diff --git a/.github/workflows/api-information.yml b/.github/workflows/api-information.yml
new file mode 100644
index 00000000000..cf2d37da5da
--- /dev/null
+++ b/.github/workflows/api-information.yml
@@ -0,0 +1,31 @@
+name: API Information
+
+on: [ pull_request ]
+
+jobs:
+  api-information-check:
+    if: github.event.pull_request.head.repo.full_name == github.repository
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 2
+          submodules: true
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - name: Set up fireci
+        run: pip3 install -e ci/fireci
+      - name: Run api-information check
+        run: |
+          fireci api_information \
+            --issue_number=${{ github.event.pull_request.number }} \
+            --repo_name=${{ github.repository }} \
+            --auth_token=${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
diff --git a/.github/workflows/build-release-artifacts.yml b/.github/workflows/build-release-artifacts.yml
new file mode 100644
index 00000000000..90928ed494f
--- /dev/null
+++ b/.github/workflows/build-release-artifacts.yml
@@ -0,0 +1,33 @@
+name: Build Release Artifacts
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - 'releases/**'
+
+jobs:
+  build-artifacts:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4.1.1
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: Perform gradle build
+        run: |
+          ./gradlew firebasePublish
+
+      - name: Upload generated artifacts
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: release_artifacts
+          path: build/*.zip
+          retention-days: 15
diff --git a/.github/workflows/build-src-check.yml b/.github/workflows/build-src-check.yml
new file mode 100644
index 00000000000..98aed0d6649
--- /dev/null
+++ b/.github/workflows/build-src-check.yml
@@ -0,0 +1,32 @@
+name: build-src-check
+
+on:
+  pull_request:
+    paths:
+      - 'buildSrc/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-src-check:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - name: buildSrc Tests
+        env:
+          FIREBASE_CI: 1
+        run: |
+          ./gradlew -b buildSrc/build.gradle.kts -PenablePluginTests=true check
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@b9f6c61d965bcaa18acc02d6daf706373a448f02
+        with:
+          files: "**/build/test-results/**/*.xml"
+          check_name: "buildSrc Test Results"
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
new file mode 100644
index 00000000000..ddf50fb93f7
--- /dev/null
+++ b/.github/workflows/changelog.yml
@@ -0,0 +1,29 @@
+name: Changelog
+
+on:
+  pull_request
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+    cancel-in-progress: true
+
+jobs:
+  changelog-check:
+    runs-on: ubuntu-22.04
+    env:
+      BUNDLE_GEMFILE: ./ci/danger/Gemfile
+    steps:
+    - uses: actions/checkout@v4.1.1
+      with:
+        fetch-depth: 100
+        submodules: true
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '2.7'
+    - name: Setup Bundler
+      run: ./ci/danger/setup_bundler.sh
+    - name: Danger CHANGELOG verifier
+      env:
+        DANGER_GITHUB_API_TOKEN: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
+      run:
+        '[ ! -z $DANGER_GITHUB_API_TOKEN ] && bundle exec danger --dangerfile=./ci/danger/Dangerfile || echo "Skipping Danger for External Contributor"'
diff --git a/.github/workflows/check-head-dependencies.yml b/.github/workflows/check-head-dependencies.yml
new file mode 100644
index 00000000000..088724bf1d4
--- /dev/null
+++ b/.github/workflows/check-head-dependencies.yml
@@ -0,0 +1,22 @@
+name: Check Head Dependencies
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - 'releases/**'
+
+jobs:
+  check-head-dependencies:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - name: Perform gradle build
+        run: |
+          ./gradlew checkHeadDependencies
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
new file mode 100644
index 00000000000..beb12d0a5bf
--- /dev/null
+++ b/.github/workflows/ci_tests.yml
@@ -0,0 +1,275 @@
+name: CI Tests
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  determine_changed:
+    name: "Determine changed modules"
+    runs-on: ubuntu-22.04
+    if: (github.repository == 'Firebase/firebase-android-sdk' && github.event_name == 'push') || github.event_name == 'pull_request'
+    outputs:
+      modules: ${{ steps.changed-modules.outputs.modules }}
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 2
+          submodules: true
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - id: changed-modules
+        run: |
+          git diff --name-only HEAD~1 | xargs printf -- '--changed-git-paths %s\n' | xargs ./gradlew writeChangedProjects --output-file-path=modules.json
+          echo modules=$(cat modules.json) >> $GITHUB_OUTPUT
+
+  unit_tests:
+    name: "Unit Tests"
+    runs-on: ubuntu-22.04
+    needs:
+      - determine_changed
+    strategy:
+      fail-fast: false
+      matrix:
+        module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
+
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 2
+          submodules: true
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: Add google-services.json
+        env:
+          INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}
+        run: |
+          echo $INTEG_TESTS_GOOGLE_SERVICES | base64 -d > google-services.json
+
+      - name: ${{ matrix.module }} Unit Tests
+        env:
+          FIREBASE_CI: 1
+        run: |
+          ./gradlew ${{matrix.module}}:check withErrorProne
+      - name: Compute upload file name
+        run: |
+          MODULE=${{matrix.module}}
+          echo "ARTIFACT_NAME=${MODULE//:/_}" >> $GITHUB_ENV
+      - name: Upload Test Results
+        uses: actions/upload-artifact@v4.3.3
+        if: always()
+        with:
+          name: unit-test-result-${{env.ARTIFACT_NAME}}
+          path: "**/build/test-results/**/*.xml"
+          retention-days: 7
+          if-no-files-found: ignore
+
+  # A job that fails if any job in the unit_tests matrix fails,
+  # to be used as a required check for merging.
+  check_all:
+    runs-on: ubuntu-22.04
+    if: always()
+    name: Unit Tests (matrix)
+    needs: unit_tests
+    steps:
+      - name: Check test matrix
+        if: needs.unit_tests.result != 'success'
+        run: exit 1
+
+
+  integ_tests:
+    name: "Instrumentation Tests"
+    # only run on post submit or PRs not originating from forks.
+    if: (github.repository == 'Firebase/firebase-android-sdk' && github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
+    runs-on: ubuntu-22.04
+    needs:
+      - determine_changed
+    strategy:
+      fail-fast: false
+      matrix:
+        module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
+
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 2
+          submodules: true
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: Add google-services.json
+        env:
+          INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}
+        run: |
+          echo $INTEG_TESTS_GOOGLE_SERVICES | base64 -d > google-services.json
+      - uses: google-github-actions/auth@v2
+        with:
+          credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+      - uses: google-github-actions/setup-gcloud@v2
+      - name: ${{ matrix.module }} Integ Tests
+        env:
+          FIREBASE_CI: 1
+          FTL_RESULTS_BUCKET: android-ci
+          FTL_RESULTS_DIR: ${{ github.event_name == 'pull_request' && format('pr-logs/pull/{0}/{1}/{2}/{3}_{4}/artifacts/', github.repository, github.event.pull_request.number, github.job, github.run_id, github.run_attempt) || format('logs/{0}/{1}_{2}/artifacts/', github.workflow, github.run_id, github.run_attempt)}}
+          FIREBASE_APP_CHECK_DEBUG_SECRET: ${{ secrets.FIREBASE_APP_CHECK_DEBUG_SECRET }}
+        run: |
+          ./gradlew ${{matrix.module}}:deviceCheck withErrorProne -PtargetBackend="prod"
+
+  firestore_custom_integ_tests:
+    name: "Firestore Custom Instrumentation Tests Against Named DB"
+    runs-on: ubuntu-22.04
+    needs:
+      - determine_changed
+    # only run on post submit or PRs not originating from forks.
+    if: ((github.repository == 'Firebase/firebase-android-sdk' && github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)) && contains(fromJSON(needs.determine_changed.outputs.modules), ':firebase-firestore')
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 2
+          submodules: true
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: Add google-services.json
+        env:
+          INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}
+        run: |
+          echo $INTEG_TESTS_GOOGLE_SERVICES | base64 -d > google-services.json
+      - uses: google-github-actions/auth@v2
+        with:
+          credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+      - uses: google-github-actions/setup-gcloud@v2
+
+      # create composite indexes with Terraform
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v2
+      - name: Terraform Init
+        run: |
+          cd firebase-firestore
+          terraform init
+        continue-on-error: true
+      - name: Terraform Apply
+        if: github.event_name == 'pull_request'
+        run: |
+          cd firebase-firestore
+
+          # Define a temporary file, redirect both stdout and stderr to the file
+          output_file=$(mktemp)
+          if ! terraform apply -var-file=../google-services.json -auto-approve > "$output_file" 2>&1 ; then
+            cat "$output_file"
+            if cat "$output_file" | grep -q "index already exists"; then
+              echo "==================================================================================="
+              echo -e "\e[93m\e[1mTerraform apply failed due to index already exists; We can safely ignore this error.\e[0m"
+              echo "==================================================================================="
+            fi
+            exit 1
+          fi
+          rm -f "$output_file"
+        continue-on-error: true
+
+      - name: Firestore Named DB Integ Tests
+        env:
+          FIREBASE_CI: 1
+          FTL_RESULTS_BUCKET: android-ci
+          FTL_RESULTS_DIR: ${{ github.event_name == 'pull_request' && format('pr-logs/pull/{0}/{1}/{2}/{3}_{4}/artifacts/', github.repository, github.event.pull_request.number, github.job, github.run_id, github.run_attempt) || format('logs/{0}/{1}_{2}/artifacts/', github.workflow, github.run_id, github.run_attempt)}}
+          FIREBASE_APP_CHECK_DEBUG_SECRET: ${{ secrets.FIREBASE_APP_CHECK_DEBUG_SECRET }}
+        run: |
+          ./gradlew firebase-firestore:deviceCheck withErrorProne -PtargetBackend="prod" -PtargetDatabaseId="test-db"
+
+
+  firestore_nightly_integ_tests:
+    name: "Firestore Instrumentation Tests Against Nightly Environment"
+    runs-on: ubuntu-22.04
+    needs:
+      - determine_changed
+    # only run on post submit or PRs not originating from forks.
+    if: ((github.repository == 'Firebase/firebase-android-sdk' && github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)) && contains(fromJSON(needs.determine_changed.outputs.modules), ':firebase-firestore')
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 2
+          submodules: true
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: Add google-services.json
+        env:
+          INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.NIGHTLY_INTEG_TESTS_GOOGLE_SERVICES }}
+        run: |
+          echo $INTEG_TESTS_GOOGLE_SERVICES > google-services.json
+      - uses: google-github-actions/auth@v2
+        with:
+          credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+      - uses: google-github-actions/setup-gcloud@v2
+
+      - name: Firestore Nightly Integ Tests
+        env:
+          FIREBASE_CI: 1
+          FTL_RESULTS_BUCKET: android-ci
+          FTL_RESULTS_DIR: ${{ github.event_name == 'pull_request' && format('pr-logs/pull/{0}/{1}/{2}/{3}_{4}/artifacts/', github.repository, github.event.pull_request.number, github.job, github.run_id, github.run_attempt) || format('logs/{0}/{1}_{2}/artifacts/', github.workflow, github.run_id, github.run_attempt)}}
+          FIREBASE_APP_CHECK_DEBUG_SECRET: ${{ secrets.FIREBASE_APP_CHECK_DEBUG_SECRET }}
+        run: |
+          ./gradlew firebase-firestore:deviceCheck withErrorProne -PtargetBackend="nightly"
+
+
+  publish-test-results:
+    name: "Publish Tests Results"
+    needs:
+      - unit_tests
+    runs-on: ubuntu-22.04
+
+    permissions:
+      checks: write
+
+      # only needed unless run with comment_mode: off
+      pull-requests: write
+
+    if: always()
+
+    steps:
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4.1.5
+        with:
+          path: artifacts
+
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v1
+        with:
+          files: "artifacts/**/*.xml"
diff --git a/.github/workflows/config-e2e.yml b/.github/workflows/config-e2e.yml
new file mode 100644
index 00000000000..604115b324d
--- /dev/null
+++ b/.github/workflows/config-e2e.yml
@@ -0,0 +1,42 @@
+name: Firebase Remote Config E2E Tests
+
+on:
+  schedule:
+    - cron: 24 */4 * * *  # every 4 hours @ 24 minutes past the hour
+  workflow_dispatch:      # allow triggering the workflow manually
+
+concurrency:
+  group: ${{ github.workflow }}
+
+env:
+  REMOTE_CONFIG_E2E_GOOGLE_SERVICES: ${{ secrets.REMOTE_CONFIG_E2E_GOOGLE_SERVICES }}
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout firebase-config
+        uses: actions/checkout@v4.1.1
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Add google-services.json
+        run: |
+          echo $REMOTE_CONFIG_E2E_GOOGLE_SERVICES | base64 -d > google-services.json
+
+      - uses: google-github-actions/auth@v2
+        with:
+          credentials_json: ${{ secrets.GCP_service_account }}
+      - uses: google-github-actions/setup-gcloud@v2
+      - name: Run Remote Config end-to-end tests
+        env:
+          FTL_RESULTS_BUCKET: fireescape
+        run: |
+          ./gradlew :firebase-config:test-app:deviceCheck withErrorProne -PtargetBackend="prod"
diff --git a/.github/workflows/copyright-check.yml b/.github/workflows/copyright-check.yml
new file mode 100644
index 00000000000..dd17b2acd4f
--- /dev/null
+++ b/.github/workflows/copyright-check.yml
@@ -0,0 +1,27 @@
+name: Copyright check
+
+on: pull_request
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  copyright-check:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.9'
+      - run: |
+          pip install -e "ci/fireci"
+      - run: |
+          fireci copyright_check \
+            -e py                   \
+            -e gradle               \
+            -e java                 \
+            -e kt                 \
+            -e groovy               \
+            -e sh                   \
+            -e proto
diff --git a/.github/workflows/create_releases.yml b/.github/workflows/create_releases.yml
new file mode 100644
index 00000000000..3d3c654683e
--- /dev/null
+++ b/.github/workflows/create_releases.yml
@@ -0,0 +1,50 @@
+name: Create release
+
+on:
+  workflow_dispatch:
+    inputs:
+      name:
+        description: 'Release name'
+        required: true
+        type: string
+      past-name:
+        description: 'Past release name'
+        required: true
+        type: string
+
+jobs:
+  create-branches:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Create base branch
+        uses: peterjgrainger/action-create-branch@c2800a3a9edbba2218da6861fa46496cf8f3195a
+        with:
+          branch: 'releases/${{ inputs.name }}'
+
+  create-pull-request:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 0
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - name: Create release configuration template
+        run: |
+          ./gradlew generateReleaseConfig -PcurrentRelease=${{ inputs.name }} -PpastRelease=${{ inputs.past-name }} -PprintOutput=true
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4
+        with:
+          base: 'releases/${{ inputs.name }}'
+          branch: 'releases/${{ inputs.name }}.release'
+          add-paths: release.json,release_report.md,release_report.json
+          title: '${{ inputs.name}} release'
+          body: 'Auto-generated PR for release ${{ inputs.name}}'
+          commit-message: 'Create release config for ${{ inputs.name }}'
diff --git a/.github/workflows/diff-javadoc.yml b/.github/workflows/diff-javadoc.yml
new file mode 100644
index 00000000000..17fb370d0bf
--- /dev/null
+++ b/.github/workflows/diff-javadoc.yml
@@ -0,0 +1,64 @@
+name: Diff Javadoc
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Make diff directory
+        run: mkdir ~/diff
+
+      - name: Checkout PR branch
+        uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 2
+          submodules: true
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: Generate docs for PR branch
+        run: ./gradlew kotlindoc
+
+      - name: Move branch docs to diff directory
+        run: mv build ~/diff/modified
+
+      - name: Checkout master
+        uses: actions/checkout@v4.1.1
+        with:
+          ref: ${{ github.base_ref }}
+
+      - name: Generate docs for Master
+        run: ./gradlew kotlindoc
+
+      - name: Move master docs to diff directory
+        run: mv build ~/diff/original
+
+      - name: Get diff between Master and Branch docs
+        run: >
+          `# Recursively diff directories, including new files, git style, with 3 lines of context`
+          diff -wEburN ~/diff/original ~/diff/modified
+          `# Remove the first line and new file signifier of the output`
+          | tail -n +2
+          `# Replace the diff new file signifier with the end and start of a new codeblock`
+          | sed "s/^diff.*$/\`\`\`\\n\`\`\`diff/g"
+          `# Add a collapsable block, summary, and start the first code block on the first line`
+          | sed "1s/^/<details>\\n<summary>Javadoc Changes:<\/summary>\\n\\n\`\`\`diff\\n/"
+          `# Close the final code block and close the collapsable on the final line`
+          | sed "$ s/$/\\n\`\`\`\\n<\/details>/"
+          `# Write to diff.md for later`
+          > diff.md
+
+      - name: Add comment
+        continue-on-error: true
+        uses: mshick/add-pr-comment@a65df5f64fc741e91c59b8359a4bc56e57aaf5b1
+        with:
+          message-path: diff.md
diff --git a/.github/workflows/fireci.yml b/.github/workflows/fireci.yml
new file mode 100644
index 00000000000..2181236e2a8
--- /dev/null
+++ b/.github/workflows/fireci.yml
@@ -0,0 +1,27 @@
+name: fireci
+
+on:
+  pull_request:
+    paths:
+      - 'ci/**'
+      - '.github/workflows/fireci.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  fireci:
+    name: "fireci tests"
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+      - run: |
+          pip install -e "ci/fireci[test]"
+      - run: |
+          pytest ci/fireci
+      - run: |
+          mypy --config-file ci/fireci/setup.cfg ci/fireci/ 
diff --git a/.github/workflows/fireperf-e2e.yml b/.github/workflows/fireperf-e2e.yml
new file mode 100644
index 00000000000..d1e09f1e2d7
--- /dev/null
+++ b/.github/workflows/fireperf-e2e.yml
@@ -0,0 +1,107 @@
+name: FirePerf E2E Tests
+
+on:
+  schedule:
+    - cron: 4 */4 * * *  # every 4 hours at 04 minutes past the hour
+  workflow_dispatch:     # allow triggering the workflow manually
+
+concurrency:
+  group: ${{ github.workflow }}
+
+env:
+  PERF_E2E_GOOGLE_SERVICES: ${{ secrets.PERF_E2E_GOOGLE_SERVICES }}
+  FTL_RESULTS_BUCKET: fireescape
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        environment: [ prod, autopush ]
+    steps:
+      - name: Checkout firebase-android-sdk
+        uses: actions/checkout@v4.1.1
+      - name: Checkout firebase-android-buildtools
+        uses: actions/checkout@v4.1.1
+        with:
+          repository: FirebasePrivate/firebase-android-buildtools
+          token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
+          path: firebase-android-buildtools
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - name: Set up fireci
+        run: pip3 install -e ci/fireci
+      - uses: google-github-actions/auth@v2
+        with:
+          credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+      - uses: google-github-actions/setup-gcloud@v2
+      - name: Add google-services.json
+        run: echo $PERF_E2E_GOOGLE_SERVICES | base64 -d > google-services.json
+      - name: Run fireperf end-to-end tests
+        run: |
+          fireci fireperf_e2e_test \
+            --plugin_repo_dir=firebase-android-buildtools \
+            --target_environment=${{ matrix.environment }}
+      - name: Notify developers upon failures
+        if: ${{ failure() }}
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            const commit = context.sha;
+            const run = context.runId;
+            const url = `https://github.com/${owner}/${repo}/actions/runs/${run}`;
+
+            const datetime = (new Date()).toLocaleString('en-US', {
+              timeZone: 'America/Los_Angeles',
+              dateStyle: 'medium',
+              timeStyle: 'long',
+            });
+
+            const text =
+            `Failed on commit ${commit} at ${datetime}.
+
+            ${url}`;
+
+            const { data: issues } = await github.rest.issues.listForRepo({
+              owner: owner,
+              repo: repo,
+              state: 'open',
+              labels: 'fireperf-e2e-tests'
+            });
+
+            if (issues.length) {
+              github.rest.issues.createComment({
+                owner: owner,
+                repo: repo,
+                issue_number: issues[0].number,
+                body: text,
+              });
+            } else {
+              github.rest.issues.create({
+                owner: owner,
+                repo: repo,
+                title: 'FirePerf E2E Test Failures',
+                body: text,
+                labels: ['fireperf-e2e-tests'],
+                assignees: ['raymondlam', 'visumickey']
+              });
+            }
+      - name: Upload test artifacts
+        if: always()
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: test-artifacts (${{ matrix.environment }})
+          path: |
+            ~/.m2/repository/com/google/firebase/perf-plugin
+            **/build/reports
+            **/build/test-results
diff --git a/.github/workflows/health-metrics.yml b/.github/workflows/health-metrics.yml
new file mode 100644
index 00000000000..a47c682ae61
--- /dev/null
+++ b/.github/workflows/health-metrics.yml
@@ -0,0 +1,134 @@
+name: Health Metrics
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      # add other feature branches here
+  # TODO(yifany): support workflow_dispatch for metric tests (or only for startup time test)
+
+env:
+  GITHUB_PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
+
+jobs:
+  coverage:
+    name: Coverage
+    if: |
+      (github.event_name == 'push' && github.repository == 'firebase/firebase-android-sdk')
+        || (github.event_name == 'pull_request'
+              && github.event.pull_request.head.repo.full_name == github.repository)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 2
+          submodules: true
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - uses: google-github-actions/auth@v2
+        with:
+          credentials_json: '${{ secrets.GCP_SERVICE_ACCOUNT }}'
+      - uses: google-github-actions/setup-gcloud@v2
+      - name: Set up fireci
+        run: pip3 install -e ci/fireci
+      - name: Run coverage tests (presubmit)
+        if: ${{ github.event_name == 'pull_request' }}
+        run: fireci coverage --pull-request
+      - name: Run coverage tests (post-submit)
+        if: ${{ github.event_name == 'push' }}
+        run: fireci coverage
+
+  size:
+    name: Size
+    if: |
+      (github.event_name == 'push' && github.repository == 'firebase/firebase-android-sdk')
+        || (github.event_name == 'pull_request'
+              && github.event.pull_request.head.repo.full_name == github.repository)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 2
+          submodules: true
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - uses: google-github-actions/auth@v2
+        with:
+          credentials_json: '${{ secrets.GCP_SERVICE_ACCOUNT }}'
+      - uses: google-github-actions/setup-gcloud@v2
+      - name: Set up fireci
+        run: pip3 install -e ci/fireci
+      - name: Run size tests (presubmit)
+        if: ${{ github.event_name == 'pull_request' }}
+        run: fireci binary_size --pull-request
+      - name: Run size tests (post-submit)
+        if: ${{ github.event_name == 'push' }}
+        run: fireci binary_size
+
+  startup_time:
+    name: Startup Time
+    if: |
+      (github.event_name == 'push' && github.repository == 'firebase/firebase-android-sdk')
+        || (github.event_name == 'pull_request'
+              && github.event.pull_request.head.repo.full_name == github.repository
+              && github.event.pull_request.base.ref == 'master')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 2
+          submodules: true
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - uses: google-github-actions/auth@v2
+        with:
+          credentials_json: '${{ secrets.GCP_SERVICE_ACCOUNT }}'
+      - uses: google-github-actions/setup-gcloud@v2
+      - name: Set up fireci
+        run: pip3 install -e ci/fireci
+      - name: Add google-services.json
+        env:
+          INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}
+          BENCHMARK_APP_LOCATION: health-metrics/benchmark/template/app/google-services.json
+        run: |
+          echo $INTEG_TESTS_GOOGLE_SERVICES | base64 -d > $BENCHMARK_APP_LOCATION
+      - name: Run startup-time tests (presubmit)
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          git diff --name-only HEAD~1 | \
+            xargs printf -- '--changed-git-paths %s\n' | \
+            xargs ./gradlew writeChangedProjects --output-file-path=modules.json
+          fireci macrobenchmark ci --pull-request --changed-modules-file modules.json
+      - name: Run startup-time tests (post-submit)
+        if: ${{ github.event_name == 'push' }}
+        run: |
+          fireci macrobenchmark ci --push
diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
new file mode 100644
index 00000000000..2a6bd787e0d
--- /dev/null
+++ b/.github/workflows/jekyll-gh-pages.yml
@@ -0,0 +1,55 @@
+name: Jekyll with GitHub Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+    paths:
+      - '.github/workflows/jekyll-gh-pages.yml'
+      - 'contributor-docs/**'
+  pull_request:
+    paths:
+      - '.github/workflows/jekyll-gh-pages.yml'
+      - 'contributor-docs/**'
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+      - name: Setup Pages
+        uses: actions/configure-pages@v2
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
+        with:
+          source: ./contributor-docs
+          destination: ./_site
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+
+  deploy:
+    if: ${{ github.event_name == 'push' && github.repository == 'firebase/firebase-android-sdk' }}
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1
diff --git a/.github/workflows/make-bom.yml b/.github/workflows/make-bom.yml
new file mode 100644
index 00000000000..2678455add3
--- /dev/null
+++ b/.github/workflows/make-bom.yml
@@ -0,0 +1,39 @@
+name: Make BoM
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - uses: actions/checkout@v4.1.1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: Build
+        run: |
+          ./ci/run.sh \
+          --artifact-target-dir=./logs/artifacts \
+          --artifact-patterns=bom.zip \
+          --artifact-patterns=bomReleaseNotes.md \
+          --artifact-patterns=recipeVersionUpdate.txt \
+          gradle \
+          -- \
+          --build-cache \
+          buildBomZip
+
+      - name: Upload generated artifacts
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: artifacts
+          path: ./logs/artifacts/
+          retention-days: 5
diff --git a/.github/workflows/merge-to-main.yml b/.github/workflows/merge-to-main.yml
new file mode 100644
index 00000000000..70b03e29b61
--- /dev/null
+++ b/.github/workflows/merge-to-main.yml
@@ -0,0 +1,30 @@
+name: Merge to main
+
+on:
+  pull_request:
+    branches:
+      - master
+    types:
+      - opened
+      - labeled
+      - unlabeled
+
+jobs:
+  pr-message:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+    - uses: mshick/add-pr-comment@a65df5f64fc741e91c59b8359a4bc56e57aaf5b1
+      with:
+        message: >
+          ### 📝 PRs merging into main branch
+
+          **Our main branch should always be in a releasable state**.
+          If you are working on a larger change, or if you don't want
+          this change to see the light of the day just yet, consider
+          using a feature branch first, and only merge into the main
+          branch when the code complete and ready to be released.
+
+    - name: Success
+      run: exit 0
diff --git a/.github/workflows/post_release_cleanup.yml b/.github/workflows/post_release_cleanup.yml
new file mode 100644
index 00000000000..fb6d7dc8f96
--- /dev/null
+++ b/.github/workflows/post_release_cleanup.yml
@@ -0,0 +1,43 @@
+name: Post release cleanup
+
+on:
+  workflow_dispatch:
+    inputs:
+      name:
+        description: 'Release name'
+        required: true
+        type: string
+
+jobs:
+  create-pull-request:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 0
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - name: Run post release cleanup task
+        run: |
+          ./gradlew postReleaseCleanup
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4
+        with:
+          base: 'master'
+          branch: 'releases/${{ inputs.name }}.mergeback'
+          add-paths: |
+            **/CHANGELOG.md
+            **/gradle.properties
+            **/*.gradle
+            **/*.gradle.kts
+          title: '${{ inputs.name}} mergeback'
+          body: |
+            Auto-generated PR for cleaning up release ${{ inputs.name}}
+            
+            NO_RELEASE_CHANGE
+          commit-message: 'Post release cleanup for ${{ inputs.name }}'
diff --git a/.github/workflows/private-mirror-sync.yml b/.github/workflows/private-mirror-sync.yml
new file mode 100644
index 00000000000..9bb2ca13a0b
--- /dev/null
+++ b/.github/workflows/private-mirror-sync.yml
@@ -0,0 +1,25 @@
+name: Private Mirror Sync
+
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  sync:
+    if: github.repository == 'firebase/firebase-android-sdk'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 0
+          submodules: true
+          token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
+      - name: Force push HEAD to private repo main branch
+        run: |
+          git remote add mirror https://github.com/FirebasePrivate/firebase-android-sdk.git
+          git push mirror HEAD:main --force --verbose
diff --git a/.github/workflows/release-note-changes.yml b/.github/workflows/release-note-changes.yml
new file mode 100644
index 00000000000..2ef318e9809
--- /dev/null
+++ b/.github/workflows/release-note-changes.yml
@@ -0,0 +1,67 @@
+name: Release note changes
+
+on:
+  pull_request:
+    branches:
+      - 'master'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.1.1
+      with:
+        fetch-depth: 0
+
+    - name: Create output file
+      run: touch changelog_comment.md
+
+    - name: Get changed changelog files
+      id: changed-files
+      uses: tj-actions/changed-files@v36.0.10
+      with:
+        files_ignore: |
+          buildSrc/**
+        files: |
+          **/CHANGELOG.md
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4.1.0
+      with:
+        java-version: 17
+        distribution: temurin
+        cache: gradle
+
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v4
+      if: ${{ steps.changed-files.outputs.any_changed == 'true' }}
+      with:
+        python-version: '3.10'
+
+    - name: Set up fireci
+      id: install-fireci
+      if: ${{ steps.changed-files.outputs.any_changed == 'true' }}
+      run: pip3 install -e ci/fireci
+
+    - name: Generate comment
+      id: generate-comment
+      if: ${{ steps.install-fireci.outcome == 'success' }}
+      run: |
+        fireci changelog_comment -c "${{ steps.changed-files.outputs.all_changed_files }}" -o ./changelog_comment.md
+
+    - name: Add PR Comment
+      uses: mshick/add-pr-comment@v2.8.1
+      continue-on-error: true
+      with:
+        status: ${{ steps.generate-comment.outcome }}
+        message-path: ./changelog_comment.md
+        message-skipped: |
+          ## Release note changes
+          No release note changes were detected. If you made changes that should be
+          present in the next release, ensure you've added an entry in the appropriate
+          `CHANGELOG.md` file(s).
+        message-failure: |
+          ## Release note changes
+          A `CHANGELOG.md` file seems to not match the expected format.
+          Please ensure your changelog files are following the format as
+          defined in [our documentation](#).
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
new file mode 100644
index 00000000000..130ac90b22e
--- /dev/null
+++ b/.github/workflows/scorecards.yml
@@ -0,0 +1,72 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecards supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '45 11 * * 1'
+  push:
+    branches: [ "master" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecards analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v4.1.1
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # v2.0.6
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecards on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@807578363a7869ca324a79039e6db9c843e0e100 # v2.1.27
+        with:
+          sarif_file: results.sarif
diff --git a/.github/workflows/semver-check.yml b/.github/workflows/semver-check.yml
new file mode 100644
index 00000000000..2fc7eb38843
--- /dev/null
+++ b/.github/workflows/semver-check.yml
@@ -0,0 +1,22 @@
+name: Semver Check
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - 'releases/**'
+
+jobs:
+  semver-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - name: Perform gradle build
+        run: |
+          ./gradlew semverCheckForRelease
diff --git a/.github/workflows/sessions-e2e.yml b/.github/workflows/sessions-e2e.yml
new file mode 100644
index 00000000000..048cd92eee9
--- /dev/null
+++ b/.github/workflows/sessions-e2e.yml
@@ -0,0 +1,42 @@
+name: Firebase Sessions E2E Tests
+
+on:
+  schedule:
+    - cron: 24 */4 * * *  # every 4 hours at 24 minutes past the hour
+  workflow_dispatch:     # allow triggering the workflow manually
+
+concurrency:
+  group: ${{ github.workflow }}
+
+env:
+  SESSIONS_E2E_GOOGLE_SERVICES: ${{ secrets.SESSIONS_E2E_GOOGLE_SERVICES }}
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout firebase-sessions
+        uses: actions/checkout@v4.1.1
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Add google-services.json
+        run: |
+          echo $SESSIONS_E2E_GOOGLE_SERVICES | base64 -d > google-services.json
+
+      - uses: google-github-actions/auth@v2
+        with:
+          credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+      - uses: google-github-actions/setup-gcloud@v2
+      - name: Run sessions end-to-end tests
+        env:
+          FTL_RESULTS_BUCKET: fireescape
+        run: |
+          ./gradlew :firebase-sessions:test-app:deviceCheck withErrorProne -PtargetBackend="prod" -PtriggerCrashes
diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
new file mode 100644
index 00000000000..07ab7dbeeb2
--- /dev/null
+++ b/.github/workflows/smoke-tests.yml
@@ -0,0 +1,60 @@
+name: Smoke Tests
+
+on: [ pull_request ]
+
+jobs:
+  smoke-tests:
+    if: github.event.pull_request.head.repo.full_name == github.repository
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+        with:
+          fetch-depth: 2
+          submodules: true
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - uses: google-github-actions/auth@v2
+        with:
+          credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+      - uses: google-github-actions/setup-gcloud@v2
+
+      # TODO(yifany): make it a fireci plugin and remove the separately distributed jar file
+      - name: Download smoke tests runner
+        run: |
+          SMOKE_TESTS_RUNNER_URL="https://storage.googleapis.com/android-ci/smoke-tests-runner.jar"
+          curl ${SMOKE_TESTS_RUNNER_URL} --output runner.jar
+
+      # TODO(yifany): remove hardcoded reference to /smoke-tests-google-services from the runner
+      - name: Add google-services.json
+        env:
+          SMOKE_TESTS_GOOGLE_SERVICES: ${{ secrets.SMOKE_TESTS_GOOGLE_SERVICES }}
+        run: |
+          echo $SMOKE_TESTS_GOOGLE_SERVICES | base64 -d > google-services.json
+          sudo mkdir /smoke-tests-google-services
+          sudo mv google-services.json /smoke-tests-google-services
+
+      # TODO(yifany): remove hardcoded reference to Prow environment variables from the runner
+      - name: Run smoke tests
+        env:
+          FIREBASE_CI: 1
+          REPO_OWNER: ${{ github.repository_owner }}
+          REPO_NAME: firebase-android-sdk
+          PULL_NUMBER: ${{ github.event.pull_request.number }}
+          JOB_NAME: smoke-tests
+          BUILD_ID: ${{ github.run_id }}
+          ARTIFACTS: ${{ runner.temp }}
+        run: java -jar runner.jar smoke-tests/runner.config
+
+      - name: Upload test artifacts
+        if: always()
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: smoke-tests-artifacts
+          path: |
+            ${{ runner.temp }}/**/*.apk
+            ${{ runner.temp }}/**/changed-artifacts.json
+            ${{ runner.temp }}/**/smoke-test-dependencies.log
diff --git a/.github/workflows/update-cpp-sdk-on-release.yml b/.github/workflows/update-cpp-sdk-on-release.yml
index 7f611ce7895..40dbbad5d1d 100644
--- a/.github/workflows/update-cpp-sdk-on-release.yml
+++ b/.github/workflows/update-cpp-sdk-on-release.yml
@@ -23,7 +23,7 @@ jobs:
     outputs:
       released_version_changed: ${{ steps.check_version.outputs.released_version_changed }}
     steps:
-      - uses: actions/checkout@v2.3.1
+      - uses: actions/checkout@v4.1.1
         with:
           # Check out the actual head commit, not any merge commit.
           ref: ${{ github.sha }}
@@ -35,7 +35,7 @@ jobs:
           # Query the git history for all gradle.properties files changed by this push.
           # Then, check the diff to see if any "latestReleasedVersion=" lines changed.
           if (git diff '${{ github.event.before }}' -- '**/gradle.properties' | grep -q '^[-+]latestReleasedVersion='); then
-            echo "::set-output name=released_version_changed::1"
+            echo "released_version_changed=1" >> $GITHUB_OUTPUT
           else
             echo "No change to latestReleasedVersion detected since ${{ github.event.before }}"
           fi
@@ -56,13 +56,13 @@ jobs:
           python-version: 3.7
 
       - name: Check out firebase-cpp-sdk
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v4.1.1
         with:
           repository: firebase/firebase-cpp-sdk
           ref: main
 
       - name: Get firebase-workflow-trigger token
-        uses: tibdex/github-app-token@v1
+        uses: tibdex/github-app-token@021a2405c7f990db57f5eae5397423dcc554159c
         id: generate-token
         with:
           app_id: ${{ secrets.CPP_WORKFLOW_TRIGGER_APP_ID }}
@@ -71,5 +71,5 @@ jobs:
 
       - name: Trigger firebase-cpp-sdk update
         run: |
-          pip install -r scripts/gha/requirements.txt
+          pip install -r scripts/gha/python_requirements.txt
           python scripts/gha/trigger_workflow.py -t ${{ steps.generate-token.outputs.token }} -w update-dependencies.yml -p updateAndroid 1 -p updateiOS 0 -p comment "[Triggered]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID) by [firebase-android-sdk $(date '+%b %d') release]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/${{ github.sha }})." -s 10 -A
diff --git a/.github/workflows/validate-dependencies.yml b/.github/workflows/validate-dependencies.yml
new file mode 100644
index 00000000000..c91ad8aee0c
--- /dev/null
+++ b/.github/workflows/validate-dependencies.yml
@@ -0,0 +1,22 @@
+name: Validate Artifact Dependencies
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - 'releases/**'
+
+jobs:
+  build-artifacts:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - name: Perform gradle build
+        run: |
+          ./gradlew validatePomForRelease
diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml
new file mode 100644
index 00000000000..f5f285e29a0
--- /dev/null
+++ b/.github/workflows/version-check.yml
@@ -0,0 +1,22 @@
+name: Version Check
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - 'releases/**'
+
+jobs:
+  version-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4.1.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+      - name: Build
+        run: |
+          ./gradlew gmavenVersionCheck
diff --git a/.gitignore b/.gitignore
index afeb384ada6..d76e10d3c80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,13 @@ _artifacts
 .DS_Store
 firebase-crashlytics-ndk/.externalNativeBuild/
 firebase-crashlytics-ndk/.cxx/
+smoke-test-logs/
+smoke-tests/build-debug-headGit-smoke-test
+smoke-tests/firehorn.log
+macrobenchmark-output.json
+
+# generated Terraform docs
+.terraform/*
+.terraform.lock.hcl
+*.tfstate
+*.tfstate.*
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0c0969ee7ef..e0360670700 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,3 +27,7 @@ information on using pull requests.
 This project follows
 [Google's Open Source Community Guidelines](https://opensource.google.com/conduct/).
 
+## Contributor Documentation
+
+To know more about how to setup your environment, how Firebase internals work, and
+best practices, take a look at our detailed [contributor documentation](https://firebase.github.io/firebase-android-sdk/).
\ No newline at end of file
diff --git a/README.md b/README.md
index 55dca269146..4e6500c4820 100644
--- a/README.md
+++ b/README.md
@@ -1,37 +1,7 @@
 # Firebase Android Open Source Development
 
-This repository contains a subset of the Firebase Android SDK source. It
-currently includes the following Firebase libraries, and some of their
-dependencies:
-
-  * `firebase-abt`
-  * `firebase-appdistribution`
-  * `firebase-common`
-  * `firebase-common-ktx`
-  * `firebase-crashlytics`
-  * `firebase-crashlytics-ktx`
-  * `firebase-crashlytics-ndk`
-  * `firebase-database`
-  * `firebase-database-ktx`
-  * `firebase-database-collection`
-  * `firebase-datatransport`
-  * `firebase-firestore`
-  * `firebase-firestore-ktx`
-  * `firebase-functions`
-  * `firebase-functions-ktx`
-  * `firebase-inappmessaging`
-  * `firebase-inappmessaging-ktx`
-  * `firebase-inappmessaging-display`
-  * `firebase-inappmessaging-display-ktx`
-  * `firebase-messaging`
-  * `firebase-messaging-directboot`
-  * `firebase-perf`
-  * `firebase-perf-ktx`
-  * `firebase-remote-config`
-  * `firebase-remote-config-ktx`
-  * `firebase-storage`
-  * `firebase-storage-ktx`
-
+This repository contains the source code for all Android Firebase SDKs except
+Analytics and Auth.
 
 Firebase is an app development platform with tools to help you build, grow and
 monetize your app. More information about Firebase can be found at
@@ -65,7 +35,7 @@ https://firebase.google.com.
 * Import the firebase-android-sdk gradle project into Android Studio using the
   **Import project(Gradle, Eclipse ADT, etc.)** option.
 * `firebase-crashlytics-ndk` must be built with NDK 21. See
-  [firebase-crashlytics-ndk](firebase-crashlytics-ndk/README.md) for more 
+  [firebase-crashlytics-ndk](firebase-crashlytics-ndk/README.md) for more
   details.
 
 ## Testing
@@ -143,7 +113,7 @@ Integration tests can be executed on the command line by running
 ```
 
 This will execute tests on devices that are configured per project, if nothing is configured for the
-project, the tests will run on `model=Pixel2,version=27,locale=en,orientation=portrait`.
+project, the tests will run on `model=panther,version=33,locale=en,orientation=portrait`.
 
 Projects can be configured in the following way:
 
@@ -225,13 +195,14 @@ strategy](https://docs.gradle.org/current/dsl/org.gradle.api.artifacts.Resolutio
 
 ### Commands
 
-The simplest way to publish a project and all its associated dependencies is to
-just publish all projects. The following command builds SNAPSHOT dependencies of
-all projects. All pom level dependencies within the published artifacts will
-also point to SNAPSHOT versions that are co-published.
+For more advanced use cases where developers wish to make changes to a project,
+but have transitive dependencies point to publicly released versions, individual
+projects may be published as follows.
 
 ```bash
-./gradlew publishAllToLocal
+# e.g. to publish Firestore and Functions
+./gradlew -PprojectsToPublish="firebase-firestore,firebase-functions" \
+    publishReleasingLibrariesToMavenLocal
 ```
 
 Developers may take a dependency on these locally published versions by adding
@@ -239,27 +210,23 @@ the `mavenLocal()` repository to your [repositories
 block](https://docs.gradle.org/current/userguide/declaring_repositories.html) in
 your app module's build.gradle.
 
-For more advanced use cases where developers wish to make changes to a project,
-but have transitive dependencies point to publicly released versions, individual
-projects may be published as follows.
+### Code Formatting
 
-```bash
-# e.g. to publish Firestore and Functions
-./gradlew -PprojectsToPublish=":firebase-firestore,:firebase-functions" \
-    publishProjectsToMavenLocal
-```
+#### Java
 
-### Code Formatting
+N/A for now
+
+
+#### Kotlin
 
-Code in this repo is formatted with the google-java-format tool. You can enable
+Kotlin code in this repo is formatted with the `ktfmt` tool. You can enable
 this formatting in Android Studio by downloading and installing the
-[google-java-format plugin](https://github.com/google/google-java-format).
-The plugin is disabled by default, but the repo contains configuration information
-and links to additional plugins.
+[ktfmt plugin](https://plugins.jetbrains.com/plugin/14912-ktfmt).
+Enable the plugin in Preferences | Editor | ktfmt Settings. and set code style to Google (internal).
 
 To run formatting on your entire project you can run
 ```bash
-./gradlew :<firebase-project>:googleJavaFormat
+./gradlew :<firebase-project>:ktfmtFormat
 ```
 
 ### Contributing
diff --git a/alternative-root-project.gradle b/alternative-root-project.gradle
deleted file mode 100644
index c202e9964f4..00000000000
--- a/alternative-root-project.gradle
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import com.google.firebase.gradle.MultiProjectReleasePlugin
-
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    ext.kotlinVersion = '1.3.72'
-    repositories {
-        google()
-        jcenter()
-        mavenCentral()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-        maven {
-            url 'https://storage.googleapis.com/android-ci/mvn/'
-        }
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.3'
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14'
-        classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
-        classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
-        classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'digital.wup:android-maven-publish:3.6.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'org.jlleitschuh.gradle:ktlint-gradle:9.2.1'
-    }
-}
-
-apply from: 'sdkProperties.gradle'
-
-ext {
-    playServicesVersion = '16.0.1'
-    supportAnnotationsVersion = '28.0.0'
-    gMavenRoot = 'https://dl.google.com/dl/android/maven2'
-    firebaseDefaultPreguardFile='oss/default-preguard.txt'
-    errorproneVersion = '2.3.2'
-    errorproneJavacVersion = '9+181-r4173-1'
-    googleTruthVersion = '0.40'
-
-}
-
-apply from: 'build.gradle'
-
-apply plugin: MultiProjectReleasePlugin
diff --git a/appcheck/firebase-appcheck-debug-testing/CHANGELOG.md b/appcheck/firebase-appcheck-debug-testing/CHANGELOG.md
new file mode 100644
index 00000000000..afaeae8a097
--- /dev/null
+++ b/appcheck/firebase-appcheck-debug-testing/CHANGELOG.md
@@ -0,0 +1,64 @@
+# Unreleased
+
+
+# 18.0.0
+* [changed] Bump internal dependencies
+
+# 17.1.2
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 17.1.1
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 17.1.0
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 17.0.0
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 16.1.2
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 16.1.1
+* [changed] Integrated the [app_check] Debug Testing SDK with Firebase
+  components.
+  (GitHub [#4436](//github.com/firebase/firebase-android-sdk/issues/4436){: .external})
+
+# 16.1.0
+* [unchanged] Updated to accommodate the release of the updated
+  [app_check] Kotlin extensions library.
+
+# 16.0.1
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+# 16.0.0
+* [changed] [app_check] has exited beta and is now generally available for
+  use.
+
+# 16.0.0-beta06
+* [fixed] Fixed a bug in the [app_check] token refresh flow when using a
+  custom provider.
+
+# 16.0.0-beta05
+* [changed] Internal improvements.
+
+# 16.0.0-beta04
+* [changed] Improved error handling logic by minimizing the amount of requests
+  that are unlikely to succeed.
+* [fixed] Fixed heartbeat reporting.
+
+# 16.0.0-beta03
+* [changed] Added `X-Android-Package` and `X-Android-Cert` request headers to
+  [app_check] network calls.
+
+# 16.0.0-beta02
+* [feature] Added [`getAppCheckToken()`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck#getAppCheckToken(boolean)),
+  [`AppCheckTokenListener`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck.AppCheckListener),
+  and associated setters and removers for developers to request and observe
+  changes to the [app_check] token.
+
+# 16.0.0-beta01
+* [feature] Initial beta release of the [app_check] Debug Testing SDK with
+  abuse reduction features.
+
diff --git a/appcheck/firebase-appcheck-debug-testing/api.txt b/appcheck/firebase-appcheck-debug-testing/api.txt
new file mode 100644
index 00000000000..24535cd8bfb
--- /dev/null
+++ b/appcheck/firebase-appcheck-debug-testing/api.txt
@@ -0,0 +1,15 @@
+// Signature format: 2.0
+package com.google.firebase.appcheck.debug.testing {
+
+  public final class DebugAppCheckTestHelper {
+    method @NonNull public static com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper fromInstrumentationArgs();
+    method public <E extends java.lang.Throwable> void withDebugProvider(@NonNull com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper.MaybeThrowingRunnable<E>) throws E;
+    method public <E extends java.lang.Throwable> void withDebugProvider(@NonNull com.google.firebase.FirebaseApp, @NonNull com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper.MaybeThrowingRunnable<E>) throws E;
+  }
+
+  public static interface DebugAppCheckTestHelper.MaybeThrowingRunnable<E extends java.lang.Throwable> {
+    method public void run() throws E;
+  }
+
+}
+
diff --git a/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle b/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
index c6ff822738c..84354a59255 100644
--- a/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
+++ b/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
@@ -14,9 +14,11 @@
 
 plugins {
     id 'firebase-library'
+    id 'copy-google-services'
 }
 
 firebaseLibrary {
+    libraryGroup "appcheck"
     testLab.enabled = true
     publishSources = true
 }
@@ -26,11 +28,13 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.appcheck.debug.testing"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
         versionName version
+        multiDexEnabled = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArgument "firebaseAppCheckDebugSecret", System.getenv("FIREBASE_APP_CHECK_DEBUG_SECRET") ?: ''
     }
@@ -38,38 +42,34 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
     testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':appcheck:firebase-appcheck')
-    implementation project(':appcheck:firebase-appcheck-debug')
-    implementation project(':appcheck:firebase-appcheck-interop')
+    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+
+    api project(':appcheck:firebase-appcheck')
+    api project(':appcheck:firebase-appcheck-debug')
+    api 'com.google.firebase:firebase-appcheck-interop:17.0.0'
+    api 'com.google.firebase:firebase-common:21.0.0'
+    api 'com.google.firebase:firebase-common-ktx:21.0.0'
+    api 'com.google.firebase:firebase-components:18.0.0'
+
+    implementation "androidx.test:core:$androidxTestCoreVersion"
     implementation 'com.google.android.gms:play-services-base:18.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation 'androidx.test:core:1.2.0'
 
+    testImplementation project(':appcheck:firebase-appcheck-playintegrity')
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'junit:junit:4.13-beta-2'
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation project(':appcheck:firebase-appcheck-safetynet')
 
     androidTestImplementation project(':firebase-storage')
-    androidTestImplementation 'junit:junit:4.13-beta-2'
-    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
+    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'junit:junit:4.13-beta-2'
     androidTestImplementation 'org.mockito:mockito-core:2.25.0'
 }
-
-// ==========================================================================
-// Copy from here down if you want to use the google-services plugin in your
-// androidTest integration tests.
-// ==========================================================================
-ext.packageName = "com.google.firebase.appcheck.debug.testing"
-apply from: '../../gradle/googleServices.gradle'
diff --git a/appcheck/firebase-appcheck-debug-testing/gradle.properties b/appcheck/firebase-appcheck-debug-testing/gradle.properties
index 671ce6a5ae5..9b7be4891d1 100644
--- a/appcheck/firebase-appcheck-debug-testing/gradle.properties
+++ b/appcheck/firebase-appcheck-debug-testing/gradle.properties
@@ -1 +1,2 @@
-version=16.0.1
+version=18.0.1
+latestReleasedVersion=18.0.0
diff --git a/appcheck/firebase-appcheck-debug-testing/src/main/AndroidManifest.xml b/appcheck/firebase-appcheck-debug-testing/src/main/AndroidManifest.xml
index 3426ff98472..b47f8ebc903 100644
--- a/appcheck/firebase-appcheck-debug-testing/src/main/AndroidManifest.xml
+++ b/appcheck/firebase-appcheck-debug-testing/src/main/AndroidManifest.xml
@@ -13,8 +13,14 @@
 <!-- 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="com.google.firebase.appcheck.debug.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="16"/>-->
+  <!--<uses-sdk android:minSdkVersion="21"/>-->
+  <application>
+    <service android:name="com.google.firebase.components.ComponentDiscoveryService"
+        android:exported="false">
+      <meta-data android:name="com.google.firebase.components:com.google.firebase.appcheck.debug.testing.FirebaseAppCheckDebugTestingRegistrar"
+          android:value="com.google.firebase.components.ComponentRegistrar" />
+    </service>
+  </application>
 </manifest>
diff --git a/appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/testing/DebugAppCheckTestHelper.java b/appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/testing/DebugAppCheckTestHelper.java
index 82562258bf3..6473c636d78 100644
--- a/appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/testing/DebugAppCheckTestHelper.java
+++ b/appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/testing/DebugAppCheckTestHelper.java
@@ -15,13 +15,11 @@
 package com.google.firebase.appcheck.debug.testing;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
 import androidx.test.platform.app.InstrumentationRegistry;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.appcheck.AppCheckProviderFactory;
 import com.google.firebase.appcheck.FirebaseAppCheck;
 import com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory;
-import com.google.firebase.appcheck.debug.DebugAppCheckProviderFactoryHelper;
 import com.google.firebase.appcheck.internal.DefaultFirebaseAppCheck;
 
 /**
@@ -66,28 +64,16 @@
  * </pre>
  */
 public final class DebugAppCheckTestHelper {
-  private static final String DEBUG_SECRET_KEY = "firebaseAppCheckDebugSecret";
-
-  private final String debugSecret;
-
   /**
-   * Creates a {@link DebugAppCheckTestHelper} instance with the debug secret obtained from {@link
-   * InstrumentationRegistry} arguments.
+   * Creates a {@link DebugAppCheckTestHelper} instance with a debug secret obtained from <br>
+   * {@link InstrumentationRegistry} arguments.
    */
   @NonNull
   public static DebugAppCheckTestHelper fromInstrumentationArgs() {
-    String debugSecret = InstrumentationRegistry.getArguments().getString(DEBUG_SECRET_KEY);
-    return new DebugAppCheckTestHelper(debugSecret);
+    return new DebugAppCheckTestHelper();
   }
 
-  @VisibleForTesting
-  static DebugAppCheckTestHelper fromString(String debugSecret) {
-    return new DebugAppCheckTestHelper(debugSecret);
-  }
-
-  private DebugAppCheckTestHelper(String debugSecret) {
-    this.debugSecret = debugSecret;
-  }
+  private DebugAppCheckTestHelper() {}
 
   /**
    * Installs a {@link DebugAppCheckProviderFactory} to the default {@link FirebaseApp} and runs the
@@ -109,8 +95,7 @@ public <E extends Throwable> void withDebugProvider(
         (DefaultFirebaseAppCheck) FirebaseAppCheck.getInstance(firebaseApp);
     AppCheckProviderFactory currentAppCheckProviderFactory =
         firebaseAppCheck.getInstalledAppCheckProviderFactory();
-    firebaseAppCheck.installAppCheckProviderFactory(
-        DebugAppCheckProviderFactoryHelper.createDebugAppCheckProviderFactory(debugSecret));
+    firebaseAppCheck.installAppCheckProviderFactory(DebugAppCheckProviderFactory.getInstance());
     try {
       runnable.run();
     } catch (Throwable throwable) {
diff --git a/appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/testing/DebugSecretProvider.java b/appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/testing/DebugSecretProvider.java
new file mode 100644
index 00000000000..c4c0caf74eb
--- /dev/null
+++ b/appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/testing/DebugSecretProvider.java
@@ -0,0 +1,35 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck.debug.testing;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import com.google.firebase.appcheck.debug.InternalDebugSecretProvider;
+
+/** @hide */
+public class DebugSecretProvider implements InternalDebugSecretProvider {
+  private static final String DEBUG_SECRET_KEY = "firebaseAppCheckDebugSecret";
+
+  DebugSecretProvider() {}
+
+  /**
+   * Returns a debug secret from {@link InstrumentationRegistry} arguments to be used with the
+   * {@link com.google.firebase.appcheck.debug.internal.DebugAppCheckProvider} in continuous
+   * integration testing flows.
+   */
+  @Override
+  public String getDebugSecret() {
+    return InstrumentationRegistry.getArguments().getString(DEBUG_SECRET_KEY);
+  }
+}
diff --git a/appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/testing/FirebaseAppCheckDebugTestingRegistrar.java b/appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/testing/FirebaseAppCheckDebugTestingRegistrar.java
new file mode 100644
index 00000000000..d1951beb185
--- /dev/null
+++ b/appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/testing/FirebaseAppCheckDebugTestingRegistrar.java
@@ -0,0 +1,45 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck.debug.testing;
+
+import com.google.android.gms.common.annotation.KeepForSdk;
+import com.google.firebase.appcheck.debug.BuildConfig;
+import com.google.firebase.appcheck.debug.InternalDebugSecretProvider;
+import com.google.firebase.components.Component;
+import com.google.firebase.components.ComponentRegistrar;
+import com.google.firebase.platforminfo.LibraryVersionComponent;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * {@link ComponentRegistrar} for setting up FirebaseAppCheck debug testing's dependency injections
+ * in Firebase Android Components.
+ *
+ * @hide
+ */
+@KeepForSdk
+public class FirebaseAppCheckDebugTestingRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-app-check-debug-testing";
+
+  @Override
+  public List<Component<?>> getComponents() {
+    return Arrays.asList(
+        Component.builder(DebugSecretProvider.class, (InternalDebugSecretProvider.class))
+            .name(LIBRARY_NAME)
+            .factory((container) -> new DebugSecretProvider())
+            .build(),
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
+  }
+}
diff --git a/appcheck/firebase-appcheck-debug-testing/src/test/java/com/google/firebase/appcheck/debug/testing/DebugAppCheckTestHelperTest.java b/appcheck/firebase-appcheck-debug-testing/src/test/java/com/google/firebase/appcheck/debug/testing/DebugAppCheckTestHelperTest.java
index 5e27218d25c..bf9224d3cb1 100644
--- a/appcheck/firebase-appcheck-debug-testing/src/test/java/com/google/firebase/appcheck/debug/testing/DebugAppCheckTestHelperTest.java
+++ b/appcheck/firebase-appcheck-debug-testing/src/test/java/com/google/firebase/appcheck/debug/testing/DebugAppCheckTestHelperTest.java
@@ -23,7 +23,7 @@
 import com.google.firebase.appcheck.FirebaseAppCheck;
 import com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory;
 import com.google.firebase.appcheck.internal.DefaultFirebaseAppCheck;
-import com.google.firebase.appcheck.safetynet.SafetyNetAppCheckProviderFactory;
+import com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,10 +35,9 @@ public class DebugAppCheckTestHelperTest {
   private static final String PROJECT_ID = "projectId";
   private static final String APP_ID = "appId";
   private static final String OTHER_FIREBASE_APP_NAME = "otherFirebaseAppName";
-  private static final String DEBUG_SECRET = "debugSecret";
 
   private final DebugAppCheckTestHelper debugAppCheckTestHelper =
-      DebugAppCheckTestHelper.fromString(DEBUG_SECRET);
+      DebugAppCheckTestHelper.fromInstrumentationArgs();
 
   @Before
   public void setUp() {
@@ -52,11 +51,12 @@ public void setUp() {
   public void testDebugAppCheckTestHelper_withDebugProviderDefaultApp_installsDebugProvider() {
     DefaultFirebaseAppCheck firebaseAppCheck =
         (DefaultFirebaseAppCheck) FirebaseAppCheck.getInstance();
-    firebaseAppCheck.installAppCheckProviderFactory(SafetyNetAppCheckProviderFactory.getInstance());
+    firebaseAppCheck.installAppCheckProviderFactory(
+        PlayIntegrityAppCheckProviderFactory.getInstance());
 
     // Sanity check
     assertThat(firebaseAppCheck.getInstalledAppCheckProviderFactory())
-        .isEqualTo(SafetyNetAppCheckProviderFactory.getInstance());
+        .isEqualTo(PlayIntegrityAppCheckProviderFactory.getInstance());
 
     debugAppCheckTestHelper.withDebugProvider(
         () -> {
@@ -66,7 +66,7 @@ public void testDebugAppCheckTestHelper_withDebugProviderDefaultApp_installsDebu
 
     // Make sure the factory is reset.
     assertThat(firebaseAppCheck.getInstalledAppCheckProviderFactory())
-        .isEqualTo(SafetyNetAppCheckProviderFactory.getInstance());
+        .isEqualTo(PlayIntegrityAppCheckProviderFactory.getInstance());
   }
 
   @Test
@@ -74,11 +74,12 @@ public void testDebugAppCheckTestHelper_withDebugProviderNamedApp_installsDebugP
     FirebaseApp firebaseApp = FirebaseApp.getInstance(OTHER_FIREBASE_APP_NAME);
     DefaultFirebaseAppCheck firebaseAppCheck =
         (DefaultFirebaseAppCheck) FirebaseAppCheck.getInstance(firebaseApp);
-    firebaseAppCheck.installAppCheckProviderFactory(SafetyNetAppCheckProviderFactory.getInstance());
+    firebaseAppCheck.installAppCheckProviderFactory(
+        PlayIntegrityAppCheckProviderFactory.getInstance());
 
     // Sanity check
     assertThat(firebaseAppCheck.getInstalledAppCheckProviderFactory())
-        .isEqualTo(SafetyNetAppCheckProviderFactory.getInstance());
+        .isEqualTo(PlayIntegrityAppCheckProviderFactory.getInstance());
 
     debugAppCheckTestHelper.withDebugProvider(
         firebaseApp,
@@ -89,7 +90,7 @@ public void testDebugAppCheckTestHelper_withDebugProviderNamedApp_installsDebugP
 
     // Make sure the factory is reset.
     assertThat(firebaseAppCheck.getInstalledAppCheckProviderFactory())
-        .isEqualTo(SafetyNetAppCheckProviderFactory.getInstance());
+        .isEqualTo(PlayIntegrityAppCheckProviderFactory.getInstance());
   }
 
   @Test
@@ -102,10 +103,9 @@ public void testDebugAppCheckTestHelper_withDebugProviderNamedApp_installsDebugP
     assertThat(firebaseAppCheck.getInstalledAppCheckProviderFactory()).isNull();
 
     debugAppCheckTestHelper.withDebugProvider(
-        () -> {
-          assertThat(firebaseAppCheck.getInstalledAppCheckProviderFactory())
-              .isInstanceOf(DebugAppCheckProviderFactory.class);
-        });
+        () ->
+            assertThat(firebaseAppCheck.getInstalledAppCheckProviderFactory())
+                .isInstanceOf(DebugAppCheckProviderFactory.class));
 
     // Make sure the factory is reset.
     assertThat(firebaseAppCheck.getInstalledAppCheckProviderFactory()).isNull();
diff --git a/appcheck/firebase-appcheck-debug-testing/src/test/java/com/google/firebase/appcheck/debug/testing/FirebaseAppCheckDebugTestingRegistrarTest.java b/appcheck/firebase-appcheck-debug-testing/src/test/java/com/google/firebase/appcheck/debug/testing/FirebaseAppCheckDebugTestingRegistrarTest.java
new file mode 100644
index 00000000000..05eadd44d4b
--- /dev/null
+++ b/appcheck/firebase-appcheck-debug-testing/src/test/java/com/google/firebase/appcheck/debug/testing/FirebaseAppCheckDebugTestingRegistrarTest.java
@@ -0,0 +1,38 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck.debug.testing;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.firebase.components.Component;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link FirebaseAppCheckDebugTestingRegistrar}. */
+@RunWith(RobolectricTestRunner.class)
+public class FirebaseAppCheckDebugTestingRegistrarTest {
+  @Test
+  public void testGetComponents() {
+    FirebaseAppCheckDebugTestingRegistrar registrar = new FirebaseAppCheckDebugTestingRegistrar();
+    List<Component<?>> components = registrar.getComponents();
+    assertThat(components).isNotEmpty();
+    assertThat(components).hasSize(2);
+    Component<?> appCheckDebugTestingComponent = components.get(0);
+    assertThat(appCheckDebugTestingComponent.getDependencies()).isEmpty();
+    assertThat(appCheckDebugTestingComponent.isLazy()).isTrue();
+  }
+}
diff --git a/appcheck/firebase-appcheck-debug/CHANGELOG.md b/appcheck/firebase-appcheck-debug/CHANGELOG.md
new file mode 100644
index 00000000000..ced2dde64d0
--- /dev/null
+++ b/appcheck/firebase-appcheck-debug/CHANGELOG.md
@@ -0,0 +1,69 @@
+# Unreleased
+
+
+# 18.0.0
+* [changed] Bump internal dependencies
+
+# 17.1.2
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 17.1.1
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 17.1.0
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 17.0.0
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 16.1.2
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 16.1.1
+* [changed] Migrated [app_check] SDKs to use standard Firebase executors.
+  (GitHub [#4431](//github.com/firebase/firebase-android-sdk/issues/4431){: .external}
+  and
+  [#4449](//github.com/firebase/firebase-android-sdk/issues/4449){: .external})
+* [changed] Integrated the [app_check] Debug SDK with Firebase components.
+  (GitHub [#4436](//github.com/firebase/firebase-android-sdk/issues/4436){: .external})
+* [changed] Moved Task continuations off the main thread.
+  (GitHub [#4453](//github.com/firebase/firebase-android-sdk/issues/4453){: .external})
+
+# 16.1.0
+* [unchanged] Updated to accommodate the release of the updated
+  [app_check] Kotlin extensions library.
+
+# 16.0.1
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+# 16.0.0
+* [changed] [app_check] has exited beta and is now generally available for
+  use.
+
+# 16.0.0-beta06
+* [fixed] Fixed a bug in the [app_check] token refresh flow when using a
+  custom provider.
+
+# 16.0.0-beta05
+* [changed] Internal improvements.
+
+# 16.0.0-beta04
+* [changed] Improved error handling logic by minimizing the amount of requests
+  that are unlikely to succeed.
+* [fixed] Fixed heartbeat reporting.
+
+# 16.0.0-beta03
+* [changed] Added `X-Android-Package` and `X-Android-Cert` request headers to
+  [app_check] network calls.
+
+# 16.0.0-beta02
+* [feature] Added [`getAppCheckToken()`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck#getAppCheckToken(boolean)),
+  [`AppCheckTokenListener`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck.AppCheckListener),
+  and associated setters and removers for developers to request and observe
+  changes to the [app_check] token.
+
+# 16.0.0-beta01
+* [feature] Initial beta release of the [app_check] Debug SDK with abuse
+  reduction features.
+
diff --git a/appcheck/firebase-appcheck-debug/api.txt b/appcheck/firebase-appcheck-debug/api.txt
new file mode 100644
index 00000000000..a98578ea9da
--- /dev/null
+++ b/appcheck/firebase-appcheck-debug/api.txt
@@ -0,0 +1,10 @@
+// Signature format: 2.0
+package com.google.firebase.appcheck.debug {
+
+  public class DebugAppCheckProviderFactory implements com.google.firebase.appcheck.AppCheckProviderFactory {
+    method @NonNull public com.google.firebase.appcheck.AppCheckProvider create(@NonNull com.google.firebase.FirebaseApp);
+    method @NonNull public static com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory getInstance();
+  }
+
+}
+
diff --git a/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle b/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
index 80cad7da537..d92893190ac 100644
--- a/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
+++ b/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
@@ -17,6 +17,7 @@ plugins {
 }
 
 firebaseLibrary {
+    libraryGroup "appcheck"
     publishSources = true
 }
 
@@ -25,7 +26,8 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.appcheck.debug"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
@@ -41,18 +43,25 @@ android {
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':appcheck:firebase-appcheck')
+    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+
+    api project(':appcheck:firebase-appcheck')
+    api 'com.google.firebase:firebase-annotations:16.2.0'
+    api 'com.google.firebase:firebase-common:21.0.0'
+    api 'com.google.firebase:firebase-common-ktx:21.0.0'
+    api 'com.google.firebase:firebase-components:18.0.0'
+
     implementation 'com.google.android.gms:play-services-base:18.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
 
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
-
+    testImplementation(project(":integ-testing")){
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation 'androidx.test:rules:1.2.0'
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'junit:junit:4.13-beta-2'
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'androidx.test:rules:1.2.0'
 }
diff --git a/appcheck/firebase-appcheck-debug/gradle.properties b/appcheck/firebase-appcheck-debug/gradle.properties
index 671ce6a5ae5..9b7be4891d1 100644
--- a/appcheck/firebase-appcheck-debug/gradle.properties
+++ b/appcheck/firebase-appcheck-debug/gradle.properties
@@ -1 +1,2 @@
-version=16.0.1
+version=18.0.1
+latestReleasedVersion=18.0.0
diff --git a/appcheck/firebase-appcheck-debug/src/main/AndroidManifest.xml b/appcheck/firebase-appcheck-debug/src/main/AndroidManifest.xml
index 8a9c55b0be3..1366ef5d185 100644
--- a/appcheck/firebase-appcheck-debug/src/main/AndroidManifest.xml
+++ b/appcheck/firebase-appcheck-debug/src/main/AndroidManifest.xml
@@ -13,8 +13,14 @@
 <!-- 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="com.google.firebase.appcheck.debug">
+<manifest  xmlns:android="http://schemas.android.com/apk/res/android">
   <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="16"/>-->
+  <!--<uses-sdk android:minSdkVersion="21"/>-->
+  <application>
+    <service android:name="com.google.firebase.components.ComponentDiscoveryService"
+        android:exported="false">
+      <meta-data android:name="com.google.firebase.components:com.google.firebase.appcheck.debug.FirebaseAppCheckDebugRegistrar"
+          android:value="com.google.firebase.components.ComponentRegistrar" />
+    </service>
+  </application>
 </manifest>
diff --git a/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/DebugAppCheckProviderFactory.java b/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/DebugAppCheckProviderFactory.java
index d2135dc78d8..a2f4b148439 100644
--- a/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/DebugAppCheckProviderFactory.java
+++ b/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/DebugAppCheckProviderFactory.java
@@ -18,35 +18,23 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.appcheck.AppCheckProvider;
 import com.google.firebase.appcheck.AppCheckProviderFactory;
+import com.google.firebase.appcheck.FirebaseAppCheck;
 import com.google.firebase.appcheck.debug.internal.DebugAppCheckProvider;
 
 /**
- * Implementation of an {@link AppCheckProviderFactory} that builds {@link DebugAppCheckProvider}s.
+ * Implementation of an {@link AppCheckProviderFactory} that builds {@code DebugAppCheckProvider}s.
  */
 public class DebugAppCheckProviderFactory implements AppCheckProviderFactory {
 
   private static final DebugAppCheckProviderFactory instance = new DebugAppCheckProviderFactory();
 
-  private String debugSecret;
-
-  private DebugAppCheckProviderFactory() {
-    this.debugSecret = null;
-  }
-
-  /**
-   * This constructor is package-private in order to prevent debug secrets from being hard-coded in
-   * application logic. This constructor is used by the firebase-appcheck-debug-testing SDK, to
-   * inject debug secrets in integration tests.
-   */
-  DebugAppCheckProviderFactory(String debugSecret) {
-    this.debugSecret = debugSecret;
-  }
+  private DebugAppCheckProviderFactory() {}
 
   /**
-   * Gets an instance of this class for installation into a {@link
-   * com.google.firebase.appcheck.FirebaseAppCheck} instance. If no debug secret is found in {@link
-   * android.content.SharedPreferences}, a new debug secret will be generated and printed to the
-   * logcat. The debug secret should then be added to the allow list in the Firebase Console.
+   * Gets an instance of this class for installation into a {@link FirebaseAppCheck} instance. If no
+   * debug secret is found in {@link android.content.SharedPreferences}, a new debug secret will be
+   * generated and printed to the logcat. The debug secret should then be added to the allow list in
+   * the Firebase Console.
    */
   @NonNull
   public static DebugAppCheckProviderFactory getInstance() {
@@ -55,7 +43,8 @@ public static DebugAppCheckProviderFactory getInstance() {
 
   @NonNull
   @Override
+  @SuppressWarnings("FirebaseUseExplicitDependencies")
   public AppCheckProvider create(@NonNull FirebaseApp firebaseApp) {
-    return new DebugAppCheckProvider(firebaseApp, debugSecret);
+    return firebaseApp.get(DebugAppCheckProvider.class);
   }
 }
diff --git a/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/FirebaseAppCheckDebugRegistrar.java b/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/FirebaseAppCheckDebugRegistrar.java
new file mode 100644
index 00000000000..9eb96cd0891
--- /dev/null
+++ b/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/FirebaseAppCheckDebugRegistrar.java
@@ -0,0 +1,67 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck.debug;
+
+import com.google.android.gms.common.annotation.KeepForSdk;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appcheck.debug.internal.DebugAppCheckProvider;
+import com.google.firebase.components.Component;
+import com.google.firebase.components.ComponentRegistrar;
+import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import com.google.firebase.platforminfo.LibraryVersionComponent;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Executor;
+
+/**
+ * {@link ComponentRegistrar} for setting up FirebaseAppCheck debug's dependency injections in
+ * Firebase Android Components.
+ *
+ * @hide
+ */
+@KeepForSdk
+public class FirebaseAppCheckDebugRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-app-check-debug";
+
+  @Override
+  public List<Component<?>> getComponents() {
+    Qualified<Executor> liteExecutor = Qualified.qualified(Lightweight.class, Executor.class);
+    Qualified<Executor> backgroundExecutor = Qualified.qualified(Background.class, Executor.class);
+    Qualified<Executor> blockingExecutor = Qualified.qualified(Blocking.class, Executor.class);
+
+    return Arrays.asList(
+        Component.builder(DebugAppCheckProvider.class)
+            .name(LIBRARY_NAME)
+            .add(Dependency.required(FirebaseApp.class))
+            .add(Dependency.optionalProvider(InternalDebugSecretProvider.class))
+            .add(Dependency.required(liteExecutor))
+            .add(Dependency.required(backgroundExecutor))
+            .add(Dependency.required(blockingExecutor))
+            .factory(
+                (container) ->
+                    new DebugAppCheckProvider(
+                        container.get(FirebaseApp.class),
+                        container.getProvider(InternalDebugSecretProvider.class),
+                        container.get(liteExecutor),
+                        container.get(backgroundExecutor),
+                        container.get(blockingExecutor)))
+            .build(),
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
+  }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/Settings.java b/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/InternalDebugSecretProvider.java
similarity index 61%
rename from firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/Settings.java
rename to appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/InternalDebugSecretProvider.java
index c74b2e6d851..7b3a196abc4 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/Settings.java
+++ b/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/InternalDebugSecretProvider.java
@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,18 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.crashlytics.internal.settings.model;
+package com.google.firebase.appcheck.debug;
 
-public interface Settings {
-  SessionSettingsData getSessionData();
+import androidx.annotation.Nullable;
 
-  FeaturesSettingsData getFeaturesData();
-
-  long getExpiresAtMillis();
-
-  int getSettingsVersion();
-
-  int getCacheDuration();
-
-  boolean isExpired(long currentTimeMillis);
+/**
+ * An interface for obtaining a debug secret to be used with {@link
+ * com.google.firebase.appcheck.debug.internal.DebugAppCheckProvider}.
+ *
+ * @hide
+ */
+public interface InternalDebugSecretProvider {
+  @Nullable
+  String getDebugSecret();
 }
diff --git a/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/internal/DebugAppCheckProvider.java b/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/internal/DebugAppCheckProvider.java
index 4f23d52951a..443b126db92 100644
--- a/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/internal/DebugAppCheckProvider.java
+++ b/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/internal/DebugAppCheckProvider.java
@@ -18,22 +18,23 @@
 
 import android.util.Log;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
 import com.google.firebase.appcheck.AppCheckProvider;
 import com.google.firebase.appcheck.AppCheckToken;
-import com.google.firebase.appcheck.internal.AppCheckTokenResponse;
+import com.google.firebase.appcheck.debug.InternalDebugSecretProvider;
 import com.google.firebase.appcheck.internal.DefaultAppCheckToken;
 import com.google.firebase.appcheck.internal.NetworkClient;
 import com.google.firebase.appcheck.internal.RetryManager;
+import com.google.firebase.inject.Provider;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.Executor;
 
 public class DebugAppCheckProvider implements AppCheckProvider {
 
@@ -41,18 +42,30 @@ public class DebugAppCheckProvider implements AppCheckProvider {
   private static final String UTF_8 = "UTF-8";
 
   private final NetworkClient networkClient;
-  private final ExecutorService backgroundExecutor;
+  private final Executor liteExecutor;
+  private final Executor blockingExecutor;
   private final RetryManager retryManager;
   private final Task<String> debugSecretTask;
 
-  public DebugAppCheckProvider(@NonNull FirebaseApp firebaseApp, @Nullable String debugSecret) {
+  public DebugAppCheckProvider(
+      @NonNull FirebaseApp firebaseApp,
+      @NonNull Provider<InternalDebugSecretProvider> debugSecretProvider,
+      @Lightweight Executor liteExecutor,
+      @Background Executor backgroundExecutor,
+      @Blocking Executor blockingExecutor) {
     checkNotNull(firebaseApp);
     this.networkClient = new NetworkClient(firebaseApp);
-    this.backgroundExecutor = Executors.newCachedThreadPool();
+    this.liteExecutor = liteExecutor;
+    this.blockingExecutor = blockingExecutor;
     this.retryManager = new RetryManager();
+
+    String debugSecret = null;
+    if (debugSecretProvider.get() != null) {
+      debugSecret = debugSecretProvider.get().getDebugSecret();
+    }
     this.debugSecretTask =
         debugSecret == null
-            ? determineDebugSecret(firebaseApp, this.backgroundExecutor)
+            ? determineDebugSecret(firebaseApp, backgroundExecutor)
             : Tasks.forResult(debugSecret);
   }
 
@@ -60,10 +73,12 @@ public DebugAppCheckProvider(@NonNull FirebaseApp firebaseApp, @Nullable String
   DebugAppCheckProvider(
       @NonNull String debugSecret,
       @NonNull NetworkClient networkClient,
-      @NonNull ExecutorService backgroundExecutor,
+      @NonNull Executor liteExecutor,
+      @NonNull Executor blockingExecutor,
       @NonNull RetryManager retryManager) {
     this.networkClient = networkClient;
-    this.backgroundExecutor = backgroundExecutor;
+    this.liteExecutor = liteExecutor;
+    this.blockingExecutor = blockingExecutor;
     this.retryManager = retryManager;
     this.debugSecretTask = Tasks.forResult(debugSecret);
   }
@@ -71,7 +86,7 @@ public DebugAppCheckProvider(@NonNull FirebaseApp firebaseApp, @Nullable String
   @VisibleForTesting
   @NonNull
   static Task<String> determineDebugSecret(
-      @NonNull FirebaseApp firebaseApp, @NonNull ExecutorService executor) {
+      @NonNull FirebaseApp firebaseApp, @NonNull Executor executor) {
     TaskCompletionSource<String> taskCompletionSource = new TaskCompletionSource<>();
     executor.execute(
         () -> {
@@ -96,31 +111,21 @@ static Task<String> determineDebugSecret(
   @Override
   public Task<AppCheckToken> getToken() {
     return debugSecretTask
-        .continueWithTask(
-            new Continuation<String, Task<AppCheckTokenResponse>>() {
-              @Override
-              public Task<AppCheckTokenResponse> then(@NonNull Task<String> task) throws Exception {
-                ExchangeDebugTokenRequest request = new ExchangeDebugTokenRequest(task.getResult());
-                return Tasks.call(
-                    backgroundExecutor,
-                    () ->
-                        networkClient.exchangeAttestationForAppCheckToken(
-                            request.toJsonString().getBytes(UTF_8),
-                            NetworkClient.DEBUG,
-                            retryManager));
-              }
+        .onSuccessTask(
+            liteExecutor,
+            debugSecret -> {
+              ExchangeDebugTokenRequest request = new ExchangeDebugTokenRequest(debugSecret);
+              return Tasks.call(
+                  blockingExecutor,
+                  () ->
+                      networkClient.exchangeAttestationForAppCheckToken(
+                          request.toJsonString().getBytes(UTF_8),
+                          NetworkClient.DEBUG,
+                          retryManager));
             })
-        .continueWithTask(
-            new Continuation<AppCheckTokenResponse, Task<AppCheckToken>>() {
-              @Override
-              public Task<AppCheckToken> then(@NonNull Task<AppCheckTokenResponse> task) {
-                if (task.isSuccessful()) {
-                  return Tasks.forResult(
-                      DefaultAppCheckToken.constructFromAppCheckTokenResponse(task.getResult()));
-                }
-                // TODO: Surface more error details.
-                return Tasks.forException(task.getException());
-              }
-            });
+        .onSuccessTask(
+            liteExecutor,
+            response ->
+                Tasks.forResult(DefaultAppCheckToken.constructFromAppCheckTokenResponse(response)));
   }
 }
diff --git a/appcheck/firebase-appcheck-debug/src/test/java/com/google/firebase/appcheck/debug/FirebaseAppCheckDebugRegistrarTest.java b/appcheck/firebase-appcheck-debug/src/test/java/com/google/firebase/appcheck/debug/FirebaseAppCheckDebugRegistrarTest.java
new file mode 100644
index 00000000000..70301ee2eab
--- /dev/null
+++ b/appcheck/firebase-appcheck-debug/src/test/java/com/google/firebase/appcheck/debug/FirebaseAppCheckDebugRegistrarTest.java
@@ -0,0 +1,51 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck.debug;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.components.Component;
+import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import java.util.List;
+import java.util.concurrent.Executor;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link FirebaseAppCheckDebugRegistrar}. */
+@RunWith(RobolectricTestRunner.class)
+public class FirebaseAppCheckDebugRegistrarTest {
+  @Test
+  public void testGetComponents() {
+    FirebaseAppCheckDebugRegistrar registrar = new FirebaseAppCheckDebugRegistrar();
+    List<Component<?>> components = registrar.getComponents();
+    assertThat(components).isNotEmpty();
+    assertThat(components).hasSize(2);
+    Component<?> appCheckDebugComponent = components.get(0);
+    assertThat(appCheckDebugComponent.getDependencies())
+        .containsExactly(
+            Dependency.required(FirebaseApp.class),
+            Dependency.optionalProvider(InternalDebugSecretProvider.class),
+            Dependency.required(Qualified.qualified(Lightweight.class, Executor.class)),
+            Dependency.required(Qualified.qualified(Background.class, Executor.class)),
+            Dependency.required(Qualified.qualified(Blocking.class, Executor.class)));
+    assertThat(appCheckDebugComponent.isLazy()).isTrue();
+  }
+}
diff --git a/appcheck/firebase-appcheck-debug/src/test/java/com/google/firebase/appcheck/debug/internal/DebugAppCheckProviderTest.java b/appcheck/firebase-appcheck-debug/src/test/java/com/google/firebase/appcheck/debug/internal/DebugAppCheckProviderTest.java
index c3c3b200db5..d7680b94b56 100644
--- a/appcheck/firebase-appcheck-debug/src/test/java/com/google/firebase/appcheck/debug/internal/DebugAppCheckProviderTest.java
+++ b/appcheck/firebase-appcheck-debug/src/test/java/com/google/firebase/appcheck/debug/internal/DebugAppCheckProviderTest.java
@@ -33,8 +33,9 @@
 import com.google.firebase.appcheck.internal.DefaultAppCheckToken;
 import com.google.firebase.appcheck.internal.NetworkClient;
 import com.google.firebase.appcheck.internal.RetryManager;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import java.io.IOException;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executor;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,14 +44,16 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
 
 /** Tests for {@link DebugAppCheckProvider}. */
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
+@LooperMode(LooperMode.Mode.LEGACY)
 public class DebugAppCheckProviderTest {
 
   private static final String DEBUG_SECRET = "debugSecret";
-  private static final String ATTESTATION_TOKEN = "token";
+  private static final String APP_CHECK_TOKEN = "appCheckToken";
   private static final String TIME_TO_LIVE = "3600s";
   private static final String API_KEY = "apiKey";
   private static final String APP_ID = "appId";
@@ -70,7 +73,10 @@ public class DebugAppCheckProviderTest {
 
   private StorageHelper storageHelper;
   private SharedPreferences sharedPreferences;
-  private ExecutorService backgroundExecutor = MoreExecutors.newDirectExecutorService();
+  // TODO(b/258273630): Use TestOnlyExecutors instead of MoreExecutors.directExecutor().
+  private Executor liteExecutor = MoreExecutors.directExecutor();
+  private Executor backgroundExecutor = MoreExecutors.directExecutor();
+  private Executor blockingExecutor = MoreExecutors.directExecutor();
 
   @Before
   public void setup() {
@@ -98,7 +104,12 @@ public void testPublicConstructor_nullFirebaseApp_expectThrows() {
     assertThrows(
         NullPointerException.class,
         () -> {
-          new DebugAppCheckProvider(null, null);
+          new DebugAppCheckProvider(
+              null,
+              null,
+              TestOnlyExecutors.lite(),
+              TestOnlyExecutors.background(),
+              TestOnlyExecutors.blocking());
         });
   }
 
@@ -128,12 +139,12 @@ public void exchangeDebugToken_onSuccess_setsTaskResult() throws Exception {
     when(mockNetworkClient.exchangeAttestationForAppCheckToken(
             any(), eq(NetworkClient.DEBUG), eq(mockRetryManager)))
         .thenReturn(mockAppCheckTokenResponse);
-    when(mockAppCheckTokenResponse.getAttestationToken()).thenReturn(ATTESTATION_TOKEN);
+    when(mockAppCheckTokenResponse.getToken()).thenReturn(APP_CHECK_TOKEN);
     when(mockAppCheckTokenResponse.getTimeToLive()).thenReturn(TIME_TO_LIVE);
 
     DebugAppCheckProvider provider =
         new DebugAppCheckProvider(
-            DEBUG_SECRET, mockNetworkClient, backgroundExecutor, mockRetryManager);
+            DEBUG_SECRET, mockNetworkClient, liteExecutor, blockingExecutor, mockRetryManager);
     Task<AppCheckToken> task = provider.getToken();
 
     verify(mockNetworkClient)
@@ -141,7 +152,7 @@ public void exchangeDebugToken_onSuccess_setsTaskResult() throws Exception {
 
     AppCheckToken token = task.getResult();
     assertThat(token).isInstanceOf(DefaultAppCheckToken.class);
-    assertThat(token.getToken()).isEqualTo(ATTESTATION_TOKEN);
+    assertThat(token.getToken()).isEqualTo(APP_CHECK_TOKEN);
   }
 
   @Test
@@ -152,7 +163,7 @@ public void exchangeDebugToken_onFailure_setsTaskException() throws Exception {
 
     DebugAppCheckProvider provider =
         new DebugAppCheckProvider(
-            DEBUG_SECRET, mockNetworkClient, backgroundExecutor, mockRetryManager);
+            DEBUG_SECRET, mockNetworkClient, liteExecutor, blockingExecutor, mockRetryManager);
     Task<AppCheckToken> task = provider.getToken();
 
     verify(mockNetworkClient)
diff --git a/appcheck/firebase-appcheck-interop/CHANGELOG.md b/appcheck/firebase-appcheck-interop/CHANGELOG.md
new file mode 100644
index 00000000000..f514bbb890e
--- /dev/null
+++ b/appcheck/firebase-appcheck-interop/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Unreleased
+
+
diff --git a/appcheck/firebase-appcheck-interop/api.txt b/appcheck/firebase-appcheck-interop/api.txt
new file mode 100644
index 00000000000..4ad12343fcf
--- /dev/null
+++ b/appcheck/firebase-appcheck-interop/api.txt
@@ -0,0 +1,19 @@
+// Signature format: 2.0
+package com.google.firebase.appcheck {
+
+  public abstract class AppCheckTokenResult {
+    ctor public AppCheckTokenResult();
+    method @Nullable public abstract Exception getError();
+    method @NonNull public abstract String getToken();
+  }
+
+}
+
+package com.google.firebase.appcheck.interop {
+
+  public interface AppCheckTokenListener {
+    method public void onAppCheckTokenChanged(@NonNull com.google.firebase.appcheck.AppCheckTokenResult);
+  }
+
+}
+
diff --git a/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle b/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle
index a916b61250f..eeadcd3ea16 100644
--- a/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle
+++ b/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle
@@ -19,6 +19,7 @@ plugins {
 firebaseLibrary {
     publishSources = true
     publishJavadoc = false
+    publishReleaseNotes = false
 }
 
 android {
@@ -26,7 +27,8 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.appcheck.interop"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
@@ -42,15 +44,13 @@ android {
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
     implementation 'com.google.android.gms:play-services-base:18.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
 
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation 'androidx.test:rules:1.2.0'
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'androidx.test:rules:1.2.0'
 }
diff --git a/appcheck/firebase-appcheck-interop/gradle.properties b/appcheck/firebase-appcheck-interop/gradle.properties
index 6d884a28d65..0b498a0491d 100644
--- a/appcheck/firebase-appcheck-interop/gradle.properties
+++ b/appcheck/firebase-appcheck-interop/gradle.properties
@@ -1,2 +1,2 @@
-version=16.0.1
-latestReleasedVersion=16.0.0-beta02
+version=18.0.0
+latestReleasedVersion=17.1.0
diff --git a/appcheck/firebase-appcheck-interop/src/main/AndroidManifest.xml b/appcheck/firebase-appcheck-interop/src/main/AndroidManifest.xml
index 4e8353021db..bcdf9a2c8cb 100644
--- a/appcheck/firebase-appcheck-interop/src/main/AndroidManifest.xml
+++ b/appcheck/firebase-appcheck-interop/src/main/AndroidManifest.xml
@@ -13,9 +13,8 @@
 <!-- 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="com.google.firebase.appcheck.interop">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application />
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/AppCheckTokenResult.java b/appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/AppCheckTokenResult.java
index 06d49d163a7..fd183d40292 100644
--- a/appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/AppCheckTokenResult.java
+++ b/appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/AppCheckTokenResult.java
@@ -16,13 +16,12 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.firebase.FirebaseException;
 
 /**
  * Class to hold the result emitted by a Firebase App Check service application verification
  * attempt. The result will always contain a token, which will either be a valid raw JWT attesting
- * application identity, or a dummy value. The result may optionally contain a {@link
- * FirebaseException} if application verification does not succeed.
+ * application identity, or a dummy value. The result may optionally contain an {@link Exception} if
+ * application verification does not succeed.
  */
 public abstract class AppCheckTokenResult {
 
@@ -34,9 +33,9 @@ public abstract class AppCheckTokenResult {
   public abstract String getToken();
 
   /**
-   * Returns the {@link FirebaseException} if the {@link
-   * com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider} failed to obtain a token.
+   * Returns the {@link Exception} if the {@link
+   * com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider} failed to obtain a token.
    */
   @Nullable
-  public abstract FirebaseException getError();
+  public abstract Exception getError();
 }
diff --git a/appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InternalAppCheckTokenProvider.java b/appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InteropAppCheckTokenProvider.java
similarity index 78%
rename from appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InternalAppCheckTokenProvider.java
rename to appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InteropAppCheckTokenProvider.java
index c8179322994..1fde5c7c8cb 100644
--- a/appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InternalAppCheckTokenProvider.java
+++ b/appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InteropAppCheckTokenProvider.java
@@ -18,7 +18,8 @@
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.appcheck.AppCheckTokenResult;
 
-public interface InternalAppCheckTokenProvider {
+/** @hide */
+public interface InteropAppCheckTokenProvider {
 
   /**
    * Requests an {@link AppCheckTokenResult} from the installed {@code AppCheckFactory}. This will
@@ -28,6 +29,15 @@ public interface InternalAppCheckTokenProvider {
   @NonNull
   Task<AppCheckTokenResult> getToken(boolean forceRefresh);
 
+  /**
+   * Requests an {@link AppCheckTokenResult} from the installed {@code AppCheckFactory}. This will
+   * always return a successful task, with an {@link AppCheckTokenResult} that contains either a
+   * valid token, or a dummy token and an error string. The token returned from this method will be
+   * a one-time use token.
+   */
+  @NonNull
+  Task<AppCheckTokenResult> getLimitedUseToken();
+
   /**
    * Registers a listener to changes in the token state. There can be more than one listener
    * registered at the same time for one or more FirebaseAppAuth instances. The listeners call back
diff --git a/appcheck/firebase-appcheck-playintegrity/CHANGELOG.md b/appcheck/firebase-appcheck-playintegrity/CHANGELOG.md
new file mode 100644
index 00000000000..391a2d955f3
--- /dev/null
+++ b/appcheck/firebase-appcheck-playintegrity/CHANGELOG.md
@@ -0,0 +1,46 @@
+# Unreleased
+
+
+# 18.0.0
+* [changed] Bump internal dependencies
+
+# 17.1.2
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 17.1.1
+* [fixed] Fixed client-side throttling in Play Integrity flows.
+* [changed] Bumped Play Integrity API Library dependency version.
+
+# 17.1.0
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 17.0.0
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 16.1.2
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 16.1.1
+* [changed] Migrated [app_check] SDKs to use standard Firebase executors.
+  (GitHub [#4431](//github.com/firebase/firebase-android-sdk/issues/4431){: .external}
+  and
+  [#4449](//github.com/firebase/firebase-android-sdk/issues/4449){: .external})
+* [changed] Integrated the [app_check] Play integrity SDK with Firebase
+  components.
+  (GitHub [#4436](//github.com/firebase/firebase-android-sdk/issues/4436){: .external})
+* [changed] Moved Task continuations off the main thread.
+  (GitHub [#4453](//github.com/firebase/firebase-android-sdk/issues/4453){: .external})
+
+# 16.1.0
+* [unchanged] Updated to accommodate the release of the updated
+  [app_check] Kotlin extensions library.
+
+# 16.0.1
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+# 16.0.0
+* [feature] Added support for
+  [Play Integrity](https://developer.android.com/google/play/integrity) as an
+  attestation provider.
+
diff --git a/appcheck/firebase-appcheck-playintegrity/api.txt b/appcheck/firebase-appcheck-playintegrity/api.txt
new file mode 100644
index 00000000000..41646391f7b
--- /dev/null
+++ b/appcheck/firebase-appcheck-playintegrity/api.txt
@@ -0,0 +1,11 @@
+// Signature format: 2.0
+package com.google.firebase.appcheck.playintegrity {
+
+  public class PlayIntegrityAppCheckProviderFactory implements com.google.firebase.appcheck.AppCheckProviderFactory {
+    ctor public PlayIntegrityAppCheckProviderFactory();
+    method @NonNull public com.google.firebase.appcheck.AppCheckProvider create(@NonNull com.google.firebase.FirebaseApp);
+    method @NonNull public static com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory getInstance();
+  }
+
+}
+
diff --git a/appcheck/firebase-appcheck-safetynet/firebase-appcheck-safetynet.gradle b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
similarity index 63%
rename from appcheck/firebase-appcheck-safetynet/firebase-appcheck-safetynet.gradle
rename to appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
index fee97970023..634360cc079 100644
--- a/appcheck/firebase-appcheck-safetynet/firebase-appcheck-safetynet.gradle
+++ b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ plugins {
 }
 
 firebaseLibrary {
+    libraryGroup "appcheck"
     publishSources = true
 }
 
@@ -25,7 +26,8 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.appcheck.playintegrity"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
@@ -41,19 +43,25 @@ android {
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':appcheck:firebase-appcheck')
+    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+
+    api project(':appcheck:firebase-appcheck')
+    api 'com.google.firebase:firebase-annotations:16.2.0'
+    api 'com.google.firebase:firebase-common:21.0.0'
+    api 'com.google.firebase:firebase-common-ktx:21.0.0'
+    api 'com.google.firebase:firebase-components:18.0.0'
+
     implementation 'com.google.android.gms:play-services-base:18.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation 'com.google.android.gms:play-services-safetynet:18.0.0'
-
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    implementation 'com.google.android.play:integrity:1.2.0'
 
-    testImplementation 'junit:junit:4.13-beta-2'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation(project(":integ-testing")){
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'androidx.test:rules:1.2.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:3.4.6'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
diff --git a/appcheck/firebase-appcheck-playintegrity/gradle.properties b/appcheck/firebase-appcheck-playintegrity/gradle.properties
new file mode 100644
index 00000000000..9b7be4891d1
--- /dev/null
+++ b/appcheck/firebase-appcheck-playintegrity/gradle.properties
@@ -0,0 +1,2 @@
+version=18.0.1
+latestReleasedVersion=18.0.0
diff --git a/appcheck/firebase-appcheck-playintegrity/src/main/AndroidManifest.xml b/appcheck/firebase-appcheck-playintegrity/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..928ea77e3e8
--- /dev/null
+++ b/appcheck/firebase-appcheck-playintegrity/src/main/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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">
+  <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
+  <!--<uses-sdk android:minSdkVersion="21"/>-->
+  <application>
+    <service android:name="com.google.firebase.components.ComponentDiscoveryService"
+        android:exported="false">
+      <meta-data android:name="com.google.firebase.components:com.google.firebase.appcheck.playintegrity.FirebaseAppCheckPlayIntegrityRegistrar"
+          android:value="com.google.firebase.components.ComponentRegistrar" />
+    </service>
+  </application>
+</manifest>
diff --git a/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrar.java b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrar.java
new file mode 100644
index 00000000000..56f0e091907
--- /dev/null
+++ b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrar.java
@@ -0,0 +1,61 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck.playintegrity;
+
+import com.google.android.gms.common.annotation.KeepForSdk;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appcheck.playintegrity.internal.PlayIntegrityAppCheckProvider;
+import com.google.firebase.components.Component;
+import com.google.firebase.components.ComponentRegistrar;
+import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import com.google.firebase.platforminfo.LibraryVersionComponent;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Executor;
+
+/**
+ * {@link ComponentRegistrar} for setting up FirebaseAppCheck play integrity's dependency injections
+ * in Firebase Android Components.
+ *
+ * @hide
+ */
+@KeepForSdk
+public class FirebaseAppCheckPlayIntegrityRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-app-check-play-integrity";
+
+  @Override
+  public List<Component<?>> getComponents() {
+    Qualified<Executor> liteExecutor = Qualified.qualified(Lightweight.class, Executor.class);
+    Qualified<Executor> blockingExecutor = Qualified.qualified(Blocking.class, Executor.class);
+
+    return Arrays.asList(
+        Component.builder(PlayIntegrityAppCheckProvider.class)
+            .name(LIBRARY_NAME)
+            .add(Dependency.required(FirebaseApp.class))
+            .add(Dependency.required(liteExecutor))
+            .add(Dependency.required(blockingExecutor))
+            .factory(
+                (container) ->
+                    new PlayIntegrityAppCheckProvider(
+                        container.get(FirebaseApp.class),
+                        container.get(liteExecutor),
+                        container.get(blockingExecutor)))
+            .build(),
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
+  }
+}
diff --git a/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/SafetyNetAppCheckProviderFactory.java b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/PlayIntegrityAppCheckProviderFactory.java
similarity index 54%
rename from appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/SafetyNetAppCheckProviderFactory.java
rename to appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/PlayIntegrityAppCheckProviderFactory.java
index f6b2e019bed..6a43548eb6e 100644
--- a/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/SafetyNetAppCheckProviderFactory.java
+++ b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/PlayIntegrityAppCheckProviderFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,37 +12,34 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appcheck.safetynet;
+package com.google.firebase.appcheck.playintegrity;
 
 import androidx.annotation.NonNull;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.appcheck.AppCheckProvider;
 import com.google.firebase.appcheck.AppCheckProviderFactory;
-import com.google.firebase.appcheck.safetynet.internal.SafetyNetAppCheckProvider;
+import com.google.firebase.appcheck.FirebaseAppCheck;
+import com.google.firebase.appcheck.playintegrity.internal.PlayIntegrityAppCheckProvider;
 
 /**
- * Implementation of an {@link AppCheckProviderFactory} that builds {@link
- * SafetyNetAppCheckProvider}s. This is the default implementation.
+ * Implementation of an {@link AppCheckProviderFactory} that builds <br>
+ * {@link PlayIntegrityAppCheckProvider}s. This is the default implementation.
  */
-public class SafetyNetAppCheckProviderFactory implements AppCheckProviderFactory {
+public class PlayIntegrityAppCheckProviderFactory implements AppCheckProviderFactory {
 
-  private static final SafetyNetAppCheckProviderFactory instance =
-      new SafetyNetAppCheckProviderFactory();
+  private static final PlayIntegrityAppCheckProviderFactory instance =
+      new PlayIntegrityAppCheckProviderFactory();
 
-  private SafetyNetAppCheckProviderFactory() {}
-
-  /**
-   * Gets an instance of this class for installation into a {@link
-   * com.google.firebase.appcheck.FirebaseAppCheck} instance.
-   */
+  /** Gets an instance of this class for installation into a {@link FirebaseAppCheck} instance. */
   @NonNull
-  public static SafetyNetAppCheckProviderFactory getInstance() {
+  public static PlayIntegrityAppCheckProviderFactory getInstance() {
     return instance;
   }
 
   @NonNull
   @Override
+  @SuppressWarnings("FirebaseUseExplicitDependencies")
   public AppCheckProvider create(@NonNull FirebaseApp firebaseApp) {
-    return new SafetyNetAppCheckProvider(firebaseApp);
+    return firebaseApp.get(PlayIntegrityAppCheckProvider.class);
   }
 }
diff --git a/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/internal/ExchangeSafetyNetTokenRequest.java b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/ExchangePlayIntegrityTokenRequest.java
similarity index 59%
rename from appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/internal/ExchangeSafetyNetTokenRequest.java
rename to appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/ExchangePlayIntegrityTokenRequest.java
index 33240ca4a2f..cc2e68d3054 100644
--- a/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/internal/ExchangeSafetyNetTokenRequest.java
+++ b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/ExchangePlayIntegrityTokenRequest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appcheck.safetynet.internal;
+package com.google.firebase.appcheck.playintegrity.internal;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
@@ -20,23 +20,23 @@
 import org.json.JSONObject;
 
 /**
- * Client-side model of the ExchangeSafetyNetTokenRequest payload from the Firebase App Check Token
- * Exchange API.
+ * Client-side model of the ExchangePlayIntegrityTokenRequest payload from the Firebase App Check
+ * Token Exchange API.
  */
-public class ExchangeSafetyNetTokenRequest {
+class ExchangePlayIntegrityTokenRequest {
 
-  @VisibleForTesting static final String SAFETY_NET_TOKEN_KEY = "safetyNetToken";
+  @VisibleForTesting static final String PLAY_INTEGRITY_TOKEN_KEY = "playIntegrityToken";
 
-  private final String safetyNetToken;
+  private final String playIntegrityToken;
 
-  public ExchangeSafetyNetTokenRequest(@NonNull String safetyNetToken) {
-    this.safetyNetToken = safetyNetToken;
+  public ExchangePlayIntegrityTokenRequest(@NonNull String playIntegrityToken) {
+    this.playIntegrityToken = playIntegrityToken;
   }
 
   @NonNull
   public String toJsonString() throws JSONException {
     JSONObject jsonObject = new JSONObject();
-    jsonObject.put(SAFETY_NET_TOKEN_KEY, safetyNetToken);
+    jsonObject.put(PLAY_INTEGRITY_TOKEN_KEY, playIntegrityToken);
 
     return jsonObject.toString();
   }
diff --git a/appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/DebugAppCheckProviderFactoryHelper.java b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/GeneratePlayIntegrityChallengeRequest.java
similarity index 53%
rename from appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/DebugAppCheckProviderFactoryHelper.java
rename to appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/GeneratePlayIntegrityChallengeRequest.java
index b484fe89d63..5e213d13189 100644
--- a/appcheck/firebase-appcheck-debug-testing/src/main/java/com/google/firebase/appcheck/debug/DebugAppCheckProviderFactoryHelper.java
+++ b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/GeneratePlayIntegrityChallengeRequest.java
@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,21 +12,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appcheck.debug;
+package com.google.firebase.appcheck.playintegrity.internal;
 
 import androidx.annotation.NonNull;
+import org.json.JSONObject;
 
 /**
- * Helper class used by {@link com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper}
- * in order to access the package-private {@link DebugAppCheckProviderFactory} constructor that
- * takes in a debug secret.
- *
- * @hide
+ * Client-side model of the GeneratePlayIntegrityChallengeRequest payload from the Firebase App
+ * Check Token Exchange API.
  */
-public class DebugAppCheckProviderFactoryHelper {
+class GeneratePlayIntegrityChallengeRequest {
+
+  public GeneratePlayIntegrityChallengeRequest() {}
+
   @NonNull
-  public static DebugAppCheckProviderFactory createDebugAppCheckProviderFactory(
-      @NonNull String debugSecret) {
-    return new DebugAppCheckProviderFactory(debugSecret);
+  public String toJsonString() {
+    JSONObject jsonObject = new JSONObject();
+
+    // GeneratePlayIntegrityChallenge takes an empty POST body since the app ID is in the URL.
+    return jsonObject.toString();
   }
 }
diff --git a/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/GeneratePlayIntegrityChallengeResponse.java b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/GeneratePlayIntegrityChallengeResponse.java
new file mode 100644
index 00000000000..52d91827276
--- /dev/null
+++ b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/GeneratePlayIntegrityChallengeResponse.java
@@ -0,0 +1,67 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck.playintegrity.internal;
+
+import static com.google.android.gms.common.internal.Preconditions.checkNotNull;
+import static com.google.android.gms.common.util.Strings.emptyToNull;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import com.google.firebase.FirebaseException;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Client-side model of the GeneratePlayIntegrityChallengeResponse payload from the Firebase App
+ * Check Token Exchange API.
+ */
+class GeneratePlayIntegrityChallengeResponse {
+
+  @VisibleForTesting static final String CHALLENGE_KEY = "challenge";
+  @VisibleForTesting static final String TIME_TO_LIVE_KEY = "ttl";
+
+  private String challenge;
+  private String timeToLive;
+
+  @NonNull
+  public static GeneratePlayIntegrityChallengeResponse fromJsonString(@NonNull String jsonString)
+      throws FirebaseException, JSONException {
+    JSONObject jsonObject = new JSONObject(jsonString);
+    String challenge = emptyToNull(jsonObject.optString(CHALLENGE_KEY));
+    String timeToLive = emptyToNull(jsonObject.optString(TIME_TO_LIVE_KEY));
+    if (challenge == null || timeToLive == null) {
+      throw new FirebaseException("Unexpected server response.");
+    }
+    return new GeneratePlayIntegrityChallengeResponse(challenge, timeToLive);
+  }
+
+  private GeneratePlayIntegrityChallengeResponse(
+      @NonNull String challenge, @NonNull String timeToLive) {
+    checkNotNull(challenge);
+    checkNotNull(timeToLive);
+    this.challenge = challenge;
+    this.timeToLive = timeToLive;
+  }
+
+  @NonNull
+  public String getChallenge() {
+    return challenge;
+  }
+
+  @NonNull
+  public String getTimeToLive() {
+    return timeToLive;
+  }
+}
diff --git a/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/PlayIntegrityAppCheckProvider.java b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/PlayIntegrityAppCheckProvider.java
new file mode 100644
index 00000000000..910aa3be2c7
--- /dev/null
+++ b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/PlayIntegrityAppCheckProvider.java
@@ -0,0 +1,119 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck.playintegrity.internal;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.android.play.core.integrity.IntegrityManager;
+import com.google.android.play.core.integrity.IntegrityManagerFactory;
+import com.google.android.play.core.integrity.IntegrityTokenRequest;
+import com.google.android.play.core.integrity.IntegrityTokenResponse;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appcheck.AppCheckProvider;
+import com.google.firebase.appcheck.AppCheckToken;
+import com.google.firebase.appcheck.internal.DefaultAppCheckToken;
+import com.google.firebase.appcheck.internal.NetworkClient;
+import com.google.firebase.appcheck.internal.RetryManager;
+import java.util.concurrent.Executor;
+
+public class PlayIntegrityAppCheckProvider implements AppCheckProvider {
+
+  private static final String UTF_8 = "UTF-8";
+
+  private final String projectNumber;
+  private final IntegrityManager integrityManager;
+  private final NetworkClient networkClient;
+  private final Executor liteExecutor;
+  private final Executor blockingExecutor;
+  private final RetryManager retryManager;
+
+  public PlayIntegrityAppCheckProvider(
+      @NonNull FirebaseApp firebaseApp,
+      @Lightweight Executor liteExecutor,
+      @Blocking Executor blockingExecutor) {
+    this(
+        firebaseApp.getOptions().getGcmSenderId(),
+        IntegrityManagerFactory.create(firebaseApp.getApplicationContext()),
+        new NetworkClient(firebaseApp),
+        liteExecutor,
+        blockingExecutor,
+        new RetryManager());
+  }
+
+  @VisibleForTesting
+  PlayIntegrityAppCheckProvider(
+      @NonNull String projectNumber,
+      @NonNull IntegrityManager integrityManager,
+      @NonNull NetworkClient networkClient,
+      @NonNull Executor liteExecutor,
+      @NonNull Executor blockingExecutor,
+      @NonNull RetryManager retryManager) {
+    this.projectNumber = projectNumber;
+    this.integrityManager = integrityManager;
+    this.networkClient = networkClient;
+    this.liteExecutor = liteExecutor;
+    this.blockingExecutor = blockingExecutor;
+    this.retryManager = retryManager;
+  }
+
+  @NonNull
+  @Override
+  public Task<AppCheckToken> getToken() {
+    return getPlayIntegrityAttestation()
+        .onSuccessTask(
+            liteExecutor,
+            integrityTokenResponse -> {
+              ExchangePlayIntegrityTokenRequest request =
+                  new ExchangePlayIntegrityTokenRequest(integrityTokenResponse.token());
+              return Tasks.call(
+                  blockingExecutor,
+                  () ->
+                      networkClient.exchangeAttestationForAppCheckToken(
+                          request.toJsonString().getBytes(UTF_8),
+                          NetworkClient.PLAY_INTEGRITY,
+                          retryManager));
+            })
+        .onSuccessTask(
+            liteExecutor,
+            appCheckTokenResponse ->
+                Tasks.forResult(
+                    DefaultAppCheckToken.constructFromAppCheckTokenResponse(
+                        appCheckTokenResponse)));
+  }
+
+  @NonNull
+  private Task<IntegrityTokenResponse> getPlayIntegrityAttestation() {
+    GeneratePlayIntegrityChallengeRequest generateChallengeRequest =
+        new GeneratePlayIntegrityChallengeRequest();
+    return Tasks.call(
+            blockingExecutor,
+            () ->
+                GeneratePlayIntegrityChallengeResponse.fromJsonString(
+                    networkClient.generatePlayIntegrityChallenge(
+                        generateChallengeRequest.toJsonString().getBytes(UTF_8), retryManager)))
+        .onSuccessTask(
+            liteExecutor,
+            generatePlayIntegrityChallengeResponse ->
+                integrityManager.requestIntegrityToken(
+                    IntegrityTokenRequest.builder()
+                        .setCloudProjectNumber(Long.parseLong(projectNumber))
+                        .setNonce(generatePlayIntegrityChallengeResponse.getChallenge())
+                        .build()));
+  }
+}
diff --git a/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/package-info.java b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/package-info.java
new file mode 100644
index 00000000000..3431597172a
--- /dev/null
+++ b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/package-info.java
@@ -0,0 +1,16 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 */
+package com.google.firebase.appcheck.playintegrity.internal;
diff --git a/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrarTest.java b/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrarTest.java
new file mode 100644
index 00000000000..4b2f7a632ba
--- /dev/null
+++ b/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrarTest.java
@@ -0,0 +1,48 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck.playintegrity;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.components.Component;
+import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import java.util.List;
+import java.util.concurrent.Executor;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link FirebaseAppCheckPlayIntegrityRegistrar}. */
+@RunWith(RobolectricTestRunner.class)
+public class FirebaseAppCheckPlayIntegrityRegistrarTest {
+  @Test
+  public void testGetComponents() {
+    FirebaseAppCheckPlayIntegrityRegistrar registrar = new FirebaseAppCheckPlayIntegrityRegistrar();
+    List<Component<?>> components = registrar.getComponents();
+    assertThat(components).isNotEmpty();
+    assertThat(components).hasSize(2);
+    Component<?> appCheckPlayIntegrityComponent = components.get(0);
+    assertThat(appCheckPlayIntegrityComponent.getDependencies())
+        .containsExactly(
+            Dependency.required(FirebaseApp.class),
+            Dependency.required(Qualified.qualified(Lightweight.class, Executor.class)),
+            Dependency.required(Qualified.qualified(Blocking.class, Executor.class)));
+    assertThat(appCheckPlayIntegrityComponent.isLazy()).isTrue();
+  }
+}
diff --git a/appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/SafetyNetAppCheckProviderFactoryTest.java b/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/PlayIntegrityAppCheckProviderFactoryTest.java
similarity index 68%
rename from appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/SafetyNetAppCheckProviderFactoryTest.java
rename to appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/PlayIntegrityAppCheckProviderFactoryTest.java
index cf4446a92a0..ed1ebddda96 100644
--- a/appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/SafetyNetAppCheckProviderFactoryTest.java
+++ b/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/PlayIntegrityAppCheckProviderFactoryTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appcheck.safetynet;
+package com.google.firebase.appcheck.playintegrity;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -21,16 +21,17 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-/** Tests for {@link SafetyNetAppCheckProviderFactory}. */
+/** Tests for {@link PlayIntegrityAppCheckProviderFactory}. */
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
-public class SafetyNetAppCheckProviderFactoryTest {
+public class PlayIntegrityAppCheckProviderFactoryTest {
 
   @Test
   public void testGetInstance_callTwice_sameInstance() {
-    SafetyNetAppCheckProviderFactory firstInstance = SafetyNetAppCheckProviderFactory.getInstance();
-    SafetyNetAppCheckProviderFactory secondInstance =
-        SafetyNetAppCheckProviderFactory.getInstance();
+    PlayIntegrityAppCheckProviderFactory firstInstance =
+        PlayIntegrityAppCheckProviderFactory.getInstance();
+    PlayIntegrityAppCheckProviderFactory secondInstance =
+        PlayIntegrityAppCheckProviderFactory.getInstance();
     assertThat(firstInstance).isEqualTo(secondInstance);
   }
 }
diff --git a/appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/internal/ExchangeSafetyNetTokenRequestTest.java b/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/ExchangePlayIntegrityTokenRequestTest.java
similarity index 61%
rename from appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/internal/ExchangeSafetyNetTokenRequestTest.java
rename to appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/ExchangePlayIntegrityTokenRequestTest.java
index 06aac6e9016..8c01f97f887 100644
--- a/appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/internal/ExchangeSafetyNetTokenRequestTest.java
+++ b/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/ExchangePlayIntegrityTokenRequestTest.java
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appcheck.safetynet.internal;
+package com.google.firebase.appcheck.playintegrity.internal;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -22,21 +22,21 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-/** Tests for {@link ExchangeSafetyNetTokenRequest}. */
+/** Tests for {@link ExchangePlayIntegrityTokenRequest}. */
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
-public class ExchangeSafetyNetTokenRequestTest {
-  private static final String SAFETY_NET_TOKEN = "safetyNetToken";
+public class ExchangePlayIntegrityTokenRequestTest {
+  private static final String PLAY_INTEGRITY_TOKEN = "playIntegrityToken";
 
   @Test
   public void toJsonString_expectSerialized() throws Exception {
-    ExchangeSafetyNetTokenRequest exchangeSafetyNetTokenRequest =
-        new ExchangeSafetyNetTokenRequest(SAFETY_NET_TOKEN);
+    ExchangePlayIntegrityTokenRequest exchangePlayIntegrityTokenRequest =
+        new ExchangePlayIntegrityTokenRequest(PLAY_INTEGRITY_TOKEN);
 
-    String jsonString = exchangeSafetyNetTokenRequest.toJsonString();
+    String jsonString = exchangePlayIntegrityTokenRequest.toJsonString();
     JSONObject jsonObject = new JSONObject(jsonString);
 
-    assertThat(jsonObject.getString(ExchangeSafetyNetTokenRequest.SAFETY_NET_TOKEN_KEY))
-        .isEqualTo(SAFETY_NET_TOKEN);
+    assertThat(jsonObject.getString(ExchangePlayIntegrityTokenRequest.PLAY_INTEGRITY_TOKEN_KEY))
+        .isEqualTo(PLAY_INTEGRITY_TOKEN);
   }
 }
diff --git a/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/GeneratePlayIntegrityChallengeRequestTest.java b/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/GeneratePlayIntegrityChallengeRequestTest.java
new file mode 100644
index 00000000000..abd86ae8258
--- /dev/null
+++ b/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/GeneratePlayIntegrityChallengeRequestTest.java
@@ -0,0 +1,37 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck.playintegrity.internal;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Tests for {@link GeneratePlayIntegrityChallengeRequest}. */
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class GeneratePlayIntegrityChallengeRequestTest {
+  private static final String EMPTY_JSON = "{}";
+
+  @Test
+  public void toJsonString_expectSerialized() throws Exception {
+    GeneratePlayIntegrityChallengeRequest generatePlayIntegrityChallengeRequest =
+        new GeneratePlayIntegrityChallengeRequest();
+
+    assertThat(generatePlayIntegrityChallengeRequest.toJsonString()).isEqualTo(EMPTY_JSON);
+  }
+}
diff --git a/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/GeneratePlayIntegrityChallengeResponseTest.java b/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/GeneratePlayIntegrityChallengeResponseTest.java
new file mode 100644
index 00000000000..dcc48034b00
--- /dev/null
+++ b/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/GeneratePlayIntegrityChallengeResponseTest.java
@@ -0,0 +1,65 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck.playintegrity.internal;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+
+import com.google.firebase.FirebaseException;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Tests for {@link GeneratePlayIntegrityChallengeResponse}. */
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class GeneratePlayIntegrityChallengeResponseTest {
+  private static final String CHALLENGE = "testChallenge";
+  private static final String TIME_TO_LIVE = "3600s";
+
+  @Test
+  public void fromJsonString_expectDeserialized() throws Exception {
+    JSONObject jsonObject = new JSONObject();
+    jsonObject.put(GeneratePlayIntegrityChallengeResponse.CHALLENGE_KEY, CHALLENGE);
+    jsonObject.put(GeneratePlayIntegrityChallengeResponse.TIME_TO_LIVE_KEY, TIME_TO_LIVE);
+
+    GeneratePlayIntegrityChallengeResponse generatePlayIntegrityChallengeResponse =
+        GeneratePlayIntegrityChallengeResponse.fromJsonString(jsonObject.toString());
+    assertThat(generatePlayIntegrityChallengeResponse.getChallenge()).isEqualTo(CHALLENGE);
+    assertThat(generatePlayIntegrityChallengeResponse.getTimeToLive()).isEqualTo(TIME_TO_LIVE);
+  }
+
+  @Test
+  public void fromJsonString_nullChallenge_throwsException() throws Exception {
+    JSONObject jsonObject = new JSONObject();
+    jsonObject.put(GeneratePlayIntegrityChallengeResponse.TIME_TO_LIVE_KEY, TIME_TO_LIVE);
+
+    assertThrows(
+        FirebaseException.class,
+        () -> GeneratePlayIntegrityChallengeResponse.fromJsonString(jsonObject.toString()));
+  }
+
+  @Test
+  public void fromJsonString_nullTimeToLive_throwsException() throws Exception {
+    JSONObject jsonObject = new JSONObject();
+    jsonObject.put(GeneratePlayIntegrityChallengeResponse.CHALLENGE_KEY, CHALLENGE);
+
+    assertThrows(
+        FirebaseException.class,
+        () -> GeneratePlayIntegrityChallengeResponse.fromJsonString(jsonObject.toString()));
+  }
+}
diff --git a/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/PlayIntegrityAppCheckProviderTest.java b/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/PlayIntegrityAppCheckProviderTest.java
new file mode 100644
index 00000000000..e0f80ceb2a5
--- /dev/null
+++ b/appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/PlayIntegrityAppCheckProviderTest.java
@@ -0,0 +1,236 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck.playintegrity.internal;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.android.play.core.integrity.IntegrityManager;
+import com.google.android.play.core.integrity.IntegrityTokenRequest;
+import com.google.android.play.core.integrity.IntegrityTokenResponse;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.firebase.appcheck.AppCheckToken;
+import com.google.firebase.appcheck.internal.AppCheckTokenResponse;
+import com.google.firebase.appcheck.internal.DefaultAppCheckToken;
+import com.google.firebase.appcheck.internal.NetworkClient;
+import com.google.firebase.appcheck.internal.RetryManager;
+import com.google.firebase.concurrent.TestOnlyExecutors;
+import java.io.IOException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeoutException;
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
+
+/** Tests for {@link PlayIntegrityAppCheckProvider}. */
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+@LooperMode(LooperMode.Mode.LEGACY)
+public class PlayIntegrityAppCheckProviderTest {
+
+  private static final String PROJECT_NUMBER = "123456";
+  private static final String APP_CHECK_TOKEN = "appCheckToken";
+  private static final String TIME_TO_LIVE = "3600s";
+  private static final String CHALLENGE = "testChallenge";
+  private static final String INTEGRITY_TOKEN = "integrityToken";
+
+  @Mock private IntegrityManager mockIntegrityManager;
+  @Mock private NetworkClient mockNetworkClient;
+  @Mock private RetryManager mockRetryManager;
+  @Mock private IntegrityTokenResponse mockIntegrityTokenResponse;
+  @Mock private AppCheckTokenResponse mockAppCheckTokenResponse;
+
+  @Captor private ArgumentCaptor<IntegrityTokenRequest> integrityTokenRequestCaptor;
+  @Captor private ArgumentCaptor<byte[]> exchangePlayIntegrityTokenRequestCaptor;
+
+  // TODO(b/258273630): Use TestOnlyExecutors instead of MoreExecutors.directExecutor().
+  private Executor liteExecutor = MoreExecutors.directExecutor();
+  private Executor blockingExecutor = MoreExecutors.directExecutor();
+
+  @Before
+  public void setup() {
+    MockitoAnnotations.initMocks(this);
+    when(mockIntegrityTokenResponse.token()).thenReturn(INTEGRITY_TOKEN);
+    when(mockAppCheckTokenResponse.getToken()).thenReturn(APP_CHECK_TOKEN);
+    when(mockAppCheckTokenResponse.getTimeToLive()).thenReturn(TIME_TO_LIVE);
+  }
+
+  @Test
+  public void testPublicConstructor_nullFirebaseApp_expectThrows() {
+    assertThrows(
+        NullPointerException.class,
+        () -> {
+          new PlayIntegrityAppCheckProvider(
+              null, TestOnlyExecutors.lite(), TestOnlyExecutors.blocking());
+        });
+  }
+
+  @Test
+  public void getToken_onSuccess_setsTaskResult() throws Exception {
+    when(mockNetworkClient.generatePlayIntegrityChallenge(any(), eq(mockRetryManager)))
+        .thenReturn(createGeneratePlayIntegrityChallengeResponse());
+    when(mockIntegrityManager.requestIntegrityToken(any()))
+        .thenReturn(Tasks.forResult(mockIntegrityTokenResponse));
+    when(mockNetworkClient.exchangeAttestationForAppCheckToken(
+            any(), eq(NetworkClient.PLAY_INTEGRITY), eq(mockRetryManager)))
+        .thenReturn(mockAppCheckTokenResponse);
+
+    PlayIntegrityAppCheckProvider provider =
+        new PlayIntegrityAppCheckProvider(
+            PROJECT_NUMBER,
+            mockIntegrityManager,
+            mockNetworkClient,
+            liteExecutor,
+            blockingExecutor,
+            mockRetryManager);
+    Task<AppCheckToken> task = provider.getToken();
+
+    AppCheckToken token = task.getResult();
+    assertThat(token).isInstanceOf(DefaultAppCheckToken.class);
+    assertThat(token.getToken()).isEqualTo(APP_CHECK_TOKEN);
+
+    verify(mockNetworkClient).generatePlayIntegrityChallenge(any(), eq(mockRetryManager));
+
+    verify(mockIntegrityManager).requestIntegrityToken(integrityTokenRequestCaptor.capture());
+    assertThat(integrityTokenRequestCaptor.getValue().cloudProjectNumber())
+        .isEqualTo(Long.parseLong(PROJECT_NUMBER));
+    assertThat(integrityTokenRequestCaptor.getValue().nonce()).isEqualTo(CHALLENGE);
+
+    verify(mockNetworkClient)
+        .exchangeAttestationForAppCheckToken(
+            exchangePlayIntegrityTokenRequestCaptor.capture(),
+            eq(NetworkClient.PLAY_INTEGRITY),
+            eq(mockRetryManager));
+    String exchangePlayIntegrityTokenRequestJsonString =
+        new String(exchangePlayIntegrityTokenRequestCaptor.getValue());
+    assertThat(exchangePlayIntegrityTokenRequestJsonString).contains(INTEGRITY_TOKEN);
+  }
+
+  @Test
+  public void getToken_generateChallengeFails_setsTaskException() throws Exception {
+    when(mockNetworkClient.generatePlayIntegrityChallenge(any(), eq(mockRetryManager)))
+        .thenThrow(new IOException());
+
+    PlayIntegrityAppCheckProvider provider =
+        new PlayIntegrityAppCheckProvider(
+            PROJECT_NUMBER,
+            mockIntegrityManager,
+            mockNetworkClient,
+            liteExecutor,
+            blockingExecutor,
+            mockRetryManager);
+    Task<AppCheckToken> task = provider.getToken();
+
+    assertThat(task.isSuccessful()).isFalse();
+    assertThat(task.getException()).isInstanceOf(IOException.class);
+
+    verify(mockNetworkClient).generatePlayIntegrityChallenge(any(), eq(mockRetryManager));
+    verify(mockNetworkClient, never()).exchangeAttestationForAppCheckToken(any(), anyInt(), any());
+    verify(mockIntegrityManager, never()).requestIntegrityToken(any());
+  }
+
+  @Test
+  public void getToken_requestIntegrityTokenFails_setsTaskException() throws Exception {
+    when(mockNetworkClient.generatePlayIntegrityChallenge(any(), eq(mockRetryManager)))
+        .thenReturn(createGeneratePlayIntegrityChallengeResponse());
+    when(mockIntegrityManager.requestIntegrityToken(any()))
+        .thenReturn(Tasks.forException(new TimeoutException()));
+
+    PlayIntegrityAppCheckProvider provider =
+        new PlayIntegrityAppCheckProvider(
+            PROJECT_NUMBER,
+            mockIntegrityManager,
+            mockNetworkClient,
+            liteExecutor,
+            blockingExecutor,
+            mockRetryManager);
+    Task<AppCheckToken> task = provider.getToken();
+
+    assertThat(task.isSuccessful()).isFalse();
+    assertThat(task.getException()).isInstanceOf(TimeoutException.class);
+
+    verify(mockNetworkClient).generatePlayIntegrityChallenge(any(), eq(mockRetryManager));
+    verify(mockNetworkClient, never()).exchangeAttestationForAppCheckToken(any(), anyInt(), any());
+
+    verify(mockIntegrityManager).requestIntegrityToken(integrityTokenRequestCaptor.capture());
+    assertThat(integrityTokenRequestCaptor.getValue().cloudProjectNumber())
+        .isEqualTo(Long.parseLong(PROJECT_NUMBER));
+    assertThat(integrityTokenRequestCaptor.getValue().nonce()).isEqualTo(CHALLENGE);
+  }
+
+  @Test
+  public void getToken_tokenExchangeFails_setsTaskException() throws Exception {
+    when(mockNetworkClient.generatePlayIntegrityChallenge(any(), eq(mockRetryManager)))
+        .thenReturn(createGeneratePlayIntegrityChallengeResponse());
+    when(mockIntegrityManager.requestIntegrityToken(any()))
+        .thenReturn(Tasks.forResult(mockIntegrityTokenResponse));
+    when(mockNetworkClient.exchangeAttestationForAppCheckToken(
+            any(), eq(NetworkClient.PLAY_INTEGRITY), eq(mockRetryManager)))
+        .thenThrow(new IOException());
+
+    PlayIntegrityAppCheckProvider provider =
+        new PlayIntegrityAppCheckProvider(
+            PROJECT_NUMBER,
+            mockIntegrityManager,
+            mockNetworkClient,
+            liteExecutor,
+            blockingExecutor,
+            mockRetryManager);
+    Task<AppCheckToken> task = provider.getToken();
+
+    assertThat(task.isSuccessful()).isFalse();
+    assertThat(task.getException()).isInstanceOf(IOException.class);
+
+    verify(mockNetworkClient).generatePlayIntegrityChallenge(any(), eq(mockRetryManager));
+
+    verify(mockIntegrityManager).requestIntegrityToken(integrityTokenRequestCaptor.capture());
+    assertThat(integrityTokenRequestCaptor.getValue().cloudProjectNumber())
+        .isEqualTo(Long.parseLong(PROJECT_NUMBER));
+    assertThat(integrityTokenRequestCaptor.getValue().nonce()).isEqualTo(CHALLENGE);
+
+    verify(mockNetworkClient)
+        .exchangeAttestationForAppCheckToken(
+            exchangePlayIntegrityTokenRequestCaptor.capture(),
+            eq(NetworkClient.PLAY_INTEGRITY),
+            eq(mockRetryManager));
+    String exchangePlayIntegrityTokenRequestJsonString =
+        new String(exchangePlayIntegrityTokenRequestCaptor.getValue());
+    assertThat(exchangePlayIntegrityTokenRequestJsonString).contains(INTEGRITY_TOKEN);
+  }
+
+  private static String createGeneratePlayIntegrityChallengeResponse() throws Exception {
+    JSONObject responseBodyJson = new JSONObject();
+    responseBodyJson.put(GeneratePlayIntegrityChallengeResponse.CHALLENGE_KEY, CHALLENGE);
+    responseBodyJson.put(GeneratePlayIntegrityChallengeResponse.TIME_TO_LIVE_KEY, TIME_TO_LIVE);
+
+    return responseBodyJson.toString();
+  }
+}
diff --git a/appcheck/firebase-appcheck-safetynet/gradle.properties b/appcheck/firebase-appcheck-safetynet/gradle.properties
deleted file mode 100644
index 671ce6a5ae5..00000000000
--- a/appcheck/firebase-appcheck-safetynet/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-version=16.0.1
diff --git a/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/internal/SafetyNetAppCheckProvider.java b/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/internal/SafetyNetAppCheckProvider.java
deleted file mode 100644
index f44867c39ee..00000000000
--- a/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/internal/SafetyNetAppCheckProvider.java
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appcheck.safetynet.internal;
-
-import static com.google.android.gms.common.internal.Preconditions.checkNotEmpty;
-import static com.google.android.gms.common.internal.Preconditions.checkNotNull;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.safetynet.SafetyNet;
-import com.google.android.gms.safetynet.SafetyNetApi;
-import com.google.android.gms.safetynet.SafetyNetClient;
-import com.google.android.gms.tasks.Continuation;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.TaskCompletionSource;
-import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.appcheck.AppCheckProvider;
-import com.google.firebase.appcheck.AppCheckToken;
-import com.google.firebase.appcheck.internal.AppCheckTokenResponse;
-import com.google.firebase.appcheck.internal.DefaultAppCheckToken;
-import com.google.firebase.appcheck.internal.NetworkClient;
-import com.google.firebase.appcheck.internal.RetryManager;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class SafetyNetAppCheckProvider implements AppCheckProvider {
-
-  // The SafetyNet nonce is used to associate a SafetyNet attestation with a request. However, since
-  // we do not have any fields in ExchangeSafetyNetTokenRequest that are not already covered in the
-  // AttestationResponse, the nonce does not provide much additional benefit. Because of this, we
-  // will leave the nonce empty in the v1 flow.
-  private static final String NONCE = "";
-  private static final String UTF_8 = "UTF-8";
-
-  private final Context context;
-  private final Task<SafetyNetClient> safetyNetClientTask;
-  private final NetworkClient networkClient;
-  private final ExecutorService backgroundExecutor;
-  private final RetryManager retryManager;
-  private final String apiKey;
-
-  /** @param firebaseApp the FirebaseApp to which this Factory is tied. */
-  public SafetyNetAppCheckProvider(@NonNull FirebaseApp firebaseApp) {
-    this(
-        firebaseApp,
-        new NetworkClient(firebaseApp),
-        GoogleApiAvailability.getInstance(),
-        Executors.newCachedThreadPool());
-  }
-
-  @VisibleForTesting
-  SafetyNetAppCheckProvider(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull NetworkClient networkClient,
-      @NonNull GoogleApiAvailability googleApiAvailability,
-      @NonNull ExecutorService backgroundExecutor) {
-    checkNotNull(firebaseApp);
-    checkNotNull(networkClient);
-    checkNotNull(googleApiAvailability);
-    checkNotNull(backgroundExecutor);
-    this.context = firebaseApp.getApplicationContext();
-    this.apiKey = firebaseApp.getOptions().getApiKey();
-    this.backgroundExecutor = backgroundExecutor;
-    this.safetyNetClientTask = initSafetyNetClient(googleApiAvailability, this.backgroundExecutor);
-    this.networkClient = networkClient;
-    this.retryManager = new RetryManager();
-  }
-
-  @VisibleForTesting
-  SafetyNetAppCheckProvider(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull SafetyNetClient safetyNetClient,
-      @NonNull NetworkClient networkClient,
-      @NonNull ExecutorService backgroundExecutor,
-      @NonNull RetryManager retryManager) {
-    this.context = firebaseApp.getApplicationContext();
-    this.apiKey = firebaseApp.getOptions().getApiKey();
-    this.safetyNetClientTask = Tasks.forResult(safetyNetClient);
-    this.networkClient = networkClient;
-    this.backgroundExecutor = backgroundExecutor;
-    this.retryManager = retryManager;
-  }
-
-  private Task<SafetyNetClient> initSafetyNetClient(
-      GoogleApiAvailability googleApiAvailability, ExecutorService executor) {
-    TaskCompletionSource<SafetyNetClient> taskCompletionSource = new TaskCompletionSource<>();
-    executor.execute(
-        () -> {
-          int connectionResult = googleApiAvailability.isGooglePlayServicesAvailable(context);
-          if (connectionResult == ConnectionResult.SUCCESS) {
-            taskCompletionSource.setResult(SafetyNet.getClient(context));
-          } else {
-            taskCompletionSource.setException(
-                new IllegalStateException(
-                    "SafetyNet unavailable; unable to connect to Google Play Services: "
-                        + getGooglePlayServicesConnectionErrorString(connectionResult)));
-          }
-        });
-    return taskCompletionSource.getTask();
-  }
-
-  private String getGooglePlayServicesConnectionErrorString(int connectionResult) {
-    switch (connectionResult) {
-      case ConnectionResult.SERVICE_MISSING:
-        return "Google Play services is missing on this device.";
-      case ConnectionResult.SERVICE_UPDATING:
-        return "Google Play services is currently being updated on this device.";
-      case ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED:
-        return "The installed version of Google Play services is out of date.";
-      case ConnectionResult.SERVICE_DISABLED:
-        return "The installed version of Google Play services has been disabled on this device.";
-      case ConnectionResult.SERVICE_INVALID:
-        return "The version of the Google Play services installed on this device is not authentic.";
-      default:
-        return "Unknown error.";
-    }
-  }
-
-  @VisibleForTesting
-  Task<SafetyNetClient> getSafetyNetClientTask() {
-    return safetyNetClientTask;
-  }
-
-  @NonNull
-  @Override
-  public Task<AppCheckToken> getToken() {
-    return safetyNetClientTask
-        .continueWithTask(
-            new Continuation<SafetyNetClient, Task<SafetyNetApi.AttestationResponse>>() {
-              @Override
-              public Task<SafetyNetApi.AttestationResponse> then(
-                  @NonNull Task<SafetyNetClient> task) {
-                if (task.isSuccessful()) {
-                  return task.getResult().attest(NONCE.getBytes(), apiKey);
-                }
-                return Tasks.forException(task.getException());
-              }
-            })
-        .continueWithTask(
-            new Continuation<SafetyNetApi.AttestationResponse, Task<AppCheckToken>>() {
-              @Override
-              public Task<AppCheckToken> then(
-                  @NonNull Task<SafetyNetApi.AttestationResponse> task) {
-                if (!task.isSuccessful()) {
-                  // Proxies errors to the client directly; need to wrap to get the
-                  // types right.
-                  // TODO: more specific error mapping to help clients debug more
-                  //       easily.
-                  return Tasks.forException(task.getException());
-                } else {
-                  return exchangeSafetyNetAttestationResponseForToken(task.getResult());
-                }
-              }
-            });
-  }
-
-  @NonNull
-  Task<AppCheckToken> exchangeSafetyNetAttestationResponseForToken(
-      @NonNull SafetyNetApi.AttestationResponse attestationResponse) {
-    checkNotNull(attestationResponse);
-    String safetyNetJwsResult = attestationResponse.getJwsResult();
-    checkNotEmpty(safetyNetJwsResult);
-
-    ExchangeSafetyNetTokenRequest request = new ExchangeSafetyNetTokenRequest(safetyNetJwsResult);
-
-    Task<AppCheckTokenResponse> networkTask =
-        Tasks.call(
-            backgroundExecutor,
-            () ->
-                networkClient.exchangeAttestationForAppCheckToken(
-                    request.toJsonString().getBytes(UTF_8),
-                    NetworkClient.SAFETY_NET,
-                    retryManager));
-    return networkTask.continueWithTask(
-        new Continuation<AppCheckTokenResponse, Task<AppCheckToken>>() {
-          @Override
-          public Task<AppCheckToken> then(@NonNull Task<AppCheckTokenResponse> task) {
-            if (task.isSuccessful()) {
-              return Tasks.forResult(
-                  DefaultAppCheckToken.constructFromAppCheckTokenResponse(task.getResult()));
-            }
-            // TODO: Surface more error details.
-            return Tasks.forException(task.getException());
-          }
-        });
-  }
-}
diff --git a/appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/internal/SafetyNetAppCheckProviderTest.java b/appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/internal/SafetyNetAppCheckProviderTest.java
deleted file mode 100644
index 088ff764496..00000000000
--- a/appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/internal/SafetyNetAppCheckProviderTest.java
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appcheck.safetynet.internal;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import androidx.test.core.app.ApplicationProvider;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.safetynet.SafetyNetApi;
-import com.google.android.gms.safetynet.SafetyNetClient;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.TaskCompletionSource;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
-import com.google.firebase.appcheck.AppCheckToken;
-import com.google.firebase.appcheck.internal.AppCheckTokenResponse;
-import com.google.firebase.appcheck.internal.DefaultAppCheckToken;
-import com.google.firebase.appcheck.internal.NetworkClient;
-import com.google.firebase.appcheck.internal.RetryManager;
-import java.io.IOException;
-import java.util.concurrent.ExecutorService;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-/** Tests for {@link SafetyNetAppCheckProvider}. */
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
-public class SafetyNetAppCheckProviderTest {
-
-  private static final String API_KEY = "apiKey";
-  private static final String APP_ID = "appId";
-  private static final String PROJECT_ID = "projectId";
-  private static final String SAFETY_NET_TOKEN = "safetyNetToken";
-  private static final String ATTESTATION_TOKEN = "token";
-  private static final String TIME_TO_LIVE = "3600s";
-
-  private FirebaseApp firebaseApp;
-  private ExecutorService backgroundExecutor = MoreExecutors.newDirectExecutorService();
-  @Mock private GoogleApiAvailability mockGoogleApiAvailability;
-  @Mock private SafetyNetClient mockSafetyNetClient;
-  @Mock private NetworkClient mockNetworkClient;
-  @Mock private RetryManager mockRetryManager;
-  @Mock private SafetyNetApi.AttestationResponse mockSafetyNetAttestationResponse;
-  @Mock private AppCheckTokenResponse mockAppCheckTokenResponse;
-
-  @Before
-  public void setup() {
-    MockitoAnnotations.initMocks(this);
-    FirebaseApp.clearInstancesForTest();
-    firebaseApp =
-        initializeFirebaseApp(
-            ApplicationProvider.getApplicationContext(), FirebaseApp.DEFAULT_APP_NAME);
-  }
-
-  @Test
-  public void testPublicConstructor_nullFirebaseApp_expectThrows() {
-    assertThrows(
-        NullPointerException.class,
-        () -> {
-          new SafetyNetAppCheckProvider(null);
-        });
-  }
-
-  @Test
-  public void
-      testConstructor_googlePlayServicesIsNotAvailable_expectSafetyNetClientTaskException() {
-    when(mockGoogleApiAvailability.isGooglePlayServicesAvailable(any()))
-        .thenReturn(ConnectionResult.SERVICE_MISSING);
-    SafetyNetAppCheckProvider provider =
-        new SafetyNetAppCheckProvider(
-            firebaseApp, mockNetworkClient, mockGoogleApiAvailability, backgroundExecutor);
-    assertThat(provider.getSafetyNetClientTask().isSuccessful()).isFalse();
-  }
-
-  @Test
-  public void testGetToken_googlePlayServicesIsNotAvailable_expectGetTokenTaskException() {
-    when(mockGoogleApiAvailability.isGooglePlayServicesAvailable(any()))
-        .thenReturn(ConnectionResult.SERVICE_MISSING);
-    SafetyNetAppCheckProvider provider =
-        new SafetyNetAppCheckProvider(
-            firebaseApp, mockNetworkClient, mockGoogleApiAvailability, backgroundExecutor);
-    assertThat(provider.getSafetyNetClientTask().isSuccessful()).isFalse();
-
-    Task<AppCheckToken> tokenTask = provider.getToken();
-    assertThat(tokenTask).isNotNull();
-    assertThat(tokenTask.isSuccessful()).isFalse();
-  }
-
-  @Test
-  public void testGetToken_nonNullSafetyNetClient_expectCallsSafetyNetForAttestation() {
-    SafetyNetAppCheckProvider provider =
-        new SafetyNetAppCheckProvider(
-            firebaseApp,
-            mockSafetyNetClient,
-            mockNetworkClient,
-            backgroundExecutor,
-            mockRetryManager);
-    assertThat(provider.getSafetyNetClientTask().getResult()).isEqualTo(mockSafetyNetClient);
-
-    Task<SafetyNetApi.AttestationResponse> safetyNetTask =
-        new TaskCompletionSource<SafetyNetApi.AttestationResponse>().getTask();
-
-    when(mockSafetyNetClient.attest(any(), any())).thenReturn(safetyNetTask);
-
-    Task<AppCheckToken> tokenTask = provider.getToken();
-    assertThat(tokenTask).isNotNull();
-
-    verify(mockSafetyNetClient).attest(any(), any());
-  }
-
-  @Test
-  public void testExchangeSafetyNetJwsForToken_nullAttestationResponse_expectThrows() {
-    SafetyNetAppCheckProvider provider =
-        new SafetyNetAppCheckProvider(
-            firebaseApp,
-            mockSafetyNetClient,
-            mockNetworkClient,
-            backgroundExecutor,
-            mockRetryManager);
-    assertThrows(
-        NullPointerException.class,
-        () -> {
-          provider.exchangeSafetyNetAttestationResponseForToken(
-              /* attestationResponse= */ (SafetyNetApi.AttestationResponse) null);
-        });
-  }
-
-  @Test
-  public void testExchangeSafetyNetJwsForToken_emptySafetyNetJwsResult_expectThrows() {
-    when(mockSafetyNetAttestationResponse.getJwsResult()).thenReturn("");
-    SafetyNetAppCheckProvider provider =
-        new SafetyNetAppCheckProvider(
-            firebaseApp,
-            mockSafetyNetClient,
-            mockNetworkClient,
-            backgroundExecutor,
-            mockRetryManager);
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> {
-          provider.exchangeSafetyNetAttestationResponseForToken(mockSafetyNetAttestationResponse);
-        });
-  }
-
-  @Test
-  public void testExchangeSafetyNetJwsForToken_validFields_expectReturnsTask() {
-    when(mockSafetyNetAttestationResponse.getJwsResult()).thenReturn(SAFETY_NET_TOKEN);
-    SafetyNetAppCheckProvider provider =
-        new SafetyNetAppCheckProvider(
-            firebaseApp,
-            mockSafetyNetClient,
-            mockNetworkClient,
-            backgroundExecutor,
-            mockRetryManager);
-    Task<AppCheckToken> task =
-        provider.exchangeSafetyNetAttestationResponseForToken(mockSafetyNetAttestationResponse);
-    assertThat(task).isNotNull();
-  }
-
-  @Test
-  public void exchangeSafetyNetJwsForToken_onSuccess_setsTaskResult() throws Exception {
-    when(mockSafetyNetAttestationResponse.getJwsResult()).thenReturn(SAFETY_NET_TOKEN);
-    when(mockNetworkClient.exchangeAttestationForAppCheckToken(
-            any(), eq(NetworkClient.SAFETY_NET), eq(mockRetryManager)))
-        .thenReturn(mockAppCheckTokenResponse);
-    when(mockAppCheckTokenResponse.getAttestationToken()).thenReturn(ATTESTATION_TOKEN);
-    when(mockAppCheckTokenResponse.getTimeToLive()).thenReturn(TIME_TO_LIVE);
-
-    SafetyNetAppCheckProvider provider =
-        new SafetyNetAppCheckProvider(
-            firebaseApp,
-            mockSafetyNetClient,
-            mockNetworkClient,
-            backgroundExecutor,
-            mockRetryManager);
-    Task<AppCheckToken> task =
-        provider.exchangeSafetyNetAttestationResponseForToken(mockSafetyNetAttestationResponse);
-
-    verify(mockNetworkClient)
-        .exchangeAttestationForAppCheckToken(
-            any(), eq(NetworkClient.SAFETY_NET), eq(mockRetryManager));
-
-    AppCheckToken token = task.getResult();
-    assertThat(token).isInstanceOf(DefaultAppCheckToken.class);
-    assertThat(token.getToken()).isEqualTo(ATTESTATION_TOKEN);
-  }
-
-  @Test
-  public void exchangeSafetyNetJwsForToken_onFailure_setsTaskException() throws Exception {
-    when(mockSafetyNetAttestationResponse.getJwsResult()).thenReturn(SAFETY_NET_TOKEN);
-    when(mockNetworkClient.exchangeAttestationForAppCheckToken(
-            any(), eq(NetworkClient.SAFETY_NET), eq(mockRetryManager)))
-        .thenThrow(new IOException());
-
-    SafetyNetAppCheckProvider provider =
-        new SafetyNetAppCheckProvider(
-            firebaseApp,
-            mockSafetyNetClient,
-            mockNetworkClient,
-            backgroundExecutor,
-            mockRetryManager);
-    Task<AppCheckToken> task =
-        provider.exchangeSafetyNetAttestationResponseForToken(mockSafetyNetAttestationResponse);
-
-    verify(mockNetworkClient)
-        .exchangeAttestationForAppCheckToken(
-            any(), eq(NetworkClient.SAFETY_NET), eq(mockRetryManager));
-
-    assertThat(task.isSuccessful()).isFalse();
-    Exception exception = task.getException();
-    assertThat(exception).isInstanceOf(IOException.class);
-  }
-
-  private static FirebaseApp initializeFirebaseApp(Context context, String name) {
-    return FirebaseApp.initializeApp(
-        context,
-        new FirebaseOptions.Builder()
-            .setApiKey(API_KEY)
-            .setApplicationId(APP_ID)
-            .setProjectId(PROJECT_ID)
-            .build(),
-        name);
-  }
-}
diff --git a/appcheck/firebase-appcheck/CHANGELOG.md b/appcheck/firebase-appcheck/CHANGELOG.md
new file mode 100644
index 00000000000..19e29699175
--- /dev/null
+++ b/appcheck/firebase-appcheck/CHANGELOG.md
@@ -0,0 +1,141 @@
+# Unreleased
+
+
+# 18.0.0
+* [changed] Bump internal dependencies
+* [changed] Internal support for `SafetyNet` has been dropped, as the [SafetyNet Attestation API
+has been deprecated.](https://developer.android.com/privacy-and-security/safetynet/deprecation-timeline#safetynet_attestation_deprecation_timeline)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appcheck` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.1.2
+* [changed] Bump internal dependencies.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appcheck` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.1.1
+* [fixed] Fixed a bug causing internal tests to depend directly on `firebase-common`.
+* [fixed] Fixed client-side throttling in Play Integrity flows.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appcheck` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.1.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-appcheck-ktx`
+  to `com.google.firebase:firebase-appcheck` under the `com.google.firebase.appcheck` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-appcheck-ktx` have been added to
+  `com.google.firebase:firebase-appcheck` under the `com.google.firebase.appcheck` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-appcheck-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appcheck` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.0.1
+* [changed] Internal updates to allow Firebase SDKs to obtain limited-use tokens.
+
+# 17.0.0
+* [feature] Added [`getLimitedUseAppCheckToken()`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck#getLimitedUseAppCheckToken())
+  for obtaining limited-use tokens for protecting non-Firebase backends.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appcheck` library. The Kotlin extensions library has no additional
+updates.
+
+# 16.1.2
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appcheck` library. The Kotlin extensions library has no additional
+updates.
+
+# 16.1.1
+* [changed] Migrated [app_check] SDKs to use standard Firebase executors.
+  (GitHub [#4431](//github.com/firebase/firebase-android-sdk/issues/4431){: .external}
+  and
+  [#4449](//github.com/firebase/firebase-android-sdk/issues/4449){: .external})
+* [changed] Moved Task continuations off the main thread.
+  (GitHub [#4453](//github.com/firebase/firebase-android-sdk/issues/4453){: .external})
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appcheck` library. The Kotlin extensions library has no additional
+updates.
+
+# 16.1.0
+* [unchanged] Updated to accommodate the release of the updated
+  [app_check] Kotlin extensions library.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appcheck` library. The Kotlin extensions library has the following
+additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-appcheck-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+
+# 16.0.1
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+# 16.0.0
+* [changed] [app_check] has exited beta and is now generally available for
+  use.
+* [feature] Added support for
+  [Play Integrity](https://developer.android.com/google/play/integrity) as an
+  attestation provider.
+
+# 16.0.0-beta06
+* [fixed] Fixed a bug in the [app_check] token refresh flow when using a
+  custom provider.
+
+# 16.0.0-beta05
+* [changed] Internal improvements.
+
+# 16.0.0-beta04
+* [changed] Improved error handling logic by minimizing the amount of requests
+  that are unlikely to succeed.
+* [fixed] Fixed heartbeat reporting.
+
+# 16.0.0-beta03
+* [changed] Added `X-Android-Package` and `X-Android-Cert` request headers to
+  [app_check] network calls.
+
+# 16.0.0-beta02
+* [feature] Added [`getAppCheckToken()`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck#getAppCheckToken(boolean)),
+  [`AppCheckTokenListener`](/docs/reference/android/com/google/firebase/appcheck/FirebaseAppCheck.AppCheckListener),
+  and associated setters and removers for developers to request and observe
+  changes to the [app_check] token.
+
+# 16.0.0-beta01
+* [feature] Initial beta release of the [app_check] SDK with abuse reduction
+  features.
+
diff --git a/appcheck/firebase-appcheck/api.txt b/appcheck/firebase-appcheck/api.txt
new file mode 100644
index 00000000000..e818b1ecd65
--- /dev/null
+++ b/appcheck/firebase-appcheck/api.txt
@@ -0,0 +1,54 @@
+// Signature format: 2.0
+package com.google.firebase.appcheck {
+
+  public interface AppCheckProvider {
+    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getToken();
+  }
+
+  public interface AppCheckProviderFactory {
+    method @NonNull public com.google.firebase.appcheck.AppCheckProvider create(@NonNull com.google.firebase.FirebaseApp);
+  }
+
+  public abstract class AppCheckToken {
+    ctor public AppCheckToken();
+    method public abstract long getExpireTimeMillis();
+    method @NonNull public abstract String getToken();
+  }
+
+  public abstract class FirebaseAppCheck implements com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider {
+    ctor public FirebaseAppCheck();
+    method public abstract void addAppCheckListener(@NonNull com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener);
+    method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getAppCheckToken(boolean);
+    method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getInstance();
+    method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getInstance(@NonNull com.google.firebase.FirebaseApp);
+    method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getLimitedUseAppCheckToken();
+    method public abstract void installAppCheckProviderFactory(@NonNull com.google.firebase.appcheck.AppCheckProviderFactory);
+    method public abstract void installAppCheckProviderFactory(@NonNull com.google.firebase.appcheck.AppCheckProviderFactory, boolean);
+    method public abstract void removeAppCheckListener(@NonNull com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener);
+    method public abstract void setTokenAutoRefreshEnabled(boolean);
+  }
+
+  public static interface FirebaseAppCheck.AppCheckListener {
+    method public void onAppCheckTokenChanged(@NonNull com.google.firebase.appcheck.AppCheckToken);
+  }
+
+  public final class FirebaseAppCheckKt {
+    method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @NonNull public static operator String component1(@NonNull com.google.firebase.appcheck.AppCheckToken);
+    method public static operator long component2(@NonNull com.google.firebase.appcheck.AppCheckToken);
+    method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(@NonNull com.google.firebase.Firebase);
+  }
+
+}
+
+package com.google.firebase.appcheck.ktx {
+
+  public final class FirebaseAppCheckKt {
+    method @Deprecated @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @Deprecated @NonNull public static operator String component1(@NonNull com.google.firebase.appcheck.AppCheckToken);
+    method @Deprecated public static operator long component2(@NonNull com.google.firebase.appcheck.AppCheckToken);
+    method @Deprecated @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(@NonNull com.google.firebase.ktx.Firebase);
+  }
+
+}
+
diff --git a/appcheck/firebase-appcheck/firebase-appcheck.gradle b/appcheck/firebase-appcheck/firebase-appcheck.gradle
index 3f04fff97ad..0da65d53d49 100644
--- a/appcheck/firebase-appcheck/firebase-appcheck.gradle
+++ b/appcheck/firebase-appcheck/firebase-appcheck.gradle
@@ -14,9 +14,11 @@
 
 plugins {
     id 'firebase-library'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
+    libraryGroup "appcheck"
     publishSources = true
 }
 
@@ -25,10 +27,12 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.appcheck"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
+        multiDexEnabled = true
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -36,24 +40,48 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
+    kotlinOptions { jvmTarget = "1.8" }
     testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(":appcheck:firebase-appcheck-interop")
-    implementation 'com.google.android.gms:play-services-base:18.0.1'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-
     javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
 
+    api 'com.google.android.gms:play-services-tasks:18.1.0'
+    api 'com.google.firebase:firebase-annotations:16.2.0'
+    api "com.google.firebase:firebase-appcheck-interop:17.1.0"
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
+
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'com.google.android.gms:play-services-base:18.1.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+
+    testImplementation(project(":integ-testing")){
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation 'androidx.test:rules:1.2.0'
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.12'
     testImplementation 'junit:junit:4.13-beta-2'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'org.mockito:mockito-inline:2.25.0'
+    testImplementation 'org.mockito:mockito-core:5.2.0'
+    testImplementation 'org.mockito:mockito-inline:5.2.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'androidx.test:rules:1.2.0'
+
+    androidTestImplementation project(':appcheck:firebase-appcheck')
+    androidTestImplementation(project(":integ-testing")){
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    androidTestImplementation "androidx.annotation:annotation:1.0.0"
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
+    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
+    androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
 }
diff --git a/appcheck/firebase-appcheck/gradle.properties b/appcheck/firebase-appcheck/gradle.properties
index 671ce6a5ae5..9b7be4891d1 100644
--- a/appcheck/firebase-appcheck/gradle.properties
+++ b/appcheck/firebase-appcheck/gradle.properties
@@ -1 +1,2 @@
-version=16.0.1
+version=18.0.1
+latestReleasedVersion=18.0.0
diff --git a/appcheck/firebase-appcheck/ktx/api.txt b/appcheck/firebase-appcheck/ktx/api.txt
new file mode 100644
index 00000000000..c951388dd72
--- /dev/null
+++ b/appcheck/firebase-appcheck/ktx/api.txt
@@ -0,0 +1,8 @@
+// Signature format: 2.0
+package com.google.firebase.appcheck.ktx {
+
+  public final class LoggingKt {
+  }
+
+}
+
diff --git a/firebase-appdistribution/ktx/gradle.properties b/appcheck/firebase-appcheck/ktx/gradle.properties
similarity index 100%
rename from firebase-appdistribution/ktx/gradle.properties
rename to appcheck/firebase-appcheck/ktx/gradle.properties
diff --git a/firebase-functions/ktx/ktx.gradle b/appcheck/firebase-appcheck/ktx/ktx.gradle
similarity index 62%
rename from firebase-functions/ktx/ktx.gradle
rename to appcheck/firebase-appcheck/ktx/ktx.gradle
index ea6e2575ed7..1de7ceea1cf 100644
--- a/firebase-functions/ktx/ktx.gradle
+++ b/appcheck/firebase-appcheck/ktx/ktx.gradle
@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,20 +14,22 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-functions')
-    publishJavadoc = true
-    publishSources = true
+    libraryGroup "appcheck"
     testLab.enabled = true
+    publishJavadoc = false
+    publishReleaseNotes = false
+    publishSources = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.appcheck.ktx"    
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
@@ -40,25 +42,31 @@ android {
         }
         androidTest.java.srcDirs += 'src/androidTest/kotlin'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api(project(":appcheck:firebase-appcheck"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
 
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-functions')
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    implementation("com.google.firebase:firebase-components:18.0.0")
 
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'com.google.firebase:firebase-appcheck-interop:17.1.0'
+    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'junit:junit:4.12'
 }
diff --git a/firebase-appdistribution/ktx/src/androidTest/AndroidManifest.xml b/appcheck/firebase-appcheck/ktx/src/androidTest/AndroidManifest.xml
similarity index 64%
rename from firebase-appdistribution/ktx/src/androidTest/AndroidManifest.xml
rename to appcheck/firebase-appcheck/ktx/src/androidTest/AndroidManifest.xml
index c9068143ed6..1b0d1dff1e4 100644
--- a/firebase-appdistribution/ktx/src/androidTest/AndroidManifest.xml
+++ b/appcheck/firebase-appcheck/ktx/src/androidTest/AndroidManifest.xml
@@ -1,7 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.google.firebase.appdistribution.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />-->
+  <!--<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />-->
   <uses-permission android:name="android.permission.INTERNET"/>
   <application>
     <uses-library android:name="android.test.runner" />
@@ -9,5 +8,5 @@
 
   <instrumentation
     android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="3com.google.firebase.appdistribution.ktx" />
-</manifest>
\ No newline at end of file
+    android:targetPackage="com.google.firebase.appcheck.ktx" />
+</manifest>
diff --git a/appcheck/firebase-appcheck/ktx/src/androidTest/kotlin/com/google/firebase/appcheck/ktx/FirebaseAppCheckTests.kt b/appcheck/firebase-appcheck/ktx/src/androidTest/kotlin/com/google/firebase/appcheck/ktx/FirebaseAppCheckTests.kt
new file mode 100644
index 00000000000..2989924a2c5
--- /dev/null
+++ b/appcheck/firebase-appcheck/ktx/src/androidTest/kotlin/com/google/firebase/appcheck/ktx/FirebaseAppCheckTests.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.appcheck.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.appcheck.AppCheckToken
+import com.google.firebase.appcheck.FirebaseAppCheck
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+class FirebaseAppCheckTests : BaseTestCase() {
+  @Test
+  fun appCheck_default_callsDefaultGetInstance() {
+    assertThat(Firebase.appCheck).isSameInstanceAs(FirebaseAppCheck.getInstance())
+  }
+
+  @Test
+  fun appCheck_with_custom_firebaseapp_calls_GetInstance() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.appCheck(app)).isSameInstanceAs(FirebaseAppCheck.getInstance(app))
+  }
+
+  @Test
+  fun appCheckToken_destructuring_declaration_works() {
+    val mockAppCheckToken =
+      object : AppCheckToken() {
+        override fun getToken(): String = "randomToken"
+
+        override fun getExpireTimeMillis(): Long = 23121997
+      }
+
+    val (token, expiration) = mockAppCheckToken
+
+    assertThat(token).isEqualTo(mockAppCheckToken.token)
+    assertThat(expiration).isEqualTo(mockAppCheckToken.expireTimeMillis)
+  }
+}
+
+internal const val LIBRARY_NAME: String = "fire-app-check-ktx"
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun libraryRegistrationAtRuntime() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
+}
diff --git a/appcheck/firebase-appcheck/ktx/src/main/AndroidManifest.xml b/appcheck/firebase-appcheck/ktx/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..e2af9507263
--- /dev/null
+++ b/appcheck/firebase-appcheck/ktx/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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">
+    <uses-sdk android:minSdkVersion="21"/>
+
+    <application>
+        <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.appcheck.ktx.FirebaseAppcheckLegacyRegistrar"
+                android:value="com.google.firebase.components.ComponentRegistrar" />
+        </service>
+    </application>
+</manifest>
diff --git a/appcheck/firebase-appcheck/ktx/src/main/kotlin/com/google/firebase/appcheck/ktx/Logging.kt b/appcheck/firebase-appcheck/ktx/src/main/kotlin/com/google/firebase/appcheck/ktx/Logging.kt
new file mode 100644
index 00000000000..56050655f1f
--- /dev/null
+++ b/appcheck/firebase-appcheck/ktx/src/main/kotlin/com/google/firebase/appcheck/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.appcheck.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.appcheck.BuildConfig
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-app-check-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseAppcheckLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/health-metrics/macrobenchmark/template/benchmark/src/main/AndroidManifest.xml.mustache b/appcheck/firebase-appcheck/src/androidTest/java/AndroidManifest.xml
similarity index 67%
rename from health-metrics/macrobenchmark/template/benchmark/src/main/AndroidManifest.xml.mustache
rename to appcheck/firebase-appcheck/src/androidTest/java/AndroidManifest.xml
index 15cff250146..31f57005096 100644
--- a/health-metrics/macrobenchmark/template/benchmark/src/main/AndroidManifest.xml.mustache
+++ b/appcheck/firebase-appcheck/src/androidTest/java/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2021 Google LLC -->
+<!-- Copyright 2022 Google LLC -->
 <!-- -->
 <!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
 <!-- you may not use this file except in compliance with the License. -->
@@ -13,13 +13,13 @@
 <!-- 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"
-    package="com.google.firebase.benchmark">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <queries>
-        <package android:name="com.google.firebase.macrobenchmark" />
-    </queries>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
+    <application>
+        <uses-library android:name="android.test.runner"/>
+    </application>
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.google.firebase.appcheck" />
 </manifest>
diff --git a/appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/FirebaseAppCheckTests.kt b/appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/FirebaseAppCheckTests.kt
new file mode 100644
index 00000000000..ee159b7de2d
--- /dev/null
+++ b/appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/FirebaseAppCheckTests.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.appcheck
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+class FirebaseAppCheckTests : BaseTestCase() {
+  @Test
+  fun appCheck_default_callsDefaultGetInstance() {
+    assertThat(Firebase.appCheck).isSameInstanceAs(FirebaseAppCheck.getInstance())
+  }
+
+  @Test
+  fun appCheck_with_custom_firebaseapp_calls_GetInstance() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.appCheck(app)).isSameInstanceAs(FirebaseAppCheck.getInstance(app))
+  }
+
+  @Test
+  fun appCheckToken_destructuring_declaration_works() {
+    val mockAppCheckToken =
+      object : AppCheckToken() {
+        override fun getToken(): String = "randomToken"
+
+        override fun getExpireTimeMillis(): Long = 23121997
+      }
+
+    val (token, expiration) = mockAppCheckToken
+
+    assertThat(token).isEqualTo(mockAppCheckToken.token)
+    assertThat(expiration).isEqualTo(mockAppCheckToken.expireTimeMillis)
+  }
+}
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun libraryRegistrationAtRuntime() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/StrictModeTest.java b/appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/StrictModeTest.java
new file mode 100644
index 00000000000..6fefe4abea1
--- /dev/null
+++ b/appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/StrictModeTest.java
@@ -0,0 +1,49 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appcheck;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
+import com.google.firebase.testing.integ.StrictModeRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class StrictModeTest {
+
+  @Rule public StrictModeRule strictMode = new StrictModeRule();
+
+  @Test
+  public void initializingFirebaseAppcheck_shouldNotViolateStrictMode() {
+    strictMode.runOnMainThread(
+        () -> {
+          FirebaseApp app =
+              FirebaseApp.initializeApp(
+                  ApplicationProvider.getApplicationContext(),
+                  new FirebaseOptions.Builder()
+                      .setApiKey("api")
+                      .setProjectId("123")
+                      .setApplicationId("appId")
+                      .build(),
+                  "hello");
+          app.get(FirebaseAppCheck.class);
+          app.get(InteropAppCheckTokenProvider.class);
+        });
+  }
+}
diff --git a/appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/ktx/FirebaseAppCheckTests.kt b/appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/ktx/FirebaseAppCheckTests.kt
new file mode 100644
index 00000000000..969b0230ed5
--- /dev/null
+++ b/appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/ktx/FirebaseAppCheckTests.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.appcheck.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.appcheck.AppCheckToken
+import com.google.firebase.appcheck.FirebaseAppCheck
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+class FirebaseAppCheckTests : BaseTestCase() {
+  @Test
+  fun appCheck_default_callsDefaultGetInstance() {
+    assertThat(Firebase.appCheck).isSameInstanceAs(FirebaseAppCheck.getInstance())
+  }
+
+  @Test
+  fun appCheck_with_custom_firebaseapp_calls_GetInstance() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.appCheck(app)).isSameInstanceAs(FirebaseAppCheck.getInstance(app))
+  }
+
+  @Test
+  fun appCheckToken_destructuring_declaration_works() {
+    val mockAppCheckToken =
+      object : AppCheckToken() {
+        override fun getToken(): String = "randomToken"
+
+        override fun getExpireTimeMillis(): Long = 23121997
+      }
+
+    val (token, expiration) = mockAppCheckToken
+
+    assertThat(token).isEqualTo(mockAppCheckToken.token)
+    assertThat(expiration).isEqualTo(mockAppCheckToken.expireTimeMillis)
+  }
+}
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun libraryRegistrationAtRuntime() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/appcheck/firebase-appcheck/src/main/AndroidManifest.xml b/appcheck/firebase-appcheck/src/main/AndroidManifest.xml
index d531146c6bf..991bdbcc53a 100644
--- a/appcheck/firebase-appcheck/src/main/AndroidManifest.xml
+++ b/appcheck/firebase-appcheck/src/main/AndroidManifest.xml
@@ -12,16 +12,14 @@
 <!-- WITHOUT 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="com.google.firebase.appcheck">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService"
-            android:exported="false">
+            android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.appcheck.FirebaseAppCheckKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.appcheck.FirebaseAppCheckRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/AppCheckProvider.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/AppCheckProvider.java
index eeda91bdecb..6bfd4157a86 100644
--- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/AppCheckProvider.java
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/AppCheckProvider.java
@@ -19,9 +19,9 @@
 
 /**
  * Interface for a provider that generates {@link AppCheckToken}s. This provider can be called at
- * any time by any Firebase library that depends (optionally or otherwise) on {@link
- * AppCheckToken}s. This provider is responsible for determining if it can create a new token at the
- * time of the call and returning that new token if it can.
+ * any time by any Firebase library that depends (optionally or otherwise) on <br>
+ * {@link AppCheckToken}s. This provider is responsible for determining if it can create a new token
+ * at the time of the call and returning that new token if it can.
  */
 public interface AppCheckProvider {
 
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheck.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheck.java
index b42394f14d0..21d2dc1078c 100644
--- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheck.java
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheck.java
@@ -19,9 +19,9 @@
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.appcheck.interop.AppCheckTokenListener;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 
-public abstract class FirebaseAppCheck implements InternalAppCheckTokenProvider {
+public abstract class FirebaseAppCheck implements InteropAppCheckTokenProvider {
 
   /** Gets the default instance of {@code FirebaseAppCheck}. */
   @NonNull
@@ -75,10 +75,29 @@ public abstract void installAppCheckProviderFactory(
    * Requests a Firebase App Check token. This method should be used ONLY if you need to authorize
    * requests to a non-Firebase backend. Requests to Firebase backends are authorized automatically
    * if configured.
+   *
+   * <p>If your non-Firebase backend exposes a sensitive or expensive endpoint that has low traffic
+   * volume, consider protecting it with <a
+   * href=https://firebase.google.com/docs/app-check/custom-resource-backend#replay-protection>Replay
+   * Protection</a>. In this case, use {@link #getLimitedUseAppCheckToken()} instead to obtain a
+   * limited-use token.
    */
   @NonNull
   public abstract Task<AppCheckToken> getAppCheckToken(boolean forceRefresh);
 
+  /**
+   * Requests a Firebase App Check token. This method should be used ONLY if you need to authorize
+   * requests to a non-Firebase backend.
+   *
+   * <p>Returns limited-use tokens that are intended for use with your non-Firebase backend
+   * endpoints that are protected with <a
+   * href=https://firebase.google.com/docs/app-check/custom-resource-backend#replay-protection>Replay
+   * Protection</a>. This method does not affect the token generation behavior of the {@link
+   * #getAppCheckToken(boolean forceRefresh)} method.
+   */
+  @NonNull
+  public abstract Task<AppCheckToken> getLimitedUseAppCheckToken();
+
   /**
    * Registers an {@link AppCheckListener} to changes in the token state. This method should be used
    * ONLY if you need to authorize requests to a non-Firebase backend. Requests to Firebase backends
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheck.kt b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheck.kt
new file mode 100644
index 00000000000..b0f69179205
--- /dev/null
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheck.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.appcheck
+
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+
+/** Returns the [FirebaseAppCheck] instance of the default [FirebaseApp]. */
+val Firebase.appCheck: FirebaseAppCheck
+  get() = FirebaseAppCheck.getInstance()
+
+/** Returns the [FirebaseAppCheck] instance of a given [FirebaseApp]. */
+fun Firebase.appCheck(app: FirebaseApp) = FirebaseAppCheck.getInstance(app)
+
+/**
+ * Destructuring declaration for [AppCheckToken] to provide token.
+ *
+ * @return the token of the [AppCheckToken]
+ */
+operator fun AppCheckToken.component1() = token
+
+/**
+ * Destructuring declaration for [AppCheckToken] to provide expireTimeMillis.
+ *
+ * @return the expireTimeMillis of the [AppCheckToken]
+ */
+operator fun AppCheckToken.component2() = expireTimeMillis
+
+/** @suppress */
+class FirebaseAppCheckKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java
index 4fd70eb4a17..51a3482fb29 100644
--- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java
@@ -16,15 +16,23 @@
 
 import com.google.android.gms.common.annotation.KeepForSdk;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
 import com.google.firebase.appcheck.internal.DefaultFirebaseAppCheck;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import com.google.firebase.heartbeatinfo.HeartBeatConsumerComponent;
 import com.google.firebase.heartbeatinfo.HeartBeatController;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * {@link ComponentRegistrar} for setting up FirebaseAppCheck's dependency injections in Firebase
@@ -34,20 +42,37 @@
  */
 @KeepForSdk
 public class FirebaseAppCheckRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-app-check";
 
   @Override
   public List<Component<?>> getComponents() {
+    Qualified<Executor> uiExecutor = Qualified.qualified(UiThread.class, Executor.class);
+    Qualified<Executor> liteExecutor = Qualified.qualified(Lightweight.class, Executor.class);
+    Qualified<Executor> backgroundExecutor = Qualified.qualified(Background.class, Executor.class);
+    Qualified<ScheduledExecutorService> blockingScheduledExecutorService =
+        Qualified.qualified(Blocking.class, ScheduledExecutorService.class);
+
     return Arrays.asList(
-        Component.builder(FirebaseAppCheck.class, (InternalAppCheckTokenProvider.class))
+        Component.builder(FirebaseAppCheck.class, (InteropAppCheckTokenProvider.class))
+            .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
+            .add(Dependency.required(uiExecutor))
+            .add(Dependency.required(liteExecutor))
+            .add(Dependency.required(backgroundExecutor))
+            .add(Dependency.required(blockingScheduledExecutorService))
             .add(Dependency.optionalProvider(HeartBeatController.class))
             .factory(
                 (container) ->
                     new DefaultFirebaseAppCheck(
                         container.get(FirebaseApp.class),
-                        container.getProvider(HeartBeatController.class)))
+                        container.getProvider(HeartBeatController.class),
+                        container.get(uiExecutor),
+                        container.get(liteExecutor),
+                        container.get(backgroundExecutor),
+                        container.get(blockingScheduledExecutorService)))
             .alwaysEager()
             .build(),
-        LibraryVersionComponent.create("fire-app-check", BuildConfig.VERSION_NAME));
+        HeartBeatConsumerComponent.create(),
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/AppCheckTokenResponse.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/AppCheckTokenResponse.java
index f4975322d85..407ad603c3d 100644
--- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/AppCheckTokenResponse.java
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/AppCheckTokenResponse.java
@@ -19,40 +19,43 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
+import com.google.firebase.FirebaseException;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 /**
- * Client-side model of the AttestationTokenResponse payload from the Firebase App Check Token
- * Exchange API.
+ * Client-side model of the AppCheckToken payload from the Firebase App Check Token Exchange API.
  */
 public class AppCheckTokenResponse {
 
-  @VisibleForTesting static final String ATTESTATION_TOKEN_KEY = "attestationToken";
+  @VisibleForTesting static final String TOKEN_KEY = "token";
   @VisibleForTesting static final String TIME_TO_LIVE_KEY = "ttl";
 
-  private String attestationToken;
+  private String token;
   private String timeToLive;
 
   @NonNull
   public static AppCheckTokenResponse fromJsonString(@NonNull String jsonString)
-      throws JSONException {
+      throws FirebaseException, JSONException {
     JSONObject jsonObject = new JSONObject(jsonString);
-    String attestationToken = emptyToNull(jsonObject.optString(ATTESTATION_TOKEN_KEY));
+    String token = emptyToNull(jsonObject.optString(TOKEN_KEY));
     String timeToLive = emptyToNull(jsonObject.optString(TIME_TO_LIVE_KEY));
-    return new AppCheckTokenResponse(attestationToken, timeToLive);
+    if (token == null || timeToLive == null) {
+      throw new FirebaseException("Unexpected server response.");
+    }
+    return new AppCheckTokenResponse(token, timeToLive);
   }
 
-  private AppCheckTokenResponse(@NonNull String attestationToken, @NonNull String timeToLive) {
-    checkNotNull(attestationToken);
+  private AppCheckTokenResponse(@NonNull String token, @NonNull String timeToLive) {
+    checkNotNull(token);
     checkNotNull(timeToLive);
-    this.attestationToken = attestationToken;
+    this.token = token;
     this.timeToLive = timeToLive;
   }
 
   @NonNull
-  public String getAttestationToken() {
-    return attestationToken;
+  public String getToken() {
+    return token;
   }
 
   @NonNull
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckToken.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckToken.java
index fcd99e1a840..0b1d1b651a3 100644
--- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckToken.java
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckToken.java
@@ -41,6 +41,8 @@ public final class DefaultAppCheckToken extends AppCheckToken {
   @VisibleForTesting static final String ISSUED_AT_KEY = "iat";
   @VisibleForTesting static final String EXPIRATION_TIME_KEY = "exp";
 
+  private static final long ONE_SECOND_MILLIS = 1000L;
+
   // Raw token value
   private final String token;
   // Timestamp in MS at which this token was generated
@@ -75,14 +77,13 @@ public static DefaultAppCheckToken constructFromAppCheckTokenResponse(
     } catch (NumberFormatException e) {
       // If parsing the duration string returned by the server fails for any reason, fall back to
       // computing the timeToLive from the token claims directly.
-      Map<String, Object> claimsMap =
-          TokenParser.parseTokenClaims(tokenResponse.getAttestationToken());
+      Map<String, Object> claimsMap = TokenParser.parseTokenClaims(tokenResponse.getToken());
       long iat = getLongFromClaimsSafely(claimsMap, ISSUED_AT_KEY);
       long exp = getLongFromClaimsSafely(claimsMap, EXPIRATION_TIME_KEY);
-      expiresInMillis = exp - iat;
+      expiresInMillis = (exp - iat) * ONE_SECOND_MILLIS;
     }
 
-    return new DefaultAppCheckToken(tokenResponse.getAttestationToken(), expiresInMillis);
+    return new DefaultAppCheckToken(tokenResponse.getToken(), expiresInMillis);
   }
 
   @NonNull
@@ -138,10 +139,10 @@ public static DefaultAppCheckToken constructFromRawToken(@NonNull String token)
     Map<String, Object> claimsMap = TokenParser.parseTokenClaims(token);
     long iat = getLongFromClaimsSafely(claimsMap, ISSUED_AT_KEY);
     long exp = getLongFromClaimsSafely(claimsMap, EXPIRATION_TIME_KEY);
-    long expiresInMillis = exp - iat;
+    long expiresInMillis = (exp - iat) * ONE_SECOND_MILLIS;
     // We use iat for receivedAtTimestamp as an approximation since we have to guess for raw JWTs
     // that we recovered from storage
-    return new DefaultAppCheckToken(token, expiresInMillis, iat);
+    return new DefaultAppCheckToken(token, expiresInMillis, iat * ONE_SECOND_MILLIS);
   }
 
   private static long getLongFromClaimsSafely(
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenResult.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenResult.java
index 02bddb94e23..4398d0a6a70 100644
--- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenResult.java
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenResult.java
@@ -58,7 +58,7 @@ public String getToken() {
 
   @Nullable
   @Override
-  public FirebaseException getError() {
+  public Exception getError() {
     return error;
   }
 }
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheck.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheck.java
index 087d10b9868..737b314457a 100644
--- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheck.java
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheck.java
@@ -19,11 +19,15 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseException;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
 import com.google.firebase.appcheck.AppCheckProvider;
 import com.google.firebase.appcheck.AppCheckProviderFactory;
 import com.google.firebase.appcheck.AppCheckToken;
@@ -35,6 +39,8 @@
 import com.google.firebase.inject.Provider;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
 
 public class DefaultFirebaseAppCheck extends FirebaseAppCheck {
 
@@ -46,15 +52,24 @@ public class DefaultFirebaseAppCheck extends FirebaseAppCheck {
   private final List<AppCheckListener> appCheckListenerList;
   private final StorageHelper storageHelper;
   private final TokenRefreshManager tokenRefreshManager;
+  private final Executor uiExecutor;
+  private final Executor liteExecutor;
+  private final Executor backgroundExecutor;
+  private final Task<Void> retrieveStoredTokenTask;
   private final Clock clock;
 
   private AppCheckProviderFactory appCheckProviderFactory;
   private AppCheckProvider appCheckProvider;
   private AppCheckToken cachedToken;
+  private Task<AppCheckToken> cachedTokenTask;
 
   public DefaultFirebaseAppCheck(
       @NonNull FirebaseApp firebaseApp,
-      @NonNull Provider<HeartBeatController> heartBeatController) {
+      @NonNull Provider<HeartBeatController> heartBeatController,
+      @UiThread Executor uiExecutor,
+      @Lightweight Executor liteExecutor,
+      @Background Executor backgroundExecutor,
+      @Blocking ScheduledExecutorService scheduledExecutorService) {
     checkNotNull(firebaseApp);
     checkNotNull(heartBeatController);
     this.firebaseApp = firebaseApp;
@@ -64,9 +79,29 @@ public DefaultFirebaseAppCheck(
     this.storageHelper =
         new StorageHelper(firebaseApp.getApplicationContext(), firebaseApp.getPersistenceKey());
     this.tokenRefreshManager =
-        new TokenRefreshManager(firebaseApp.getApplicationContext(), /* firebaseAppCheck= */ this);
+        new TokenRefreshManager(
+            firebaseApp.getApplicationContext(),
+            /* firebaseAppCheck= */ this,
+            liteExecutor,
+            scheduledExecutorService);
+    this.uiExecutor = uiExecutor;
+    this.liteExecutor = liteExecutor;
+    this.backgroundExecutor = backgroundExecutor;
+    this.retrieveStoredTokenTask = retrieveStoredAppCheckTokenInBackground(backgroundExecutor);
     this.clock = new Clock.DefaultClock();
-    setCachedToken(storageHelper.retrieveAppCheckToken());
+  }
+
+  private Task<Void> retrieveStoredAppCheckTokenInBackground(@NonNull Executor executor) {
+    TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
+    executor.execute(
+        () -> {
+          AppCheckToken token = storageHelper.retrieveAppCheckToken();
+          if (token != null) {
+            setCachedToken(token);
+          }
+          taskCompletionSource.setResult(null);
+        });
+    return taskCompletionSource.getTask();
   }
 
   @Override
@@ -146,68 +181,115 @@ public void removeAppCheckListener(@NonNull AppCheckListener listener) {
   @NonNull
   @Override
   public Task<AppCheckTokenResult> getToken(boolean forceRefresh) {
-    if (!forceRefresh && hasValidToken()) {
-      return Tasks.forResult(DefaultAppCheckTokenResult.constructFromAppCheckToken(cachedToken));
-    }
-    if (appCheckProvider == null) {
-      return Tasks.forResult(
-          DefaultAppCheckTokenResult.constructFromError(
-              new FirebaseException("No AppCheckProvider installed.")));
-    }
-    // TODO: Cache the in-flight task.
-    return fetchTokenFromProvider()
-        .continueWithTask(
-            new Continuation<AppCheckToken, Task<AppCheckTokenResult>>() {
-              @Override
-              public Task<AppCheckTokenResult> then(@NonNull Task<AppCheckToken> task) {
-                if (task.isSuccessful()) {
+    return retrieveStoredTokenTask.continueWithTask(
+        liteExecutor,
+        unused -> {
+          if (!forceRefresh && hasValidToken()) {
+            return Tasks.forResult(
+                DefaultAppCheckTokenResult.constructFromAppCheckToken(cachedToken));
+          }
+          if (appCheckProvider == null) {
+            return Tasks.forResult(
+                DefaultAppCheckTokenResult.constructFromError(
+                    new FirebaseException("No AppCheckProvider installed.")));
+          }
+          if (cachedTokenTask == null
+              || cachedTokenTask.isComplete()
+              || cachedTokenTask.isCanceled()) {
+            cachedTokenTask = fetchTokenFromProvider();
+          }
+          return cachedTokenTask.continueWithTask(
+              liteExecutor,
+              appCheckTokenTask -> {
+                if (appCheckTokenTask.isSuccessful()) {
                   return Tasks.forResult(
-                      DefaultAppCheckTokenResult.constructFromAppCheckToken(task.getResult()));
+                      DefaultAppCheckTokenResult.constructFromAppCheckToken(
+                          appCheckTokenTask.getResult()));
                 }
-                // If the token exchange failed, return a dummy token for integrators to attach in
-                // their headers.
+                // If the token exchange failed, return a dummy token for integrators to attach
+                // in their headers.
                 return Tasks.forResult(
                     DefaultAppCheckTokenResult.constructFromError(
                         new FirebaseException(
-                            task.getException().getMessage(), task.getException())));
+                            appCheckTokenTask.getException().getMessage(),
+                            appCheckTokenTask.getException())));
+              });
+        });
+  }
+
+  @NonNull
+  @Override
+  public Task<AppCheckTokenResult> getLimitedUseToken() {
+    return getLimitedUseAppCheckToken()
+        .continueWithTask(
+            liteExecutor,
+            appCheckTokenTask -> {
+              if (appCheckTokenTask.isSuccessful()) {
+                return Tasks.forResult(
+                    DefaultAppCheckTokenResult.constructFromAppCheckToken(
+                        appCheckTokenTask.getResult()));
               }
+              // If the token exchange failed, return a dummy token for integrators to attach
+              // in their headers.
+              return Tasks.forResult(
+                  DefaultAppCheckTokenResult.constructFromError(
+                      new FirebaseException(
+                          appCheckTokenTask.getException().getMessage(),
+                          appCheckTokenTask.getException())));
             });
   }
 
   @NonNull
   @Override
   public Task<AppCheckToken> getAppCheckToken(boolean forceRefresh) {
-    if (!forceRefresh && hasValidToken()) {
-      return Tasks.forResult(cachedToken);
-    }
+    return retrieveStoredTokenTask.continueWithTask(
+        liteExecutor,
+        unused -> {
+          if (!forceRefresh && hasValidToken()) {
+            return Tasks.forResult(cachedToken);
+          }
+          if (appCheckProvider == null) {
+            return Tasks.forException(new FirebaseException("No AppCheckProvider installed."));
+          }
+          if (cachedTokenTask == null
+              || cachedTokenTask.isComplete()
+              || cachedTokenTask.isCanceled()) {
+            cachedTokenTask = fetchTokenFromProvider();
+          }
+          return cachedTokenTask;
+        });
+  }
+
+  @NonNull
+  @Override
+  public Task<AppCheckToken> getLimitedUseAppCheckToken() {
     if (appCheckProvider == null) {
       return Tasks.forException(new FirebaseException("No AppCheckProvider installed."));
     }
-    return fetchTokenFromProvider();
+
+    // We explicitly do not call the fetchTokenFromProvider helper method, as that method includes
+    // side effects such as notifying listeners, updating the cached token, and scheduling token
+    // refresh.
+    return appCheckProvider.getToken();
   }
 
   /** Fetches an {@link AppCheckToken} via the installed {@link AppCheckProvider}. */
   Task<AppCheckToken> fetchTokenFromProvider() {
     return appCheckProvider
         .getToken()
-        .continueWithTask(
-            new Continuation<AppCheckToken, Task<AppCheckToken>>() {
-              @Override
-              public Task<AppCheckToken> then(@NonNull Task<AppCheckToken> task) {
-                if (task.isSuccessful()) {
-                  AppCheckToken token = task.getResult();
-                  updateStoredToken(token);
-                  for (AppCheckListener listener : appCheckListenerList) {
-                    listener.onAppCheckTokenChanged(token);
-                  }
-                  AppCheckTokenResult tokenResult =
-                      DefaultAppCheckTokenResult.constructFromAppCheckToken(token);
-                  for (AppCheckTokenListener listener : appCheckTokenListenerList) {
-                    listener.onAppCheckTokenChanged(tokenResult);
-                  }
-                }
-                return task;
+        .onSuccessTask(
+            uiExecutor,
+            token -> {
+              updateStoredToken(token);
+              for (AppCheckListener listener : appCheckListenerList) {
+                listener.onAppCheckTokenChanged(token);
+              }
+              AppCheckTokenResult tokenResult =
+                  DefaultAppCheckTokenResult.constructFromAppCheckToken(token);
+              for (AppCheckTokenListener listener : appCheckTokenListenerList) {
+                listener.onAppCheckTokenChanged(tokenResult);
               }
+              return Tasks.forResult(token);
             });
   }
 
@@ -227,7 +309,7 @@ void setCachedToken(@NonNull AppCheckToken token) {
    * well as the in-memory cached {@link AppCheckToken}.
    */
   private void updateStoredToken(@NonNull AppCheckToken token) {
-    storageHelper.saveAppCheckToken(token);
+    backgroundExecutor.execute(() -> storageHelper.saveAppCheckToken(token));
     setCachedToken(token);
 
     tokenRefreshManager.maybeScheduleTokenRefresh(token);
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultTokenRefresher.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultTokenRefresher.java
index 8e7f6722046..5098b8a6d53 100644
--- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultTokenRefresher.java
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultTokenRefresher.java
@@ -20,8 +20,9 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
-import com.google.android.gms.tasks.OnFailureListener;
-import java.util.concurrent.Executors;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 
@@ -36,19 +37,18 @@ public class DefaultTokenRefresher {
   @VisibleForTesting static final long MAX_DELAY_SECONDS = 16 * 60; // 16 minutes
 
   private final DefaultFirebaseAppCheck firebaseAppCheck;
+  private final Executor liteExecutor;
   private final ScheduledExecutorService scheduledExecutorService;
 
   private volatile ScheduledFuture<?> refreshFuture;
   private volatile long delayAfterFailureSeconds;
 
-  DefaultTokenRefresher(@NonNull DefaultFirebaseAppCheck firebaseAppCheck) {
-    this(checkNotNull(firebaseAppCheck), Executors.newScheduledThreadPool(/* corePoolSize= */ 1));
-  }
-
-  @VisibleForTesting
   DefaultTokenRefresher(
-      DefaultFirebaseAppCheck firebaseAppCheck, ScheduledExecutorService scheduledExecutorService) {
-    this.firebaseAppCheck = firebaseAppCheck;
+      @NonNull DefaultFirebaseAppCheck firebaseAppCheck,
+      @Lightweight Executor liteExecutor,
+      @Blocking ScheduledExecutorService scheduledExecutorService) {
+    this.firebaseAppCheck = checkNotNull(firebaseAppCheck);
+    this.liteExecutor = liteExecutor;
     this.scheduledExecutorService = scheduledExecutorService;
     this.delayAfterFailureSeconds = UNSET_DELAY;
   }
@@ -93,13 +93,7 @@ private long getNextRefreshMillis() {
   private void onRefresh() {
     firebaseAppCheck
         .fetchTokenFromProvider()
-        .addOnFailureListener(
-            new OnFailureListener() {
-              @Override
-              public void onFailure(@NonNull Exception e) {
-                scheduleRefreshAfterFailure();
-              }
-            });
+        .addOnFailureListener(liteExecutor, e -> scheduleRefreshAfterFailure());
   }
 
   /** Cancels the in-flight scheduled refresh. */
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/NetworkClient.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/NetworkClient.java
index 4cf4de5c602..959a64efda2 100644
--- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/NetworkClient.java
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/NetworkClient.java
@@ -51,10 +51,12 @@ public class NetworkClient {
 
   private static final String TAG = NetworkClient.class.getName();
 
-  private static final String SAFETY_NET_EXCHANGE_URL_TEMPLATE =
-      "https://firebaseappcheck.googleapis.com/v1beta/projects/%s/apps/%s:exchangeSafetyNetToken?key=%s";
   private static final String DEBUG_EXCHANGE_URL_TEMPLATE =
-      "https://firebaseappcheck.googleapis.com/v1beta/projects/%s/apps/%s:exchangeDebugToken?key=%s";
+      "https://firebaseappcheck.googleapis.com/v1/projects/%s/apps/%s:exchangeDebugToken?key=%s";
+  private static final String PLAY_INTEGRITY_EXCHANGE_URL_TEMPLATE =
+      "https://firebaseappcheck.googleapis.com/v1/projects/%s/apps/%s:exchangePlayIntegrityToken?key=%s";
+  private static final String PLAY_INTEGRITY_CHALLENGE_URL_TEMPLATE =
+      "https://firebaseappcheck.googleapis.com/v1/projects/%s/apps/%s:generatePlayIntegrityChallenge?key=%s";
   private static final String CONTENT_TYPE = "Content-Type";
   private static final String APPLICATION_JSON = "application/json";
   private static final String UTF_8 = "UTF-8";
@@ -69,12 +71,12 @@ public class NetworkClient {
   private final Provider<HeartBeatController> heartBeatControllerProvider;
 
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({UNKNOWN, SAFETY_NET, DEBUG})
+  @IntDef({UNKNOWN, DEBUG, PLAY_INTEGRITY})
   public @interface AttestationTokenType {}
 
   public static final int UNKNOWN = 0;
-  public static final int SAFETY_NET = 1;
   public static final int DEBUG = 2;
+  public static final int PLAY_INTEGRITY = 3;
 
   public NetworkClient(@NonNull FirebaseApp firebaseApp) {
     this(
@@ -116,6 +118,34 @@ public AppCheckTokenResponse exchangeAttestationForAppCheckToken(
       throw new FirebaseException("Too many attempts.");
     }
     URL url = new URL(String.format(getUrlTemplate(tokenType), projectId, appId, apiKey));
+    String response =
+        makeNetworkRequest(url, requestBytes, retryManager, /* resetRetryManagerOnSuccess= */ true);
+    return AppCheckTokenResponse.fromJsonString(response);
+  }
+
+  /**
+   * Calls the App Check backend using {@link HttpURLConnection} in order to generate a challenge
+   * nonce for the Play Integrity attestation flow.
+   */
+  @NonNull
+  public String generatePlayIntegrityChallenge(
+      @NonNull byte[] requestBytes, @NonNull RetryManager retryManager)
+      throws FirebaseException, IOException, JSONException {
+    if (!retryManager.canRetry()) {
+      throw new FirebaseException("Too many attempts.");
+    }
+    URL url =
+        new URL(String.format(PLAY_INTEGRITY_CHALLENGE_URL_TEMPLATE, projectId, appId, apiKey));
+    return makeNetworkRequest(
+        url, requestBytes, retryManager, /* resetRetryManagerOnSuccess= */ false);
+  }
+
+  private String makeNetworkRequest(
+      @NonNull URL url,
+      @NonNull byte[] requestBytes,
+      @NonNull RetryManager retryManager,
+      boolean resetRetryManagerOnSuccess)
+      throws FirebaseException, IOException, JSONException {
     HttpURLConnection urlConnection = createHttpUrlConnection(url);
 
     try {
@@ -159,8 +189,10 @@ public AppCheckTokenResponse exchangeAttestationForAppCheckToken(
                 + " body: "
                 + httpErrorResponse.getErrorMessage());
       }
-      retryManager.resetBackoffOnSuccess();
-      return AppCheckTokenResponse.fromJsonString(responseBody);
+      if (resetRetryManagerOnSuccess) {
+        retryManager.resetBackoffOnSuccess();
+      }
+      return responseBody;
     } finally {
       urlConnection.disconnect();
     }
@@ -199,10 +231,10 @@ private String getFingerprintHashForPackage() {
 
   private static String getUrlTemplate(@AttestationTokenType int tokenType) {
     switch (tokenType) {
-      case SAFETY_NET:
-        return SAFETY_NET_EXCHANGE_URL_TEMPLATE;
       case DEBUG:
         return DEBUG_EXCHANGE_URL_TEMPLATE;
+      case PLAY_INTEGRITY:
+        return PLAY_INTEGRITY_EXCHANGE_URL_TEMPLATE;
       default:
         throw new IllegalArgumentException("Unknown token type.");
     }
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/RetryManager.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/RetryManager.java
index ea8c6cde029..8798c655512 100644
--- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/RetryManager.java
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/RetryManager.java
@@ -26,7 +26,6 @@
 public class RetryManager {
 
   @VisibleForTesting static final int BAD_REQUEST_ERROR_CODE = 400;
-  @VisibleForTesting static final int FORBIDDEN_ERROR_CODE = 403;
   @VisibleForTesting static final int NOT_FOUND_ERROR_CODE = 404;
   @VisibleForTesting static final long MAX_EXP_BACKOFF_MILLIS = 4 * 60 * 60 * 1000; // 4 hours
   @VisibleForTesting static final long ONE_DAY_MILLIS = 24 * 60 * 60 * 1000; // 24 hours
@@ -91,9 +90,7 @@ public void updateBackoffOnFailure(int errorCode) {
 
   @BackoffStrategyType
   private static int getBackoffStrategyByErrorCode(int errorCode) {
-    if (errorCode == BAD_REQUEST_ERROR_CODE
-        || errorCode == FORBIDDEN_ERROR_CODE
-        || errorCode == NOT_FOUND_ERROR_CODE) {
+    if (errorCode == BAD_REQUEST_ERROR_CODE || errorCode == NOT_FOUND_ERROR_CODE) {
       return ONE_DAY;
     }
     return EXPONENTIAL;
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/StorageHelper.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/StorageHelper.java
index 5537b636cf9..ae821de0d39 100644
--- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/StorageHelper.java
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/StorageHelper.java
@@ -24,6 +24,7 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.appcheck.AppCheckToken;
 import com.google.firebase.appcheck.internal.util.Logger;
+import com.google.firebase.components.Lazy;
 
 /**
  * Internal class used to persist {@link com.google.firebase.appcheck.AppCheckToken}s. Uses {@link
@@ -47,24 +48,27 @@ enum TokenType {
     UNKNOWN_APP_CHECK_TOKEN
   }
 
-  private SharedPreferences sharedPreferences;
+  private Lazy<SharedPreferences> sharedPreferences;
 
   public StorageHelper(@NonNull Context context, @NonNull String persistenceKey) {
     checkNotNull(context);
     checkNotEmpty(persistenceKey);
     String prefsName = String.format(PREFS_TEMPLATE, persistenceKey);
-    this.sharedPreferences = context.getSharedPreferences(prefsName, Context.MODE_PRIVATE);
+    this.sharedPreferences =
+        new Lazy(() -> context.getSharedPreferences(prefsName, Context.MODE_PRIVATE));
   }
 
   public void saveAppCheckToken(@NonNull AppCheckToken appCheckToken) {
     if (appCheckToken instanceof DefaultAppCheckToken) {
       sharedPreferences
+          .get()
           .edit()
           .putString(TOKEN_KEY, ((DefaultAppCheckToken) appCheckToken).serializeTokenToString())
           .putString(TOKEN_TYPE_KEY, TokenType.DEFAULT_APP_CHECK_TOKEN.name())
           .apply();
     } else {
       sharedPreferences
+          .get()
           .edit()
           .putString(TOKEN_KEY, appCheckToken.getToken())
           .putString(TOKEN_TYPE_KEY, TokenType.UNKNOWN_APP_CHECK_TOKEN.name())
@@ -74,8 +78,8 @@ public void saveAppCheckToken(@NonNull AppCheckToken appCheckToken) {
 
   @Nullable
   public AppCheckToken retrieveAppCheckToken() {
-    String tokenType = sharedPreferences.getString(TOKEN_TYPE_KEY, null);
-    String serializedToken = sharedPreferences.getString(TOKEN_KEY, null);
+    String tokenType = sharedPreferences.get().getString(TOKEN_TYPE_KEY, null);
+    String serializedToken = sharedPreferences.get().getString(TOKEN_KEY, null);
     if (tokenType == null || serializedToken == null) {
       return null;
     }
@@ -101,6 +105,6 @@ public AppCheckToken retrieveAppCheckToken() {
   }
 
   void clearSharedPrefs() {
-    sharedPreferences.edit().remove(TOKEN_KEY).remove(TOKEN_TYPE_KEY).apply();
+    sharedPreferences.get().edit().remove(TOKEN_KEY).remove(TOKEN_TYPE_KEY).apply();
   }
 }
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/TokenRefreshManager.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/TokenRefreshManager.java
index ac116dd0ca7..4ac16a05c5b 100644
--- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/TokenRefreshManager.java
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/TokenRefreshManager.java
@@ -22,8 +22,12 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.common.api.internal.BackgroundDetector;
 import com.google.android.gms.common.api.internal.BackgroundDetector.BackgroundStateChangeListener;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
 import com.google.firebase.appcheck.AppCheckToken;
 import com.google.firebase.appcheck.internal.util.Clock;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
 
 /** Class to manage whether or not to schedule an {@link AppCheckToken} refresh attempt. */
 public final class TokenRefreshManager {
@@ -41,10 +45,15 @@ public final class TokenRefreshManager {
   private volatile long nextRefreshTimeMillis;
   private volatile boolean isAutoRefreshEnabled;
 
-  TokenRefreshManager(@NonNull Context context, @NonNull DefaultFirebaseAppCheck firebaseAppCheck) {
+  TokenRefreshManager(
+      @NonNull Context context,
+      @NonNull DefaultFirebaseAppCheck firebaseAppCheck,
+      @Lightweight Executor liteExecutor,
+      @Blocking ScheduledExecutorService scheduledExecutorService) {
     this(
         checkNotNull(context),
-        new DefaultTokenRefresher(checkNotNull(firebaseAppCheck)),
+        new DefaultTokenRefresher(
+            checkNotNull(firebaseAppCheck), liteExecutor, scheduledExecutorService),
         new Clock.DefaultClock());
   }
 
diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/ktx/FirebaseAppCheck.kt b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/ktx/FirebaseAppCheck.kt
new file mode 100644
index 00000000000..15e1f5b2189
--- /dev/null
+++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/ktx/FirebaseAppCheck.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.appcheck.ktx
+
+import com.google.firebase.FirebaseApp
+import com.google.firebase.appcheck.AppCheckToken
+import com.google.firebase.appcheck.FirebaseAppCheck
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseAppCheck] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.appCheck: FirebaseAppCheck
+  get() = FirebaseAppCheck.getInstance()
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseAppCheck] instance of a given [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.appCheck(app: FirebaseApp) = FirebaseAppCheck.getInstance(app)
+
+/**
+ * Destructuring declaration for [AppCheckToken] to provide token.
+ *
+ * @return the token of the [AppCheckToken]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun AppCheckToken.component1() = token
+
+/**
+ * Destructuring declaration for [AppCheckToken] to provide expireTimeMillis.
+ *
+ * @return the expireTimeMillis of the [AppCheckToken]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun AppCheckToken.component2() = expireTimeMillis
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+class FirebaseAppCheckKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrarTest.java b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrarTest.java
index 3b235c14ce4..c5e6a35d112 100644
--- a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrarTest.java
+++ b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrarTest.java
@@ -17,10 +17,17 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
 import com.google.firebase.heartbeatinfo.HeartBeatController;
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -34,11 +41,16 @@ public void testGetComponents() {
     FirebaseAppCheckRegistrar firebaseAppCheckRegistrar = new FirebaseAppCheckRegistrar();
     List<Component<?>> components = firebaseAppCheckRegistrar.getComponents();
     assertThat(components).isNotEmpty();
-    assertThat(components).hasSize(2);
+    assertThat(components).hasSize(3);
     Component<?> firebaseAppCheckComponent = components.get(0);
     assertThat(firebaseAppCheckComponent.getDependencies())
         .containsExactly(
             Dependency.required(FirebaseApp.class),
+            Dependency.required(Qualified.qualified(UiThread.class, Executor.class)),
+            Dependency.required(Qualified.qualified(Lightweight.class, Executor.class)),
+            Dependency.required(Qualified.qualified(Background.class, Executor.class)),
+            Dependency.required(
+                Qualified.qualified(Blocking.class, ScheduledExecutorService.class)),
             Dependency.optionalProvider(HeartBeatController.class));
     assertThat(firebaseAppCheckComponent.isAlwaysEager()).isTrue();
   }
diff --git a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/AppCheckTokenResponseTest.java b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/AppCheckTokenResponseTest.java
index 8a25459692b..db2255d151f 100644
--- a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/AppCheckTokenResponseTest.java
+++ b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/AppCheckTokenResponseTest.java
@@ -17,6 +17,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
 
+import com.google.firebase.FirebaseException;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,38 +29,36 @@
 @Config(manifest = Config.NONE)
 public class AppCheckTokenResponseTest {
 
-  private static final String ATTESTATION_TOKEN = "attestationToken";
-  private static final String TIME_TO_LIVE = "ttl";
+  private static final String APP_CHECK_TOKEN = "appCheckToken";
+  private static final String TIME_TO_LIVE = "3600s";
 
   @Test
   public void fromJsonString_expectDeserialized() throws Exception {
     JSONObject jsonObject = new JSONObject();
-    jsonObject.put(AppCheckTokenResponse.ATTESTATION_TOKEN_KEY, ATTESTATION_TOKEN);
+    jsonObject.put(AppCheckTokenResponse.TOKEN_KEY, APP_CHECK_TOKEN);
     jsonObject.put(AppCheckTokenResponse.TIME_TO_LIVE_KEY, TIME_TO_LIVE);
 
     AppCheckTokenResponse appCheckTokenResponse =
         AppCheckTokenResponse.fromJsonString(jsonObject.toString());
-    assertThat(appCheckTokenResponse.getAttestationToken()).isEqualTo(ATTESTATION_TOKEN);
+    assertThat(appCheckTokenResponse.getToken()).isEqualTo(APP_CHECK_TOKEN);
     assertThat(appCheckTokenResponse.getTimeToLive()).isEqualTo(TIME_TO_LIVE);
   }
 
   @Test
-  public void fromJsonString_nullAttestationToken_throwsException() throws Exception {
+  public void fromJsonString_nullToken_throwsException() throws Exception {
     JSONObject jsonObject = new JSONObject();
     jsonObject.put(AppCheckTokenResponse.TIME_TO_LIVE_KEY, TIME_TO_LIVE);
 
     assertThrows(
-        NullPointerException.class,
-        () -> AppCheckTokenResponse.fromJsonString(jsonObject.toString()));
+        FirebaseException.class, () -> AppCheckTokenResponse.fromJsonString(jsonObject.toString()));
   }
 
   @Test
   public void fromJsonString_nullTimeToLive_throwsException() throws Exception {
     JSONObject jsonObject = new JSONObject();
-    jsonObject.put(AppCheckTokenResponse.ATTESTATION_TOKEN_KEY, ATTESTATION_TOKEN);
+    jsonObject.put(AppCheckTokenResponse.TOKEN_KEY, APP_CHECK_TOKEN);
 
     assertThrows(
-        NullPointerException.class,
-        () -> AppCheckTokenResponse.fromJsonString(jsonObject.toString()));
+        FirebaseException.class, () -> AppCheckTokenResponse.fromJsonString(jsonObject.toString()));
   }
 }
diff --git a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenTest.java b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenTest.java
index 1f98a079c9f..b9be2652d1e 100644
--- a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenTest.java
+++ b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenTest.java
@@ -37,6 +37,7 @@ public class DefaultAppCheckTokenTest {
   private static final String INVALID_TIME_TO_LIVE = "notanumber";
   private static final long EXPIRES_IN_ONE_HOUR = 60L * 60L * 1000L; // 1 hour in millis
   private static final long RECEIVED_AT_TIMESTAMP = 1L;
+  private static final long ONE_SECOND_MILLIS = 1000L;
   private static final long IAT = 10L;
   private static final long EXP = 30L;
   private static final String TOKEN_PREFIX = "prefix";
@@ -104,13 +105,14 @@ public void testConstructFromRawToken_normalToken_expectSuccess() throws Excepti
 
     assertThat(defaultAppCheckToken).isNotNull();
     assertThat(defaultAppCheckToken.getToken()).isEqualTo(rawToken);
-    assertThat(defaultAppCheckToken.getReceivedAtTimestamp()).isEqualTo(IAT);
-    assertThat(defaultAppCheckToken.getExpiresInMillis()).isEqualTo(EXP - IAT);
+    assertThat(defaultAppCheckToken.getReceivedAtTimestamp()).isEqualTo(IAT * ONE_SECOND_MILLIS);
+    assertThat(defaultAppCheckToken.getExpiresInMillis())
+        .isEqualTo((EXP - IAT) * ONE_SECOND_MILLIS);
   }
 
   @Test
   public void testConstructFromAppCheckTokenResponse_success() {
-    when(mockAppCheckTokenResponse.getAttestationToken()).thenReturn(TOKEN_PAYLOAD);
+    when(mockAppCheckTokenResponse.getToken()).thenReturn(TOKEN_PAYLOAD);
     when(mockAppCheckTokenResponse.getTimeToLive()).thenReturn(TIME_TO_LIVE_ONE_HOUR);
 
     DefaultAppCheckToken defaultAppCheckToken =
@@ -122,7 +124,7 @@ public void testConstructFromAppCheckTokenResponse_success() {
 
   @Test
   public void testConstructFromAppCheckTokenResponse_withNanoSecondsDuration_success() {
-    when(mockAppCheckTokenResponse.getAttestationToken()).thenReturn(TOKEN_PAYLOAD);
+    when(mockAppCheckTokenResponse.getToken()).thenReturn(TOKEN_PAYLOAD);
     when(mockAppCheckTokenResponse.getTimeToLive()).thenReturn(TIME_TO_LIVE_ONE_HOUR_PLUS_NANOS);
 
     DefaultAppCheckToken defaultAppCheckToken =
@@ -136,14 +138,15 @@ public void testConstructFromAppCheckTokenResponse_withNanoSecondsDuration_succe
   public void testConstructFromAppCheckTokenResponse_invalidTimeToLiveFormat_fallbackToTokenClaims()
       throws Exception {
     String rawToken = constructFakeRawToken();
-    when(mockAppCheckTokenResponse.getAttestationToken()).thenReturn(rawToken);
+    when(mockAppCheckTokenResponse.getToken()).thenReturn(rawToken);
     when(mockAppCheckTokenResponse.getTimeToLive()).thenReturn(INVALID_TIME_TO_LIVE);
 
     DefaultAppCheckToken defaultAppCheckToken =
         DefaultAppCheckToken.constructFromAppCheckTokenResponse(mockAppCheckTokenResponse);
 
     assertThat(defaultAppCheckToken.getToken()).isEqualTo(rawToken);
-    assertThat(defaultAppCheckToken.getExpiresInMillis()).isEqualTo(EXP - IAT);
+    assertThat(defaultAppCheckToken.getExpiresInMillis())
+        .isEqualTo((EXP - IAT) * ONE_SECOND_MILLIS);
   }
 
   private String constructFakeRawToken() throws Exception {
diff --git a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheckTest.java b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheckTest.java
index 320dbd9d1c2..5d5974036e6 100644
--- a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheckTest.java
+++ b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheckTest.java
@@ -24,6 +24,7 @@
 import androidx.test.core.app.ApplicationProvider;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.appcheck.AppCheckProvider;
 import com.google.firebase.appcheck.AppCheckProviderFactory;
@@ -31,6 +32,7 @@
 import com.google.firebase.appcheck.AppCheckTokenResult;
 import com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener;
 import com.google.firebase.appcheck.interop.AppCheckTokenListener;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.heartbeatinfo.HeartBeatController;
 import org.junit.Before;
 import org.junit.Test;
@@ -40,10 +42,12 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
 
 /** Tests for {@link DefaultFirebaseAppCheck}. */
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
+@LooperMode(LooperMode.Mode.LEGACY)
 public class DefaultFirebaseAppCheckTest {
 
   private static final String EXCEPTION_TEXT = "exceptionText";
@@ -73,8 +77,15 @@ public void setup() {
     when(mockAppCheckProviderFactory.create(any())).thenReturn(mockAppCheckProvider);
     when(mockAppCheckProvider.getToken()).thenReturn(Tasks.forResult(validDefaultAppCheckToken));
 
+    // TODO(b/258273630): Use TestOnlyExecutors instead of MoreExecutors.directExecutor().
     defaultFirebaseAppCheck =
-        new DefaultFirebaseAppCheck(mockFirebaseApp, () -> mockHeartBeatController);
+        new DefaultFirebaseAppCheck(
+            mockFirebaseApp,
+            () -> mockHeartBeatController,
+            TestOnlyExecutors.ui(),
+            /* liteExecutor= */ MoreExecutors.directExecutor(),
+            /* backgroundExecutor= */ MoreExecutors.directExecutor(),
+            TestOnlyExecutors.blocking());
   }
 
   @Test
@@ -82,7 +93,13 @@ public void testConstructor_nullFirebaseApp_expectThrows() {
     assertThrows(
         NullPointerException.class,
         () -> {
-          new DefaultFirebaseAppCheck(null, () -> mockHeartBeatController);
+          new DefaultFirebaseAppCheck(
+              null,
+              () -> mockHeartBeatController,
+              TestOnlyExecutors.ui(),
+              TestOnlyExecutors.lite(),
+              TestOnlyExecutors.background(),
+              TestOnlyExecutors.blocking());
         });
   }
 
@@ -91,7 +108,13 @@ public void testConstructor_nullHeartBeatControllerProvider_expectThrows() {
     assertThrows(
         NullPointerException.class,
         () -> {
-          new DefaultFirebaseAppCheck(mockFirebaseApp, null);
+          new DefaultFirebaseAppCheck(
+              mockFirebaseApp,
+              null,
+              TestOnlyExecutors.ui(),
+              TestOnlyExecutors.lite(),
+              TestOnlyExecutors.background(),
+              TestOnlyExecutors.blocking());
         });
   }
 
@@ -205,6 +228,22 @@ public void testGetAppCheckToken_noFactoryInstalled_taskFails() throws Exception
     assertThat(tokenTask.isSuccessful()).isFalse();
   }
 
+  @Test
+  public void testGetLimitedUseAppCheckToken_noFactoryInstalled_taskFails() throws Exception {
+    Task<AppCheckToken> tokenTask = defaultFirebaseAppCheck.getLimitedUseAppCheckToken();
+    assertThat(tokenTask.isComplete()).isTrue();
+    assertThat(tokenTask.isSuccessful()).isFalse();
+  }
+
+  @Test
+  public void testGetLimitedUseToken_noFactoryInstalled_returnResultWithError() throws Exception {
+    Task<AppCheckTokenResult> tokenTask = defaultFirebaseAppCheck.getLimitedUseToken();
+    assertThat(tokenTask.isComplete()).isTrue();
+    assertThat(tokenTask.isSuccessful()).isTrue();
+    assertThat(tokenTask.getResult().getToken()).isNotNull();
+    assertThat(tokenTask.getResult().getError()).isNotNull();
+  }
+
   @Test
   public void testGetToken_factoryInstalled_proxiesToAppCheckFactory() {
     defaultFirebaseAppCheck.installAppCheckProviderFactory(mockAppCheckProviderFactory);
@@ -373,4 +412,42 @@ public void testGetAppCheckToken_existingInvalidToken_requestsNewToken() {
 
     verify(mockAppCheckProvider).getToken();
   }
+
+  @Test
+  public void testGetLimitedUseAppCheckToken_noExistingToken_requestsNewToken() {
+    defaultFirebaseAppCheck.installAppCheckProviderFactory(mockAppCheckProviderFactory);
+
+    defaultFirebaseAppCheck.getLimitedUseAppCheckToken();
+
+    verify(mockAppCheckProvider).getToken();
+  }
+
+  @Test
+  public void testGetLimitedUseAppCheckToken_existingToken_requestsNewToken() {
+    defaultFirebaseAppCheck.setCachedToken(validDefaultAppCheckToken);
+    defaultFirebaseAppCheck.installAppCheckProviderFactory(mockAppCheckProviderFactory);
+
+    defaultFirebaseAppCheck.getLimitedUseAppCheckToken();
+
+    verify(mockAppCheckProvider).getToken();
+  }
+
+  @Test
+  public void testGetLimitedUseToken_noExistingToken_requestsNewToken() {
+    defaultFirebaseAppCheck.installAppCheckProviderFactory(mockAppCheckProviderFactory);
+
+    defaultFirebaseAppCheck.getLimitedUseToken();
+
+    verify(mockAppCheckProvider).getToken();
+  }
+
+  @Test
+  public void testGetLimitedUseToken_existingToken_requestsNewToken() {
+    defaultFirebaseAppCheck.setCachedToken(validDefaultAppCheckToken);
+    defaultFirebaseAppCheck.installAppCheckProviderFactory(mockAppCheckProviderFactory);
+
+    defaultFirebaseAppCheck.getLimitedUseToken();
+
+    verify(mockAppCheckProvider).getToken();
+  }
 }
diff --git a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultTokenRefresherTest.java b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultTokenRefresherTest.java
index 67b7fd5805b..0a3f31ddb3f 100644
--- a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultTokenRefresherTest.java
+++ b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultTokenRefresherTest.java
@@ -24,6 +24,7 @@
 import static org.mockito.Mockito.when;
 
 import com.google.android.gms.tasks.Tasks;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.firebase.appcheck.AppCheckToken;
 import java.util.concurrent.ScheduledExecutorService;
 import org.junit.Before;
@@ -33,8 +34,10 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.LooperMode;
 
 @RunWith(RobolectricTestRunner.class)
+@LooperMode(LooperMode.Mode.LEGACY)
 public class DefaultTokenRefresherTest {
 
   private static final long TIME_TO_REFRESH_MILLIS = 1000L;
@@ -42,7 +45,6 @@ public class DefaultTokenRefresherTest {
   private static final long TWO_MINUTES_SECONDS = 2L * 60L;
   private static final long FOUR_MINUTES_SECONDS = 4L * 60L;
   private static final long EIGHT_MINUTES_SECONDS = 8L * 60L;
-  private static final String ERROR = "error";
 
   @Mock DefaultFirebaseAppCheck mockFirebaseAppCheck;
   @Mock ScheduledExecutorService mockScheduledExecutorService;
@@ -57,8 +59,10 @@ public void setUp() {
     when(mockFirebaseAppCheck.fetchTokenFromProvider())
         .thenReturn(Tasks.forResult(mockAppCheckToken));
 
+    // TODO(b/258273630): Use TestOnlyExecutors.
     defaultTokenRefresher =
-        new DefaultTokenRefresher(mockFirebaseAppCheck, mockScheduledExecutorService);
+        new DefaultTokenRefresher(
+            mockFirebaseAppCheck, MoreExecutors.directExecutor(), mockScheduledExecutorService);
   }
 
   @Test
diff --git a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/NetworkClientTest.java b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/NetworkClientTest.java
index 3d9c5965480..852a6f0e6d0 100644
--- a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/NetworkClientTest.java
+++ b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/NetworkClientTest.java
@@ -15,8 +15,8 @@
 package com.google.firebase.appcheck.internal;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.firebase.appcheck.internal.AppCheckTokenResponse.ATTESTATION_TOKEN_KEY;
 import static com.google.firebase.appcheck.internal.AppCheckTokenResponse.TIME_TO_LIVE_KEY;
+import static com.google.firebase.appcheck.internal.AppCheckTokenResponse.TOKEN_KEY;
 import static com.google.firebase.appcheck.internal.HttpErrorResponse.CODE_KEY;
 import static com.google.firebase.appcheck.internal.HttpErrorResponse.ERROR_KEY;
 import static com.google.firebase.appcheck.internal.HttpErrorResponse.MESSAGE_KEY;
@@ -65,17 +65,20 @@ public class NetworkClientTest {
           .setApplicationId(APP_ID)
           .setProjectId(PROJECT_ID)
           .build();
-  private static final String SAFETY_NET_EXPECTED_URL =
-      "https://firebaseappcheck.googleapis.com/v1beta/projects/projectId/apps/appId:exchangeSafetyNetToken?key=apiKey";
   private static final String DEBUG_EXPECTED_URL =
-      "https://firebaseappcheck.googleapis.com/v1beta/projects/projectId/apps/appId:exchangeDebugToken?key=apiKey";
+      "https://firebaseappcheck.googleapis.com/v1/projects/projectId/apps/appId:exchangeDebugToken?key=apiKey";
+  private static final String PLAY_INTEGRITY_CHALLENGE_EXPECTED_URL =
+      "https://firebaseappcheck.googleapis.com/v1/projects/projectId/apps/appId:generatePlayIntegrityChallenge?key=apiKey";
+  private static final String PLAY_INTEGRITY_EXCHANGE_EXPECTED_URL =
+      "https://firebaseappcheck.googleapis.com/v1/projects/projectId/apps/appId:exchangePlayIntegrityToken?key=apiKey";
   private static final String JSON_REQUEST = "jsonRequest";
   private static final int SUCCESS_CODE = 200;
   private static final int ERROR_CODE = 404;
-  private static final String ATTESTATION_TOKEN = "token";
+  private static final String APP_CHECK_TOKEN = "token";
   private static final String TIME_TO_LIVE = "3600s";
   private static final String ERROR_MESSAGE = "error message";
   private static final String HEART_BEAT_HEADER_TEST = "test-header";
+  private static final String CHALLENGE_RESPONSE = "challengeResponse";
 
   @Mock HeartBeatController mockHeartBeatController;
   @Mock HttpURLConnection mockHttpUrlConnection;
@@ -110,8 +113,7 @@ public void init_nullFirebaseApp_throwsException() {
   }
 
   @Test
-  public void exchangeSafetyNetToken_successResponse_returnsAppCheckTokenResponse()
-      throws Exception {
+  public void exchangeDebugToken_successResponse_returnsAppCheckTokenResponse() throws Exception {
     JSONObject responseBodyJson = createAttestationResponse();
 
     when(mockHttpUrlConnection.getOutputStream()).thenReturn(mockOutputStream);
@@ -121,11 +123,11 @@ public void exchangeSafetyNetToken_successResponse_returnsAppCheckTokenResponse(
 
     AppCheckTokenResponse tokenResponse =
         networkClient.exchangeAttestationForAppCheckToken(
-            JSON_REQUEST.getBytes(), NetworkClient.SAFETY_NET, mockRetryManager);
-    assertThat(tokenResponse.getAttestationToken()).isEqualTo(ATTESTATION_TOKEN);
+            JSON_REQUEST.getBytes(), NetworkClient.DEBUG, mockRetryManager);
+    assertThat(tokenResponse.getToken()).isEqualTo(APP_CHECK_TOKEN);
     assertThat(tokenResponse.getTimeToLive()).isEqualTo(TIME_TO_LIVE);
 
-    URL expectedUrl = new URL(SAFETY_NET_EXPECTED_URL);
+    URL expectedUrl = new URL(DEBUG_EXPECTED_URL);
     verify(networkClient).createHttpUrlConnection(expectedUrl);
     verify(mockOutputStream)
         .write(JSON_REQUEST.getBytes(), /* off= */ 0, JSON_REQUEST.getBytes().length);
@@ -135,7 +137,7 @@ public void exchangeSafetyNetToken_successResponse_returnsAppCheckTokenResponse(
   }
 
   @Test
-  public void exchangeSafetyNetToken_errorResponse_throwsException() throws Exception {
+  public void exchangeDebugToken_errorResponse_throwsException() throws Exception {
     JSONObject responseBodyJson = createHttpErrorResponse();
 
     when(mockHttpUrlConnection.getOutputStream()).thenReturn(mockOutputStream);
@@ -148,10 +150,10 @@ public void exchangeSafetyNetToken_errorResponse_throwsException() throws Except
             FirebaseException.class,
             () ->
                 networkClient.exchangeAttestationForAppCheckToken(
-                    JSON_REQUEST.getBytes(), NetworkClient.SAFETY_NET, mockRetryManager));
+                    JSON_REQUEST.getBytes(), NetworkClient.DEBUG, mockRetryManager));
 
     assertThat(exception.getMessage()).contains(ERROR_MESSAGE);
-    URL expectedUrl = new URL(SAFETY_NET_EXPECTED_URL);
+    URL expectedUrl = new URL(DEBUG_EXPECTED_URL);
     verify(networkClient).createHttpUrlConnection(expectedUrl);
     verify(mockOutputStream)
         .write(JSON_REQUEST.getBytes(), /* off= */ 0, JSON_REQUEST.getBytes().length);
@@ -161,7 +163,8 @@ public void exchangeSafetyNetToken_errorResponse_throwsException() throws Except
   }
 
   @Test
-  public void exchangeDebugToken_successResponse_returnsAppCheckTokenResponse() throws Exception {
+  public void exchangePlayIntegrityToken_successResponse_returnsAppCheckTokenResponse()
+      throws Exception {
     JSONObject responseBodyJson = createAttestationResponse();
 
     when(mockHttpUrlConnection.getOutputStream()).thenReturn(mockOutputStream);
@@ -171,11 +174,11 @@ public void exchangeDebugToken_successResponse_returnsAppCheckTokenResponse() th
 
     AppCheckTokenResponse tokenResponse =
         networkClient.exchangeAttestationForAppCheckToken(
-            JSON_REQUEST.getBytes(), NetworkClient.DEBUG, mockRetryManager);
-    assertThat(tokenResponse.getAttestationToken()).isEqualTo(ATTESTATION_TOKEN);
+            JSON_REQUEST.getBytes(), NetworkClient.PLAY_INTEGRITY, mockRetryManager);
+    assertThat(tokenResponse.getToken()).isEqualTo(APP_CHECK_TOKEN);
     assertThat(tokenResponse.getTimeToLive()).isEqualTo(TIME_TO_LIVE);
 
-    URL expectedUrl = new URL(DEBUG_EXPECTED_URL);
+    URL expectedUrl = new URL(PLAY_INTEGRITY_EXCHANGE_EXPECTED_URL);
     verify(networkClient).createHttpUrlConnection(expectedUrl);
     verify(mockOutputStream)
         .write(JSON_REQUEST.getBytes(), /* off= */ 0, JSON_REQUEST.getBytes().length);
@@ -185,7 +188,7 @@ public void exchangeDebugToken_successResponse_returnsAppCheckTokenResponse() th
   }
 
   @Test
-  public void exchangeDebugToken_errorResponse_throwsException() throws Exception {
+  public void exchangePlayIntegrityToken_errorResponse_throwsException() throws Exception {
     JSONObject responseBodyJson = createHttpErrorResponse();
 
     when(mockHttpUrlConnection.getOutputStream()).thenReturn(mockOutputStream);
@@ -198,10 +201,10 @@ public void exchangeDebugToken_errorResponse_throwsException() throws Exception
             FirebaseException.class,
             () ->
                 networkClient.exchangeAttestationForAppCheckToken(
-                    JSON_REQUEST.getBytes(), NetworkClient.DEBUG, mockRetryManager));
+                    JSON_REQUEST.getBytes(), NetworkClient.PLAY_INTEGRITY, mockRetryManager));
 
     assertThat(exception.getMessage()).contains(ERROR_MESSAGE);
-    URL expectedUrl = new URL(DEBUG_EXPECTED_URL);
+    URL expectedUrl = new URL(PLAY_INTEGRITY_EXCHANGE_EXPECTED_URL);
     verify(networkClient).createHttpUrlConnection(expectedUrl);
     verify(mockOutputStream)
         .write(JSON_REQUEST.getBytes(), /* off= */ 0, JSON_REQUEST.getBytes().length);
@@ -210,6 +213,18 @@ public void exchangeDebugToken_errorResponse_throwsException() throws Exception
     verifyRequestHeaders();
   }
 
+  @Test
+  public void exchangeUnknownAttestation_throwsException() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            networkClient.exchangeAttestationForAppCheckToken(
+                JSON_REQUEST.getBytes(), NetworkClient.UNKNOWN, mockRetryManager));
+
+    verify(mockRetryManager, never()).updateBackoffOnFailure(anyInt());
+    verify(mockRetryManager, never()).resetBackoffOnSuccess();
+  }
+
   @Test
   public void exchangeAttestation_heartbeatNone_doesNotAttachHeader() throws Exception {
     JSONObject responseBodyJson = createAttestationResponse();
@@ -220,33 +235,83 @@ public void exchangeAttestation_heartbeatNone_doesNotAttachHeader() throws Excep
     when(mockHttpUrlConnection.getResponseCode()).thenReturn(SUCCESS_CODE);
     // The heartbeat request header should not be attached when the heartbeat is HeartBeat.NONE.
     networkClient.exchangeAttestationForAppCheckToken(
-        JSON_REQUEST.getBytes(), NetworkClient.SAFETY_NET, mockRetryManager);
+        JSON_REQUEST.getBytes(), NetworkClient.DEBUG, mockRetryManager);
 
     verifyRequestHeaders();
   }
 
   @Test
-  public void exchangeUnknownAttestation_throwsException() {
-    assertThrows(
-        IllegalArgumentException.class,
-        () ->
-            networkClient.exchangeAttestationForAppCheckToken(
-                JSON_REQUEST.getBytes(), NetworkClient.UNKNOWN, mockRetryManager));
+  public void exchangeAttestation_cannotRetry_throwsException() {
+    when(mockRetryManager.canRetry()).thenReturn(false);
+
+    FirebaseException exception =
+        assertThrows(
+            FirebaseException.class,
+            () ->
+                networkClient.exchangeAttestationForAppCheckToken(
+                    JSON_REQUEST.getBytes(), NetworkClient.DEBUG, mockRetryManager));
 
+    assertThat(exception.getMessage()).contains("Too many attempts");
     verify(mockRetryManager, never()).updateBackoffOnFailure(anyInt());
     verify(mockRetryManager, never()).resetBackoffOnSuccess();
   }
 
   @Test
-  public void exchangeAttestation_cannotRetry_throwsException() {
+  public void generatePlayIntegrityChallenge_successResponse_returnsJsonString() throws Exception {
+    when(mockHttpUrlConnection.getOutputStream()).thenReturn(mockOutputStream);
+    when(mockHttpUrlConnection.getInputStream())
+        .thenReturn(new ByteArrayInputStream(CHALLENGE_RESPONSE.getBytes()));
+    when(mockHttpUrlConnection.getResponseCode()).thenReturn(SUCCESS_CODE);
+
+    String challengeResponse =
+        networkClient.generatePlayIntegrityChallenge(JSON_REQUEST.getBytes(), mockRetryManager);
+    assertThat(challengeResponse).isEqualTo(CHALLENGE_RESPONSE);
+
+    URL expectedUrl = new URL(PLAY_INTEGRITY_CHALLENGE_EXPECTED_URL);
+    verify(networkClient).createHttpUrlConnection(expectedUrl);
+    verify(mockOutputStream)
+        .write(JSON_REQUEST.getBytes(), /* off= */ 0, JSON_REQUEST.getBytes().length);
+    verify(mockRetryManager, never()).updateBackoffOnFailure(anyInt());
+    verify(mockRetryManager, never()).resetBackoffOnSuccess();
+    verifyRequestHeaders();
+  }
+
+  @Test
+  public void generatePlayIntegrityChallenge_errorResponse_throwsException() throws Exception {
+    JSONObject responseBodyJson = createHttpErrorResponse();
+
+    when(mockHttpUrlConnection.getOutputStream()).thenReturn(mockOutputStream);
+    when(mockHttpUrlConnection.getErrorStream())
+        .thenReturn(new ByteArrayInputStream(responseBodyJson.toString().getBytes()));
+    when(mockHttpUrlConnection.getResponseCode()).thenReturn(ERROR_CODE);
+
+    FirebaseException exception =
+        assertThrows(
+            FirebaseException.class,
+            () ->
+                networkClient.generatePlayIntegrityChallenge(
+                    JSON_REQUEST.getBytes(), mockRetryManager));
+
+    assertThat(exception.getMessage()).contains(ERROR_MESSAGE);
+    URL expectedUrl = new URL(PLAY_INTEGRITY_CHALLENGE_EXPECTED_URL);
+    verify(networkClient).createHttpUrlConnection(expectedUrl);
+    verify(mockOutputStream)
+        .write(JSON_REQUEST.getBytes(), /* off= */ 0, JSON_REQUEST.getBytes().length);
+    verify(mockRetryManager).updateBackoffOnFailure(ERROR_CODE);
+    verify(mockRetryManager, never()).resetBackoffOnSuccess();
+    verifyRequestHeaders();
+  }
+
+  @Test
+  public void generatePlayIntegrityChallenge_cannotRetry_throwsException() {
     when(mockRetryManager.canRetry()).thenReturn(false);
 
     FirebaseException exception =
         assertThrows(
             FirebaseException.class,
             () ->
-                networkClient.exchangeAttestationForAppCheckToken(
-                    JSON_REQUEST.getBytes(), NetworkClient.DEBUG, mockRetryManager));
+                networkClient.generatePlayIntegrityChallenge(
+                    JSON_REQUEST.getBytes(), mockRetryManager));
 
     assertThat(exception.getMessage()).contains("Too many attempts");
     verify(mockRetryManager, never()).updateBackoffOnFailure(anyInt());
@@ -264,7 +329,7 @@ private void verifyRequestHeaders() {
 
   private static JSONObject createAttestationResponse() throws Exception {
     JSONObject responseBodyJson = new JSONObject();
-    responseBodyJson.put(ATTESTATION_TOKEN_KEY, ATTESTATION_TOKEN);
+    responseBodyJson.put(TOKEN_KEY, APP_CHECK_TOKEN);
     responseBodyJson.put(TIME_TO_LIVE_KEY, TIME_TO_LIVE);
 
     return responseBodyJson;
diff --git a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/RetryManagerTest.java b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/RetryManagerTest.java
index 92c87f70c91..aaaf6750662 100644
--- a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/RetryManagerTest.java
+++ b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/RetryManagerTest.java
@@ -16,7 +16,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.firebase.appcheck.internal.RetryManager.BAD_REQUEST_ERROR_CODE;
-import static com.google.firebase.appcheck.internal.RetryManager.FORBIDDEN_ERROR_CODE;
 import static com.google.firebase.appcheck.internal.RetryManager.MAX_EXP_BACKOFF_MILLIS;
 import static com.google.firebase.appcheck.internal.RetryManager.NOT_FOUND_ERROR_CODE;
 import static com.google.firebase.appcheck.internal.RetryManager.ONE_DAY_MILLIS;
@@ -60,14 +59,6 @@ public void updateBackoffOnFailure_badRequestError_oneDayRetryStrategy() {
         .isEqualTo(CURRENT_TIME_MILLIS + ONE_DAY_MILLIS);
   }
 
-  @Test
-  public void updateBackoffOnFailure_forbiddenError_oneDayRetryStrategy() {
-    retryManager.updateBackoffOnFailure(FORBIDDEN_ERROR_CODE);
-
-    assertThat(retryManager.getNextRetryTimeMillis())
-        .isEqualTo(CURRENT_TIME_MILLIS + ONE_DAY_MILLIS);
-  }
-
   @Test
   public void updateBackoffOnFailure_notFoundError_oneDayRetryStrategy() {
     retryManager.updateBackoffOnFailure(NOT_FOUND_ERROR_CODE);
@@ -78,9 +69,9 @@ public void updateBackoffOnFailure_notFoundError_oneDayRetryStrategy() {
 
   @Test
   public void updateBackoffOnFailure_oneDayRetryStrategy_multipleRetries() {
-    retryManager.updateBackoffOnFailure(FORBIDDEN_ERROR_CODE);
-    retryManager.updateBackoffOnFailure(FORBIDDEN_ERROR_CODE);
-    retryManager.updateBackoffOnFailure(FORBIDDEN_ERROR_CODE);
+    retryManager.updateBackoffOnFailure(BAD_REQUEST_ERROR_CODE);
+    retryManager.updateBackoffOnFailure(BAD_REQUEST_ERROR_CODE);
+    retryManager.updateBackoffOnFailure(BAD_REQUEST_ERROR_CODE);
 
     // The backoff period should not increase for consecutive failed retries with the ONE_DAY
     // strategy.
@@ -133,7 +124,7 @@ public void updateBackoffOnFailure_exponentialRetryStrategy() {
 
   @Test
   public void canRetry_beforeNextRetryTime() {
-    retryManager.updateBackoffOnFailure(FORBIDDEN_ERROR_CODE);
+    retryManager.updateBackoffOnFailure(BAD_REQUEST_ERROR_CODE);
 
     // Sanity check.
     assertThat(mockClock.currentTimeMillis()).isEqualTo(CURRENT_TIME_MILLIS);
@@ -145,7 +136,7 @@ public void canRetry_beforeNextRetryTime() {
 
   @Test
   public void canRetry_afterNextRetryTime() {
-    retryManager.updateBackoffOnFailure(FORBIDDEN_ERROR_CODE);
+    retryManager.updateBackoffOnFailure(BAD_REQUEST_ERROR_CODE);
     long nextRetryMillis = retryManager.getNextRetryTimeMillis();
 
     when(mockClock.currentTimeMillis()).thenReturn(nextRetryMillis + 1);
@@ -154,7 +145,7 @@ public void canRetry_afterNextRetryTime() {
 
   @Test
   public void resetBackoffOnSuccess() {
-    retryManager.updateBackoffOnFailure(FORBIDDEN_ERROR_CODE);
+    retryManager.updateBackoffOnFailure(BAD_REQUEST_ERROR_CODE);
     // Sanity check.
     assertThat(retryManager.getNextRetryTimeMillis())
         .isEqualTo(CURRENT_TIME_MILLIS + ONE_DAY_MILLIS);
diff --git a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/StorageHelperTest.java b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/StorageHelperTest.java
index d57a5fcfd46..fd135c6ca13 100644
--- a/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/StorageHelperTest.java
+++ b/appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/StorageHelperTest.java
@@ -40,6 +40,7 @@ public class StorageHelperTest {
   private static final long RECEIVED_AT_TIMESTAMP = 10L;
   private static final long IAT = 10L;
   private static final long EXP = 30L;
+  private static final long ONE_SECOND_MILLIS = 1000L;
   private static final String TOKEN_PREFIX = "prefix";
   private static final String TOKEN_SUFFIX = "suffix";
   private static final String SEPARATOR = ".";
@@ -108,8 +109,8 @@ public void testSaveAndRetrieveToken_TestAppCheckToken_expectEquivalentToken() t
         (DefaultAppCheckToken) storageHelper.retrieveAppCheckToken();
     assertThat(retrievedToken).isNotNull();
     assertThat(retrievedToken.getToken()).isEqualTo(rawToken);
-    assertThat(retrievedToken.getExpiresInMillis()).isEqualTo(EXP - IAT);
-    assertThat(retrievedToken.getReceivedAtTimestamp()).isEqualTo(IAT);
+    assertThat(retrievedToken.getExpiresInMillis()).isEqualTo((EXP - IAT) * ONE_SECOND_MILLIS);
+    assertThat(retrievedToken.getReceivedAtTimestamp()).isEqualTo(IAT * ONE_SECOND_MILLIS);
   }
 
   @Test
diff --git a/appcheck/firebase-appcheck/test-app/src/main/AndroidManifest.xml b/appcheck/firebase-appcheck/test-app/src/main/AndroidManifest.xml
index fbb5ebb6240..95347824781 100644
--- a/appcheck/firebase-appcheck/test-app/src/main/AndroidManifest.xml
+++ b/appcheck/firebase-appcheck/test-app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
   <application
       android:label="@string/app_name"
       android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
+    <activity android:name=".MainActivity" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
 
diff --git a/appcheck/firebase-appcheck/test-app/src/main/java/com/googletest/firebase/appcheck/MainActivity.java b/appcheck/firebase-appcheck/test-app/src/main/java/com/googletest/firebase/appcheck/MainActivity.java
index 41299c2276d..1be95660b8b 100644
--- a/appcheck/firebase-appcheck/test-app/src/main/java/com/googletest/firebase/appcheck/MainActivity.java
+++ b/appcheck/firebase-appcheck/test-app/src/main/java/com/googletest/firebase/appcheck/MainActivity.java
@@ -30,7 +30,7 @@
 import com.google.firebase.appcheck.FirebaseAppCheck;
 import com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener;
 import com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory;
-import com.google.firebase.appcheck.safetynet.SafetyNetAppCheckProviderFactory;
+import com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory;
 import com.google.firebase.storage.FirebaseStorage;
 import com.google.firebase.storage.ListResult;
 import com.google.firebase.storage.StorageReference;
@@ -42,9 +42,10 @@ public class MainActivity extends AppCompatActivity {
   private FirebaseAppCheck firebaseAppCheck;
   private FirebaseStorage firebaseStorage;
   private AppCheckListener appCheckListener;
-  private Button installSafetyNetButton;
+  private Button installPlayIntegrityButton;
   private Button installDebugButton;
   private Button getAppCheckTokenButton;
+  private Button getLimitedUseTokenButton;
   private Button listStorageFilesButton;
 
   @Override
@@ -72,7 +73,7 @@ private void initFirebase() {
         new AppCheckListener() {
           @Override
           public void onAppCheckTokenChanged(@NonNull AppCheckToken token) {
-            Log.d(TAG, "onAppCheckTokenChanged");
+            Log.d(TAG, "onAppCheckTokenChanged: " + token.getToken());
           }
         };
 
@@ -80,23 +81,24 @@ public void onAppCheckTokenChanged(@NonNull AppCheckToken token) {
   }
 
   private void initViews() {
-    installSafetyNetButton = findViewById(R.id.install_safety_net_app_check_button);
+    installPlayIntegrityButton = findViewById(R.id.install_play_integrity_app_check_button);
     installDebugButton = findViewById(R.id.install_debug_app_check_button);
     getAppCheckTokenButton = findViewById(R.id.exchange_app_check_button);
+    getLimitedUseTokenButton = findViewById(R.id.limited_use_app_check_button);
     listStorageFilesButton = findViewById(R.id.storage_list_files_button);
 
     setOnClickListeners();
   }
 
   private void setOnClickListeners() {
-    installSafetyNetButton.setOnClickListener(
+    installPlayIntegrityButton.setOnClickListener(
         new OnClickListener() {
           @Override
           public void onClick(View v) {
             firebaseAppCheck.installAppCheckProviderFactory(
-                SafetyNetAppCheckProviderFactory.getInstance());
-            Log.d(TAG, "Installed SafetyNetAppCheckProvider");
-            showToast("Installed SafetyNetAppCheckProvider.");
+                PlayIntegrityAppCheckProviderFactory.getInstance());
+            Log.d(TAG, "Installed PlayIntegrityAppCheckProvider");
+            showToast("Installed PlayIntegrityAppCheckProvider.");
           }
         });
 
@@ -120,20 +122,55 @@ public void onClick(View v) {
                 new OnSuccessListener<AppCheckToken>() {
                   @Override
                   public void onSuccess(AppCheckToken appCheckToken) {
-                    Log.d(TAG, "Successfully retrieved AppCheck token.");
-                    showToast("Successfully retrieved AppCheck token.");
+                    // Note: Logging App Check tokens is bad practice and should NEVER be done in a
+                    // production application. We log the token here in our unpublished test
+                    // application for easier debugging.
+                    Log.d(
+                        TAG, "Successfully retrieved App Check token: " + appCheckToken.getToken());
+                    showToast("Successfully retrieved App Check token.");
                   }
                 });
             task.addOnFailureListener(
                 new OnFailureListener() {
                   @Override
                   public void onFailure(@NonNull Exception e) {
-                    Log.d(TAG, "AppCheck token exchange failed with error: " + e.getMessage());
-                    showToast("AppCheck token exchange failed.");
+                    Log.d(TAG, "App Check token exchange failed with error: " + e.getMessage());
+                    showToast("App Check token exchange failed.");
                   }
                 });
           }
         });
+
+    getLimitedUseTokenButton.setOnClickListener(
+        new OnClickListener() {
+          @Override
+          public void onClick(View v) {
+            Task<AppCheckToken> task = firebaseAppCheck.getLimitedUseAppCheckToken();
+            task.addOnSuccessListener(
+                new OnSuccessListener<AppCheckToken>() {
+                  @Override
+                  public void onSuccess(AppCheckToken appCheckToken) {
+                    // Note: Logging App Check tokens is bad practice and should NEVER be done in a
+                    // production application. We log the token here in our unpublished test
+                    // application for easier debugging.
+                    Log.d(
+                        TAG,
+                        "Successfully retrieved limited-use App Check token: "
+                            + appCheckToken.getToken());
+                    showToast("Successfully retrieved limited-use App Check token.");
+                  }
+                });
+            task.addOnFailureListener(
+                new OnFailureListener() {
+                  @Override
+                  public void onFailure(@NonNull Exception e) {
+                    Log.d(TAG, "App Check token exchange failed with error: " + e.getMessage());
+                    showToast("App Check token exchange failed.");
+                  }
+                });
+          }
+        });
+
     listStorageFilesButton.setOnClickListener(
         new OnClickListener() {
           @Override
diff --git a/appcheck/firebase-appcheck/test-app/src/main/res/layout/activity_main.xml b/appcheck/firebase-appcheck/test-app/src/main/res/layout/activity_main.xml
index eccdbf9ec6e..cd2dff67e27 100644
--- a/appcheck/firebase-appcheck/test-app/src/main/res/layout/activity_main.xml
+++ b/appcheck/firebase-appcheck/test-app/src/main/res/layout/activity_main.xml
@@ -6,6 +6,11 @@
     android:gravity="center"
     android:orientation="vertical">
 
+  <Button
+      android:id="@+id/install_play_integrity_app_check_button"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/install_play_integrity_app_check_button_text"/>
   <Button
       android:id="@+id/install_safety_net_app_check_button"
       android:layout_width="wrap_content"
@@ -21,6 +26,11 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/exchange_app_check_button_text"/>
+  <Button
+      android:id="@+id/limited_use_app_check_button"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/limited_use_app_check_button_text"/>
   <Button
       android:id="@+id/storage_list_files_button"
       android:layout_width="wrap_content"
diff --git a/appcheck/firebase-appcheck/test-app/src/main/res/values/strings.xml b/appcheck/firebase-appcheck/test-app/src/main/res/values/strings.xml
index eeaa5e5c1cf..4513a22a6b0 100644
--- a/appcheck/firebase-appcheck/test-app/src/main/res/values/strings.xml
+++ b/appcheck/firebase-appcheck/test-app/src/main/res/values/strings.xml
@@ -1,7 +1,8 @@
 <resources>
   <string name="app_name">App Check Test Application</string>
-  <string name="install_safety_net_app_check_button_text">Install SafetyNetAppCheckProvider</string>
+  <string name="install_play_integrity_app_check_button_text">Install PlayIntegrityAppCheckProvider</string>
   <string name="install_debug_app_check_button_text">Install DebugAppCheckProvider</string>
-  <string name="exchange_app_check_button_text">Exchange attestation for App Check token</string>
+  <string name="exchange_app_check_button_text">Get App Check token</string>
+  <string name="limited_use_app_check_button_text">Get limited-use App Check token</string>
   <string name="storage_list_files_button_text">List Cloud Storage files with App Check token</string>
 </resources>
\ No newline at end of file
diff --git a/appcheck/firebase-appcheck/test-app/test-app.gradle b/appcheck/firebase-appcheck/test-app/test-app.gradle
index d380d0e9c75..d7cae53bbf6 100644
--- a/appcheck/firebase-appcheck/test-app/test-app.gradle
+++ b/appcheck/firebase-appcheck/test-app/test-app.gradle
@@ -14,9 +14,10 @@
 
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
+apply plugin: 'copy-google-services'
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    compileSdkVersion project.compileSdkVersion
 
     defaultConfig {
         applicationId "com.googletest.firebase.appcheck"
@@ -35,23 +36,13 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-
     // Firebase dependencies
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
     implementation project(":appcheck:firebase-appcheck")
     implementation project(":appcheck:firebase-appcheck-debug")
     implementation project(":appcheck:firebase-appcheck-interop")
-    implementation project(":appcheck:firebase-appcheck-safetynet")
+    implementation project(":appcheck:firebase-appcheck-playintegrity")
     implementation project(":firebase-storage")
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
 }
-
-// ==========================================================================
-// Copy from here down if you want to use the google-services plugin in your
-// androidTest integration tests.
-// ==========================================================================
-ext.packageName = "com.googletest.firebase.appcheck"
-apply from: '../../../gradle/googleServices.gradle'
diff --git a/build.gradle b/build.gradle
index f408825f930..e88d423efc9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
-
 buildscript {
-    ext.kotlinVersion = '1.3.72'
+    // TODO: remove once all sdks have migrated to version catalog
+    ext.kotlinVersion = libs.versions.kotlin.get()
+    ext.coroutinesVersion = libs.versions.coroutines.get()
+
     repositories {
         google()
         mavenCentral()
@@ -24,18 +25,20 @@ buildscript {
         }
         maven {
             url 'https://storage.googleapis.com/android-ci/mvn/'
+            metadataSources {
+                artifact()
+            }
         }
-        jcenter()
+
     }
 
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14'
-        classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
-        classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
-        classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'digital.wup:android-maven-publish:3.6.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'org.jlleitschuh.gradle:ktlint-gradle:9.2.1'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
+        classpath 'net.ltgt.gradle:gradle-errorprone-plugin:3.1.0'
+        classpath 'com.google.gms:google-services:4.3.15'
+        classpath "com.ncorti.ktfmt.gradle:plugin:0.11.0"
+        classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.2'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
     }
 }
 
@@ -43,16 +46,19 @@ apply from: 'sdkProperties.gradle'
 apply from: "gradle/errorProne.gradle"
 
 ext {
-    playServicesVersion = '16.0.1'
-    supportAnnotationsVersion = '28.0.0'
-    googleTruthVersion = '1.1.2'
-    grpcVersion = '1.44.1'
-    robolectricVersion = '4.3.1'
-    protocVersion = '3.14.0'
-    javaliteVersion = '3.14.0'
+    // TODO: remove once all sdks have migrated to version catalog
+    googleTruthVersion = libs.versions.truth.get()
+    grpcVersion = libs.versions.grpc.get()
+    robolectricVersion = libs.versions.robolectric.get()
+    androidxTestCoreVersion = libs.versions.androidx.test.core.get()
+    androidxTestJUnitVersion = libs.versions.androidx.test.junit.get()
+    protocVersion = libs.versions.protoc.get()
+    javaliteVersion = libs.versions.javalite.get()
+    protobufJavaUtilVersion = libs.versions.protobufjavautil.get()
 }
 
-apply plugin: com.google.firebase.gradle.plugins.publish.PublishingPlugin
+apply plugin: com.google.firebase.gradle.plugins.PublishingPlugin
+
 apply plugin: com.google.firebase.gradle.plugins.ci.ContinuousIntegrationPlugin
 apply plugin: com.google.firebase.gradle.plugins.ci.SmokeTestsPlugin
 
@@ -60,24 +66,28 @@ firebaseContinuousIntegration {
     ignorePaths = [
             /.*\.gitignore$/,
             /.*\/.*.md$/,
+            /.*\.github.*/,
     ]
 }
 
-if(JavaVersion.current() != JavaVersion.VERSION_11){
-    throw new GradleException("This build must be run with java 11. You're using ${JavaVersion.current()}.")
-}
-
 configure(subprojects) {
     repositories {
         google()
         mavenLocal()
+        mavenCentral()
         maven {
             url 'https://storage.googleapis.com/android-ci/mvn/'
+            metadataSources {
+                artifact()
+            }
         }
-        jcenter()
     }
 
-    apply plugin: "org.jlleitschuh.gradle.ktlint"
+    apply plugin: "com.ncorti.ktfmt.gradle"
+
+    ktfmt {
+        googleStyle()
+    }
 }
 
 task clean(type: Delete) {
diff --git a/buildSrc/README.md b/buildSrc/README.md
new file mode 100644
index 00000000000..bc32b0f0449
--- /dev/null
+++ b/buildSrc/README.md
@@ -0,0 +1,14 @@
+## Build Source
+
+> [!NOTE]
+> Eventually, this will be merged with our [contributor documentation](https://firebase.github.io/firebase-android-sdk/).
+
+This file will be more organized as time progresses. Because a lot of our
+plugins and systems require a moderate amount of cognitive overhead to understand,
+I thought it best to provide documentation for such systems. You can find the
+currently documented systems below:
+
+[Dackka Plugin](src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt)
+
+
+* Note that this file currently only serves as a table of contents until sufficient documentation has been created.
\ No newline at end of file
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
deleted file mode 100644
index a63b271f420..00000000000
--- a/buildSrc/build.gradle
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-plugins {
-    id "org.gradle.kotlin.kotlin-dsl" version "1.2.9"
-    id "org.jlleitschuh.gradle.ktlint" version "9.2.1"
-    id 'com.github.sherter.google-java-format' version '0.9'
-}
-
-repositories {
-    mavenLocal()
-    maven {
-        url 'https://maven.google.com/'
-    }
-    jcenter()
-    mavenCentral()
-
-    maven {
-        url 'https://storage.googleapis.com/android-ci/mvn/'
-    }
-    maven {
-        url 'https://plugins.gradle.org/m2/'
-    }
-}
-
-// Refer latest "perf-plugin" released version on https://maven.google.com/web/index.html?q=perf-plugin#com.google.firebase:perf-plugin
-// The System property allows us to integrate with an unreleased version from https://bityl.co/3oYt.
-// Refer go/fireperf-plugin-test-on-head for more details.
-def perfPluginVersion = System.getenv("FIREBASE_PERF_PLUGIN_VERSION") ?: "1.4.0"
-
-googleJavaFormat {
-    toolVersion = '1.10.0'
-}
-
-dependencies {
-    // Firebase performance plugin, it should be added here because of how gradle dependency
-    // resolution works, otherwise it breaks Fireperf Test Apps.
-    // See https://github.com/gradle/gradle/issues/12286
-    implementation "com.google.firebase:perf-plugin:$perfPluginVersion"
-
-    implementation "com.google.auto.value:auto-value-annotations:1.7"
-    annotationProcessor "com.google.auto.value:auto-value:1.6.5"
-    implementation 'digital.wup:android-maven-publish:3.6.3'
-    implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
-    implementation 'org.json:json:20180813'
-
-    implementation "org.eclipse.aether:aether-api:1.0.0.v20140518"
-    implementation "org.eclipse.aether:aether-util:1.0.0.v20140518"
-    implementation "org.eclipse.aether:aether-impl:1.0.0.v20140518"
-    implementation "org.eclipse.aether:aether-connector-basic:1.0.0.v20140518"
-    implementation "org.eclipse.aether:aether-transport-file:1.0.0.v20140518"
-    implementation "org.eclipse.aether:aether-transport-http:1.0.0.v20140518"
-    implementation "org.eclipse.aether:aether-transport-wagon:1.0.0.v20140518"
-    implementation "org.apache.maven:maven-aether-provider:3.1.0"
-
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
-    implementation 'org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.17-g013-9b8280a'
-    implementation 'com.android.tools.build:gradle:3.4.3'
-    implementation 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
-
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
-    testImplementation "com.google.truth:truth:1.0.1"
-    testImplementation 'commons-io:commons-io:2.6'
-
-}
-
-gradlePlugin {
-    plugins {
-        licensePlugin {
-            id = 'LicenseResolverPlugin'
-            implementationClass = 'com.google.firebase.gradle.plugins.license.LicenseResolverPlugin'
-        }
-        multiProjectReleasePlugin {
-            id = 'MultiProjectReleasePlugin'
-            implementationClass = 'com.google.firebase.gradle.MultiProjectReleasePlugin'
-        }
-        publishingPlugin {
-            id = 'PublishingPlugin'
-            implementationClass = 'com.google.firebase.gradle.plugins.publish.PublishingPlugin'
-        }
-        firebaseLibraryPlugin {
-            id = 'firebase-library'
-            implementationClass = 'com.google.firebase.gradle.plugins.FirebaseLibraryPlugin'
-        }
-
-        firebaseJavaLibraryPlugin {
-            id = "firebase-java-library"
-            implementationClass = 'com.google.firebase.gradle.plugins.FirebaseJavaLibraryPlugin'
-        }
-
-        firebaseVendorPlugin {
-            id = "firebase-vendor"
-            implementationClass = 'com.google.firebase.gradle.plugins.VendorPlugin'
-        }
-    }
-}
-
-test {
-    testLogging {
-        // Make sure output from
-        // standard out or error is shown
-        // in Gradle output.
-        showStandardStreams = true
-    }
-    enabled = rootProject.properties.get('enablePluginTests', false).toBoolean()
-}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 00000000000..3fd5e29b4e3
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,111 @@
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+    id("com.ncorti.ktfmt.gradle") version "0.11.0"
+    kotlin("plugin.serialization") version "1.8.22"
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenLocal()
+    maven(url = "https://maven.google.com/")
+    mavenCentral()
+    maven(url = "https://storage.googleapis.com/android-ci/mvn/")
+    maven(url = "https://plugins.gradle.org/m2/")
+}
+
+// Refer latest "perf-plugin" released version on https://maven.google.com/web/index.html?q=perf-plugin#com.google.firebase:perf-plugin
+// The System property allows us to integrate with an unreleased version from https://bityl.co/3oYt.
+// Refer go/fireperf-plugin-test-on-head for more details.
+val perfPluginVersion = System.getenv("FIREBASE_PERF_PLUGIN_VERSION") ?: "1.4.1"
+
+ktfmt {
+    googleStyle()
+}
+
+dependencies {
+    // Firebase performance plugin, it should be added here because of how gradle dependency
+    // resolution works, otherwise it breaks Fireperf Test Apps.
+    // See https://github.com/gradle/gradle/issues/12286
+    implementation("com.google.firebase:perf-plugin:$perfPluginVersion")
+    implementation("com.google.auto.value:auto-value-annotations:1.8.1")
+    annotationProcessor("com.google.auto.value:auto-value:1.6.5")
+    implementation(kotlin("gradle-plugin", "1.8.22"))
+    implementation("org.json:json:20210307")
+
+    implementation("org.eclipse.aether:aether-api:1.0.0.v20140518")
+    implementation("org.eclipse.aether:aether-util:1.0.0.v20140518")
+    implementation("org.ow2.asm:asm-tree:9.5")
+    implementation("org.eclipse.aether:aether-impl:1.0.0.v20140518")
+    implementation("org.eclipse.aether:aether-connector-basic:1.0.0.v20140518")
+    implementation("org.eclipse.aether:aether-transport-file:1.0.0.v20140518")
+    implementation("org.eclipse.aether:aether-transport-http:1.0.0.v20140518")
+    implementation("org.eclipse.aether:aether-transport-wagon:1.0.0.v20140518")
+    implementation("org.apache.maven:maven-aether-provider:3.3.9")
+
+    implementation("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r")
+
+    implementation(libs.kotlinx.serialization.json)
+    implementation("com.google.code.gson:gson:2.8.9")
+    implementation("com.android.tools.build:gradle:8.2.1")
+    implementation("com.android.tools.build:builder-test-api:8.2.1")
+
+    testImplementation(libs.bundles.kotest)
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("com.google.truth:truth:1.4.2")
+    testImplementation("commons-io:commons-io:2.15.1")
+}
+
+gradlePlugin {
+    plugins {
+        register("licensePlugin") {
+            id = "LicenseResolverPlugin"
+            implementationClass = "com.google.firebase.gradle.plugins.license.LicenseResolverPlugin"
+        }
+        register("multiProjectReleasePlugin") {
+            id = "MultiProjectReleasePlugin"
+            implementationClass = "com.google.firebase.gradle.MultiProjectReleasePlugin"
+        }
+        register("publishingPlugin") {
+            id = "PublishingPlugin"
+            implementationClass = "com.google.firebase.gradle.plugins.PublishingPlugin"
+        }
+        register("firebaseLibraryPlugin") {
+            id = "firebase-library"
+            implementationClass = "com.google.firebase.gradle.plugins.FirebaseLibraryPlugin"
+        }
+        register("firebaseJavaLibraryPlugin") {
+            id = "firebase-java-library"
+            implementationClass = "com.google.firebase.gradle.plugins.FirebaseJavaLibraryPlugin"
+        }
+        register("firebaseVendorPlugin") {
+            id = "firebase-vendor"
+            implementationClass = "com.google.firebase.gradle.plugins.VendorPlugin"
+        }
+        register("copyGoogleServicesPlugin") {
+            id = "copy-google-services"
+            implementationClass = "com.google.firebase.gradle.plugins.CopyGoogleServicesPlugin"
+        }
+    }
+}
+
+tasks.withType<Test> {
+    testLogging {
+        // Make sure output from standard out or error is shown in Gradle output.
+        showStandardStreams = true
+    }
+    val enablePluginTests: String? by rootProject
+    enabled = enablePluginTests == "true"
+}
diff --git a/buildSrc/firesite_transform.sh b/buildSrc/firesite_transform.sh
deleted file mode 100755
index a8d6e034520..00000000000
--- a/buildSrc/firesite_transform.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -x
-#!/bin/sh -x
-grep -rl 'http://' | xargs sed -i 's|http://|//|g'
-grep -rl 'https://' | xargs sed -i 's|https://|//|g'
-grep -rl 'reference/com/google/' | xargs sed -i 's|reference/com/google/|/docs/reference/android/com/google/|g'
-grep -rl '//developers.google.com/android//docs/reference/android/' | xargs sed -i 's|//developers.google.com/android//docs/reference/android/|//developers.google.com/android/reference/|g'
-grep -rl '//developers.google.com/android/reference/com/google/firebase/' | xargs sed -i 's|//developers.google.com/android/reference/com/google/firebase/|/docs/reference/android/com/google/firebase/|g'
-grep -rl 'href="reference' | xargs sed -i 's|href="reference|href="/docs/reference/android/|g'
-grep -rl '/docs/reference/android///developers.google.com/android/reference/' | xargs sed -i 's|/docs/reference/android///developers.google.com/android/reference/|/docs/reference/android/|g'
-grep -rl '/docs/reference/android///developer.android.com/reference/' | xargs sed -i 's|/docs/reference/android///developer.android.com/reference/|//developer.android.com/reference/|g'
-grep -rl '/docs/reference/android//docs/reference/android/' | xargs sed -i 's|/docs/reference/android//docs/reference/android/|/docs/reference/android/|g'
-find . -name '*.html' | xargs sed -i 's/[ \t]*$//' "$@"
-# TODO(b/37810114): Remove this hack once b/64612004 is fixed and propagated to our javadoc.
-find . -name '*.html' | xargs perl -0777 -p -i -e 's|.+<div class="jd-tagdata">\n(.*\n){1,5}?(?:.+<tr>\n.+\n.+<td><!-- no parameter comment --></td>\n.+</tr>\n)+?(.+\n){1,5}?.*</div>||gm'
-find . -name '_toc.yaml' | xargs sed -i 's|"com\.google\.firebase|"firebase|g'
-find . -name '_toc.yaml' | xargs sed -i 's|"com\.goo  gle\.android\.gms\.|"|g'
-find . -name "_toc.yaml" | xargs sed -i 's|path: reference/|path: /docs/reference/android/|g'
-
-#Delete blank lines
-find . -name "_toc.yaml" | xargs sed -i 's/[ \t]*$//'
-
-#Delete newline after section:
-find . -name "_toc.yaml" | xargs sed -i -z 's/section:\n\n+/section:\n/g'
-
-#Delete whitestapes after toc sections
-find . -name "_toc.yaml" | xargs sed -i 's|section: |section:|g'
-
-#Delete blank lines at the top of a file
-find . -name "_toc.yaml" | xargs sed -i '/./,$!d'
-
-#Delete all kotlin javadoc
-rm -rf "ktx/"
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/package-info.java b/buildSrc/settings.gradle.kts
similarity index 77%
rename from firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/package-info.java
rename to buildSrc/settings.gradle.kts
index 8b263e1e2f3..ed150cd85b1 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/package-info.java
+++ b/buildSrc/settings.gradle.kts
@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,5 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/** @hide */
-package com.google.firebase.crashlytics.internal.settings.model;
+dependencyResolutionManagement {
+  versionCatalogs {
+    create("libs") {
+      from(files("../gradle/libs.versions.toml"))
+    }
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/MultiProjectReleasePlugin.java b/buildSrc/src/main/java/com/google/firebase/gradle/MultiProjectReleasePlugin.java
deleted file mode 100644
index 03ac99f965b..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/MultiProjectReleasePlugin.java
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.gradle;
-
-import static com.google.firebase.gradle.plugins.ProjectUtilsKt.toBoolean;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.firebase.gradle.bomgenerator.BomGeneratorTask;
-import com.google.firebase.gradle.plugins.FireEscapeArtifactPlugin;
-import com.google.firebase.gradle.plugins.FirebaseLibraryExtension;
-import com.google.firebase.gradle.plugins.JavadocPlugin;
-import com.google.firebase.gradle.plugins.TasksKt;
-import com.google.firebase.gradle.plugins.publish.PublishingPlugin;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.gradle.api.GradleException;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.Task;
-import org.gradle.api.tasks.Delete;
-import org.gradle.api.tasks.bundling.Zip;
-
-/**
- * Orchestrates the release process by automating validations, documentation and prebuilts
- * generation.
- *
- * <ul>
- *   <li>Pre-release validations:
- *       <ul>
- *         <li>Build maven artifacts.
- *       </ul>
- *   <li>Documentation:
- *       <ul>
- *         <li>Generates javadoc for all SDKs being released.
- *       </ul>
- *   <li>Artifact generation:
- *       <ul>
- *         <li>Releases artifacts into a maven repo in build/m2repository.
- *         <li>Bundles all artifacts into a distributable .zip file.
- *       </ul>
- * </ul>
- */
-public class MultiProjectReleasePlugin implements Plugin<Project> {
-
-  @Override
-  public void apply(Project project) {
-    project.apply(ImmutableMap.of("plugin", PublishingPlugin.class));
-
-    boolean releaseJavadocs = toBoolean(System.getProperty("releaseJavadocs", "true"));
-
-    File firebaseDevsiteJavadoc = new File(project.getBuildDir(), "firebase-javadocs/");
-    File firebaseClientBuildDest = new File(firebaseDevsiteJavadoc, "client/");
-    firebaseClientBuildDest.mkdirs();
-
-    project.subprojects(
-        sub -> {
-          sub.afterEvaluate(
-              p -> {
-                sub.apply(ImmutableMap.of("plugin", JavadocPlugin.class));
-                sub.apply(ImmutableMap.of("plugin", FireEscapeArtifactPlugin.class));
-              });
-        });
-
-    project
-        .getTasks()
-        .create(
-            "buildBomZip",
-            Zip.class,
-            task -> {
-              task.dependsOn(project.getTasks().create("generateBom", BomGeneratorTask.class));
-              task.from("bom");
-              task.getArchiveFileName().set("bom.zip");
-              task.getDestinationDirectory().set(project.getRootDir());
-            });
-
-    project
-        .getGradle()
-        .projectsEvaluated(
-            gradle -> {
-              Set<FirebaseLibraryExtension> librariesToPublish =
-                  (Set<FirebaseLibraryExtension>)
-                      project.getExtensions().getExtraProperties().get("projectsToPublish");
-
-              Set<Project> projectsToPublish =
-                  librariesToPublish.stream().map(lib -> lib.project).collect(Collectors.toSet());
-
-              Task validateProjectsToPublish =
-                  project.task(
-                      "validateProjectsToPublish",
-                      task ->
-                          task.doLast(
-                              t -> {
-                                if (projectsToPublish.isEmpty()) {
-                                  throw new GradleException(
-                                      "Required projectsToPublish parameter missing.");
-                                }
-                              }));
-              Task firebasePublish = project.getTasks().findByName("firebasePublish");
-              firebasePublish.dependsOn(validateProjectsToPublish);
-
-              Task generateAllJavadocs =
-                  project.task(
-                      "generateAllJavadocs",
-                      task -> {
-                        for (Project p : projectsToPublish) {
-                          task.dependsOn(p.getPath() + ":" + TasksKt.JAVADOC_TASK_NAME);
-
-                          task.doLast(
-                              t -> {
-                                for (Project publishableProject : projectsToPublish) {
-                                  publishableProject.copy(
-                                      copy -> {
-                                        copy.from(
-                                            publishableProject.getBuildDir()
-                                                + "/docs/javadoc/reference");
-                                        copy.include("**/*");
-                                        copy.into(firebaseDevsiteJavadoc);
-                                      });
-
-                                  publishableProject.copy(
-                                      copy -> {
-                                        copy.from(
-                                            publishableProject.getBuildDir()
-                                                + "/docs/javadoc/reference/_toc.yaml");
-                                        copy.include("**/*");
-                                        copy.into(
-                                            firebaseClientBuildDest
-                                                + "/"
-                                                + publishableProject.getName());
-                                      });
-                                }
-                              });
-                        }
-                      });
-
-              Delete prepareJavadocs =
-                  project
-                      .getTasks()
-                      .create(
-                          "prepareJavadocs",
-                          Delete.class,
-                          del -> {
-                            del.dependsOn(generateAllJavadocs);
-                            del.doLast(
-                                d -> {
-                                  // cleanup docs
-                                  project.delete(
-                                      delSpec -> {
-                                        ImmutableList<String> relativeDeletablePaths =
-                                            ImmutableList.of(
-                                                "timestamp.js",
-                                                "navtree_data.js",
-                                                "assets/",
-                                                "classes.html",
-                                                "hierarchy.html",
-                                                "lists.js",
-                                                "package-list",
-                                                "packages.html",
-                                                "index.html",
-                                                "current.xml",
-                                                "_toc.yaml");
-                                        delSpec.delete(
-                                            relativeDeletablePaths.stream()
-                                                .map(
-                                                    path ->
-                                                        firebaseDevsiteJavadoc.getPath()
-                                                            + "/"
-                                                            + path)
-                                                .collect(Collectors.toList()));
-                                      });
-                                  // Transform
-                                  project.exec(
-                                      execSpec -> {
-                                        execSpec.setIgnoreExitValue(true);
-                                        execSpec.setWorkingDir(firebaseDevsiteJavadoc);
-                                        execSpec.setCommandLine(
-                                            project.getRootProject().file("buildSrc").getPath()
-                                                + "/firesite_transform.sh");
-                                      });
-
-                                  // Tidy
-                                  String tidyBinary = System.getProperty("tidyBinaryPath", null);
-                                  String tidyConfig = System.getProperty("tidyConfigPath", null);
-                                  if (tidyBinary != null && tidyConfig != null) {
-                                    try {
-                                      Files.walk(firebaseDevsiteJavadoc.toPath())
-                                          .filter(
-                                              p ->
-                                                  p.toFile().isFile()
-                                                      && p.toString().endsWith(".html"))
-                                          .forEach(
-                                              p -> {
-                                                project.exec(
-                                                    execSpec -> {
-                                                      System.out.println("Tidying " + p);
-                                                      execSpec.setIgnoreExitValue(true);
-                                                      execSpec.commandLine(
-                                                          tidyBinary, "-config", tidyConfig, p);
-                                                    });
-                                              });
-                                    } catch (IOException e) {
-                                      throw new GradleException("Directory walk failed.", e);
-                                    }
-                                  }
-                                });
-                          });
-
-              Zip assembleFirebaseJavadocZip =
-                  project
-                      .getTasks()
-                      .create(
-                          "assembleFirebaseJavadocZip",
-                          Zip.class,
-                          zip -> {
-                            zip.dependsOn(prepareJavadocs);
-                            zip.getDestinationDirectory().set(project.getBuildDir());
-                            zip.getArchiveFileName().set("firebase-javadoc.zip");
-                            zip.from(firebaseDevsiteJavadoc);
-                            zip.include("**/*");
-                          });
-
-              if (releaseJavadocs) {
-                firebasePublish.dependsOn(assembleFirebaseJavadocZip);
-              }
-            });
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt b/buildSrc/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt
new file mode 100644
index 00000000000..e5403468871
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle
+
+import java.io.File
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+abstract class NdkBinaryFixTask : DefaultTask() {
+  @get:InputFile abstract val inputFile: RegularFileProperty
+
+  @get:OutputFile
+  val outputFile: File
+    get() = inputFile.get().asFile.let { File(it.parentFile, "lib${it.name}.so") }
+
+  @get:Internal
+  val into: String
+    get() = "jni/${outputFile.parentFile.name}"
+
+  @TaskAction
+  fun run() {
+    Files.copy(
+      inputFile.get().asFile.toPath(),
+      outputFile.toPath(),
+      StandardCopyOption.REPLACE_EXISTING
+    )
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java
index 52ccade93e3..66fe2551630 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java
@@ -40,26 +40,31 @@
 import javax.xml.parsers.ParserConfigurationException;
 import org.eclipse.aether.resolution.VersionRangeResolutionException;
 import org.gradle.api.DefaultTask;
+import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.logging.Logger;
+import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-public class BomGeneratorTask extends DefaultTask {
+public abstract class BomGeneratorTask extends DefaultTask {
   private static final List<String> BOM_ARTIFACTS =
       ImmutableList.of(
           "com.google.firebase:firebase-analytics",
           "com.google.firebase:firebase-analytics-ktx",
-          "com.google.firebase:firebase-appindexing",
+          "com.google.firebase:firebase-appcheck-debug",
+          "com.google.firebase:firebase-appcheck-debug-testing",
+          "com.google.firebase:firebase-appcheck-ktx",
+          "com.google.firebase:firebase-appcheck-playintegrity",
+          "com.google.firebase:firebase-appcheck",
           "com.google.firebase:firebase-auth",
           "com.google.firebase:firebase-auth-ktx",
           "com.google.firebase:firebase-common",
           "com.google.firebase:firebase-common-ktx",
           "com.google.firebase:firebase-config",
           "com.google.firebase:firebase-config-ktx",
-          "com.google.firebase:firebase-core",
           "com.google.firebase:firebase-crashlytics",
           "com.google.firebase:firebase-crashlytics-ktx",
           "com.google.firebase:firebase-crashlytics-ndk",
@@ -72,7 +77,6 @@ public class BomGeneratorTask extends DefaultTask {
           "com.google.firebase:firebase-firestore-ktx",
           "com.google.firebase:firebase-functions",
           "com.google.firebase:firebase-functions-ktx",
-          "com.google.firebase:firebase-iid",
           "com.google.firebase:firebase-inappmessaging",
           "com.google.firebase:firebase-inappmessaging-display",
           "com.google.firebase:firebase-inappmessaging-display-ktx",
@@ -92,10 +96,6 @@ public class BomGeneratorTask extends DefaultTask {
       ImmutableList.of(
           "crash-plugin",
           "firebase-ml-vision",
-          "firebase-appcheck-debug",
-          "firebase-appcheck-interop",
-          "firebase-appcheck-safetynet",
-          "firebase-appcheck",
           "crashlytics",
           "firebase-ads",
           "firebase-ads-lite",
@@ -104,9 +104,13 @@ public class BomGeneratorTask extends DefaultTask {
           "firebase-analytics-impl-license",
           "firebase-analytics-license",
           "firebase-annotations",
-          "firebase-appcheck-debug-testing",
+          "firebase-appcheck-interop",
+          "firebase-appcheck-safetynet",
           "firebase-appdistribution-gradle",
           "firebase-appindexing-license",
+          "firebase-appindexing",
+          "firebase-iid",
+          "firebase-core",
           "firebase-auth-common",
           "firebase-auth-impl",
           "firebase-auth-interop",
@@ -118,6 +122,7 @@ public class BomGeneratorTask extends DefaultTask {
           "firebase-common-license",
           "firebase-components",
           "firebase-config-license",
+          "firebase-config-interop",
           "firebase-crash",
           "firebase-crash-license",
           "firebase-crashlytics-buildtools",
@@ -127,6 +132,10 @@ public class BomGeneratorTask extends DefaultTask {
           "firebase-database-connection-license",
           "firebase-database-license",
           "firebase-datatransport",
+          "firebase-appdistribution-ktx",
+          "firebase-appdistribution",
+          "firebase-appdistribution-api",
+          "firebase-appdistribution-api-ktx",
           "firebase-dynamic-module-support",
           "firebase-dynamic-links-license",
           "firebase-functions-license",
@@ -141,9 +150,11 @@ public class BomGeneratorTask extends DefaultTask {
           "firebase-ml-model-interpreter",
           "firebase-perf-license",
           "firebase-plugins",
+          "firebase-sessions",
           "firebase-storage-common",
           "firebase-storage-common-license",
           "firebase-storage-license",
+          "firebase-vertexai",
           "perf-plugin",
           "play-services-ads",
           "protolite-well-known-types",
@@ -177,6 +188,9 @@ public class BomGeneratorTask extends DefaultTask {
 
   public Map<String, String> versionOverrides = new HashMap<>();
 
+  @OutputDirectory
+  public abstract DirectoryProperty getBomDirectory();
+
   /**
    * This task generates a current Bill of Materials (BoM) based on the latest versions of
    * everything in gMaven. This is meant to be a post-release task so that the BoM contains the most
@@ -238,8 +252,8 @@ public void generateBom() throws Exception {
     String version = findArtifactVersion(bomDependencies, currentVersion, previousBomVersions);
 
     // Surface generated pom for sanity checking and testing, and then write it.
-    Path projectRootDir = this.getProject().getRootDir().toPath();
-    PomXmlWriter xmlWriter = new PomXmlWriter(bomDependencies, version, projectRootDir);
+    Path bomDir = getBomDirectory().getAsFile().get().toPath();
+    PomXmlWriter xmlWriter = new PomXmlWriter(bomDependencies, version, bomDir);
     MarkdownDocumentationWriter documentationWriter =
         new MarkdownDocumentationWriter(
             bomDependencies, version, previousBomVersions, currentVersion);
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/PomXmlWriter.java b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/PomXmlWriter.java
index bd06ad843b0..bac4b8d9c85 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/PomXmlWriter.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/PomXmlWriter.java
@@ -86,7 +86,7 @@ public void writeXmlDocument(Document document) throws IOException, TransformerE
     transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
 
     DOMSource source = new DOMSource(document);
-    Path outputDir = rootDir.resolve("bom/com/google/firebase/firebase-bom/" + version + "/");
+    Path outputDir = rootDir.resolve("com/google/firebase/firebase-bom/" + version + "/");
     Files.createDirectories(outputDir);
     Path pom = outputDir.resolve("firebase-bom-" + version + ".pom");
     StreamResult file = new StreamResult(pom.toFile());
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RecipeVersionWriter.java b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RecipeVersionWriter.java
index a34c45a5975..09f56eb6099 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RecipeVersionWriter.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RecipeVersionWriter.java
@@ -44,7 +44,7 @@ public String generateVersionUpdate() {
             "com.google.gms:google-services"));
     outputBuilder.append(
         "  <!ENTITY google-services-plugin \"com.google.gms.google-services\">\n"
-            + "  <!ENTITY gradle-plugin-class \"com.android.tools.build:gradle:3.4.0\">\n");
+            + "  <!ENTITY gradle-plugin-class \"com.android.tools.build:gradle:8.1.0\">\n");
     outputBuilder.append("\n");
     outputBuilder.append("  <!-- Firebase SDK libraries -->\n");
     outputBuilder.append(
@@ -53,102 +53,48 @@ public String generateVersionUpdate() {
             "Analytics",
             "analytics-dependency",
             "com.google.firebase:firebase-analytics"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Analytics KTX",
-            "analytics-ktx-dependency",
-            "com.google.firebase:firebase-analytics-ktx"));
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,
             "Crashlytics",
             "crashlytics-dependency",
             "com.google.firebase:firebase-crashlytics"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Crashlytics KTX",
-            "crashlytics-ktx-dependency",
-            "com.google.firebase:firebase-crashlytics-ktx"));
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,
             "Performance Monitoring",
             "perf-dependency",
             "com.google.firebase:firebase-perf"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Performance Monitoring KTX",
-            "perf-ktx-dependency",
-            "com.google.firebase:firebase-perf-ktx"));
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,
             "Cloud Messaging",
             "messaging-dependency",
             "com.google.firebase:firebase-messaging"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Cloud Messaging KTX",
-            "messaging-ktx-dependency",
-            "com.google.firebase:firebase-messaging-ktx"));
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,
             "Authentication",
             "auth-dependency",
             "com.google.firebase:firebase-auth"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Authentication KTX",
-            "auth-ktx-dependency",
-            "com.google.firebase:firebase-auth-ktx"));
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,
             "Realtime Database",
             "database-dependency",
             "com.google.firebase:firebase-database"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Realtime Database KTX",
-            "database-ktx-dependency",
-            "com.google.firebase:firebase-database-ktx"));
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,
             "Cloud Storage",
             "storage-dependency",
             "com.google.firebase:firebase-storage"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Cloud Storage KTX",
-            "storage-ktx-dependency",
-            "com.google.firebase:firebase-storage-ktx"));
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,
             "Remote Config",
             "remote-config-dependency",
             "com.google.firebase:firebase-config"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Remote Config KTX",
-            "remote-config-ktx-dependency",
-            "com.google.firebase:firebase-config-ktx"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "App Indexing",
-            "appindexing-dependency",
-            "com.google.firebase:firebase-appindexing"));
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,
@@ -161,48 +107,18 @@ public String generateVersionUpdate() {
             "Cloud Firestore",
             "firestore-dependency",
             "com.google.firebase:firebase-firestore"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Cloud Firestore KTX",
-            "firestore-ktx-dependency",
-            "com.google.firebase:firebase-firestore-ktx"));
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,
             "Firebase Functions",
             "functions-dependency",
             "com.google.firebase:firebase-functions"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Firebase Functions KTX",
-            "functions-ktx-dependency",
-            "com.google.firebase:firebase-functions-ktx"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Firebase Dynamic Links",
-            "fdl-dependency",
-            "com.google.firebase:firebase-dynamic-links"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "Firebase Dynamic Links KTX",
-            "fdl-ktx-dependency",
-            "com.google.firebase:firebase-dynamic-links-ktx"));
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,
             "FIAM Display",
             "fiamd-dependency",
             "com.google.firebase:firebase-inappmessaging-display"));
-    outputBuilder.append(
-        generateVersionVariable(
-            depsByArtifactId,
-            "FIAM Display KTX",
-            "fiamd-ktx-dependency",
-            "com.google.firebase:firebase-inappmessaging-display-ktx"));
     outputBuilder.append(
         generateVersionVariable(
             depsByArtifactId,
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java
index 0a1e1ed585d..d707acb0fcc 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java
@@ -23,6 +23,7 @@
 import java.util.function.Consumer;
 import org.gradle.api.GradleException;
 
+// TODO(b/267668143): With modernization efforts
 public class ShellExecutor {
   private final Runtime runtime;
   private final File cwd;
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt
new file mode 100644
index 00000000000..82477b0d74d
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt
@@ -0,0 +1,300 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import com.android.build.gradle.LibraryExtension
+import com.google.firebase.gradle.plugins.ci.Coverage
+import java.io.File
+import java.nio.file.Paths
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.ProjectDependency
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPom
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
+import org.gradle.api.tasks.TaskProvider
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.findByType
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.provideDelegate
+import org.gradle.kotlin.dsl.register
+import org.w3c.dom.Element
+
+abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
+  protected fun registerMakeReleaseNotesTask(project: Project) =
+    project.tasks.register<MakeReleaseNotesTask>("makeReleaseNotes") {
+      val changelog = project.file("CHANGELOG.md")
+      val releaseNotes by tempFile("release_notes.md")
+
+      onlyIf("Changelog file not found.") { changelog.exists() }
+
+      changelogFile.set(changelog)
+      releaseNotesFile.set(releaseNotes)
+      skipMissingEntries.set(project.provideProperty("skipEmptyChangelog"))
+    }
+
+  protected fun kotlinModuleName(project: Project): String {
+    val fullyQualifiedProjectPath = project.path.replace(":".toRegex(), "-")
+    return project.rootProject.name + fullyQualifiedProjectPath
+  }
+
+  protected fun setupStaticAnalysis(project: Project, library: FirebaseLibraryExtension) {
+    project.afterEvaluate {
+      configurations.all {
+        if ("lintChecks" == name) {
+          for (checkProject in library.staticAnalysis.androidLintCheckProjects) {
+            project.dependencies.add("lintChecks", project.project(checkProject!!))
+          }
+        }
+      }
+    }
+    project.tasks.register("firebaseLint") { dependsOn("lint") }
+    Coverage.apply(library)
+  }
+
+  protected fun getApiInfo(project: Project, srcDirs: Set<File>): TaskProvider<ApiInformationTask> {
+    val outputFile =
+      project.rootProject.file(
+        Paths.get(
+          project.rootProject.buildDir.path,
+          "apiinfo",
+          project.path.substring(1).replace(":", "_")
+        )
+      )
+    val outputApiFile = File(outputFile.absolutePath + "_api.txt")
+    val apiTxt =
+      project.file("api.txt").takeIf { it.exists() } ?: project.rootProject.file("empty-api.txt")
+    val apiInfo =
+      project.tasks.register<ApiInformationTask>("apiInformation") {
+        sources.value(project.provider { srcDirs })
+        apiTxtFile.set(apiTxt)
+        baselineFile.set(project.file("baseline.txt"))
+        this.outputFile.set(outputFile)
+        this.outputApiFile.set(outputApiFile)
+        updateBaseline.set(project.hasProperty("updateBaseline"))
+      }
+    return apiInfo
+  }
+
+  protected fun getIsPomValidTask(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
+    project.tasks.register<PomValidator>("isPomDependencyValid") {
+      pomFile.set(project.layout.buildDirectory.file("publications/mavenAar/pom-default.xml"))
+      groupId.set(firebaseLibrary.groupId.get())
+      artifactId.set(firebaseLibrary.artifactId.get())
+      dependsOn("generatePomFileForMavenAarPublication")
+    }
+  }
+
+  protected fun getGenerateApiTxt(project: Project, srcDirs: Set<File>) =
+    project.tasks.register<GenerateApiTxtTask>("generateApiTxtFile") {
+      sources.value(project.provider { srcDirs })
+      apiTxtFile.set(project.file("api.txt"))
+      baselineFile.set(project.file("baseline.txt"))
+      updateBaseline.set(project.hasProperty("updateBaseline"))
+    }
+
+  protected fun getDocStubs(project: Project, srcDirs: Set<File>) =
+    project.tasks.register<GenerateStubsTask>("docStubs") {
+      sources.value(project.provider { srcDirs })
+    }
+
+  /**
+   * Adds + configures the [MavenPublishPlugin] for the given [project].
+   *
+   * This provides the repository we publish to (a folder in the root build directory), and
+   * configures maven pom generation.
+   *
+   * @see [applyPomTransformations]
+   * @see [FirebaseLibraryExtension.applyPomCustomization]
+   */
+  protected fun configurePublishing(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
+    with(project) {
+      apply<MavenPublishPlugin>()
+      extensions.configure<PublishingExtension> {
+        repositories.maven {
+          url = rootProject.fileFromBuildDir("m2repository").toURI()
+          name = "BuildDir"
+        }
+        publications.create<MavenPublication>("mavenAar") {
+          afterEvaluate {
+            artifactId =
+              firebaseLibrary.artifactId.get() // these dont get populated until afterEvaluate :(
+            groupId = firebaseLibrary.groupId.get()
+
+            firebaseLibrary.applyPomCustomization(pom)
+            firebaseLibrary.applyPomTransformations(pom)
+            from(components.findByName(firebaseLibrary.type.componentName))
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Performs various transformations needed to ensure the given [pom] is ready for a release.
+   *
+   * The transformations are done lazily via the [withXml][MavenPom.withXml] provider.
+   *
+   * @param pom the [MavenPom] to prepare
+   * @see [addTypeWithAARSupport]
+   */
+  // TODO(b/270576405): Combine with applyPomCustomization when migrating FirebaseLibraryExtension
+  private fun FirebaseLibraryExtension.applyPomTransformations(pom: MavenPom) {
+    pom.withXml {
+      val dependencies = asElement().findElementsByTag("dependency")
+      val androidDependencies = resolveAndroidDependencies()
+      for (dependency in dependencies) {
+        addTypeWithAARSupport(dependency, androidDependencies)
+      }
+    }
+  }
+
+  /**
+   * Adds + configures the `type` element as a direct descendant of the provided [Element].
+   *
+   * The `type` element specifies what the given [dependency] is published as. This could be another
+   * `pom`, a `jar`, an `aar`, etc., Usually, the [MavenPublishPlugin] can infer these types; this
+   * is not the case however with `aar` artifacts.
+   *
+   * This method will check if the provided [dependency] is in the provided list of artifact strings
+   * ([androidLibraries]), and map it to an `aar` or `jar` as needed.
+   *
+   * The following is an example of a `type` element:
+   * ```
+   * <dependency>
+   *   <type>aar</type>
+   * </dependency>
+   * ```
+   *
+   * @param dependency the element to append the `type` to
+   * @param androidLibraries a list of dependencies for this given SDK that publish `aar` artifacts
+   * @see applyPomTransformations
+   */
+  // TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
+  private fun addTypeWithAARSupport(dependency: Element, androidLibraries: List<String>) {
+    dependency.findOrCreate("type").apply {
+      textContent = if (androidLibraries.contains(dependency.toMavenName())) "aar" else "jar"
+    }
+  }
+}
+
+/**
+ * A list of _all_ dependencies that publish `aar` artifacts.
+ *
+ * This is collected via the [runtimeClasspath][FirebaseLibraryExtension.getRuntimeClasspath], and
+ * includes project level dependencies as well as external dependencies.
+ *
+ * The dependencies are mapped to their [mavenName][toMavenName].
+ *
+ * @see resolveProjectLevelDependencies
+ * @see resolveExternalAndroidLibraries
+ */
+// TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
+fun FirebaseLibraryExtension.resolveAndroidDependencies() =
+  resolveExternalAndroidLibraries() +
+    resolveProjectLevelDependencies().filter { it.type == LibraryType.ANDROID }.map { it.mavenName }
+
+/**
+ * A list of project level dependencies.
+ *
+ * This is collected via the [runtimeClasspath][FirebaseLibraryExtension.getRuntimeClasspath].
+ *
+ * @throws RuntimeException if a project level dependency is found that doesn't have
+ * [FirebaseLibraryExtension]
+ */
+// TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
+fun FirebaseLibraryExtension.resolveProjectLevelDependencies() =
+  project.configurations
+    .getByName(runtimeClasspath)
+    .allDependencies
+    .mapNotNull { it as? ProjectDependency }
+    .map {
+      it.dependencyProject.extensions.findByType<FirebaseLibraryExtension>()
+        ?: throw RuntimeException(
+          "Project level dependencies must have the firebaseLibrary plugin. The following dependency does not: ${it.artifactName}"
+        )
+    }
+
+/**
+ * A list of _external_ dependencies that publish `aar` artifacts.
+ *
+ * This is collected via the [runtimeClasspath][FirebaseLibraryExtension.getRuntimeClasspath], using
+ * an [ArtifactView][org.gradle.api.artifacts.ArtifactView] that filters for `aar` artifactType.
+ *
+ * Artifacts are mapped to their respective maven name:
+ * ```
+ * groupId:artifactId
+ * ```
+ */
+// TODO(b/277607560): Remove when Gradle's MavenPublishPlugin adds functionality for aar types
+fun FirebaseLibraryExtension.resolveExternalAndroidLibraries() =
+  project.configurations
+    .getByName(runtimeClasspath)
+    .incoming
+    .artifactView { attributes { attribute("artifactType", "aar") } }
+    .artifacts
+    .map { it.variant.displayName.substringBefore(" ").substringBeforeLast(":") }
+
+/**
+ * The name provided to this artifact when published.
+ *
+ * Syntax sugar for:
+ * ```
+ * "$mavenName:$version"
+ * ```
+ *
+ * For example, the following could be an artifact name:
+ * ```
+ * "com.google.firebase:firebase-common:16.0.5"
+ * ```
+ */
+val FirebaseLibraryExtension.artifactName: String
+  get() = "$mavenName:$version"
+
+/**
+ * Fetches the latest version for this SDK from GMaven.
+ *
+ * Uses [GmavenHelper] to make the request.
+ */
+val FirebaseLibraryExtension.latestVersion: ModuleVersion
+  get() {
+    val latestVersion = GmavenHelper(groupId.get(), artifactId.get()).getLatestReleasedVersion()
+
+    return ModuleVersion.fromStringOrNull(latestVersion)
+      ?: throw RuntimeException(
+        "Invalid format for ModuleVersion for module '$artifactName':\n $latestVersion"
+      )
+  }
+
+/**
+ * Fetches the namespace for this SDK from the [LibraryExtension].
+ *
+ * eg;
+ *
+ * ```
+ * com.googletest.firebase.appdistribution
+ * ```
+ *
+ * @throws RuntimeException when the project doesn't have a defined namespace
+ */
+val FirebaseLibraryExtension.namespace: String
+  get() =
+    project.extensions.getByType<LibraryExtension>().namespace
+      ?: throw RuntimeException("Project doesn't have a defined namespace: ${project.path}")
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Changelog.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Changelog.kt
new file mode 100644
index 00000000000..6d90bfad6b8
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Changelog.kt
@@ -0,0 +1,388 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import java.io.File
+
+// TODO(b/281873509) - Add documentation for CHANGELOG.md
+/**
+ * Type safe representation of `CHANGELOG.md` files.
+ *
+ * For more information on what a `CHANGELOG.md` file entails, see the following documentation:
+ * [Changelog Files](#)
+ *
+ * @property releases previous releases and the data associated with them
+ * @see fromFile
+ * @see fromString
+ */
+data class Changelog(val releases: List<ReleaseEntry>) {
+
+  override fun toString(): String = releases.joinToString("\n") + "\n"
+
+  companion object {
+    /**
+     * Regex for finding the version titles in a changelog file.
+     *
+     * The regex can be described as such:
+     * - Find lines that start with `#`, followed by a space and any amount of characters
+     *
+     * For example:
+     * ```markdown
+     * # Unreleased
+     *
+     * # 18.3.7
+     * [feature] Added collection of version control information generated by the
+     *   Android Gradle plugin (AGP).
+     *
+     * # 18.3.6
+     * [feature] Added support for upcoming [crashlytics] features to report
+     *   GWP-ASan crashes on supported API levels.
+     * ```
+     *
+     * Will find the following groups:
+     * ```kotlin
+     * [
+     *   "Unreleased",
+     *   "18.3.7",
+     *   "18.3.6"
+     * ]
+     * ```
+     */
+    val RELEASE_VERSION_REGEX = Regex("^# (.+)", RegexOption.MULTILINE)
+
+    /**
+     * Parses a [Changelog] from a [String].
+     *
+     * For example, the following is a valid string:
+     * ```markdown
+     * # Unreleased
+     *
+     * # 18.3.7
+     * [feature] Added collection of version control information generated by the
+     *   Android Gradle plugin (AGP).
+     *
+     * ## Kotlin
+     * The Kotlin extensions library transitively includes the updated
+     * `firebase-crashlytics` library. The Kotlin extensions library has no additional
+     * updates.
+     *
+     * # 18.3.6
+     * [feature] Added support for upcoming [crashlytics] features to report
+     *   GWP-ASan crashes on supported API levels.
+     * ```
+     *
+     * @see RELEASE_VERSION_REGEX
+     * @see ReleaseEntry
+     */
+    fun fromString(string: String): Changelog {
+      val content = RELEASE_VERSION_REGEX.split(string).map { it.trim('\n', ' ') }.drop(1)
+      val releaseNames =
+        RELEASE_VERSION_REGEX.findAll(string).map { it.firstCapturedValue }.toList()
+
+      val releases = releaseNames.zip(content).map { ReleaseEntry.fromString(it.first, it.second) }
+
+      return Changelog(releases)
+    }
+
+    /**
+     * Parses a [Changelog] from the text content of a [File].
+     *
+     * Just a helper method to call off to [Changelog.fromString].
+     */
+    fun fromFile(file: File): Changelog = fromString(file.readText())
+  }
+}
+
+/**
+ * A release in a [Changelog], and its associated data.
+ *
+ * @property version the [ModuleVersion] that this release was for
+ * @property content what went out in the release
+ * @property ktx a variant of [content] for a ktx subcategory- if present, or null otherwise
+ * @see fromString
+ */
+data class ReleaseEntry(
+  val version: ModuleVersion?,
+  val content: ReleaseContent,
+  val ktx: ReleaseContent?
+) {
+
+  override fun toString(): String {
+    return """
+      |# ${version ?: "Unreleased"}
+      |$content
+      |${ktx?.let { """
+      |
+      |## Kotlin
+      |$it
+      |""" }.orEmpty()}
+    """
+      .trimMargin()
+  }
+
+  /**
+   * If there is any content in this release.
+   *
+   * Meaning that there is content in either the [base release][content] or [ktx].
+   *
+   * @see ReleaseContent.hasContent
+   */
+  fun hasContent() = content.hasContent() || ktx?.hasContent() ?: false
+
+  companion object {
+
+    /**
+     * A static instance of a [ReleaseEntry] without any content.
+     *
+     * This exists to provide a means for tooling to create new sections explicitly, versus offering
+     * default values to [ReleaseEntry]
+     * - as this could lead to edge case scenarios where empty [ReleaseEntry] instances are
+     * accidentally created.
+     */
+    val Empty = ReleaseEntry(null, ReleaseContent("", emptyList()), null)
+
+    /**
+     * Regex for finding the Kotlin header in a changelog file.
+     *
+     * The regex can be described as such:
+     * - Look for a line that only contains `## Kotlin`
+     *
+     * For example:
+     * ```markdown
+     * # 18.3.7
+     * [feature] Added collection of version control information generated by the
+     *   Android Gradle plugin (AGP).
+     *
+     * ## Kotlin
+     * [feature] Added support for upcoming [crashlytics] features to report
+     *   GWP-ASan crashes on supported API levels.
+     * ```
+     *
+     * Will find the following match:
+     * ```kotlin
+     * "## Kotlin"
+     * ```
+     */
+    val KOTLIN_TITLE_REGEX = Regex("^## Kotlin\n", RegexOption.MULTILINE)
+
+    /**
+     * Parses a [ReleaseEntry] from a [String], given the version name.
+     *
+     * For example, the following is a valid string:
+     * ```markdown
+     * [feature] Added some cool stuff
+     *
+     * [changed] Changed some bad stuff
+     *
+     * ## Kotlin
+     * [feature] Added other cool stuff
+     * ```
+     *
+     * @param versionString the version of the release
+     * @param string the content of a release
+     * @see KOTLIN_TITLE_REGEX
+     * @see ReleaseContent
+     */
+    fun fromString(versionString: String, string: String): ReleaseEntry {
+      val (contentString, ktxString) = KOTLIN_TITLE_REGEX.split(string).toPairOrFirst()
+
+      val content = ReleaseContent.fromString(contentString)
+      val ktx = ktxString?.let { ReleaseContent.fromString(it) }
+      val version = ModuleVersion.fromStringOrNull(versionString)
+
+      if (ktx?.hasContent() == false)
+        throw RuntimeException("KTX header found without any content:\n $string")
+
+      return ReleaseEntry(version, content, ktx)
+    }
+  }
+}
+
+/**
+ * The data for a [release][ReleaseEntry].
+ *
+ * @property subtext optional additional text provided for a release
+ * @property changes a list of changes that went out in this release
+ * @see fromString
+ */
+data class ReleaseContent(val subtext: String, val changes: List<Change>) {
+
+  override fun toString(): String {
+    val changes = changes.joinToString("\n")
+
+    return when {
+      subtext.isNotBlank() && changes.isNotBlank() -> "$subtext\n\n$changes"
+      subtext.isNotBlank() -> subtext
+      changes.isNotBlank() -> changes
+      else -> ""
+    }
+  }
+
+  /**
+   * If there is any content in this release.
+   *
+   * Meaning that there is either [changes] or [subtext] present.
+   */
+  fun hasContent() = changes.isNotEmpty() || subtext.isNotBlank()
+
+  companion object {
+    /**
+     * Regex for finding the changes in a release.
+     *
+     * The regex can be described as such:
+     * - Look for a line that starts with a `*`, followed by a space and any amount of characters
+     * - Keep collecting characters until you find a line that starts with `*` or you hit EOF
+     *
+     * For example:
+     * ```markdown
+     * This release contains a known bug. We will address this in a future bugfix.
+     *
+     * [feature] Added some cool stuff
+     *
+     * [changed] Changed some bad stuff
+     * ```
+     *
+     * Will find the following groups:
+     * ```kotlin
+     * [
+     *   "[feature] Added some cool stuff",
+     *   "[changed] Changed some bad stuff"
+     * ]
+     * ```
+     */
+    val CHANGE_REGEX = Regex("^\\* ([\\s\\S]+?)(?=^\\*|(?![\\s\\S]))", RegexOption.MULTILINE)
+
+    /**
+     * Regex for finding the subtext in a release.
+     *
+     * The regex can be described as such:
+     * - Look for a line that with any amount of characters
+     * - This line should not start with whitespace or a `*`
+     * - This line should either end with two new lines or there should be nothing after it
+     *
+     * For example:
+     * ```markdown
+     * This release contains a known bug. We will address this in a future bugfix.
+     *
+     * [feature] Added some cool stuff
+     *
+     * [changed] Changed some bad stuff
+     * ```
+     *
+     * Will find the following group:
+     * ```kotlin
+     * "This release contains a known bug. We will address this in a future bugfix."
+     * ```
+     */
+    val SUBTEXT_REGEX = Regex("^([^\\*\\s][\\s\\S]+?)(\\n\\n|(?![\\s\\S]))")
+
+    /**
+     * Parses [ReleaseContent] from a [String].
+     *
+     * For example, the following is a valid string:
+     * ```markdown
+     * This release contains a known bug. We will address this in a future bugfix.
+     *
+     * [feature] Added some cool stuff
+     *
+     * [changed] Changed some bad stuff
+     * ```
+     *
+     * @see CHANGE_REGEX
+     * @see SUBTEXT_REGEX
+     * @see Change
+     */
+    fun fromString(string: String): ReleaseContent {
+      val changes =
+        CHANGE_REGEX.findAll(string).map { Change.fromString(it.firstCapturedValue) }.toList()
+      val firstChange = CHANGE_REGEX.find(string)
+      val subtext = if (firstChange != null) string.substringBefore(firstChange.value) else string
+
+      return ReleaseContent(subtext.trim(), changes.toList())
+    }
+  }
+}
+
+/**
+ * Information about a change that went out in a [release][ReleaseContent].
+ *
+ * @property type what kind of change it was
+ * @property message a description of the change
+ * @see fromString
+ */
+data class Change(val type: ChangeType, val message: String) {
+
+  override fun toString(): String = "* [$type] $message"
+
+  companion object {
+    /**
+     * Regex for finding the information about a [Change].
+     *
+     * The regex can be described as such:
+     * - Look for a line that might start with a space
+     * - Look for a `[` followed by any amount of letters and another `]` (this will be the `type`)
+     * - Anything after the `type` should be the `content`
+     *
+     * For example:
+     * ```markdown
+     * [feature] Added some cool stuff
+     * ```
+     *
+     * Will find the following named groups:
+     * ```kotlin
+     * [
+     *   "type": "feature",
+     *   "content": "Added some cool stuff"
+     * ]
+     * ```
+     */
+    val REGEX = Regex("^ ?\\[ ?(?<type>\\w+) ?\\](?<content>[\\s\\S]*)", RegexOption.MULTILINE)
+
+    /**
+     * Parses [Change] from a [String].
+     *
+     * For example, the following is a valid string:
+     * ```markdown
+     * [feature] Added some cool stuff
+     * ```
+     *
+     * @see REGEX
+     * @see ChangeType
+     */
+    fun fromString(string: String): Change {
+      val (type, description) = REGEX.findOrThrow(string).destructured
+
+      return Change(ChangeType.valueOf(type.toUpperCase()), description.trim())
+    }
+  }
+}
+
+/**
+ * A classification for what a change does.
+ *
+ * For example, does the change add something? Does it add a new feature? Maybe it fixes a bug?
+ */
+enum class ChangeType {
+  FEATURE,
+  FIXED,
+  CHANGED,
+  UNCHANGED,
+  REMOVED,
+  DEPRECATED;
+
+  override fun toString(): String = name.toLowerCase()
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/CheckHeadDependencies.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/CheckHeadDependencies.kt
new file mode 100644
index 00000000000..4e5bb48127d
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/CheckHeadDependencies.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+
+/**
+ * Validates that all project level dependencies are in the release.
+ *
+ * Any releasing library that has a project level dependency on another library invokes the release
+ * of said dependent libary. This is checked via the [artifactId]
+ * [FirebaseLibraryExtension.artifactId], so that the check is version agnostic.
+ *
+ * @throws GradleException if any project level dependencies are found that are not included in the
+ * release
+ */
+abstract class CheckHeadDependencies : DefaultTask() {
+  @get:Input abstract val projectsToPublish: ListProperty<FirebaseLibraryExtension>
+
+  @TaskAction
+  fun run() {
+    val projectsReleasing = computeProjectsReleasing()
+
+    val errors =
+      projectsToPublish
+        .get()
+        .associate { it.artifactId.get() to it.projectLevelDepsAsArtifactIds() - projectsReleasing }
+        .filterValues { it.isNotEmpty() }
+        .map { "${it.key} requires: ${it.value.joinToString(", ") }" }
+
+    if (errors.isNotEmpty()) {
+      throw GradleException(
+        "Project-level dependency errors found. Please update the release config.\n" +
+          "${errors.joinToString("\n")}"
+      )
+    }
+  }
+
+  private fun FirebaseLibraryExtension.projectLevelDepsAsArtifactIds() =
+    resolveProjectLevelDependencies().map { it.artifactId.get() }
+
+  private fun computeProjectsReleasing() =
+    projectsToPublish.get().map { it.artifactId.get() } + DEPENDENCIES_TO_IGNORE
+
+  companion object {
+    val DEPENDENCIES_TO_IGNORE = listOf("protolite-well-known-types")
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt
new file mode 100644
index 00000000000..28af40f7e7a
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import com.android.build.gradle.BaseExtension
+import java.io.File
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.tasks.Copy
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.register
+
+/**
+ * Copies the root google-services.json into the project directory during build time.
+ *
+ * If a path is provided via `FIREBASE_GOOGLE_SERVICES_PATH`, that will be used instead. The file
+ * will also be renamed to `google-services.json`, so provided files do *not* need to be properly
+ * named.
+ *
+ * Will also register the `com.google.gms.google-services` plugin if a test task is running.
+ */
+abstract class CopyGoogleServicesPlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    val copyRootGoogleServices = registerCopyRootGoogleServicesTask(project)
+
+    project.allprojects {
+      // fixes dependencies with gradle tasks that do not properly dependOn `preBuild`
+      tasks.configureEach {
+        if (name !== "copyRootGoogleServices") dependsOn(copyRootGoogleServices)
+      }
+    }
+
+    if (project.isRunningTestTask()) {
+      println("[test] applying google-services plugin")
+      project.plugins.apply("com.google.gms.google-services")
+    }
+  }
+
+  private fun Project.isRunningTestTask(): Boolean {
+    val testTasks = listOf("AndroidTest", "connectedCheck", "deviceCheck")
+
+    return gradle.startParameter.taskNames.any { testTasks.any(it::contains) }
+  }
+
+  private fun registerCopyRootGoogleServicesTask(project: Project) =
+    project.tasks.register<Copy>("copyRootGoogleServices") {
+      val sourcePath =
+        System.getenv("FIREBASE_GOOGLE_SERVICES_PATH") ?: "${project.rootDir}/google-services.json"
+
+      val library = project.extensions.getByType<BaseExtension>()
+
+      val targetPackageLine = "\"package_name\": \"${library.namespace}\""
+      val packageLineRegex = Regex("\"package_name\":\\s+\".*\"")
+
+      from(sourcePath)
+      into(project.projectDir)
+
+      rename { "google-services.json" }
+
+      if (fileIsMissingPackageName(sourcePath, targetPackageLine)) {
+        /**
+         * Modifies `google-services.json` such that all declared `package_name` entries are
+         * replaced with the project's namespace. This tricks the google services plugin into
+         * thinking that the target `package_name` is a Firebase App and allows connection to the
+         * Firebase project.
+         *
+         * Note that all events generated from that app will then go to whatever the first client
+         * entry is in the `google-services.json` file.
+         */
+        filter { it.replace(packageLineRegex, targetPackageLine) }
+      }
+    }
+
+  private fun fileIsMissingPackageName(path: String, targetPackageLine: String): Boolean {
+    val file = File(path)
+    if (!file.exists()) return true
+
+    return !file.readText().contains(targetPackageLine)
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt
new file mode 100644
index 00000000000..08573735f98
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import java.io.File
+import javax.inject.Inject
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.FileCollection
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Classpath
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskAction
+import org.gradle.process.ExecOperations
+import org.gradle.workers.WorkAction
+import org.gradle.workers.WorkParameters
+import org.gradle.workers.WorkerExecutor
+import org.json.JSONObject
+
+/**
+ * Extension class for [GenerateDocumentationTask].
+ *
+ * Provides public configurations for the task.
+ *
+ * @property dackkaJarFile a [File] of the Dackka fat jar
+ * @property dependencies a list of all dependent jars (the classpath)
+ * @property sources a list of source roots
+ * @property suppressedFiles a list of files to exclude from documentation
+ * @property packageListFiles a list of files that define external package-lists for links
+ * @property clientName the name of the module
+ * @property outputDirectory where to store the generated files
+ */
+@CacheableTask
+abstract class GenerateDocumentationTaskExtension : DefaultTask() {
+  @get:[InputFile Classpath]
+  abstract val dackkaJarFile: Property<File>
+
+  @get:[InputFiles Classpath]
+  abstract val dependencies: Property<FileCollection>
+
+  @get:InputFiles
+  @get:PathSensitive(PathSensitivity.RELATIVE)
+  abstract val sources: ListProperty<File>
+
+  @get:InputFiles
+  @get:PathSensitive(PathSensitivity.RELATIVE)
+  abstract val suppressedFiles: ListProperty<File>
+
+  @get:InputFiles
+  @get:PathSensitive(PathSensitivity.RELATIVE)
+  abstract val packageListFiles: ListProperty<File>
+
+  @get:Input abstract val clientName: Property<String>
+
+  @get:OutputDirectory abstract val outputDirectory: Property<File>
+}
+
+/**
+ * Wrapper data class for External package-lists in Dokka
+ *
+ * This class allows us to map package-lists in a type-safe way, versus inline straight to a map.
+ * This extra step could be removed- but it could also catch bugs in the future.
+ *
+ * @property packageList the prepared package-list file to map against
+ * @property externalLink the url to map with when generating the docs
+ */
+data class ExternalDocumentationLink(val packageList: File, val externalLink: String)
+
+/**
+ * Task to run Dackka on a project.
+ *
+ * Since dackka needs to be run on the command line, we have to organize the arguments for dackka
+ * into a json file. We then pass that json file to dackka as an argument.
+ *
+ * @see GenerateDocumentationTaskExtension
+ */
+abstract class GenerateDocumentationTask
+@Inject
+constructor(private val workerExecutor: WorkerExecutor) : GenerateDocumentationTaskExtension() {
+
+  @TaskAction
+  fun build() {
+    val configFile = saveToJsonFile(constructArguments())
+    launchDackka(configFile, workerExecutor)
+  }
+
+  private fun constructArguments(): JSONObject {
+    val annotationsNotToDisplay =
+      listOf(
+        "androidx.compose.runtime.Stable",
+        "androidx.compose.runtime.Immutable",
+        "androidx.compose.runtime.ReadOnlyComposable",
+        "androidx.annotation.CheckResult",
+        "androidx.annotation.OptIn",
+        "androidx.annotation.StringDef",
+        "kotlin.OptIn",
+        "kotlin.ParameterName",
+        "kotlin.js.JsName",
+        "java.lang.Override"
+      )
+    val annotationsNotToDisplayKotlin = listOf("kotlin.ExtensionFunctionType")
+
+    val jsonMap =
+      mapOf(
+        "moduleName" to "",
+        "outputDir" to outputDirectory.get().absolutePath,
+        "globalLinks" to "",
+        "sourceSets" to
+          listOf(
+            mutableMapOf(
+              "sourceSetID" to mapOf("scopeId" to "androidx", "sourceSetName" to "main"),
+              "sourceRoots" to sources.get().map { it.absolutePath },
+              "classpath" to dependencies.get().map { it.absolutePath },
+              "documentedVisibilities" to listOf("PUBLIC", "PROTECTED"),
+              "skipEmptyPackages" to "true",
+              "suppressedFiles" to suppressedFiles.get().map { it.absolutePath },
+              "externalDocumentationLinks" to
+                createExternalLinks(packageListFiles).map {
+                  mapOf("url" to it.externalLink, "packageListUrl" to it.packageList.toURI())
+                }
+            )
+          ),
+        "offlineMode" to "true",
+        "noJdkLink" to "true",
+        "pluginsConfiguration" to
+          listOf(
+            mapOf(
+              "fqPluginName" to "com.google.devsite.DevsitePlugin",
+              "serializationFormat" to "JSON",
+              "values" to
+                JSONObject(
+                    mapOf(
+                      "docRootPath" to "/docs/reference/",
+                      "javaDocsPath" to "android",
+                      "kotlinDocsPath" to "kotlin",
+                      "projectPath" to "client/${clientName.get()}",
+                      "includedHeadTagsPathJava" to
+                        "docs/reference/android/_reference-head-tags.html",
+                      "includedHeadTagsPathKotlin" to
+                        "docs/reference/kotlin/_reference-head-tags.html",
+                      "annotationsNotToDisplay" to annotationsNotToDisplay,
+                      "annotationsNotToDisplayKotlin" to annotationsNotToDisplayKotlin
+                    )
+                  )
+                  .toString()
+            )
+          )
+      )
+
+    return JSONObject(jsonMap)
+  }
+
+  private fun createExternalLinks(
+    packageLists: ListProperty<File>
+  ): List<ExternalDocumentationLink> {
+    val linksMap =
+      mapOf(
+        "android" to "https://developer.android.com/reference/kotlin/",
+        "androidx" to "https://developer.android.com/reference/kotlin/",
+        "google" to "https://developers.google.com/android/reference/",
+        "firebase" to "https://firebase.google.com/docs/reference/kotlin/",
+        "coroutines" to "https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-core/",
+        "kotlin" to "https://kotlinlang.org/api/latest/jvm/stdlib/"
+      )
+
+    return packageLists
+      .get()
+      .associateWith {
+        linksMap[it.parentFile.nameWithoutExtension]
+          ?: throw RuntimeException("Unexpected package-list found: ${it.name}")
+      }
+      .map { ExternalDocumentationLink(it.key, it.value) }
+  }
+
+  private fun saveToJsonFile(jsonObject: JSONObject) =
+    File.createTempFile("dackkaArgs", ".json").apply {
+      deleteOnExit()
+      writeText(jsonObject.toString(2))
+    }
+
+  private fun launchDackka(argsFile: File, workerExecutor: WorkerExecutor) {
+    val workQueue = workerExecutor.noIsolation()
+    workQueue.submit<DackkaWorkAction, DackkaParams>() {
+      args.set(listOf(argsFile.path, "-loggingLevel", "WARN"))
+      dackkaFile.set(dackkaJarFile.get())
+    }
+  }
+}
+
+/**
+ * Parameters needs to launch the Dackka fat jar on the command line.
+ *
+ * @property args a list of arguments to pass to Dackka- should include the json arguments file
+ * @property dackkaFile a [File] of the Dackka fat jar
+ */
+interface DackkaParams : WorkParameters {
+  val args: ListProperty<String>
+  val dackkaFile: Property<File>
+}
+
+/**
+ * Work action to launch dackka with a [DackkaParams].
+ *
+ * Work actions are organized sections of work, offered by gradle.
+ */
+abstract class DackkaWorkAction @Inject constructor(private val execOperations: ExecOperations) :
+  WorkAction<DackkaParams> {
+  override fun execute() {
+    execOperations.javaexec {
+      mainClass.set("org.jetbrains.dokka.MainKt")
+      args = parameters.args.get()
+      classpath(parameters.dackkaFile.get())
+    }
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt
new file mode 100644
index 00000000000..c4cd9de6019
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt
@@ -0,0 +1,248 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import com.android.build.api.attributes.BuildTypeAttr
+import com.android.build.gradle.LibraryExtension
+import java.io.File
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.Delete
+import org.gradle.api.tasks.TaskProvider
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.named
+import org.gradle.kotlin.dsl.register
+
+/**
+ * # Dackka Plugin
+ *
+ * The Dackka Plugin is a wrapper around internal tooling at Google called Dackka, which generates
+ * documentation for [Firesite](https://firebase.google.com/docs/reference)
+ *
+ * ## Dackka
+ *
+ * Dackka is an internal-purposed Dokka plugin. Google hosts its documentation on an internal
+ * service called **Devsite**. Firebase hosts their documentation on a variant of Devsite called
+ * **Firesite**. You can click [here](https://firebase.google.com/docs/reference) to see how that
+ * looks. Essentially, it's just Google's way of decorating (and organizing) documentation.
+ *
+ * Devsite expects its files to be in a very specific format. Previously, we would use an internal
+ * Javadoc doclet called [Doclava](https://code.google.com/archive/p/doclava/), which allowed us to
+ * provide sensible defaults as to how the Javadoc should be rendered. Then, we would do some
+ * further transformations to get the Javadoc output in-line with what Devsite expects. This was a
+ * lengthy process, and came with a lot of overhead. Furthermore, Doclava does not support kotlindoc
+ * and has been unmaintained for many years.
+ *
+ * Dackka is an internal solution to that. Dackka provides a devsite plugin for Dokka that will
+ * handle the job of doclava. Not only does this mean we can cut out a huge portion of our
+ * transformation systems- but the overhead for maintaining such systems is deferred away to the
+ * AndroidX team (the maintainers of Dackka).
+ *
+ * ## Dackka Usage
+ *
+ * The Dackka we use is a fat jar pulled periodically from Dackka nightly builds, and moved to our
+ * own maven repo bucket. Since it's recommended from the AndroidX team to run Dackka on the command
+ * line, the fat jar allows us to ignore all the miscenalionous dependencies of Dackka (in regards
+ * to Dokka especially).
+ *
+ * The general process of using Dackka is that you collect the dependencies and source sets of the
+ * gradle project, create a
+ * [Dokka appropriate JSON file](https://kotlin.github.io/dokka/1.7.10/user_guide/cli/usage/#example-using-json)
+ * , run the Dackka fat jar with the JSON file as an argument, and publish the output folder.
+ *
+ * ## Implementation
+ *
+ * Our implementation of Dackka falls into three separate files, and two separate tasks.
+ *
+ * ### [GenerateDocumentationTask]
+ *
+ * This task is the meat of our Dackka implementation. It's what actually handles the running of
+ * Dackka itself. The task exposes a gradle extension called [GenerateDocumentationTaskExtension]
+ * with various configuration points for Dackka. This will likely be expanded upon in the future, as
+ * configurations are needed.
+ *
+ * The job of this task is to **just** run Dackka. What happens after-the-fact does not matter to
+ * this task. It will take the provided inputs, organize them into the expected JSON file, and run
+ * Dackka with the JSON file as an argument.
+ *
+ * ### [FiresiteTransformTask]
+ *
+ * Dackka was designed with Devsite in mind. The problem though, is that we use Firesite. Firesite
+ * is very similar to Devsite, but there *are* minor differences.
+ *
+ * The job of this task is to transform the Dackka output from a Devsite purposed format, to a
+ * Firesite purposed format. This includes removing unnecessary files and headers, fixing links, and
+ * so forth.
+ *
+ * There are open bugs for each transformation, as in an ideal world- they are instead exposed as
+ * configurations from Dackka. Should these configurations be adopted by Dackka, this task could
+ * become unnecessary itself- as we could just configure the task during generation.
+ *
+ * ### DackkaPlugin
+ *
+ * This plugin is the mind of our Dackka implementation. It manages registering, and configuring all
+ * the tasks for Dackka (that is, the already established tasks above). While we do not currently
+ * offer any configuration for the Dackka plugin, this could change in the future as needed.
+ * Currently, the DackkaPlugin provides sensible defaults to output directories, package lists, and
+ * so forth.
+ *
+ * The DackkaPlugin also provides two extra tasks: [cleanDackkaDocumentation]
+ * [registerCleanDackkaDocumentation] and [copyDocsToCommonDirectory]
+ * [registerCopyDocsToCommonDirectoryTask].
+ *
+ * _cleanDackkaDocumentation_ is exactly what it sounds like, a task to clean up (delete) the output
+ * of Dackka. This is useful when testing Dackka outputs itself- and shouldn't be apart of the
+ * normal flow. The reasoning is that it would otherwise invalidate the gradle cache.
+ *
+ * _copyDocsToCommonDirectory_ copies the transformed Dackka output, and pastes it in a common
+ * directory under the root project's build directory. This makes it easier to zip the doc files for
+ * staging.
+ */
+abstract class DackkaPlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    prepareJavadocConfiguration(project)
+    registerCleanDackkaDocumentation(project)
+    val kotlinDoc = registerKotlinDocTask(project)
+
+    // TODO(b/270576405): remove afterEvalutate after fixed
+    project.afterEvaluate {
+      if (weShouldPublish(this)) {
+        val dackkaOutputDirectory = provider { fileFromBuildDir("dackkaRawOutput") }
+        val transformedFilesDirectory = provider { fileFromBuildDir("dackkaTransformedFiles") }
+
+        val generateDocumentation =
+          registerGenerateDackkaDocumentationTask(project, dackkaOutputDirectory)
+        val firesiteTransform =
+          registerFiresiteTransformTask(project, dackkaOutputDirectory, transformedFilesDirectory)
+        val copyDocsToCommonDirectory =
+          registerCopyDocsToCommonDirectoryTask(project, transformedFilesDirectory)
+
+        kotlinDoc.configure {
+          dependsOn(generateDocumentation, firesiteTransform, copyDocsToCommonDirectory)
+
+          outputs.dir(copyDocsToCommonDirectory.map { it.destinationDir })
+        }
+      }
+    }
+  }
+
+  private fun registerKotlinDocTask(project: Project) =
+    project.tasks.register("kotlindoc") { group = "documentation" }
+
+  /**
+   * Checks if the [Project] has opted in to releasing their documentation.
+   *
+   * This is done via the [FirebaseLibraryExtension.publishJavadoc] property.
+   */
+  private fun weShouldPublish(project: Project) = project.firebaseLibrary.publishJavadoc
+
+  /**
+   * Applies common configuration to the [javadocConfig], that is otherwise not present.
+   *
+   * @see javadocConfig
+   */
+  private fun prepareJavadocConfiguration(project: Project) {
+    project.javadocConfig.apply {
+      dependencies += project.dependencies.create("com.google.code.findbugs:jsr305:3.0.2")
+      dependencies +=
+        project.dependencies.create("com.google.errorprone:error_prone_annotations:2.15.0")
+      attributes.attribute(BuildTypeAttr.ATTRIBUTE, project.objects.named("release"))
+    }
+  }
+
+  private fun registerGenerateDackkaDocumentationTask(
+    project: Project,
+    targetDirectory: Provider<File>,
+  ): TaskProvider<GenerateDocumentationTask> =
+    project.tasks.register<GenerateDocumentationTask>("generateDackkaDocumentation") {
+      with(project.extensions.getByType<LibraryExtension>()) {
+        libraryVariants.all {
+          if (name == "release") {
+            val classpath =
+              compileConfiguration.jars + project.javadocConfig.jars + project.files(bootClasspath)
+
+            val sourceDirectories =
+              sourceSets.flatMap { it.javaDirectories } +
+                sourceSets.flatMap { it.kotlinDirectories }
+
+            sources.set(sourceDirectories)
+            dependencies.set(classpath)
+            outputDirectory.set(targetDirectory)
+            suppressedFiles.set(emptyList())
+            packageListFiles.set(fetchPackageLists(project))
+
+            applyCommonConfigurations()
+          }
+        }
+      }
+    }
+
+  private fun fetchPackageLists(project: Project) =
+    project.rootProject
+      .fileTree("kotlindoc/package-lists")
+      .matching { include("**/package-list") }
+      .toList()
+
+  private fun GenerateDocumentationTask.applyCommonConfigurations() {
+    dependsOnAndMustRunAfter("createFullJarRelease")
+
+    val dackkaFile = project.provider { project.dackkaConfig.singleFile }
+
+    dackkaJarFile.set(dackkaFile)
+    clientName.set(project.firebaseLibrary.artifactId)
+  }
+
+  private fun registerFiresiteTransformTask(
+    project: Project,
+    dackkaOutputDirectory: Provider<File>,
+    targetDirectory: Provider<File>
+  ) =
+    project.tasks.register<FiresiteTransformTask>("firesiteTransform") {
+      dependsOnAndMustRunAfter("generateDackkaDocumentation")
+
+      dackkaFiles.set(dackkaOutputDirectory.childFile("docs/reference"))
+      outputDirectory.set(targetDirectory)
+    }
+
+  private fun registerCopyDocsToCommonDirectoryTask(
+    project: Project,
+    transformedFilesDirectory: Provider<File>,
+  ) =
+    project.tasks.register<Copy>("copyDocsToCommonDirectory") {
+      mustRunAfter("firesiteTransform")
+
+      from(transformedFilesDirectory)
+      into(project.rootProject.fileFromBuildDir("firebase-kotlindoc"))
+    }
+
+  /**
+   * Useful for local testing, but may not be desired for standard use.
+   *
+   * As such, this task has to be ran explicitly- it won't be invoked otherwise.
+   */
+  private fun registerCleanDackkaDocumentation(project: Project) =
+    project.tasks.register<Delete>("cleanDackkaDocumentation") {
+      group = "cleanup"
+
+      val outputDirs = listOf("dackkaRawOutput", "dackkaTransformedFiles")
+
+      delete(outputDirs.map { project.fileFromBuildDir(it) })
+      delete(project.rootProject.fileFromBuildDir("firebase-kotlindoc"))
+    }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Dokka.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Dokka.java
deleted file mode 100644
index 0d835029748..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Dokka.java
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.gradle.plugins;
-
-import com.android.build.api.attributes.BuildTypeAttr;
-import com.android.build.gradle.LibraryExtension;
-import com.google.common.collect.ImmutableMap;
-import com.sun.istack.Nullable;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Optional;
-import org.gradle.api.GradleException;
-import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.attributes.Attribute;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.file.RelativePath;
-import org.gradle.api.tasks.Copy;
-import org.jetbrains.dokka.DokkaConfiguration;
-import org.jetbrains.dokka.gradle.DokkaAndroidTask;
-import org.jetbrains.dokka.gradle.DokkaTask;
-
-final class Dokka {
-  /**
-   * Configures the dokka task for a 'firebase-library'.
-   *
-   * <p>Configuration includes:
-   *
-   * <ol>
-   *   <li>Configure Metalava task for Java(non-Kotlin) libraries
-   *   <li>Configure Dokka with the DAC format and full classpath for symbol resolution
-   *   <li>Postprocessing of the produced Kotlindoc
-   *       <ul>
-   *         <li>Copy the _toc.yaml file to "client/{libName}/_toc.yaml"
-   *         <li>Filter out unneeded files
-   *         <li>Copy docs to the buildDir of the root project
-   *         <li>Remove the "https://firebase.google.com" prefix from all urls
-   */
-  static void configure(
-      Project project,
-      @Nullable LibraryExtension android,
-      FirebaseLibraryExtension firebaseLibrary) {
-
-    Configuration javadocClasspath = project.getConfigurations().create("javadocClasspath");
-    project.getDependencies().add("javadocClasspath", "com.google.code.findbugs:jsr305:3.0.2");
-    if (android != null) {
-      javadocClasspath
-          .getAttributes()
-          .attribute(
-              BuildTypeAttr.ATTRIBUTE, project.getObjects().named(BuildTypeAttr.class, "release"));
-    }
-    Configuration runtimeOnly = project.getConfigurations().findByName("runtimeOnly");
-    if (runtimeOnly != null) {
-      javadocClasspath.extendsFrom(runtimeOnly);
-    }
-
-    project.afterEvaluate(
-        p -> {
-          String dokkaPluginName =
-              android == null ? "org.jetbrains.dokka" : "org.jetbrains.dokka-android";
-          project.apply(ImmutableMap.of("plugin", dokkaPluginName));
-
-          if (!firebaseLibrary.publishJavadoc) {
-            project.getTasks().register("kotlindoc");
-            return;
-          }
-          Class<? extends DokkaTask> taskClass =
-              android == null ? DokkaTask.class : DokkaAndroidTask.class;
-          DokkaTask dokkaTask = configure(project, taskClass);
-
-          if (dokkaTask instanceof DokkaAndroidTask) {
-            ((DokkaAndroidTask) dokkaTask).setNoAndroidSdkLink(true);
-
-            android
-                .getLibraryVariants()
-                .all(
-                    v -> {
-                      if (v.getName().equals("release")) {
-                        FileCollection artifactFiles =
-                            getJars(v.getRuntimeConfiguration())
-                                .plus(getJars(javadocClasspath))
-                                .plus(project.files(android.getBootClasspath()));
-                        dokkaTask.setClasspath(artifactFiles);
-                      }
-                    });
-          }
-
-          project
-              .getTasks()
-              .create(
-                  "kotlindoc",
-                  Copy.class,
-                  copy -> {
-                    copy.dependsOn(dokkaTask);
-                    copy.setDestinationDir(
-                        project.file(
-                            project.getRootProject().getBuildDir() + "/firebase-kotlindoc"));
-                    copy.from(
-                        project.getBuildDir() + "/dokka/firebase",
-                        cfg -> {
-                          cfg.exclude("package-list");
-                          cfg.filesMatching(
-                              "_toc.yaml",
-                              fileCopy -> {
-                                fileCopy.setRelativePath(
-                                    new RelativePath(
-                                        true,
-                                        "client",
-                                        firebaseLibrary.artifactId.get(),
-                                        "_toc.yaml"));
-                                fileCopy.filter(
-                                    line ->
-                                        line.replaceFirst(
-                                            "\\spath:\\s/", " path: /docs/reference/kotlin/"));
-                              });
-                          cfg.filesMatching(
-                              "**/*.html",
-                              fileCopy ->
-                                  fileCopy.filter(
-                                      line -> line.replaceAll("https://firebase.google.com", "")));
-                        });
-                  });
-        });
-  }
-
-  private static FileCollection getJars(Configuration configuration) {
-    return configuration
-        .getIncoming()
-        .artifactView(
-            view -> {
-              view.attributes(
-                  attrs -> attrs.attribute(Attribute.of("artifactType", String.class), "jar"));
-              view.componentFilter(
-                  c -> !c.getDisplayName().startsWith("androidx.annotation:annotation:"));
-            })
-        .getArtifacts()
-        .getArtifactFiles();
-  }
-
-  static <T extends DokkaTask> T configure(Project project, Class<T> taskType) {
-    return project
-        .getTasks()
-        .create(
-            "kotlindocDokka",
-            taskType,
-            dokka -> {
-              dokka.setOutputDirectory(project.getBuildDir() + "/dokka/firebase");
-              dokka.setOutputFormat("dac");
-
-              dokka.setGenerateClassIndexPage(false);
-              dokka.setGeneratePackageIndexPage(false);
-              if (!project.getPluginManager().hasPlugin("kotlin-android")) {
-                dokka.dependsOn("docStubs");
-                dokka.setSourceDirs(
-                    Collections.singletonList(project.file(project.getBuildDir() + "/doc-stubs")));
-              }
-
-              dokka.setNoJdkLink(true);
-
-              createLink(
-                      project,
-                      "https://developers.android.com/reference/kotlin/",
-                      "kotlindoc/package-lists/android/package-list")
-                  .map(dokka.getExternalDocumentationLinks()::add);
-              createLink(
-                      project,
-                      "https://developers.google.com/android/reference/",
-                      "kotlindoc/package-lists/google/package-list")
-                  .map(dokka.getExternalDocumentationLinks()::add);
-              createLink(
-                      project,
-                      "https://firebase.google.com/docs/reference/kotlin/",
-                      "kotlindoc/package-lists/firebase/package-list")
-                  .map(dokka.getExternalDocumentationLinks()::add);
-              createLink(
-                      project,
-                      "https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/",
-                      "kotlindoc/package-lists/coroutines/package-list")
-                  .map(dokka.getExternalDocumentationLinks()::add);
-            });
-  }
-
-  private static Optional<DokkaConfiguration.ExternalDocumentationLink> createLink(
-      Project project, String url, String packageListPath) {
-
-    File packageListFile = project.getRootProject().file(packageListPath);
-    if (!packageListFile.exists()) {
-      return Optional.empty();
-    }
-    try {
-      DokkaConfiguration.ExternalDocumentationLink.Builder builder =
-          new DokkaConfiguration.ExternalDocumentationLink.Builder();
-      builder.setUrl(new URL(url));
-      builder.setPackageListUrl(packageListFile.toURI().toURL());
-      return Optional.of(builder.build());
-    } catch (MalformedURLException e) {
-      throw new GradleException("Could not parse url", e);
-    }
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FireEscapeArtifactPlugin.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FireEscapeArtifactPlugin.java
deleted file mode 100644
index 815897103fb..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FireEscapeArtifactPlugin.java
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.gradle.plugins;
-
-import java.io.File;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.Task;
-import org.gradle.api.publish.PublishingExtension;
-import org.gradle.api.publish.maven.MavenPublication;
-import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
-import org.gradle.api.tasks.bundling.Jar;
-import org.gradle.api.tasks.bundling.Zip;
-
-/**
- * Injects release related artifact into the maven publication.
- *
- * <p>The artifact contains the following files in it:
- *
- * <ul>
- *   <li>api-diff.txt
- *   <li>api.txt
- *   <li>mapping.txt(optional,only present if library is proguarded)
- * </ul>
- */
-public class FireEscapeArtifactPlugin implements Plugin<Project> {
-  private Project project;
-
-  @Override
-  public void apply(Project project) {
-    this.project = project;
-    project.afterEvaluate(
-        p -> {
-          FirebaseLibraryExtension firebaseLibrary =
-              p.getExtensions().findByType(FirebaseLibraryExtension.class);
-          if (firebaseLibrary == null) {
-            return;
-          }
-
-          Zip fireEscapeTask =
-              p.getTasks()
-                  .create(
-                      "mavenAarFireEscapeArtifact", Zip.class, t -> t.setClassifier("fireescape"));
-
-          p.getPlugins()
-              .withType(
-                  MavenPublishPlugin.class,
-                  plugin ->
-                      p.getExtensions()
-                          .configure(
-                              PublishingExtension.class,
-                              pub ->
-                                  pub.getPublications()
-                                      .withType(
-                                          MavenPublication.class,
-                                          publication -> {
-                                            if ("mavenAar".equals(publication.getName())) {
-                                              configurePublication(
-                                                  publication,
-                                                  fireEscapeTask,
-                                                  firebaseLibrary.type);
-                                            }
-                                          })));
-        });
-  }
-
-  private void configurePublication(
-      MavenPublication publication, Zip artifactTask, LibraryType libraryType) {
-    publication.artifact(artifactTask);
-    artifactTask.from(apiTxtFileTask());
-    if (libraryType.equals(LibraryType.ANDROID)) {
-      artifactTask.from(proguardMappingFileTask());
-    }
-    publication.artifact(javadocTask());
-  }
-
-  private Task proguardMappingFileTask() {
-    return project
-        .getTasks()
-        .create(
-            "fireEscapeProguardMapping",
-            task -> {
-              project
-                  .getTasks()
-                  .all(
-                      it -> {
-                        if (it.getName().equals("assembleRelease")) {
-                          task.dependsOn(it);
-                        }
-                      });
-              task.getOutputs()
-                  .file(new File(project.getBuildDir(), "outputs/mapping/release/mapping.txt"));
-            });
-  }
-
-  private Task apiTxtFileTask() {
-    return project
-        .getTasks()
-        .create(
-            "fireEscapeApiTxt",
-            task -> {
-              task.dependsOn(TasksKt.JAVADOC_TASK_NAME);
-              task.getOutputs().file(new File(project.getBuildDir(), "tmp/javadoc/api.txt"));
-            });
-  }
-
-  private Task javadocTask() {
-    return project
-        .getTasks()
-        .create(
-            "fireescapeJavadocJar",
-            Jar.class,
-            javadoc -> {
-              javadoc.dependsOn(TasksKt.JAVADOC_TASK_NAME);
-              javadoc.from(new File(project.getBuildDir(), "/docs/javadoc/reference"));
-              javadoc.include("**/*");
-              javadoc.setArchiveName("fireescape-javadoc.jar");
-              javadoc.setClassifier("javadoc");
-            });
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.java
deleted file mode 100644
index 69e2d37d274..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.java
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.gradle.plugins;
-
-import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormatExtension;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.firebase.gradle.plugins.apiinfo.ApiInformationTask;
-import com.google.firebase.gradle.plugins.apiinfo.GenerateApiTxtFileTask;
-import com.google.firebase.gradle.plugins.apiinfo.GetMetalavaJarTask;
-import com.google.firebase.gradle.plugins.ci.Coverage;
-import java.io.File;
-import java.nio.file.Paths;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.attributes.Attribute;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.TaskProvider;
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
-
-// TODO(vkryachko): extract functionality common across Firebase{,Java}LibraryPlugin plugins.
-public class FirebaseJavaLibraryPlugin implements Plugin<Project> {
-
-  @Override
-  public void apply(Project project) {
-    project.apply(ImmutableMap.of("plugin", "java-library"));
-    project.apply(ImmutableMap.of("plugin", "com.github.sherter.google-java-format"));
-    project.getExtensions().getByType(GoogleJavaFormatExtension.class).setToolVersion("1.10.0");
-
-    FirebaseLibraryExtension firebaseLibrary =
-        project
-            .getExtensions()
-            .create("firebaseLibrary", FirebaseLibraryExtension.class, project, LibraryType.JAVA);
-
-    // reduce the likelihood of kotlin module files colliding.
-    project
-        .getTasks()
-        .withType(
-            KotlinCompile.class,
-            kotlin ->
-                kotlin
-                    .getKotlinOptions()
-                    .setFreeCompilerArgs(
-                        ImmutableList.of("-module-name", kotlinModuleName(project))));
-
-    setupStaticAnalysis(project, firebaseLibrary);
-    project.afterEvaluate(p -> Dokka.configure(project, null, firebaseLibrary));
-  }
-
-  private static void setupStaticAnalysis(Project project, FirebaseLibraryExtension library) {
-    project.afterEvaluate(
-        p ->
-            project
-                .getConfigurations()
-                .all(
-                    c -> {
-                      if ("annotationProcessor".equals(c.getName())) {
-                        for (String checkProject : library.staticAnalysis.errorproneCheckProjects) {
-                          project
-                              .getDependencies()
-                              .add("annotationProcessor", project.project(checkProject));
-                        }
-                      }
-                      if ("lintChecks".equals(c.getName())) {
-                        for (String checkProject :
-                            library.staticAnalysis.androidLintCheckProjects) {
-                          project
-                              .getDependencies()
-                              .add("lintChecks", project.project(checkProject));
-                        }
-                      }
-                    }));
-
-    setupApiInformationAnalysis(project);
-
-    project.getTasks().register("firebaseLint", task -> task.dependsOn("lint"));
-    Coverage.apply(library);
-  }
-
-  private static void setupApiInformationAnalysis(Project project) {
-    File metalavaOutputJarFile = new File(project.getRootProject().getBuildDir(), "metalava.jar");
-    SourceSet mainSourceSet =
-        project
-            .getConvention()
-            .getPlugin(JavaPluginConvention.class)
-            .getSourceSets()
-            .getByName("main");
-    File outputFile =
-        project
-            .getRootProject()
-            .file(
-                Paths.get(
-                    project.getRootProject().getBuildDir().getPath(),
-                    "apiinfo",
-                    project.getPath().substring(1).replace(":", "_")));
-    File outputApiFile = new File(outputFile.getAbsolutePath() + "_api.txt");
-
-    project
-        .getTasks()
-        .register(
-            "getMetalavaJar",
-            GetMetalavaJarTask.class,
-            task -> {
-              task.setOutputFile(metalavaOutputJarFile);
-            });
-    File apiTxt =
-        project.file("api.txt").exists()
-            ? project.file("api.txt")
-            : project.file(project.getRootDir() + "/empty-api.txt");
-    TaskProvider<ApiInformationTask> apiInfo =
-        project
-            .getTasks()
-            .register(
-                "apiInformation",
-                ApiInformationTask.class,
-                task -> {
-                  task.setApiTxt(apiTxt);
-                  task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath());
-                  task.setSourceSet(mainSourceSet);
-                  task.setOutputFile(outputFile);
-                  task.setBaselineFile(project.file("baseline.txt"));
-                  task.setOutputApiFile(outputApiFile);
-                  if (project.hasProperty("updateBaseline")) {
-                    task.setUpdateBaseline(true);
-                  } else {
-                    task.setUpdateBaseline(false);
-                  }
-                  task.dependsOn("getMetalavaJar");
-                });
-
-    TaskProvider<GenerateApiTxtFileTask> generateApiTxt =
-        project
-            .getTasks()
-            .register(
-                "generateApiTxtFile",
-                GenerateApiTxtFileTask.class,
-                task -> {
-                  task.setApiTxt(project.file("api.txt"));
-                  task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath());
-                  task.setSourceSet(mainSourceSet);
-                  task.setBaselineFile(project.file("baseline.txt"));
-                  task.setUpdateBaseline(project.hasProperty("updateBaseline"));
-                  task.dependsOn("getMetalavaJar");
-                });
-
-    TaskProvider<GenerateStubsTask> docStubs =
-        project
-            .getTasks()
-            .register(
-                "docStubs",
-                GenerateStubsTask.class,
-                task -> {
-                  task.dependsOn("getMetalavaJar");
-
-                  task.setSourceSet(mainSourceSet);
-                });
-    project.getTasks().getByName("check").dependsOn(docStubs);
-
-    project.afterEvaluate(
-        p -> {
-          FileCollection classpath =
-              project
-                  .getConfigurations()
-                  .getByName("runtimeClasspath")
-                  .getIncoming()
-                  .artifactView(
-                      config ->
-                          config.attributes(
-                              container ->
-                                  container.attribute(
-                                      Attribute.of("artifactType", String.class), "jar")))
-                  .getArtifacts()
-                  .getArtifactFiles();
-
-          apiInfo.configure(t -> t.setClassPath(classpath));
-          generateApiTxt.configure(t -> t.setClassPath(classpath));
-          docStubs.configure(t -> t.setClassPath(classpath));
-        });
-  }
-
-  private static String kotlinModuleName(Project project) {
-
-    String fullyQualifiedProjectPath = project.getPath().replaceAll(":", "-");
-
-    return project.getRootProject().getName() + fullyQualifiedProjectPath;
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
new file mode 100644
index 00000000000..0638a300bb3
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import com.google.common.collect.ImmutableList
+import com.google.firebase.gradle.plugins.LibraryType.JAVA
+import com.google.firebase.gradle.plugins.semver.ApiDiffer
+import com.google.firebase.gradle.plugins.semver.GmavenCopier
+import org.gradle.api.Project
+import org.gradle.api.attributes.Attribute
+import org.gradle.api.plugins.JavaLibraryPlugin
+import org.gradle.api.plugins.JavaPluginConvention
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.getPlugin
+import org.gradle.kotlin.dsl.register
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {
+
+  override fun apply(project: Project) {
+    project.apply<JavaLibraryPlugin>()
+    project.apply<DackkaPlugin>()
+
+    setupFirebaseLibraryExtension(project)
+    registerMakeReleaseNotesTask(project)
+
+    // reduce the likelihood of kotlin module files colliding.
+    project.tasks.withType<KotlinCompile> {
+      kotlinOptions.freeCompilerArgs = ImmutableList.of("-module-name", kotlinModuleName(project))
+    }
+  }
+
+  private fun setupFirebaseLibraryExtension(project: Project) {
+    val firebaseLibrary =
+      project.extensions.create<FirebaseLibraryExtension>("firebaseLibrary", project, JAVA)
+
+    setupStaticAnalysis(project, firebaseLibrary)
+    setupApiInformationAnalysis(project)
+    getIsPomValidTask(project, firebaseLibrary)
+    setupVersionCheckTasks(project, firebaseLibrary)
+    configurePublishing(project, firebaseLibrary)
+  }
+
+  private fun setupVersionCheckTasks(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
+    project.tasks.register<GmavenVersionChecker>("gmavenVersionCheck") {
+      groupId.value(firebaseLibrary.groupId.get())
+      artifactId.value(firebaseLibrary.artifactId.get())
+      version.value(firebaseLibrary.version)
+      latestReleasedVersion.value(firebaseLibrary.latestReleasedVersion.orElseGet { "" })
+    }
+    project.mkdir("semver")
+    project.tasks.register<GmavenCopier>("copyPreviousArtifacts") {
+      dependsOn("jar")
+      project.file("semver/previous.jar").delete()
+      groupId.value(firebaseLibrary.groupId.get())
+      artifactId.value(firebaseLibrary.artifactId.get())
+      aarAndroidFile.value(false)
+      filePath.value(project.file("semver/previous.jar").absolutePath)
+    }
+    val currentJarFile =
+      project
+        .file("build/libs/${firebaseLibrary.artifactId.get()}-${firebaseLibrary.version}.jar")
+        .absolutePath
+    val previousJarFile = project.file("semver/previous.jar").absolutePath
+    project.tasks.register<ApiDiffer>("semverCheck") {
+      currentJar.value(currentJarFile)
+      previousJar.value(previousJarFile)
+      version.value(firebaseLibrary.version)
+      previousVersionString.value(
+        GmavenHelper(firebaseLibrary.groupId.get(), firebaseLibrary.artifactId.get())
+          .getLatestReleasedVersion()
+      )
+
+      dependsOn("copyPreviousArtifacts")
+    }
+  }
+
+  private fun setupApiInformationAnalysis(project: Project) {
+    val srcDirs =
+      project.convention.getPlugin<JavaPluginConvention>().sourceSets.getByName("main").java.srcDirs
+
+    val apiInfo = getApiInfo(project, srcDirs)
+
+    val generateApiTxt = getGenerateApiTxt(project, srcDirs)
+    val docStubs = getDocStubs(project, srcDirs)
+
+    project.tasks.getByName("check").dependsOn(docStubs)
+    project.afterEvaluate {
+      val classpath =
+        configurations
+          .getByName("runtimeClasspath")
+          .incoming
+          .artifactView {
+            attributes { attribute(Attribute.of("artifactType", String::class.java), "jar") }
+          }
+          .artifacts
+          .artifactFiles
+      apiInfo.configure { classPath = classpath }
+      generateApiTxt.configure { classPath = classpath }
+      docStubs.configure { classPath = classpath }
+    }
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.java
index ff5d3cd442e..2f27d8e64f2 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.java
@@ -19,29 +19,27 @@
 import com.google.firebase.gradle.plugins.ci.device.FirebaseTestLabExtension;
 import java.io.File;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 import javax.inject.Inject;
 import org.gradle.api.Action;
-import org.gradle.api.GradleException;
 import org.gradle.api.Project;
-import org.gradle.api.UnknownDomainObjectException;
 import org.gradle.api.internal.provider.DefaultProvider;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.provider.Property;
 import org.gradle.api.publish.maven.MavenPom;
 
+// TODO(b/270576405): rewrite in kotlin, and utilize conventions
 public class FirebaseLibraryExtension {
 
   public final Project project;
   public final LibraryType type;
-  private final Set<FirebaseLibraryExtension> librariesToCoRelease = new HashSet<>();
-
   /** Indicates whether the library has public javadoc. */
   public boolean publishJavadoc = true;
 
+  /** Indicates whether release notes are published for the library. */
+  public boolean publishReleaseNotes = true;
+
   /** Indicates whether sources are published alongside the library. */
   public boolean publishSources;
 
@@ -54,6 +52,8 @@ public class FirebaseLibraryExtension {
   public Property<String> groupId;
   public Property<String> artifactId;
 
+  String libraryGroupName;
+
   private Action<MavenPom> customizePomAction =
       pom -> {
         pom.licenses(
@@ -87,11 +87,11 @@ public FirebaseLibraryExtension(Project project, LibraryType type) {
       groupId.set(new DefaultProvider<>(() -> project.getGroup().toString()));
     }
     this.staticAnalysis = initializeStaticAnalysis(project);
+    libraryGroupName = this.artifactId.get();
   }
 
   private FirebaseStaticAnalysis initializeStaticAnalysis(Project project) {
     return new FirebaseStaticAnalysis(
-        projectsFromProperty(project, "firebase.checks.errorproneProjects"),
         projectsFromProperty(project, "firebase.checks.lintProjects"));
   }
 
@@ -113,39 +113,8 @@ public void testLab(Action<FirebaseTestLabExtension> action) {
    * <p>This will force the released version of the current project to match the one it's released
    * with.
    */
-  public void releaseWith(Project releaseWithProject) {
-    try {
-      FirebaseLibraryExtension releaseWithLibrary =
-          releaseWithProject.getExtensions().getByType(FirebaseLibraryExtension.class);
-      releaseWithLibrary.librariesToCoRelease.add(this);
-      this.project.setVersion(releaseWithProject.getVersion());
-
-      String latestRelease = "latestReleasedVersion";
-      if (releaseWithProject.hasProperty(latestRelease)) {
-        this.project
-            .getExtensions()
-            .getExtraProperties()
-            .set(latestRelease, releaseWithProject.property(latestRelease));
-      }
-
-    } catch (UnknownDomainObjectException ex) {
-      throw new GradleException(
-          "Library cannot be released with a project that is not a Firebase Library itself");
-    }
-  }
-
-  public Set<Project> getProjectsToRelease() {
-    return ImmutableSet.<Project>builder()
-        .add(project)
-        .addAll(librariesToCoRelease.stream().map(l -> l.project).collect(Collectors.toSet()))
-        .build();
-  }
-
-  public Set<FirebaseLibraryExtension> getLibrariesToRelease() {
-    return ImmutableSet.<FirebaseLibraryExtension>builder()
-        .add(this)
-        .addAll(librariesToCoRelease)
-        .build();
+  public void libraryGroup(String libraryGroupName) {
+    this.libraryGroupName = libraryGroupName;
   }
 
   /** Provides a hook to customize pom generation. */
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java
deleted file mode 100644
index c50f038eaeb..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.gradle.plugins;
-
-import static com.google.firebase.gradle.plugins.ClosureUtil.closureOf;
-
-import com.android.build.gradle.LibraryExtension;
-import com.android.build.gradle.api.AndroidSourceSet;
-import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormatExtension;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.firebase.gradle.plugins.apiinfo.ApiInformationTask;
-import com.google.firebase.gradle.plugins.apiinfo.GenerateApiTxtFileTask;
-import com.google.firebase.gradle.plugins.apiinfo.GetMetalavaJarTask;
-import com.google.firebase.gradle.plugins.ci.Coverage;
-import com.google.firebase.gradle.plugins.ci.device.FirebaseTestServer;
-import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin;
-import java.io.File;
-import java.nio.file.Paths;
-import org.gradle.api.JavaVersion;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.attributes.Attribute;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.tasks.TaskProvider;
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
-
-public class FirebaseLibraryPlugin implements Plugin<Project> {
-
-  @Override
-  public void apply(Project project) {
-    project.apply(ImmutableMap.of("plugin", "com.android.library"));
-    project.apply(ImmutableMap.of("plugin", LicenseResolverPlugin.class));
-    project.apply(ImmutableMap.of("plugin", "com.github.sherter.google-java-format"));
-    project.getExtensions().getByType(GoogleJavaFormatExtension.class).setToolVersion("1.10.0");
-
-    FirebaseLibraryExtension firebaseLibrary =
-        project
-            .getExtensions()
-            .create(
-                "firebaseLibrary", FirebaseLibraryExtension.class, project, LibraryType.ANDROID);
-
-    LibraryExtension android = project.getExtensions().getByType(LibraryExtension.class);
-
-    android.compileOptions(
-        options -> {
-          options.setSourceCompatibility(JavaVersion.VERSION_1_8);
-          options.setTargetCompatibility(JavaVersion.VERSION_1_8);
-        });
-
-    // In the case of and android library signing config only affects instrumentation test APK.
-    // We need it signed with default debug credentials in order for FTL to accept the APK.
-    android.buildTypes(
-        types ->
-            types
-                .getByName("release")
-                .setSigningConfig(types.getByName("debug").getSigningConfig()));
-
-    // see https://github.com/robolectric/robolectric/issues/5456
-    android.testOptions(
-        options ->
-            options
-                .getUnitTests()
-                .all(
-                    closureOf(
-                        test -> {
-                          test.systemProperty("robolectric.dependency.repo.id", "central");
-                          test.systemProperty(
-                              "robolectric.dependency.repo.url", "https://repo1.maven.org/maven2");
-                          test.systemProperty("javax.net.ssl.trustStoreType", "JKS");
-                        })));
-
-    // skip debug tests in CI
-    // TODO(vkryachko): provide ability for teams to control this if needed
-    if (System.getenv().containsKey("FIREBASE_CI")) {
-      android.setTestBuildType("release");
-      project
-          .getTasks()
-          .all(
-              task -> {
-                if ("testDebugUnitTest".equals(task.getName())) {
-                  task.setEnabled(false);
-                }
-              });
-    }
-
-    setupApiInformationAnalysis(project, android);
-    android.testServer(new FirebaseTestServer(project, firebaseLibrary.testLab, android));
-
-    setupStaticAnalysis(project, firebaseLibrary);
-
-    // reduce the likelihood of kotlin module files colliding.
-    project
-        .getTasks()
-        .withType(
-            KotlinCompile.class,
-            kotlin ->
-                kotlin
-                    .getKotlinOptions()
-                    .setFreeCompilerArgs(
-                        ImmutableList.of("-module-name", kotlinModuleName(project))));
-
-    Dokka.configure(project, android, firebaseLibrary);
-  }
-
-  private static void setupApiInformationAnalysis(Project project, LibraryExtension android) {
-    File metalavaOutputJarFile = new File(project.getRootProject().getBuildDir(), "metalava.jar");
-    AndroidSourceSet mainSourceSet = android.getSourceSets().getByName("main");
-    File outputFile =
-        project
-            .getRootProject()
-            .file(
-                Paths.get(
-                    project.getRootProject().getBuildDir().getPath(),
-                    "apiinfo",
-                    project.getPath().substring(1).replace(":", "_")));
-    File outputApiFile = new File(outputFile.getAbsolutePath() + "_api.txt");
-
-    project
-        .getTasks()
-        .register(
-            "getMetalavaJar",
-            GetMetalavaJarTask.class,
-            task -> {
-              task.setOutputFile(metalavaOutputJarFile);
-            });
-    File apiTxt =
-        project.file("api.txt").exists()
-            ? project.file("api.txt")
-            : project.file(project.getRootDir() + "/empty-api.txt");
-    TaskProvider<ApiInformationTask> apiInfo =
-        project
-            .getTasks()
-            .register(
-                "apiInformation",
-                ApiInformationTask.class,
-                task -> {
-                  task.setApiTxt(apiTxt);
-                  task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath());
-                  task.setSourceSet(mainSourceSet);
-                  task.setOutputFile(outputFile);
-                  task.setBaselineFile(project.file("baseline.txt"));
-                  task.setOutputApiFile(outputApiFile);
-                  if (project.hasProperty("updateBaseline")) {
-                    task.setUpdateBaseline(true);
-                  } else {
-                    task.setUpdateBaseline(false);
-                  }
-                  task.dependsOn("getMetalavaJar");
-                });
-
-    TaskProvider<GenerateApiTxtFileTask> generateApiTxt =
-        project
-            .getTasks()
-            .register(
-                "generateApiTxtFile",
-                GenerateApiTxtFileTask.class,
-                task -> {
-                  task.setApiTxt(project.file("api.txt"));
-                  task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath());
-                  task.setSourceSet(mainSourceSet);
-                  task.setBaselineFile(project.file("baseline.txt"));
-                  task.setUpdateBaseline(project.hasProperty("updateBaseline"));
-                  task.dependsOn("getMetalavaJar");
-                });
-
-    TaskProvider<GenerateStubsTask> docStubs =
-        project
-            .getTasks()
-            .register(
-                "docStubs",
-                GenerateStubsTask.class,
-                task -> {
-                  task.setSourceSet(mainSourceSet);
-                });
-    project.getTasks().getByName("check").dependsOn(docStubs);
-
-    android
-        .getLibraryVariants()
-        .all(
-            v -> {
-              if (v.getName().equals("release")) {
-                FileCollection jars =
-                    v.getCompileConfiguration()
-                        .getIncoming()
-                        .artifactView(
-                            config ->
-                                config.attributes(
-                                    container ->
-                                        container.attribute(
-                                            Attribute.of("artifactType", String.class), "jar")))
-                        .getArtifacts()
-                        .getArtifactFiles();
-                apiInfo.configure(t -> t.setClassPath(jars));
-                generateApiTxt.configure(t -> t.setClassPath(jars));
-                docStubs.configure(t -> t.setClassPath(jars));
-              }
-            });
-  }
-
-  private static void setupStaticAnalysis(Project project, FirebaseLibraryExtension library) {
-    project.afterEvaluate(
-        p ->
-            project
-                .getConfigurations()
-                .all(
-                    c -> {
-                      if ("annotationProcessor".equals(c.getName())) {
-                        for (String checkProject : library.staticAnalysis.errorproneCheckProjects) {
-                          project
-                              .getDependencies()
-                              .add("annotationProcessor", project.project(checkProject));
-                        }
-                      }
-                      if ("lintChecks".equals(c.getName())) {
-                        for (String checkProject :
-                            library.staticAnalysis.androidLintCheckProjects) {
-                          project
-                              .getDependencies()
-                              .add("lintChecks", project.project(checkProject));
-                        }
-                      }
-                    }));
-
-    project.getTasks().register("firebaseLint", task -> task.dependsOn("lint"));
-    Coverage.apply(library);
-  }
-
-  private static String kotlinModuleName(Project project) {
-
-    String fullyQualifiedProjectPath = project.getPath().replaceAll(":", "-");
-
-    return project.getRootProject().getName() + fullyQualifiedProjectPath;
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.kt
new file mode 100644
index 00000000000..ef3e05e5506
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.kt
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import com.android.build.gradle.LibraryExtension
+import com.android.build.gradle.LibraryPlugin
+import com.google.firebase.gradle.plugins.LibraryType.ANDROID
+import com.google.firebase.gradle.plugins.ci.device.FirebaseTestServer
+import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
+import com.google.firebase.gradle.plugins.semver.ApiDiffer
+import com.google.firebase.gradle.plugins.semver.GmavenCopier
+import java.io.File
+import org.gradle.api.JavaVersion
+import org.gradle.api.Project
+import org.gradle.api.attributes.Attribute
+import org.gradle.api.publish.tasks.GenerateModuleMetadata
+import org.gradle.api.tasks.Copy
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.register
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+// TODO() maybe rename to FirebaseAndroidLibraryPlugin; makes more sense alongside java one
+class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
+
+  override fun apply(project: Project) {
+    project.apply<LibraryPlugin>()
+    project.apply<LicenseResolverPlugin>()
+
+    setupAndroidLibraryExtension(project)
+    registerMakeReleaseNotesTask(project)
+
+    // reduce the likelihood of kotlin module files colliding.
+    project.tasks.withType<KotlinCompile> {
+      kotlinOptions.freeCompilerArgs = listOf("-module-name", kotlinModuleName(project))
+      kotlinOptions.jvmTarget = "1.8"
+    }
+
+    project.apply<DackkaPlugin>()
+    project.apply<GitSubmodulePlugin>()
+
+    project.tasks.getByName("preBuild").dependsOn("updateGitSubmodules")
+  }
+
+  private fun setupAndroidLibraryExtension(project: Project) {
+    val firebaseLibrary =
+      project.extensions.create<FirebaseLibraryExtension>("firebaseLibrary", project, ANDROID)
+    val android = project.extensions.getByType<LibraryExtension>()
+    android.compileOptions {
+      sourceCompatibility = JavaVersion.VERSION_1_8
+      targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    android.buildFeatures.buildConfig = true
+
+    // In the case of and android library signing config only affects instrumentation test APK.
+    // We need it signed with default debug credentials in order for FTL to accept the APK.
+    android.buildTypes { getByName("release").signingConfig = getByName("debug").signingConfig }
+
+    android.defaultConfig {
+      buildConfigField("String", "VERSION_NAME", "\"" + project.version + "\"")
+    }
+
+    // see https://github.com/robolectric/robolectric/issues/5456
+    android.testOptions.unitTests.all {
+      it.systemProperty("robolectric.dependency.repo.id", "central")
+      it.systemProperty("robolectric.dependency.repo.url", "https://repo1.maven.org/maven2")
+      it.systemProperty("javax.net.ssl.trustStoreType", "JKS")
+    }
+
+    setupApiInformationAnalysis(project, android)
+    android.testServer(FirebaseTestServer(project, firebaseLibrary.testLab, android))
+    setupStaticAnalysis(project, firebaseLibrary)
+    getIsPomValidTask(project, firebaseLibrary)
+    setupVersionCheckTasks(project, firebaseLibrary)
+    configurePublishing(project, firebaseLibrary, android)
+  }
+
+  private fun setupVersionCheckTasks(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
+    project.tasks.register<GmavenVersionChecker>("gmavenVersionCheck") {
+      groupId.value(firebaseLibrary.groupId.get())
+      artifactId.value(firebaseLibrary.artifactId.get())
+      version.value(firebaseLibrary.version)
+      latestReleasedVersion.value(firebaseLibrary.latestReleasedVersion.orElseGet { "" })
+    }
+    project.mkdir("semver")
+    project.mkdir("semver/previous-version")
+    project.tasks.register<GmavenCopier>("copyPreviousArtifacts") {
+      dependsOn("bundleReleaseAar")
+      project.file("semver/previous.aar").delete()
+
+      groupId.value(firebaseLibrary.groupId.get())
+      artifactId.value(firebaseLibrary.artifactId.get())
+      aarAndroidFile.value(true)
+      filePath.value(project.file("semver/previous.aar").absolutePath)
+    }
+    val artifact = firebaseLibrary.artifactId.get()
+    val releaseAar = if (artifact.contains("-ktx")) "ktx-release.aar" else "${artifact}-release.aar"
+    project.tasks.register<Copy>("extractCurrentClasses") {
+      dependsOn("bundleReleaseAar")
+
+      from(project.zipTree("build/outputs/aar/${releaseAar}"))
+      into(project.file("semver/current-version"))
+    }
+
+    project.tasks.register<Copy>("extractPreviousClasses") {
+      dependsOn("copyPreviousArtifacts")
+      if (
+        GmavenHelper(firebaseLibrary.groupId.get(), firebaseLibrary.artifactId.get())
+          .isPresentInGmaven()
+      ) {
+        from(project.zipTree("semver/previous.aar"))
+        into(project.file("semver/previous-version"))
+      }
+    }
+
+    val currentJarFile = project.file("semver/current-version/classes.jar").absolutePath
+
+    val previousJarFile = project.file("semver/previous-version/classes.jar").absolutePath
+    project.tasks.register<ApiDiffer>("semverCheck") {
+      dependsOn("extractCurrentClasses")
+      dependsOn("extractPreviousClasses")
+      currentJar.value(currentJarFile)
+      previousJar.value(previousJarFile)
+      version.value(firebaseLibrary.version)
+      previousVersionString.value(
+        GmavenHelper(firebaseLibrary.groupId.get(), firebaseLibrary.artifactId.get())
+          .getLatestReleasedVersion()
+      )
+    }
+  }
+
+  private fun setupApiInformationAnalysis(project: Project, android: LibraryExtension) {
+    val srcDirs = android.sourceSets.getByName("main").java.srcDirs
+
+    val mainSourceSets = android.sourceSets.getByName("main")
+    val getKotlinDirectories = mainSourceSets::class.java.getDeclaredMethod("getKotlinDirectories")
+    val kotlinSrcDirs = getKotlinDirectories.invoke(mainSourceSets)
+
+    val apiInfo = getApiInfo(project, kotlinSrcDirs as Set<File>)
+    val generateApiTxt = getGenerateApiTxt(project, kotlinSrcDirs)
+    val docStubs = getDocStubs(project, srcDirs)
+
+    project.tasks.getByName("check").dependsOn(docStubs)
+    android.libraryVariants.all {
+      if (name == "release") {
+        val jars =
+          compileConfiguration.incoming
+            .artifactView {
+              attributes {
+                attribute(Attribute.of("artifactType", String::class.java), "android-classes")
+              }
+            }
+            .artifacts
+            .artifactFiles
+        apiInfo.configure { classPath = jars }
+        generateApiTxt.configure { classPath = jars }
+        docStubs.configure { classPath = jars }
+      }
+    }
+  }
+
+  private fun configurePublishing(
+    project: Project,
+    firebaseLibrary: FirebaseLibraryExtension,
+    android: LibraryExtension,
+  ) {
+    android.publishing.singleVariant("release") { withSourcesJar() }
+    project.tasks.withType<GenerateModuleMetadata> { isEnabled = false }
+
+    configurePublishing(project, firebaseLibrary)
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseProprietaryLibraryPlugin.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseProprietaryLibraryPlugin.kt
index 06d024ecaec..c63eb056d43 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseProprietaryLibraryPlugin.kt
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseProprietaryLibraryPlugin.kt
@@ -1,16 +1,18 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
 
@@ -19,18 +21,18 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 
 class FirebaseProprietaryLibraryPlugin : Plugin<Project> {
-    override fun apply(project: Project) {
-        project.apply(plugin = "firebase-library")
+  override fun apply(project: Project) {
+    project.apply(plugin = "firebase-library")
 
-        val library = project.extensions.getByType(FirebaseLibraryExtension::class.java)
-        library.publishSources = false
-        library.customizePom {
-            licenses {
-                license {
-                    name.set("Android Software Development Kit License")
-                    url.set("https://developer.android.com/studio/terms.html")
-                }
-            }
+    val library = project.extensions.getByType(FirebaseLibraryExtension::class.java)
+    library.publishSources = false
+    library.customizePom {
+      licenses {
+        license {
+          name.set("Android Software Development Kit License")
+          url.set("https://developer.android.com/studio/terms.html")
         }
+      }
     }
+  }
 }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java
index 1f8da8b03b9..374a66f2fb3 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java
@@ -17,12 +17,9 @@
 import java.util.Set;
 
 public class FirebaseStaticAnalysis {
-  public Set<String> errorproneCheckProjects;
   public Set<String> androidLintCheckProjects;
 
-  public FirebaseStaticAnalysis(
-      Set<String> errorproneCheckProjects, Set<String> androidLintCheckProjects) {
-    this.errorproneCheckProjects = errorproneCheckProjects;
+  public FirebaseStaticAnalysis(Set<String> androidLintCheckProjects) {
     this.androidLintCheckProjects = androidLintCheckProjects;
   }
 }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FiresiteTransformTask.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FiresiteTransformTask.kt
new file mode 100644
index 00000000000..8d8e5e4a8f6
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FiresiteTransformTask.kt
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import java.io.File
+import org.gradle.api.DefaultTask
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskAction
+
+/**
+ * Fixes minor inconsistencies between what dackka generates, and what firesite actually expects.
+ *
+ * Should dackka ever expand to offer configurations for these procedures, this class can be
+ * replaced.
+ *
+ * More specifically, it:
+ * - Deletes unnecessary files
+ * - Removes Class and Index headers from _toc.yaml files
+ * - Adds the deprecated status to ktx sections in _toc.yaml files
+ * - Fixes broken hyperlinks in `@see` blocks
+ * - Removes the prefix path from book_path
+ *
+ * **Please note:** This task is idempotent- meaning it can safely be ran multiple times on the same
+ * set of files.
+ */
+@CacheableTask
+abstract class FiresiteTransformTask : DefaultTask() {
+  @get:InputDirectory
+  @get:PathSensitive(PathSensitivity.RELATIVE)
+  abstract val dackkaFiles: Property<File>
+
+  @get:OutputDirectory abstract val outputDirectory: Property<File>
+
+  @TaskAction
+  fun build() {
+    val namesOfFilesWeDoNotNeed =
+      listOf("index.html", "classes.html", "packages.html", "package-list")
+    val rootDirectory = dackkaFiles.get()
+    val targetDirectory = outputDirectory.get()
+    targetDirectory.deleteRecursively()
+
+    rootDirectory.walkTopDown().forEach {
+      if (it.name !in namesOfFilesWeDoNotNeed) {
+        val relativePath = it.toRelativeString(rootDirectory)
+        val newFile = it.copyTo(File("${targetDirectory.path}/$relativePath"), true)
+
+        when (it.extension) {
+          "html" -> newFile.fixHTMLFile()
+          "yaml" -> newFile.fixYamlFile()
+        }
+      }
+    }
+  }
+
+  private fun File.fixHTMLFile() {
+    val fixedContent = readText().fixBookPath().fixHyperlinksInSeeBlocks()
+    writeText(fixedContent)
+  }
+
+  private fun File.fixYamlFile() {
+    val fixedContent = readText().removeClassHeader().removeIndexHeader().addDeprecatedStatus()
+    writeText(fixedContent)
+  }
+
+  /**
+   * Fixes broken hyperlinks in the rendered HTML
+   *
+   * Links in Dockka are currently broken in `@see` tags. This transform destructures those broken
+   * links and reconstructs them as they're expected to be.
+   *
+   * Example input:
+   * ```
+   * // Generated from @see <a href="git.page.link/timestamp-proto">Timestamp</a>The ref timestamp definition
+   * <code>&lt;a href=&quot;git.page.link/timestamp-proto&quot;&gt;Timestamp&lt;/a&gt;The ref timestamp definition</code></td>
+   * <td></td>
+   * ```
+   *
+   * Example output:
+   * ```
+   * <code><a href="git.page.link/timestamp-proto">Timestamp</a></code></td>
+   * <td>The ref timestamp definition</td>
+   * ```
+   */
+  // TODO(go/dokka-upstream-bug/2665): Remove when Dockka fixes this issue
+  private fun String.fixHyperlinksInSeeBlocks() =
+    replace(
+      Regex(
+        "<code>&lt;a href=&quot;(?<href>.*)&quot;&gt;(?<link>.*)&lt;/a&gt;(?<text>.*)</code></td>\\s*<td></td>"
+      )
+    ) {
+      val (href, link, text) = it.destructured
+
+      """
+                <code><a href="$href">$link</a></code></td>
+                <td>$text</td>
+            """
+        .trimIndent()
+    }
+
+  /**
+   * Adds the deprecated status to ktx libs.
+   *
+   * Our ktx libs are marked as deprecated in the sidebar, and as such- require that we add a
+   * `status: deprecated` to their section in the relevant `_toc.yaml` file.
+   *
+   * Example input:
+   * ```
+   * - title: "firebase.database.ktx"
+   *   path: "/docs/reference/android/com/google/firebase/database/ktx/package-summary.html"
+   * ```
+   *
+   * Example output:
+   * ```
+   * - title: "firebase.database.ktx"
+   *   status: deprecated
+   *   path: "/docs/reference/android/com/google/firebase/database/ktx/package-summary.html"
+   * ```
+   */
+  // TODO(b/310964911): Remove when we drop ktx modules
+  private fun String.addDeprecatedStatus(): String =
+    replace(Regex("- title: \"(.+ktx)\"")) {
+      val packageName = it.firstCapturedValue
+
+      """
+      - title: "${packageName}"
+        status: deprecated
+    """
+        .trimIndent()
+    }
+
+  // We don't actually upload class or index files,
+  // so these headers will throw not found errors if not removed.
+  // TODO(b/243674302): Remove when dackka exposes configuration for this
+  private fun String.removeClassHeader() =
+    remove(Regex("- title: \"Class Index\"\n {2}path: \".+\"\n\n"))
+
+  private fun String.removeIndexHeader() =
+    remove(Regex("- title: \"Package Index\"\n {2}path: \".+\"\n\n"))
+
+  // We use a common book for all sdks, wheres dackka expects each sdk to have its own book.
+  // TODO(b/243674303): Remove when dackka exposes configuration for this
+  private fun String.fixBookPath() =
+    remove(Regex("(?<=setvar book_path ?%})(.+)(?=/_book.yaml\\{% ?endsetvar)"))
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GitSubmodulePlugin.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GitSubmodulePlugin.kt
new file mode 100644
index 00000000000..aec3efbb6c8
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GitSubmodulePlugin.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import java.io.File
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Exec
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.register
+
+/**
+ * Exposes configuration for [GitSubmodulePlugin].
+ *
+ * @param submodules the parent directory of the SDK's Git Submodules. Defaults to `src/third_party`
+ */
+interface GitSubmodulePluginExtension {
+  val submodules: Property<File>
+}
+
+/**
+ * Helper plugin for common actions regarding Git Submodules
+ *
+ * At the time of writing this, we only have one SDK with submodules. Although, that could grow in
+ * the future. More importantly though, this provides a way for us to make sure the submodules are
+ * initilized whenever we are building said SDKs- while keeping our system clean and modular.
+ *
+ * This plugin is automatically applied to all SDKs that utilize [FirebaseLibraryPlugin], and is
+ * subsequently bound to the `preBuild` task that is apart of all gradle modules.
+ *
+ * The following tasks are registered when this plugin is applied:
+ * - [initializeGitSubmodules][registerInitializeGitSubmodulesTask]
+ * - [updateGitSubmodules][registerUpdateGitSubmodulesTask]
+ * - [removeGitSubmodules][registerRemoveGitSubmodulesTask]
+ *
+ * __Documentation explaining each task is provided in the annotation for each task__
+ *
+ * @see [GitSubmodulePluginExtension]
+ */
+abstract class GitSubmodulePlugin : Plugin<Project> {
+
+  override fun apply(project: Project) {
+    with(configureExtension(project)) {
+      registerInitializeGitSubmodulesTask(project, submodules.get())
+      registerUpdateGitSubmodulesTask(project, submodules.get())
+      registerRemoveGitSubmodulesTask(project, submodules.get())
+    }
+  }
+
+  private fun configureExtension(project: Project) =
+    project.extensions.create<GitSubmodulePluginExtension>("GitSubmodule").apply {
+      submodules.convention(project.file("src/third_party"))
+    }
+
+  /**
+   * Registers the initializeGitSubmodules Task for the provided [Project].
+   *
+   * Creates a local configuration for the predefined submodules. It does this by running the
+   * command `git submodule init` from the [project]'s root directory.
+   *
+   * If there aren't any submodules to initialize, this task is skipped- saving resources.
+   *
+   * @param project the [Project] to register this task to
+   * @param submodules the root directory of where the submodules live
+   */
+  private fun registerInitializeGitSubmodulesTask(project: Project, submodules: File) =
+    project.tasks.register<Exec>("initializeGitSubmodules") {
+      onlyIf { hasEmptySubmodules(submodules) }
+
+      workingDir = project.projectDir
+      commandLine = "git submodule init".split(" ")
+    }
+
+  /**
+   * Registers the updateGitSubmodules Task for the provided [Project].
+   *
+   * Pulls the latest data for each submodule, similiar to `git pull`. It does this by running the
+   * command `git submodule update` from the [project]'s root directory.
+   *
+   * If there aren't any submodules, this task is skipped- saving resources.
+   *
+   * @param project the [Project] to register this task to
+   * @param submodules the root directory of where the submodules live
+   */
+  private fun registerUpdateGitSubmodulesTask(project: Project, submodules: File) =
+    project.tasks.register<Exec>("updateGitSubmodules") {
+      onlyIf { hasEmptySubmodules(submodules) }
+      dependsOn("initializeGitSubmodules")
+
+      workingDir = project.projectDir
+      commandLine = "git submodule update".split(" ")
+    }
+
+  /**
+   * Registers the removeGitSubmodules Task for the provided [Project].
+   *
+   * Removes and de initilizes all submodules for the given [project]. It does this by running the
+   * command `git submodule deinit --all` from the [project]'s root directory.
+   *
+   * If there aren't any submodules to remove, this task is skipped- saving resources.
+   *
+   * @param project the [Project] to register this task to
+   * @param submodules the root directory of where the submodules live
+   */
+  private fun registerRemoveGitSubmodulesTask(project: Project, submodules: File) =
+    project.tasks.register<Exec>("removeGitSubmodules") {
+      onlyIf { submodules.exists() }
+
+      workingDir = project.projectDir
+      commandLine = "git submodule deinit --all".split(" ")
+    }
+
+  private fun hasEmptySubmodules(parentFolder: File) =
+    parentFolder.listFilesOrEmpty().any { it.isDirectory && it.listFilesOrEmpty().isEmpty() }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenHelper.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenHelper.kt
new file mode 100644
index 00000000000..16d4e104f53
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenHelper.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import java.io.FileNotFoundException
+import java.net.HttpURLConnection
+import java.net.URL
+import javax.xml.parsers.DocumentBuilder
+import javax.xml.parsers.DocumentBuilderFactory
+import org.w3c.dom.Document
+
+/** TODO(b/279466888) - Make GmavenHelper testable */
+class GmavenHelper(val groupId: String, val artifactId: String) {
+  val GMAVEN_ROOT = "https://dl.google.com/dl/android/maven2"
+
+  fun getPomFileForVersion(version: String): String {
+    val pomFileName = "${artifactId}-${version}.pom"
+    val groupIdAsPath = groupId.replace(".", "/")
+    return "${GMAVEN_ROOT}/${groupIdAsPath}/${artifactId}/${version}/${pomFileName}"
+  }
+
+  fun isPresentInGmaven(): Boolean {
+    val groupIdAsPath = groupId.replace(".", "/")
+    val u = URL("${GMAVEN_ROOT}/${groupIdAsPath}/${artifactId}/maven-metadata.xml")
+    val huc: HttpURLConnection = u.openConnection() as HttpURLConnection
+    huc.setRequestMethod("GET") // OR  huc.setRequestMethod ("HEAD");
+    huc.connect()
+    val code: Int = huc.getResponseCode()
+    return code == HttpURLConnection.HTTP_OK
+  }
+
+  fun getArtifactForVersion(version: String, isJar: Boolean): String {
+    val fileName =
+      if (isJar == true) "${artifactId}-${version}.jar" else "${artifactId}-${version}.aar"
+    val groupIdAsPath = groupId.replace(".", "/")
+    return "${GMAVEN_ROOT}/${groupIdAsPath}/${artifactId}/${version}/${fileName}"
+  }
+
+  fun hasReleasedVersion(version: String): Boolean {
+    val doc: Document? = getMavenMetadata()
+    if (doc != null) {
+      val versions = doc.getElementsByTagName("version")
+      for (i in 0..versions.length - 1) {
+        if (versions.item(i).textContent == version) {
+          return true
+        }
+      }
+    }
+    return false
+  }
+
+  fun getLatestReleasedVersion(): String {
+    val doc: Document? = getMavenMetadata()
+    return doc?.getElementsByTagName("latest")?.item(0)?.getTextContent() ?: ""
+  }
+
+  fun getMavenMetadata(): Document? {
+    val groupIdAsPath = groupId.replace(".", "/")
+    val mavenMetadataUrl = "${GMAVEN_ROOT}/${groupIdAsPath}/${artifactId}/maven-metadata.xml"
+    val factory: DocumentBuilderFactory = DocumentBuilderFactory.newInstance()
+    val builder: DocumentBuilder = factory.newDocumentBuilder()
+    try {
+      val doc: Document = builder.parse(URL(mavenMetadataUrl).openStream())
+      doc.documentElement.normalize()
+      return doc
+    } catch (e: FileNotFoundException) {
+      return null
+    }
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenVersionChecker.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenVersionChecker.kt
new file mode 100644
index 00000000000..e58ba7fda3e
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenVersionChecker.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+
+abstract class GmavenVersionChecker : DefaultTask() {
+
+  @get:Input abstract val groupId: Property<String>
+
+  @get:Input abstract val artifactId: Property<String>
+
+  @get:Input abstract val latestReleasedVersion: Property<String>
+
+  @get:Input abstract val version: Property<String>
+
+  @TaskAction
+  fun run() {
+    val mavenHelper = GmavenHelper(groupId.get(), artifactId.get())
+    val latestMavenVersion = mavenHelper.getLatestReleasedVersion()
+    val info =
+      "\n  latestReleasedVersion in gradle.properties should match the latest release on GMaven (${latestMavenVersion})" +
+        "\n  version in gradle.properties should be a version bump above this, following SemVer, and should not be released on GMaven"
+    // Either the Maven metadata does not exist, or the library hasn't been released
+    if (latestMavenVersion.isEmpty()) {
+      return
+    }
+    // TODO(b/285892320): Remove condition when bug fixed
+    if (artifactId.get() == "protolite-well-known-types") {
+      return
+    }
+    if (version.get() == latestReleasedVersion.get()) {
+      throw GradleException(
+        "version and latestReleasedVersion from gradle.properties are the same (${version.get()})" +
+          info
+      )
+    }
+    if (latestMavenVersion == version.get()) {
+      throw GradleException(
+        "version from gradle.properties (${version.get()}) is already the latest release on GMaven" +
+          info
+      )
+    } else if (mavenHelper.hasReleasedVersion(version.get())) {
+      throw GradleException(
+        "version from gradle.properties (${version.get()}) has already been released on GMaven" +
+          info
+      )
+    }
+    if (latestMavenVersion != latestReleasedVersion.get()) {
+      if (mavenHelper.hasReleasedVersion(latestReleasedVersion.get())) {
+        throw GradleException(
+          "latestReleasedVersion from gradle.properties (${latestReleasedVersion.get()}) has been released but is not the latest release on GMaven (${latestMavenVersion})"
+        )
+      } else {
+        throw GradleException(
+          "latestReleasedVersion from gradle.properties (${latestReleasedVersion.get()}) has not been released on GMaven" +
+            info
+        )
+      }
+    }
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GradleUtils.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GradleUtils.kt
new file mode 100644
index 00000000000..ca794d66754
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GradleUtils.kt
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import java.io.File
+import org.gradle.api.DefaultTask
+import org.gradle.api.Project
+import org.gradle.api.artifacts.Dependency
+import org.gradle.api.attributes.Attribute
+import org.gradle.api.attributes.AttributeContainer
+import org.gradle.api.provider.Provider
+import org.gradle.kotlin.dsl.apply
+import org.gradle.workers.WorkAction
+import org.gradle.workers.WorkParameters
+import org.gradle.workers.WorkQueue
+import org.jetbrains.kotlin.gradle.utils.provider
+
+/**
+ * Creates a file at the buildDir for the given [Project].
+ *
+ * Syntax sugar for:
+ * ```
+ * project.file("${project.buildDir}/$path)
+ * ```
+ */
+fun Project.fileFromBuildDir(path: String) = file("$buildDir/$path")
+
+/**
+ * Maps a file provider to another file provider as a sub directory.
+ *
+ * Syntax sugar for:
+ * ```
+ * fileProvider.map { File("${it.path}/$path") }
+ * ```
+ */
+fun Provider<File>.childFile(path: String) = map { File("${it.path}/$path") }
+
+/**
+ * Returns a new [File] under the given sub directory.
+ *
+ * Syntax sugar for:
+ * ```
+ * File("$path/$childPath")
+ * ```
+ */
+fun File.childFile(childPath: String) = File("$path/$childPath")
+
+/**
+ * Rewrites the lines of a file.
+ *
+ * The lines of the file are first read and then transformed by the provided `block` function. The
+ * transformed lines are then joined together with a newline character and written back to the file.
+ *
+ * If the `terminateWithNewline` parameter is set to `false`, the file will not be terminated with a
+ * newline character.
+ *
+ * @param terminateWithNewline Whether to terminate the file with a newline character. Defaults to
+ * `true`.
+ * @param block A function that takes a string as input and returns a new string. This function is
+ * used to transform the lines of the file before they are rewritten.
+ *
+ * ```
+ * val file = File("my-file.txt")
+ *
+ * // Rewrite the lines of the file, replacing all spaces with tabs.
+ * file.rewriteLines { it.replace(" ", "\t") }
+ *
+ * // Rewrite the lines of the file, capitalizing the first letter of each word.
+ * file.rewriteLines { it.capitalizeWords() }
+ * ```
+ *
+ * @see [readLines]
+ * @see [writeText]
+ */
+fun File.rewriteLines(terminateWithNewline: Boolean = true, block: (String) -> String) {
+  val newLines = readLines().map(block)
+  writeText(newLines.joinToString("\n").let { if (terminateWithNewline) it + "\n" else it })
+}
+
+/**
+ * Provides a temporary file for use during the task.
+ *
+ * Creates a file under the [temporaryDir][DefaultTask.getTemporaryDir] of the task, and should be
+ * preferred to defining an explicit [File]. This will allow Gradle to make better optimizations on
+ * our part, and helps us avoid edge-case scenarios like conflicting file names.
+ */
+fun DefaultTask.tempFile(path: String) = provider { temporaryDir.childFile(path) }
+
+/**
+ * Returns a list of children files, or an empty list if this [File] doesn't exist or doesn't have
+ * any children.
+ *
+ * Syntax sugar for:
+ * ```
+ * listFiles().orEmpty()
+ * ```
+ */
+fun File.listFilesOrEmpty() = listFiles().orEmpty()
+
+/**
+ * Copies this file to the specified directory.
+ *
+ * The new file will retain the same [name][File.getName] and [extension][File.extension] as this
+ * file.
+ *
+ * @param target The directory to copy the file to.
+ * @param overwrite Whether to overwrite the file if it already exists.
+ * @param bufferSize The size of the buffer to use for the copy operation.
+ * @return The new file.
+ *
+ * @see copyTo
+ */
+fun File.copyToDirectory(
+  target: File,
+  overwrite: Boolean = false,
+  bufferSize: Int = DEFAULT_BUFFER_SIZE
+): File = copyTo(target.childFile(name), overwrite, bufferSize)
+
+/**
+ * Submits a piece of work to be executed asynchronously.
+ *
+ * More Kotlin friendly variant of the existing [WorkQueue.submit]
+ *
+ * Syntax sugar for:
+ * ```kotlin
+ * submit(T::class.java, paramAction)
+ * ```
+ */
+inline fun <reified T : WorkAction<C>, C : WorkParameters> WorkQueue.submit(
+  noinline action: C.() -> Unit
+) {
+  submit(T::class.java, action)
+}
+
+/**
+ * Creates an attribute of type T.
+ *
+ * More kotlin friendly variant of the existing [Attribute.of]
+ *
+ * Syntax sugar for:
+ * ```kotlin
+ * Attribute.of(name, T::class.java)
+ * ```
+ */
+inline fun <reified T> attributeFrom(name: String) = Attribute.of(name, T::class.java)
+
+/**
+ * Sets an attribute value.
+ *
+ * Syntax sugar for:
+ * ```kotlin
+ * attribute(Attribute.of(name, T::class.java), value)
+ * ```
+ */
+inline fun <reified T> AttributeContainer.attribute(name: String, value: T) =
+  attribute(attributeFrom(name), value)
+
+/**
+ * Syntax sugar for:
+ * ```kotlin
+ * pluginManager.apply(T::class)
+ * ```
+ */
+inline fun <reified T : Any> org.gradle.api.plugins.PluginManager.`apply`(): Unit =
+  `apply`(T::class)
+
+/**
+ * The name provided to this artifact when published.
+ *
+ * For example, the following could be an artifact name:
+ * ```
+ * "com.google.firebase:firebase-common:16.0.5"
+ * ```
+ */
+val Dependency.artifactName: String
+  get() = listOf(group, name, version).filterNotNull().joinToString(":")
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/JavadocPlugin.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/JavadocPlugin.java
deleted file mode 100644
index bfd95993546..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/JavadocPlugin.java
+++ /dev/null
@@ -1,316 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.gradle.plugins;
-
-import static com.google.firebase.gradle.plugins.ClosureUtil.closureOf;
-import static com.google.firebase.gradle.plugins.ProjectUtilsKt.toBoolean;
-
-import com.android.build.gradle.LibraryExtension;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import org.gradle.api.GradleException;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.Task;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.attributes.Attribute;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.tasks.javadoc.Javadoc;
-import org.gradle.external.javadoc.CoreJavadocOptions;
-import org.jetbrains.dokka.gradle.DokkaAndroidPlugin;
-import org.jetbrains.dokka.gradle.DokkaTask;
-
-/**
- * This plugin modifies the java plugin's javadoc task to be firebase friendly. It does the
- * following
- *
- * <ul>
- *   <li>It adds android's source sets to the task's sources.
- *   <li>It changes the classpath to include ANDROID_HOME
- *   <li>Since firebase documents are generated by the doclava doclet, we wire in sensible defaults
- *       to enable building javadocs externally while supporting our internal publishing process.
- *   <li>Kotlin projects use dokka to produce documentation
- *   <li>Projects with `publishJavadoc = false` produce an empty javadoc
- * </ul>
- */
-public class JavadocPlugin implements Plugin<Project> {
-
-  private static final String UNFILTERED_API_TXT_BUILD_PATH = "tmp/javadoc/unfiltered-api.txt";
-
-  @Override
-  public void apply(Project project) {
-    project.afterEvaluate(
-        p -> {
-          FirebaseLibraryExtension ext =
-              project.getExtensions().findByType(FirebaseLibraryExtension.class);
-          if (ext == null) {
-            project
-                .getLogger()
-                .lifecycle(
-                    "[Doclava] Project {} is not a firebase library, skipping...",
-                    project.getPath());
-            return;
-          }
-          @SuppressWarnings("unchecked")
-          boolean includeFireEscapeArtifacts =
-              toBoolean(
-                  ((Map<String, Object>) project.getProperties())
-                      .getOrDefault("includeFireEscapeArtifacts", "false"));
-          if (!ext.publishJavadoc || !includeFireEscapeArtifacts) {
-            applyDummyJavadoc(project);
-          } else if (project.getPlugins().hasPlugin("kotlin-android")) {
-            applyDokka(project);
-          } else {
-            applyDoclava(project);
-          }
-        });
-  }
-
-  private static void applyDoclava(Project project) {
-    project.getConfigurations().maybeCreate("javadocCustomConfig");
-    project.getDependencies().add("javadocCustomConfig", "com.google.doclava:doclava:1.0.6");
-
-    // setting overwrite as java-library adds the javadoc task by default and it does not work
-    // with our @hide tags.
-    Javadoc generateJavadoc = project.getTasks().replace("generateJavadoc", Javadoc.class);
-    project.configure(
-        generateJavadoc,
-        closureOf(
-            (Javadoc javadoc) -> {
-              project
-                  .getTasks()
-                  .all(
-                      it -> {
-                        if (it.getName().equals("assembleRelease")) {
-                          javadoc.dependsOn(it);
-                        }
-                      });
-              // Besides third party libraries, firestore depends on the sibling module
-              // :immutable-collection,
-              // which needs to be in the classpath when javadoc is run
-              // Ref:
-              // https://stackoverflow.com/questions/41076271/javadoc-generation-error-package-does-not-exist-in-multi-module-project
-              if (ProjectUtilsKt.isAndroid(project)) {
-                LibraryExtension android =
-                    project.getExtensions().getByType(LibraryExtension.class);
-                javadoc.setClasspath(
-                    javadoc.getClasspath().plus(project.files(android.getBootClasspath())));
-                // We include the Timestamp file in common's javadoc source set and remove it from
-                // Firestore"s source set
-                // This comes with the risks of Timestamp's javadoc and binary releases having
-                // disconnected timelines.
-                // Given the repeated tedium in dealing with javadoc, this risk seems worth taking
-                if ("firebase-common".equals(project.getName())) {
-                  Project firestoreProject = project.findProject(":firebase-firestore");
-                  javadoc.setSource(
-                      android
-                          .getSourceSets()
-                          .getByName("main")
-                          .getJava()
-                          .getSourceFiles()
-                          .plus(
-                              firestoreProject.files(
-                                  "src/main/java/com/google/firebase/Timestamp.java")));
-
-                } else if ("firebase-firestore".equals(project.getName())) {
-                  javadoc.setSource(
-                      android
-                          .getSourceSets()
-                          .getByName("main")
-                          .getJava()
-                          .getSourceFiles()
-                          .minus(
-                              project.files("src/main/java/com/google/firebase/Timestamp.java")));
-                } else {
-                  javadoc.setSource(
-                      android.getSourceSets().getByName("main").getJava().getSrcDirs());
-                }
-                android
-                    .getLibraryVariants()
-                    .all(
-                        variant -> {
-                          if (!"release".equals(variant.getName().toLowerCase())) {
-                            return;
-                          }
-                          javadoc.setClasspath(
-                              javadoc
-                                  .getClasspath()
-                                  .plus(
-                                      getJars(variant.getCompileConfiguration())
-                                          .plus(getJars(variant.getRuntimeConfiguration()))));
-
-                          // this includes compiled sources which avoids "cannot find symbol" errors
-                          javadoc.setClasspath(
-                              javadoc
-                                  .getClasspath()
-                                  .plus(
-                                      project.files(variant.getJavaCompile().getDestinationDir())));
-                        });
-              } else {
-                JavaPluginConvention java =
-                    project.getConvention().getPlugin(JavaPluginConvention.class);
-                javadoc.setSource(java.getSourceSets().getByName("main").getAllJava());
-                javadoc.setClasspath(java.getSourceSets().getByName("main").getCompileClasspath());
-              }
-
-              Configuration javadocClasspath =
-                  project.getConfigurations().findByName("javadocClasspath");
-
-              if (javadocClasspath != null) {
-                javadoc.setClasspath(javadoc.getClasspath().plus(getJars(javadocClasspath)));
-              }
-
-              // Gradle passes the (unsupported) -doctitle option to the doclava doclet.
-              // We set the title to null to overcome this issue
-              javadoc.setTitle(null);
-              javadoc.getOptions().setDoclet("com.google.doclava.Doclava");
-
-              // set book path and project path used in g3 templates
-              CoreJavadocOptions options = (CoreJavadocOptions) javadoc.getOptions();
-              options
-                  .addMultilineMultiValueOption("hdf")
-                  .setValue(
-                      ImmutableList.of(
-                          ImmutableList.of("book.path", "/docs/reference/_book.yaml"),
-                          ImmutableList.of("project.path", "/_project.yaml")));
-
-              // root path assumed by docs
-              options.addStringOption("toroot", "/docs/reference/android/");
-
-              // TODO(ashwinraghav) : These currently fail because of unknown annotations in
-              // Firestore
-              // @Documented, @TypeQualifierNickname, @Retention which are relatively minor
-              // b/74115412
-              // options.addMultilineStringsOption("error").setValue(["103", "104"])
-
-              options.addMultilineStringsOption("warning").setValue(ImmutableList.of("101", "106"));
-
-              // destination for generated toc yaml
-              options.addStringOption("yaml", "_toc.yaml");
-
-              if (project.hasProperty("templatedir")) {
-                options.addStringOption(
-                    "templatedir", project.getProperties().get("templatedir").toString());
-              }
-
-              // Custom doclet can be specified in certain scenarios
-              if (project.hasProperty("docletpath")) {
-                options.setDocletpath(
-                    ImmutableList.of(project.file(project.getProperties().get("docletpath"))));
-              } else {
-                options.setDocletpath(
-                    ImmutableList.copyOf(
-                        project.getConfigurations().getByName("javadocCustomConfig").getFiles()));
-              }
-
-              ImmutableList.Builder<List<String>> federationApiFiles = ImmutableList.builder();
-              ImmutableList.Builder<List<String>> federationUrls = ImmutableList.builder();
-
-              if (project.hasProperty("android_api_file")) {
-                federationUrls.add(ImmutableList.of("Android", "https://developer.android.com"));
-                federationApiFiles.add(
-                    ImmutableList.of(
-                        "Android", project.getProperties().get("android_api_file").toString()));
-              }
-              if (project.hasProperty("android_support_library_api_file")) {
-                federationUrls.add(
-                    ImmutableList.of("Android Support Library", "https://developer.android.com"));
-                federationApiFiles.add(
-                    ImmutableList.of(
-                        "Android Support Library",
-                        project
-                            .getProperties()
-                            .get("android_support_library_api_file")
-                            .toString()));
-              }
-              if (project.hasProperty("google_play_services_api_file")) {
-                federationUrls.add(
-                    ImmutableList.of(
-                        "Google Play services", "https://developers.google.com/android"));
-                federationApiFiles.add(
-                    ImmutableList.of(
-                        "Google Play services",
-                        project.getProperties().get("google_play_services_api_file").toString()));
-              }
-              if (project.hasProperty("tasks_api_file")) {
-                federationUrls.add(
-                    ImmutableList.of("Tasks", "https://developers.google.com/android"));
-                federationApiFiles.add(
-                    ImmutableList.of(
-                        "Tasks", project.getProperties().get("tasks_api_file").toString()));
-              }
-
-              // set federated links for external projects that need to be linked
-              options.addMultilineMultiValueOption("federate").setValue(federationUrls.build());
-              options
-                  .addMultilineMultiValueOption("federationapi")
-                  .setValue(federationApiFiles.build());
-            }));
-    project
-        .getTasks()
-        .create(
-            TasksKt.JAVADOC_TASK_NAME,
-            task -> {
-              task.dependsOn(generateJavadoc);
-              createEmptyApiFile(project);
-            });
-  }
-
-  private static void applyDokka(Project project) {
-    project.apply(ImmutableMap.of("plugin", DokkaAndroidPlugin.class));
-    DokkaTask dokka = (DokkaTask) project.getTasks().getByName("dokka");
-    dokka.setOutputDirectory(project.getBuildDir() + "/docs/javadoc/reference");
-    applyDummyJavadoc(project).dependsOn(dokka);
-  }
-
-  private static Task applyDummyJavadoc(Project project) {
-    return project
-        .getTasks()
-        .create(
-            TasksKt.JAVADOC_TASK_NAME,
-            task -> {
-              task.doLast(
-                  t -> {
-                    createEmptyApiFile(project);
-                  });
-              task.doLast(t -> project.mkdir(project.getBuildDir() + "/docs/javadoc/reference"));
-            });
-  }
-
-  private static void createEmptyApiFile(Project project) {
-    File dir = project.file(project.getBuildDir() + "/tmp/javadoc");
-    project.mkdir(dir);
-    try {
-      project.file(dir + "/api.txt").createNewFile();
-    } catch (IOException e) {
-      throw new GradleException("Unable to create file", e);
-    }
-  }
-
-  private static FileCollection getJars(Configuration configuration) {
-    return configuration
-        .getIncoming()
-        .artifactView(
-            view ->
-                view.attributes(
-                    attrs -> attrs.attribute(Attribute.of("artifactType", String.class), "jar")))
-        .getArtifacts()
-        .getArtifactFiles();
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/KotlinUtils.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/KotlinUtils.kt
new file mode 100644
index 00000000000..4dd3382ba81
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/KotlinUtils.kt
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import org.w3c.dom.Element
+import org.w3c.dom.NodeList
+
+/** Replaces all matching substrings with an empty string (nothing) */
+fun String.remove(regex: Regex) = replace(regex, "")
+
+/** Replaces all matching substrings with an empty string (nothing) */
+fun String.remove(str: String) = replace(str, "")
+
+/**
+ * Returns a sequence containing all elements.
+ *
+ * The operation is _terminal_.
+ *
+ * Syntax sugar for:
+ * ```
+ * take(count())
+ * ```
+ */
+public fun <T> Sequence<T>.takeAll(): Sequence<T> = take(count())
+
+/**
+ * Converts an [Element] to an Artifact string.
+ *
+ * An Artifact string can be defined as a dependency with the following format:
+ * ```
+ * groupId:artifactId:version
+ * ```
+ *
+ * For example, the following would be a valid [Element]:
+ * ```
+ * <mySuperCoolElement>
+ *   <groupId>com.google.firebase</groupId>
+ *   <artifactId>firebase-common</artifactId>
+ *   <version>16.0.1</version>
+ * </mySuperCoolElement>
+ * ```
+ *
+ * @throws NoSuchElementException if the [Element] does not have descendant [Element]s with tags
+ * that match the components of an Artifact string; groupId, artifactId, version.
+ */
+fun Element.toArtifactString() =
+  "${textByTag("groupId")}:${textByTag("artifactId")}:${textByTag("version")}"
+
+/**
+ * Converts an [Element] to a Maven name
+ *
+ * A Maven name can be defined as a dependency with the following format:
+ * ```
+ * groupId:artifactId
+ * ```
+ *
+ * For example, the following would be a valid [Element]:
+ * ```
+ * <mySuperCoolElement>
+ *   <groupId>com.google.firebase</groupId>
+ *   <artifactId>firebase-common</artifactId>
+ * </mySuperCoolElement>
+ * ```
+ *
+ * @throws NoSuchElementException if the [Element] does not have descendant [Element]s with tags
+ * that match the components of an Artifact string; groupId, artifactId, version.
+ */
+fun Element.toMavenName() = "${textByTag("groupId")}:${textByTag("artifactId")}"
+
+/**
+ * Finds a descendant [Element] by a given [tag], and returns the [textContent]
+ * [Element.getTextContent] of it.
+ *
+ * @param tag the XML tag to filter for (the special value "*" matches all tags)
+ * @throws NoSuchElementException if an [Element] with the given [tag] does not exist
+ * @see findElementsByTag
+ */
+fun Element.textByTag(tag: String) = findElementsByTag(tag).first().textContent
+
+/**
+ * Finds a descendant [Element] by a given [tag], or creates a new one.
+ *
+ * If a new one is created, it is also appended to the [ownerDocument][Element.findOrCreate].
+ *
+ * @param tag the XML tag to filter for (the special value "*" matches all tags)
+ * @see findElementsByTag
+ */
+fun Element.findOrCreate(tag: String) =
+  findElementsByTag(tag).firstOrNull() ?: ownerDocument.createElement(tag).also { appendChild(it) }
+
+/**
+ * Returns a [Sequence] of all descendant [Element]s that match the given [tag].
+ *
+ * Essentially a rewrite of [Element.getElementsByTagName] that offers the elements as a [Sequence]
+ * and properly converts them to [Element].
+ *
+ * @param tag the XML tag to filter for (the special value "*" matches all tags)
+ * @see Element.getElementsByTagName
+ */
+fun Element.findElementsByTag(tag: String) =
+  getElementsByTagName(tag).children().mapNotNull { it as? Element }
+
+/**
+ * Yields the items of this [NodeList] as a [Sequence].
+ *
+ * [NodeList] does not typically offer an iterator. This extension method offers a means to loop
+ * through a NodeList's [item][NodeList.item] method, while also taking into account its [length]
+ * [NodeList.getLength] property to avoid an [IndexOutOfBoundsException].
+ *
+ * Additionally, this operation is _intermediate_ and _stateless_.
+ */
+fun NodeList.children() = sequence {
+  for (index in 0..length) {
+    yield(item(index))
+  }
+}
+
+/**
+ * Joins a variable amount of [strings][Any.toString] to a single [String] split by newlines (`\n`).
+ *
+ * For example:
+ * ```kotlin
+ * println(multiLine("Hello", "World", "!")) // "Hello\nWorld\n!"
+ * ```
+ */
+fun multiLine(vararg strings: Any?) = strings.joinToString("\n")
+
+/**
+ * Returns the first match of a regular expression in the [input], beginning at the specified
+ * [startIndex].
+ *
+ * @param input the string to search through
+ * @param startIndex an index to start search with, by default zero. Must be not less than zero and
+ * not greater than `input.length()`
+ * @throws RuntimeException if a match is not found
+ */
+fun Regex.findOrThrow(input: CharSequence, startIndex: Int = 0) =
+  find(input, startIndex)
+    ?: throw RuntimeException(multiLine("No match found for the given input:", input.toString()))
+
+/**
+ * Creates a [Pair] out of an [Iterable] with only two elements.
+ *
+ * If the [Iterable] has more or less than two elements, the [second element][Pair.second] will be
+ * null.
+ *
+ * For example:
+ * ```kotlin
+ * listOf(1,2).toPairOrNull() // (1,2)
+ * listOf(1).toPairOrNull() // (1, null)
+ * listOf(1,2,3).toPairOrNull() // (1, null)
+ * ```
+ *
+ * @throws NoSuchElementException if the [Iterable] is empty
+ */
+fun <T : Any?> Iterable<T>.toPairOrFirst(): Pair<T, T?> = first() to last().takeIf { count() == 2 }
+
+/**
+ * Splits a list at the given [index].
+ *
+ * A [Pair] will be returned that contains the first and second part of the list respectively.
+ *
+ * The [second list][Pair.second] will be the one that contains the element at the split.
+ *
+ * For example:
+ * ```kotlin
+ * listOf("a","b","c","d","e").separateAt(3) // (["a", "b", "c"], ["d", "e"])
+ * listOf("a","b","c","d","e").separateAt(2) // (["a", "b"], ["c", "d", "e"])
+ * listOf("a","b").separateAt(1) // (["a"],["b"])
+ * listOf("a").separateAt(1) // (["a"],[])
+ * listOf("a").separateAt(0) // ([],["a"])
+ * ```
+ *
+ * @param index the index to split the list at; zero being the first element
+ */
+fun <T> List<T>.separateAt(index: Int) = slice(0 until index) to slice(index..lastIndex)
+
+/**
+ * Maps any instances of the [regex] found in this list to the provided [transform].
+ *
+ * For example:
+ * ```kotlin
+ * listOf("mom", "mommy", "momma", "dad").replaceMatches(Regex(".*mom.*")) {
+ *   it.value.takeUnless { it.contains("y") }?.drop(1)
+ * } // ["om", "mommy", "omma", "dad"]
+ * ```
+ *
+ * @param regex the [Regex] to use to match against values in this list
+ * @param transform a callback to call with [MathResults][MatchResult] when matches are found. If
+ * the [transform] returns null, then the value remains unchanged.
+ */
+fun List<String>.replaceMatches(regex: Regex, transform: (MatchResult) -> String?) = map {
+  val newValue = regex.find(it)?.let(transform)
+  if (newValue != null) {
+    it.replace(regex, newValue)
+  } else {
+    it
+  }
+}
+
+/**
+ * Returns the value of the first capture group.
+ *
+ * Intended to be used in [MatchResult] that are only supposed to capture a single entry.
+ */
+val MatchResult.firstCapturedValue: String
+  get() = groupValues[1]
+
+/**
+ * Creates a diff between two lists.
+ *
+ * For example:
+ * ```kotlin
+ * listOf(1,2,3,7,8) diff listOf(1,3,2,6) // [(2, 3), (3, 2), (7, 6), (8, null)]
+ * ```
+ */
+infix fun <T> List<T>.diff(other: List<T>): List<Pair<T?, T?>> {
+  val largestList = maxOf(size, other.size)
+
+  val firstList = coerceToSize(largestList)
+  val secondList = other.coerceToSize(largestList)
+
+  return firstList.zip(secondList).filter { it.first != it.second }
+}
+
+/**
+ * Creates a list that is forced to certain size.
+ *
+ * If the list is longer than the specified size, the extra elements will be cut. If the list is
+ * shorter than the specified size, null will be padded to the end
+ *
+ * For example:
+ * ```kotlin
+ * listOf(1,2,3).coerceToSize(5) // [1,2,3,null,null,null]
+ * listOf(1,2,3).coerceToSize(2) // [1,2]
+ * ```
+ */
+fun <T> List<T>.coerceToSize(targetSize: Int) = List(targetSize) { getOrNull(it) }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryGroups.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryGroups.kt
new file mode 100644
index 00000000000..c06e7aaf95d
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryGroups.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import org.gradle.api.GradleException
+import org.gradle.api.Project
+
+/**
+ * Returns a map of library group names to the list of libraries that belong to that group.
+ *
+ * Libraries, aka projects with `FirebaseLibraryExtension`, always belong to a library group. See
+ * [FirebaseLibraryExtension] to know more about library group names.
+ */
+fun computeLibraryGroups(project: Project): Map<String, List<FirebaseLibraryExtension>> {
+  if (project != project.rootProject) {
+    throw GradleException(
+      "Error trying to generate library groups from non root project. " +
+        "Computing library groups for non root projects can generate incomplete views."
+    )
+  }
+  val libraryGroups =
+    project.subprojects.mapNotNull { it.firebaseLibraryOrNull }.groupBy { it.libraryGroupName }
+
+  return libraryGroups
+}
+
+fun fixLibraryGroupVersions(libraryGroups: Map<String, List<FirebaseLibraryExtension>>) {
+  for ((name, libraryGroup) in libraryGroups) {
+    val maxVersion =
+      libraryGroup.mapNotNull { it.moduleVersion }.maxOrNull()?.toString() ?: continue
+    for (firebaseExtension in libraryGroup) {
+      if (ModuleVersion.fromStringOrNull(firebaseExtension.project.version.toString()) == null) {
+        firebaseExtension.project.version = maxVersion.toString()
+      }
+    }
+  }
+}
+
+/**
+ * Returns the list of libraries that should be transitively included in a release but are not.
+ *
+ * Based on [librariesToRelease], this function will find and return all libraries that belongs to
+ * the same library group of a releasing library and are not included.
+ */
+fun computeMissingLibrariesToRelease(
+  librariesToRelease: List<FirebaseLibraryExtension>,
+  libraryGroups: Map<String, List<FirebaseLibraryExtension>>
+): List<FirebaseLibraryExtension> =
+  expandWithLibraryGroup(librariesToRelease, libraryGroups) - librariesToRelease
+
+/** Returns a list that includes [libraries] and all their library group members. */
+fun expandWithLibraryGroup(
+  libraries: List<FirebaseLibraryExtension>,
+  libraryGroups: Map<String, List<FirebaseLibraryExtension>>
+) =
+  libraries
+    .flatMap { libraryGroups.getOrDefault(it.libraryGroupName, emptyList()) }
+    .distinctBy { it.artifactId.get() }
+
+val FirebaseLibraryExtension.moduleVersion: ModuleVersion?
+  get() = ModuleVersion.fromStringOrNull(version)
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java
index 2be7d76b450..a1f0fcc56d3 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java
@@ -29,6 +29,14 @@ public String getFormat() {
   }
 
   public String getComponentName() {
+    // Due to the fact that multiple components are created for android libraries(1 per variant),
+    // the "android" component contains artifacts from all 3 variants for Kotlin libraries, which is
+    // invalid(bug in
+    // https://github.com/wupdigital/android-maven-publish ?).
+    // So we explicitly choose the "Release" variant for android libraries.
+    if (this == ANDROID) {
+      return "release";
+    }
     return name().toLowerCase();
   }
 }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/MakeReleaseNotesTask.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/MakeReleaseNotesTask.kt
new file mode 100644
index 00000000000..497e9376002
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/MakeReleaseNotesTask.kt
@@ -0,0 +1,217 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.StopActionException
+import org.gradle.api.tasks.TaskAction
+import org.gradle.work.DisableCachingByDefault
+
+/**
+ * Creates the release notes for the given project.
+ *
+ * Utilizing the [Changelog] for the target project, this task uses the unreleased section to
+ * generate appropriate release notes.
+ *
+ * @property changelogFile The `CHANGELOG.md` file to use as a [Changelog]
+ * @property releaseNotesFile The output file to write the release notes to
+ * @property skipMissingEntries Continue the build if the release notes are missing entries
+ * @throws StopActionException If metadata does not exist for the given project, or there are no
+ * changes to release
+ * @see make
+ */
+@DisableCachingByDefault
+abstract class MakeReleaseNotesTask : DefaultTask() {
+  @get:InputFile abstract val changelogFile: RegularFileProperty
+
+  @get:OutputFile abstract val releaseNotesFile: RegularFileProperty
+
+  @get:Optional @get:Input abstract val skipMissingEntries: Property<Boolean>
+
+  /**
+   * Converts the [changelogFile] into a [Changelog], and then uses that data to create release
+   * notes.
+   *
+   * Example Input:
+   * ```markdown
+   * # Unreleased
+   *
+   * # 18.3.7
+   * [feature] Added super cool stuff
+   *
+   * ## Kotlin
+   * The Kotlin extensions library transitively includes the updated
+   * `firebase-crashlytics` library. The Kotlin extensions library has no additional
+   * updates.
+   *
+   * # 18.3.6
+   * [changed] Changed some bad stuff
+   * ```
+   *
+   * Example Output:
+   * ```markdown
+   * ### {{crashlytics}} version 18.3.7 {: #crashlytics_v18-3-7}
+   *
+   * * {{FEATURE}} Added super cool stuff
+   *
+   * #### {{crashlytics}} Kotlin extension version 18.3.7 {: #crashlytics-ktx_v18-3-7}
+   *
+   * The Kotlin extensions library transitively includes the updated
+   * `firebase-crashlytics` library. The Kotlin extensions library has no additional
+   * updates.
+   * ```
+   *
+   * @see convertToMetadata
+   */
+  @TaskAction
+  fun make() {
+    val changelog = Changelog.fromFile(changelogFile.asFile.get())
+    val metadata = convertToMetadata(project.name)
+    val unreleased = changelog.releases.first()
+    val version = project.version.toString()
+    val skipMissing = skipMissingEntries.getOrElse(false)
+
+    if (!project.firebaseLibrary.publishReleaseNotes)
+      throw StopActionException("No release notes required for ${project.name}")
+
+    if (!unreleased.hasContent()) {
+      if (skipMissing)
+        throw StopActionException(
+          "Missing releasing notes for  \"${project.name}\", but skip missing enabled."
+        )
+
+      throw GradleException("Missing release notes for \"${project.name}\"")
+    }
+
+    val versionClassifier = version.replace(".", "-")
+
+    val baseReleaseNotes =
+      """
+        |### ${metadata.name} version $version {: #${metadata.versionName}_v$versionClassifier}
+        |
+        |${unreleased.content.toReleaseNotes()}
+      """
+        .trimMargin()
+        .trim()
+
+    val ktxReleaseNotes =
+      """
+          |#### ${metadata.name} Kotlin extensions version $version {: #${metadata.versionName}-ktx_v$versionClassifier}
+          |
+          |${unreleased.ktx?.toReleaseNotes() ?: KTXTransitiveReleaseText(project.name)}
+        """
+        .trimMargin()
+        .trim()
+        .takeIf { metadata.hasKTX }
+
+    val releaseNotes =
+      """
+        |$baseReleaseNotes
+        |
+        |${ktxReleaseNotes.orEmpty()}
+      """
+        .trimMargin()
+        .trim()
+
+    releaseNotesFile.asFile.get().writeText(releaseNotes)
+  }
+
+  /**
+   * Converts a [ReleaseContent] to a [String] to be used in a release note.
+   *
+   * @see [MakeReleaseNotesTask]
+   * @see [Change.toReleaseNote]
+   */
+  private fun ReleaseContent.toReleaseNotes() =
+    """
+      |$subtext
+      |
+      |${changes.joinToString("\n\n") { it.toReleaseNote() }}
+    """
+      .trimMargin()
+      .trim()
+
+  /**
+   * Converts a [Change] to a [String] to be used in a release note.
+   *
+   * @see [MakeReleaseNotesTask]
+   * @see [LINK_REGEX]
+   */
+  private fun Change.toReleaseNote(): String {
+    if (message.isBlank()) throw RuntimeException("A changelog entry message can not be blank.")
+
+    val fixedMessage =
+      LINK_REGEX.replace(message) {
+        val id = it.firstCapturedValue
+        "GitHub [#$id](//github.com/firebase/firebase-android-sdk/issues/$id){: .external}"
+      }
+
+    return "* {{${type.name.toLowerCase()}}} $fixedMessage"
+  }
+
+  companion object {
+    /**
+     * Regex for GitHub issue links in change messages.
+     *
+     * The regex can be described as such:
+     * - Look for numbers that will be surrounded by either brackets or parentheses
+     * - These numbers might be preceded by `GitHub `
+     * - These numbers might also be followed by parentheses with `//` followed by some text (a
+     * link)
+     * - At the end there might be `{: .external}`
+     *
+     * For example:
+     * ```markdown
+     * We added (#123) and some
+     * other cool stuff: [#321]
+     * alongside [#5678](//github.com/firebase-firebase-android-sdk/issues/number)
+     * ```
+     *
+     * Will find the following groups:
+     * ```kotlin
+     * [
+     *   123,
+     *   321,
+     *   5678
+     * ]
+     * ```
+     *
+     * But will *match* the following:
+     * ```kotlin
+     * [
+     *  "(#123)",
+     *  "[#321]",
+     *  "[#5678](//github.com/firebase-firebase-android-sdk/issues/number)"
+     * ]
+     * ```
+     *
+     * @see [Change.toReleaseNote]
+     */
+    private val LINK_REGEX =
+      Regex(
+        "(?:GitHub )?(?:\\[|\\()#(\\d+)(?:\\]|\\))(?:\\(.+?\\))?(?:\\{: \\.external\\})?",
+        RegexOption.MULTILINE
+      )
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt
index 1a3160bbf21..e823fd3437f 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt
@@ -1,94 +1,201 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
 
-import com.android.build.gradle.api.AndroidSourceSet
 import java.io.File
+import java.io.FileOutputStream
+import java.io.OutputStream
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.FileCollection
+import org.gradle.api.provider.Property
+import org.gradle.api.provider.SetProperty
+import org.gradle.api.tasks.Classpath
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.SourceSet
+import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 
 val Project.metalavaConfig: Configuration
-    get() =
-        configurations.findByName("metalavaArtifacts")
-                ?: configurations.create("metalavaArtifacts") {
-                    this.dependencies.add(this@metalavaConfig.dependencies.create("com.android:metalava:1.3.0"))
-                }
+  get() =
+    configurations.findByName("metalavaArtifacts")
+      ?: configurations.create("metalavaArtifacts") {
+        this.dependencies.add(
+          this@metalavaConfig.dependencies.create(
+            "com.android.tools.metalava:metalava:1.0.0-alpha06"
+          )
+        )
+      }
+
+val Project.docStubs: File?
+  get() = project.file("${buildDir.path}/doc-stubs")
 
 fun Project.runMetalavaWithArgs(
-    arguments: List<String>
+  arguments: List<String>,
+  ignoreFailure: Boolean = false,
+  stdOut: OutputStream? = null
 ) {
-    val allArgs = listOf(
-            "--no-banner",
-            "--hide",
-            "HiddenSuperclass" // We allow having a hidden parent class
+  val allArgs =
+    listOf(
+      "--no-banner",
+      "--hide",
+      "HiddenSuperclass", // We allow having a hidden parent class
+      "--hide",
+      "HiddenAbstractMethod"
     ) + arguments
 
-    project.javaexec {
-        main = "com.android.tools.metalava.Driver"
-        classpath = project.metalavaConfig
-        args = allArgs
-    }
+  project.javaexec {
+    mainClass.set("com.android.tools.metalava.Driver")
+    classpath = project.metalavaConfig
+    args = allArgs
+    isIgnoreExitValue = ignoreFailure
+    if (stdOut != null) errorOutput = stdOut
+  }
 }
 
 abstract class GenerateStubsTask : DefaultTask() {
-    /** Source files against which API signatures will be validated. */
-    lateinit var sourceSet: Object
-
-    @get:InputFiles
-    lateinit var classPath: FileCollection
-
-    @get:OutputDirectory
-    val outputDir: File = File(project.buildDir, "doc-stubs")
-
-    private val sourceDirs: Set<File>
-        get() = with(sourceSet) {
-            when (this) {
-                is SourceSet -> java.srcDirs
-                is AndroidSourceSet -> java.srcDirs
-                else -> throw IllegalStateException("Unsupported sourceSet provided: $javaClass")
-            }
-        }
-
-    @TaskAction
-    fun run() {
-        val sourcePath = sourceDirs.asSequence()
-                .filter { it.exists() }
-                .map { it.absolutePath }
-                .joinToString(":")
-
-        val classPath = classPath.files.asSequence()
-                .map { it.absolutePath }.toMutableList()
-        project.androidJar?.let {
-            classPath += listOf(it.absolutePath)
-        }
-
-        project.runMetalavaWithArgs(
-                listOf(
-                        "--source-path",
-                        sourcePath,
-                        "--classpath",
-                        classPath.joinToString(":"),
-                        "--include-annotations",
-                        "--doc-stubs",
-                        outputDir.absolutePath
-                ))
-    }
+  /** Source files against which API signatures will be validated. */
+  @get:InputFiles abstract val sources: SetProperty<File>
+
+  @get:[InputFiles Classpath]
+  lateinit var classPath: FileCollection
+
+  @get:OutputDirectory val outputDir: File = File(project.buildDir, "doc-stubs")
+
+  @TaskAction
+  fun run() {
+    val sourcePath =
+      sources.get().asSequence().filter { it.exists() }.map { it.absolutePath }.joinToString(":")
+
+    val classPath = classPath.files.asSequence().map { it.absolutePath }.toMutableList()
+    project.androidJar?.let { classPath += listOf(it.absolutePath) }
+
+    project.runMetalavaWithArgs(
+      listOf(
+        "--source-path",
+        sourcePath,
+        "--classpath",
+        classPath.joinToString(":"),
+        "--include-annotations",
+        "--doc-stubs",
+        outputDir.absolutePath
+      )
+    )
+  }
+}
+
+abstract class GenerateApiTxtTask : DefaultTask() {
+  /** Source files against which API signatures will be validated. */
+  @get:InputFiles abstract val sources: SetProperty<File>
+
+  @get:InputFiles lateinit var classPath: FileCollection
+
+  @get:OutputFile abstract val apiTxtFile: Property<File>
+
+  @get:OutputFile abstract val baselineFile: Property<File>
+
+  @get:Input abstract val updateBaseline: Property<Boolean>
+
+  @TaskAction
+  fun run() {
+    val sourcePath =
+      sources.get().asSequence().filter { it.exists() }.map { it.absolutePath }.joinToString(":")
+
+    val classPath = classPath.files.asSequence().map { it.absolutePath }.toMutableList()
+    project.androidJar?.let { classPath += listOf(it.absolutePath) }
+
+    project.runMetalavaWithArgs(
+      listOf(
+        "--source-path",
+        sourcePath,
+        "--classpath",
+        classPath.joinToString(":"),
+        "--api",
+        apiTxtFile.get().absolutePath,
+        "--format=v2"
+      ) +
+        if (updateBaseline.get()) listOf("--update-baseline")
+        else if (baselineFile.get().exists()) listOf("--baseline", baselineFile.get().absolutePath)
+        else listOf(),
+      ignoreFailure = true
+    )
+  }
+}
+
+abstract class ApiInformationTask : DefaultTask() {
+  /** Source files against which API signatures will be validated. */
+  @get:InputFiles abstract val sources: SetProperty<File>
+
+  @get:InputFiles lateinit var classPath: FileCollection
+
+  @get:InputFile abstract val apiTxtFile: Property<File>
+
+  @get:OutputFile abstract val outputApiFile: Property<File>
+
+  @get:OutputFile abstract val baselineFile: Property<File>
+
+  @get:OutputFile abstract val outputFile: Property<File>
+
+  @get:Input abstract val updateBaseline: Property<Boolean>
+
+  @TaskAction
+  fun run() {
+    val sourcePath =
+      sources.get().asSequence().filter { it.exists() }.map { it.absolutePath }.joinToString(":")
+
+    val classPath = classPath.files.asSequence().map { it.absolutePath }.toMutableList()
+    project.androidJar?.let { classPath += listOf(it.absolutePath) }
+
+    project.runMetalavaWithArgs(
+      listOf(
+        "--source-path",
+        sourcePath,
+        "--classpath",
+        classPath.joinToString(":"),
+        "--api",
+        outputApiFile.get().absolutePath,
+        "--format=v2"
+      ),
+      ignoreFailure = true
+    )
+
+    project.runMetalavaWithArgs(
+      listOf(
+        "--source-files",
+        outputApiFile.get().absolutePath,
+        "--check-compatibility:api:released",
+        apiTxtFile.get().absolutePath,
+        "--error",
+        "AddedClass",
+        "--error",
+        "AddedMethod",
+        "--error",
+        "AddedField",
+        "--format=v2",
+        "--no-color"
+      ) +
+        if (updateBaseline.get()) listOf("--update-baseline")
+        else if (baselineFile.get().exists()) listOf("--baseline", baselineFile.get().absolutePath)
+        else listOf(),
+      ignoreFailure = true,
+      stdOut = FileOutputStream(outputFile.get())
+    )
+  }
 }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt
new file mode 100644
index 00000000000..841d6c058c0
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+/**
+ * Possible version types in a SemVer versioning scheme.
+ *
+ * @see ModuleVersion
+ */
+enum class VersionType {
+  MAJOR,
+  MINOR,
+  PATCH,
+  PRE
+}
+
+/**
+ * Type-Safe representation of pre-release identifiers.
+ *
+ * The following priority is established, in order of newest to oldest:
+ *
+ * `RC > EAP > BETA > ALPHA`
+ *
+ * @see PreReleaseVersion
+ */
+enum class PreReleaseVersionType {
+  ALPHA,
+  BETA,
+  EAP,
+  RC
+}
+
+/**
+ * Type-Safe representation of pre-release [Versions][VersionType] for [ModuleVersion].
+ *
+ * Pre-Release versions (otherwise known as [pre][VersionType.PRE]) indicates changes that are worth
+ * releasing- but not stable enough to satisfy a full release.
+ *
+ * Pre-Release versions should be in the format of:
+ *
+ * `(Type)(Build)`
+ *
+ * Where `Type` is a case insensitive string of any [PreReleaseVersionType], and `Build` is a two
+ * digit number (single digits should have a leading zero).
+ *
+ * Note that `build` will always be present as starting at one by defalt. That is, the following
+ * transform occurs:
+ * ```
+ * "12.13.1-beta" // 12.13.1-beta01
+ * ```
+ *
+ * @property type an enum of [PreReleaseVersionType] that identifies the pre-release identifier
+ * @property build an [Int] that specifies the build number; defaults to one
+ * @see fromStringsOrNull
+ */
+data class PreReleaseVersion(val type: PreReleaseVersionType, val build: Int = 1) :
+  Comparable<PreReleaseVersion> {
+
+  companion object {
+
+    /**
+     * Converts a string of [type] and [build] into a valid [PreReleaseVersion].
+     *
+     * To learn more about what is considered a valid string and not, take a look at
+     * [PreReleaseVersion].
+     *
+     * Example Usage:
+     * ```
+     * PreReleaseVersion.fromStringsOrNull("alpha", "6") // PreReleaseVersion(ALPHA, 6)
+     * PreReleaseVersion.fromStringsOrNull("Beta", "") // PreReleaseVersion(BETA, 1)
+     * PreReleaseVersion.fromStringsOrNull("", "13") // null
+     * ```
+     *
+     * @param type a case insensitive string of any [PreReleaseVersionType]
+     * @param build a string number; gets automatically converted to double digits, and defaults to
+     * one if blank
+     * @return a [PreReleaseVersion] created from the string, or null if the string was invalid.
+     */
+    fun fromStringsOrNull(type: String, build: String): PreReleaseVersion? =
+      runCatching {
+          val preType = PreReleaseVersionType.valueOf(type.toUpperCase())
+          val buildNumber = build.takeUnless { it.isBlank() }?.toInt() ?: 1
+
+          PreReleaseVersion(preType, buildNumber)
+        }
+        .getOrNull()
+  }
+
+  override fun compareTo(other: PreReleaseVersion) =
+    compareValuesBy(this, other, { it.type }, { it.build })
+
+  /** Returns a copy of this [PreReleaseVersion], with the [build] increased by one. */
+  fun bump() = copy(build = build + 1)
+
+  /**
+   * Formatted as `TypeBuild`
+   *
+   * For example:
+   * ```
+   * PreReleaseVersion(ALPHA, 5).toString() // "alpha05"
+   * PreReleaseVersion(RC, 12).toString() // "rc12"
+   * ```
+   */
+  override fun toString() = "${type.name.toLowerCase()}${build.toString().padStart(2, '0')}"
+}
+
+/**
+ * Type-Safe representation of your standard [SemVer](https://semver.org/) versioning scheme.
+ *
+ * All versions should fall under your standard `MAJOR.MINOR.PATCH-PRE` format, where `PRE` is
+ * optional.
+ *
+ * To see rules about pre-release (`PRE`) formatting, see [PreReleaseVersion].
+ *
+ * @property major An update that represents breaking changes
+ * @property minor An update that represents new functionality
+ * @property patch An update that represents bug fixes
+ * @property pre An update that represents unstable changes not ready for a full release
+ * @see fromStringOrNull
+ */
+data class ModuleVersion(
+  val major: Int,
+  val minor: Int,
+  val patch: Int,
+  val pre: PreReleaseVersion? = null
+) : Comparable<ModuleVersion> {
+
+  /** Formatted as `MAJOR.MINOR.PATCH-PRE` */
+  override fun toString() = "$major.$minor.$patch${pre?.let { "-${it.toString()}" } ?: ""}"
+
+  override fun compareTo(other: ModuleVersion) =
+    compareValuesBy(
+      this,
+      other,
+      { it.major },
+      { it.minor },
+      { it.patch },
+      { it.pre == null }, // a version with no prerelease version takes precedence
+      { it.pre }
+    )
+
+  companion object {
+    /**
+     * Regex used in matching SemVer versions.
+     *
+     * The regex can be broken down as such:
+     *
+     * `(N digits).(N digits).(N digits)-(maybe letters)(maybe numbers)`
+     *
+     * For example, the following would be valid matches:
+     * ```
+     * "13.1.5" // valid
+     * "5.0.5-beta" // valid
+     * "19.45.12-rc09" // valid
+     * ```
+     *
+     * While the following would not be:
+     * ```
+     * "1.3.4-" // invalid
+     * "16.2.3-01" // invalid
+     * "5.1.c" // invalid
+     * ```
+     */
+    val VERSION_REGEX =
+      "(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?:\\-\\b)?(?<pre>\\w\\D+)?(?<build>\\B\\d+)?".toRegex()
+
+    /**
+     * Extrapolates the version variables from a provided [String], and turns them into a
+     * [ModuleVersion].
+     *
+     * The String should be in the format of `MAJOR.MINOR.PATCH-PRE`.
+     *
+     * ```
+     * ModuleVersion.fromString("1.2.3") // ModuleVersion(1,2,3)
+     * ModuleVersion.fromString("16.12.3-alpha") // ModuleVersion(16,12,3, ...)
+     * ModuleVersion.fromString("5.4.1-beta01") // ModuleVersion(5,4,1, ...)
+     * ModuleVersion.fromString("a.b.c") // null
+     * ```
+     *
+     * @param str a [String] that matches the SemVer format.
+     * @return a [ModuleVersion] created from the string, or null if the string was invalid.
+     */
+    fun fromStringOrNull(str: String): ModuleVersion? =
+      runCatching {
+          VERSION_REGEX.matchEntire(str)?.let {
+            val (major, minor, patch, pre, build) = it.destructured
+            ModuleVersion(
+                major.toInt(),
+                minor.toInt(),
+                patch.toInt(),
+                PreReleaseVersion.fromStringsOrNull(pre, build)
+              )
+              .takeUnless { it.pre == null && (pre.isNotEmpty() || build.isNotEmpty()) }
+          }
+        }
+        .getOrNull()
+  }
+
+  /**
+   * Returns a copy of this [ModuleVersion], with the given [VersionType] increased by one.
+   *
+   * @param version the [VersionType] to increase; defaults to the lowest valid version ([pre] else
+   * [patch]).
+   */
+  fun bump(version: VersionType? = null) =
+    version
+      .let { it ?: if (pre != null) VersionType.PRE else VersionType.PATCH }
+      .let {
+        when (it) {
+          VersionType.MAJOR -> copy(major = major + 1)
+          VersionType.MINOR -> copy(minor = minor + 1)
+          VersionType.PATCH -> copy(patch = patch + 1)
+          VersionType.PRE -> copy(pre = pre?.bump())
+        }
+      }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTask.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTask.kt
new file mode 100644
index 00000000000..cefea679b67
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTask.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import java.io.File
+import org.gradle.api.DefaultTask
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.StopActionException
+import org.gradle.api.tasks.TaskAction
+import org.gradle.kotlin.dsl.provideDelegate
+
+/**
+ * Moves the `Unreleased` section in a changelog file into a new section for a release.
+ *
+ * Primarily utilized as a post-release clean up task in which we update `CHANGELOG.md` files after
+ * a release, such that the changes that went out in said release are moved into their own section
+ * for auditing purposes.
+ *
+ * @see PostReleasePlugin
+ *
+ * @property changelogFile A [File] to use as the [Changelog]. Defaults to the `CHANGELOG.md` file
+ * at the project's root.
+ * @property releaseVersion A [ModuleVersion] of what to set the version to. Defaults to the
+ * project's current version.
+ */
+abstract class MoveUnreleasedChangesTask : DefaultTask() {
+  @get:[Optional InputFile]
+  abstract val changelogFile: Property<File>
+
+  @get:[Optional Input]
+  abstract val releaseVersion: Property<ModuleVersion>
+
+  init {
+    configure()
+  }
+
+  @TaskAction
+  fun build() {
+    val file = changelogFile.get()
+    val changelog = Changelog.fromFile(file)
+    val (unreleased, previousReleases) = changelog.releases.separateAt(1)
+
+    val newEntry = createEntryForRelease(unreleased.single())
+
+    val releases = listOf(ReleaseEntry.Empty, newEntry) + previousReleases
+
+    val newChangelog = Changelog(releases)
+
+    file.writeText(newChangelog.toString())
+  }
+
+  /**
+   * Creates an actual release entry for the current unreleased section.
+   *
+   * That is, it attaches the release version and creates the KTX content.
+   *
+   * @see createEntryForKTX
+   * @throws StopActionException if [unreleased] does not have any content
+   */
+  private fun createEntryForRelease(unreleased: ReleaseEntry): ReleaseEntry {
+    if (!unreleased.hasContent())
+      throw StopActionException("No changes to move for project: ${project.name}")
+
+    return unreleased.copy(version = releaseVersion.get(), ktx = createEntryForKTX(unreleased))
+  }
+
+  /**
+   * Creates the [ReleaseEntry.ktx] for a new release.
+   *
+   * Ensures the entry is only created if the library has a KTX lib to begin with, and adds template
+   * subtext if it lacks any changes.
+   *
+   * @see convertToMetadata
+   * @see KTXTransitiveReleaseText
+   */
+  private fun createEntryForKTX(release: ReleaseEntry): ReleaseContent? {
+    val metadata = convertToMetadata(project.name)
+
+    val nonEmptyKTXContent = release.ktx?.takeIf { it.hasContent() }
+
+    val ktxContent =
+      nonEmptyKTXContent ?: ReleaseContent(KTXTransitiveReleaseText(project.name), emptyList())
+
+    return ktxContent.takeIf { metadata.hasKTX }
+  }
+
+  private fun configure() {
+    changelogFile.convention(project.file("CHANGELOG.md"))
+    releaseVersion.convention(computeReleaseVersion())
+  }
+
+  private fun computeReleaseVersion(): ModuleVersion? {
+    val version: String? by project
+
+    return version?.let { ModuleVersion.fromStringOrNull(it) }
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt
new file mode 100644
index 00000000000..5c344621095
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import java.net.URL
+import javax.xml.parsers.DocumentBuilderFactory
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.TaskAction
+import org.w3c.dom.Element
+
+/**
+ * Ensures that pom dependencies are not accidently downgraded.
+ *
+ * Compares the latest pom at gmaven for the given artifact with the one generate for the current
+ * release.
+ *
+ * @property pomFile The pom file for the current release
+ * @property artifactId The artifactId for the pom parent
+ * @property groupId The groupId for the pom parent
+ * @throws GradleException if a dependency is found with a degraded version
+ */
+abstract class PomValidator : DefaultTask() {
+  @get:InputFile abstract val pomFile: RegularFileProperty
+  @get:Input abstract val artifactId: Property<String>
+  @get:Input abstract val groupId: Property<String>
+
+  @TaskAction
+  fun run() {
+    try {
+      var diff = diffWithPomFromURL(getLatestReleasePomUrl())
+
+      if (diff.isNotEmpty()) {
+        throw GradleException("Dependency version errors found:\n${diff}")
+      }
+    } catch (_: java.io.FileNotFoundException) {
+      // Gmaven artifact doesn't exist.
+      return
+    }
+  }
+
+  private fun getLatestReleasePomUrl() =
+    with(GmavenHelper(groupId.get(), artifactId.get())) {
+      getPomFileForVersion(getLatestReleasedVersion())
+    }
+
+  private fun getMapOfDependencies(doc: Element) =
+    doc
+      .findElementsByTag("dependency")
+      .associate { it.textByTag("artifactId") to it.textByTag("version") }
+      .filterKeys { it !in IGNORED_DEPENDENCIES }
+      .mapValues {
+        ModuleVersion.fromStringOrNull(it.value)
+          ?: throw RuntimeException("Invalid module version found for '${it.key}': ${it.value}")
+      }
+
+  data class DependencyDiff(
+    val artifactId: String,
+    val oldVersion: ModuleVersion,
+    val currentVersion: ModuleVersion
+  )
+
+  fun diffWithPomFromURL(url: String): String {
+    val documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
+
+    val oldPom = documentBuilder.parse(URL(url).openStream())
+    val currentPom = documentBuilder.parse(pomFile.get().asFile)
+
+    val oldDependencies = getMapOfDependencies(oldPom.documentElement)
+    val currentDependencies = getMapOfDependencies(currentPom.documentElement)
+
+    return currentDependencies
+      .map { DependencyDiff(it.key, oldDependencies.getOrDefault(it.key, it.value), it.value) }
+      .filter { it.oldVersion > it.currentVersion }
+      .map {
+        "Dependency on ${it.artifactId} has been degraded from ${it.oldVersion} to ${it.currentVersion}"
+      }
+      .joinToString("\n")
+  }
+
+  companion object {
+    val IGNORED_DEPENDENCIES =
+      listOf(
+        "javax.inject", // javax.inject doesn't respect SemVer and doesn't update
+        "dagger", // dagger doesn't respect Semver
+        "auto-service-annotations", // auto-service-annotations doesn't respect SemVer
+      )
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt
new file mode 100644
index 00000000000..a54d5b40b6b
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.register
+
+/**
+ * Facilitates the creation of Post Release Tasks.
+ *
+ * At the end of a release, we need to update the state of the master branch according to various
+ * "cleanup" tasks. These tasks are defined in this plugin, and attached to releasing SDKs.
+ *
+ * The primary parent task that this plugin creates is `postReleaseCleanup`- which runs all the
+ * clean up tasks in one go.
+ *
+ * *Note that this task should be ran on the release branch- or more appropriately the merge-back
+ * branch*
+ *
+ * @see registerVersionBumpTask
+ * @see registerMoveUnreleasedChangesTask
+ * @see registerUpdatePinnedDependenciesTask
+ */
+class PostReleasePlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    val versionBump = registerVersionBumpTask(project)
+    val moveUnreleasedChanges = registerMoveUnreleasedChangesTask(project)
+    val updatePinnedDependencies = registerUpdatePinnedDependenciesTask(project)
+
+    project.tasks.register("postReleaseCleanup") {
+      dependsOn(versionBump, moveUnreleasedChanges, updatePinnedDependencies)
+    }
+  }
+
+  /**
+   * Registers the `versionBump` task for the provided [Project].
+   *
+   * Each SDK has a `gradle.properties` file at its root. This file has a `version` variable, that
+   * is set to the current version of said module. After a release, this `version` should be bumped
+   * up to differentiate between code at HEAD, and the latest released version.
+   *
+   * Furthermore, this file may optionally contain a `latestReleasedVersion` variable (if the SDK
+   * has released). If this property is present, it should be updated to the related version that
+   * went out during the release.
+   *
+   * @see VersionBumpTask
+   *
+   * @param project the [Project] to register this task to
+   */
+  fun registerVersionBumpTask(project: Project) =
+    project.tasks.register<VersionBumpTask>("versionBump")
+
+  /**
+   * Registers the `moveUnreleasedChanges` task for the provided [Project].
+   *
+   * Each SDK has `CHANGELOG.md` file at its root. This file has an `Unreleased` section with
+   * changes that go out in the next release. After a release, this `Unreleased` section should be
+   * moved into a seperate section that specifies the version it went out with, and the `Unreleased`
+   * section should be wiped clear for new changes to come; for the next release.
+   *
+   * @see MoveUnreleasedChangesTask
+   *
+   * @param project the [Project] to register this task to
+   */
+  fun registerMoveUnreleasedChangesTask(project: Project) =
+    project.tasks.register<MoveUnreleasedChangesTask>("moveUnreleasedChanges") {
+      onlyIf("CHANGELOG.md file must be present") { project.file("CHANGELOG.md").exists() }
+    }
+
+  /**
+   * Registers the `updatePinnedDependencies` for the provided [Project]
+   *
+   * If a given SDK needs to use unreleased features from a dependent SDK they change their pinned
+   * dependency to a project level dependency, until the features are released. After a release, we
+   * need to convert these project level dependencies back to pinned dependencies- with the latest
+   * released version attached.
+   *
+   * @see UpdatePinnedDependenciesTask
+   *
+   * @param project the [Project] to register this task to
+   */
+  fun registerUpdatePinnedDependenciesTask(project: Project) =
+    project.tasks.register<UpdatePinnedDependenciesTask>("updatePinnedDependencies") {
+      buildFile.set(project.buildFile)
+      outputFile.set(project.buildFile)
+    }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt
index 179adc32e40..4080530f6a4 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt
@@ -1,25 +1,147 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
 
 import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.file.FileCollection
+import org.gradle.api.provider.Provider
+import org.gradle.kotlin.dsl.findByType
+import org.gradle.kotlin.dsl.getByType
 
+/** Checks if the project has any of the common Android specific plugins. */
 fun Project.isAndroid(): Boolean =
-        listOf("com.android.application", "com.android.library", "com.android.test")
-                .any { plugin: String -> project.plugins.hasPlugin(plugin) }
+  listOf("com.android.application", "com.android.library", "com.android.test").any {
+    project.plugins.hasPlugin(it)
+  }
 
 fun toBoolean(value: Any?): Boolean {
-    val trimmed = value?.toString()?.trim()?.toLowerCase()
-    return "true" == trimmed || "y" == trimmed || "1" == trimmed
+  val trimmed = value?.toString()?.trim()?.toLowerCase()
+  return "true" == trimmed || "y" == trimmed || "1" == trimmed
+}
+
+/**
+ * Finds or creates the javadocClasspath [Configuration].
+ *
+ * This config allows us to expose artifacts on the classpath during doc generation, but not
+ * elsewhere.
+ */
+val Project.javadocConfig: Configuration
+  get() =
+    configurations.findByName("javadocClasspath")
+      ?: configurations.create("javadocClasspath").also {
+        configurations.all {
+          if (name == "compileOnly") {
+            it.extendsFrom(this)
+          }
+        }
+      }
+
+/**
+ * Finds or creates the dackkaArtifacts [Configuration].
+ *
+ * Used to fetch the dackka-fat jar at runtime versus needing to explicitly specify it in project
+ * dependencies.
+ */
+val Project.dackkaConfig: Configuration
+  get() =
+    configurations.findByName("dackkaArtifacts")
+      ?: configurations.create("dackkaArtifacts") {
+        dependencies.add(
+          this@dackkaConfig.dependencies.create("com.google.devsite:dackka-fat:1.2.0")
+        )
+      }
+
+/**
+ * The [FirebaseLibraryExtension] for this [Project].
+ *
+ * Syntax sugar for:
+ * ```kotlin
+ * extensions.getByType<FirebaseLibraryExtension>()
+ * ```
+ */
+val Project.firebaseLibrary: FirebaseLibraryExtension
+  get() = extensions.getByType<FirebaseLibraryExtension>()
+
+/**
+ * The [FirebaseLibraryExtension] for this [Project], or null if not found.
+ *
+ * Syntax sugar for:
+ * ```kotlin
+ * extensions.findByType<FirebaseLibraryExtension>()
+ * ```
+ */
+val Project.firebaseLibraryOrNull: FirebaseLibraryExtension?
+  get() = extensions.findByType<FirebaseLibraryExtension>()
+
+/**
+ * Hacky-check to see if the module is a ktx variant.
+ *
+ * This does NOT include Kotlin only SDKs. A KTX library refers to the interop modules suffixed with
+ * "ktx". Ironically, this is all this method does. It checks if the module's artifactId ends with
+ * "ktx"
+ */
+val Project.isKTXLibary: Boolean
+  get() = firebaseLibrary.artifactId.get().endsWith("-ktx")
+
+/**
+ * Provides a project property as the specified type, or null otherwise.
+ *
+ * Utilizing a safe cast, an attempt is made to cast the project property (if found) to the receiver
+ * type. Should this cast fail, the resulting value will be null.
+ *
+ * Keep in mind that is provided lazily via a [Provider], so evalutation does not occur until the
+ * value is needed.
+ *
+ * @param property the name of the property to look for
+ */
+inline fun <reified T> Project.provideProperty(property: String) = provider {
+  val maybeProperty = findProperty(property)
+
+  // using when instead of an if statement so we can expand as needed
+  when (T::class) {
+    Boolean::class -> maybeProperty?.toString()?.toBoolean() as? T
+    else -> maybeProperty as? T
+  }
+}
+
+/** Fetches the jars of dependencies associated with this configuration through an artifact view. */
+val Configuration.jars: FileCollection
+  get() =
+    incoming
+      .artifactView { attributes { attribute("artifactType", "android-classes") } }
+      .artifacts
+      .artifactFiles
+
+/** Utility method to call [Task.mustRunAfter] and [Task.dependsOn] on the specified task */
+fun <T : Task, R : Task> T.dependsOnAndMustRunAfter(otherTask: R) {
+  mustRunAfter(otherTask)
+  dependsOn(otherTask)
+}
+
+/** Utility method to call [Task.mustRunAfter] and [Task.dependsOn] on the specified task */
+fun <T : Task, R : Task> T.dependsOnAndMustRunAfter(otherTask: Provider<R>) {
+  mustRunAfter(otherTask)
+  dependsOn(otherTask)
+}
+
+/** Utility method to call [Task.mustRunAfter] and [Task.dependsOn] on the specified task name */
+fun <T : Task> T.dependsOnAndMustRunAfter(otherTask: String) {
+  mustRunAfter(otherTask)
+  dependsOn(otherTask)
 }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt
new file mode 100644
index 00000000000..4b6c50d7355
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt
@@ -0,0 +1,609 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import com.google.firebase.gradle.bomgenerator.BomGeneratorTask
+import com.google.firebase.gradle.plugins.PublishingPlugin.Companion.BUILD_BOM_ZIP_TASK
+import com.google.firebase.gradle.plugins.PublishingPlugin.Companion.BUILD_KOTLINDOC_ZIP_TASK
+import com.google.firebase.gradle.plugins.PublishingPlugin.Companion.BUILD_MAVEN_ZIP_TASK
+import com.google.firebase.gradle.plugins.PublishingPlugin.Companion.BUILD_RELEASE_NOTES_ZIP_TASK
+import com.google.firebase.gradle.plugins.PublishingPlugin.Companion.FIREBASE_PUBLISH_TASK
+import com.google.firebase.gradle.plugins.PublishingPlugin.Companion.GENERATE_BOM_TASK
+import com.google.firebase.gradle.plugins.PublishingPlugin.Companion.GENERATE_KOTLINDOC_FOR_RELEASE_TASK
+import com.google.firebase.gradle.plugins.PublishingPlugin.Companion.PUBLISH_RELEASING_LIBS_TO_BUILD_TASK
+import com.google.firebase.gradle.plugins.semver.ApiDiffer
+import org.gradle.api.GradleException
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
+import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.TaskProvider
+import org.gradle.api.tasks.bundling.Zip
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.named
+import org.gradle.kotlin.dsl.register
+
+/**
+ * Plugin for providing tasks to release [FirebaseLibrary][FirebaseLibraryPlugin] projects.
+ *
+ * Projects to release are computed via [computeReleasingLibraries]. A multitude of tasks are then
+ * registered at the root project.
+ *
+ * The following pertain specifically to a release:
+ * - [CHECK_HEAD_DEPS_TASK][registerCheckHeadDependenciesTask]
+ * - [VALIDATE_POM_TASK][registerValidatePomForReleaseTask]
+ * - [VALIDATE_PROJECTS_TO_PUBLISH_TASK][registerValidateProjectsToPublishTask]
+ * - [BUILD_MAVEN_ZIP_TASK] -> Creates a zip file of the contents of
+ * [PUBLISH_RELEASING_LIBS_TO_BUILD_TASK] [registerPublishReleasingLibrariesToBuildDirTask]
+ * - [BUILD_KOTLINDOC_ZIP_TASK] -> Creates a zip file of the contents of
+ * [GENERATE_KOTLINDOC_FOR_RELEASE_TASK] [registerGenerateKotlindocForReleaseTask]
+ * - [BUILD_RELEASE_NOTES_ZIP_TASK] -> Creates a zip file of the contents of
+ * [PREPARE_RELEASE_NOTES_FOR_DROP][registerPrepareReleaseNotesForDropTask]
+ * - [FIREBASE_PUBLISH_TASK] -> Runs all the tasks above
+ *
+ * The following are additional tasks provided- that are either for convenience sake, or are used
+ * outside of the standard [FIREBASE_PUBLISH_TASK] workflow (possibly at a later time in the release
+ * cycle):
+ * - [BUILD_BOM_ZIP_TASK] -> Creates a zip file of the contents of [GENERATE_BOM_TASK]
+ * [registerGenerateBomTask]
+ * - [RELEASE_GENEATOR_TASK][registerGenerateReleaseConfigFilesTask]
+ * - [RELEASE_REPORT_GENERATOR_TASK][registerGenerateReleaseReportFilesTask]
+ * - [PUBLISH_RELEASING_LIBS_TO_LOCAL_TASK][registerPublishReleasingLibrariesToMavenLocalTask]
+ * - [SEMVER_CHECK_TASK][registerSemverCheckForReleaseTask]
+ * - [PUBLISH_ALL_TO_BUILD_TASK][registerPublishAllToBuildDir]
+ * - [LIBRARY_GROUPS_TASK][registerLibraryGroupsTask]
+ *
+ * Additionally, this plugin registers the [PostReleasePlugin] via [registerPostReleasePlugin] for
+ * each releasing library.
+ */
+abstract class PublishingPlugin : Plugin<Project> {
+
+  override fun apply(project: Project) {
+    project.gradle.projectsEvaluated {
+      val allFirebaseLibraries = project.subprojects.mapNotNull { it.firebaseLibraryOrNull }
+      val libraryGroups = computeLibraryGroups(project)
+      fixLibraryGroupVersions(libraryGroups)
+      val releaseMetadata = computeReleaseMetadata(project, allFirebaseLibraries, libraryGroups)
+
+      val releasingFirebaseLibraries = releaseMetadata?.releasingLibraries.orEmpty()
+      val releasingProjects = releasingFirebaseLibraries.map { it.project }
+
+      val generateBom = registerGenerateBomTask(project)
+      val validatePomForRelease = registerValidatePomForReleaseTask(project, releasingProjects)
+      val checkHeadDependencies =
+        registerCheckHeadDependenciesTask(project, releasingFirebaseLibraries)
+      val validateProjectsToPublish =
+        registerValidateProjectsToPublishTask(project, releasingFirebaseLibraries)
+      val validateLibraryGroupsToPublish =
+        registerValidateLibraryGroupsToPublishTask(
+          project,
+          releasingFirebaseLibraries,
+          libraryGroups,
+        )
+      val publishReleasingLibrariesToBuildDir =
+        registerPublishReleasingLibrariesToBuildDirTask(project, releasingProjects)
+      val generateKotlindocsForRelease =
+        registerGenerateKotlindocForReleaseTask(project, releasingFirebaseLibraries)
+      val prepareReleaseNotesForDrop =
+        registerPrepareReleaseNotesForDropTask(
+          project,
+          releasingProjects,
+          releaseMetadata?.name.orEmpty(),
+        )
+      val releaseReportTask = registerGenerateReleaseReportFilesTask(project)
+
+      registerGenerateReleaseConfigFilesTask(project, libraryGroups, releaseReportTask)
+      registerPublishReleasingLibrariesToMavenLocalTask(project, releasingProjects)
+      registerSemverCheckForReleaseTask(project, releasingProjects)
+      registerPublishAllToBuildDir(project, allFirebaseLibraries)
+      registerPostReleasePlugin(releasingProjects)
+      registerLibraryGroupsTask(project, libraryGroups)
+
+      val buildMavenZip =
+        project.tasks.register<Zip>(BUILD_MAVEN_ZIP_TASK) {
+          from(publishReleasingLibrariesToBuildDir)
+          archiveFileName.set("m2repository.zip")
+          destinationDirectory.set(project.layout.buildDirectory)
+        }
+
+      val buildKotlindocZip =
+        project.tasks.register<Zip>(BUILD_KOTLINDOC_ZIP_TASK) {
+          from(generateKotlindocsForRelease)
+          archiveFileName.set("kotlindoc.zip")
+          destinationDirectory.set(project.layout.buildDirectory)
+        }
+
+      val buildReleaseNotesZip =
+        project.tasks.register<Zip>(BUILD_RELEASE_NOTES_ZIP_TASK) {
+          from(prepareReleaseNotesForDrop.map { it.destinationDir })
+          archiveFileName.set("release-notes.zip")
+          destinationDirectory.set(project.layout.buildDirectory)
+        }
+
+      project.tasks.register<Zip>(BUILD_BOM_ZIP_TASK) {
+        from(generateBom)
+        archiveFileName.set("bom.zip")
+        destinationDirectory.set(project.layout.projectDirectory)
+      }
+
+      project.tasks.register(FIREBASE_PUBLISH_TASK) {
+        dependsOn(
+          validateProjectsToPublish,
+          validateLibraryGroupsToPublish,
+          checkHeadDependencies,
+          // validatePomForRelease, TODO(b/279466888) - Make GmavenHelper testable
+          buildMavenZip,
+          buildKotlindocZip,
+          buildReleaseNotesZip,
+        )
+
+        doLast {
+          logger.lifecycle(
+            "Publishing the following libraries:\n{}",
+            releasingProjects.map { it.path }.joinToString("\n"),
+          )
+        }
+      }
+    }
+  }
+
+  private fun registerLibraryGroupsTask(
+    project: Project,
+    libraryGroups: Map<String, List<FirebaseLibraryExtension>>,
+  ) {
+    project.tasks.register(LIBRARY_GROUPS_TASK) {
+      for (libraryGroup in libraryGroups) {
+        println(
+          "${libraryGroup.key} -> ${libraryGroup.value.joinToString(" | ") { it.artifactName }}"
+        )
+      }
+    }
+  }
+
+  /**
+   * Figures out the [ReleaseMetadata] for with this release.
+   *
+   * Metadata can be provided either via the project properties or a [ReleaseConfig] file.
+   *
+   * The expected project properties can be defined as such:
+   * - `projectsToPublish` -> A comma seperated list of the publishing project(s) `artifactId`.
+   * - `releaseName` -> The name of the release (such as `m123`)
+   *
+   * When using project properties, this method will take into account [librariesToRelease]
+   * [FirebaseLibraryExtension.getLibrariesToRelease] -> so there's no need to specify multiple of
+   * the same co-releasing libs.
+   *
+   * The [ReleaseConfig] is a pre-defined set of data for a release. It expects a valid [file]
+   * [ReleaseConfig.fromFile], which provides a list of libraries via their [path]
+   * [FirebaseLibraryExtension.getPath]. Additionally, it does __NOT__ take into account
+   * co-releasing libraries-> meaning libraries that should be releasing alongside one another will
+   * need to be individually specified in the [ReleaseConfig], otherwise it will likely cause an
+   * error during the release process.
+   *
+   * **Project properties take priority over a [ReleaseConfig].**
+   *
+   * Example usage of project properties:
+   * ```
+   * ./gradlew firebasePublish -PprojectsToPublish="firebase-firestore,firebase-common" -PreleaseName="m131"
+   * ```
+   *
+   * See [ReleaseConfig.toFile] for example usage of [ReleaseConfig].
+   *
+   * If either project property is not provided, and a [ReleaseConfig] is either not found or is
+   * empty- this method will return null.
+   */
+  private fun computeReleaseMetadata(
+    project: Project,
+    allFirebaseLibraries: List<FirebaseLibraryExtension>,
+    libraryGroups: Map<String, List<FirebaseLibraryExtension>>,
+  ): ReleaseMetadata? =
+    releaseMetadataFromProperties(project, allFirebaseLibraries, libraryGroups)
+      ?: releaseMetadataFromReleaseConfig(project, allFirebaseLibraries, libraryGroups)
+
+  private fun releaseMetadataFromProperties(
+    project: Project,
+    allFirebaseLibraries: List<FirebaseLibraryExtension>,
+    libraryGroups: Map<String, List<FirebaseLibraryExtension>>,
+  ): ReleaseMetadata? {
+    val projectsToPublish = project.provideProperty<String>("projectsToPublish").orNull
+    val releaseName = project.provideProperty<String>("releaseName").orNull ?: "NO_NAME"
+
+    if (projectsToPublish == null) return null
+
+    val publishingProjects =
+      allFirebaseLibraries.filter { it.artifactId.get() in projectsToPublish.split(",") }
+
+    val librariesToRelease = getDeepTransitiveReleases(publishingProjects, libraryGroups)
+
+    return ReleaseMetadata(librariesToRelease, releaseName)
+  }
+
+  /**
+   * Finds all transitive libraries that need to be released so that the input list of project names
+   * can be released. This includes all project level dependencies, and anything in the same library
+   * group.
+   */
+  private tailrec fun getDeepTransitiveReleases(
+    inputProjects: List<FirebaseLibraryExtension>,
+    libraryGroups: Map<String, List<FirebaseLibraryExtension>>,
+  ): List<FirebaseLibraryExtension> {
+    val libraryGroupsToRelease =
+      inputProjects
+        .flatMap { it.resolveProjectLevelDependencies() + it }
+        .map { it.libraryGroupName }
+    val projectsToRelease =
+      libraryGroups
+        .filterKeys { it in libraryGroupsToRelease }
+        .flatMap { it.value }
+        .distinctBy { it.artifactId.get() }
+    return if (inputProjects == projectsToRelease) inputProjects
+    else getDeepTransitiveReleases(projectsToRelease, libraryGroups)
+  }
+
+  private fun releaseMetadataFromReleaseConfig(
+    project: Project,
+    allFirebaseLibraries: List<FirebaseLibraryExtension>,
+    libraryGroups: Map<String, List<FirebaseLibraryExtension>>,
+  ): ReleaseMetadata? {
+    val releaseConfigFile =
+      project.layout.projectDirectory.file(RELEASE_CONFIG_FILE).asFile.takeIf { it.exists() }
+
+    return releaseConfigFile?.let {
+      val releaseConfig = ReleaseConfig.fromFile(it)
+      val librariesToRelease = allFirebaseLibraries.filter { it.path in releaseConfig.libraries }
+
+      val missingLibrariesToRelease =
+        computeMissingLibrariesToRelease(librariesToRelease, libraryGroups)
+      if (missingLibrariesToRelease.isNotEmpty()) {
+        throw GradleException(
+          "Invalid release configuration. " +
+            "It's should include the following libraries due to library groups: \n" +
+            "${missingLibrariesToRelease.joinToString("\n"){ it.artifactName }}"
+        )
+      }
+
+      ReleaseMetadata(librariesToRelease, releaseConfig.name)
+    }
+  }
+
+  /**
+   * Registers the [GENERATE_BOM_TASK] task.
+   *
+   * Generates a BOM for a release, although it relies on gmaven to be updated- so it should be
+   * invoked manually later on in the release process.
+   *
+   * @see BomGeneratorTask
+   */
+  private fun registerGenerateBomTask(project: Project) =
+    project.tasks.register<BomGeneratorTask>(GENERATE_BOM_TASK) {
+      bomDirectory.convention(project.layout.projectDirectory.dir(BOM_DIR_NAME))
+    }
+
+  /**
+   * Registers the [VALIDATE_POM_TASK] task.
+   *
+   * A collection of [PomValidator] for each releasing project.
+   *
+   * Ensures that pom dependencies are not accidently downgraded.
+   */
+  private fun registerValidatePomForReleaseTask(
+    project: Project,
+    releasingProjects: List<Project>,
+  ) =
+    project.tasks.register(VALIDATE_POM_TASK) {
+      for (releasingProject in releasingProjects) {
+        val pomValidatorTask = releasingProject.tasks.named("isPomDependencyValid")
+
+        dependsOn(pomValidatorTask)
+      }
+    }
+
+  /**
+   * Registers the [CHECK_HEAD_DEPS_TASK] task.
+   *
+   * Ensures that project level dependencies are included in the release.
+   *
+   * @see [CheckHeadDependencies]
+   */
+  private fun registerCheckHeadDependenciesTask(
+    project: Project,
+    releasingLibraries: List<FirebaseLibraryExtension>,
+  ) =
+    project.tasks.register<CheckHeadDependencies>(CHECK_HEAD_DEPS_TASK) {
+      projectsToPublish.set(releasingLibraries)
+    }
+
+  /**
+   * Registers the [VALIDATE_PROJECTS_TO_PUBLISH_TASK] task.
+   *
+   * Ensures that there are releasing projects provided, to avoid potential false positive
+   * edge-cases.
+   *
+   * @throws GradleException if no releasing projects are found.
+   */
+  // TODO(b/280320915): Remove doLast when Gradle + IDEA fix task configuration avoidance bug
+  private fun registerValidateProjectsToPublishTask(
+    project: Project,
+    releasinglibraries: List<FirebaseLibraryExtension>,
+  ) =
+    project.tasks.register(VALIDATE_PROJECTS_TO_PUBLISH_TASK) {
+      doLast {
+        if (releasinglibraries.isEmpty()) {
+          throw GradleException(
+            "No projects to release. " +
+              "Ensure you've specified the projectsToPublish parameter, " +
+              "or have a valid $RELEASE_CONFIG_FILE file at the root directory."
+          )
+        }
+      }
+    }
+
+  /**
+   * Registers the [VALIDATE_LIBRARY_GROUPS_TO_PUBLISH_TASK] task.
+   *
+   * Validates that all library groups of all publishing projects are included in the release config
+   *
+   * @throws GradleException if a library is releasing without it's library group.
+   */
+  private fun registerValidateLibraryGroupsToPublishTask(
+    project: Project,
+    librariesToRelease: List<FirebaseLibraryExtension>,
+    libraryGroups: Map<String, List<FirebaseLibraryExtension>>,
+  ) =
+    project.tasks.register(VALIDATE_LIBRARY_GROUPS_TO_PUBLISH_TASK) {
+      doLast {
+        val missingLibrariesToRelease =
+          computeMissingLibrariesToRelease(librariesToRelease, libraryGroups)
+        if (missingLibrariesToRelease.isNotEmpty()) {
+          throw GradleException(
+            "Invalid release configuration. " +
+              "It's should include the following libraries due to library groups: \n" +
+              "${missingLibrariesToRelease.joinToString("\n")}"
+          )
+        }
+      }
+    }
+
+  /**
+   * Registers the [PUBLISH_RELEASING_LIBS_TO_BUILD_TASK] task.
+   *
+   * A collection of [publishMavenAarPublicationToBuildDirRepository][PublishToMavenRepository] for
+   * each releasing project.
+   *
+   * The artifacts are provided in a repository under the [buildDir][Project.getBuildDir] of the
+   * provided [project].
+   *
+   * This task outputs the final repository directory.
+   */
+  private fun registerPublishReleasingLibrariesToBuildDirTask(
+    project: Project,
+    releasingProjects: List<Project>,
+  ) =
+    project.tasks.register(PUBLISH_RELEASING_LIBS_TO_BUILD_TASK) {
+      for (releasingProject in releasingProjects) {
+        val publishTask =
+          releasingProject.tasks.named<PublishToMavenRepository>(
+            "publishMavenAarPublicationToBuildDirRepository"
+          )
+
+        dependsOn(publishTask)
+        outputs.file(publishTask.map { it.repository.url })
+      }
+    }
+
+  /**
+   * Registers the [GENERATE_KOTLINDOC_FOR_RELEASE_TASK] task.
+   *
+   * A collection of [kotlindoc][DackkaPlugin] for each releasing library.
+   *
+   * Outputs a directory containing all the documentation generated for releasing projects.
+   */
+  private fun registerGenerateKotlindocForReleaseTask(
+    project: Project,
+    releasingLibraries: List<FirebaseLibraryExtension>,
+  ) =
+    project.tasks.register(GENERATE_KOTLINDOC_FOR_RELEASE_TASK) {
+      for (releasingLibrary in releasingLibraries) {
+        val kotlindocTask = releasingLibrary.project.tasks.named("kotlindoc")
+
+        dependsOn(kotlindocTask)
+
+        outputs.dirs(kotlindocTask).optional()
+      }
+    }
+
+  /**
+   * Registers the [PREPARE_RELEASE_NOTES_FOR_DROP] task.
+   *
+   * A collection of [makeReleaseNotes][MakeReleaseNotesTask] for each releasing project, that are
+   * arranged in a common directly such that they can be properly dropped in G3.
+   *
+   * The artifacts are provided in a folder under the [buildDir][Project.getBuildDir] of the
+   * provided [project].
+   */
+  private fun registerPrepareReleaseNotesForDropTask(
+    project: Project,
+    releasingProjects: List<Project>,
+    releaseName: String,
+  ) =
+    project.tasks.register<Copy>(PREPARE_RELEASE_NOTES_FOR_DROP) {
+      for (releasingProject in releasingProjects) {
+        with(releasingProject) {
+          val directory = if (name == "firebase-storage") "$name-api" else name
+          val releaseNotesTask = tasks.named("makeReleaseNotes")
+
+          from(releaseNotesTask) { into("android/client/$directory/_releases") }
+          rename { "$releaseName.md" }
+        }
+      }
+
+      destinationDir = project.fileFromBuildDir("release-notes")
+    }
+
+  /**
+   * Registers the [RELEASE_GENEATOR_TASK] task.
+   *
+   * Creates a config file that keeps track of what libraries are releasing. To learn more about the
+   * file's format see [ReleaseConfig].
+   *
+   * @see [ReleaseGenerator]
+   */
+  private fun registerGenerateReleaseConfigFilesTask(
+    project: Project,
+    libraryGroups: Map<String, List<FirebaseLibraryExtension>>,
+    releaseReportTask: TaskProvider<ReleaseReportGenerator>,
+  ) =
+    project.tasks.register<ReleaseGenerator>(RELEASE_GENEATOR_TASK) {
+      currentRelease.convention(project.provideProperty("currentRelease"))
+      pastRelease.convention(project.provideProperty("pastRelease"))
+      printReleaseConfig.convention(project.provideProperty("printOutput"))
+      commitsToIgnoreFile.convention(project.layout.projectDirectory.file("ignoreCommits.txt"))
+
+      releaseConfigFile.convention(project.layout.projectDirectory.file(RELEASE_CONFIG_FILE))
+      releaseReportJsonFile.convention(
+        project.layout.projectDirectory.file(RELEASE_REPORT_JSON_FILE)
+      )
+      this.libraryGroups = libraryGroups
+      finalizedBy(releaseReportTask)
+    }
+
+  /**
+   * Registers the [RELEASE_REPORT_GENERATOR_TASK] task.
+   *
+   * Creates a markdown file that keeps track of what libraries are releasing. To learn more about
+   * the file's format see [ReleaseConfig].
+   *
+   * @see [ReleaseReportGenerator]
+   */
+  private fun registerGenerateReleaseReportFilesTask(project: Project) =
+    project.tasks.register<ReleaseReportGenerator>(RELEASE_REPORT_GENERATOR_TASK) {
+      releaseReportMdFile.convention(project.layout.projectDirectory.file(RELEASE_REPORT_MD_FILE))
+      releaseReportJsonFile.convention(
+        project.layout.projectDirectory.file(RELEASE_REPORT_JSON_FILE)
+      )
+    }
+
+  /**
+   * Registers the [PUBLISH_RELEASING_LIBS_TO_LOCAL_TASK] task.
+   *
+   * A collection of [publishMavenAarPublicationToMavenLocal][PublishToMavenRepository] for each
+   * releasing project.
+   *
+   * Allows users to do local testing of releasing libraries, pulling the artifacts via the maven
+   * local repository.
+   */
+  private fun registerPublishReleasingLibrariesToMavenLocalTask(
+    project: Project,
+    releasingProjects: List<Project>,
+  ) =
+    project.tasks.register(PUBLISH_RELEASING_LIBS_TO_LOCAL_TASK) {
+      for (releasingProject in releasingProjects) {
+        val publishTask = releasingProject.tasks.named("publishMavenAarPublicationToMavenLocal")
+
+        dependsOn(publishTask)
+      }
+    }
+
+  /**
+   * Registers the [SEMVER_CHECK_TASK] task.
+   *
+   * A collection of [ApiDiffer] for each releasing project.
+   *
+   * Ensures that the version of a releasing project aligns with the API. That is, if the API shows
+   * signs of a major or minor bump- the version is bumped as expected.
+   */
+  private fun registerSemverCheckForReleaseTask(
+    project: Project,
+    releasingProjects: List<Project>,
+  ) =
+    project.tasks.register(SEMVER_CHECK_TASK) {
+      for (releasingProject in releasingProjects) {
+        val semverCheckTask = releasingProject.tasks.named("semverCheck")
+        dependsOn(semverCheckTask)
+      }
+    }
+
+  /**
+   * Registers the [PUBLISH_ALL_TO_BUILD_TASK] task.
+   *
+   * A collection of [publishMavenAarPublicationToBuildDirRepository][PublishToMavenRepository] for
+   * __ALL__ firebase library projects.
+   *
+   * The artifacts are provided in a repository under the [buildDir][Project.getBuildDir] of the
+   * provided [project].
+   */
+  private fun registerPublishAllToBuildDir(
+    project: Project,
+    allFirebaseLibraries: List<FirebaseLibraryExtension>,
+  ) =
+    project.tasks.register(PUBLISH_ALL_TO_BUILD_TASK) {
+      for (firebaseLibrary in allFirebaseLibraries) {
+        val publishTask =
+          firebaseLibrary.project.tasks.named("publishMavenAarPublicationToBuildDirRepository")
+
+        dependsOn(publishTask)
+      }
+    }
+
+  /** Registers the [PostReleasePlugin] to each releaing project. */
+  private fun registerPostReleasePlugin(releasingProjects: List<Project>) {
+    for (releasingProject in releasingProjects) {
+      releasingProject.apply<PostReleasePlugin>()
+    }
+  }
+
+  companion object {
+    const val RELEASE_CONFIG_FILE = "release.json"
+    const val RELEASE_REPORT_MD_FILE = "release_report.md"
+    const val RELEASE_REPORT_JSON_FILE = "release_report.json"
+    const val BOM_DIR_NAME = "bom"
+
+    const val GENERATE_BOM_TASK = "generateBom"
+    const val VALIDATE_PROJECTS_TO_PUBLISH_TASK = "validateProjectsToPublish"
+    const val VALIDATE_LIBRARY_GROUPS_TO_PUBLISH_TASK = "validateLibraryGroupsToPublish"
+    const val SEMVER_CHECK_TASK = "semverCheckForRelease"
+    const val RELEASE_GENEATOR_TASK = "generateReleaseConfig"
+    const val RELEASE_REPORT_GENERATOR_TASK = "generateReleaseReport"
+    const val VALIDATE_POM_TASK = "validatePomForRelease"
+    const val LIBRARY_GROUPS_TASK = "libraryGroups"
+    const val PUBLISH_RELEASING_LIBS_TO_BUILD_TASK = "publishReleasingLibrariesToBuildDir"
+    const val PUBLISH_RELEASING_LIBS_TO_LOCAL_TASK = "publishReleasingLibrariesToMavenLocal"
+    const val GENERATE_KOTLINDOC_FOR_RELEASE_TASK = "generateKotlindocForRelease"
+    const val PREPARE_RELEASE_NOTES_FOR_DROP = "prepareReleaseNotesForDrop"
+    const val CHECK_HEAD_DEPS_TASK = "checkHeadDependencies"
+    const val BUILD_MAVEN_ZIP_TASK = "buildMavenZip"
+    const val BUILD_KOTLINDOC_ZIP_TASK = "buildKotlindocZip"
+    const val BUILD_RELEASE_NOTES_ZIP_TASK = "buildReleaseNotesZip"
+    const val BUILD_BOM_ZIP_TASK = "buildBomZip"
+    const val FIREBASE_PUBLISH_TASK = "firebasePublish"
+    const val PUBLISH_ALL_TO_BUILD_TASK = "publishAllToBuildDir"
+
+    const val BUILD_DIR_REPOSITORY_DIR = "m2repository"
+  }
+}
+
+/**
+ * Data needed to understand a Release.
+ *
+ * @property releasingLibraries A list of libraries that should be released
+ * @property name The name of the release (such as `m123`)
+ * @see computeReleaseMetadata
+ */
+data class ReleaseMetadata(
+  val releasingLibraries: List<FirebaseLibraryExtension>,
+  val name: String,
+)
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseConfig.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseConfig.kt
new file mode 100644
index 00000000000..844599b6c2e
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseConfig.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import java.io.File
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+
+/**
+ * Container for providing data about a release.
+ *
+ * Allows a type safe representation of data generated for an official release.
+ *
+ * @see ReleaseGenerator
+ * @see fromFile
+ * @see toFile
+ *
+ * @property name the name of a release, such as `m130`
+ * @property libraries a list of project paths intending to release
+ */
+@Serializable
+data class ReleaseConfig(val name: String, val libraries: List<String>) {
+
+  /**
+   * Writes a [ReleaseConfig] into a [File] as JSON.
+   *
+   * An example of the output can be seen below:
+   * ```
+   * {
+   *   "name": "m130",
+   *   "libraries": [
+   *     ":firebase-appdistribution",
+   *     ":firebase-config",
+   *   ]
+   * }
+   * ```
+   *
+   * @see fromFile
+   */
+  fun toFile(file: File) = file.also { it.writeText(formatter.encodeToString(this)) }
+
+  companion object {
+    val formatter = Json { prettyPrint = true }
+
+    /**
+     * Parses a [ReleaseConfig] from the contents of a given [File].
+     *
+     * Allows one to reuse an already generated [ReleaseConfig] that was saved to disc.
+     *
+     * @param file the [File] to parse
+     * @see toFile
+     */
+    fun fromFile(file: File): ReleaseConfig = formatter.decodeFromString(file.readText())
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseGenerator.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseGenerator.kt
new file mode 100644
index 00000000000..0be620e52f7
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseGenerator.kt
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import java.io.File
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.api.ListBranchCommand
+import org.eclipse.jgit.api.errors.GitAPIException
+import org.eclipse.jgit.lib.Constants
+import org.eclipse.jgit.lib.ObjectId
+import org.eclipse.jgit.revwalk.RevCommit
+import org.gradle.api.DefaultTask
+import org.gradle.api.Project
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+/**
+ * Contains output data from the Release Generator, published as release_report.json
+ *
+ * @property changesByLibraryName contains libs which have opted into the release, and their changes
+ * @property changedLibrariesWithNoChangelog contains libs not opted into the release, despite
+ * having changes
+ */
+@Serializable
+data class ReleaseReport(
+  val changesByLibraryName: Map<String, List<CommitDiff>>,
+  val changedLibrariesWithNoChangelog: Set<String>,
+) {
+  companion object {
+    val formatter = Json { prettyPrint = true }
+
+    fun fromFile(file: File) = formatter.decodeFromString<ReleaseReport>(file.readText())
+  }
+
+  fun toFile(file: File) = file.also { it.writeText(formatter.encodeToString(this)) }
+
+  override fun toString() =
+    """
+      |# Release Report
+      |${changesByLibraryName.entries.joinToString("\n") {
+      """
+      |## ${it.key}
+      
+      |${it.value.joinToString("\n") { it.toString() }}
+      """.trimMargin()
+      }
+    }
+      |
+      |## SDKs with changes, but no changelogs
+      |${changedLibrariesWithNoChangelog.joinToString("  \n")}
+    """
+      .trimMargin()
+}
+
+@Serializable
+data class CommitDiff(
+  val commitId: String,
+  val prId: String,
+  val author: String,
+  val message: String,
+  val commitLink: String,
+  val prLink: String,
+) {
+  companion object {
+    // This is a meant to capture the PR number from PR Titles
+    // ex: "Fix a problem (#1234)" -> "1234"
+    private val PR_ID_EXTRACTOR = Regex(".*\\(#(\\d+)\\).*")
+
+    public fun fromRevCommit(commit: RevCommit): CommitDiff {
+      val commitId = commit.id.name
+      val prId =
+        PR_ID_EXTRACTOR.find(commit.fullMessage.split("\n").first())?.groupValues?.get(1) ?: ""
+      return CommitDiff(
+        commitId,
+        prId,
+        commit.authorIdent.name,
+        commit.fullMessage,
+        "https://github.com/firebase/firebase-android-sdk/commit/$commitId",
+        "https://github.com/firebase/firebase-android-sdk/pull/$prId",
+      )
+    }
+  }
+
+  override fun toString(): String =
+    """
+      |* ${message.split("\n").first()}   
+      |  [pr]($prLink) [commit]($commitLink)  [$author]
+
+    """
+      .trimMargin()
+}
+
+abstract class ReleaseGenerator : DefaultTask() {
+  companion object {
+    private val RELEASE_CHANGE_FILTER = "NO_RELEASE_CHANGE"
+  }
+
+  @get:Input abstract val currentRelease: Property<String>
+
+  @get:Input abstract val pastRelease: Property<String>
+
+  @get:Optional @get:Input abstract val printReleaseConfig: Property<String>
+
+  @get:Optional @get:InputFiles abstract val commitsToIgnoreFile: RegularFileProperty
+
+  @get:Internal
+  val commitsToIgnore: List<ObjectId>
+    get() =
+      commitsToIgnoreFile.asFileIfExistsOrNull()?.readLines()?.map { ObjectId.fromString(it) }
+        ?: emptyList()
+
+  @get:OutputFile abstract val releaseConfigFile: RegularFileProperty
+
+  @get:OutputFile abstract val releaseReportJsonFile: RegularFileProperty
+
+  @get:Internal lateinit var libraryGroups: Map<String, List<FirebaseLibraryExtension>>
+
+  @TaskAction
+  @Throws(Exception::class)
+  fun generateReleaseConfig() {
+    val rootDir = project.rootDir
+    val availableModules = project.subprojects.filter { it.plugins.hasPlugin("firebase-library") }
+
+    val repo = Git.open(rootDir)
+    val headRef = repo.repository.resolve(Constants.HEAD)
+    val branchRef = getObjectRefForBranchName(repo, pastRelease.get())
+
+    val libsToRelease = getChangedChangelogs(repo, branchRef, headRef, availableModules)
+    val changedLibsWithNoChangelog =
+      getChangedLibraries(repo, branchRef, headRef, availableModules) subtract
+        libsToRelease.map { it.path }.toSet()
+
+    val changes = getChangesForLibraries(repo, branchRef, headRef, libsToRelease)
+
+    val releaseConfig = ReleaseConfig(currentRelease.get(), libsToRelease.map { it.path })
+    releaseConfig.toFile(releaseConfigFile.get().asFile)
+
+    val releaseReport = ReleaseReport(changes, changedLibsWithNoChangelog)
+    if (printReleaseConfig.orNull.toBoolean()) {
+      project.logger.info(releaseReport.toString())
+    }
+    releaseReportJsonFile.get().asFile.let { releaseReport.toFile(it) }
+  }
+
+  private fun getChangesForLibraries(
+    repo: Git,
+    branchRef: ObjectId,
+    headRef: ObjectId,
+    changedLibraries: Set<Project>,
+  ) =
+    changedLibraries
+      .map { getRelativeDir(it) }
+      .associateWith { getDirChanges(repo, branchRef, headRef, it) }
+      .toMap()
+
+  @Throws(GitAPIException::class)
+  private fun getObjectRefForBranchName(repo: Git, branchName: String) =
+    repo
+      .branchList()
+      .setListMode(ListBranchCommand.ListMode.REMOTE)
+      .call()
+      .firstOrNull { it.name == "refs/remotes/origin/releases/$branchName" }
+      ?.objectId
+      ?: throw RuntimeException("Could not find branch named $branchName")
+
+  private fun getChangedLibraries(
+    repo: Git,
+    previousReleaseRef: ObjectId,
+    currentReleaseRef: ObjectId,
+    libraries: List<Project>,
+  ) =
+    libraries
+      .filter {
+        checkDirChanges(repo, previousReleaseRef, currentReleaseRef, "${getRelativeDir(it)}/")
+      }
+      .flatMap { libraryGroups.getOrDefault(it.firebaseLibrary.libraryGroupName, emptyList()) }
+      .map { it.path }
+      .toSet()
+
+  private fun getChangedChangelogs(
+    repo: Git,
+    previousReleaseRef: ObjectId,
+    currentReleaseRef: ObjectId,
+    libraries: List<Project>,
+  ): Set<Project> =
+    libraries
+      .filter { library ->
+        checkDirChanges(
+          repo,
+          previousReleaseRef,
+          currentReleaseRef,
+          "${getRelativeDir(library)}/CHANGELOG.md",
+        )
+      }
+      .flatMap {
+        libraryGroups.getOrDefault(it.firebaseLibrary.libraryGroupName, listOf(it.firebaseLibrary))
+      }
+      .map { it.project }
+      .toSet()
+
+  private fun checkDirChanges(
+    repo: Git,
+    previousReleaseRef: ObjectId,
+    currentReleaseRef: ObjectId,
+    directory: String,
+  ) =
+    repo
+      .log()
+      .addPath(directory)
+      .addRange(previousReleaseRef, currentReleaseRef)
+      .setMaxCount(10)
+      .call()
+      .filter {
+        !it.fullMessage.contains(RELEASE_CHANGE_FILTER) &&
+          !commitsToIgnore.any { ignore -> it.id == ignore }
+      }
+      .isNotEmpty()
+
+  private fun getDirChanges(
+    repo: Git,
+    previousReleaseRef: ObjectId,
+    currentReleaseRef: ObjectId,
+    directory: String,
+  ) =
+    repo
+      .log()
+      .addPath(directory)
+      .addRange(previousReleaseRef, currentReleaseRef)
+      .call()
+      .filter {
+        !it.fullMessage.contains(RELEASE_CHANGE_FILTER) &&
+          !commitsToIgnore.any { ignore -> it.id == ignore }
+      }
+      .map { CommitDiff.fromRevCommit(it) }
+
+  private fun getRelativeDir(project: Project) = project.path.substring(1).replace(':', '/')
+}
+
+abstract class ReleaseReportGenerator : DefaultTask() {
+
+  @get:InputFiles abstract val releaseReportJsonFile: RegularFileProperty
+
+  @get:OutputFile abstract val releaseReportMdFile: RegularFileProperty
+
+  @TaskAction
+  @Throws(Exception::class)
+  fun generateReleaseReport() {
+
+    val releaseReport =
+      ReleaseReport.fromFile(
+        releaseReportJsonFile.asFileIfExistsOrNull()
+          ?: throw RuntimeException("Missing release json file")
+      )
+    releaseReportMdFile.get().asFile.writeText(releaseReport.toString())
+  }
+}
+
+fun RegularFileProperty.asFileIfExistsOrNull(): File? = orNull?.asFile?.takeIf { it.exists() }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/SdkUtil.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/SdkUtil.kt
index b3fdfccc060..040b1facbe8 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/SdkUtil.kt
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/SdkUtil.kt
@@ -1,16 +1,19 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
 
 import com.android.build.gradle.LibraryExtension
@@ -20,31 +23,119 @@ import java.io.IOException
 import java.util.Properties
 import org.gradle.api.GradleException
 import org.gradle.api.Project
+import org.gradle.api.tasks.StopActionException
 
 val Project.sdkDir: File
-    get() {
-        val properties = Properties()
-        val localProperties = rootProject.file("local.properties")
-        if (localProperties.exists()) {
-            try {
-                FileInputStream(localProperties).use { fis -> properties.load(fis) }
-            } catch (ex: IOException) {
-                throw GradleException("Could not load local.properties", ex)
-            }
-        }
-        val sdkDir = properties.getProperty("sdk.dir")
-        if (sdkDir != null) {
-            return file(sdkDir)
-        }
-        val androidHome = System.getenv("ANDROID_HOME")
-                ?: throw GradleException("No sdk.dir or ANDROID_HOME set.")
-        return file(androidHome)
+  get() {
+    val properties = Properties()
+    val localProperties = rootProject.file("local.properties")
+    if (localProperties.exists()) {
+      try {
+        FileInputStream(localProperties).use { fis -> properties.load(fis) }
+      } catch (ex: IOException) {
+        throw GradleException("Could not load local.properties", ex)
+      }
+    }
+    val sdkDir = properties.getProperty("sdk.dir")
+    if (sdkDir != null) {
+      return file(sdkDir)
     }
+    val androidHome =
+      System.getenv("ANDROID_HOME") ?: throw GradleException("No sdk.dir or ANDROID_HOME set.")
+    return file(androidHome)
+  }
 
 val Project.androidJar: File?
-    get() {
-        val android = project.extensions.findByType(LibraryExtension::class.java)
-                ?: return null
-        return File(
-                sdkDir, String.format("/platforms/%s/android.jar", android.compileSdkVersion))
-    }
+  get() {
+    val android = project.extensions.findByType(LibraryExtension::class.java) ?: return null
+    return File(sdkDir, String.format("/platforms/%s/android.jar", android.compileSdkVersion))
+  }
+
+/**
+ * Provides default text for releasing KTX libs that are transitively invoked in a release, because
+ * their parent module is releasing. This only applies to `-ktx` libs, not Kotlin SDKs.
+ */
+fun KTXTransitiveReleaseText(projectName: String) =
+  """
+      |The Kotlin extensions library transitively includes the updated
+      |`${ProjectNameToKTXPlaceholder(projectName)}` library. The Kotlin extensions library has no additional
+      |updates.
+    """
+    .trimMargin()
+    .trim()
+
+/**
+ * Maps a project's name to a KTX suitable placeholder.
+ *
+ * Some libraries produce artifacts with different coordinates than their project name. This method
+ * helps to map that gap for [KTXTransitiveReleaseText].
+ */
+fun ProjectNameToKTXPlaceholder(projectName: String) =
+  when (projectName) {
+    "firebase-perf" -> "firebase-performance"
+    "firebase-appcheck" -> "firebase-appcheck"
+    else -> projectName
+  }
+
+/**
+ * Provides extra metadata needed to create release notes for a given project.
+ *
+ * This data is needed for g3 internal mappings, and does not really have any implications for
+ * public repo actions.
+ *
+ * @property name The variable name for a project in a release note
+ * @property vesionName The variable name given to the versions of a project
+ * @property hasKTX The module has a KTX submodule (not to be confused with having KTX files)
+ * @see MakeReleaseNotesTask
+ */
+data class ReleaseNotesMetadata(
+  val name: String,
+  val versionName: String,
+  val hasKTX: Boolean = true
+)
+
+/**
+ * Maps the name of a project to its potential [ReleaseNotesMetadata].
+ *
+ * @throws StopActionException If a mapping is not found
+ */
+// TODO() - Should we expose these as firebaselib configuration points; especially for new SDKS?
+fun convertToMetadata(string: String) =
+  when (string) {
+    "firebase-abt" -> ReleaseNotesMetadata("{{ab_testing}}", "ab_testing", false)
+    "firebase-appdistribution" -> ReleaseNotesMetadata("{{appdistro}}", "app-distro", false)
+    "firebase-appdistribution-api" -> ReleaseNotesMetadata("{{appdistro}} API", "app-distro-api")
+    "firebase-config" -> ReleaseNotesMetadata("{{remote_config}}", "remote-config")
+    "firebase-crashlytics" -> ReleaseNotesMetadata("{{crashlytics}}", "crashlytics")
+    "firebase-crashlytics-ndk" ->
+      ReleaseNotesMetadata("{{crashlytics}} NDK", "crashlytics-ndk", false)
+    "firebase-database" -> ReleaseNotesMetadata("{{database}}", "realtime-database")
+    "firebase-dynamic-links" -> ReleaseNotesMetadata("{{ddls}}", "dynamic-links")
+    "firebase-firestore" -> ReleaseNotesMetadata("{{firestore}}", "firestore")
+    "firebase-functions" -> ReleaseNotesMetadata("{{functions_client}}", "functions-client")
+    "firebase-dynamic-module-support" ->
+      ReleaseNotesMetadata(
+        "Dynamic feature modules support",
+        "dynamic-feature-modules-support",
+        false
+      )
+    "firebase-inappmessaging" -> ReleaseNotesMetadata("{{inappmessaging}}", "inappmessaging")
+    "firebase-inappmessaging-display" ->
+      ReleaseNotesMetadata("{{inappmessaging}} Display", "inappmessaging-display")
+    "firebase-installations" -> ReleaseNotesMetadata("{{firebase_installations}}", "installations")
+    "firebase-messaging" -> ReleaseNotesMetadata("{{messaging_longer}}", "messaging")
+    "firebase-messaging-directboot" ->
+      ReleaseNotesMetadata("Cloud Messaging Direct Boot", "messaging-directboot", false)
+    "firebase-ml-modeldownloader" ->
+      ReleaseNotesMetadata("{{firebase_ml}}", "firebaseml-modeldownloader")
+    "firebase-perf" -> ReleaseNotesMetadata("{{perfmon}}", "performance")
+    "firebase-storage" -> ReleaseNotesMetadata("{{firebase_storage_full}}", "storage")
+    "firebase-appcheck" -> ReleaseNotesMetadata("{{app_check}}", "appcheck")
+    "firebase-appcheck-debug" ->
+      ReleaseNotesMetadata("{{app_check}} Debug", "appcheck-debug", false)
+    "firebase-appcheck-debug-testing" ->
+      ReleaseNotesMetadata("{{app_check}} Debug Testing", "appcheck-debug-testing", false)
+    "firebase-appcheck-playintegrity" ->
+      ReleaseNotesMetadata("{{app_check}} Play integrity", "appcheck-playintegrity", false)
+    else -> throw StopActionException("No metadata mapping found for project: $string")
+  }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Tasks.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Tasks.kt
index 8fa9ae3c30e..24cfd73835c 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Tasks.kt
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Tasks.kt
@@ -1,16 +1,19 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
 
 const val JAVADOC_TASK_NAME = "firebaseJavadoc"
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTask.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTask.kt
new file mode 100644
index 00000000000..db068592c6a
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTask.kt
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import java.io.File
+import org.gradle.api.DefaultTask
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.StopExecutionException
+import org.gradle.api.tasks.TaskAction
+
+/**
+ * Changes the project level dependencies in a project's build file to pinned dependencies.
+ *
+ * Computes project level dependencies outside of the project's library group, looks for instances
+ * of them in the `dependencies` block in the build file, and replaces them with pinned versions.
+ * GMaven is used to figure out the latest version to use for a given dependency.
+ *
+ * For example, given the following input:
+ * ```
+ * dependencies {
+ *    implementation(project(":appcheck:firebase-appcheck-interop"))
+ * }
+ * ```
+ *
+ * The output would be:
+ * ```
+ * dependencies {
+ *    implementation("com.google.firebase:firebase-appcheck-interop:17.0.1")
+ * }
+ * ```
+ *
+ * *Assuming that `17.0.1` is the latest version of `firebase-appcheck-interop`*
+ *
+ * @property buildFile A [File] that should be used as the source to update from. Typically the
+ * `build.gradle` or `build.gradle.kts` file for a given project.
+ * @property outputFile A [File] that should be used to write the new text to. Typically the same as
+ * the input file ([buildFile]).
+ * @see PostReleasePlugin
+ */
+abstract class UpdatePinnedDependenciesTask : DefaultTask() {
+  @get:[InputFile]
+  abstract val buildFile: Property<File>
+
+  @get:[OutputFile]
+  abstract val outputFile: Property<File>
+
+  @TaskAction
+  fun updateBuildFileDependencies() {
+    val libraryGroups = computeLibraryGroups(project.rootProject)
+    val dependenciesToChange = findProjectLevelDependenciesToChange(libraryGroups)
+
+    if (dependenciesToChange.isEmpty()) throw StopExecutionException("No libraries to change.")
+
+    val buildFileContent = buildFile.get().readLines()
+    val updatedContent = replaceProjectLevelDependencies(buildFileContent, dependenciesToChange)
+
+    validateDependenciesHaveChanged(dependenciesToChange, buildFileContent, updatedContent)
+
+    outputFile.get().writeText(updatedContent.joinToString("\n") + "\n")
+  }
+
+  private fun validateDependenciesHaveChanged(
+    dependenciesToChange: List<FirebaseLibraryExtension>,
+    oldContent: List<String>,
+    updatedContent: List<String>
+  ) {
+    if (oldContent == updatedContent)
+      throw RuntimeException(
+        "Expected the following project level dependencies, but found none: " +
+          "${dependenciesToChange.joinToString("\n") { it.mavenName }}"
+      )
+
+    val diff = oldContent.diff(updatedContent)
+    val changedLines = diff.mapNotNull { it.first ?: it.second }
+
+    val (librariesCorrectlyChanged, linesChangedIncorrectly) =
+      dependenciesToChange.partition { lib -> changedLines.any { it.contains(lib.path) } }
+
+    val librariesNotChanged = dependenciesToChange - librariesCorrectlyChanged
+
+    if (linesChangedIncorrectly.isNotEmpty())
+      throw RuntimeException(
+        "The following lines were caught by our REGEX, but should not have been:\n ${linesChangedIncorrectly.joinToString("\n")}"
+      )
+
+    if (librariesNotChanged.isNotEmpty())
+      throw RuntimeException(
+        "The following libraries were not found, but should have been:\n ${librariesNotChanged.joinToString("\n") { it.mavenName }}"
+      )
+
+    if (librariesCorrectlyChanged.size > dependenciesToChange.size)
+      throw RuntimeException(
+        "Too many libraries were caught by our change, possible REGEX false positive:\n ${changedLines.joinToString("\n")}"
+      )
+  }
+
+  private fun findProjectLevelDependenciesToChange(
+    libraryGroups: Map<String, List<FirebaseLibraryExtension>>
+  ) =
+    with(project.firebaseLibrary) {
+      projectLevelDependencies - libraryGroups.getOrDefault(libraryGroupName, emptyList())
+    }
+
+  private val FirebaseLibraryExtension.projectLevelDependencies: List<FirebaseLibraryExtension>
+    get() = resolveProjectLevelDependencies().filterNot { it.path in DEPENDENCIES_TO_IGNORE }
+
+  private fun replaceProjectLevelDependencies(
+    buildFileContent: List<String>,
+    libraries: List<FirebaseLibraryExtension>
+  ) =
+    buildFileContent.replaceMatches(DEPENDENCY_REGEX) {
+      val projectName = it.firstCapturedValue
+      val projectToChange = libraries.find { it.path == projectName }
+      val latestVersion = projectToChange?.latestVersion
+
+      latestVersion?.let { "\"${projectToChange.mavenName}:$latestVersion\"" }
+    }
+
+  companion object {
+    /**
+     * Regex used in finding project level dependencies and their respective project.
+     *
+     * The regex can be broken down as such:
+     *
+     * `(N whitespace)(N letters)(a space or bracket)project((a single or double quote): (anything
+     * besides whitespace)(a single or double quote))`
+     *
+     * For example, given the following input:
+     * ```
+     * dependencies {
+     *   implementation 'com.google.firebase:firebase-annotations:16.2.0'
+     *   implementation 'com.google.firebase:firebase-common:20.3.1'
+     *   implementation project(':firebase-installations')
+     *   implementation 'com.google.firebase:firebase-database-collection:18.0.1'
+     * ```
+     *
+     * The following group would be captured:
+     * ```
+     * :firebase-installations
+     * ```
+     */
+    val DEPENDENCY_REGEX =
+      Regex("(?<=\\s{1,20}\\w{1,20}(?:\\s|\\())project\\((?:'|\")(:\\S+)(?:'|\")\\)")
+
+    val DEPENDENCIES_TO_IGNORE = listOf(":protolite-well-known-types")
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/VendorPlugin.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/VendorPlugin.kt
index 27d41bf7c1a..0bcd4ab68be 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/VendorPlugin.kt
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/VendorPlugin.kt
@@ -1,24 +1,24 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
 
-import com.android.build.api.transform.Format
-import com.android.build.api.transform.QualifiedContent
-import com.android.build.api.transform.Transform
-import com.android.build.api.transform.TransformInvocation
-import com.android.build.gradle.LibraryExtension
+import com.android.build.api.artifact.ScopedArtifact
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
+import com.android.build.api.variant.ScopedArtifacts
 import com.android.build.gradle.LibraryPlugin
 import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
@@ -28,234 +28,222 @@ import java.io.FileOutputStream
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 import java.util.zip.ZipOutputStream
+import javax.inject.Inject
+import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
-import org.gradle.api.logging.Logger
+import org.gradle.api.file.Directory
+import org.gradle.api.file.RegularFile
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Classpath
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
 import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.process.ExecOperations
 
 class VendorPlugin : Plugin<Project> {
-    override fun apply(project: Project) {
-        project.plugins.all {
-            when (this) {
-                is LibraryPlugin -> configureAndroid(project)
-            }
-        }
+  override fun apply(project: Project) {
+    project.plugins.all {
+      when (this) {
+        is LibraryPlugin -> configureAndroid(project)
+      }
+    }
+  }
+
+  fun configureAndroid(project: Project) {
+    project.apply(plugin = "LicenseResolverPlugin")
+
+    val vendor = project.configurations.create("vendor")
+    project.configurations.all {
+      when (name) {
+        "releaseCompileOnly",
+        "debugImplementation",
+        "testImplementation",
+        "androidTestImplementation" -> extendsFrom(vendor)
+      }
     }
 
-    fun configureAndroid(project: Project) {
-        project.apply(plugin = "LicenseResolverPlugin")
-
-        val vendor = project.configurations.create("vendor")
-        project.configurations.all {
-            when (name) {
-                "compileOnly", "testImplementation", "androidTestImplementation" -> extendsFrom(vendor)
-            }
-        }
-
-        val jarJar = project.configurations.create("firebaseJarJarArtifact")
-        project.dependencies.add("firebaseJarJarArtifact", "org.pantsbuild:jarjar:1.7.2")
+    val jarJar = project.configurations.create("firebaseJarJarArtifact")
+    project.dependencies.add("firebaseJarJarArtifact", "org.pantsbuild:jarjar:1.7.2")
 
-        val android = project.extensions.getByType(LibraryExtension::class.java)
+    val androidComponents = project.extensions.getByType<LibraryAndroidComponentsExtension>()
 
-        android.registerTransform(VendorTransform(
-                android,
-                vendor,
-                JarJarTransformer(
-                        parentPackageProvider = {
-                            android.libraryVariants.find { it.name == "release" }!!.applicationId
-                        },
-                        jarJarProvider = { jarJar.resolve() },
-                        project = project,
-                        logger = project.logger),
-                logger = project.logger))
+    androidComponents.onVariants(androidComponents.selector().withBuildType("release")) { variant ->
+      val vendorTask =
+        project.tasks.register("${variant.name}VendorTransform", VendorTask::class.java) {
+          vendorDependencies.set(vendor)
+          packageName.set(variant.namespace)
+          this.jarJar.set(jarJar)
+        }
+      variant.artifacts
+        .forScope(ScopedArtifacts.Scope.PROJECT)
+        .use(vendorTask)
+        .toTransform(
+          ScopedArtifact.CLASSES,
+          VendorTask::inputJars,
+          VendorTask::inputDirs,
+          VendorTask::outputJar
+        )
     }
+  }
 }
 
-interface JarTransformer {
-    fun transform(inputJar: File, outputJar: File, packagesToVendor: Set<String>)
-}
+abstract class VendorTask @Inject constructor(private val execOperations: ExecOperations) :
+  DefaultTask() {
+  @get:[InputFiles Classpath]
+  abstract val vendorDependencies: Property<Configuration>
 
-class JarJarTransformer(
-    private val parentPackageProvider: () -> String,
-    private val jarJarProvider: () -> Collection<File>,
-    private val project: Project,
-    private val logger: Logger
-) : JarTransformer {
-    override fun transform(inputJar: File, outputJar: File, packagesToVendor: Set<String>) {
-        val parentPackage = parentPackageProvider()
-        val rulesFile = File.createTempFile(parentPackage, ".jarjar")
-        rulesFile.printWriter().use {
-            for (externalPackageName in packagesToVendor) {
-                it.println("rule $externalPackageName.** $parentPackage.@0")
-            }
-        }
-        logger.info("The following JarJar configuration will be used:\n ${rulesFile.readText()}")
+  @get:[InputFiles Classpath]
+  abstract val jarJar: Property<Configuration>
 
-        project.javaexec {
-            main = "org.pantsbuild.jarjar.Main"
-            classpath = project.files(jarJarProvider())
-            args = listOf("process", rulesFile.absolutePath, inputJar.absolutePath, outputJar.absolutePath)
-            systemProperties = mapOf("verbose" to "true", "misplacedClassStrategy" to "FATAL")
-        }.assertNormalExitValue()
-    }
-}
+  @get:Input abstract val packageName: Property<String>
 
-class VendorTransform(
-    private val android: LibraryExtension,
-    private val configuration: Configuration,
-    private val jarTransformer: JarTransformer,
-    private val logger: Logger
-) :
-        Transform() {
-    override fun getName() = "firebaseVendorTransform"
+  @get:InputFiles abstract val inputJars: ListProperty<RegularFile>
 
-    override fun getInputTypes(): MutableSet<QualifiedContent.ContentType> {
-        return mutableSetOf(QualifiedContent.DefaultContentType.CLASSES)
-    }
+  @get:InputFiles abstract val inputDirs: ListProperty<Directory>
 
-    override fun isIncremental() = false
+  @get:OutputFile abstract val outputJar: RegularFileProperty
 
-    override fun getScopes(): MutableSet<in QualifiedContent.Scope> {
-        return mutableSetOf(QualifiedContent.Scope.PROJECT)
-    }
+  @TaskAction
+  fun taskAction() {
+    val workDir = File.createTempFile("vendorTmp", null)
+    workDir.mkdirs()
+    workDir.deleteRecursively()
 
-    override fun getReferencedScopes(): MutableSet<in QualifiedContent.Scope> {
-        return mutableSetOf(QualifiedContent.Scope.PROJECT)
-    }
-
-    override fun transform(transformInvocation: TransformInvocation) {
-        if (configuration.resolve().isEmpty()) {
-            logger.warn("Nothing to vendor. " +
-                    "If you don't need vendor functionality please disable 'firebase-vendor' plugin. " +
-                    "Otherwise use the 'vendor' configuration to add dependencies you want vendored in.")
-            for (input in transformInvocation.inputs) {
-                for (directoryInput in input.directoryInputs) {
-                    val directoryOutput = transformInvocation.outputProvider.getContentLocation(
-                            directoryInput.name,
-                            setOf(QualifiedContent.DefaultContentType.CLASSES),
-                            mutableSetOf(QualifiedContent.Scope.PROJECT),
-                            Format.DIRECTORY)
-                    directoryInput.file.copyRecursively(directoryOutput, overwrite = true)
-                }
-            }
-            return
-        }
+    val unzippedDir = File(workDir, "unzipped")
+    val externalCodeDir = unzippedDir
 
-        val contentLocation = transformInvocation.outputProvider.getContentLocation(
-                "sourceAndVendoredLibraries",
-                setOf(QualifiedContent.DefaultContentType.CLASSES),
-                mutableSetOf(QualifiedContent.Scope.PROJECT),
-                Format.DIRECTORY)
-        contentLocation.deleteRecursively()
-        contentLocation.mkdirs()
-        val tmpDir = File(contentLocation, "tmp")
-        tmpDir.mkdirs()
-        try {
-            val fatJar = process(tmpDir, transformInvocation)
-            unzipJar(fatJar, contentLocation)
-        } finally {
-            tmpDir.deleteRecursively()
-        }
+    for (directory in inputDirs.get()) {
+      directory.asFile.copyRecursively(unzippedDir)
     }
-
-    private fun isTest(transformInvocation: TransformInvocation): Boolean {
-        return android.testVariants.find { it.name == transformInvocation.context.variantName } != null
+    for (jar in inputJars.get()) {
+      unzipJar(jar.asFile, unzippedDir)
     }
 
-    private fun process(workDir: File, transformInvocation: TransformInvocation): File {
-        transformInvocation.context.variantName
-        val unzippedDir = File(workDir, "unzipped")
-        val unzippedExcludedDir = File(workDir, "unzipped-excluded")
-        unzippedDir.mkdirs()
-        unzippedExcludedDir.mkdirs()
-
-        val externalCodeDir = if (isTest(transformInvocation)) unzippedExcludedDir else unzippedDir
-
-        for (input in transformInvocation.inputs) {
-            for (directoryInput in input.directoryInputs) {
-                directoryInput.file.copyRecursively(unzippedDir)
-            }
-        }
-
-        val ownPackageNames = inferPackages(unzippedDir)
-
-        for (jar in configuration.resolve()) {
-            unzipJar(jar, externalCodeDir)
-        }
-        val externalPackageNames = inferPackages(externalCodeDir) subtract ownPackageNames
-        val java = File(externalCodeDir, "java")
-        val javax = File(externalCodeDir, "javax")
-        if (java.exists() || javax.exists()) {
-            // JarJar unconditionally skips any classes whose package name starts with "java" or "javax".
-            throw GradleException("Vendoring java or javax packages is not supported. " +
-                    "Please exclude one of the direct or transitive dependencies: \n" +
-                    configuration.resolvedConfiguration.resolvedArtifacts.joinToString(separator = "\n"))
-        }
-        val jar = File(workDir, "intermediate.jar")
-        zipAll(unzippedDir, jar)
-        val outputJar = File(workDir, "output.jar")
+    val ownPackageNames = inferPackages(unzippedDir)
 
-        jarTransformer.transform(jar, outputJar, externalPackageNames)
-        return outputJar
+    for (jar in vendorDependencies.get()) {
+      unzipJar(jar, externalCodeDir)
+    }
+    val externalPackageNames = inferPackages(externalCodeDir) subtract ownPackageNames
+    val java = File(externalCodeDir, "java")
+    val javax = File(externalCodeDir, "javax")
+    if (java.exists() || javax.exists()) {
+      // JarJar unconditionally skips any classes whose package name starts with "java" or "javax".
+      throw GradleException(
+        "Vendoring java or javax packages is not supported. " +
+          "Please exclude one of the direct or transitive dependencies: \n" +
+          vendorDependencies
+            .get()
+            .resolvedConfiguration
+            .resolvedArtifacts
+            .joinToString(separator = "\n")
+      )
     }
 
-    private fun inferPackages(dir: File): Set<String> {
-        return dir.walk().filter { it.name.endsWith(".class") }.map { it.parentFile.toRelativeString(dir).replace('/', '.') }.toSet()
+    val jar = File(workDir, "intermediate.jar")
+    zipAll(unzippedDir, jar)
+    transform(jar, ownPackageNames, externalPackageNames)
+  }
+
+  fun transform(inputJar: File, ownPackages: Set<String>, packagesToVendor: Set<String>) {
+    val parentPackage = packageName.get()
+    val rulesFile = File.createTempFile(parentPackage, ".jarjar")
+    rulesFile.printWriter().use {
+      for (packageName in ownPackages) {
+        it.println("keep $packageName.**")
+      }
+      for (externalPackageName in packagesToVendor) {
+        it.println("rule $externalPackageName.** $parentPackage.@0")
+      }
     }
+    logger.info("The following JarJar configuration will be used:\n ${rulesFile.readText()}")
+
+    execOperations
+      .javaexec {
+        mainClass.set("org.pantsbuild.jarjar.Main")
+        classpath = project.files(jarJar.get())
+        args =
+          listOf(
+            "process",
+            rulesFile.absolutePath,
+            inputJar.absolutePath,
+            outputJar.asFile.get().absolutePath
+          )
+        systemProperties = mapOf("verbose" to "true", "misplacedClassStrategy" to "FATAL")
+      }
+      .assertNormalExitValue()
+  }
+}
+
+fun inferPackages(dir: File): Set<String> {
+  return dir
+    .walk()
+    .filter { it.name.endsWith(".class") }
+    .map { it.parentFile.toRelativeString(dir).replace('/', '.') }
+    .toSet()
 }
 
 fun unzipJar(jar: File, directory: File) {
-    ZipFile(jar).use { zip ->
-        zip.entries().asSequence().filter { !it.isDirectory && !it.name.startsWith("META-INF") }.forEach { entry ->
-            zip.getInputStream(entry).use { input ->
-                val entryFile = File(directory, entry.name)
-                entryFile.parentFile.mkdirs()
-                entryFile.outputStream().use { output ->
-                    input.copyTo(output)
-                }
-            }
+  ZipFile(jar).use { zip ->
+    zip
+      .entries()
+      .asSequence()
+      .filter { !it.isDirectory && !it.name.startsWith("META-INF") }
+      .forEach { entry ->
+        zip.getInputStream(entry).use { input ->
+          val entryFile = File(directory, entry.name)
+          entryFile.parentFile.mkdirs()
+          entryFile.outputStream().use { output -> input.copyTo(output) }
         }
-    }
+      }
+  }
 }
 
 fun zipAll(directory: File, zipFile: File) {
 
-    ZipOutputStream(BufferedOutputStream(FileOutputStream(zipFile))).use {
-        zipFiles(it, directory, "")
-    }
+  ZipOutputStream(BufferedOutputStream(FileOutputStream(zipFile))).use {
+    zipFiles(it, directory, "")
+  }
 }
 
 private fun zipFiles(zipOut: ZipOutputStream, sourceFile: File, parentDirPath: String) {
-    val data = ByteArray(2048)
-    sourceFile.listFiles()?.forEach { f ->
-        if (f.isDirectory) {
-            val path = if (parentDirPath == "") {
-                f.name
-            } else {
-                parentDirPath + File.separator + f.name
-            }
-            // Call recursively to add files within this directory
-            zipFiles(zipOut, f, path)
+  val data = ByteArray(2048)
+  sourceFile.listFiles()?.forEach { f ->
+    if (f.isDirectory) {
+      val path =
+        if (parentDirPath == "") {
+          f.name
         } else {
-            FileInputStream(f).use { fi ->
-                BufferedInputStream(fi).use { origin ->
-                    val path = parentDirPath + File.separator + f.name
-                    val entry = ZipEntry(path)
-                    entry.time = f.lastModified()
-                    entry.isDirectory
-                    entry.size = f.length()
-                    zipOut.putNextEntry(entry)
-                    while (true) {
-                        val readBytes = origin.read(data)
-                        if (readBytes == -1) {
-                            break
-                        }
-                        zipOut.write(data, 0, readBytes)
-                    }
-                }
+          parentDirPath + File.separator + f.name
+        }
+      // Call recursively to add files within this directory
+      zipFiles(zipOut, f, path)
+    } else {
+      FileInputStream(f).use { fi ->
+        BufferedInputStream(fi).use { origin ->
+          val path = parentDirPath + File.separator + f.name
+          val entry = ZipEntry(path)
+          entry.time = f.lastModified()
+          entry.isDirectory
+          entry.size = f.length()
+          zipOut.putNextEntry(entry)
+          while (true) {
+            val readBytes = origin.read(data)
+            if (readBytes == -1) {
+              break
             }
+            zipOut.write(data, 0, readBytes)
+          }
         }
+      }
     }
+  }
 }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/VersionBumpTask.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/VersionBumpTask.kt
new file mode 100644
index 00000000000..34c5539eea6
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/VersionBumpTask.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import java.io.File
+import org.gradle.api.DefaultTask
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.TaskAction
+import org.gradle.kotlin.dsl.provideDelegate
+
+/**
+ * Bumps the `version` property of the specified [versionFile], and sets the
+ * `latestReleasedVersion`.
+ *
+ * Primarily utilized as a post-release clean up task in which we bump the versions of released
+ * modules to be one patch higher than their currently released counterparts, and update their
+ * latest released version.
+ *
+ * @see PostReleasePlugin
+ *
+ * @property versionFile A [File] that contains the `version` property. Defaults to the
+ * `gradle.properties` file at the project's root.
+ * @property releasedVersion A [ModuleVersion] of what to bump from. Defaults to the project
+ * version.
+ * @property newVersion A [ModuleVersion] of what to set the version to. Defaults to one patch
+ * higher than [releasedVersion]
+ */
+abstract class VersionBumpTask : DefaultTask() {
+  @get:[Optional InputFile]
+  abstract val versionFile: Property<File>
+
+  @get:[Optional Input]
+  abstract val releasedVersion: Property<ModuleVersion>
+
+  @get:[Optional Input]
+  abstract val newVersion: Property<ModuleVersion>
+
+  init {
+    configure()
+  }
+
+  @TaskAction
+  fun build() {
+    versionFile.get().rewriteLines {
+      when {
+        it.startsWith("version=") -> "version=${newVersion.get()}"
+        it.startsWith("latestReleasedVersion") -> "latestReleasedVersion=${releasedVersion.get()}"
+        else -> it
+      }
+    }
+  }
+
+  fun configure() {
+    versionFile.convention(project.file("gradle.properties"))
+    releasedVersion.convention(computeReleasedVersion())
+    newVersion.convention(releasedVersion.map { it.bump() })
+  }
+
+  fun computeReleasedVersion(): ModuleVersion? {
+    val version: String? by project
+
+    return version?.let { ModuleVersion.fromStringOrNull(it) }
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java
deleted file mode 100644
index 56beae61d55..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.gradle.plugins.apiinfo;
-
-import com.android.build.gradle.api.AndroidSourceSet;
-import com.google.firebase.gradle.plugins.SdkUtilKt;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.GradleException;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.InputFile;
-import org.gradle.api.tasks.InputFiles;
-import org.gradle.api.tasks.OutputFile;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.TaskAction;
-
-/**
- * Task generates the api diff of the current source code against the api.txt file stored alongside
- * the project's src directory.
- */
-public abstract class ApiInformationTask extends DefaultTask {
-
-  @Input
-  abstract String getMetalavaJarPath();
-
-  @InputFile
-  abstract File getApiTxt();
-
-  abstract Object getSourceSet();
-
-  @InputFiles
-  abstract FileCollection getClassPath();
-
-  @OutputFile
-  abstract File getBaselineFile();
-
-  @OutputFile
-  abstract File getOutputApiFile();
-
-  @Input
-  abstract boolean getUpdateBaseline();
-
-  @OutputFile
-  abstract File getOutputFile();
-
-  public abstract void setSourceSet(Object value);
-
-  public abstract void setClassPath(FileCollection value);
-
-  public abstract void setBaselineFile(File value);
-
-  public abstract void setUpdateBaseline(boolean value);
-
-  public abstract void setMetalavaJarPath(String value);
-
-  public abstract void setApiTxt(File value);
-
-  public abstract void setOutputApiFile(File value);
-
-  public abstract void setOutputFile(File value);
-
-  private Set<File> getSourceDirs() {
-    if (getSourceSet() instanceof SourceSet) {
-      return ((SourceSet) getSourceSet()).getJava().getSrcDirs();
-    } else if (getSourceSet() instanceof AndroidSourceSet) {
-      return ((AndroidSourceSet) getSourceSet()).getJava().getSrcDirs();
-    }
-    throw new IllegalStateException("Unsupported sourceSet provided: " + getSourceSet().getClass());
-  }
-
-  @TaskAction
-  void execute() {
-    String sourcePath =
-        getSourceDirs().stream()
-            .filter(File::exists)
-            .map(File::getAbsolutePath)
-            .collect(Collectors.joining(":"));
-    if (sourcePath.isEmpty()) {
-      getLogger()
-          .warn(
-              "Project {} has no sources in main source set, skipping...", getProject().getPath());
-      return;
-    }
-
-    String classPath =
-        getClassPath().getFiles().stream()
-            .map(File::getAbsolutePath)
-            .collect(Collectors.joining(":"));
-
-    File androidJar = SdkUtilKt.getAndroidJar(getProject());
-    if (androidJar != null) {
-      classPath += ":" + androidJar.getAbsolutePath();
-    }
-
-    String cp = classPath;
-
-    File outputFileDir = getOutputFile().getParentFile();
-    if (!outputFileDir.exists()) {
-      outputFileDir.mkdirs();
-    }
-
-    // Generate api.txt file and store it in the  build directory.
-    getProject()
-        .javaexec(
-            spec -> {
-              spec.setMain("-jar");
-              spec.setArgs(
-                  Arrays.asList(
-                      getMetalavaJarPath(),
-                      "--no-banner",
-                      "--source-path",
-                      sourcePath,
-                      "--classpath",
-                      cp,
-                      "--api",
-                      getOutputApiFile().getAbsolutePath(),
-                      "--format=v2"));
-              spec.setIgnoreExitValue(true);
-            });
-    getProject()
-        .javaexec(
-            spec -> {
-              spec.setMain("-jar");
-              List<String> args =
-                  new ArrayList<>(
-                      Arrays.asList(
-                          getMetalavaJarPath(),
-                          "--no-banner",
-                          "--source-files",
-                          getOutputApiFile().getAbsolutePath(),
-                          "--check-compatibility:api:current",
-                          getApiTxt().getAbsolutePath(),
-                          "--format=v2",
-                          "--no-color"));
-              if (getUpdateBaseline()) {
-                args.addAll(
-                    Arrays.asList("--update-baseline", getBaselineFile().getAbsolutePath()));
-              } else if (getBaselineFile().exists()) {
-                args.addAll(Arrays.asList("--baseline", getBaselineFile().getAbsolutePath()));
-              }
-              spec.setArgs(args);
-              try {
-                spec.setStandardOutput(new FileOutputStream(getOutputFile()));
-              } catch (FileNotFoundException e) {
-                throw new GradleException("Unable to run the command", e);
-              }
-            });
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/GenerateApiTxtFileTask.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/GenerateApiTxtFileTask.java
deleted file mode 100644
index c17ed4708ea..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/GenerateApiTxtFileTask.java
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.gradle.plugins.apiinfo;
-
-import com.android.build.gradle.api.AndroidSourceSet;
-import com.google.firebase.gradle.plugins.SdkUtilKt;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.InputFiles;
-import org.gradle.api.tasks.OutputFile;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.TaskAction;
-
-public abstract class GenerateApiTxtFileTask extends DefaultTask {
-
-  @Input
-  abstract String getMetalavaJarPath();
-
-  @OutputFile
-  abstract File getApiTxt();
-
-  abstract Object getSourceSet();
-
-  @InputFiles
-  public abstract FileCollection getClassPath();
-
-  @OutputFile
-  abstract File getBaselineFile();
-
-  @Input
-  abstract boolean getUpdateBaseline();
-
-  public abstract void setSourceSet(Object value);
-
-  public abstract void setClassPath(FileCollection value);
-
-  public abstract void setBaselineFile(File value);
-
-  public abstract void setUpdateBaseline(boolean value);
-
-  public abstract void setMetalavaJarPath(String value);
-
-  public abstract void setApiTxt(File value);
-
-  private Set<File> getSourceDirs() {
-    if (getSourceSet() instanceof SourceSet) {
-      return ((SourceSet) getSourceSet()).getJava().getSrcDirs();
-    } else if (getSourceSet() instanceof AndroidSourceSet) {
-      return ((AndroidSourceSet) getSourceSet()).getJava().getSrcDirs();
-    }
-    throw new IllegalStateException("Unsupported sourceSet provided: " + getSourceSet().getClass());
-  }
-
-  @TaskAction
-  void execute() {
-    String sourcePath =
-        getSourceDirs().stream()
-            .filter(File::exists)
-            .map(File::getAbsolutePath)
-            .collect(Collectors.joining(":"));
-    if (sourcePath.isEmpty()) {
-      getLogger()
-          .warn(
-              "Project {} has no sources in main source set, skipping...", getProject().getPath());
-      return;
-    }
-    String classPath =
-        getClassPath().getFiles().stream()
-            .map(File::getAbsolutePath)
-            .collect(Collectors.joining(":"));
-
-    File androidJar = SdkUtilKt.getAndroidJar(getProject());
-    if (androidJar != null) {
-      classPath += ":" + androidJar.getAbsolutePath();
-    }
-    List<String> args =
-        new ArrayList<>(
-            Arrays.asList(
-                getMetalavaJarPath(),
-                "--no-banner",
-                "--source-path",
-                sourcePath,
-                "--classpath",
-                classPath,
-                "--api",
-                getApiTxt().getAbsolutePath(),
-                "--format=v2"));
-
-    if (getUpdateBaseline()) {
-      args.addAll(Arrays.asList("--update-baseline", getBaselineFile().getAbsolutePath()));
-    } else if (getBaselineFile().exists()) {
-      args.addAll(Arrays.asList("--baseline", getBaselineFile().getAbsolutePath()));
-    }
-
-    getProject()
-        .javaexec(
-            spec -> {
-              spec.setMain("-jar");
-              spec.setArgs(args);
-              spec.setIgnoreExitValue(true);
-            });
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/GetMetalavaJarTask.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/GetMetalavaJarTask.java
deleted file mode 100644
index b9250abf0f4..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/GetMetalavaJarTask.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.gradle.plugins.apiinfo;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.GradleException;
-import org.gradle.api.tasks.OutputFile;
-import org.gradle.api.tasks.TaskAction;
-
-public abstract class GetMetalavaJarTask extends DefaultTask {
-
-  @OutputFile
-  abstract File getOutputFile();
-
-  public abstract void setOutputFile(File outputFile);
-
-  @TaskAction
-  void execute() {
-    if (getOutputFile().exists()) {
-      return;
-    }
-
-    try (InputStream stream =
-        new URL("https://storage.googleapis.com/android-ci/metalava-full-1.3.0-SNAPSHOT.jar")
-            .openStream()) {
-      Files.copy(stream, getOutputFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
-    } catch (IOException e) {
-      throw new GradleException("Unable to read the jar file from GCS", e);
-    }
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java
index 73a198feb1b..57b14e5d43e 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java
@@ -39,7 +39,7 @@ public AffectedProjectFinder(Project project, List<Pattern> ignorePaths) {
     this(project, changedPaths(project.getRootDir()), ignorePaths);
   }
 
-  private AffectedProjectFinder(
+  public AffectedProjectFinder(
       Project project, Set<String> changedPaths, List<Pattern> ignorePaths) {
     this.project = project;
     this.changedPaths =
@@ -68,9 +68,10 @@ Set<Project> find() {
 
   private static Set<String> changedPaths(File workDir) {
     try {
+      // works on CI only.
       Process process =
           Runtime.getRuntime()
-              .exec("git diff --name-only --submodule=diff HEAD@{0} HEAD@{1}", null, workDir);
+              .exec("git diff --name-only --submodule=diff HEAD^1 HEAD", null, workDir);
       try {
         return ImmutableSet.copyOf(
             CharStreams.readLines(new InputStreamReader(process.getInputStream())));
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ChangedModulesTask.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ChangedModulesTask.kt
new file mode 100644
index 00000000000..2eda1532173
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ChangedModulesTask.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins.ci
+
+import com.google.firebase.gradle.plugins.FirebaseLibraryExtension
+import com.google.gson.Gson
+import java.io.File
+import org.gradle.api.DefaultTask
+import org.gradle.api.artifacts.ProjectDependency
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.options.Option
+import org.gradle.kotlin.dsl.findByType
+
+abstract class ChangedModulesTask : DefaultTask() {
+  @get:Input
+  @set:Option(option = "changed-git-paths", description = "The list of changed paths")
+  abstract var changedGitPaths: List<String>
+
+  @get:Input
+  @set:Option(option = "output-file-path", description = "The file to output json to")
+  abstract var outputFilePath: String
+
+  @get:Input
+  @set:Option(option = "only-firebase-sdks", description = "Only list Firebase SDKs")
+  abstract var onlyFirebaseSDKs: Boolean
+
+  @get:OutputFile val outputFile by lazy { File(outputFilePath) }
+
+  init {
+    outputs.upToDateWhen { false }
+  }
+
+  @TaskAction
+  fun execute() {
+    val projects =
+      AffectedProjectFinder(project, changedGitPaths.toSet(), listOf())
+        .find()
+        .filter {
+          val ext = it.extensions.findByType(FirebaseLibraryExtension::class.java)
+          !onlyFirebaseSDKs || it.extensions.findByType<FirebaseLibraryExtension>() != null
+        }
+        .map { it.path }
+        .toSet()
+
+    val result = project.rootProject.subprojects.associate { it.path to mutableSetOf<String>() }
+    project.rootProject.subprojects.forEach { p ->
+      p.configurations.forEach { c ->
+        c.dependencies.filterIsInstance<ProjectDependency>().forEach {
+          if (
+            !onlyFirebaseSDKs ||
+              it.dependencyProject.extensions.findByType<FirebaseLibraryExtension>() != null
+          ) {
+            if (!onlyFirebaseSDKs || p.extensions.findByType<FirebaseLibraryExtension>() != null) {
+              result[it.dependencyProject.path]?.add(p.path)
+            }
+          }
+        }
+      }
+    }
+    val affectedProjects =
+      result
+        .flatMap { (key, value) -> if (projects.contains(key)) setOf(key) + value else setOf() }
+        .toSet()
+
+    outputFile.writeText(Gson().toJson(affectedProjects))
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java
index 1519e3ca35f..77e8662a143 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java
@@ -103,6 +103,8 @@ public void apply(Project project) {
     setupChangedTask(project, affectedProjects, "check");
     setupChangedTask(project, affectedProjects, "checkCoverage");
     setupChangedTask(project, affectedProjects, "deviceCheck");
+
+    project.getTasks().register("writeChangedProjects", ChangedModulesTask.class);
   }
 
   private static void setupChangedTask(
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java
index c20c7fa2a6c..8a429bb88d6 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java
@@ -26,6 +26,7 @@
 import org.gradle.testing.jacoco.tasks.JacocoReport;
 
 public final class Coverage {
+
   private Coverage() {}
 
   public static void apply(FirebaseLibraryExtension firebaseLibrary) {
@@ -34,8 +35,8 @@ public static void apply(FirebaseLibraryExtension firebaseLibrary) {
     File reportsDir = new File(project.getBuildDir(), "/reports/jacoco");
     JacocoPluginExtension jacoco = project.getExtensions().getByType(JacocoPluginExtension.class);
 
-    jacoco.setToolVersion("0.8.5");
-    jacoco.setReportsDir(reportsDir);
+    jacoco.setToolVersion("0.8.8");
+    jacoco.getReportsDirectory().set(reportsDir);
     project
         .getTasks()
         .withType(
@@ -66,35 +67,38 @@ public static void apply(FirebaseLibraryExtension firebaseLibrary) {
                       .add("**Manifest*.*")
                       .build();
 
-              task.setClassDirectories(
-                  project.files(
-                      project.fileTree(
-                          ImmutableMap.of(
-                              "dir",
-                              project.getBuildDir() + "/intermediates/javac/release",
-                              "excludes",
-                              excludes)),
+              task.getClassDirectories()
+                  .setFrom(
+                      project.files(
+                          project.fileTree(
+                              ImmutableMap.of(
+                                  "dir",
+                                  project.getBuildDir() + "/intermediates/javac/release",
+                                  "excludes",
+                                  excludes)),
+                          project.fileTree(
+                              ImmutableMap.of(
+                                  "dir",
+                                  project.getBuildDir() + "/tmp/kotlin-classes/release",
+                                  "excludes",
+                                  excludes))));
+              task.getSourceDirectories()
+                  .setFrom(project.files("src/main/java", "src/main/kotlin"));
+              task.getExecutionData()
+                  .setFrom(
                       project.fileTree(
                           ImmutableMap.of(
                               "dir",
-                              project.getBuildDir() + "/tmp/kotlin-classes/release",
-                              "excludes",
-                              excludes))));
-              task.setSourceDirectories(project.files("src/main/java", "src/main/kotlin"));
-              task.setExecutionData(
-                  project.fileTree(
-                      ImmutableMap.of(
-                          "dir",
-                          project.getBuildDir(),
-                          "includes",
-                          ImmutableList.of("jacoco/*.exec"))));
+                              project.getBuildDir(),
+                              "includes",
+                              ImmutableList.of("jacoco/*.exec"))));
               task.reports(
                   reports -> {
                     reports
                         .getHtml()
                         .setDestination(
                             new File(reportsDir, firebaseLibrary.artifactId.get() + "/html"));
-                    reports.getXml().setEnabled(true);
+                    reports.getXml().getRequired().set(true);
                     reports
                         .getXml()
                         .setDestination(
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/SmokeTestsPlugin.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/SmokeTestsPlugin.java
index 5c73a641845..3556c1b62b9 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/SmokeTestsPlugin.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/SmokeTestsPlugin.java
@@ -15,6 +15,7 @@
 package com.google.firebase.gradle.plugins.ci;
 
 import com.google.firebase.gradle.plugins.FirebaseLibraryExtension;
+import com.google.firebase.gradle.plugins.PublishingPlugin;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
@@ -60,7 +61,7 @@ public void apply(Project project) {
                     String groupId = firebaseLibrary.groupId.get();
                     String artifactId = firebaseLibrary.artifactId.get();
                     String artifact =
-                        String.format("%s:%s:%s-SNAPSHOT", groupId, artifactId, sub.getVersion());
+                        String.format("%s:%s:%s", groupId, artifactId, sub.getVersion());
                     allArtifacts.add(artifact);
 
                     if (changedProjects.contains(sub)) {
@@ -69,8 +70,7 @@ public void apply(Project project) {
                   });
 
               // Reuse the publish task for building the libraries.
-              Task publishAllTask = project.getTasks().getByPath("publishAllToBuildDir");
-              assembleAllTask.dependsOn(publishAllTask);
+              assembleAllTask.dependsOn(PublishingPlugin.PUBLISH_ALL_TO_BUILD_TASK);
 
               // Generate a JSON file listing the artifacts after everything is complete.
               assembleAllTask.doLast(
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java
index 01d57f85b9e..6bbe72b18bb 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java
@@ -49,7 +49,7 @@ public void timeout(String timeout) {
 
   Set<String> getDevices() {
     if (devices.get().isEmpty()) {
-      return Collections.singleton("model=Pixel2,version=27,locale=en,orientation=portrait");
+      return Collections.singleton("model=panther,version=33,locale=en,orientation=portrait");
     }
     return devices.get();
   }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java
index 7ecdfb4c440..0bfcd3d0534 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java
index 3a8151c452c..c8849bc90c2 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java
@@ -32,7 +32,7 @@
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.incremental.IncrementalTaskInputs;
+import org.gradle.work.InputChanges;
 
 abstract class GenerateLicensesTask extends DefaultTask {
   private static final int NEW_LINE_LENGTH = "\n".getBytes().length;
@@ -43,9 +43,9 @@ abstract class GenerateLicensesTask extends DefaultTask {
   public abstract void setAdditionalLicenses(
       List<ThirdPartyLicensesExtension.CustomLicense> additionalLicenses);
 
-  @OutputDirectory
   public abstract void setOutputDir(File outputDir);
 
+  @OutputDirectory
   public abstract File getOutputDir();
 
   @Inject
@@ -56,7 +56,7 @@ public GenerateLicensesTask() {
   }
 
   @TaskAction
-  void execute(IncrementalTaskInputs inputs) {
+  void execute(InputChanges inputs) {
     Set<URI> licenseUris = new HashSet<URI>();
     for (ThirdPartyLicensesExtension.CustomLicense license : getadditionalLicenses()) {
       licenseUris.addAll(license.licenseUris);
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java
index 7a2a7822daa..dd6ee16297b 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.gradle.plugins.license;
 
+import java.io.File;
 import java.io.Serializable;
 import java.net.URI;
 import java.util.ArrayList;
@@ -27,18 +28,25 @@ public class ThirdPartyLicensesExtension {
    * supported
    */
   public void add(String name, String... licenseUris) {
-    customLicenses.add(new CustomLicense(name, licenseUris));
+    customLicenses.add(CustomLicense.buildFromStrings(name, licenseUris));
   }
 
   static class CustomLicense implements Serializable {
     final String name;
-    final List<URI> licenseUris = new ArrayList<>();
+    final List<URI> licenseUris;
 
-    CustomLicense(String name, String[] licenseUris) {
+    CustomLicense(String name, List<URI> licenseUris) {
       this.name = name;
+      this.licenseUris = licenseUris;
+    }
+
+    static CustomLicense buildFromStrings(String name, String[] licenseUris) {
+      List<URI> uris = new ArrayList<>();
       for (String s : licenseUris) {
-        this.licenseUris.add(URI.create(s));
+        File file = new File(s);
+        uris.add(file.toURI());
       }
+      return new CustomLicense(name, uris);
     }
   }
 
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/Publisher.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/Publisher.java
deleted file mode 100644
index 72cd594205e..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/Publisher.java
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.gradle.plugins.publish;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.firebase.gradle.plugins.FirebaseLibraryExtension;
-import com.google.firebase.gradle.plugins.LibraryType;
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-import org.gradle.api.GradleException;
-import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.ProjectDependency;
-import org.gradle.api.publish.maven.MavenPublication;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class Publisher {
-  private static String UNRELEASED_VERSION = "unreleased";
-
-  private static final Set<String> SUPPORT_GROUP_IDS =
-      ImmutableSet.of("com.android.support", "androidx.multidex");
-
-  private final Mode mode;
-  private final Set<FirebaseLibraryExtension> librariesToPublish;
-
-  Publisher(Mode mode, Set<FirebaseLibraryExtension> librariesToPublish) {
-    this.mode = mode;
-    this.librariesToPublish = librariesToPublish;
-  }
-
-  public String determineVersion(FirebaseLibraryExtension library) {
-    if (librariesToPublish.isEmpty() || librariesToPublish.contains(library)) {
-      return renderVersion(library.getVersion(), mode);
-    }
-    return library.getLatestReleasedVersion().orElse(UNRELEASED_VERSION);
-  }
-
-  public void decorate(FirebaseLibraryExtension library, MavenPublication publication) {
-    publication.setVersion(determineVersion(library));
-    publication
-        .getPom()
-        .withXml(
-            xml -> {
-              Element rootElement = xml.asElement();
-              validatePomXml(library, rootElement);
-              processDependencies(library, rootElement);
-            });
-  }
-
-  private static void validatePomXml(FirebaseLibraryExtension library, Element rootElement) {
-    NodeList dependencies = rootElement.getElementsByTagName("dependency");
-    List<String> unreleased = new ArrayList<>();
-    for (int i = 0; i < dependencies.getLength(); i++) {
-      Element dep = (Element) dependencies.item(i);
-      Element version = (Element) dep.getElementsByTagName("version").item(0);
-      if (UNRELEASED_VERSION.equals(version.getTextContent().trim())) {
-        String groupId = dep.getElementsByTagName("groupId").item(0).getTextContent();
-        String artifactId = dep.getElementsByTagName("artifactId").item(0).getTextContent();
-        unreleased.add(String.format("%s:%s", groupId, artifactId));
-      }
-    }
-    if (!unreleased.isEmpty()) {
-      throw new GradleException(
-          String.format(
-              "Failed to release %s. Some of its dependencies don't have a released version: %s",
-              library.getMavenName(), unreleased));
-    }
-  }
-
-  private static void processDependencies(FirebaseLibraryExtension library, Element rootElement) {
-    Map<String, String> deps = getDependencyTypes(library);
-
-    NodeList dependencies = rootElement.getElementsByTagName("dependency");
-    List<Element> depsToRemove = new ArrayList<>();
-    for (int i = 0; i < dependencies.getLength(); i++) {
-      Element dep = (Element) dependencies.item(i);
-      String groupId = dep.getElementsByTagName("groupId").item(0).getTextContent();
-      String artifactId = dep.getElementsByTagName("artifactId").item(0).getTextContent();
-
-      if (SUPPORT_GROUP_IDS.contains(groupId) && "multidex".equals(artifactId)) {
-        depsToRemove.add(dep);
-        continue;
-      }
-
-      Element type = dep.getOwnerDocument().createElement("type");
-      type.setTextContent(deps.get(groupId + ":" + artifactId));
-      dep.appendChild(type);
-
-      NodeList scopes = dep.getElementsByTagName("scope");
-      if (scopes.getLength() > 0) {
-        dep.removeChild(scopes.item(0));
-      }
-      Element scope = dep.getOwnerDocument().createElement("scope");
-      scope.setTextContent("compile");
-      dep.appendChild(scope);
-    }
-    for (Element dep : depsToRemove) {
-      dep.getParentNode().removeChild(dep);
-    }
-  }
-
-  private static String renderVersion(String baseVersion, Mode mode) {
-    return baseVersion + (Mode.SNAPSHOT.equals(mode) ? "-SNAPSHOT" : "");
-  }
-
-  private static Map<String, String> getDependencyTypes(FirebaseLibraryExtension firebaseLibrary) {
-    Project project = firebaseLibrary.project;
-    Configuration dummyDependencyConfiguration =
-        project.getConfigurations().create("publisherDummyConfig");
-    Set<Dependency> nonProjectDependencies =
-        project
-            .getConfigurations()
-            .getByName(firebaseLibrary.getRuntimeClasspath())
-            .getAllDependencies()
-            .stream()
-            .filter(dep -> !(dep instanceof ProjectDependency))
-            .collect(Collectors.toSet());
-
-    dummyDependencyConfiguration.getDependencies().addAll(nonProjectDependencies);
-    try {
-      return project
-          .getConfigurations()
-          .getByName(firebaseLibrary.getRuntimeClasspath())
-          .getAllDependencies()
-          .stream()
-          .map(dep -> getType(dummyDependencyConfiguration, dep))
-          .filter(Objects::nonNull)
-          .collect(Collectors.toMap(lib -> lib.name, lib -> lib.type.getFormat()));
-    } finally {
-      project.getConfigurations().remove(dummyDependencyConfiguration);
-    }
-  }
-
-  private static Library getType(Configuration config, Dependency d) {
-    if (d instanceof ProjectDependency) {
-      FirebaseLibraryExtension library =
-          getFirebaseLibrary(((ProjectDependency) d).getDependencyProject());
-      return new Library(library.getMavenName(), library.type);
-    }
-
-    Optional<Library> path =
-        StreamSupport.stream(config.spliterator(), false)
-            .map(File::getAbsolutePath)
-            .filter(
-                absPath ->
-                    absPath.matches(
-                        MessageFormat.format(
-                            ".*\\Q{0}/{1}/{2}/\\E[a-zA-Z0-9]+/\\Q{1}-{2}.\\E[aj]ar",
-                            d.getGroup(), d.getName(), d.getVersion())))
-            .findFirst()
-            .map(absPath -> absPath.endsWith(".aar") ? LibraryType.ANDROID : LibraryType.JAVA)
-            .map(type -> new Library(d.getGroup() + ":" + d.getName(), type));
-    return path.orElse(null);
-  }
-
-  private static FirebaseLibraryExtension getFirebaseLibrary(Project project) {
-    return project.getExtensions().getByType(FirebaseLibraryExtension.class);
-  }
-
-  private static final class Library {
-    private final String name;
-    private final LibraryType type;
-
-    private Library(String name, LibraryType type) {
-      this.name = name;
-      this.type = type;
-    }
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/PublishingPlugin.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/PublishingPlugin.java
deleted file mode 100644
index d92c78bacd8..00000000000
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/PublishingPlugin.java
+++ /dev/null
@@ -1,234 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.gradle.plugins.publish;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.firebase.gradle.plugins.FirebaseLibraryExtension;
-import digital.wup.android_maven_publish.AndroidMavenPublishPlugin;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.Task;
-import org.gradle.api.publish.PublishingExtension;
-import org.gradle.api.publish.maven.MavenPublication;
-import org.gradle.api.tasks.bundling.Jar;
-import org.gradle.api.tasks.bundling.Zip;
-
-/**
- * Enables releasing of the SDKs.
- *
- * <p>The plugin supports multiple workflows.
- *
- * <p><strong>Build all SDK snapshots</strong>
- *
- * <pre>
- * ./gradlew publishAllToLocal # publishes to maven local repo
- * ./gradlew publishAllToBuildDir # publishes to build/m2repository
- * </pre>
- *
- * <p><strong>Prepare a release</strong>
- *
- * <pre>
- * ./gradlew -PprojectsToPublish="firebase-inappmessaging,firebase-inappmessaging-display"\
- *           -PpublishMode=(RELEASE|SNAPSHOT) \
- *           firebasePublish
- * </pre>
- *
- * <ul>
- *   <li>{@code projectsToPublish} is a list of projects to release separated by {@code
- *       projectsToPublishSeparator}(default: ","), these projects will have their versions depend
- *       on the {@code publishMode} parameter.
- *   <li>{@code publishMode} can one of two values: {@code SNAPSHOT} results in version to be {@code
- *       "${project.version}-SNAPSHOT"}. {@code RELEASE} results in versions to be whatever is
- *       specified in the SDKs gradle.properties. Additionally when {@code RELEASE} is specified,
- *       the release validates the pom to make sure no SDKs point to unreleased SDKs.
- *   <li>{@code projectsToPublishSeparator}: separates project names in the {@code
- *       projectsToPublish} parameter. Default is: ",".
- *       <p>The artifacts will be built to build/m2repository.zip
- *       <p><strong>Prepare release(to maven local)</strong>
- *       <p>Same as above but publishes artifacts to maven local.
- *       <pre>
- * ./gradlew -PprojectsToPublish="firebase-inappmessaging,firebase-inappmessaging-display"\
- *           -PpublishMode=(RELEASE|SNAPSHOT) \
- *           publishProjectsToMavenLocal
- * </pre>
- */
-public class PublishingPlugin implements Plugin<Project> {
-
-  public PublishingPlugin() {}
-
-  @Override
-  public void apply(Project project) {
-    String projectNamesToPublish = getPropertyOr(project, "projectsToPublish", "");
-    String projectsToPublishSeparator = getPropertyOr(project, "projectsToPublishSeparator", ",");
-    Mode publishMode = Enum.valueOf(Mode.class, getPropertyOr(project, "publishMode", "SNAPSHOT"));
-
-    Task publishAllToLocal = project.task("publishAllToLocal");
-    Task publishAllToBuildDir = project.task("publishAllToBuildDir");
-    Task firebasePublish = project.task("firebasePublish");
-
-    project
-        .getGradle()
-        .projectsEvaluated(
-            gradle -> {
-              Set<FirebaseLibraryExtension> projectsToPublish =
-                  Arrays.stream(projectNamesToPublish.split(projectsToPublishSeparator, -1))
-                      .filter(name -> !name.isEmpty())
-                      .map(
-                          name ->
-                              project
-                                  .project(name)
-                                  .getExtensions()
-                                  .getByType(FirebaseLibraryExtension.class))
-                      .flatMap(lib -> lib.getLibrariesToRelease().stream())
-                      .collect(Collectors.toSet());
-              project
-                  .getExtensions()
-                  .getExtraProperties()
-                  .set("projectsToPublish", projectsToPublish);
-
-              Publisher publisher = new Publisher(publishMode, projectsToPublish);
-              project.subprojects(
-                  sub -> {
-                    FirebaseLibraryExtension firebaseLibrary =
-                        sub.getExtensions().findByType(FirebaseLibraryExtension.class);
-                    if (firebaseLibrary == null) {
-                      return;
-                    }
-
-                    sub.apply(ImmutableMap.of("plugin", AndroidMavenPublishPlugin.class));
-                    PublishingExtension publishing =
-                        sub.getExtensions().getByType(PublishingExtension.class);
-                    publishing.repositories(
-                        repos ->
-                            repos.maven(
-                                repo -> {
-                                  repo.setUrl(
-                                      URI.create(
-                                          "file://"
-                                              + sub.getRootProject().getBuildDir()
-                                              + "/m2repository"));
-                                  repo.setName("BuildDir");
-                                }));
-                    publishing.publications(
-                        publications ->
-                            publications.create(
-                                "mavenAar",
-                                MavenPublication.class,
-                                publication -> {
-                                  publication.from(
-                                      sub.getComponents()
-                                          .findByName(firebaseLibrary.type.getComponentName()));
-                                  publication.setArtifactId(firebaseLibrary.artifactId.get());
-                                  publication.setGroupId(firebaseLibrary.groupId.get());
-                                  if (firebaseLibrary.publishSources) {
-                                    publication.artifact(
-                                        sub.getTasks()
-                                            .create(
-                                                "sourceJar",
-                                                Jar.class,
-                                                jar -> {
-                                                  jar.from(firebaseLibrary.getSrcDirs());
-                                                  jar.getArchiveClassifier().set("sources");
-                                                }));
-                                  }
-                                  firebaseLibrary.applyPomCustomization(publication.getPom());
-                                  publisher.decorate(firebaseLibrary, publication);
-                                }));
-                    publishAllToLocal.dependsOn(
-                        sub.getPath() + ":publishMavenAarPublicationToMavenLocal");
-                    publishAllToBuildDir.dependsOn(
-                        sub.getPath() + ":publishMavenAarPublicationToBuildDirRepository");
-                  });
-              project
-                  .getTasks()
-                  .create(
-                      "publishProjectsToMavenLocal",
-                      t -> {
-                        for (FirebaseLibraryExtension toPublish : projectsToPublish) {
-                          t.dependsOn(getPublishTask(toPublish, "MavenLocal"));
-                        }
-                      });
-              Task publishProjectsToBuildDir =
-                  project
-                      .getTasks()
-                      .create(
-                          "publishProjectsToBuildDir",
-                          t -> {
-                            for (FirebaseLibraryExtension toPublish : projectsToPublish) {
-                              t.dependsOn(getPublishTask(toPublish, "BuildDirRepository"));
-                              t.dependsOn(toPublish.getPath() + ":kotlindoc");
-                            }
-                          });
-              Zip buildMavenZip =
-                  project
-                      .getTasks()
-                      .create(
-                          "buildMavenZip",
-                          Zip.class,
-                          zip -> {
-                            zip.dependsOn(publishProjectsToBuildDir);
-                            zip.getArchiveFileName().set("m2repository.zip");
-                            zip.getDestinationDirectory().set(project.getBuildDir());
-                            zip.from(project.getBuildDir() + "/m2repository");
-                          });
-              Zip buildKotlindocZip =
-                  project
-                      .getTasks()
-                      .create(
-                          "buildKotlindocZip",
-                          Zip.class,
-                          zip -> {
-                            zip.dependsOn(publishProjectsToBuildDir);
-                            zip.getArchiveFileName().set("kotlindoc.zip");
-                            zip.getDestinationDirectory().set(project.getBuildDir());
-                            zip.from(project.getBuildDir() + "/firebase-kotlindoc");
-                          });
-              Task info =
-                  project
-                      .getTasks()
-                      .create(
-                          "publishPrintInfo",
-                          t ->
-                              publishAllToLocal.doLast(
-                                  it ->
-                                      project
-                                          .getLogger()
-                                          .lifecycle(
-                                              "Publishing the following libraries:\n{}",
-                                              projectsToPublish.stream()
-                                                  .map(FirebaseLibraryExtension::getPath)
-                                                  .collect(Collectors.joining("\n")))));
-              buildMavenZip.mustRunAfter(info);
-              buildKotlindocZip.mustRunAfter(info);
-              firebasePublish.dependsOn(info, buildMavenZip, buildKotlindocZip);
-            });
-  }
-
-  private static String getPropertyOr(Project p, String property, String defaultValue) {
-    Object value = p.findProperty(property);
-    if (value != null) {
-      return value.toString();
-    }
-    return defaultValue;
-  }
-
-  private static String getPublishTask(FirebaseLibraryExtension p, String repoName) {
-    return p.getPath() + ":publishMavenAarPublicationTo" + repoName;
-  }
-}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/AccessDescriptor.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/AccessDescriptor.kt
new file mode 100644
index 00000000000..ccea115da0c
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/AccessDescriptor.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins.semver
+
+import org.objectweb.asm.Opcodes
+
+/**
+ * Convenience class that helps avoid confusing (if more performant) bitwise checks against {@link
+ * Opcodes}
+ */
+class AccessDescriptor(private val access: Int) {
+  fun isProtected(): Boolean = accessIs(Opcodes.ACC_PROTECTED)
+
+  fun isPublic(): Boolean = accessIs(Opcodes.ACC_PUBLIC)
+
+  fun isStatic(): Boolean = accessIs(Opcodes.ACC_STATIC)
+
+  fun isSynthetic(): Boolean = accessIs(Opcodes.ACC_SYNTHETIC)
+
+  fun isBridge(): Boolean = accessIs(Opcodes.ACC_BRIDGE)
+
+  fun isAbstract(): Boolean = accessIs(Opcodes.ACC_ABSTRACT)
+
+  fun isFinal(): Boolean = accessIs(Opcodes.ACC_FINAL)
+
+  fun isPrivate(): Boolean = !this.isProtected() && !this.isPublic()
+
+  fun getVerboseDescription(): String {
+    val outputStringList = mutableListOf<String>()
+    if (this.isPublic()) {
+      outputStringList.add("public")
+    }
+    if (this.isPrivate()) {
+      outputStringList.add("private")
+    }
+    if (this.isProtected()) {
+      outputStringList.add("protected")
+    }
+    if (this.isStatic()) {
+      outputStringList.add("static")
+    }
+    if (this.isFinal()) {
+      outputStringList.add("final")
+    }
+    if (this.isAbstract()) {
+      outputStringList.add("abstract")
+    }
+    return outputStringList.joinToString(" ")
+  }
+  /** Returns true if the given access modifier matches the given opcode. */
+  fun accessIs(opcode: Int): Boolean = (access and opcode) != 0
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt
new file mode 100644
index 00000000000..6796a55f190
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins.semver
+
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.util.jar.JarEntry
+import java.util.jar.JarInputStream
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+import org.objectweb.asm.ClassReader
+import org.objectweb.asm.tree.ClassNode
+
+abstract class ApiDiffer : DefaultTask() {
+  @get:Input abstract val currentJar: Property<String>
+
+  @get:Input abstract val previousJar: Property<String>
+
+  @get:Input abstract val version: Property<String>
+
+  @get:Input abstract val previousVersionString: Property<String>
+
+  private val CLASS_EXTENSION = ".class"
+
+  @TaskAction
+  fun run() {
+    if (version.get().contains("beta") || previousVersionString.get().isNullOrEmpty()) {
+      return
+    }
+    val (pMajor, pMinor, _) = previousVersionString.get().split(".")
+    val (major, minor, _) = version.get().split(".")
+    val curVersionDelta: VersionDelta =
+      if (major > pMajor) VersionDelta.MAJOR
+      else if (minor > pMinor) VersionDelta.MINOR else VersionDelta.PATCH
+    val afterJar = readApi(currentJar.get())
+    val beforeJar = readApi(previousJar.get())
+    val classKeys = afterJar.keys union beforeJar.keys
+    val apiDeltas =
+      classKeys
+        .map { className -> Pair(beforeJar.get(className), afterJar.get(className)) }
+        .flatMap { (before, after) ->
+          DeltaType.values().flatMap { it.getViolations(before, after) }
+        }
+    val deltaViolations: List<Delta> =
+      if (curVersionDelta == VersionDelta.MINOR)
+        apiDeltas.filter { it.versionDelta == VersionDelta.MAJOR }
+      else if (curVersionDelta == VersionDelta.PATCH) apiDeltas else mutableListOf()
+    if (!apiDeltas.isEmpty()) {
+      val printString =
+        apiDeltas.joinToString(
+          prefix =
+            "Here is a list of all the minor/major version bump changes which are made since the last release.\n",
+          separator = "\n"
+        ) {
+          "[${it.versionDelta}] ${it.description}"
+        }
+      println(printString)
+    }
+    if (!deltaViolations.isEmpty()) {
+      val outputString =
+        deltaViolations.joinToString(
+          prefix =
+            "Here is a list of all the violations which needs to be fixed before we could release.\n",
+          separator = "\n"
+        ) {
+          "[${it.versionDelta}] ${it.description}"
+        }
+      throw GradleException(outputString)
+    }
+  }
+
+  private fun readApi(jarPath: String): Map<String, ClassInfo> {
+    val classes: Map<String, ClassNode> = readClassNodes(Paths.get(jarPath))
+    return classes.entries.associate { (key, value) -> key to ClassInfo(value, classes) }
+  }
+
+  /** Returns true if the class is local or anonymous. */
+  private fun isLocalOrAnonymous(classNode: ClassNode): Boolean {
+    // JVMS 4.7.7 says a class has an EnclosingMethod attribute iff it is local or anonymous.
+    // ASM sets the "enclosing class" only if an EnclosingMethod attribute is present, so this
+    // this test will not include named inner classes even though they have enclosing classes.
+    return classNode.outerClass != null
+  }
+
+  private fun getUnqualifiedClassname(classNodeName: String): String {
+    // Class names may be "/" or "." separated depending on context. Normalize to "/"
+    val normalizedPath = classNodeName.replace(".", "/")
+    val withoutPackage = normalizedPath.substring(normalizedPath.lastIndexOf('/') + 1)
+    return withoutPackage.substring(withoutPackage.lastIndexOf('$') + 1)
+  }
+
+  fun readClassNodes(jar: Path): Map<String, ClassNode> {
+    val classes: MutableMap<String, ClassNode> = LinkedHashMap()
+    val inputStream = Files.newInputStream(jar)
+    val jis = JarInputStream(inputStream)
+    var je: JarEntry? = null
+    while (true) {
+      je = jis.nextJarEntry
+      if (je == null) {
+        break
+      }
+      if (!je.name.endsWith(CLASS_EXTENSION)) {
+        continue
+      }
+      val expectedName = je.name.substring(0, je.name.length - CLASS_EXTENSION.length)
+      val classNode: ClassNode = ClassNode()
+
+      ClassReader(jis).accept(classNode, ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES)
+
+      if (!classNode.name.equals(expectedName)) {
+        logger.error(
+          "Classnode doesn't match expected name ${classNode.name}. This is not a valid jar."
+        )
+        continue
+      }
+      // Skip classes that appear to be obfuscated.
+      if (UtilityClass.isObfuscatedSymbol(getUnqualifiedClassname(classNode.name))) {
+        continue
+      }
+      // Skip local and anonymous classes.
+      if (isLocalOrAnonymous(classNode)) {
+        continue
+      }
+      // Skip private nested classes
+      if (!classes.containsKey(classNode.name)) {
+        classes.put(classNode.name, classNode)
+      } else {
+        project.logger.info("Duplicate class seen: ${classNode.name}")
+      }
+    }
+    return classes
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ClassInfo.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ClassInfo.kt
new file mode 100644
index 00000000000..c9db9a3fe9e
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ClassInfo.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins.semver
+
+import org.objectweb.asm.tree.ClassNode
+import org.objectweb.asm.tree.FieldNode
+import org.objectweb.asm.tree.MethodNode
+
+class ClassInfo(node: ClassNode, classNodes: Map<String, ClassNode>) {
+  val name: String
+  val node: ClassNode
+  val fields: Map<String, FieldNode>
+  val methods: Map<String, MethodNode>
+  val methodsCache: MutableMap<String, Map<String, MethodNode>>
+
+  init {
+    this.name = node.name
+    this.node = node
+    this.fields = getAllFields(node)
+    this.methodsCache = mutableMapOf()
+    this.methods = getAllMethods(node, classNodes)
+  }
+
+  fun getAllFields(node: ClassNode): Map<String, FieldNode> =
+    node.fields
+      .filterNot {
+        AccessDescriptor(it.access).isSynthetic() || UtilityClass.isObfuscatedSymbol(it.name)
+      }
+      .associate { field -> "${field.name}-${field.desc}" to field }
+
+  fun getAllMethods(node: ClassNode, classNodes: Map<String, ClassNode>): Map<String, MethodNode> =
+    getAllStaticMethods(node) + getAllNonStaticMethods(node, classNodes)
+
+  fun getAllStaticMethods(node: ClassNode): Map<String, MethodNode> =
+    node.methods
+      .filterNot {
+        !AccessDescriptor(it.access).isStatic() || AccessDescriptor(it.access).isSynthetic()
+      }
+      .filterNot { UtilityClass.isObfuscatedSymbol(it.name) || it.name.equals("<clint>") }
+      .associate { method -> "${method.name}-${method.desc}" to method }
+
+  fun getAllNonStaticMethods(
+    node: ClassNode?,
+    classNodes: Map<String, ClassNode>
+  ): Map<String, MethodNode> {
+    if (node == null) {
+      return emptyMap()
+    }
+    if (methodsCache.containsKey(node.name)) {
+      return methodsCache.get(node.name)!!
+    }
+    val result: MutableMap<String, MethodNode> =
+      node.methods
+        .filterNot {
+          (AccessDescriptor(it.access).isSynthetic() ||
+            AccessDescriptor(it.access).isBridge() ||
+            AccessDescriptor(it.access).isStatic())
+        }
+        .filterNot { UtilityClass.isObfuscatedSymbol(it.name) }
+        .associate { method -> "${method.name}-${method.desc}" to method }
+        as MutableMap<String, MethodNode>
+
+    if (node.superName != null) {
+      result.putAll(getAllNonStaticMethods(classNodes.get(node.superName), classNodes))
+    }
+    if (node.interfaces != null) {
+      for (interfaceName in node.interfaces) {
+        result.putAll(getAllNonStaticMethods(classNodes.get(interfaceName), classNodes))
+      }
+    }
+    methodsCache.put(node.name, result)
+    return result
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/Delta.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/Delta.kt
new file mode 100644
index 00000000000..28263051f7b
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/Delta.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins.semver
+
+/** Encapsulation of a change between two APIs. */
+data class Delta(
+  val className: String,
+  val memberName: String,
+  val description: String,
+  val deltaType: DeltaType,
+  val versionDelta: VersionDelta,
+)
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt
new file mode 100644
index 00000000000..23197285773
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt
@@ -0,0 +1,689 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins.semver
+
+import org.objectweb.asm.Type
+import org.objectweb.asm.tree.ClassNode
+import org.objectweb.asm.tree.FieldNode
+import org.objectweb.asm.tree.MethodNode
+
+enum class DeltaType {
+  REMOVED_CLASS {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      val apiDeltas = mutableListOf<Delta>()
+      if (before == null) return apiDeltas
+      val beforeAccess = AccessDescriptor(before.node.access)
+      if (after == null && !beforeAccess.isPrivate()) {
+        apiDeltas.add(
+          Delta(
+            before.name,
+            "",
+            String.format("Class %s removed.", before.name),
+            REMOVED_CLASS,
+            VersionDelta.MAJOR
+          )
+        )
+      }
+      return apiDeltas
+    }
+  },
+  REMOVED_METHOD {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      val beforeMethods =
+        getAllMethods(before).filter { (key, value) ->
+          val accessDescriptor = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) && !accessDescriptor.isPrivate()
+        }
+      val afterMethods =
+        getAllMethods(after).filter { (key, value) ->
+          val accessDescriptor = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) && !accessDescriptor.isPrivate()
+        }
+      return (beforeMethods.keys subtract afterMethods.keys).map {
+        val method = beforeMethods.get(it)
+        Delta(
+          before!!.name,
+          method!!.name,
+          String.format(
+            "Method %s on class %s was removed.",
+            getMethodSignature(method),
+            before.name
+          ),
+          REMOVED_METHOD,
+          VersionDelta.MAJOR
+        )
+      }
+    }
+  },
+  REMOVED_FIELD {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      val beforeFields =
+        getAllFields(before).filter { (key, value) ->
+          val accessDescriptor = AccessDescriptor(value.access)
+          !hasNonPublicFieldSignature(value) && !accessDescriptor.isPrivate()
+        }
+      val afterFields =
+        getAllFields(after).filter { (key, value) ->
+          val accessDescriptor = AccessDescriptor(value.access)
+          !hasNonPublicFieldSignature(value) && !accessDescriptor.isPrivate()
+        }
+      return (beforeFields.keys subtract afterFields.keys).map {
+        val field = beforeFields.get(it)
+        Delta(
+          before!!.name,
+          field!!.name,
+          String.format("Field %s on class %s was removed.", field.name, before.name),
+          REMOVED_FIELD,
+          VersionDelta.MAJOR
+        )
+      }
+    }
+  },
+  REDUCED_VISIBILITY {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      if (before == null || after == null) return emptyList()
+      val allBeforeFields = getAllFields(before)
+      val allAfterFields = getAllFields(after)
+      val allBeforeMethods = getAllMethods(before)
+      val allAfterMethods = getAllMethods(after)
+      val publicBeforeFields =
+        allBeforeFields.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicFieldSignature(value) && allAfterFields.containsKey(key) && access.isPublic()
+        }
+      val protectedBeforeFields =
+        allBeforeFields.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicFieldSignature(value) &&
+            allAfterFields.containsKey(key) &&
+            access.isProtected()
+        }
+      val nonPublicFields =
+        allAfterFields.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicFieldSignature(value) &&
+            allBeforeFields.containsKey(key) &&
+            !access.isPublic()
+        }
+      val privateFields =
+        allAfterFields.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicFieldSignature(value) &&
+            allBeforeFields.containsKey(key) &&
+            access.isPrivate()
+        }
+      val publicBeforeMethods =
+        allBeforeMethods.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) &&
+            allAfterMethods.containsKey(key) &&
+            access.isPublic()
+        }
+      val protectedBeforeMethods =
+        allBeforeMethods.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) &&
+            allAfterMethods.containsKey(key) &&
+            access.isProtected()
+        }
+      val nonPublicMethods =
+        allAfterMethods.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) &&
+            allBeforeMethods.containsKey(key) &&
+            !access.isPublic()
+        }
+      val privateMethods =
+        allAfterMethods.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) &&
+            allBeforeMethods.containsKey(key) &&
+            access.isPrivate()
+        }
+      val apiDeltas = mutableListOf<Delta>()
+      val beforeAccess = AccessDescriptor(before.node.access)
+      val afterAccess = AccessDescriptor(after.node.access)
+      if (
+        (beforeAccess.isPublic() && !afterAccess.isPublic()) ||
+          (beforeAccess.isProtected() && afterAccess.isPrivate())
+      ) {
+        apiDeltas.add(
+          Delta(
+            after.name,
+            "",
+            String.format("Class %s has reduced visibility.", after.name),
+            REDUCED_VISIBILITY,
+            VersionDelta.MAJOR
+          )
+        )
+      }
+
+      ((publicBeforeMethods.keys intersect nonPublicMethods.keys) union
+          (protectedBeforeMethods.keys intersect privateMethods.keys))
+        .forEach {
+          val method =
+            if (allAfterMethods.get(it) != null) allAfterMethods.get(it)
+            else allBeforeMethods.get(it)
+          apiDeltas.add(
+            Delta(
+              after.name,
+              method!!.name,
+              String.format(
+                "Method %s on class %s has reduced its visiblity.",
+                getMethodSignature(method),
+                after.name
+              ),
+              REDUCED_VISIBILITY,
+              VersionDelta.MAJOR
+            )
+          )
+        }
+
+      ((publicBeforeFields.keys intersect nonPublicFields.keys) union
+          (protectedBeforeFields.keys intersect privateFields.keys))
+        .forEach {
+          val field =
+            if (allAfterFields.get(it) != null) allAfterFields.get(it) else allBeforeFields.get(it)
+          apiDeltas.add(
+            Delta(
+              after.name,
+              field!!.name,
+              String.format(
+                "Field %s on class %s has reduced its visiblity.",
+                field.name,
+                after.name
+              ),
+              REDUCED_VISIBILITY,
+              VersionDelta.MAJOR
+            )
+          )
+        }
+      return apiDeltas
+    }
+  },
+  CHANGED_TO_STATIC {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      val allBeforeMethods = getAllMethods(before)
+      val allAfterMethods = getAllMethods(after)
+      val afterStaticMethods =
+        allAfterMethods.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) &&
+            allBeforeMethods.containsKey(key) &&
+            access.isStatic()
+        }
+      val beforeStaticMethods =
+        allBeforeMethods.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) &&
+            allBeforeMethods.containsKey(key) &&
+            access.isStatic()
+        }
+      return (afterStaticMethods.keys subtract beforeStaticMethods.keys).map {
+        val method = allAfterMethods.get(it)
+        Delta(
+          after!!.name,
+          method!!.name,
+          String.format("Method %s on class %s became static.", getMethodSignature(method), after),
+          CHANGED_TO_STATIC,
+          VersionDelta.MAJOR
+        )
+      }
+    }
+  },
+  NEW_EXCEPTIONS {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      val allBeforeMethods = getAllMethods(before)
+      val allAfterMethods = getAllMethods(after)
+      val apiDeltas = mutableListOf<Delta>()
+      (allAfterMethods.keys intersect allBeforeMethods.keys).forEach {
+        val afterMethod = allAfterMethods.get(it)
+        val beforeMethod = allBeforeMethods.get(it)
+        if (!beforeMethod!!.exceptions.containsAll(afterMethod!!.exceptions)) {
+          apiDeltas.add(
+            Delta(
+              after!!.name,
+              afterMethod!!.name,
+              String.format(
+                "Method %s on class %s throws new exceptions.",
+                getMethodSignature(afterMethod),
+                after.name
+              ),
+              NEW_EXCEPTIONS,
+              VersionDelta.MINOR
+            )
+          )
+        }
+      }
+      return apiDeltas
+    }
+  },
+  DELETE_EXCEPTIONS {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      val allBeforeMethods = getAllMethods(before)
+      val allAfterMethods = getAllMethods(after)
+      val apiDeltas = mutableListOf<Delta>()
+      (allAfterMethods.keys intersect allBeforeMethods.keys).forEach {
+        val afterMethod = allAfterMethods.get(it)
+        val beforeMethod = allBeforeMethods.get(it)
+        if (!afterMethod!!.exceptions.containsAll(beforeMethod!!.exceptions)) {
+          apiDeltas.add(
+            Delta(
+              after!!.name,
+              afterMethod!!.name,
+              String.format(
+                "Method %s on class %s throws fewer exceptions.",
+                getMethodSignature(afterMethod),
+                after.name
+              ),
+              DELETE_EXCEPTIONS,
+              VersionDelta.MAJOR
+            )
+          )
+        }
+      }
+      return apiDeltas
+    }
+  },
+  CLASS_MADE_ABSTRACT {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      if (before == null || after == null) return emptyList()
+      val apiDeltas = mutableListOf<Delta>()
+      if (
+        AccessDescriptor(after.node.access).isAbstract() &&
+          !AccessDescriptor(before.node.access).isAbstract()
+      ) {
+        apiDeltas.add(
+          Delta(
+            after.name,
+            "",
+            String.format("Class %s made abstract.", after.name),
+            CLASS_MADE_ABSTRACT,
+            VersionDelta.MAJOR
+          )
+        )
+      }
+      return apiDeltas
+    }
+  },
+  METHOD_MADE_ABSTRACT {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      val allBeforeMethods = getAllMethods(before)
+      val allAfterMethods = getAllMethods(after)
+      val apiDeltas = mutableListOf<Delta>()
+      (allAfterMethods.keys intersect allBeforeMethods.keys).forEach {
+        val afterMethod = allAfterMethods.get(it)
+        val beforeMethod = allBeforeMethods.get(it)
+
+        if (
+          AccessDescriptor(afterMethod!!.access).isAbstract() &&
+            !AccessDescriptor(beforeMethod!!.access).isAbstract()
+        ) {
+          apiDeltas.add(
+            Delta(
+              after!!.name,
+              afterMethod!!.name,
+              String.format(
+                "Method %s on class %s became abstract.",
+                getMethodSignature(afterMethod),
+                after.name
+              ),
+              METHOD_MADE_ABSTRACT,
+              VersionDelta.MAJOR
+            )
+          )
+        }
+      }
+      return apiDeltas
+    }
+  },
+  METHOD_MADE_FINAL {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      val allBeforeMethods = getAllMethods(before)
+      val allAfterMethods = getAllMethods(after)
+      val apiDeltas = mutableListOf<Delta>()
+      (allAfterMethods.keys intersect allBeforeMethods.keys).forEach {
+        val afterMethod = allAfterMethods.get(it)
+        val beforeMethod = allBeforeMethods.get(it)
+
+        if (
+          AccessDescriptor(afterMethod!!.access).isFinal() &&
+            !AccessDescriptor(beforeMethod!!.access).isFinal()
+        ) {
+          apiDeltas.add(
+            Delta(
+              after!!.name,
+              afterMethod!!.name,
+              String.format(
+                "Method %s on class %s became final.",
+                getMethodSignature(afterMethod),
+                after.name
+              ),
+              METHOD_MADE_FINAL,
+              VersionDelta.MAJOR
+            )
+          )
+        }
+      }
+      return apiDeltas
+    }
+  },
+  CLASS_MADE_FINAL {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      if (before == null || after == null) return emptyList()
+      val apiDeltas = mutableListOf<Delta>()
+      if (
+        AccessDescriptor(after.node.access).isFinal() &&
+          !AccessDescriptor(before.node.access).isFinal()
+      ) {
+        apiDeltas.add(
+          Delta(
+            after.name,
+            "",
+            String.format("Class %s made abstract.", after.name),
+            CLASS_MADE_FINAL,
+            VersionDelta.MAJOR
+          )
+        )
+      }
+      return apiDeltas
+    }
+  },
+  ADDED_CLASS {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      val apiDeltas = mutableListOf<Delta>()
+      if (after == null) return apiDeltas
+      val afterAccess = AccessDescriptor(after.node.access)
+      if (before == null && !afterAccess.isPrivate()) {
+        apiDeltas.add(
+          Delta(
+            after.name,
+            "",
+            String.format("Class %s added.", after.name),
+            ADDED_CLASS,
+            VersionDelta.MINOR
+          )
+        )
+      }
+      return apiDeltas
+    }
+  },
+  ADDED_METHOD {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      val beforeMethods =
+        getAllMethods(before).filter { (key, value) ->
+          val accessDescriptor = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) && !accessDescriptor.isPrivate()
+        }
+      val afterMethods =
+        getAllMethods(after).filter { (key, value) ->
+          val accessDescriptor = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) && !accessDescriptor.isPrivate()
+        }
+      return (afterMethods.keys subtract beforeMethods.keys).map {
+        val method = afterMethods.get(it)
+        Delta(
+          after!!.name,
+          method!!.name,
+          String.format("Method %s on class %s was added.", getMethodSignature(method), after.name),
+          ADDED_METHOD,
+          VersionDelta.MINOR
+        )
+      }
+    }
+  },
+  ADDED_FIELD {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      val beforeFields =
+        getAllFields(before).filter { (key, value) ->
+          val accessDescriptor = AccessDescriptor(value.access)
+          !hasNonPublicFieldSignature(value) && !accessDescriptor.isPrivate()
+        }
+      val afterFields =
+        getAllFields(after).filter { (key, value) ->
+          val accessDescriptor = AccessDescriptor(value.access)
+          !hasNonPublicFieldSignature(value) && !accessDescriptor.isPrivate()
+        }
+
+      return (afterFields.keys subtract beforeFields.keys).map {
+        val field = afterFields[it]
+        Delta(
+          after!!.name,
+          field!!.name,
+          String.format("Field %s on class %s was added.", field.name, after.name),
+          ADDED_FIELD,
+          VersionDelta.MINOR
+        )
+      }
+    }
+  },
+  INCREASED_VISIBILITY {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      if (before == null || after == null) return emptyList()
+      val allBeforeFields = getAllFields(before)
+      val allAfterFields = getAllFields(after)
+      val allBeforeMethods = getAllMethods(before)
+      val allAfterMethods = getAllMethods(after)
+      val publicAfterFields =
+        allAfterFields.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicFieldSignature(value) &&
+            allBeforeFields.containsKey(key) &&
+            access.isPublic()
+        }
+      val protectedAfterFields =
+        allAfterFields.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicFieldSignature(value) &&
+            allBeforeFields.containsKey(key) &&
+            access.isProtected()
+        }
+      val nonPublicFields =
+        allBeforeFields.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicFieldSignature(value) &&
+            allAfterFields.containsKey(key) &&
+            !access.isPublic()
+        }
+      val privateFields =
+        allBeforeFields.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicFieldSignature(value) &&
+            allAfterFields.containsKey(key) &&
+            access.isPrivate()
+        }
+      val publicAfterMethods =
+        allAfterMethods.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) &&
+            allBeforeMethods.containsKey(key) &&
+            access.isPublic()
+        }
+      val protectedAfterMethods =
+        allAfterMethods.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) &&
+            allBeforeMethods.containsKey(key) &&
+            access.isProtected()
+        }
+      val nonPublicMethods =
+        allBeforeMethods.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) &&
+            allAfterMethods.containsKey(key) &&
+            !access.isPublic()
+        }
+      val privateMethods =
+        allBeforeMethods.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) &&
+            allAfterMethods.containsKey(key) &&
+            access.isPrivate()
+        }
+      val apiDeltas = mutableListOf<Delta>()
+      val beforeAccess = AccessDescriptor(before.node.access)
+      val afterAccess = AccessDescriptor(after.node.access)
+      if (
+        (afterAccess.isPublic() && !beforeAccess.isPublic()) ||
+          (afterAccess.isProtected() && beforeAccess.isPrivate())
+      ) {
+        apiDeltas.add(
+          Delta(
+            after.name,
+            "",
+            String.format("Class %s has increased visibility.", after.name),
+            INCREASED_VISIBILITY,
+            VersionDelta.MINOR
+          )
+        )
+      }
+
+      ((publicAfterMethods.keys intersect nonPublicMethods.keys) union
+          ((protectedAfterMethods.keys) intersect privateMethods.keys))
+        .forEach {
+          val method = allAfterMethods.get(it)
+          apiDeltas.add(
+            Delta(
+              after.name,
+              method!!.name,
+              String.format(
+                "Method %s on class %s has increased its visiblity.",
+                getMethodSignature(method),
+                after.name
+              ),
+              INCREASED_VISIBILITY,
+              VersionDelta.MINOR
+            )
+          )
+        }
+
+      ((publicAfterFields.keys intersect nonPublicFields.keys) union
+          (protectedAfterFields.keys intersect privateFields.keys))
+        .forEach {
+          val field = allAfterFields.get(it)
+          apiDeltas.add(
+            Delta(
+              after.name,
+              field!!.name,
+              String.format(
+                "Field %s on class %s has reduced its visiblity.",
+                field.name,
+                after.name
+              ),
+              INCREASED_VISIBILITY,
+              VersionDelta.MINOR
+            )
+          )
+        }
+      return apiDeltas
+    }
+  },
+  CHANGED_FROM_STATIC {
+    override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      val allBeforeMethods = getAllMethods(before)
+      val allAfterMethods = getAllMethods(after)
+      val afterStaticMethods =
+        allAfterMethods.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) &&
+            allBeforeMethods.containsKey(key) &&
+            access.isStatic()
+        }
+      val beforeStaticMethods =
+        allBeforeMethods.filter { (key, value) ->
+          val access = AccessDescriptor(value.access)
+          !hasNonPublicMethodSignature(value) &&
+            allBeforeMethods.containsKey(key) &&
+            access.isStatic()
+        }
+
+      return (beforeStaticMethods.keys subtract afterStaticMethods.keys).map {
+        val method = beforeStaticMethods.get(it)
+        Delta(
+          after!!.name,
+          method!!.name,
+          String.format("Method %s on class %s removed static.", getMethodSignature(method), after),
+          CHANGED_FROM_STATIC,
+          VersionDelta.MINOR
+        )
+      }
+    }
+  };
+
+  abstract fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta>
+
+  fun getAllFields(classInfo: ClassInfo?): Map<String, FieldNode> {
+    if (classInfo == null) return emptyMap()
+    return classInfo.fields
+  }
+
+  fun getAllMethods(classInfo: ClassInfo?): Map<String, MethodNode> {
+    if (classInfo == null) return emptyMap()
+    return classInfo.methods
+  }
+
+  fun getMethodSignature(methodNode: MethodNode): String {
+    val parameterTypes = Type.getArgumentTypes(methodNode.desc)
+    var parameterClasses = mutableListOf<String>()
+    for (type in parameterTypes) {
+      parameterClasses.add(type.getClassName())
+    }
+    return String.format(
+      "%s %s %s(%s)",
+      AccessDescriptor(methodNode.access).getVerboseDescription(),
+      Type.getReturnType(methodNode.desc).className,
+      methodNode.name,
+      parameterClasses.joinToString(", ")
+    )
+  }
+
+  fun hasNonPublicMethodSignature(methodNode: MethodNode): Boolean {
+    if (
+      UtilityClass.isObfuscatedSymbol(
+        getUnqualifiedClassname(Type.getReturnType(methodNode.desc).getClassName())
+      )
+    ) {
+      return true
+    }
+
+    val parameterTypes = Type.getArgumentTypes(methodNode.desc)
+    for (type in parameterTypes) {
+      if (UtilityClass.isObfuscatedSymbol(getUnqualifiedClassname(type.getClassName()))) {
+        return true
+      }
+    }
+    return false
+  }
+  /** Returns true if the class is local or anonymous. */
+  fun isLocalOrAnonymous(classNode: ClassNode): Boolean {
+    // JVMS 4.7.7 says a class has an EnclosingMethod attribute iff it is local or anonymous.
+    // ASM sets the "enclosing class" only if an EnclosingMethod attribute is present, so this
+    // this test will not include named inner classes even though they have enclosing classes.
+    return classNode.outerClass != null
+  }
+
+  fun getUnqualifiedClassname(classNodeName: String): String {
+    // Class names may be "/" or "." separated depending on context. Normalize to "/"
+    val normalizedPath = classNodeName.replace(".", "/")
+    val withoutPackage = normalizedPath.substring(normalizedPath.lastIndexOf('/') + 1)
+    return withoutPackage.substring(withoutPackage.lastIndexOf('$') + 1)
+  }
+  fun hasNonPublicFieldSignature(fieldNode: FieldNode): Boolean {
+    val fieldType = Type.getType(fieldNode.desc)
+    return UtilityClass.isObfuscatedSymbol(getUnqualifiedClassname(fieldType.getClassName()))
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt
new file mode 100644
index 00000000000..72beb5302fc
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins.semver
+
+import com.google.firebase.gradle.plugins.GmavenHelper
+import java.net.URL
+import java.nio.file.Files
+import java.nio.file.Paths
+import org.gradle.api.DefaultTask
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+
+abstract class GmavenCopier : DefaultTask() {
+
+  @get:Input abstract val groupId: Property<String>
+
+  @get:Input abstract val aarAndroidFile: Property<Boolean>
+
+  @get:Input abstract val artifactId: Property<String>
+
+  @get:Input abstract val filePath: Property<String>
+
+  @TaskAction
+  fun run() {
+    val mavenHelper = GmavenHelper(groupId.get(), artifactId.get())
+    if (!mavenHelper.isPresentInGmaven()) {
+      return
+    }
+    val gMavenPath =
+      mavenHelper.getArtifactForVersion(
+        mavenHelper.getLatestReleasedVersion(),
+        !aarAndroidFile.get()
+      )
+    URL(gMavenPath).openStream().use { Files.copy(it, Paths.get(filePath.get())) }
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/UtilityClass.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/UtilityClass.kt
new file mode 100644
index 00000000000..f8152e66260
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/UtilityClass.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins.semver
+
+import java.util.*
+
+object UtilityClass {
+  fun isObfuscatedSymbol(symbol: String): Boolean {
+    val normalizedSymbol = symbol.toLowerCase(Locale.ROOT).replace("\\[\\]", "")
+    return normalizedSymbol.startsWith("zz") || normalizedSymbol.startsWith("za")
+  }
+}
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/VersionDelta.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/VersionDelta.kt
new file mode 100644
index 00000000000..eadbf956f3d
--- /dev/null
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/VersionDelta.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins.semver
+
+enum class VersionDelta {
+  MAJOR,
+  MINOR,
+  PATCH,
+}
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/bomgenerator/tagging/GitClientTest.kt b/buildSrc/src/test/kotlin/com/google/firebase/gradle/bomgenerator/tagging/GitClientTest.kt
index a18438b6d78..8b244629634 100644
--- a/buildSrc/src/test/kotlin/com/google/firebase/gradle/bomgenerator/tagging/GitClientTest.kt
+++ b/buildSrc/src/test/kotlin/com/google/firebase/gradle/bomgenerator/tagging/GitClientTest.kt
@@ -1,16 +1,18 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.bomgenerator.tagging
 
@@ -27,72 +29,73 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class GitClientTest {
-    @Rule @JvmField val testGitDirectory = TemporaryFolder()
-    private val branch = AtomicReference<String>()
-    private val commit = AtomicReference<String>()
+  @Rule @JvmField val testGitDirectory = TemporaryFolder()
+  private val branch = AtomicReference<String>()
+  private val commit = AtomicReference<String>()
 
-    private lateinit var executor: ShellExecutor
-    private val handler: (List<String>) -> Unit = { it.forEach(System.out::println) }
+  private lateinit var executor: ShellExecutor
+  private val handler: (List<String>) -> Unit = { it.forEach(System.out::println) }
 
-    @Before
-    fun setup() {
-        testGitDirectory.newFile("hello.txt").writeText("hello git!")
-        executor = ShellExecutor(testGitDirectory.root, System.out::println)
+  @Before
+  fun setup() {
+    testGitDirectory.newFile("hello.txt").writeText("hello git!")
+    executor = ShellExecutor(testGitDirectory.root, System.out::println)
 
-        executor.execute("git init", handler)
-        executor.execute("git config user.email 'GitClientTest@example.com'", handler)
-        executor.execute("git config user.name 'GitClientTest'", handler)
-        executor.execute("git add .", handler)
-        executor.execute("git commit -m 'init_commit'", handler)
-        executor.execute("git status", handler)
+    executor.execute("git init", handler)
+    executor.execute("git config user.email 'GitClientTest@example.com'", handler)
+    executor.execute("git config user.name 'GitClientTest'", handler)
+    executor.execute("git add .", handler)
+    executor.execute("git commit -m 'init_commit'", handler)
+    executor.execute("git status", handler)
 
-        executor.execute("git rev-parse --abbrev-ref HEAD", handler) { branch.set(it[0]) }
-        executor.execute("git rev-parse HEAD", handler) { commit.set(it[0]) }
-    }
+    executor.execute("git rev-parse --abbrev-ref HEAD", handler) { branch.set(it[0]) }
+    executor.execute("git rev-parse HEAD", handler) { commit.set(it[0]) }
+  }
 
-    @Test
-    fun `tag M release version succeeds on local file system`() {
-        val git = GitClient(branch.get(), commit.get(), executor, System.out::println)
-        git.tagReleaseVersion()
-        executor.execute("git tag --points-at HEAD", handler) {
-            Assert.assertTrue(it.stream().anyMatch { x -> x.contains(branch.get()) })
-        }
+  @Test
+  fun `tag M release version succeeds on local file system`() {
+    val git = GitClient(branch.get(), commit.get(), executor, System.out::println)
+    git.tagReleaseVersion()
+    executor.execute("git tag --points-at HEAD", handler) {
+      Assert.assertTrue(it.stream().anyMatch { x -> x.contains(branch.get()) })
     }
+  }
 
-    @Test
-    fun `tag bom version succeeds on local file system`() {
-        val git = GitClient(branch.get(), commit.get(), executor, System.out::println)
-        git.tagBomVersion("1.2.3")
-        executor.execute("git tag --points-at HEAD", handler) {
-            Assert.assertTrue(it.stream().anyMatch { x -> x.contains("bom@1.2.3") })
-        }
+  @Test
+  fun `tag bom version succeeds on local file system`() {
+    val git = GitClient(branch.get(), commit.get(), executor, System.out::println)
+    git.tagBomVersion("1.2.3")
+    executor.execute("git tag --points-at HEAD", handler) {
+      Assert.assertTrue(it.stream().anyMatch { x -> x.contains("bom@1.2.3") })
     }
+  }
 
-    @Test
-    fun `tag product version succeeds on local file system`() {
-        val git = GitClient(branch.get(), commit.get(), executor, System.out::println)
-        git.tagProductVersion("firebase-database", "1.2.3")
-        executor.execute("git tag --points-at HEAD", handler) {
-            Assert.assertTrue(it.stream().anyMatch { x -> x.contains("firebase-database@1.2.3") })
-        }
+  @Test
+  fun `tag product version succeeds on local file system`() {
+    val git = GitClient(branch.get(), commit.get(), executor, System.out::println)
+    git.tagProductVersion("firebase-database", "1.2.3")
+    executor.execute("git tag --points-at HEAD", handler) {
+      Assert.assertTrue(it.stream().anyMatch { x -> x.contains("firebase-database@1.2.3") })
     }
+  }
 
-    @Test
-    fun `tags are pushed to the remote repository`() {
-        Assume.assumeTrue(System.getenv().containsKey("FIREBASE_CI"))
+  @Test
+  fun `tags are pushed to the remote repository`() {
+    Assume.assumeTrue(System.getenv().containsKey("FIREBASE_CI"))
 
-        val mockExecutor = object : ShellExecutor(testGitDirectory.root, System.out::println) {
-            override fun execute(command: String, consumer: Consumer<List<String>>) {
-                consumer.accept(listOf("Received command: $command"))
-            }
+    val mockExecutor =
+      object : ShellExecutor(testGitDirectory.root, System.out::println) {
+        override fun execute(command: String, consumer: Consumer<List<String>>) {
+          consumer.accept(listOf("Received command: $command"))
         }
+      }
 
-        val outputs = mutableListOf<String>()
-        val git = GitClient(branch.get(), commit.get(), mockExecutor) { outputs.add(it) }
-        git.tagBomVersion("1.2.3")
-        git.tagProductVersion("firebase-functions", "1.2.3")
-        git.pushCreatedTags()
+    val outputs = mutableListOf<String>()
+    val git = GitClient(branch.get(), commit.get(), mockExecutor) { outputs.add(it) }
+    git.tagBomVersion("1.2.3")
+    git.tagProductVersion("firebase-functions", "1.2.3")
+    git.pushCreatedTags()
 
-        Assert.assertTrue(outputs.stream().anyMatch { it.contains("git push origin") })
-    }
+    Assert.assertTrue(outputs.stream().anyMatch { it.contains("git push origin") })
+  }
 }
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/FirebaseTestController.kt b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/FirebaseTestController.kt
new file mode 100644
index 00000000000..00831a17877
--- /dev/null
+++ b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/FirebaseTestController.kt
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import io.kotest.matchers.nulls.shouldNotBeNull
+import java.io.File
+import org.gradle.testkit.runner.GradleRunner
+import org.junit.rules.TemporaryFolder
+
+/**
+ * Util class for providing a common ground for tests that need to dynamically create [projects]
+ * [Project].
+ *
+ * This class effectively acts as the root controller during multi module testing. The general
+ * workflow can be defined as such:
+ * - Wrap your test in a [FirebaseTestController]
+ * - Create your test [projects][Project]
+ * - Link your test projects with the controller via [withProjects]
+ * - Use the [GradleRunner] to run your build at the [rootDirectory]
+ * - Use any of the provided extension methods to inspect the build files and make assertions in
+ * your test
+ *
+ * Some example of the provided extension methods are:
+ * - [Project.buildFile]
+ * - [Project.pom]
+ *
+ * To see a more involved example of this workflow, you can take a look at test classes that
+ * implement this class, eg; [UpdatePinnedDependenciesTests] and [PublishingPluginTests].
+ *
+ * @see project
+ * @see createReleaseWithConfig
+ * @see createReleaseWithProjects
+ * @see withProjects
+ *
+ * @property rootDirectory the root [TemporaryFolder] that all files will be created under.
+ */
+class FirebaseTestController(val rootDirectory: TemporaryFolder) {
+
+  /**
+   * The `build.gradle` file for this project under the [rootDirectory].
+   *
+   * @see project
+   */
+  val Project.buildFile: File
+    get() = project(this).childFile("build.gradle")
+
+  /**
+   * The compiled [Pom] for this [Project], or null if not found.
+   *
+   * Looks for the [Pom] file under the root `m2repository`, using a REGEX pattern to find matches
+   * for this [Project]. The file is then converted into a [Pom] via [Pom.parse].
+   *
+   * @see pom
+   */
+  fun Project.pomOrNull(): Pom? {
+    val regex = Regex(".*/${group.replace('.', '/')}/$name/$expectedVersion.*/.*\\.pom$")
+    val repository = rootDirectory.root.childFile("build/m2repository")
+    val pomFile = repository.walk().find { it.isFile && it.path.matches(regex) }
+
+    return pomFile?.let { Pom.parse(it) }
+  }
+
+  /**
+   * The compiled [Pom] for this [Project].
+   *
+   * A variant of [pomOrNull] that makes an assertion that the [Pom] should not be null.
+   *
+   * @see pomOrNull
+   * @see shouldNotBeNull
+   */
+  val Project.pom: Pom
+    get() = pomOrNull().shouldNotBeNull()
+
+  /**
+   * The sub directory for the given [project] under the parent [rootDirectory].
+   *
+   * *Alternatively known as the project's directory*
+   *
+   * @see include
+   */
+  fun project(project: Project) = rootDirectory.root.childFile(project.name)
+
+  /**
+   * Creates a subdirectory for the given [project] under [rootDirectory].
+   *
+   * Will use [Project.generateBuildFile] to create the relevant [buildFile], and will populate the
+   * [AndroidManifest.xml][ANDROID_MANIFEST] accordingly.
+   *
+   * Usually, you don't want to invoke this method yourself, as it will not include the [project] in
+   * the build process. What you're probably looking for is [withProjects].
+   *
+   * @see project
+   * @see withProjects
+   */
+  fun include(project: Project) {
+    rootDirectory.newFolder("${project.name}/src/main")
+    rootDirectory.newFile("${project.name}/build.gradle").writeText(project.generateBuildFile())
+    rootDirectory
+      .newFile("${project.name}/src/main/AndroidManifest.xml")
+      .writeText(ANDROID_MANIFEST)
+  }
+
+  /**
+   * Creates the build files for the root project, and subsequently the provided [projects].
+   *
+   * All of the provided [projects] will be included in the root `settings.gradle` file, such that
+   * they are invoked during the build process.
+   *
+   * @param projects a variable amount of [Project] to create subdirectories for and include in the
+   * build process.
+   *
+   * @see include
+   */
+  fun withProjects(vararg projects: Project) {
+    rootDirectory.newFile("build.gradle").writeText(ROOT_PROJECT)
+    rootDirectory
+      .newFile("settings.gradle")
+      .writeText(projects.joinToString("\n") { "include '${it.path}'" })
+
+    projects.forEach(this::include)
+  }
+
+  /**
+   * Creates a `release.json` file at the [rootDirectory].
+   *
+   * @param release the [ReleaseConfig] to convert into a `json` file.
+   *
+   * @see createReleaseWithProjects
+   */
+  fun createReleaseWithConfig(release: ReleaseConfig) {
+    release.toFile(rootDirectory.newFile("release.json"))
+  }
+
+  /**
+   * Creates a `release.json` file at the [rootDirectory].
+   *
+   * The release will have a [name][ReleaseConfig.name] of `test`. If you would rather have a
+   * different name, then pass your own [ReleaseConfig] instead via [createReleaseWithConfig].
+   *
+   * @param projects a variable amount of [Project] to include in the release file.
+   *
+   * @see createReleaseWithConfig
+   */
+  fun createReleaseWithProjects(vararg projects: Project) {
+    createReleaseWithConfig(ReleaseConfig("test", projects.map { it.path }))
+  }
+
+  companion object {
+    const val ROOT_PROJECT =
+      """
+        buildscript {
+            repositories {
+                google()
+                jcenter()
+                maven {
+                    url 'https://storage.googleapis.com/android-ci/mvn/'
+                    metadataSources {
+                        artifact()
+                    }
+                }
+            }
+        }
+        plugins {
+            id 'PublishingPlugin'
+        }
+
+        configure(subprojects) {
+            repositories {
+                google()
+                jcenter()
+                maven {
+                    url 'https://storage.googleapis.com/android-ci/mvn/'
+                    metadataSources {
+                          artifact()
+                    }
+                }
+            }
+        }
+      """
+
+    const val ANDROID_MANIFEST =
+      """<?xml version="1.0" encoding="utf-8"?>
+        <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+            <uses-sdk android:minSdkVersion="14"/>
+        </manifest>
+        """
+  }
+}
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt
index 98eb22da3c1..8a71a06adad 100644
--- a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt
+++ b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
 
@@ -33,89 +35,100 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class LicenseResolverPluginTests {
 
-    @Rule
-    @JvmField
-    val testProjectDir = TemporaryFolder()
-    private lateinit var buildFile: File
+  @Rule @JvmField val testProjectDir = TemporaryFolder()
+  private lateinit var buildFile: File
 
-    val idempotentBuild: (taskName: String) -> BuildResult
-        get() = this::build.memoize()
+  val idempotentBuild: (taskName: String) -> BuildResult
+    get() = this::build.memoize()
 
-    @Before
-    fun setup() {
-        buildFile = testProjectDir.newFile("build.gradle")
-        testProjectDir.newFolder("src", "main", "java", "com", "example")
-        testProjectDir.newFile("src/main/java/com/example/Foo.java").writeText("package com.example; class Foo {}")
-        testProjectDir.newFile("src/main/AndroidManifest.xml").writeText(MANIFEST)
+  @Before
+  fun setup() {
+    buildFile = testProjectDir.newFile("build.gradle")
+    testProjectDir.newFolder("src", "main", "java", "com", "example")
+    testProjectDir
+      .newFile("src/main/java/com/example/Foo.java")
+      .writeText("package com.example; class Foo {}")
+    testProjectDir.newFile("src/main/AndroidManifest.xml").writeText(MANIFEST)
 
-        buildFile.writeText(BUILD_CONFIG)
-    }
+    buildFile.writeText(BUILD_CONFIG)
+  }
 
-    @Test
-    fun `Generating licenses`() {
-        val result = idempotentBuild("generateLicenses")
-        assertThat(result.task(":generateLicenses")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
+  @Test
+  fun `Generating licenses`() {
+    val result = idempotentBuild("generateLicenses")
+    assertThat(result.task(":generateLicenses")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
 
-        val json = getLicenseJson()
-        val txt = getLicenseText()
+    val json = getLicenseJson()
+    val txt = getLicenseText()
 
-        assertThat(txt).isNotEmpty()
+    assertThat(txt).isNotEmpty()
 
-        assertThat(json).containsKey("customLib1")
+    assertThat(json).containsKey("customLib1")
 
-        assertThat(txt).contains("customLib1")
-        assertThat(txt).contains("Test license")
-        val (start, length) = json["customLib1"]!!
-        assertThat(txt.substring(start, start + length).trim()).isEqualTo("Test license")
-    }
+    assertThat(txt).contains("customLib1")
+    assertThat(txt).contains("Test license")
+    val (start, length) = json["customLib1"]!!
+    assertThat(txt.substring(start, start + length).trim()).isEqualTo("Test license")
+  }
 
-    @Test
-    fun `License tasks throw useful exception if file URI not found`() {
-        buildFile.writeText("""
+  @Test
+  fun `License tasks throw useful exception if file URI not found`() {
+    buildFile.writeText(
+      """
             plugins {
                 id 'com.android.library'
                 id 'LicenseResolverPlugin'
             }
-            android.compileSdkVersion = 26
+            android {
+              compileSdkVersion 26
+              namespace 'com.example'
+            }
 
             thirdPartyLicenses {
-                add 'customLib', "file:///${File("non_existent_path.txt").absolutePath}"
+                add 'customLib', "${File("non_existent_path.txt").absolutePath}"
             }
-        """)
-
-        val thrown = Assert.assertThrows(UnexpectedBuildFailure::class.java) {
-            build("generateLicenses")
-        }
-
-        assertThat(thrown.message).contains("License file not found")
-    }
-
-    data class FileOffset(val start: Int, val length: Int)
-
-    private fun getLicenseJson(): Map<String, FileOffset> =
-            Gson().fromJson(
-                    File("${testProjectDir.root}/build/generated/third_party_licenses/",
-                            "third_party_licenses.json").readText(),
-                    object : TypeToken<Map<String, FileOffset>>() {}.type)
-
-    private fun getLicenseText(): String =
-            File("${testProjectDir.root}/build/generated/third_party_licenses/",
-                    "third_party_licenses.txt").readText()
-
-    private fun build(taskName: String): BuildResult = GradleRunner.create()
-            .withProjectDir(testProjectDir.root)
-            .withArguments(taskName, "--stacktrace")
-            .withPluginClasspath()
-            .build()
-
-    companion object {
-        const val MANIFEST = """<?xml version="1.0" encoding="utf-8"?>
-        <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-                  package="com.example">
+        """
+    )
+
+    val thrown =
+      Assert.assertThrows(UnexpectedBuildFailure::class.java) { build("generateLicenses") }
+
+    assertThat(thrown.message).contains("License file not found")
+  }
+
+  data class FileOffset(val start: Int, val length: Int)
+
+  private fun getLicenseJson(): Map<String, FileOffset> =
+    Gson()
+      .fromJson(
+        File(
+            "${testProjectDir.root}/build/generated/third_party_licenses/",
+            "third_party_licenses.json"
+          )
+          .readText(),
+        object : TypeToken<Map<String, FileOffset>>() {}.type
+      )
+
+  private fun getLicenseText(): String =
+    File("${testProjectDir.root}/build/generated/third_party_licenses/", "third_party_licenses.txt")
+      .readText()
+
+  private fun build(taskName: String): BuildResult =
+    GradleRunner.create()
+      .withProjectDir(testProjectDir.root)
+      .withArguments(taskName, "--stacktrace")
+      .withPluginClasspath()
+      .build()
+
+  companion object {
+    const val MANIFEST =
+      """<?xml version="1.0" encoding="utf-8"?>
+        <manifest xmlns:android="http://schemas.android.com/apk/res/android">
             <uses-sdk android:minSdkVersion="14"/>
         </manifest>
     """
-        val BUILD_CONFIG = """
+    val BUILD_CONFIG =
+      """
         buildscript {
             repositories {
                 google()
@@ -128,8 +141,11 @@ class LicenseResolverPluginTests {
             id 'LicenseResolverPlugin'
         }
 
-        android.compileSdkVersion = 26
-
+        android {
+          compileSdkVersion 26
+          namespace 'com.example'
+        }
+        
         repositories {
             jcenter()
             google()
@@ -141,8 +157,8 @@ class LicenseResolverPluginTests {
         }
 
         thirdPartyLicenses {
-            add 'customLib1', "file:///${File("src/test/fixtures/license.txt").absolutePath}"
+            add 'customLib1', "${File("src/test/fixtures/license.txt").absolutePath}"
         }
         """
-    }
+  }
 }
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MakeReleaseNotesTests.kt b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MakeReleaseNotesTests.kt
new file mode 100644
index 00000000000..c84e990b03e
--- /dev/null
+++ b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MakeReleaseNotesTests.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.collections.beEmpty
+import io.kotest.matchers.file.exist
+import io.kotest.matchers.should
+import java.io.File
+import org.gradle.testkit.runner.GradleRunner
+import org.junit.BeforeClass
+import org.junit.ClassRule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class MakeReleaseNotesTests : FunSpec() {
+
+  @Test
+  fun `Creates release notes that match the expected output`() {
+    buildReleaseNotes()
+
+    val expectedReleaseNoteFile = testResources.childFile("release-notes.md")
+    val releaseNoteFile =
+      testProjectDirectory.root.childFile(
+        "firebase-storage/build/tmp/makeReleaseNotes/release_notes.md"
+      )
+
+    releaseNoteFile should exist()
+
+    releaseNoteFile.readLines() diff expectedReleaseNoteFile.readLines() should beEmpty()
+  }
+
+  private fun buildReleaseNotes() =
+    GradleRunner.create()
+      .withProjectDir(testProjectDirectory.root)
+      .withPluginClasspath()
+      .withArguments("makeReleaseNotes")
+      .build()
+
+  companion object {
+    @ClassRule @JvmField val testProjectDirectory = TemporaryFolder()
+    private val resourcesDirectory = File("src/test/resources")
+    private val basicProject = resourcesDirectory.childFile("BasicProject")
+    private val testResources = resourcesDirectory.childFile("MakeReleaseNotes")
+
+    @BeforeClass
+    @JvmStatic
+    fun setup() {
+      copyFixtureToTempDirectory()
+    }
+
+    private fun copyFixtureToTempDirectory() {
+      basicProject.copyRecursively(testProjectDirectory.root)
+    }
+  }
+}
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/Memoization.kt b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/Memoization.kt
index 7d25f4f835e..055def99b44 100644
--- a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/Memoization.kt
+++ b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/Memoization.kt
@@ -1,24 +1,26 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
 
 class Memoize1<in T, out R>(val f: (T) -> R) : (T) -> R {
-    private val values = mutableMapOf<T, R>()
-    override fun invoke(x: T): R {
-        return values.getOrPut(x, { f(x) })
-    }
+  private val values = mutableMapOf<T, R>()
+  override fun invoke(x: T): R {
+    return values.getOrPut(x, { f(x) })
+  }
 }
 
 fun <T, R> ((T) -> R).memoize(): (T) -> R = Memoize1(this)
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt
new file mode 100644
index 00000000000..d5027399a0f
--- /dev/null
+++ b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import com.google.firebase.gradle.plugins.PreReleaseVersionType.*
+import com.google.firebase.gradle.plugins.VersionType.*
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.*
+import org.junit.Test
+
+class ModuleVersionTests : FunSpec() {
+
+  val numbers = generateSequence(1) { it + 1 }
+  val versionTypes = sequenceOf(*VersionType.values())
+  val preReleaseVersionTypes = sequenceOf(*PreReleaseVersionType.values())
+
+  @Test
+  fun `ModuleVersion#fromString() handles standard valid versions`() {
+    listOf("12.0.1", "1.0.0", "13.6.3-rc", "19.2.3", "11.4.3-beta06", "13.5.4-alpha11")
+      .map { ModuleVersion.fromStringOrNull(it) }
+      .forEach { it shouldNotBe null }
+  }
+
+  @Test
+  fun `PreReleaseVersion#fromStrings() handles standard valid versions`() {
+    listOf("alpha", "bEtA", "rC", "EAP")
+      .map { PreReleaseVersion.fromStringsOrNull(it, "1") }
+      .forEach { it shouldNotBe null }
+  }
+
+  @Test
+  fun `Pre release versions default to build 1 on missing build`() {
+    PreReleaseVersion(ALPHA).build shouldBe 1
+    PreReleaseVersion.fromStringsOrNull("alpha", "")?.build shouldBe 1
+  }
+
+  @Test
+  fun `Pre release versions are double digits`() {
+    numbers.take(20).onEach {
+      PreReleaseVersion(ALPHA, it).toString().takeLast(2).toIntOrNull() shouldBe it
+    }
+  }
+
+  @Test
+  fun `ModuleVersion returns null on invalid versions`() {
+    listOf("12.0.", "1.0.-1", "13.6.3-", "19.2.c", "11.4.3-bet", "13.5.4-01", "")
+      .map { ModuleVersion.fromStringOrNull(it) }
+      .forEach { it shouldBe null }
+  }
+
+  @Test
+  fun `PreReleaseVersion returns null on invalid versions`() {
+    listOf("alph", "bEt", "r", "pea", "", "1", "!")
+      .map { PreReleaseVersion.fromStringsOrNull(it, "1") }
+      .forEach { it shouldBe null }
+  }
+
+  @Test
+  fun `PreReleaseVersion's bump increases the build number`() {
+    numbers.take(20).forEach { PreReleaseVersion(ALPHA, it).bump().build shouldBe it + 1 }
+  }
+
+  @Test
+  fun `Bump handles all version types`() {
+    ModuleVersion(1, 1, 1, PreReleaseVersion(ALPHA, 1)).apply {
+      versionTypes.takeAll().forEach {
+        bump(it).run {
+          when (it) {
+            MAJOR -> major shouldBe 2
+            MINOR -> minor shouldBe 2
+            PATCH -> patch shouldBe 2
+            PRE -> pre?.build shouldBe 2
+          }
+        }
+      }
+    }
+  }
+
+  @Test
+  fun `Bump doesn't incorrectly bump on undefined pre-release`() {
+    ModuleVersion(1, 1, 1).apply { bump(PRE) shouldBe this }
+  }
+
+  @Test
+  fun `Bump correctly chooses the smallest by default`() {
+    ModuleVersion(1, 1, 1).bump().patch shouldBe 2
+    ModuleVersion(1, 1, 1, PreReleaseVersion(ALPHA, 1)).bump().pre?.build shouldBe 2
+  }
+}
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTests.kt b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTests.kt
new file mode 100644
index 00000000000..7917d952397
--- /dev/null
+++ b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTests.kt
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import com.google.firebase.gradle.plugins.ChangeType.FIXED
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.collections.shouldBeEmpty
+import io.kotest.matchers.collections.shouldContainExactly
+import io.kotest.matchers.collections.shouldHaveAtLeastSize
+import io.kotest.matchers.collections.shouldHaveSize
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNot
+import io.kotest.matchers.shouldNotBe
+import io.kotest.matchers.string.beEmpty
+import io.kotest.matchers.string.shouldMatch
+import java.io.File
+import org.gradle.testkit.runner.GradleRunner
+import org.junit.BeforeClass
+import org.junit.ClassRule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class MoveUnreleasedChangesTests : FunSpec() {
+
+  @Test
+  fun `Moves Unreleased changes to a new section`() {
+    val newChangelog = buildWithChangelog(basicChangelog)
+    validateChangelog(basicChangelog, newChangelog)
+  }
+
+  @Test
+  fun `Handles KTX libs`() {
+    val ktxEntry = ReleaseContent("Fixed some bugs:", listOf(Change(FIXED, "that annoying bug")))
+
+    val changelog = basicChangelog.replaceUnreleasedWith { it.copy(ktx = ktxEntry) }
+
+    val newChangelog = buildWithChangelog(changelog)
+    validateChangelog(changelog, newChangelog)
+
+    val releasedEntry = newChangelog.releases[1]
+
+    releasedEntry.ktx shouldBe ktxEntry
+  }
+
+  @Test
+  fun `Uses template text on KTX libs with no changes`() {
+    basicChangelog.releases.first().ktx shouldBe null
+
+    val newChangelog = buildWithChangelog(basicChangelog)
+    validateChangelog(basicChangelog, newChangelog)
+
+    val releasedEntry = newChangelog.releases[1]
+
+    releasedEntry.ktx shouldNotBe null
+    releasedEntry.ktx?.let {
+      it.subtext shouldNot beEmpty()
+      it.changes.shouldBeEmpty()
+    }
+  }
+
+  @Test
+  fun `Handles empty Unreleased sections`() {
+    val changelog = basicChangelog.replaceUnreleasedWith { ReleaseEntry.Empty }
+
+    val newChangelog = buildWithChangelog(changelog)
+
+    newChangelog shouldBe changelog
+  }
+
+  @Test
+  fun `Is idempotent`() {
+    val firstBuild = buildWithChangelog(basicChangelog)
+    val secondBuild = buildWithChangelog(firstBuild)
+
+    firstBuild shouldBe secondBuild
+  }
+
+  private fun Changelog.replaceUnreleasedWith(
+    transform: (ReleaseEntry) -> ReleaseEntry
+  ): Changelog {
+    val (unreleased, previousReleases) = releases.separateAt(1)
+    val newUnreleased = transform(unreleased.single())
+
+    return copy(releases = listOf(newUnreleased) + previousReleases)
+  }
+
+  private fun buildWithChangelog(changelog: Changelog): Changelog {
+    val currentProject = testProjectDirectory.root.childFile("firebase-storage")
+    currentProject.childFile("CHANGELOG.md").writeText(changelog.toString())
+    buildProject()
+
+    return Changelog.fromFile(currentProject.childFile("CHANGELOG.md"))
+  }
+
+  private fun buildProject() =
+    GradleRunner.create()
+      .withProjectDir(testProjectDirectory.root)
+      .withPluginClasspath()
+      .withArguments("moveUnreleasedChanges")
+      .build()
+
+  private fun validateChangelog(original: Changelog, newest: Changelog) {
+    newest.releases shouldHaveAtLeastSize 2
+    newest.releases shouldHaveSize original.releases.size + 1
+    newest.releases.first().hasContent() shouldBe false
+
+    val releasedEntry = newest.releases[1]
+    val originalEntry = original.releases.first()
+
+    releasedEntry.content.changes shouldContainExactly originalEntry.content.changes
+    releasedEntry.content.subtext shouldMatch originalEntry.content.subtext
+  }
+
+  companion object {
+    @ClassRule @JvmField val testProjectDirectory = TemporaryFolder()
+    private val resourcesDirectory = File("src/test/resources")
+    private val basicProject = resourcesDirectory.childFile("BasicProject")
+    private val testResources = resourcesDirectory.childFile("MoveUnreleasedChanges")
+    private val releaseJson = testResources.childFile("release.json")
+
+    private val basicChangelog = Changelog.fromFile(testResources.childFile("basic.md"))
+
+    @BeforeClass
+    @JvmStatic
+    fun setup() {
+      copyFixtureToTempDirectory()
+    }
+
+    private fun copyFixtureToTempDirectory() {
+      basicProject.copyRecursively(testProjectDirectory.root)
+      releaseJson.copyToDirectory(testProjectDirectory.root)
+    }
+  }
+}
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt
index 5c374b52b7e..ee6778f6455 100644
--- a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt
+++ b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt
@@ -1,365 +1,251 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
 
-import com.google.common.truth.Truth.assertThat
-import com.google.firebase.gradle.plugins.publish.Mode
-import java.io.File
+import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder
+import io.kotest.matchers.collections.shouldHaveSingleElement
+import io.kotest.matchers.nulls.shouldNotBeNull
+import io.kotest.matchers.shouldBe
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
-import org.gradle.testkit.runner.TaskOutcome
-import org.gradle.testkit.runner.UnexpectedBuildFailure
-import org.junit.Assert
+import org.gradle.testkit.runner.TaskOutcome.FAILED
+import org.gradle.testkit.runner.TaskOutcome.SUCCESS
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
 
 class PublishingPluginTests {
-    @Rule
-    @JvmField
-    val testProjectDir = TemporaryFolder()
-
-    private val subprojects = mutableListOf<Project>()
-    private lateinit var rootBuildFile: File
-    private lateinit var rootSettingsFile: File
-
-    @Test
-    fun `Publishing dependent projects succeeds`() {
-        val project1 = Project(name = "childProject1", version = "1.0")
-        val project2 = Project(
-                name = "childProject2",
-                version = "0.9",
-                projectDependencies = setOf(project1),
-                customizePom = """
-licenses {
-  license {
-    name = 'Hello'
-  }
-}
-""")
-        subprojectsDefined(project1, project2)
-        val result = publish(Mode.RELEASE, project1, project2)
-        assertThat(result.task(":firebasePublish")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
-
-        val pomOrNull1 = project1.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        val pomOrNull2 = project2.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        assertThat(pomOrNull1).isNotNull()
-        assertThat(pomOrNull2).isNotNull()
-        val pom1 = pomOrNull1!!
-        val pom2 = pomOrNull2!!
-
-        assertThat(pom1.artifact.version).isEqualTo(project1.version)
-        assertThat(pom2.artifact.version).isEqualTo(project2.version)
-        assertThat(pom1.license).isEqualTo(License(
-                "The Apache Software License, Version 2.0",
-                "http://www.apache.org/licenses/LICENSE-2.0.txt"))
-        assertThat(pom2.license).isEqualTo(License(
-                "Hello",
-                ""))
-
-        assertThat(pom2.dependencies).isEqualTo(
-                listOf(Artifact(
-                        groupId = project1.group,
-                        artifactId = project1.name,
-                        version = project1.version,
-                        type = Type.AAR,
-                        scope = "compile")))
+  @Rule @JvmField val testProjectDir = TemporaryFolder()
+  private val controller = FirebaseTestController(testProjectDir)
+
+  @Test
+  fun `Publishing dependent projects succeeds`() {
+    with(controller) {
+      val project1 = Project(name = "childProject1", version = "1.0")
+      val project2 =
+        Project(
+          name = "childProject2",
+          version = "0.9",
+          projectDependencies = setOf(project1),
+          customizePom = """
+  licenses {
+    license {
+      name = 'Hello'
     }
-
-    @Test
-    fun `Publishing dependent projects one of which is a jar succeeds`() {
-        val project1 = Project(name = "childProject1", version = "1.0", libraryType = LibraryType.JAVA)
-        val project2 = Project(
-                name = "childProject2",
-                version = "0.9",
-                projectDependencies = setOf(project1),
-                customizePom = """
-licenses {
-  license {
-    name = 'Hello'
   }
-}
-""")
-        subprojectsDefined(project1, project2)
-        val result = publish(Mode.RELEASE, project1, project2)
-        assertThat(result.task(":firebasePublish")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
-
-        val pomOrNull1 = project1.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        val pomOrNull2 = project2.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        assertThat(pomOrNull1).isNotNull()
-        assertThat(pomOrNull2).isNotNull()
-        val pom1 = pomOrNull1!!
-        val pom2 = pomOrNull2!!
-
-        assertThat(pom1.artifact.version).isEqualTo(project1.version)
-        assertThat(pom2.artifact.version).isEqualTo(project2.version)
-        assertThat(pom1.license).isEqualTo(License(
-                "The Apache Software License, Version 2.0",
-                "http://www.apache.org/licenses/LICENSE-2.0.txt"))
-        assertThat(pom2.license).isEqualTo(License(
-                "Hello",
-                ""))
-
-        assertThat(pom2.dependencies).isEqualTo(
-                listOf(Artifact(
-                        groupId = project1.group,
-                        artifactId = project1.name,
-                        version = project1.version,
-                        type = Type.JAR,
-                        scope = "compile")))
+  """
+        )
+
+      withProjects(project1, project2)
+      publish(project1, project2)
+
+      project1.pom.let {
+        it.artifact.version shouldBe project1.version
+        it.license shouldBe
+          License(
+            "The Apache Software License, Version 2.0",
+            "http://www.apache.org/licenses/LICENSE-2.0.txt"
+          )
+      }
+      project2.pom.let {
+        it.artifact.version shouldBe project2.version
+        it.license shouldBe License("Hello", "")
+        it.dependencies shouldHaveSingleElement project1.toArtifact()
+      }
     }
+  }
 
-    @Test
-    fun `Publish with unreleased dependency`() {
-        val project1 = Project(name = "childProject1", version = "1.0")
-        val project2 = Project(
-                name = "childProject2",
-                version = "0.9",
-                projectDependencies = setOf(project1))
-
-        subprojectsDefined(project1, project2)
-        val exception = Assert.assertThrows(UnexpectedBuildFailure::class.java) {
-            publish(Mode.RELEASE, project2)
-        }
-        assertThat(exception.message).contains("Failed to release com.example:childProject2")
+  @Test
+  fun `Publishing dependent projects one of which is a jar succeeds`() {
+    with(controller) {
+      val project1 =
+        Project(name = "childProject1", version = "1.0", libraryType = LibraryType.JAVA)
+      val project2 =
+        Project(
+          name = "childProject2",
+          version = "0.9",
+          projectDependencies = setOf(project1),
+          customizePom = """
+  licenses {
+    license {
+      name = 'Hello'
     }
+  }
+  """
+        )
 
-    @Test
-    fun `Publish with released dependency`() {
-        val project1 = Project(name = "childProject1", version = "1.0", latestReleasedVersion = "0.8")
-        val project2 = Project(
-                name = "childProject2",
-                version = "0.9",
-                projectDependencies = setOf(project1))
-        subprojectsDefined(project1, project2)
-
-        val result = publish(Mode.RELEASE, project2)
-        assertThat(result.task(":firebasePublish")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
-
-        val pomOrNull1 = project1.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        val pomOrNull2 = project2.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        assertThat(pomOrNull1).isNull()
-        assertThat(pomOrNull2).isNotNull()
-
-        val pom2 = pomOrNull2!!
-        assertThat(pom2.dependencies).isEqualTo(
-                listOf(Artifact(
-                        groupId = project1.group,
-                        artifactId = project1.name,
-                        version = project1.latestReleasedVersion!!,
-                        type = Type.AAR,
-                        scope = "compile")))
+      withProjects(project1, project2)
+      publish(project1, project2)
+
+      project1.pom.let {
+        it.artifact.version shouldBe project1.version
+        it.license shouldBe
+          License(
+            "The Apache Software License, Version 2.0",
+            "http://www.apache.org/licenses/LICENSE-2.0.txt"
+          )
+      }
+      project2.pom.let {
+        it.artifact.version shouldBe project2.version
+        it.license shouldBe License("Hello", "")
+        it.dependencies shouldHaveSingleElement project1.toArtifact()
+      }
     }
+  }
+
+  @Test
+  fun `Publish with unreleased dependency`() {
+    with(controller) {
+      val project1 = Project(name = "childProject1", version = "1.0")
+      val project2 =
+        Project(name = "childProject2", version = "0.9", projectDependencies = setOf(project1))
 
-    @Test
-    fun `Publish all dependent snapshot projects succeeds`() {
-        val project1 = Project(name = "childProject1", version = "1.0")
-        val project2 = Project(
-                name = "childProject2",
-                version = "0.9",
-                projectDependencies = setOf(project1))
-        subprojectsDefined(project1, project2)
-        val result = publish(Mode.SNAPSHOT, project1, project2)
-        assertThat(result.task(":firebasePublish")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
-
-        val pomOrNull1 = project1.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        val pomOrNull2 = project2.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        assertThat(pomOrNull1).isNotNull()
-        assertThat(pomOrNull2).isNotNull()
-
-        val pom1 = pomOrNull1!!
-        val pom2 = pomOrNull2!!
-
-        assertThat(pom1.artifact.version).isEqualTo("${project1.version}-SNAPSHOT")
-        assertThat(pom2.artifact.version).isEqualTo("${project2.version}-SNAPSHOT")
-
-        assertThat(pom2.dependencies).isEqualTo(
-                listOf(Artifact(
-                        groupId = project1.group,
-                        artifactId = project1.name,
-                        version = "${project1.version}-SNAPSHOT",
-                        type = Type.AAR,
-                        scope = "compile")))
+      withProjects(project1, project2)
+      publish(project2)
+
+      project1.pomOrNull().shouldNotBeNull()
+      project2.pom.dependencies shouldHaveSingleElement project1.toArtifact()
     }
+  }
 
-    @Test
-    fun `Publish snapshots with released dependency`() {
-        val project1 = Project(name = "childProject1", version = "1.0", latestReleasedVersion = "0.8")
-        val project2 = Project(
-                name = "childProject2",
-                version = "0.9",
-                projectDependencies = setOf(project1))
-        subprojectsDefined(project1, project2)
-
-        val result = publish(Mode.SNAPSHOT, project2)
-        assertThat(result.task(":firebasePublish")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
-
-        val pomOrNull1 = project1.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        val pomOrNull2 = project2.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        assertThat(pomOrNull1).isNull()
-        assertThat(pomOrNull2).isNotNull()
-
-        val pom2 = pomOrNull2!!
-
-        assertThat(pom2.artifact.version).isEqualTo("${project2.version}-SNAPSHOT")
-        assertThat(pom2.dependencies).isEqualTo(
-                listOf(Artifact(
-                        groupId = project1.group,
-                        artifactId = project1.name,
-                        version = project1.latestReleasedVersion!!,
-                        type = Type.AAR,
-                        scope = "compile")))
+  @Test
+  fun `Publish with very transitive dependency`() {
+    with(controller) {
+      val project1 = Project(name = "childProject1", version = "1.0", libraryGroup = "libraryGroup")
+      val project2 =
+        Project(name = "childProject2", version = "0.9", projectDependencies = setOf(project1))
+      val project3 = Project(name = "childProject3", version = "1.0", libraryGroup = "libraryGroup")
+
+      withProjects(project1, project2, project3)
+      publish(project2)
+
+      project1.pomOrNull().shouldNotBeNull()
+      project3.pomOrNull().shouldNotBeNull()
+      project2.pom.dependencies shouldHaveSingleElement project1.toArtifact()
     }
+  }
+
+  @Test
+  fun `Publish with released dependency`() {
+    with(controller) {
+      val project1 = Project(name = "childProject1", version = "1.0", latestReleasedVersion = "0.8")
+      val project2 =
+        Project(name = "childProject2", version = "0.9", projectDependencies = setOf(project1))
 
-    @Test
-    fun `Publish project should also publish coreleased projects`() {
-        val project1 = Project(name = "childProject1", version = "1.0")
-        val project2 = Project(
-                name = "childProject2",
-                version = "0.9",
-                projectDependencies = setOf(project1),
-                releaseWith = project1)
-        subprojectsDefined(project1, project2)
-
-        val result = publish(Mode.RELEASE, project1)
-        assertThat(result.task(":firebasePublish")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
-
-        val pomOrNull1 = project1.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        val pomOrNull2 = project2.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        assertThat(pomOrNull1).isNotNull()
-        assertThat(pomOrNull2).isNotNull()
-
-        val pom1 = pomOrNull1!!
-        val pom2 = pomOrNull2!!
-
-        assertThat(pom1.artifact.version).isEqualTo(project1.version)
-        assertThat(pom2.artifact.version).isEqualTo(project1.version)
-        assertThat(pom2.dependencies).isEqualTo(
-                listOf(Artifact(
-                        groupId = project1.group,
-                        artifactId = project1.name,
-                        version = project1.version,
-                        type = Type.AAR,
-                        scope = "compile")))
+      withProjects(project1, project2)
+      publish(project2, project1)
+
+      project1.pomOrNull().shouldNotBeNull()
+      project2.pom.dependencies shouldHaveSingleElement project1.toArtifact()
     }
+  }
 
-    @Test
-    fun `Publish project should correctly set dependency types`() {
-        val project1 = Project(name = "childProject1", version = "1.0", latestReleasedVersion = "0.8")
-        val project2 = Project(
-                name = "childProject2",
-                version = "0.9",
-                projectDependencies = setOf(project1),
-                externalDependencies = setOf(
-                        Artifact("com.google.dagger", "dagger", "2.22"),
-                        Artifact("com.google.dagger", "dagger-android-support", "2.22"),
-                        Artifact("com.android.support", "multidex", "1.0.3")
-                ))
-        subprojectsDefined(project1, project2)
-
-        val result = publish(Mode.RELEASE, project2)
-        assertThat(result.task(":firebasePublish")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
-
-        val pomOrNull2 = project2.getPublishedPom("${testProjectDir.root}/build/m2repository")
-        assertThat(pomOrNull2).isNotNull()
-
-        val pom2 = pomOrNull2!!
-        assertThat(pom2.artifact.version).isEqualTo(project2.version)
-        assertThat(pom2.dependencies).containsExactly(
-                Artifact(
-                        groupId = project1.group,
-                        artifactId = project1.name,
-                        version = project1.latestReleasedVersion!!,
-                        type = Type.AAR,
-                        scope = "compile"),
-                Artifact(
-                        groupId = "com.google.dagger",
-                        artifactId = "dagger",
-                        version = "2.22",
-                        type = Type.JAR,
-                        scope = "compile"),
-                Artifact(
-                        groupId = "com.google.dagger",
-                        artifactId = "dagger-android-support",
-                        version = "2.22",
-                        type = Type.AAR,
-                        scope = "compile")
+  @Test
+  fun `Publish project should also publish coreleased projects`() {
+    with(controller) {
+      val project1 = Project(name = "childProject1", version = "1.0.0", libraryGroup = "test123")
+      val project2 =
+        Project(
+          name = "childProject2",
+          projectDependencies = setOf(project1),
+          libraryGroup = "test123",
+          expectedVersion = "1.0.0"
         )
+
+      withProjects(project1, project2)
+      publish(project1)
+
+      project1.pom.artifact.version shouldBe project1.version
+      project2.pom.let {
+        it.artifact.version shouldBe project1.version
+        it.dependencies shouldHaveSingleElement project1.toArtifact()
+      }
     }
+  }
+
+  @Test
+  fun `Publish project should correctly set dependency types`() {
+    with(controller) {
+      val dagger = Artifact("com.google.dagger", "dagger", "2.22", scope = "runtime")
+      val daggerAndroid =
+        Artifact("com.google.dagger", "dagger-android-support", "2.22", Type.AAR, "compile")
+
+      val project1 = Project(name = "childProject1", version = "1.0", latestReleasedVersion = "0.8")
+      val project2 =
+        Project(
+          name = "childProject2",
+          version = "0.9",
+          projectDependencies = setOf(project1),
+          externalDependencies = setOf(dagger, daggerAndroid)
+        )
+
+      withProjects(project1, project2)
+      publish(project2, project1)
 
-    private fun publish(mode: Mode, vararg projects: Project): BuildResult =
-            GradleRunner.create()
-                    .withProjectDir(testProjectDir.root)
-                    .withArguments(
-                            "-PprojectsToPublish=${projects.joinToString(",") { it.name }}",
-                            "-PpublishMode=$mode",
-                            "firebasePublish")
-                    .withPluginClasspath()
-                    .build()
-
-    private fun include(project: Project) {
-        testProjectDir.newFolder(project.name, "src", "main")
-        testProjectDir
-                .newFile("${project.name}/build.gradle")
-                .writeText(project.generateBuildFile())
-        testProjectDir
-                .newFile("${project.name}/src/main/AndroidManifest.xml")
-                .writeText(MANIFEST)
-        subprojects.add(project)
+      project2.pom.let {
+        it.artifact.version shouldBe project2.version
+        it.dependencies shouldContainExactlyInAnyOrder
+          listOf(project1.toArtifact(), dagger, daggerAndroid)
+      }
     }
+  }
+
+  @Test
+  fun `Publish project should ignore dependency versions`() {
+    with(controller) {
+      val externalAARLibrary = Artifact("com.google.dagger", "dagger-android-support", "2.21")
+
+      val project1 =
+        Project(
+          name = "childProject1",
+          version = "1.0",
+          externalDependencies = setOf(externalAARLibrary)
+        )
+      val project2 =
+        Project(
+          name = "childProject2",
+          version = "1.0",
+          externalDependencies = setOf(externalAARLibrary.copy(version = "2.22"))
+        )
 
-    private fun subprojectsDefined(vararg projects: Project) {
-        rootBuildFile = testProjectDir.newFile("build.gradle")
-        rootSettingsFile = testProjectDir.newFile("settings.gradle")
+      withProjects(project1, project2)
+      publish(project1, project2)
 
-        projects.forEach(this::include)
+      project2.pom.dependencies.first().type shouldBe Type.AAR
+    }
+  }
 
-        rootBuildFile.writeText(ROOT_PROJECT)
-        rootSettingsFile.writeText(projects.joinToString("\n") { "include ':${it.name}'" })
+  private fun publish(vararg projects: Project): BuildResult =
+    makeGradleRunner(*projects).build().also {
+      it.task(":firebasePublish")?.outcome shouldBe SUCCESS
     }
 
-    companion object {
-        private const val ROOT_PROJECT = """
-        buildscript {
-            repositories {
-                google()
-                jcenter()
-                maven {
-                    url 'https://storage.googleapis.com/android-ci/mvn/'
-                }
-            }
-        }
-        plugins {
-            id 'PublishingPlugin'
-        }
-
-        configure(subprojects) {
-          repositories {
-              google()
-              jcenter()
-              maven {
-                  url 'https://storage.googleapis.com/android-ci/mvn/'
-              }
-          }
-        }
-        """
-        private const val MANIFEST = """<?xml version="1.0" encoding="utf-8"?>
-        <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-                  package="com.example">
-            <uses-sdk android:minSdkVersion="14"/>
-        </manifest>
-        """
+  private fun publishAndFail(vararg projects: Project) =
+    makeGradleRunner(*projects).buildAndFail().also {
+      it.task(":checkHeadDependencies")?.outcome shouldBe FAILED
     }
+
+  private fun makeGradleRunner(vararg projects: Project) =
+    GradleRunner.create()
+      .withProjectDir(testProjectDir.root)
+      .withArguments(
+        "-PprojectsToPublish=${projects.joinToString(",") { it.name }}",
+        "-PreleaseName=m123",
+        "firebasePublish"
+      )
+      .withPluginClasspath()
 }
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTests.kt b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTests.kt
new file mode 100644
index 00000000000..aede46ddfcc
--- /dev/null
+++ b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTests.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
+
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.string.shouldContain
+import io.kotest.matchers.string.shouldNotContain
+import org.gradle.testkit.runner.GradleRunner
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class UpdatePinnedDependenciesTests : FunSpec() {
+
+  @Rule @JvmField val testProjectDirectory = TemporaryFolder()
+  private val controller = FirebaseTestController(testProjectDirectory)
+
+  @Test
+  fun `Replaces project level dependencies with pinned dependencies`() {
+    with(controller) {
+      val fakeFirestore =
+        Project(name = "firebase-firestore", group = "com.google.firebase", version = "1.0.0")
+      val testProject =
+        Project(name = "testProject", version = "1.0.0", projectDependencies = setOf(fakeFirestore))
+
+      withProjects(fakeFirestore, testProject)
+      createReleaseWithProjects(testProject)
+      buildProject()
+
+      testProject.buildFile.readText() shouldNotContain fakeFirestore.toDependency(true)
+    }
+  }
+
+  @Test
+  fun `Does not replace dependencies in same library group`() {
+    with(controller) {
+      val fakeFirestore =
+        Project(
+          name = "firebase-firestore",
+          libraryGroup = "test",
+          group = "com.google.firebase",
+          version = "1.0.0"
+        )
+      val testProject =
+        Project(
+          name = "testProject",
+          libraryGroup = "test",
+          version = "1.0.0",
+          projectDependencies = setOf(fakeFirestore)
+        )
+
+      withProjects(fakeFirestore, testProject)
+      createReleaseWithProjects(fakeFirestore, testProject)
+      buildProject()
+
+      testProject.buildFile.readText() shouldContain fakeFirestore.toDependency(true)
+    }
+  }
+
+  @Test
+  fun `Does not change already pinned dependencies`() {
+    with(controller) {
+      val fakeFirestore =
+        Project(
+          name = "firebase-firestore",
+          libraryGroup = "test",
+          group = "com.google.firebase",
+          version = "1.0.0"
+        )
+      val testProject =
+        Project(
+          name = "testProject",
+          libraryGroup = "test",
+          version = "1.0.0",
+          externalDependencies = setOf(fakeFirestore.toArtifact())
+        )
+
+      withProjects(fakeFirestore, testProject)
+      createReleaseWithProjects(testProject, fakeFirestore)
+      buildProject()
+
+      testProject.buildFile.readText() shouldContain fakeFirestore.toDependency(false)
+    }
+  }
+
+  private fun buildProject() =
+    GradleRunner.create()
+      .withProjectDir(testProjectDirectory.root)
+      .withPluginClasspath()
+      .withArguments("updatePinnedDependencies")
+      .build()
+}
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt
index 632d36dc5f0..ba2428837e1 100644
--- a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt
+++ b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
 
@@ -28,36 +30,41 @@ import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
-private const val MANIFEST = """<?xml version="1.0" encoding="utf-8"?>
-        <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-                  package="com.example">
+private const val MANIFEST =
+  """<?xml version="1.0" encoding="utf-8"?>
+        <manifest xmlns:android="http://schemas.android.com/apk/res/android">
             <uses-sdk android:minSdkVersion="14"/>
         </manifest>
         """
 
 @RunWith(JUnit4::class)
 class VendorPluginTests {
-    @Rule
-    @JvmField
-    val testProjectDir = TemporaryFolder()
-
-    @Test
-    fun `vendor guava not excluding javax transitive deps should fail`() {
-        val buildFailure = assertThrows(UnexpectedBuildFailure::class.java) {
-            buildWith("vendor 'com.google.guava:guava:29.0-android'")
-        }
-
-        assertThat(buildFailure.message).contains("Vendoring java or javax packages is not supported.")
-    }
-
-    @Test
-    fun `vendor guava excluding javax transitive deps should include subset of guava`() {
-        val classes = buildWith("""
+  @Rule @JvmField val testProjectDir = TemporaryFolder()
+
+  @Test
+  fun `vendor guava not excluding javax transitive deps should fail`() {
+    val buildFailure =
+      assertThrows(UnexpectedBuildFailure::class.java) {
+        buildWith("vendor 'com.google.guava:guava:29.0-android'")
+      }
+
+    assertThat(buildFailure.message).contains("Vendoring java or javax packages is not supported.")
+  }
+
+  @Test
+  fun `vendor guava excluding javax transitive deps should include subset of guava`() {
+    val classes =
+      buildWith(
+        """
             vendor('com.google.guava:guava:29.0-android') {
               exclude group: 'com.google.code.findbugs', module: 'jsr305'
             }
-        """.trimIndent(),
-                SourceFile(name = "com/example/Hello.java", content = """
+        """
+          .trimIndent(),
+        SourceFile(
+          name = "com/example/Hello.java",
+          content =
+            """
                     package com.example;
 
                     import com.google.common.base.Preconditions;
@@ -67,46 +74,63 @@ class VendorPluginTests {
                         Preconditions.checkNotNull(args);
                       }
                     }
-                    """.trimIndent()))
-        // expected to vendor preconditions and errorprone annotations from transitive dep.
-        assertThat(classes).containsAtLeast(
-                "com/example/Hello.class",
-                "com/example/com/google/common/base/Preconditions.class",
-                "com/example/com/google/errorprone/annotations/CanIgnoreReturnValue.class")
-
-        // ImmutableList is not used, so it should be stripped out.
-        assertThat(classes).doesNotContain("com/google/common/collect/ImmutableList.class")
-    }
-
-    @Test
-    fun `vendor dagger excluding javax transitive deps and not using it should include dagger`() {
-        val classes = buildWith("""
+                    """
+              .trimIndent(),
+        ),
+      )
+    // expected to vendor preconditions and errorprone annotations from transitive dep.
+    assertThat(classes)
+      .containsAtLeast(
+        "com/example/Hello.class",
+        "com/example/com/google/common/base/Preconditions.class",
+        "com/example/com/google/errorprone/annotations/CanIgnoreReturnValue.class",
+      )
+
+    // ImmutableList is not used, so it should be stripped out.
+    assertThat(classes).doesNotContain("com/example/com/google/common/collect/ImmutableList.class")
+  }
+
+  @Test
+  fun `vendor dagger excluding javax transitive deps and not using it should not include dagger`() {
+    val classes =
+      buildWith(
+        """
             vendor ('com.google.dagger:dagger:2.27') {
               exclude group: "javax.inject", module: "javax.inject"
             }
-        """.trimIndent(),
-                SourceFile(name = "com/example/Hello.java", content = """
+        """
+          .trimIndent(),
+        SourceFile(
+          name = "com/example/Hello.java",
+          content =
+            """
                     package com.example;
 
                     public class Hello {
                       public static void main(String[] args) {}
                     }
-                    """.trimIndent()))
-        // expected classes
-        assertThat(classes).containsAtLeast(
-                "com/example/Hello.class",
-                "com/example/BuildConfig.class",
-                "com/example/dagger/Lazy.class")
-    }
-
-    @Test
-    fun `vendor dagger excluding javax transitive deps should include dagger`() {
-        val classes = buildWith("""
+                    """
+              .trimIndent(),
+        ),
+      )
+    // expected classes
+    assertThat(classes).containsExactly("com/example/Hello.class", "com/example/BuildConfig.class")
+  }
+
+  @Test
+  fun `vendor dagger excluding javax transitive deps should include dagger`() {
+    val classes =
+      buildWith(
+        """
             vendor ('com.google.dagger:dagger:2.27') {
               exclude group: "javax.inject", module: "javax.inject"
             }
-        """.trimIndent(),
-                SourceFile(name = "com/example/Hello.java", content = """
+        """
+          .trimIndent(),
+        SourceFile(
+          name = "com/example/Hello.java",
+          content =
+            """
                     package com.example;
 
                     import dagger.Module;
@@ -115,16 +139,24 @@ class VendorPluginTests {
                     public class Hello {
                       public static void main(String[] args) {}
                     }
-                    """.trimIndent()))
-        // expected classes
-        assertThat(classes).containsAtLeast(
-                "com/example/Hello.class",
-                "com/example/BuildConfig.class",
-                "com/example/dagger/Module.class")
-    }
-
-    private fun buildWith(deps: String, vararg files: SourceFile): List<String> {
-        testProjectDir.newFile("build.gradle").writeText("""
+                    """
+              .trimIndent(),
+        ),
+      )
+    // expected classes
+    assertThat(classes)
+      .containsAtLeast(
+        "com/example/Hello.class",
+        "com/example/BuildConfig.class",
+        "com/example/dagger/Module.class",
+      )
+  }
+
+  private fun buildWith(deps: String, vararg files: SourceFile): List<String> {
+    testProjectDir
+      .newFile("build.gradle")
+      .writeText(
+        """
             buildscript {
                 repositories {
                     google()
@@ -140,51 +172,54 @@ class VendorPluginTests {
                 jcenter()
             }
 
-            android.compileSdkVersion = 26
-
+            android {
+                buildFeatures {
+                    buildConfig true
+                }
+              namespace 'com.example'
+              compileSdkVersion 26
+            }
+            
             dependencies {
                 $deps
             }
-        """.trimIndent())
-        testProjectDir.newFile("settings.gradle")
-                .writeText("rootProject.name = 'testlib'")
-
-        testProjectDir.newFolder("src/main/java")
-        testProjectDir
-                .newFile("src/main/AndroidManifest.xml")
-                .writeText(MANIFEST)
-
-        for (file in files) {
-            // if (1+1 == 2) {throw RuntimeException("src/main/java/${Paths.get(file.name).parent}")}
-            testProjectDir.newFolder("src/main/java/${Paths.get(file.name).parent}")
-            testProjectDir.newFile("src/main/java/${file.name}").writeText(file.content)
-        }
+        """
+          .trimIndent()
+      )
+    testProjectDir.newFile("settings.gradle").writeText("rootProject.name = 'testlib'")
 
-        GradleRunner.create()
-                .withArguments("assemble")
-                .withProjectDir(testProjectDir.root)
-                .withPluginClasspath()
-                .build()
-
-        val aarFile = File(testProjectDir.root, "build/outputs/aar/testlib-release.aar")
-        assertThat(aarFile.exists()).isTrue()
-
-        val zipFile = ZipFile(aarFile)
-        val classesJar = zipFile.entries().asSequence()
-                .filter { it.name == "classes.jar" }
-                .first()
-        return ZipInputStream(zipFile.getInputStream(classesJar)).use {
-            val entries = mutableListOf<String>()
-            var currentEntry = it.nextEntry
-            while (currentEntry != null) {
-                if (!currentEntry.isDirectory) {
-                    entries.add(currentEntry.name)
-                }
-                currentEntry = it.nextEntry
-            }
-            entries
+    testProjectDir.newFolder("src/main/java")
+    testProjectDir.newFile("src/main/AndroidManifest.xml").writeText(MANIFEST)
+
+    for (file in files) {
+      // if (1+1 == 2) {throw RuntimeException("src/main/java/${Paths.get(file.name).parent}")}
+      testProjectDir.newFolder("src/main/java/${Paths.get(file.name).parent}")
+      testProjectDir.newFile("src/main/java/${file.name}").writeText(file.content)
+    }
+
+    GradleRunner.create()
+      .withArguments("assemble")
+      .withProjectDir(testProjectDir.root)
+      .withPluginClasspath()
+      .build()
+
+    val aarFile = File(testProjectDir.root, "build/outputs/aar/testlib-release.aar")
+    assertThat(aarFile.exists()).isTrue()
+
+    val zipFile = ZipFile(aarFile)
+    val classesJar = zipFile.entries().asSequence().filter { it.name == "classes.jar" }.first()
+    return ZipInputStream(zipFile.getInputStream(classesJar)).use {
+      val entries = mutableListOf<String>()
+      var currentEntry = it.nextEntry
+      while (currentEntry != null) {
+        if (!currentEntry.isDirectory) {
+          entries.add(currentEntry.name)
         }
+        currentEntry = it.nextEntry
+      }
+      entries
     }
+  }
 }
 
 data class SourceFile(val name: String, val content: String)
diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt
index f71b21f4a38..0579712bf10 100644
--- a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt
+++ b/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt
@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.gradle.plugins
 
@@ -21,18 +23,21 @@ import org.w3c.dom.Element
 import org.w3c.dom.NodeList
 
 data class Project(
-    val name: String,
-    val group: String = "com.example",
-    val version: String = "undefined",
-    val latestReleasedVersion: String? = null,
-    val projectDependencies: Set<Project> = setOf(),
-    val externalDependencies: Set<Artifact> = setOf(),
-    val releaseWith: Project? = null,
-    val customizePom: String? = null,
-    val libraryType: LibraryType = LibraryType.ANDROID
+  val name: String,
+  val group: String = "com.example",
+  val version: String = "undefined",
+  val expectedVersion: String = version,
+  val latestReleasedVersion: String? = null,
+  val projectDependencies: Set<Project> = setOf(),
+  val externalDependencies: Set<Artifact> = setOf(),
+  val libraryGroup: String? = null,
+  val customizePom: String? = null,
+  val publishJavadoc: Boolean = false,
+  val libraryType: LibraryType = LibraryType.ANDROID
 ) {
-    fun generateBuildFile(): String {
-        return """
+  val path = ":$name"
+  fun generateBuildFile(): String {
+    return """
             plugins {
                 id 'firebase-${if (libraryType == LibraryType.JAVA) "java-" else ""}library'
             }
@@ -40,157 +45,186 @@ data class Project(
             version = '$version'
             ${if (latestReleasedVersion != null) "ext.latestReleasedVersion = $latestReleasedVersion" else ""}
             firebaseLibrary {
-                ${if (releaseWith != null) "releaseWith project(':${releaseWith.name}')" else ""}
+                ${if (libraryGroup != null) "libraryGroup '$libraryGroup'" else ""}
                 ${if (customizePom != null) "customizePom {$customizePom}" else ""}
+                ${"publishJavadoc = $publishJavadoc"}
             }
-            ${if (libraryType == LibraryType.ANDROID) "android.compileSdkVersion = 26" else ""}
+            ${if (libraryType == LibraryType.ANDROID) "android {\n" +
+            "  compileSdkVersion 30\n" +
+            "  namespace 'com.example" + libraryGroup + "'" +
+            "\n}\n" else ""}
 
             dependencies {
             ${projectDependencies.joinToString("\n") { "implementation project(':${it.name}')" }}
-            ${externalDependencies.joinToString("\n") { "implementation '${it.simpleDepString}'" }}
+            ${externalDependencies.joinToString("\n") { "${it.configuration} '${it.simpleDepString}'" }}
             }
             """
-    }
-
-    fun getPublishedPom(rootDirectory: String): Pom? {
-        val v = releaseWith?.version ?: version
-        return File(rootDirectory).walk().asSequence()
-                .filter { it.isFile }
-                .filter {
-                    it.path.matches(Regex(".*/${group.replace('.', '/')}/$name/$v.*/.*\\.pom$"))
-                }
-                .map(Pom::parse)
-                .firstOrNull()
-    }
+  }
 }
 
 data class License(val name: String, val url: String)
 
 enum class Type {
-    JAR, AAR
+  JAR,
+  AAR
 }
 
 data class Artifact(
-    val groupId: String,
-    val artifactId: String,
-    val version: String,
-    val type: Type = Type.JAR,
-    val scope: String = ""
+  val groupId: String,
+  val artifactId: String,
+  val version: String,
+  val type: Type = Type.JAR,
+  val scope: String = "runtime"
 ) {
-    val simpleDepString: String
-        get() = "$groupId:$artifactId:$version"
+  val simpleDepString = "$groupId:$artifactId:$version"
+
+  val configuration = if (scope == "compile") "api" else "implementation"
 }
 
 data class Pom(
-    val artifact: Artifact,
-    val license: License = License(
-            name = "The Apache Software License, Version 2.0",
-            url = "http://www.apache.org/licenses/LICENSE-2.0.txt"),
-    val dependencies: List<Artifact> = listOf()
+  val artifact: Artifact,
+  val license: License =
+    License(
+      name = "The Apache Software License, Version 2.0",
+      url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
+    ),
+  val dependencies: List<Artifact> = listOf()
 ) {
-    companion object {
-        fun parse(file: File): Pom {
-            val document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(file)
-            val childNodes = document.documentElement.childNodes
-
-            var groupId: String? = null
-            var artifactId: String? = null
-            var version: String? = null
-            var type = Type.JAR
-            var license: License? = null
-            var deps: List<Artifact> = listOf()
-
-            for (i in 0 until childNodes.length) {
-                val child = childNodes.item(i)
-                if (child !is Element) {
-                    continue
-                }
-                when (child.tagName) {
-                    "groupId" -> groupId = child.textContent.trim()
-                    "artifactId" -> artifactId = child.textContent.trim()
-                    "version" -> version = child.textContent.trim()
-                    "packaging" -> type = Type.valueOf(child.textContent.trim().toUpperCase())
-                    "licenses" -> license = parseLicense(child.getElementsByTagName("license"))
-                    "dependencies" -> deps = parseDeps(child.getElementsByTagName("dependency"))
-                }
-            }
-            if (groupId == null) {
-                throw GradleException("'<groupId>' missing in pom")
-            }
-            if (artifactId == null) {
-                throw GradleException("'<artifactId>' missing in pom")
-            }
-            if (version == null) {
-                throw GradleException("'<version>' missing in pom")
-            }
-            if (license == null) {
-                throw GradleException("'<license>' missing in pom")
-            }
-
-            return Pom(Artifact(groupId, artifactId, version, type), license, deps)
+  companion object {
+    fun parse(file: File): Pom {
+      val document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(file)
+      val childNodes = document.documentElement.childNodes
+
+      var groupId: String? = null
+      var artifactId: String? = null
+      var version: String? = null
+      var type = Type.JAR
+      var license: License? = null
+      var deps: List<Artifact> = listOf()
+
+      for (i in 0 until childNodes.length) {
+        val child = childNodes.item(i)
+        if (child !is Element) {
+          continue
         }
-
-        private fun parseDeps(nodes: NodeList): List<Artifact> {
-            val deps = mutableListOf<Artifact>()
-            for (i in 0 until nodes.length) {
-                val child = nodes.item(i)
-                if (child !is Element) {
-                    continue
-                }
-                deps.add(parseDep(child))
-            }
-            return deps
+        when (child.tagName) {
+          "groupId" -> groupId = child.textContent.trim()
+          "artifactId" -> artifactId = child.textContent.trim()
+          "version" -> version = child.textContent.trim()
+          "packaging" -> type = Type.valueOf(child.textContent.trim().toUpperCase())
+          "licenses" -> license = parseLicense(child.getElementsByTagName("license"))
+          "dependencies" -> deps = parseDeps(child.getElementsByTagName("dependency"))
         }
+      }
+      if (groupId == null) {
+        throw GradleException("'<groupId>' missing in pom")
+      }
+      if (artifactId == null) {
+        throw GradleException("'<artifactId>' missing in pom")
+      }
+      if (version == null) {
+        throw GradleException("'<version>' missing in pom")
+      }
+      if (license == null) {
+        throw GradleException("'<license>' missing in pom")
+      }
+
+      return Pom(Artifact(groupId, artifactId, version, type), license, deps)
+    }
 
-        private fun parseDep(dependencies: Element): Artifact {
-            var groupId: String? = null
-            var artifactId: String? = null
-            var version: String? = null
-            var type = Type.JAR
-            var scope: String? = null
-
-            val nodes = dependencies.childNodes
-
-            for (i in 0 until nodes.length) {
-                val child = nodes.item(i)
-                if (child !is Element) {
-                    continue
-                }
-                when (child.tagName) {
-                    "groupId" -> groupId = child.textContent.trim()
-                    "artifactId" -> artifactId = child.textContent.trim()
-                    "version" -> version = child.textContent.trim()
-                    "type" -> type = Type.valueOf(child.textContent.trim().toUpperCase())
-                    "scope" -> scope = child.textContent.trim()
-                }
-            }
-            if (groupId == null) {
-                throw GradleException("'<groupId>' missing in pom")
-            }
-            if (artifactId == null) {
-                throw GradleException("'<artifactId>' missing in pom")
-            }
-            if (version == null) {
-                throw GradleException("'<version>' missing in pom")
-            }
-            if (scope == null) {
-                throw GradleException("'<scope>' missing in pom")
-            }
-
-            return Artifact(groupId, artifactId, version, type, scope)
+    private fun parseDeps(nodes: NodeList): List<Artifact> {
+      val deps = mutableListOf<Artifact>()
+      for (i in 0 until nodes.length) {
+        val child = nodes.item(i)
+        if (child !is Element) {
+          continue
         }
+        deps.add(parseDep(child))
+      }
+      return deps
+    }
 
-        private fun parseLicense(nodes: NodeList): License? {
-            if (nodes.length == 0) {
-                return null
-            }
-            val license = nodes.item(0) as Element
-            val urlElements = license.getElementsByTagName("url")
-            val url = if (urlElements.length == 0) "" else urlElements.item(0).textContent.trim()
+    private fun parseDep(dependencies: Element): Artifact {
+      var groupId: String? = null
+      var artifactId: String? = null
+      var version: String? = null
+      var type = Type.JAR
+      var scope: String? = null
+
+      val nodes = dependencies.childNodes
 
-            val nameElements = license.getElementsByTagName("name")
-            val name = if (nameElements.length == 0) "" else nameElements.item(0).textContent.trim()
-            return License(name = name, url = url)
+      for (i in 0 until nodes.length) {
+        val child = nodes.item(i)
+        if (child !is Element) {
+          continue
+        }
+        when (child.tagName) {
+          "groupId" -> groupId = child.textContent.trim()
+          "artifactId" -> artifactId = child.textContent.trim()
+          "version" -> version = child.textContent.trim()
+          "type" -> type = Type.valueOf(child.textContent.trim().toUpperCase())
+          "scope" -> scope = child.textContent.trim()
         }
+      }
+      if (groupId == null) {
+        throw GradleException("'<groupId>' missing in pom")
+      }
+      if (artifactId == null) {
+        throw GradleException("'<artifactId>' missing in pom")
+      }
+      if (version == null) {
+        throw GradleException("'<version>' missing in pom")
+      }
+      if (scope == null) {
+        throw GradleException("'<scope>' missing in pom")
+      }
+
+      return Artifact(groupId, artifactId, version, type, scope)
     }
+
+    private fun parseLicense(nodes: NodeList): License? {
+      if (nodes.length == 0) {
+        return null
+      }
+      val license = nodes.item(0) as Element
+      val urlElements = license.getElementsByTagName("url")
+      val url = if (urlElements.length == 0) "" else urlElements.item(0).textContent.trim()
+
+      val nameElements = license.getElementsByTagName("name")
+      val name = if (nameElements.length == 0) "" else nameElements.item(0).textContent.trim()
+      return License(name = name, url = url)
+    }
+  }
 }
+
+/**
+ * Converts a [LibraryType] to a [Type].
+ *
+ * Uses the [LibraryType.format] to make the conversion.
+ */
+fun LibraryType.toArtifactType() = Type.valueOf(format.toUpperCase())
+
+/**
+ * Converts a [Project] to an [Artifact].
+ *
+ * @see toArtifactType
+ */
+fun Project.toArtifact() = Artifact(group, name, version, libraryType.toArtifactType())
+
+/**
+ * Converts a [Project] to a gradle dependency string.
+ *
+ * For example:
+ * ```
+ * val myProject = Project(name = "firestore", group = "com.firebase.google", version = "1.0.0")
+ *
+ * println(myProject.toDependency()) // 'com.google.firebase.google:firestore:1.0.0'
+ * println(myProject.toDependency(true)) // project(':firestore')
+ * ```
+ *
+ * @param projectLevel whether the dependency should be a project level dependency or external
+ *
+ * @see toArtifact
+ */
+fun Project.toDependency(projectLevel: Boolean = false) =
+  if (projectLevel) "project('${path}')" else "'${toArtifact().simpleDepString}'"
diff --git a/buildSrc/src/test/resources/BasicProject/build.gradle b/buildSrc/src/test/resources/BasicProject/build.gradle
new file mode 100644
index 00000000000..dbfbac32004
--- /dev/null
+++ b/buildSrc/src/test/resources/BasicProject/build.gradle
@@ -0,0 +1,43 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            url 'https://storage.googleapis.com/android-ci/mvn/'
+            metadataSources {
+                artifact()
+            }
+        }
+    }
+}
+
+plugins {
+    id 'PublishingPlugin'
+}
+
+configure(subprojects) {
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            url 'https://storage.googleapis.com/android-ci/mvn/'
+            metadataSources {
+                artifact()
+            }
+        }
+    }
+}
diff --git a/buildSrc/src/test/resources/BasicProject/firebase-storage/CHANGELOG.md b/buildSrc/src/test/resources/BasicProject/firebase-storage/CHANGELOG.md
new file mode 100644
index 00000000000..8b72642125d
--- /dev/null
+++ b/buildSrc/src/test/resources/BasicProject/firebase-storage/CHANGELOG.md
@@ -0,0 +1,63 @@
+# Unreleased
+Note: We did some super cool stuff here!
+
+* [feature] Added support for disjunctions in queries (`OR` queries).
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-firestore-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+
+* [fixed] An issue on GitHub [#123](//github.com/firebase/firebase-android-sdk/issues/number)
+
+* [removed] Removed some old stuff (#562)
+
+* [feature] Added this thing we wanted
+  [#444](//github.com/firebase/firebase-android-sdk/issues/number){: .external}
+
+* [feature] Added
+  [`Query.snapshots()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#snapshots_1)
+  and
+  [`DocumentReference.snapshots()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#snapshots)
+  Kotlin Flows to listen for realtime updates.
+
+* [fixed] Fixed an issue in `waitForPendingWrites()` that could lead to a
+  `NullPointerException`.
+
+* [feature] Added
+  [`Query.whereNotIn()`](/docs/reference/android/com/google/firebase/firestore/Query#whereNotIn(java.lang.String,%20java.util.List<?%20extends%20java.lang.Object>))
+  and
+  [`Query.whereNotEqualTo()`](/docs/reference/android/com/google/firebase/firestore/Query#whereNotEqualTo(java.lang.String,%20java.lang.Object))
+  query operators.
+
+  * `Query.whereNotIn()` finds documents where a specified field's value is
+    not in a specified array.
+  * `Query.whereNotEqualTo()` finds documents where a specified field's value
+    does not equal the specified value.
+
+  Neither query operator finds documents where the specified field isn't
+  present.
+
+* [unchanged] Idk ig we did some stuff
+
+* [removed] some stuff that we didn't really like got removed
+
+## Kotlin
+* [feature] Added
+  [`Query.dataObjects<T>()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#dataObjects)
+  and
+  [`DocumentReference.dataObjects<T>()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#dataObjects_1)
+  Kotlin Flows to listen for realtime updates and convert its values to a
+  specific type.
+
+# 24.5.0
+* [fixed] Fixed stack overflow caused by deeply nested server timestamps.
+  (GitHub [#4702](//github.com/firebase/firebase-android-sdk/issues/4702){: .external})
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
\ No newline at end of file
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/Mode.java b/buildSrc/src/test/resources/BasicProject/firebase-storage/build.gradle
similarity index 79%
rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/Mode.java
rename to buildSrc/src/test/resources/BasicProject/firebase-storage/build.gradle
index 79119c6384a..542c71f11e6 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/Mode.java
+++ b/buildSrc/src/test/resources/BasicProject/firebase-storage/build.gradle
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.gradle.plugins.publish;
+plugins {
+    id 'firebase-library'
+}
 
-public enum Mode {
-  RELEASE,
-  SNAPSHOT
+android{
+    namespace 'com.example.firebase-storage'
+    compileSdkVersion 26
 }
diff --git a/buildSrc/src/test/resources/BasicProject/firebase-storage/gradle.properties b/buildSrc/src/test/resources/BasicProject/firebase-storage/gradle.properties
new file mode 100644
index 00000000000..ef3c010ad4e
--- /dev/null
+++ b/buildSrc/src/test/resources/BasicProject/firebase-storage/gradle.properties
@@ -0,0 +1 @@
+version=24.6.0
diff --git a/buildSrc/src/test/resources/BasicProject/settings.gradle b/buildSrc/src/test/resources/BasicProject/settings.gradle
new file mode 100644
index 00000000000..e84cc032413
--- /dev/null
+++ b/buildSrc/src/test/resources/BasicProject/settings.gradle
@@ -0,0 +1,15 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+include ":firebase-storage"
diff --git a/buildSrc/src/test/resources/MakeReleaseNotes/release-notes.md b/buildSrc/src/test/resources/MakeReleaseNotes/release-notes.md
new file mode 100644
index 00000000000..c6d5cd8ce09
--- /dev/null
+++ b/buildSrc/src/test/resources/MakeReleaseNotes/release-notes.md
@@ -0,0 +1,56 @@
+### {{firebase_storage_full}} version 24.6.0 {: #storage_v24-6-0}
+
+Note: We did some super cool stuff here!
+
+* {{feature}} Added support for disjunctions in queries (`OR` queries).
+
+* {{feature}} Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-firestore-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+
+* {{fixed}} An issue on GitHub [#123](//github.com/firebase/firebase-android-sdk/issues/123){: .external}
+
+* {{removed}} Removed some old stuff GitHub [#562](//github.com/firebase/firebase-android-sdk/issues/562){: .external}
+
+* {{feature}} Added this thing we wanted
+  GitHub [#444](//github.com/firebase/firebase-android-sdk/issues/444){: .external}
+
+* {{feature}} Added
+  [`Query.snapshots()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#snapshots_1)
+  and
+  [`DocumentReference.snapshots()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#snapshots)
+  Kotlin Flows to listen for realtime updates.
+
+* {{fixed}} Fixed an issue in `waitForPendingWrites()` that could lead to a
+  `NullPointerException`.
+
+* {{feature}} Added
+  [`Query.whereNotIn()`](/docs/reference/android/com/google/firebase/firestore/Query#whereNotIn(java.lang.String,%20java.util.List<?%20extends%20java.lang.Object>))
+  and
+  [`Query.whereNotEqualTo()`](/docs/reference/android/com/google/firebase/firestore/Query#whereNotEqualTo(java.lang.String,%20java.lang.Object))
+  query operators.
+
+  * `Query.whereNotIn()` finds documents where a specified field's value is
+    not in a specified array.
+  * `Query.whereNotEqualTo()` finds documents where a specified field's value
+    does not equal the specified value.
+
+  Neither query operator finds documents where the specified field isn't
+  present.
+
+* {{unchanged}} Idk ig we did some stuff
+
+* {{removed}} some stuff that we didn't really like got removed
+
+#### {{firebase_storage_full}} Kotlin extensions version 24.6.0 {: #storage-ktx_v24-6-0}
+
+* {{feature}} Added
+  [`Query.dataObjects<T>()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#dataObjects)
+  and
+  [`DocumentReference.dataObjects<T>()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#dataObjects_1)
+  Kotlin Flows to listen for realtime updates and convert its values to a
+  specific type.
\ No newline at end of file
diff --git a/buildSrc/src/test/resources/MoveUnreleasedChanges/basic.md b/buildSrc/src/test/resources/MoveUnreleasedChanges/basic.md
new file mode 100644
index 00000000000..7cc7a3d245b
--- /dev/null
+++ b/buildSrc/src/test/resources/MoveUnreleasedChanges/basic.md
@@ -0,0 +1,37 @@
+# Unreleased
+Note: We did some super cool stuff here!
+
+* [feature] Added support for disjunctions in queries (`OR` queries).
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-firestore-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+* [fixed] An issue on GitHub [#123](//github.com/firebase/firebase-android-sdk/issues/number)
+* [removed] Removed some old stuff (#562)
+* [feature] Added this thing we wanted
+  [#444](//github.com/firebase/firebase-android-sdk/issues/number){: .external}
+* [feature] Added
+  [`Query.snapshots()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#snapshots_1)
+  and
+  [`DocumentReference.snapshots()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#snapshots)
+  Kotlin Flows to listen for realtime updates.
+* [fixed] Fixed an issue in `waitForPendingWrites()` that could lead to a
+  `NullPointerException`.
+* [feature] Added
+  [`Query.whereNotIn()`](/docs/reference/android/com/google/firebase/firestore/Query#whereNotIn(java.lang.String,%20java.util.List<?%20extends%20java.lang.Object>))
+  and
+  [`Query.whereNotEqualTo()`](/docs/reference/android/com/google/firebase/firestore/Query#whereNotEqualTo(java.lang.String,%20java.lang.Object))
+  query operators.
+
+    * `Query.whereNotIn()` finds documents where a specified field's value is
+      not in a specified array.
+    * `Query.whereNotEqualTo()` finds documents where a specified field's value
+      does not equal the specified value.
+
+  Neither query operator finds documents where the specified field isn't
+  present.
+* [unchanged] Idk ig we did some stuff
+* [removed] some stuff that we didn't really like got removed
\ No newline at end of file
diff --git a/buildSrc/src/test/resources/MoveUnreleasedChanges/release.json b/buildSrc/src/test/resources/MoveUnreleasedChanges/release.json
new file mode 100644
index 00000000000..104c6674dfe
--- /dev/null
+++ b/buildSrc/src/test/resources/MoveUnreleasedChanges/release.json
@@ -0,0 +1,6 @@
+{
+  "name": "M134",
+  "libraries": [
+    ":firebase-storage"
+  ]
+}
\ No newline at end of file
diff --git a/ci/README.md b/ci/README.md
index 6964edf2647..d1546d1ddbb 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -15,11 +15,10 @@ This directory contains tooling used to run Continuous Integration tasks.
   ```
 - At the root of the firebase sdk repo, run
   ```
-  ./ci/fireci/setup.py develop
+  pip3 install -e ./ci/fireci/
   ```
 
 - For usage help, see:
   ```
   fireci --help
   ```
-
diff --git a/ci/danger/Dangerfile b/ci/danger/Dangerfile
new file mode 100644
index 00000000000..0efe1369e0b
--- /dev/null
+++ b/ci/danger/Dangerfile
@@ -0,0 +1,83 @@
+## Copyright 2022 Google LLC
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+
+### Helper functions
+
+# Determine if there are changes in files matching any of the
+# path patterns provided.
+def shouldFileBeExcluded(file, exclude_paths)
+  return exclude_paths.any? { |dir| file.include? dir }
+end
+
+# Determine if there are changes in files matching any of the
+# path patterns provided.
+def hasChangesIn(paths)
+  path_array = Array(paths)
+  path_array.each do |dir|
+    if !git.modified_files.grep(/#{dir}/).empty?
+      return true
+    end
+  end
+  return false
+end
+
+### Definitions
+
+# Label for any change that shouldn't have an accompanying CHANGELOG entry,
+# including all changes that do not affect the compiled binary (i.e. script
+# changes, test-only changes)
+declared_trivial = github.pr_labels.include? "no-changelog"
+
+# Whether or not there are pending changes to any changelog file.
+has_changelog_changes = hasChangesIn(["CHANGELOG"])
+
+# Ignore changes in these directories
+$exclude_directories = [
+  '.github/',
+  'buildSrc/',
+  'ci/',
+  'encoders/',
+  'firebase-annotations/',
+  'firebase-components/',
+  'firebase-datatransport/',
+  'gradle/',
+  'health-metrics/',
+  'integ-testing/',
+  'protolite-well-known-types/',
+  'smoke-tests/',
+  'third_party/',
+  'tools/',
+  'transport/'
+]
+
+# Whether or not the PR has modified SDK source files.
+def has_sdk_changes()
+  files = (git.modified_files +
+           git.added_files +
+           git.deleted_files)
+  return files.any? { |file|
+    !shouldFileBeExcluded(file, $exclude_directories)
+  }
+end
+
+### Actions
+
+# Warn if a changelog is left out on a non-trivial PR that has modified
+# SDK source files.
+#
+if has_sdk_changes() && !has_changelog_changes && !declared_trivial
+  warning = "Did you forget to add a changelog entry? (Add the 'no-changelog'"\
+            " label to the PR to silence this warning.)"
+  warn(warning)
+end
diff --git a/ci/danger/Gemfile b/ci/danger/Gemfile
new file mode 100644
index 00000000000..6c0467dd241
--- /dev/null
+++ b/ci/danger/Gemfile
@@ -0,0 +1,5 @@
+# To update, change version below, run bundle install, test,
+# commit Gemfile and Gemfile.lock.
+source 'https://rubygems.org'
+
+gem 'danger', '8.4.5'
diff --git a/ci/danger/Gemfile.lock b/ci/danger/Gemfile.lock
new file mode 100644
index 00000000000..790c8bdfc01
--- /dev/null
+++ b/ci/danger/Gemfile.lock
@@ -0,0 +1,84 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    claide (1.1.0)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
+    colored2 (3.1.2)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    danger (8.4.5)
+      claide (~> 1.0)
+      claide-plugins (>= 0.9.2)
+      colored2 (~> 3.1)
+      cork (~> 0.1)
+      faraday (>= 0.9.0, < 2.0)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.7)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (~> 4.7)
+      terminal-table (>= 1, < 4)
+    faraday (1.10.1)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.4.1)
+      faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    git (1.13.1)
+      addressable (~> 2.8)
+      rchardet (~> 1.8)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    multipart-post (2.2.3)
+    nap (1.1.0)
+    no_proxy_fix (0.1.2)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    open4 (1.3.4)
+    public_suffix (5.0.1)
+    rchardet (1.8.0)
+    rexml (3.2.5)
+    ruby2_keywords (0.0.5)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  danger (= 8.4.5)
+
+BUNDLED WITH
+   1.17.2
diff --git a/ci/danger/setup_bundler.sh b/ci/danger/setup_bundler.sh
new file mode 100755
index 00000000000..0d7692951a0
--- /dev/null
+++ b/ci/danger/setup_bundler.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+bundle install
+bundle update --bundler # ensure bundler version is high enough for Gemfile.lock
+bundle --version
diff --git a/ci/fireci/fireci/prow_utils.py b/ci/fireci/fireci/ci_utils.py
similarity index 74%
rename from ci/fireci/fireci/prow_utils.py
rename to ci/fireci/fireci/ci_utils.py
index 3a932eecdfd..12ac98b93f6 100644
--- a/ci/fireci/fireci/prow_utils.py
+++ b/ci/fireci/fireci/ci_utils.py
@@ -16,7 +16,25 @@
 import os
 import subprocess
 
-_logger = logging.getLogger('fireci.prow_utils')
+_logger = logging.getLogger('fireci.ci_utils')
+
+
+def ci_log_link():
+  """Returns the link to the log of the current CI test."""
+
+  if os.getenv('GITHUB_ACTIONS'):
+    return github_actions_run_log_link()
+  elif os.getenv('PROW_JOB_ID'):
+    return prow_job_log_link()
+
+
+def github_actions_run_log_link():
+  """Returns the link to the log of the current GitHub Actions run."""
+
+  repo = os.getenv('GITHUB_REPOSITORY')
+  run_id = os.getenv('GITHUB_RUN_ID')
+
+  return f'https://github.com/{repo}/actions/runs/{run_id}'
 
 
 def prow_job_log_link():
diff --git a/ci/fireci/fireci/internal.py b/ci/fireci/fireci/internal.py
index c76123e3228..0950d770fc2 100644
--- a/ci/fireci/fireci/internal.py
+++ b/ci/fireci/fireci/internal.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import click
-import contextlib
 import functools
 import glob
 import itertools
@@ -21,6 +20,7 @@
 import os
 import shutil
 
+from contextlib import contextmanager, nullcontext
 
 _logger = logging.getLogger('fireci')
 
@@ -30,7 +30,7 @@ def _ensure_dir(directory):
     os.makedirs(directory)
 
 
-@contextlib.contextmanager
+@contextmanager
 def _artifact_handler(target_directory, artifact_patterns):
   _logger.debug(
       'Artifacts will be searched for in directories matching {} patterns and placed in {}'
@@ -45,7 +45,7 @@ def _artifact_handler(target_directory, artifact_patterns):
       target_name = os.path.join(target_directory, "_".join(path.split('/')))
       _logger.debug('Copying artifact {} to {}'.format(path, target_name))
       if os.path.isdir(path):
-        shutil.copytree(path, target_name)
+        shutil.copytree(path, target_name, dirs_exist_ok=True)
       else:
         shutil.copyfile(path, target_name)
 
@@ -68,8 +68,8 @@ class _CommonOptions:
     '--artifact-patterns',
     default=('**/build/test-results', '**/build/reports'),
     help=
-    'Shell-style artifact patterns that are copied into `artifact-target-dir`.'\
-        'Can be specified multiple times.',
+    'Shell-style artifact patterns that are copied into `artifact-target-dir`. '
+    'Can be specified multiple times.',
     multiple=True,
     type=str,
 )
@@ -83,30 +83,34 @@ def main(options, **kwargs):
     setattr(options, k, v)
 
 
-def ci_command(name=None):
+def ci_command(name=None, cls=click.Command, group=main):
   """Decorator to use for CI commands.
 
        The differences from the standard @click.command are:
 
        * Allows configuration of artifacts that are uploaded for later viewing in CI.
-       * Registers the command automatically
+       * Registers the command automatically.
 
-       :param name: Optional name of the task. Defaults to the function name that is decorated with
-                    this decorator.
+       :param name:  Optional name of the task. Defaults to the function name that is decorated with this decorator.
+       :param cls:   Specifies whether the func is a command or a command group. Defaults to `click.Command`.
+       :param group: Specifies the group the command belongs to. Defaults to the `main` command group.
     """
 
   def ci_command(f):
     actual_name = f.__name__ if name is None else name
 
-    @main.command(name=actual_name, help=f.__doc__)
+    @click.command(name=actual_name, cls=cls, help=f.__doc__)
     @_pass_options
     @click.pass_context
     def new_func(ctx, options, *args, **kwargs):
       with _artifact_handler(
           options.artifact_target_dir,
-          options.artifact_patterns):
+          options.artifact_patterns,
+      ) if cls is click.Command else nullcontext():
         return ctx.invoke(f, *args, **kwargs)
 
+    group.add_command(new_func)
+
     return functools.update_wrapper(new_func, f)
 
   return ci_command
diff --git a/ci/fireci/fireci/main.py b/ci/fireci/fireci/main.py
index ecf5d0c95b3..9348f69b02c 100644
--- a/ci/fireci/fireci/main.py
+++ b/ci/fireci/fireci/main.py
@@ -13,14 +13,18 @@
 # limitations under the License.
 
 import logging
+import os
 
 from . import commands
 from . import plugins
 from .internal import main
 
+# Unnecessary on CI as GitHub Actions provides them already.
+asctime_place_holder = '' if os.getenv('CI') else '%(asctime)s '
+log_format = f'[%(levelname).1s] {asctime_place_holder}%(name)s: %(message)s'
 logging.basicConfig(
     datefmt='%Y-%m-%d %H:%M:%S %z %Z',
-    format='[%(levelname).1s] %(asctime)s %(name)s: %(message)s',
+    format=log_format,
     level=logging.INFO,
 )
 logging.getLogger('fireci').setLevel(logging.DEBUG)
diff --git a/ci/fireci/fireci/plugins.py b/ci/fireci/fireci/plugins.py
index 66aebd30f8c..715c8de0884 100644
--- a/ci/fireci/fireci/plugins.py
+++ b/ci/fireci/fireci/plugins.py
@@ -27,7 +27,7 @@ def discover():
      Note: plugins *must* define the `firebaseplugins` package as a namespace package.
            See: https://packaging.python.org/guides/packaging-namespace-packages/
   """
-  modules = pkgutil.iter_modules(fireciplugins.__path__,
-                                 fireciplugins.__name__ + ".")
+  modules = pkgutil.walk_packages(fireciplugins.__path__,
+                                  fireciplugins.__name__ + ".")
   for _, name, _ in modules:
     importlib.import_module(name)
diff --git a/ci/fireci/fireci/uploader.py b/ci/fireci/fireci/uploader.py
index 5da268ef239..cb8e617bf2b 100644
--- a/ci/fireci/fireci/uploader.py
+++ b/ci/fireci/fireci/uploader.py
@@ -17,17 +17,23 @@
 import os
 import requests
 import subprocess
-import urllib.parse
 
-from . import prow_utils
 
 _logger = logging.getLogger('fireci.uploader')
 
 
-def post_report(test_report, metrics_service_url, access_token, metric='reports', note=''):
+def post_report(test_report, metrics_service_url, access_token, metric_type, asynchronous=False):
   """Post a report to the metrics service backend."""
 
-  endpoint = _construct_request_endpoint(metric, note)
+  endpoint = ''
+  if os.getenv('GITHUB_ACTIONS'):
+    endpoint = _construct_request_endpoint_for_github_actions(metric_type)
+  elif os.getenv('PROW_JOB_ID'):
+    endpoint = _construct_request_endpoint_for_prow(metric_type)
+
+  if asynchronous:
+    endpoint += '&async=true'
+
   headers = {'Authorization': f'Bearer {access_token}', 'Content-Type': 'application/json'}
   data = json.dumps(test_report)
 
@@ -41,25 +47,37 @@ def post_report(test_report, metrics_service_url, access_token, metric='reports'
   _logger.info(f'Response: {result.text}')
 
 
-def _construct_request_endpoint(metric, note):
+def _construct_request_endpoint_for_github_actions(metric_type):
+  repo = os.getenv('GITHUB_REPOSITORY')
+  commit = os.getenv('GITHUB_SHA')
+  event_name = os.getenv('GITHUB_EVENT_NAME')
+
+  endpoint = f'/repos/{repo}/commits/{commit}/{metric_type}'
+  if event_name == 'pull_request':
+    pull_request = os.getenv('GITHUB_PULL_REQUEST_NUMBER')
+    base_commit = _get_commit_hash('HEAD^1')
+    head_commit = _get_commit_hash('HEAD^2')
+    endpoint += f'?pull_request={pull_request}&base_commit={base_commit}&head_commit={head_commit}'
+  else:
+    branch = os.getenv('GITHUB_REF_NAME')
+    endpoint += f'?branch={branch}'
+
+  return endpoint
+
+
+def _construct_request_endpoint_for_prow(metric_type):
   repo_owner = os.getenv('REPO_OWNER')
   repo_name = os.getenv('REPO_NAME')
-  branch = os.getenv('PULL_BASE_REF')
-  pull_request = os.getenv('PULL_NUMBER')
-
   commit = _get_commit_hash('HEAD@{0}')
-  log = prow_utils.prow_job_log_link()
+  pull_request = os.getenv('PULL_NUMBER')
 
-  endpoint = f'/repos/{repo_owner}/{repo_name}/commits/{commit}/{metric}?log={log}'
+  endpoint = f'/repos/{repo_owner}/{repo_name}/commits/{commit}/{metric_type}'
   if pull_request:
     base_commit = os.getenv('PULL_BASE_SHA')
     head_commit = os.getenv('PULL_PULL_SHA')
     endpoint += f'&pull_request={pull_request}&base_commit={base_commit}&head_commit={head_commit}'
-
-    commit_note = _get_prow_commit_note('HEAD@{0}')
-    note += f'\n{commit_note}\n'
-    endpoint += f'&note={urllib.parse.quote(note)}'
   else:
+    branch = os.getenv('PULL_BASE_REF')
     endpoint += f'&branch={branch}'
 
   return endpoint
@@ -68,13 +86,3 @@ def _construct_request_endpoint(metric, note):
 def _get_commit_hash(revision):
   result = subprocess.run(['git', 'rev-parse', revision], stdout=subprocess.PIPE, check=True)
   return result.stdout.decode('utf-8').strip()
-
-
-def _get_prow_commit_note(revision):
-  template = 'Head commit (%h) is created by Prow via merging commits: %p.'
-  result = subprocess.run(
-    ['git', 'show', revision, f'--format={template}', '-s'],
-    stdout=subprocess.PIPE,
-    check=True,
-  )
-  return result.stdout.decode('utf-8').strip()
diff --git a/ci/fireci/fireciplugins/binary_size.py b/ci/fireci/fireciplugins/binary_size.py
index e69d75b2f06..067ca83967f 100644
--- a/ci/fireci/fireciplugins/binary_size.py
+++ b/ci/fireci/fireciplugins/binary_size.py
@@ -17,11 +17,10 @@
 import json
 import logging
 import os
-import re
 
 from fireci import ci_command
+from fireci import ci_utils
 from fireci import gradle
-from fireci import prow_utils
 from fireci import uploader
 
 _logger = logging.getLogger('fireci.binary_size')
@@ -34,17 +33,17 @@
 )
 @click.option(
   '--log',
-  default=prow_utils.prow_job_log_link,
-  help='The link to the log of the prow job, which runs this coverage check.'
+  default=ci_utils.ci_log_link,
+  help='The link to the log of the current job, which runs this size test.'
 )
 @click.option(
   '--metrics-service-url',
-  envvar='METRICS_SERVICE_URL',
+  default='https://api.firebase-sdk-health-metrics.com',
   help='The URL to the metrics service, which persists data and calculates diff.'
 )
 @click.option(
   '--access-token',
-  default=prow_utils.gcloud_identity_token,
+  default=ci_utils.gcloud_identity_token,
   help='The access token, used to authorize http requests to the metrics service.'
 )
 @ci_command()
@@ -58,12 +57,17 @@ def binary_size(pull_request, log, metrics_service_url, access_token):
   sdks = ','.join(artifacts)
 
   workdir = 'health-metrics/apk-size'
-  gradle.run('assemble', '--continue', gradle.P('sdks', sdks), workdir=workdir, check=False)
+  process = gradle.run('assemble', '--continue', gradle.P('sdks', sdks), workdir=workdir, check=False)
 
   test_results = _measure_aar_sizes(artifacts) + _measure_apk_sizes()
-  test_report = {'metric': 'BinarySize', 'results': test_results, 'log': log}
+  test_report = {'sizes': test_results, 'log': log}
 
-  uploader.post_report(test_report, metrics_service_url, access_token)
+  access_token = ci_utils.gcloud_identity_token()
+  uploader.post_report(test_report, metrics_service_url, access_token, 'size')
+
+  if process.returncode != 0:
+    _logger.error(f'{process.args} failed with error code: {process.returncode}.')
+    raise click.ClickException('Binary size test failed with above errors.')
 
 
 def _measure_aar_sizes(artifacts):
@@ -75,7 +79,7 @@ def _measure_aar_sizes(artifacts):
 
     if aar_files:
       aar_size = os.path.getsize(aar_files[0])
-      test_results.append({'sdk': artifact_id, 'type': 'aar', 'value': aar_size})
+      test_results.append({'sdk': artifact_id, 'type': 'aar', 'size': aar_size})
 
   return test_results
 
@@ -91,7 +95,7 @@ def _measure_apk_sizes():
     apk_type = build_type if abi == 'universal' else f'{build_type} / {abi}'
     apk_size = os.path.getsize(apk_file)
 
-    test_results.append({'sdk': artifact, 'type': f'apk ({apk_type})', 'value': apk_size})
+    test_results.append({'sdk': artifact, 'type': f'apk ({apk_type})', 'size': apk_size})
 
   return test_results
 
diff --git a/ci/fireci/fireciplugins/changelog_comment.py b/ci/fireci/fireciplugins/changelog_comment.py
new file mode 100644
index 00000000000..7ba20f48b8b
--- /dev/null
+++ b/ci/fireci/fireciplugins/changelog_comment.py
@@ -0,0 +1,91 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import click
+
+from textwrap import dedent
+from pathlib import Path
+from fireci import gradle
+from fireci import ci_command
+
+@click.option(
+  '--changelogs',
+  '-c',
+  required=True,
+  help="A space separated list of changelog files to generate release notes for."
+)
+@click.option(
+  '--output',
+  '-o',
+  required=True,
+  help="The file to write the comment to."
+)
+@ci_command()
+def changelog_comment(changelogs, output):
+  """Generates and formats release notes to a pretty comment for GitHub."""
+
+  gradle.run('makeReleaseNotes', gradle.P("skipEmptyChangelog", "true"))
+  release_notes = []
+  missing_release_notes = []
+  for changelog in changelogs.rsplit(" "):
+    directory = changelog.rsplit("/", 1)[0]
+    name = directory.replace("/", ":")
+    path = Path(directory, "build/tmp/makeReleaseNotes/release_notes.md")
+
+    if path.exists():
+      release_notes.append(convert_release_note(name, path))
+    else:
+      missing_release_notes.append(name)
+
+  comment_string = "## Release note changes"
+
+  if release_notes:
+    comment_string += dedent("""
+    The following release notes were modified. Please ensure they look correct.
+    <details>
+    <summary>Release Notes</summary>
+    {0}
+    </details>
+    """).format(''.join(release_notes))
+
+  if missing_release_notes:
+    comment_string += dedent("""
+    The following had changelogs that were modified, but did not have any unreleased entries for release notes to generate from.
+    <details>
+    <summary>Changelogs</summary>
+    
+    {0}
+    </details>
+    """).format('\n'.join(missing_release_notes))
+
+  if not release_notes and not missing_release_notes:
+    print("The changelogs argument was invalid.")
+    exit(1)
+
+  with open(output, 'w') as f:
+    f.write(comment_string.strip())
+
+  exit(0)
+
+def convert_release_note(name, path):
+  with open(path, 'r') as f:
+    return dedent("""
+    <details>
+    <summary>{0}</summary>
+    
+    ```markdown
+    {1}
+    ```
+    </details>
+    """).format(name, f.read())
diff --git a/ci/fireci/fireciplugins/coverage.py b/ci/fireci/fireciplugins/coverage.py
index fc98dab8e00..48ded2348ed 100644
--- a/ci/fireci/fireciplugins/coverage.py
+++ b/ci/fireci/fireciplugins/coverage.py
@@ -19,8 +19,8 @@
 import xml.etree.ElementTree as ElementTree
 
 from fireci import ci_command
+from fireci import ci_utils
 from fireci import gradle
-from fireci import prow_utils
 from fireci import uploader
 
 _logger = logging.getLogger('fireci.coverage')
@@ -33,17 +33,17 @@
 )
 @click.option(
   '--log',
-  default=prow_utils.prow_job_log_link,
-  help='The link to the log of the prow job, which runs this coverage check.'
+  default=ci_utils.ci_log_link,
+  help='The link to the log of the current job, which runs this coverage check.'
 )
 @click.option(
   '--metrics-service-url',
-  envvar='METRICS_SERVICE_URL',
+  default='https://api.firebase-sdk-health-metrics.com',
   help='The URL to the metrics service, which persists data and calculates diff.'
 )
 @click.option(
   '--access-token',
-  default=prow_utils.gcloud_identity_token,
+  default=ci_utils.gcloud_identity_token,
   help='The access token, used to authorize http requests to the metrics service.'
 )
 @ci_command()
@@ -51,17 +51,16 @@ def coverage(pull_request, log, metrics_service_url, access_token):
   """Produces and uploads code coverage reports."""
 
   coverage_task = 'checkCoverageChanged' if pull_request else 'checkCoverage'
-  gradle.run(coverage_task, '--continue', check=False)
+  process = gradle.run(coverage_task, '--continue', check=False)
 
   test_results = _parse_xml_reports()
-  test_report = {'metric': 'Coverage', 'results': test_results, 'log': log}
+  test_report = {'coverages': test_results, 'log': log}
 
-  note = '''
-HTML coverage reports can be produced locally with `./gradlew <product>:checkCoverage`.
-Report files are located at `<product-build-dir>/reports/jacoco/`.
-'''
+  access_token = ci_utils.gcloud_identity_token()
+  uploader.post_report(test_report, metrics_service_url, access_token, 'coverage')
 
-  uploader.post_report(test_report, metrics_service_url, access_token, note=note)
+  if process.returncode != 0:
+    _logger.warning(f'{process.args} failed with error code: {process.returncode}.')
 
 
 def _parse_xml_reports():
@@ -74,12 +73,12 @@ def _parse_xml_reports():
     sdk = re.search(r'([^/]*)\.xml', xml_report).group(1)
     report = ElementTree.parse(xml_report).getroot()
     sdk_coverage = _calculate_coverage(report)
-    test_results.append({'sdk': sdk, 'type': '', 'value': sdk_coverage})
+    test_results.append({'sdk': sdk, 'filename': '', 'coverage': sdk_coverage})
 
     for source_file in report.findall('.//sourcefile'):
       file_name = source_file.attrib['name']
       file_coverage = _calculate_coverage(source_file)
-      test_results.append({'sdk': sdk, 'type': file_name, 'value': file_coverage})
+      test_results.append({'sdk': sdk, 'filename': file_name, 'coverage': file_coverage})
 
   return test_results
 
diff --git a/ci/fireci/fireciplugins/fireperf.py b/ci/fireci/fireciplugins/fireperf.py
index a073c922efa..b696ee963f1 100644
--- a/ci/fireci/fireciplugins/fireperf.py
+++ b/ci/fireci/fireciplugins/fireperf.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import click
-import contextlib
 import logging
 import os
 import pathlib
@@ -38,7 +37,7 @@
 )
 @ci_command()
 def fireperf_e2e_test(target_environment, plugin_repo_dir):
-  """Run Firebase Performance end to end test."""
+  """Run Firebase Performance end-to-end test."""
 
   _logger.info('Building fireperf plugin ...')
   with chdir(plugin_repo_dir):
@@ -53,7 +52,8 @@ def fireperf_e2e_test(target_environment, plugin_repo_dir):
     '--build-cache',
     '--parallel',
     '--continue',
-    ':firebase-perf:e2e-app:deviceCheck'
+    ':firebase-perf:e2e-app:deviceCheck',
+    gradle.P('instrumentFireperfE2ETest', 'true')
   ]
   if target_environment == 'autopush':
     fireperf_e2e_test_gradle_command += [gradle.P('fireperfBuildForAutopush', 'true')]
diff --git a/ci/fireci/fireciplugins/macrobenchmark.py b/ci/fireci/fireciplugins/macrobenchmark.py
deleted file mode 100644
index dc2e891bfc9..00000000000
--- a/ci/fireci/fireciplugins/macrobenchmark.py
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 2021 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import asyncio
-import glob
-import json
-import logging
-import os
-import random
-import re
-import shutil
-import sys
-import uuid
-
-import click
-import numpy
-import pystache
-import yaml
-from google.cloud import storage
-
-from fireci import ci_command
-from fireci.dir_utils import chdir
-from fireci import prow_utils
-from fireci import uploader
-
-_logger = logging.getLogger('fireci.macrobenchmark')
-
-
-@ci_command()
-def macrobenchmark():
-  """Measures app startup times for Firebase SDKs."""
-  asyncio.run(_launch_macrobenchmark_test())
-
-
-async def _launch_macrobenchmark_test():
-  _logger.info('Starting macrobenchmark test...')
-
-  artifact_versions, config, _, _ = await asyncio.gather(
-    _parse_artifact_versions(),
-    _parse_config_yaml(),
-    _create_gradle_wrapper(),
-    _copy_google_services(),
-  )
-
-  _logger.info(f'Artifact versions: {artifact_versions}')
-
-  with chdir('health-metrics/macrobenchmark'):
-    runners = [MacrobenchmarkTest(k, v, artifact_versions) for k, v in config.items()]
-    results = await asyncio.gather(*[x.run() for x in runners], return_exceptions=True)
-
-  await _post_processing(results)
-
-  _logger.info('Macrobenchmark test finished.')
-
-
-async def _parse_artifact_versions():
-  proc = await asyncio.subprocess.create_subprocess_exec('./gradlew', 'assembleAllForSmokeTests')
-  await proc.wait()
-
-  with open('build/m2repository/changed-artifacts.json') as json_file:
-    artifacts = json.load(json_file)
-  return dict(_artifact_key_version(x) for x in artifacts['headGit'])
-
-
-def _artifact_key_version(artifact):
-  group_id, artifact_id, version = artifact.split(':')
-  return f'{group_id}:{artifact_id}', version
-
-
-async def _parse_config_yaml():
-  with open('health-metrics/macrobenchmark/config.yaml') as yaml_file:
-    return yaml.safe_load(yaml_file)
-
-
-async def _create_gradle_wrapper():
-  with open('health-metrics/macrobenchmark/settings.gradle', 'w'):
-    pass
-
-  proc = await asyncio.subprocess.create_subprocess_exec(
-    './gradlew',
-    'wrapper',
-    '--gradle-version',
-    '6.9',
-    '--project-dir',
-    'health-metrics/macrobenchmark'
-  )
-  await proc.wait()
-
-
-async def _copy_google_services():
-  if 'FIREBASE_CI' in os.environ:
-    src = os.environ['FIREBASE_GOOGLE_SERVICES_PATH']
-    dst = 'health-metrics/macrobenchmark/template/app/google-services.json'
-    _logger.info(f'Running on CI. Copying "{src}" to "{dst}"...')
-    shutil.copyfile(src, dst)
-
-
-async def _post_processing(results):
-  # Upload successful measurements to the metric service
-  measurements = []
-  for result in results:
-    if not isinstance(result, Exception):
-      measurements.extend(result)
-
-  metrics_service_url = os.getenv('METRICS_SERVICE_URL')
-  access_token = prow_utils.gcloud_identity_token()
-  uploader.post_report(measurements, metrics_service_url, access_token, metric='macrobenchmark')
-
-  # Raise exceptions for failed measurements
-  if any(map(lambda x: isinstance(x, Exception), results)):
-    _logger.error(f'Exceptions: {[x for x in results if isinstance(x, Exception)]}')
-    raise click.ClickException('Macrobenchmark test failed with above errors.')
-
-
-class MacrobenchmarkTest:
-  """Builds the test based on configurations and runs the test on FTL."""
-  def __init__(
-      self,
-      sdk_name,
-      test_app_config,
-      artifact_versions,
-      logger=_logger
-  ):
-    self.sdk_name = sdk_name
-    self.test_app_config = test_app_config
-    self.artifact_versions = artifact_versions
-    self.logger = MacrobenchmarkLoggerAdapter(logger, sdk_name)
-    self.test_app_dir = os.path.join('test-apps', test_app_config['name'])
-    self.test_results_bucket = 'fireescape-benchmark-results'
-    self.test_results_dir = str(uuid.uuid4())
-    self.gcs_client = storage.Client()
-
-  async def run(self):
-    """Starts the workflow of src creation, apks assembly, FTL testing and results upload."""
-    await self._create_benchmark_projects()
-    await self._assemble_benchmark_apks()
-    await self._execute_benchmark_tests()
-    return await self._aggregate_benchmark_results()
-
-  async def _create_benchmark_projects(self):
-    app_name = self.test_app_config['name']
-    self.logger.info(f'Creating test app "{app_name}"...')
-
-    mustache_context = await self._prepare_mustache_context()
-
-    shutil.copytree('template', self.test_app_dir)
-    with chdir(self.test_app_dir):
-      renderer = pystache.Renderer()
-      mustaches = glob.glob('**/*.mustache', recursive=True)
-      for mustache in mustaches:
-        result = renderer.render_path(mustache, mustache_context)
-        original_name = mustache[:-9]  # TODO(yifany): mustache.removesuffix('.mustache')
-        with open(original_name, 'w') as file:
-          file.write(result)
-
-  async def _assemble_benchmark_apks(self):
-    executable = './gradlew'
-    args = ['assemble', 'assembleAndroidTest', '--project-dir', self.test_app_dir]
-    await self._exec_subprocess(executable, args)
-
-  async def _execute_benchmark_tests(self):
-    app_apk_path = glob.glob(f'{self.test_app_dir}/app/**/*.apk', recursive=True)[0]
-    test_apk_path = glob.glob(f'{self.test_app_dir}/benchmark/**/*.apk', recursive=True)[0]
-
-    self.logger.info(f'App apk: {app_apk_path}')
-    self.logger.info(f'Test apk: {test_apk_path}')
-
-    ftl_environment_variables = [
-      'clearPackageData=true',
-      'additionalTestOutputDir=/sdcard/Download',
-      'no-isolated-storage=true',
-    ]
-    executable = 'gcloud'
-    args = ['firebase', 'test', 'android', 'run']
-    args += ['--type', 'instrumentation']
-    args += ['--app', app_apk_path]
-    args += ['--test', test_apk_path]
-    args += ['--device', 'model=redfin,version=30,locale=en,orientation=portrait']
-    args += ['--directories-to-pull', '/sdcard/Download']
-    args += ['--results-bucket', f'gs://{self.test_results_bucket}']
-    args += ['--results-dir', self.test_results_dir]
-    args += ['--environment-variables', ','.join(ftl_environment_variables)]
-    args += ['--timeout', '30m']
-    args += ['--project', 'fireescape-c4819']
-
-    await self._exec_subprocess(executable, args)
-
-  async def _prepare_mustache_context(self):
-    app_name = self.test_app_config['name']
-
-    mustache_context = {
-      'plugins': [],
-      'dependencies': [],
-    }
-
-    if app_name != 'baseline':
-      mustache_context['plugins'].append('com.google.gms.google-services')
-
-    if 'plugins' in self.test_app_config:
-      mustache_context['plugins'].extend(self.test_app_config['plugins'])
-
-    if 'dependencies' in self.test_app_config:
-      for dep in self.test_app_config['dependencies']:
-        if '@' in dep:
-          key, version = dep.split('@', 1)
-          dependency = {'key': key, 'version': version}
-        else:
-          dependency = {'key': dep, 'version': self.artifact_versions[dep]}
-        mustache_context['dependencies'].append(dependency)
-
-    return mustache_context
-
-  async def _aggregate_benchmark_results(self):
-    results = []
-    blobs = self.gcs_client.list_blobs(self.test_results_bucket, prefix=self.test_results_dir)
-    files = [x for x in blobs if re.search(r'sdcard/Download/[^/]*\.json', x.name)]
-    for file in files:
-      device = re.search(r'([^/]*)/artifacts/', file.name).group(1)
-      benchmarks = json.loads(file.download_as_bytes())['benchmarks']
-      for benchmark in benchmarks:
-        method = benchmark['name']
-        clazz = benchmark['className'].split('.')[-1]
-        runs = benchmark['metrics']['startupMs']['runs']
-        results.append({
-          'sdk': self.sdk_name,
-          'device': device,
-          'name': f'{clazz}.{method}',
-          'min': min(runs),
-          'max': max(runs),
-          'p50': numpy.percentile(runs, 50),
-          'p90': numpy.percentile(runs, 90),
-          'p99': numpy.percentile(runs, 99),
-          'unit': 'ms',
-        })
-    self.logger.info(f'Benchmark results: {results}')
-    return results
-
-  async def _exec_subprocess(self, executable, args):
-    command = " ".join([executable, *args])
-    self.logger.info(f'Executing command: "{command}"...')
-
-    proc = await asyncio.subprocess.create_subprocess_exec(
-      executable,
-      *args,
-      stdout=asyncio.subprocess.PIPE,
-      stderr=asyncio.subprocess.PIPE
-    )
-    await asyncio.gather(
-      self._stream_output(executable, proc.stdout),
-      self._stream_output(executable, proc.stderr)
-    )
-
-    await proc.communicate()
-    if proc.returncode == 0:
-      self.logger.info(f'"{command}" finished.')
-    else:
-      message = f'"{command}" exited with return code {proc.returncode}.'
-      self.logger.error(message)
-      raise click.ClickException(message)
-
-  async def _stream_output(self, executable, stream: asyncio.StreamReader):
-    async for line in stream:
-      self.logger.info(f'[{executable}] {line.decode("utf-8").strip()}')
-
-
-class MacrobenchmarkLoggerAdapter(logging.LoggerAdapter):
-  """Decorates log messages for a sdk to make them more distinguishable."""
-
-  reset_code = '\x1b[m'
-
-  @staticmethod
-  def random_color_code():
-    code = random.randint(16, 231)  # https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit
-    return f'\x1b[38;5;{code}m'
-
-  def __init__(self, logger, sdk_name, color_code=None):
-    super().__init__(logger, {})
-    self.sdk_name = sdk_name
-    self.color_code = self.random_color_code() if color_code is None else color_code
-
-  def process(self, msg, kwargs):
-    colored = f'{self.color_code}[{self.sdk_name}]{self.reset_code} {msg}'
-    uncolored = f'[{self.sdk_name}] {msg}'
-    return colored if sys.stderr.isatty() else uncolored, kwargs
diff --git a/ci/fireci/fireciplugins/macrobenchmark/__init__.py b/ci/fireci/fireciplugins/macrobenchmark/__init__.py
new file mode 100644
index 00000000000..6d6d1266c32
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/ci/fireci/fireciplugins/macrobenchmark/analyze/__init__.py b/ci/fireci/fireciplugins/macrobenchmark/analyze/__init__.py
new file mode 100644
index 00000000000..6d6d1266c32
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/analyze/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/ci/fireci/fireciplugins/macrobenchmark/analyze/aggregator.py b/ci/fireci/fireciplugins/macrobenchmark/analyze/aggregator.py
new file mode 100644
index 00000000000..8c52e90ca51
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/analyze/aggregator.py
@@ -0,0 +1,81 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import logging
+import pandas as pd
+import seaborn as sns
+
+from pathlib import Path
+
+logger = logging.getLogger('fireci.macrobenchmark')
+sns.set()
+
+
+def calculate_statistic(trace: str, device: str, data: pd.DataFrame, output_dir: Path = None):
+  logger.info(f'Calculating statistics for trace "{trace}" on device "{device}" ...')
+
+  # Calculate percentiles per each run_id
+  quantiles = [0.1, 0.25, 0.5, 0.75, 0.9]
+  percentiles = data.groupby('run_id').quantile(quantiles, numeric_only=True)
+  percentiles.index.set_names('percentile', level=1, inplace=True)
+  percentiles = percentiles.reset_index(['run_id', 'percentile'])
+  percentiles = percentiles.pivot(index='run_id', columns='percentile', values='duration')
+
+  def mapper(quantile: float) -> str: return f'p{int(quantile * 100)}'
+
+  percentiles.rename(mapper=mapper, axis='columns', inplace=True)
+
+  # Calculate dispersions of each percentile over all runs
+  mean = percentiles.mean()
+  std = percentiles.std()  # standard deviation
+  cv = std / mean  # coefficient of variation (relative standard deviation)
+  mad = (percentiles - percentiles.mean()).abs().mean()  # mean absolute deviation
+  rmad = mad / mean  # relative mean absolute deviation (mad / mean)
+  dispersions = pd.DataFrame([pd.Series(cv, name='cv'), pd.Series(rmad, name='rmad')])
+
+  # Optionally save percentiles and dispersions to file
+  if output_dir:
+    output_dir.mkdir(parents=True, exist_ok=True)
+    percentiles.to_json(output_dir.joinpath('percentiles.json'), orient='index')
+    dispersions.to_json(output_dir.joinpath('dispersions.json'), orient='index')
+    logger.info(f'Percentiles and dispersions saved in: {output_dir}')
+
+  return percentiles, dispersions
+
+
+def calculate_statistic_diff(
+    trace: str,
+    device: str,
+    control: pd.DataFrame,
+    experimental: pd.DataFrame,
+    output_dir: Path = None,
+):
+  logger.info(f'Calculating statistic diff for trace "{trace}" on device "{device}" ...')
+
+  ctl_percentiles, _ = calculate_statistic(trace, device, control, output_dir.joinpath("ctl"))
+  exp_percentiles, _ = calculate_statistic(trace, device, experimental, output_dir.joinpath("exp"))
+
+  ctl_mean = ctl_percentiles.mean()
+  exp_mean = exp_percentiles.mean()
+
+  delta = exp_mean - ctl_mean
+  percentage = delta / ctl_mean
+
+  # Optionally save statistics to file
+  if output_dir:
+    output_dir.mkdir(parents=True, exist_ok=True)
+    delta.to_json(output_dir.joinpath('delta.json'))
+    percentage.to_json(output_dir.joinpath('percentage.json'))
+    logger.info(f'Percentiles diff saved in: {output_dir}')
diff --git a/ci/fireci/fireciplugins/macrobenchmark/analyze/analyzer.py b/ci/fireci/fireciplugins/macrobenchmark/analyze/analyzer.py
new file mode 100644
index 00000000000..daf63b93996
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/analyze/analyzer.py
@@ -0,0 +1,102 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import tempfile
+import pandas as pd
+
+from .aggregator import calculate_statistic, calculate_statistic_diff
+from .plotter import plot_graph, plot_diff_graph
+from .utils import collect_data_points, DataPoint
+from click import progressbar
+from pathlib import Path
+from typing import List
+
+
+logger = logging.getLogger('fireci.macrobenchmark')
+
+
+def start(
+    diff_mode: bool,
+    ftl_results_dir: List[str],
+    local_reports_dir: Path,
+    ctl_ftl_results_dir: List[str],
+    ctl_local_reports_dir: Path,
+    exp_ftl_results_dir: List[str],
+    exp_local_reports_dir: Path,
+    output_dir: Path
+):
+  logger.info('Starting to analyze macrobenchmark test results ...')
+
+  if not output_dir:
+    output_dir = Path(tempfile.mkdtemp(prefix='macrobenchmark-analysis-'))
+    logger.info(f'Created temporary dir "{output_dir}" to save analysis results')
+
+  if not diff_mode:
+    data_points = collect_data_points(ftl_results_dir, local_reports_dir)
+    _process(data_points, output_dir)
+  else:
+    logger.info('Running in diff mode ...')
+    ctl_data_points = collect_data_points(ctl_ftl_results_dir, ctl_local_reports_dir)
+    exp_data_points = collect_data_points(exp_ftl_results_dir, exp_local_reports_dir)
+    _diff(ctl_data_points, exp_data_points, output_dir)
+
+  logger.info(f'Completed analysis and saved output in: {output_dir}')
+
+
+def _process(data_points: List[DataPoint], output_dir: Path) -> None:
+  data = pd.DataFrame(data_points)
+  traces = sorted(data['trace'].unique())
+  devices = sorted(data['device'].unique())
+
+  trace_device_combinations = [(trace, device) for trace in traces for device in devices]
+
+  with progressbar(trace_device_combinations) as combinations:
+    for trace, device in combinations:
+      combination_dir = output_dir.joinpath(trace, device)
+      subset = _filter_subset(data, trace, device)
+      calculate_statistic(trace, device, subset, combination_dir)
+      plot_graph(trace, device, subset, combination_dir)
+
+
+def _diff(
+    ctl_data_points: List[DataPoint],
+    exp_data_points: List[DataPoint],
+    output_dir: Path
+) -> None:
+  ctl_data = pd.DataFrame(ctl_data_points)
+  exp_data = pd.DataFrame(exp_data_points)
+  all_data = pd.concat([ctl_data, exp_data])
+
+  traces = sorted(all_data['trace'].unique())
+  devices = sorted(all_data['device'].unique())
+
+  trace_device_combinations = [(trace, device) for trace in traces for device in devices]
+
+  with progressbar(trace_device_combinations) as combinations:
+    for trace, device in combinations:
+      combination_dir = output_dir.joinpath(trace, device)
+
+      ctl_subset = _filter_subset(ctl_data, trace, device)
+      exp_subset = _filter_subset(exp_data, trace, device)
+
+      calculate_statistic_diff(trace, device, ctl_subset, exp_subset, combination_dir)
+      plot_diff_graph(trace, device, ctl_subset, exp_subset, combination_dir)
+
+
+def _filter_subset(data: pd.DataFrame, trace: str, device: str) -> pd.DataFrame:
+  return data.loc[
+    (data['trace'] == trace) & (data['device'] == device),
+    ['duration', 'run_id']
+  ]
diff --git a/ci/fireci/fireciplugins/macrobenchmark/analyze/plotter.py b/ci/fireci/fireciplugins/macrobenchmark/analyze/plotter.py
new file mode 100644
index 00000000000..31c98c229c0
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/analyze/plotter.py
@@ -0,0 +1,78 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import matplotlib.pyplot as plt
+import numpy as np
+import pandas as pd
+import seaborn as sns
+
+from pathlib import Path
+
+
+logger = logging.getLogger('fireci.macrobenchmark')
+sns.set()
+
+
+def plot_graph(trace: str, device: str, data: pd.DataFrame, output_dir: Path):
+  logger.info(f'Plotting graphs for trace "{trace}" on device "{device}" ...')
+
+  output_dir.mkdir(parents=True, exist_ok=True)
+
+  unique_run_ids = len(data['run_id'].unique())
+  col_wrap = int(np.ceil(np.sqrt(unique_run_ids)))
+
+  histograms = sns.displot(data=data, x='duration', kde=True, col="run_id", col_wrap=col_wrap)
+  histograms.set_axis_labels(x_var=f'{trace} (ms)')
+  histograms.set_titles(f'{device} ({{col_var}} = {{col_name}})')
+  histograms.savefig(output_dir.joinpath('histograms.svg'))
+  plt.close(histograms.fig)
+
+  distributions = sns.displot(
+    data=data, x='duration', kde=True, height=8,
+    hue='run_id', palette='muted', multiple='dodge'
+  )
+  distributions.set_axis_labels(x_var=f'{trace} (ms)').set(title=device)
+  distributions.savefig(output_dir.joinpath('distributions.svg'))
+  plt.close(distributions.fig)
+
+  logger.info(f'Graphs saved in: {output_dir}')
+
+
+def plot_diff_graph(
+    trace: str,
+    device: str,
+    control: pd.DataFrame,
+    experimental: pd.DataFrame,
+    output_dir: Path
+):
+  logger.info(f'Plotting distribution diff graph for trace "{trace}" on device "{device}" ...')
+
+  output_dir.mkdir(parents=True, exist_ok=True)
+
+  control_run_ids = control['run_id']
+  experimental_run_ids = experimental['run_id']
+  all_data = pd.concat([control, experimental])
+
+  palette = {**{x: 'b' for x in control_run_ids}, **{x: 'r' for x in experimental_run_ids}}
+
+  distribution_diff = sns.displot(
+    data=all_data, x='duration', kde=True, height=8,
+    hue='run_id', palette=palette, multiple='dodge'
+  )
+  distribution_diff.set_axis_labels(x_var=f'{trace} (ms)').set(title=device)
+  distribution_diff.savefig(output_dir.joinpath('distribution_diff.svg'))
+  plt.close(distribution_diff.fig)
+
+  logger.info(f'Graph saved in: {output_dir}')
diff --git a/ci/fireci/fireciplugins/macrobenchmark/analyze/utils.py b/ci/fireci/fireciplugins/macrobenchmark/analyze/utils.py
new file mode 100644
index 00000000000..131bb909a83
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/analyze/utils.py
@@ -0,0 +1,82 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import json
+import logging
+import re
+import tempfile
+
+from click import ClickException
+from google.cloud import storage
+from pathlib import Path
+from typing import List, TypedDict
+
+
+logger = logging.getLogger('fireci.macrobenchmark')
+DataPoint = TypedDict('DataPoint', {'duration': float, 'device': str, 'trace': str, 'run_id': str})
+
+
+def collect_data_points(ftl_results_dir: List[str], local_reports_dir: Path) -> List[DataPoint]:
+  if not ftl_results_dir and not local_reports_dir:
+    raise ClickException('Neither ftl-results-dir or local-reports-dir is provided.')
+  elif ftl_results_dir and not local_reports_dir:
+    temp_dir = _download(ftl_results_dir)
+    return _extract_raw_data(temp_dir)
+  elif not ftl_results_dir and local_reports_dir:
+    return _extract_raw_data(local_reports_dir)
+  else:
+    raise ClickException('Should specify either ftl-results-dir or local-reports-dir, not both.')
+
+
+def _download(ftl_results_dirs: List[str]) -> Path:
+  ftl_results_bucket = 'fireescape-benchmark-results'
+  gcs = storage.Client()
+
+  temp_dir = tempfile.mkdtemp(prefix='ftl-results-')
+  for ftl_results_dir in ftl_results_dirs:
+    blobs = gcs.list_blobs(ftl_results_bucket, prefix=ftl_results_dir)
+    files = [f for f in blobs if f.name.endswith('.json')]
+    for file in files:
+      device = re.search(r'([^/]*)/artifacts/', file.name).group(1)
+      report_dir = Path(temp_dir).joinpath(ftl_results_dir, device)
+      report_dir.mkdir(parents=True, exist_ok=True)
+      filename = file.name.split('/')[-1]
+      file.download_to_filename(report_dir.joinpath(filename))
+      logger.info(f'Downloaded "{file.name}" to "{report_dir}"')
+
+  return Path(temp_dir)
+
+
+def _extract_raw_data(test_reports_dir: Path) -> List[DataPoint]:
+  data_points: List[DataPoint] = []
+  reports = sorted(list(test_reports_dir.rglob("*-benchmarkData.json")))
+  for report in reports:
+    logger.info(f'Processing "{report}" ...')
+
+    run_id = str(report.relative_to(test_reports_dir)).split('/')[0]
+    with open(report) as file:
+      obj = json.load(file)
+      build_context = obj['context']['build']
+      device = f'{build_context["device"]}-{build_context["version"]["sdk"]}'
+      for metric in obj['benchmarks'][0]['metrics'].keys():
+        measurements = obj['benchmarks'][0]['metrics'][metric]['runs']
+        trace = metric[:-2]  # TODO(yifany): .removesuffix('Ms') w/ python 3.9+
+        data_points.extend([{
+          'duration': measurement,
+          'device': device,
+          'trace': trace,
+          'run_id': run_id
+        } for measurement in measurements])
+  logger.info(f'Extracted {len(data_points)} data points from reports in "{test_reports_dir}"')
+  return data_points
diff --git a/ci/fireci/fireciplugins/macrobenchmark/commands.py b/ci/fireci/fireciplugins/macrobenchmark/commands.py
new file mode 100644
index 00000000000..3c340ece3ea
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/commands.py
@@ -0,0 +1,197 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import asyncio
+import click
+import json
+import logging
+
+from .analyze import analyzer
+from .run import runner
+from fireci import ci_command, ci_utils, uploader
+from pathlib import Path
+from typing import List
+
+logger = logging.getLogger('fireci.macrobenchmark')
+
+
+@ci_command(cls=click.Group)
+def macrobenchmark():
+  """Macrobenchmark testing command group."""
+  pass
+
+
+@click.option(
+  '--build-only',
+  is_flag=True,
+  default=False,
+  show_default=True,
+  help='Build the test projects without running the test.'
+)
+@click.option(
+  '--local/--remote',
+  default=True,
+  help='Run the test on local devices or Firebase Test Lab.'
+)
+@click.option(
+  '--repeat',
+  default=1,
+  show_default=True,
+  help='Number of times to repeat the test (for obtaining more data points).'
+)
+@click.option(
+  '--output',
+  type=click.Path(dir_okay=True, resolve_path=True, path_type=Path),
+  default='macrobenchmark-output.json',
+  show_default=True,
+  help='The file for saving macrobenchmark test output if running on Firebase Test Lab.'
+)
+@ci_command(group=macrobenchmark)
+def run(build_only: bool, local: bool, repeat: int, output: Path):
+  """Run macrobenchmark test."""
+  asyncio.run(runner.start(build_only, local, repeat, output))
+
+
+@click.option(
+  '--diff-mode',
+  is_flag=True,
+  default=False,
+  help='Compare two sets of macrobenchmark result.'
+)
+@click.option(
+  '--ftl-results-dir',
+  multiple=True,
+  help='Firebase Test Lab results directory name. Can be specified multiple times.'
+)
+@click.option(
+  '--local-reports-dir',
+  type=click.Path(dir_okay=True, resolve_path=True, path_type=Path),
+  help='Path to the directory of local test reports.'
+)
+@click.option(
+  '--ctl-ftl-results-dir',
+  multiple=True,
+  help='FTL results dir of the control group, if running in diff mode. '
+       'Can be specified multiple times.'
+)
+@click.option(
+  '--ctl-local-reports-dir',
+  type=click.Path(dir_okay=True, resolve_path=True, path_type=Path),
+  help='Path to the local test reports of the control group, if running in diff mode.'
+)
+@click.option(
+  '--exp-ftl-results-dir',
+  multiple=True,
+  help='FTL results dir of the experimental group, if running in diff mode. '
+       'Can be specified multiple times.'
+)
+@click.option(
+  '--exp-local-reports-dir',
+  type=click.Path(dir_okay=True, resolve_path=True, path_type=Path),
+  help='Path to the local test reports of the experimental group, if running in diff mode.'
+)
+@click.option(
+  '--output-dir',
+  type=click.Path(dir_okay=True, resolve_path=True, path_type=Path),
+  help='The directory for saving macrobenchmark analysis result.'
+)
+@ci_command(group=macrobenchmark)
+def analyze(
+    diff_mode: bool,
+    ftl_results_dir: List[str],
+    local_reports_dir: Path,
+    ctl_ftl_results_dir: List[str],
+    ctl_local_reports_dir: Path,
+    exp_ftl_results_dir: List[str],
+    exp_local_reports_dir: Path,
+    output_dir: Path
+):
+  """Analyze macrobenchmark result."""
+  analyzer.start(
+    diff_mode,
+    ftl_results_dir,
+    local_reports_dir,
+    ctl_ftl_results_dir,
+    ctl_local_reports_dir,
+    exp_ftl_results_dir,
+    exp_local_reports_dir,
+    output_dir,
+  )
+
+
+@click.option(
+  '--pull-request/--push',
+  required=True,
+  help='Whether the test is running for a pull request or a push event.'
+)
+@click.option(
+  '--changed-modules-file',
+  type=click.Path(resolve_path=True, path_type=Path),
+  help='Contains a list of changed modules in the current pull request.'
+)
+@click.option(
+  '--repeat',
+  default=10,
+  show_default=True,
+  help='Number of times to repeat the test (for obtaining more data points).'
+)
+@ci_command(group=macrobenchmark)
+def ci(pull_request: bool, changed_modules_file: Path, repeat: int):
+  """Run tests in CI and upload results to the metric service."""
+
+  output_path = Path("macrobenchmark-test-output.json")
+  exception = None
+
+  try:
+    if pull_request:
+      asyncio.run(
+        runner.start(
+          build_only=False,
+          local=False,
+          repeat=repeat,
+          output=output_path,
+          changed_modules_file=changed_modules_file,
+        )
+      )
+    else:
+      asyncio.run(runner.start(build_only=False, local=False, repeat=repeat, output=output_path))
+  except Exception as e:
+    logger.error(f"Error: {e}")
+    exception = e
+
+  with open(output_path) as output_file:
+    output = json.load(output_file)
+    project_name = 'test-changed' if pull_request else 'test-all'
+    ftl_dirs = list(filter(lambda x: x['project'] == project_name, output))[0]['successful_runs']
+    ftl_bucket_name = 'fireescape-benchmark-results'
+
+    log = ci_utils.ci_log_link()
+    ftl_results = list(map(lambda x: {'bucket': ftl_bucket_name, 'dir': x}, ftl_dirs))
+    startup_time_data = {'log': log, 'ftlResults': ftl_results}
+
+    if ftl_results:
+      metric_service_url = 'https://api.firebase-sdk-health-metrics.com'
+      access_token = ci_utils.gcloud_identity_token()
+      uploader.post_report(
+        test_report=startup_time_data,
+        metrics_service_url=metric_service_url,
+        access_token=access_token,
+        metric_type='startup-time',
+        asynchronous=True
+      )
+
+  if exception:
+    raise exception
+
+# TODO(yifany): support of command chaining
diff --git a/ci/fireci/fireciplugins/macrobenchmark/run/__init__.py b/ci/fireci/fireciplugins/macrobenchmark/run/__init__.py
new file mode 100644
index 00000000000..6d6d1266c32
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/run/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/ci/fireci/fireciplugins/macrobenchmark/run/log_decorator.py b/ci/fireci/fireciplugins/macrobenchmark/run/log_decorator.py
new file mode 100644
index 00000000000..177f5a1a3ba
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/run/log_decorator.py
@@ -0,0 +1,51 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import random
+import sys
+
+from logging import Logger, LoggerAdapter
+from typing import Union
+
+
+RESET_CODE = '\x1b[m'
+
+
+class LogDecorator(LoggerAdapter):
+  """Decorates log messages with colors in console output."""
+
+  def __init__(self, logger: Union[Logger, LoggerAdapter], key: str):
+    super().__init__(logger, {})
+    self.key = key
+    self.color_code = self._random_color_code()
+
+  def process(self, msg, kwargs):
+    colored, uncolored = self._produce_prefix()
+    result = f'{colored if sys.stderr.isatty() else uncolored} {msg}'
+    return result, kwargs
+
+  @staticmethod
+  def _random_color_code():
+    code = random.randint(16, 231)  # https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit
+    return f'\x1b[38;5;{code}m'
+
+  def _produce_prefix(self):
+    if hasattr(super(), '_produce_prefix'):
+      colored_super, uncolored_super = getattr(super(), '_produce_prefix')()
+      colored = f'{colored_super} {self.color_code}[{self.key}]{RESET_CODE}'
+      uncolored = f'{uncolored_super} [{self.key}]'
+    else:
+      colored = f'{self.color_code}[{self.key}]{RESET_CODE}'
+      uncolored = f'[{self.key}]'
+    return colored, uncolored
diff --git a/ci/fireci/fireciplugins/macrobenchmark/run/runner.py b/ci/fireci/fireciplugins/macrobenchmark/run/runner.py
new file mode 100644
index 00000000000..a997e66cb49
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/run/runner.py
@@ -0,0 +1,149 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import asyncio
+import click
+import json
+import logging
+import tempfile
+import yaml
+
+from .test_project_builder import TestProjectBuilder
+from .utils import execute
+from pathlib import Path
+from typing import Dict, List, Set
+
+
+logger = logging.getLogger('fireci.macrobenchmark')
+
+
+async def start(
+    build_only: bool,
+    local: bool,
+    repeat: int,
+    output: Path,
+    changed_modules_file: Path = None
+):
+  logger.info('Starting macrobenchmark test ...')
+
+  config = _process_config_yaml()
+  product_versions = _assemble_all_products()
+  test_dir = _prepare_test_directory()
+  changed_traces = _process_changed_modules(changed_modules_file)
+  template_project_dir = Path('health-metrics/benchmark/template')
+
+  test_projects = [
+    TestProjectBuilder(
+      test_config,
+      test_dir,
+      template_project_dir,
+      product_versions,
+      changed_traces,
+    ).build() for test_config in config['test-apps']]
+
+  if not build_only:
+    if local:
+      for test_project in test_projects:
+        test_project.run_local(repeat)
+    else:
+      remote_runs = [test_project.run_remote(repeat) for test_project in test_projects]
+      results = await asyncio.gather(*remote_runs, return_exceptions=True)
+      test_outputs = [x for x in results if not isinstance(x, Exception)]
+      exceptions = [x for x in results if isinstance(x, Exception)]
+
+      with open(output, 'w') as file:
+        json.dump(test_outputs, file)
+        logger.info(f'Output of remote testing saved to: {output}')
+
+      if exceptions:
+        logger.error(f'Exceptions occurred: {exceptions}')
+      for test_output in test_outputs:
+        if test_output['exceptions']:
+          logger.error(f'Exceptions occurred: {test_output["exceptions"]}')
+
+      if exceptions or any(test_output['exceptions'] for test_output in test_outputs):
+        raise click.ClickException('Macrobenchmark test failed with above exceptions')
+
+  logger.info(f'Completed macrobenchmark test successfully')
+
+
+def _assemble_all_products() -> Dict[str, str]:
+  execute('./gradlew', 'assembleAllForSmokeTests', logger=logger)
+
+  product_versions: Dict[str, str] = {}
+  with open('build/m2repository/changed-artifacts.json') as json_file:
+    artifacts = json.load(json_file)
+    for artifact in artifacts['headGit']:
+      group_id, artifact_id, version = artifact.split(':')
+      product_versions[f'{group_id}:{artifact_id}'] = version
+
+  logger.info(f'Product versions: {product_versions}')
+  return product_versions
+
+
+def _process_config_yaml():
+  with open('health-metrics/benchmark/config.yaml') as yaml_file:
+    config = yaml.safe_load(yaml_file)
+    for app in config['test-apps']:
+      app['plugins'] = app.get('plugins', [])
+      app['traces'] = app.get('traces', [])
+      app['plugins'].extend(config['common-plugins'])
+      app['traces'].extend(config['common-traces'])
+    return config
+
+
+def _prepare_test_directory() -> Path:
+  test_dir = tempfile.mkdtemp(prefix='benchmark-test-')
+  logger.info(f'Temporary test directory created at: {test_dir}')
+  return Path(test_dir)
+
+
+def _process_changed_modules(path: Path) -> List[str]:
+  trace_names = {
+    ":appcheck": ["fire-app-check"],
+    ":firebase-abt": ["fire-abt"],
+    ":firebase-appdistribution": ["fire-appdistribution"],
+    ":firebase-config": ["fire-rc"],
+    ":firebase-common": ["Firebase", "ComponentDiscovery", "Runtime"],
+    ":firebase-components": ["Firebase", "ComponentDiscovery", "Runtime"],
+    ":firebase-database": ["fire-rtdb"],
+    ":firebase-datatransport": ["fire-transport"],
+    ":firebase-dynamic-links": ["fire-dl"],
+    ":firebase-crashlytics": ["fire-cls"],
+    ":firebase-crashlytics-ndk": ["fire-cls"],
+    ":firebase-firestore": ["fire-fst"],
+    ":firebase-functions": ["fire-fn"],
+    ":firebase-inappmessaging": ["fire-fiam"],
+    ":firebase-inappmessaging-display": ["fire-fiamd"],
+    ":firebase-installations": ["fire-installations"],
+    ":firebase-installations-interop": ["fire-installations"],
+    ":firebase-messaging": ["fire-fcm"],
+    ":firebase-messaging-directboot": ["fire-fcm"],
+    ":firebase-ml-modeldownloader": ["firebase-ml-modeldownloader"],
+    ":firebase-perf": ["fire-perf"],
+    ":firebase-sessions": ["fire-sessions"],
+    ":firebase-storage": ["fire-gcs"],
+    ":transport": ["fire-transport"],
+  }
+
+  results: Set[str] = set()
+  if path:
+    with open(path) as changed_modules_file:
+      changed_modules = json.load(changed_modules_file)
+      for module in changed_modules:
+        for product in trace_names:
+          if module.startswith(product):
+            results.update(trace_names[product])
+  logger.info(f"Extracted changed traces {results} from {path}")
+  return list(results)
diff --git a/ci/fireci/fireciplugins/macrobenchmark/run/test_project.py b/ci/fireci/fireciplugins/macrobenchmark/run/test_project.py
new file mode 100644
index 00000000000..96f35583e30
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/run/test_project.py
@@ -0,0 +1,108 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import asyncio
+import glob
+import re
+import shutil
+
+from .log_decorator import LogDecorator
+from .utils import execute, execute_async, generate_test_run_id
+from fireci.dir_utils import chdir
+from logging import getLogger, Logger, LoggerAdapter
+from pathlib import Path
+from typing import List, TypedDict, Union
+
+logger = getLogger('fireci.macrobenchmark')
+
+
+class RemoteTestOutput(TypedDict, total=False):
+  project: str
+  successful_runs: List[str]
+  exceptions: List[str]  # Using str due to Exception being not JSON serializable
+
+
+class TestProject:
+  def __init__(self, name: str, project_dir: Path, custom_logger: Union[Logger, LoggerAdapter]):
+    self.name = name
+    self.test_project_dir = project_dir
+    self.logger = custom_logger
+
+  def run_local(self, repeat: int):
+    self.logger.info(f'Running test locally for {repeat} times ...')
+    local_reports_dir = self.test_project_dir.joinpath('_reports')
+
+    with chdir(self.test_project_dir):
+      for index in range(repeat):
+        run_id = generate_test_run_id()
+        run_logger = LogDecorator(self.logger, f'run-{index}')
+        run_logger.info(f'Run-{index}: {run_id}')
+        execute('./gradlew', ':macrobenchmark:connectedCheck', logger=run_logger)
+
+        reports = self.test_project_dir.rglob('build/**/*-benchmarkData.json')
+        run_dir = local_reports_dir.joinpath(run_id)
+        for report in reports:
+          device = re.search(r'benchmark/connected/([^/]*)/', str(report)).group(1)
+          device_dir = run_dir.joinpath(device)
+          device_dir.mkdir(parents=True, exist_ok=True)
+          shutil.copy(report, device_dir)
+          run_logger.debug(f'Copied report file "{report}" to "{device_dir}"')
+
+    self.logger.info(f'Finished all {repeat} runs, local reports dir: "{local_reports_dir}"')
+
+  async def run_remote(self, repeat: int) -> RemoteTestOutput:
+    self.logger.info(f'Running test remotely for {repeat} times ...')
+
+    with chdir(self.test_project_dir):
+      await execute_async('./gradlew', 'assemble', logger=self.logger)
+      app_apk_path = glob.glob('**/app-benchmark.apk', recursive=True)[0]
+      test_apk_path = glob.glob('**/macrobenchmark-benchmark.apk', recursive=True)[0]
+      self.logger.info(f'App apk: "{app_apk_path}", Test apk: "{test_apk_path}"')
+
+      async def run(index: int, run_id: str) -> str:
+        run_logger = LogDecorator(self.logger, f'run-{index}')
+        run_logger.info(f'Run-{index}: {run_id}')
+        ftl_environment_variables = [
+          'clearPackageData=true',
+          'additionalTestOutputDir=/sdcard/Download',
+          'no-isolated-storage=true',
+        ]
+        executable = 'gcloud'
+        args = ['firebase', 'test', 'android', 'run']
+        args += ['--type', 'instrumentation']
+        args += ['--app', app_apk_path]
+        args += ['--test', test_apk_path]
+        args += ['--device', 'model=oriole,version=32,locale=en,orientation=portrait']
+        args += ['--device', 'model=redfin,version=30,locale=en,orientation=portrait']
+        args += ['--directories-to-pull', '/sdcard/Download']
+        args += ['--results-bucket', 'fireescape-benchmark-results']
+        args += ['--results-dir', run_id]
+        args += ['--environment-variables', ','.join(ftl_environment_variables)]
+        args += ['--timeout', '45m']
+        args += ['--project', 'fireescape-c4819']
+        await execute_async(executable, *args, logger=run_logger)
+        return run_id
+
+      runs = [run(i, generate_test_run_id()) for i in range(repeat)]
+      results = await asyncio.gather(*runs, return_exceptions=True)
+      successes = [x for x in results if not isinstance(x, Exception)]
+      exceptions = [x for x in results if isinstance(x, Exception)]
+
+    self.logger.info(f'Finished all {repeat} runs, successes: {successes}, failures: {exceptions}')
+
+    return RemoteTestOutput(
+      project=self.name,
+      successful_runs=successes,
+      exceptions=[str(e) for e in exceptions]
+    )
diff --git a/ci/fireci/fireciplugins/macrobenchmark/run/test_project_builder.py b/ci/fireci/fireciplugins/macrobenchmark/run/test_project_builder.py
new file mode 100644
index 00000000000..c384dcb86f3
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/run/test_project_builder.py
@@ -0,0 +1,96 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import os
+import pystache
+import shutil
+
+from .log_decorator import LogDecorator
+from .test_project import TestProject
+from .utils import execute
+from pathlib import Path
+from typing import Any, Dict, List
+
+
+logger = logging.getLogger('fireci.macrobenchmark')
+
+
+class TestProjectBuilder:
+  def __init__(
+      self,
+      test_config: Any,
+      test_dir: Path,
+      template_project_dir: Path,
+      product_versions: Dict[str, str],
+      changed_traces: List[str],
+  ):
+    self.test_config = test_config
+    self.template_project_dir = template_project_dir
+    self.product_versions = product_versions
+    self.changed_traces = changed_traces
+
+    self.name = 'test-changed' if changed_traces else 'test-all'
+    self.logger = LogDecorator(logger, self.name)
+    self.project_dir = test_dir.joinpath(self.name)
+
+  def build(self) -> TestProject:
+    self.logger.info(f'Creating test project "{self.name}" ...')
+
+    self._copy_template_project()
+    self._flesh_out_mustache_template_files()
+    self._download_gradle_wrapper()
+
+    self.logger.info(f'Test project "{self.name}" created at "{self.project_dir}"')
+    return TestProject(self.name, self.project_dir, self.logger)
+
+  def _copy_template_project(self):
+    shutil.copytree(self.template_project_dir, self.project_dir)
+    self.logger.debug(f'Copied project template files into "{self.project_dir}"')
+
+  def _download_gradle_wrapper(self):
+    args = ['wrapper', '--gradle-version', '7.5.1', '--project-dir', str(self.project_dir)]
+    execute('./gradlew', *args, logger=self.logger)
+    self.logger.debug(f'Created gradle wrapper in "{self.project_dir}"')
+
+  def _flesh_out_mustache_template_files(self):
+    mustache_context = {
+      'm2repository': os.path.abspath('build/m2repository'),
+      'plugins': self.test_config.get('plugins', []),
+      'traces': [],
+      'dependencies': [],
+    }
+
+    if 'dependencies' in self.test_config:
+      for dep in self.test_config['dependencies']:
+        if '@' in dep:
+          key, version = dep.split('@', 1)
+          dependency = {'key': key, 'version': version}
+        else:
+          dependency = {'key': dep, 'version': self.product_versions[dep]}
+        mustache_context['dependencies'].append(dependency)
+
+    if 'traces' in self.test_config:
+      for trace in self.test_config['traces']:
+        if not self.changed_traces or trace in self.changed_traces:
+          mustache_context['traces'].append(trace)
+
+    renderer = pystache.Renderer()
+    mustaches = self.project_dir.rglob('**/*.mustache')
+    for mustache in mustaches:
+      self.logger.debug(f'Processing template file: {mustache}')
+      result = renderer.render_path(mustache, mustache_context)
+      original_name = str(mustache)[:-9]  # TODO(yifany): .removesuffix('.mustache') w/ python 3.9+
+      with open(original_name, 'w') as file:
+        file.write(result)
diff --git a/ci/fireci/fireciplugins/macrobenchmark/run/utils.py b/ci/fireci/fireciplugins/macrobenchmark/run/utils.py
new file mode 100644
index 00000000000..32e90193438
--- /dev/null
+++ b/ci/fireci/fireciplugins/macrobenchmark/run/utils.py
@@ -0,0 +1,65 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import datetime
+import string
+import random
+
+from asyncio import create_subprocess_exec
+from asyncio.subprocess import PIPE as ASYNC_PIPE, STDOUT as ASYNC_STDOUT
+from logging import Logger, LoggerAdapter
+from subprocess import Popen, PIPE, STDOUT
+from typing import Union
+
+
+def generate_test_run_id() -> str:
+  now = datetime.datetime.now()
+  date = now.date()
+  time = now.time()
+  name = ''.join(random.choices(string.ascii_letters, k=4))
+  return f'{date}_{time}_{name}'
+
+
+def execute(program: str, *args: str, logger: Union[Logger, LoggerAdapter]) -> None:
+  command = " ".join([program, *args])
+  logger.info(f'Executing subprocess: "{command}" ...')
+
+  popen = Popen([program, *args], stdout=PIPE, stderr=STDOUT)
+  for line in popen.stdout:
+    logger.info(f'[{program}] {line.decode("utf-8").strip()}')
+  popen.communicate()
+
+  if popen.returncode == 0:
+    logger.info(f'"{command}" succeeded')
+  else:
+    message = f'"{command}" failed with return code {popen.returncode}'
+    logger.error(message)
+    raise RuntimeError(message)
+
+
+async def execute_async(program: str, *args: str, logger: Union[Logger, LoggerAdapter]) -> None:
+  command = " ".join([program, *args])
+  logger.info(f'Executing subprocess: "{command}" ...')
+
+  process = await create_subprocess_exec(program, *args, stdout=ASYNC_PIPE, stderr=ASYNC_STDOUT)
+  async for line in process.stdout:
+    logger.info(f'[{program}] {line.decode("utf-8").strip()}')
+  await process.communicate()
+
+  if process.returncode == 0:
+    logger.info(f'"{command}" succeeded')
+  else:
+    message = f'"{command}" failed with return code {process.returncode}'
+    logger.error(message)
+    raise RuntimeError(message)
diff --git a/ci/fireci/pyproject.toml b/ci/fireci/pyproject.toml
new file mode 100644
index 00000000000..1ec2c8a9d98
--- /dev/null
+++ b/ci/fireci/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools ~= 58.0"]
+build-backend = "setuptools.build_meta"
diff --git a/ci/fireci/setup.cfg b/ci/fireci/setup.cfg
new file mode 100644
index 00000000000..466898d3cb6
--- /dev/null
+++ b/ci/fireci/setup.cfg
@@ -0,0 +1,44 @@
+[metadata]
+name = fireci
+version = 0.1
+
+[options]
+install_requires =
+        protobuf==3.19
+        click==8.1.3
+        google-cloud-storage==2.5.0
+        mypy==0.991
+        numpy==1.23.1
+        pandas==1.5.1
+        PyGithub==1.55
+        pystache==0.6.0
+        requests==2.23.0
+        seaborn==0.12.1
+        PyYAML==6.0.0
+
+[options.extras_require]
+test =
+    pytest
+
+[options.entry_points]
+console_scripts =
+    fireci = fireci.main:cli
+
+[mypy]
+strict_optional = False
+[mypy-google.cloud]
+ignore_missing_imports = True
+[mypy-matplotlib]
+ignore_missing_imports = True
+[mypy-matplotlib.pyplot]
+ignore_missing_imports = True
+[mypy-pandas]
+ignore_missing_imports = True
+[mypy-pystache]
+ignore_missing_imports = True
+[mypy-requests]
+ignore_missing_imports = True
+[mypy-seaborn]
+ignore_missing_imports = True
+[mypy-yaml]
+ignore_missing_imports = True
diff --git a/ci/fireci/setup.py b/ci/fireci/setup.py
deleted file mode 100755
index dbf1bd4b9e6..00000000000
--- a/ci/fireci/setup.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2018 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-from setuptools import find_packages, setup
-
-os.chdir(os.path.abspath(os.path.dirname(__file__)))
-
-requires = []
-
-setup(
-    name='fireci',
-    version='0.1',
-    install_requires=[
-        'click==7.0',
-        'google-cloud-storage==1.38.0',
-        'numpy==1.19.5',
-        'PyGithub==1.43.8',
-        'pystache==0.5.4',
-        'requests==2.23.0',
-        'PyYAML==5.4.1',
-    ],
-    packages=find_packages(exclude=['tests']),
-    entry_points={
-        'console_scripts': ['fireci = fireci.main:cli'],
-    },
-)
diff --git a/ci/run.sh b/ci/run.sh
index 3b57ec6e31f..be6e0a35a68 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -17,5 +17,5 @@
 set -e
 
 DIRECTORY=$(cd `dirname $0` && pwd)
-$DIRECTORY/fireci/setup.py develop >> /dev/null
+pip3 install -e $DIRECTORY/fireci >> /dev/null
 fireci $@
diff --git a/ci/workflow_summary/README.md b/ci/workflow_summary/README.md
new file mode 100644
index 00000000000..c60558db9d2
--- /dev/null
+++ b/ci/workflow_summary/README.md
@@ -0,0 +1,176 @@
+# `workflow_information.py` Script
+
+## Prerequisites
+-   [Python](https://www.python.org/) and required packages.
+    ```
+    pip install requests argparse
+    ```
+
+## Usage
+-   Collect last `90` days' `Postsubmit` `ci_workflow.yml` workflow runs:
+    ```
+    python workflow_information.py --token ${your_github_toke} --branch master --event push --d 90
+    ```
+
+-   Collect last `30` days' `Presubmit` `ci_workflow.yml` workflow runs:
+    ```
+    python workflow_information.py --token ${your_github_toke} --event pull_request --d 30
+    ```
+
+-   Please refer to `Inputs` section for more use cases, and `Outputs` section for the workflow summary report format.
+
+## Inputs
+-  `-o, --repo_owner`: **[Required]** GitHub repo owner, default value is `firebase`.
+
+-  `-n, --repo_name`: **[Required]** GitHub repo name, default value is `firebase-android-sdk`.
+
+-  `-t, --token`: **[Required]** GitHub access token. See [Creating a personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token).
+
+-  `-w, --workflow_name`: **[Required]** Workflow filename, default value is `ci_tests.yml`.
+
+-  `-d, --days`: Filter workflows that running in past -d days, default value is `90`. See [retention period for GitHub Actions artifacts and logs](https://docs.github.com/en/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization).
+
+-  `-b, --branch`: Filter branch name that workflows run against.
+
+-  `-a, --actor`: Filter the actor who triggers the workflow runs.
+
+-  `-e, --event`: Filter workflows trigger event, could be one of the following values `['push', 'pull_request', 'issue']`.
+
+-  `-j, --jobs`: Filter workflows jobs, default is `all` (including rerun jobs), could be one of the following values `['latest', 'all']`.
+
+-  `-f, --folder`: Workflow and job information will be store here, default value is the current datatime.
+
+
+## Outputs
+
+-   `workflow_summary_report.txt`: a general report contains workflow pass/failure count, running time, etc.
+
+    ```
+    2023-03-03 01:37:07.114500
+    Namespace(actor=None, branch=None, days=30, event='pull_request', folder='presubmit_30', jobs='all', repo_name='firebase-android-sdk', repo_owner='firebase', token=${your_github_token}, workflow_name='ci_tests.yml')
+
+    Workflow 'ci_tests.yml' Report: 
+     Workflow Failure Rate:64.77% 
+     Workflow Total Count: 193 (success: 68, failure: 125)
+
+    Workflow Runtime Report:
+    161 workflow runs finished without rerun, the average running time: 0:27:24.745342
+    Including:
+     56 passed workflow runs, with average running time: 0:17:29.214286
+     105 failed workflow runs, with average running time: 0:32:42.361905
+
+    32 runs finished with rerun, the average running time: 1 day, 3:57:53.937500
+    The running time for each workflow reruns are:
+     ['1 day, 2:24:32', '3:35:54', '3:19:14', '4 days, 6:10:50', '15:33:39', '1:57:21', '1:13:12', '1:55:18', '12 days, 21:51:29', '0:48:48', '0:45:28', '1:40:21', '2 days, 1:46:35', '19:47:16', '0:45:49', '2:22:36', '0:25:22', '0:55:30', '1:40:32', '1:10:05', '20:08:38', '0:31:03', '5 days, 9:19:25', '5:10:44', '1:20:57', '0:28:47', '1:52:44', '20:19:17', '0:35:15', '21:31:07', '3 days, 1:06:44', '3 days, 2:18:14']
+
+    Job Failure Report:
+    Unit Tests (:firebase-storage):
+     Failure Rate:54.61%
+     Total Count: 152 (success: 69, failure: 83)
+    Unit Tests (:firebase-messaging):
+     Failure Rate:35.37%
+     Total Count: 147 (success: 95, failure: 52)
+    ```
+
+
+-   Intermediate file `workflow_summary.json`: contains all the workflow runs and job information attached to each workflow.
+
+    ```
+    {
+      'workflow_name':'ci_tests.yml',
+      'total_count':81,
+      'success_count':32,
+      'failure_count':49,
+      'created':'>2022-11-30T23:15:04Z',
+      'workflow_runs':[
+        {
+          'workflow_id':4296343867,
+          'conclusion':'failure',
+          'head_branch':'master',
+          'actor':'vkryachko',
+          'created_at':'2023-02-28T18:47:40Z',
+          'updated_at':'2023-02-28T19:20:16Z',
+          'run_started_at':'2023-02-28T18:47:40Z',
+          'run_attempt':1,
+          'html_url':'https://github.com/firebase/firebase-android-sdk/actions/runs/4296343867',
+          'jobs_url':'https://api.github.com/repos/firebase/firebase-android-sdk/actions/runs/4296343867/jobs',
+          'jobs':{
+            'total_count':95,
+            'success_count':92,
+            'failure_count':3,
+            'job_runs':[
+              {
+                'job_id':11664775180,
+                'job_name':'Determine changed modules',
+                'conclusion':'success',
+                'created_at':'2023-02-28T18:47:42Z',
+                'started_at':'2023-02-28T18:47:50Z',
+                'completed_at':'2023-02-28T18:50:11Z',
+                'run_attempt': 1, 
+                'html_url':'https://github.com/firebase/firebase-android-sdk/actions/runs/4296343867/jobs/7487936863',
+              }
+            ]
+          }
+        }
+      ]
+    }
+    ```
+
+-   Intermediate file `job_summary.json`: contains all the job runs organized by job name.
+    ```
+    {
+      'Unit Test Results':{   # job name
+        'total_count':17,
+        'success_count':7,
+        'failure_count':10,
+        'failure_jobs':[      # data structure is the same as same as workflow_summary['workflow_runs']['job_runs']
+          {
+            'job_id':11372664143,
+            'job_name':'Unit Test Results',
+            'conclusion':'failure',
+            'created_at':'2023-02-15T22:02:06Z',
+            'started_at':'2023-02-15T22:02:06Z',
+            'completed_at':'2023-02-15T22:02:06Z',
+            'run_attempt': 1, 
+            'html_url':'https://github.com/firebase/firebase-android-sdk/runs/11372664143',
+          }
+        ]
+      }
+    }
+    ```
+
+
+# `collect_ci_test_logs.py` Script
+
+## Usage
+-   Collect `ci_test.yml` job failure logs from `workflow_information.py` script's intermediate file:
+    ```
+    python collect_ci_test_logs.py --token ${github_toke} --folder ${folder}
+    ```
+
+## Inputs
+
+-  `-t, --token`: **[Required]** GitHub access token. See [Creating a personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token).
+
+-  `-f, --folder`: **[Required]** Folder that store intermediate files generated by `workflow_information.py`. `ci_workflow.yml` job failure logs will also be stored here.
+
+## Outputs
+
+-   `${job name}.log`: contains job failure rate, list all failed job links and failure logs.
+    ```
+    Unit Tests (:firebase-storage):
+    Failure rate:40.00% 
+    Total count: 20 (success: 12, failure: 8)
+    Failed jobs:
+
+    https://github.com/firebase/firebase-android-sdk/actions/runs/4296343867/jobs/7487989874
+    firebase-storage:testDebugUnitTest
+    Task :firebase-storage:testDebugUnitTest
+    2023-02-28T18:54:38.1333725Z 
+    2023-02-28T18:54:38.1334278Z com.google.firebase.storage.DownloadTest > streamDownloadWithResumeAndCancel FAILED
+    2023-02-28T18:54:38.1334918Z     org.junit.ComparisonFailure at DownloadTest.java:190
+    2023-02-28T18:57:20.3329130Z 
+    2023-02-28T18:57:20.3330165Z 112 tests completed, 1 failed
+    2023-02-28T18:57:20.5329189Z 
+    2023-02-28T18:57:20.5330505Z > Task :firebase-storage:testDebugUnitTest FAILED
+    ```
diff --git a/ci/workflow_summary/collect_ci_test_logs.py b/ci/workflow_summary/collect_ci_test_logs.py
new file mode 100644
index 00000000000..7409c991871
--- /dev/null
+++ b/ci/workflow_summary/collect_ci_test_logs.py
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+'''A utility collecting ci_test.yml workflow failure logs.
+
+Usage:
+
+  python collect_ci_test_logs.py --token ${github_toke} --folder ${folder}
+
+'''
+
+import github
+import argparse
+import json
+import re
+import logging
+import os
+
+
+REPO_OWNER = 'firebase'
+REPO_NAME = 'firebase-android-sdk'
+EXCLUDE_JOB_LIST = ['Determine changed modules','Unit Tests (matrix)','Publish Tests Results','Unit Test Results','Instrumentation Tests','Unit Tests']
+
+def main():
+  logging.getLogger().setLevel(logging.INFO)
+
+  args = parse_cmdline_args()
+  gh = github.GitHub(REPO_OWNER, REPO_NAME)
+
+  token = args.token
+
+  file_folder = args.folder
+  if not os.path.exists(file_folder):
+    logging.error(f'{file_folder} doesn\'t exist')
+    exit(1)
+
+  job_summary = json.load(open(os.path.join(file_folder, 'job_summary.json')))
+
+  for job_name in job_summary:
+    if job_name in EXCLUDE_JOB_LIST:
+      continue
+
+    job = job_summary[job_name]
+
+    if job['failure_rate'] > 0:
+      failure_rate = job['failure_rate']  
+      total_count = job['total_count'] 
+      success_count = job['success_count'] 
+      failure_count = job['failure_count']      
+
+      log_file_path = os.path.join(file_folder, f'{job_name}.log')
+      file_log = open(log_file_path, 'w')
+      file_log.write(f'\n{job_name}:\nFailure rate:{failure_rate:.2%} \nTotal count: {total_count} (success: {success_count}, failure: {failure_count})\nFailed jobs:')
+      logging.info(f'\n\n{job_name}:\nFailure rate:{failure_rate:.2%} \nTotal count: {total_count} (success: {success_count}, failure: {failure_count})\nFailed jobs:')
+
+      for failure_job in job['failure_jobs']:
+        file_log.write('\n\n'+failure_job['html_url'])
+        logging.info(failure_job['html_url'])
+        job_id = failure_job['job_id']
+        logs = gh.job_logs(token, job_id)
+        if logs:
+          # using regex to extract failure information
+          failed_tasks = re.findall(r"Execution failed for task ':(.*?)'.", logs)
+          for failed_task in failed_tasks:
+            file_log.write('\n'+failed_task)
+            pattern = fr'Task :{failed_task}(.*?)Task :{failed_task} FAILED'
+            failed_tests = re.search(pattern, logs, re.MULTILINE | re.DOTALL)
+            if failed_tests:
+              file_log.write('\n'+failed_tests.group())
+
+    file_log.close()
+
+  logging.info(f'\n\nFinsihed collecting failure logs, log files locates under path: {file_folder}')
+      
+
+def parse_cmdline_args():
+  parser = argparse.ArgumentParser(description='Collect certain Github workflow information and calculate failure rate.')
+  parser.add_argument('-t', '--token', required=True, help='GitHub access token')
+  parser.add_argument('-f', '--folder', required=True, help='Folder generated by workflow_information.py. Test logs also locate here.')
+  args = parser.parse_args()
+  return args
+
+if __name__ == '__main__':
+  main()
diff --git a/ci/workflow_summary/github.py b/ci/workflow_summary/github.py
new file mode 100644
index 00000000000..24f62d55661
--- /dev/null
+++ b/ci/workflow_summary/github.py
@@ -0,0 +1,62 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""A utility for GitHub REST API."""
+
+import requests
+import logging
+
+RETRIES = 3
+BACKOFF = 5
+RETRY_STATUS = (403, 500, 502, 504)
+TIMEOUT = 5
+TIMEOUT_LONG = 20
+
+class GitHub:
+
+  def __init__(self, owner, repo):
+    self.github_api_url = f'https://api.github.com/repos/{owner}/{repo}'
+
+  def list_workflows(self, token, workflow_id, params):
+    """https://docs.github.com/en/rest/actions/workflow-runs#list-workflow-runs-for-a-workflow"""
+    url = f'{self.github_api_url}/actions/workflows/{workflow_id}/runs'
+    headers = {'Accept': 'application/vnd.github+json', 'Authorization': f'token {token}'}
+    with requests.get(url, headers=headers, params=params,
+                      stream=True, timeout=TIMEOUT_LONG) as response:
+      logging.info('list_workflows: %s, params: %s, response: %s', url, params, response)
+      return response.json()
+
+  def list_jobs(self, token, run_id, params):
+    """https://docs.github.com/en/rest/actions/workflow-jobs#list-jobs-for-a-workflow-run"""
+    url = f'{self.github_api_url}/actions/runs/{run_id}/jobs'
+    headers = {'Accept': 'application/vnd.github+json', 'Authorization': f'token {token}'}
+    with requests.get(url, headers=headers, params=params,
+                      stream=True, timeout=TIMEOUT_LONG) as response:
+      logging.info('list_jobs: %s, params: %s, response: %s', url, params, response)
+      return response.json()
+
+  def job_logs(self, token, job_id):
+    """https://docs.github.com/rest/reference/actions#download-job-logs-for-a-workflow-run"""
+    url = f'{self.github_api_url}/actions/jobs/{job_id}/logs'
+    headers = {'Accept': 'application/vnd.github+json', 'Authorization': f'token {token}'}
+    with requests.get(url, headers=headers, allow_redirects=False,
+                      stream=True, timeout=TIMEOUT_LONG) as response:
+      logging.info('job_logs: %s response: %s', url, response)
+      if response.status_code == 302:
+        with requests.get(response.headers['Location'], headers=headers, allow_redirects=False,
+                          stream=True, timeout=TIMEOUT_LONG) as get_log_response:
+          return get_log_response.content.decode('utf-8')
+      else:
+        logging.info('no log avaliable')
+        return ''
diff --git a/ci/workflow_summary/workflow_information.py b/ci/workflow_summary/workflow_information.py
new file mode 100644
index 00000000000..06082cafd07
--- /dev/null
+++ b/ci/workflow_summary/workflow_information.py
@@ -0,0 +1,250 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import github
+import json
+import datetime
+import argparse
+import logging
+import os 
+
+
+'''A utility collecting ci_test.yml workflow failure logs.
+
+Usage:
+
+  python workflow_information.py --token ${github_toke} --workflow_name ${workflow_name}
+
+'''
+
+def main():
+  logging.getLogger().setLevel(logging.INFO)
+
+  args = parse_cmdline_args()
+  logging.info(args)
+
+  gh = github.GitHub(args.repo_owner, args.repo_name)
+
+  # location for all artifacts
+  if args.folder:
+    file_folder = os.path.normpath(args.folder)
+  else:
+    file_folder = os.path.normpath(datetime.datetime.utcnow().strftime('%Y-%m-%d+%H:%M:%S'))
+  if not os.path.exists(file_folder):
+    os.makedirs(file_folder)
+
+  workflow_summary = get_workflow_summary(gh, args)
+  workflow_summary_file_path = os.path.join(file_folder, 'workflow_summary.json')
+  with open(workflow_summary_file_path, 'w') as f:
+    json.dump(workflow_summary, f)
+  logging.info(f'Workflow summary has been write to {workflow_summary_file_path}\n')
+
+  job_summary = get_job_summary(workflow_summary)
+  job_summary_file_path = os.path.join(file_folder, 'job_summary.json')
+  with open(job_summary_file_path, 'w') as f:
+    json.dump(job_summary, f)
+  logging.info(f'Job summary has been write to {job_summary_file_path}\n')
+
+  workflow_summary_report = f"{datetime.datetime.utcnow()}\n{args}\n\n"
+  workflow_summary_report += generate_summary_report(workflow_summary, job_summary)
+  report_file_path = os.path.join(file_folder, 'workflow_summary_report.txt')
+  with open(report_file_path, 'w') as f:
+    f.write(workflow_summary_report)
+  logging.info(f'Workflow summary report has been write to {report_file_path}\n')
+
+
+def get_workflow_summary(gh, args):  
+  token = args.token
+  workflow_name = args.workflow_name
+  # https://docs.github.com/en/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax#query-for-dates
+  days = args.days
+  current_datetime = datetime.datetime.utcnow()
+  since_datetime = current_datetime - datetime.timedelta(days=days)
+  created = '>' + since_datetime.strftime('%Y-%m-%dT%H:%M:%SZ')
+
+  workflow_summary = {'workflow_name': workflow_name, 
+                    'total_count': 0, 
+                    'success_count': 0, 
+                    'failure_count': 0, 
+                    'created': created,
+                    'workflow_runs': []}
+
+  logging.info('START collecting workflow run data\n')
+  workflow_page = 0
+  per_page = 100 # max 100
+  list_workflows_params = {'status': 'completed', 'created': created, 'page': workflow_page, 'per_page': per_page}
+  if args.event:
+    list_workflows_params['event'] = args.event
+  if args.actor:
+    list_workflows_params['actor'] = args.actor
+  if args.branch:
+    list_workflows_params['branch'] = args.branch
+
+  while True:
+    workflow_page += 1
+    list_workflows_params['page'] = workflow_page
+    workflows = gh.list_workflows(token, workflow_name, list_workflows_params)
+
+    if 'workflow_runs' not in workflows or not workflows['workflow_runs']:
+      break
+
+    for workflow in workflows['workflow_runs']:
+      if workflow['conclusion'] in ['success', 'failure']:
+        workflow_summary['workflow_runs'].append({'workflow_id': workflow['id'], 'conclusion': workflow['conclusion'],
+                                                  'head_branch': workflow['head_branch'], 'actor': workflow['actor']['login'], 
+                                                  'created_at': workflow['created_at'], 'updated_at': workflow['updated_at'], 
+                                                  'run_started_at': workflow['run_started_at'], 'run_attempt': workflow['run_attempt'], 
+                                                  'html_url': workflow['html_url'], 'jobs_url': workflow['jobs_url'], 
+                                                  'jobs': {'total_count': 0, 'success_count': 0, 'failure_count': 0,  'job_runs': []}})
+        workflow_summary['total_count']  += 1
+        if workflow['conclusion'] == 'success':
+          workflow_summary['success_count'] += 1 
+        else: 
+          workflow_summary['failure_count'] += 1
+
+  logging.info('END collecting workflow run data\n')
+
+  logging.info('START collecting job data by workflow run\n')
+  for workflow_run in workflow_summary['workflow_runs']:
+    get_workflow_jobs(gh, args, workflow_run)
+  logging.info('END collecting job data by workflow run\n')
+
+  return workflow_summary
+
+def get_workflow_jobs(gh, args, workflow_run):
+  workflow_jobs = workflow_run['jobs']
+  job_page = 0
+  while True:
+    job_page += 1
+    list_jobs_params = {'filter': args.jobs, 'per_page': 100, 'page': job_page} # per_page: max 100
+    jobs = gh.list_jobs(args.token, workflow_run['workflow_id'], list_jobs_params)
+
+    if 'jobs' not in jobs or jobs['total_count'] < job_page * 100:
+      break
+
+    for job in jobs['jobs']:
+      workflow_jobs['job_runs'].append({'job_id': job['id'], 'job_name': job['name'], 'conclusion': job['conclusion'], 
+                                        'created_at': job['created_at'], 'started_at': job['started_at'], 'completed_at': job['completed_at'],
+                                        'run_attempt': job['run_attempt'], 'html_url': job['html_url']})
+      if job['conclusion'] in ['success', 'failure']:
+        workflow_jobs['total_count'] += 1
+      if job['conclusion'] == 'success':
+        workflow_jobs['success_count'] += 1 
+      else: 
+        workflow_jobs['failure_count'] += 1
+
+
+def get_job_summary(workflow_summary):
+  logging.info('START gathering job information by job name\n')
+  job_summary = {}
+  for workflow_run in workflow_summary['workflow_runs']:
+    for job_run in workflow_run['jobs']['job_runs']:
+      job_name = job_run['job_name']
+      if job_name not in job_summary:
+        job_summary[job_name] = {'total_count': 0, 
+                                 'success_count': 0, 
+                                 'failure_count': 0, 
+                                 'failure_jobs': []}
+
+      job = job_summary[job_name]  
+      job['total_count'] += 1
+      if job_run['conclusion'] == 'success':
+        job['success_count'] += 1
+      else:
+        job['failure_count'] += 1
+        job['failure_jobs'].append(job_run)
+
+  for job_name in job_summary:
+    total_count = job_summary[job_name]['total_count'] 
+    failure_count = job_summary[job_name]['failure_count']    
+    job_summary[job_name]['failure_rate'] = float(failure_count/total_count)
+
+  job_summary=dict(sorted(job_summary.items(), key=lambda item: item[1]['failure_rate'], reverse=True))
+
+  logging.info('END gathering job information by job name\n')
+  return job_summary
+
+
+def generate_summary_report(workflow_summary, job_summary):
+  report_content = ''
+
+  workflow_name = workflow_summary['workflow_name']
+  total_count = workflow_summary['total_count'] 
+  success_count = workflow_summary['success_count'] 
+  failure_count = workflow_summary['failure_count'] 
+  failure_rate = float(failure_count/total_count)
+  report_content += f"Workflow '{workflow_name}' Report: \n Workflow Failure Rate:{failure_rate:.2%} \n Workflow Total Count: {total_count} (success: {success_count}, failure: {failure_count})\n\n"
+
+  report_content += workflow_runtime_report(workflow_summary)
+
+  report_content += 'Job Failure Report:\n'
+  for job_name in job_summary:
+    job = job_summary[job_name]
+    if job['failure_rate'] > 0:
+      report_content += f"{job_name}:\n Failure Rate:{job['failure_rate']:.2%}\n Total Count: {job['total_count']} (success: {job['success_count']}, failure: {job['failure_count']})\n"
+  
+  logging.info(report_content)
+  return report_content
+      
+
+def workflow_runtime_report(workflow_summary):     
+  for workflow in workflow_summary['workflow_runs']:
+    created_at = datetime.datetime.strptime(workflow['created_at'], '%Y-%m-%dT%H:%M:%SZ')
+    updated_at = datetime.datetime.strptime(workflow['updated_at'], '%Y-%m-%dT%H:%M:%SZ')
+    workflow['runtime'] = (updated_at - created_at).total_seconds()
+    
+  success_without_rerun = [w['runtime'] for w in workflow_summary['workflow_runs'] if w['run_attempt'] == 1 and w['conclusion'] == 'success']
+  failure_without_rerun = [w['runtime'] for w in workflow_summary['workflow_runs'] if w['run_attempt'] == 1 and w['conclusion'] == 'failure']
+  without_rerun = success_without_rerun + failure_without_rerun
+  with_rerun = [w['runtime'] for w in workflow_summary['workflow_runs'] if w['run_attempt'] > 1]
+
+  runtime_report = 'Workflow Runtime Report:\n'
+  if without_rerun:
+    runtime_report += f"{len(without_rerun)} workflow runs finished without rerun, the average running time: {datetime.timedelta(seconds=sum(without_rerun)/len(without_rerun))}\n"
+    runtime_report += 'Including:\n'
+    if success_without_rerun:
+      runtime_report += f" {len(success_without_rerun)} passed workflow runs, with average running time: {datetime.timedelta(seconds=sum(success_without_rerun)/len(success_without_rerun))}\n"
+    if failure_without_rerun:
+      runtime_report += f" {len(failure_without_rerun)} failed workflow runs, with average running time: {datetime.timedelta(seconds=sum(failure_without_rerun)/len(failure_without_rerun))}\n\n"
+
+  if with_rerun:
+    runtime_report += f"{len(with_rerun)} runs finished with rerun, the average running time: {datetime.timedelta(seconds=sum(with_rerun)/len(with_rerun))}\n"
+    runtime_report += f"The running time for each workflow reruns are:\n {[str(datetime.timedelta(seconds=x)) for x in with_rerun]}\n\n"
+
+  return runtime_report
+
+
+def parse_cmdline_args():
+  parser = argparse.ArgumentParser(description='Collect certain Github workflow information and calculate failure rate.')
+  parser.add_argument('-o', '--repo_owner', default='firebase', help='GitHub repo owner')
+  parser.add_argument('-n', '--repo_name', default='firebase-android-sdk', help='GitHub repo name')
+  parser.add_argument('-t', '--token', required=True, help='GitHub access token')
+
+  parser.add_argument('-w', '--workflow_name', default='ci_tests.yml', help='Workflow filename to run')
+  # By default, the artifacts and log files generated by workflows are retained for 90 days before they are automatically deleted.
+  # https://docs.github.com/en/organizations/managing-organization-settings/configuring-the-retention-period-for-github-actions-artifacts-and-logs-in-your-organization
+  parser.add_argument('-d', '--days', type=int, default=90, help='Filter workflows that running in past -d days')
+  parser.add_argument('-b', '--branch', help='Filter branch name that workflows run against, default is all branches')
+  parser.add_argument('-a', '--actor', help='Filter someone\'s workflow runs, default is actors')
+  parser.add_argument('-e', '--event', choices=['push', 'pull_request', 'issue'], help='Filter workflows trigger event, default is all events')
+  parser.add_argument('-j', '--jobs', default='all', choices=['latest', 'all'], help='Filter workflows jobs, default is the last job and does not include all jobs (does not include rerun jobs)')
+
+  parser.add_argument('-f', '--folder', help='Workflow and job information will be store here, default is current datatime')
+
+  args = parser.parse_args()
+  return args
+
+
+if __name__ == '__main__':
+  main()
diff --git a/contributor-docs/README.md b/contributor-docs/README.md
new file mode 100644
index 00000000000..c7b37f2b6f3
--- /dev/null
+++ b/contributor-docs/README.md
@@ -0,0 +1,15 @@
+---
+nav_order: 1
+permalink: /
+---
+
+# Contributor documentation
+
+This site is a collection of docs and best practices for contributors to Firebase Android SDKs.
+It describes how Firebase works on Android and provides guidance on how to build/maintain a Firebase SDK.
+
+## New to Firebase?
+
+- [Development Environment Setup]({{ site.baseurl }}{% link onboarding/env_setup.md %})
+- [Creating a new SDK]({{ site.baseurl }}{% link onboarding/new_sdk.md %})
+- [How Firebase works]({{ site.baseurl }}{% link how_firebase_works.md %})
diff --git a/contributor-docs/_config.yml b/contributor-docs/_config.yml
new file mode 100644
index 00000000000..bb995ce78b3
--- /dev/null
+++ b/contributor-docs/_config.yml
@@ -0,0 +1,85 @@
+title: Contributor documentation
+description: Documentation and best practices for Android SDK development
+logo: "https://firebase.google.com/downloads/brand-guidelines/SVG/logo-logomark.svg"
+
+remote_theme: just-the-docs/just-the-docs@v0.4.0.rc3
+plugins:
+- jekyll-remote-theme
+
+color_scheme: light
+
+# Aux links for the upper right navigation
+aux_links:
+  "SDK Github Repo":
+    - "//github.com/firebase/firebase-android-sdk"
+
+# Enable or disable the site search
+# Supports true (default) or false
+search_enabled: true
+search:
+  # Split pages into sections that can be searched individually
+  # Supports 1 - 6, default: 2
+  heading_level: 6
+  # Maximum amount of previews per search result
+  # Default: 3
+  previews: 2
+  # Maximum amount of words to display before a matched word in the preview
+  # Default: 5
+  preview_words_before: 3
+  # Maximum amount of words to display after a matched word in the preview
+  # Default: 10
+  preview_words_after: 3
+  # Set the search token separator
+  # Default: /[\s\-/]+/
+  # Example: enable support for hyphenated search words
+  tokenizer_separator: /[\s/]+/
+  # Display the relative url in search results
+  # Supports true (default) or false
+  rel_url: true
+  # Enable or disable the search button that appears in the bottom right corner of every page
+  # Supports true or false (default)
+  button: false
+
+mermaid:
+  # Version of mermaid library
+  # Pick an available version from https://cdn.jsdelivr.net/npm/mermaid/
+  version: "9.2.2"
+  # Put any additional configuration, such as setting the theme, in _includes/mermaid_config.js
+
+# Enable or disable heading anchors
+heading_anchors: true
+permalink: pretty
+
+callouts_level: quiet
+callouts:
+  highlight:
+    color: yellow
+  important:
+    title: Important
+    color: blue
+  new:
+    title: New
+    color: green
+  note:
+    title: Note
+    color: purple
+  warning:
+    title: Warning
+    color: red
+
+# Back to top link
+back_to_top: true
+back_to_top_text: "Back to top"
+
+# Footer last edited timestamp
+last_edit_timestamp: true # show or hide edit time - page must have `last_modified_date` defined in the frontmatter
+last_edit_time_format: "%b %e %Y at %I:%M %p" # uses ruby's time format: https://ruby-doc.org/stdlib-2.7.0/libdoc/time/rdoc/Time.html
+
+
+# Footer "Edit this page on GitHub" link text
+gh_edit_link: true # show or hide edit this page link
+gh_edit_link_text: "Edit this page on GitHub"
+gh_edit_repository: "https://github.com/firebase/firebase-android-sdk" # the github URL for your repo
+gh_edit_branch: "master" # the branch that your docs is served from
+gh_edit_source: "contributor-docs" # the source that your files originate from
+gh_edit_view_mode: "edit" # "tree" or "edit" if you want the user to jump into the editor immediately
\ No newline at end of file
diff --git a/contributor-docs/_includes/favicon.html b/contributor-docs/_includes/favicon.html
new file mode 100644
index 00000000000..c244949e06e
--- /dev/null
+++ b/contributor-docs/_includes/favicon.html
@@ -0,0 +1 @@
+<link rel="shortcut icon" href="https://firebase.google.com/downloads/brand-guidelines/SVG/logo-logomark.svg" type="image/x-icon">
\ No newline at end of file
diff --git a/contributor-docs/_includes/nav_footer_custom.html b/contributor-docs/_includes/nav_footer_custom.html
new file mode 100644
index 00000000000..177d34a0fb5
--- /dev/null
+++ b/contributor-docs/_includes/nav_footer_custom.html
@@ -0,0 +1,3 @@
+<footer class="site-footer">
+    &copy; Google LLC {{ 'now' | date: "%Y" }}
+</footer>
\ No newline at end of file
diff --git a/contributor-docs/best_practices/best_practices.md b/contributor-docs/best_practices/best_practices.md
new file mode 100644
index 00000000000..1fc465d3ed7
--- /dev/null
+++ b/contributor-docs/best_practices/best_practices.md
@@ -0,0 +1,7 @@
+---
+has_children: true
+permalink: /best_practices/
+nav_order: 5
+---
+
+# Best Practices
diff --git a/contributor-docs/best_practices/dependency_injection.md b/contributor-docs/best_practices/dependency_injection.md
new file mode 100644
index 00000000000..3b5de828998
--- /dev/null
+++ b/contributor-docs/best_practices/dependency_injection.md
@@ -0,0 +1,247 @@
+---
+parent: Best Practices
+---
+
+# Dependency Injection
+
+While [Firebase Components]({{ site.baseurl }}{% link components/components.md %}) provides basic
+Dependency Injection capabilities for interop between Firebase SDKs, it's not ideal as a general purpose
+DI framework for a few reasons, to name some:
+
+* It's verbose, i.e. requires manually specifying dependencies and constructing instances of components in Component
+  definitions.
+* It has a runtime cost, i.e. initialization time is linear in the number of Components present in the graph
+
+As a result using [Firebase Components]({{ site.baseurl }}{% link components/components.md %}) is appropriate only
+for inter-SDK injection and scoping instances per `FirebaseApp`.
+
+On the other hand, manually instantiating SDKs is often tedious, errorprone, and leads to code smells
+that make code less testable and couples it to the implementation rather than the interface. For more context see
+[Dependency Injection](https://en.wikipedia.org/wiki/Dependency_injection) and  [Motivation](https://github.com/google/guice/wiki/Motivation).
+
+{: .important }
+It's recommended to use [Dagger](https://dagger.dev) for internal dependency injection within the SDKs and
+[Components]({{ site.baseurl }}{% link components/components.md %}) to inject inter-sdk dependencies that are available only at
+runtime into the [Dagger Graph](https://dagger.dev/dev-guide/#building-the-graph) via
+[builder setters](https://dagger.dev/dev-guide/#binding-instances) or [factory arguments](https://dagger.dev/api/latest/dagger/Component.Factory.html).
+
+See: [Dagger docs](https://dagger.dev)
+See: [Dagger tutorial](https://dagger.dev/tutorial/)
+
+{: .highlight }
+While Hilt is the recommended way to use dagger in Android applications, it's not suitable for SDK/library development.
+
+## How to get started
+
+Since [Dagger](https://dagger.dev) does not strictly follow semver and requires the dagger-compiler version to match the dagger library version,
+it's not safe to depend on it via a pom level dependency, see [This comment](https://github.com/firebase/firebase-android-sdk/issues/1677#issuecomment-645669608) for context. For this reason in Firebase SDKs we "vendor/repackage" Dagger into the SDK itself under
+`com.google.firebase.{sdkname}.dagger`. While it incurs in a size increase, it's usually on the order of a couple of KB and is considered
+negligible.
+
+To use Dagger in your SDK use the following in your Gradle build file:
+
+```groovy
+plugins {
+    id("firebase-vendor")
+}
+
+dependencies {
+    implementation(libs.javax.inject)
+    vendor(libs.dagger.dagger) {
+        exclude group: "javax.inject", module: "javax.inject"
+    }
+    annotationProcessor(libs.dagger.compiler)
+}
+```
+
+## General Dagger setup
+
+As mentioned in [Firebase Components]({{ site.baseurl }}{% link components/components.md %}), all components are scoped per `FirebaseApp`
+meaning there is a single instance of the component within a given `FirebaseApp`.
+
+This makes it a natural fit to get all inter-sdk dependencies and instatiate the Dagger component inside the `ComponentRegistrar`.
+
+```kotlin
+class MyRegistrar : ComponentRegistrar {
+  override fun getComponents() = listOf(
+    Component.builder(MySdk::class.java)
+      .add(Dependency.required(FirebaseOptions::class.java))
+      .add(Dependency.optionalProvider(SomeInteropDep::class.java))
+      .factory(c -> DaggerMySdkComponent.builder()
+        .setFirebaseApp(c.get(FirebaseApp::class.java))
+        .setSomeInterop(c.getProvider(SomeInteropDep::class.java))
+        .build()
+        .getMySdk())
+      .build()
+}
+```
+
+Here's a simple way to define the dagger component:
+
+```kotlin
+@Component(modules = MySdkComponent.MainModule::class)
+@Singleton
+interface MySdkComponent {
+  // Informs dagger that this is one of the types we want to be able to create
+  // In this example we only care about MySdk
+  fun getMySdk() : MySdk
+
+  // Tells Dagger that some types are not available statically and in order to create the component
+  // it needs FirebaseApp and Provider<SomeInteropDep>
+  @Component.Builder
+  interface Builder {
+    @BindsInstance fun setFirebaseApp(app: FirebaseApp)
+    @BindsInstance fun setSomeInterop(interop: com.google.firebase.inject.Provider<SomeInteropDep>)
+    fun build() : MySdkComponent
+  }
+
+  @Module
+  interface MainModule {
+    // define module @Provides and @Binds here
+  }
+}
+```
+
+The only thing left to do is to properly annotate `MySdk`:
+
+```kotlin
+@Singleton
+class MySdk @Inject constructor(app: FirebaseApp, interopAdapter: MySdkAdapter) {
+    fun someMethod() {
+        interopAdapter.doInterop()
+    }
+}
+
+@Singleton
+class MySdkInteropAdapter @Inject constructor(private val interop: com.google.firebase.inject.Provider<SomeInteropDep>) {
+    fun doInterop() {
+        interop.get().doStuff()
+    }
+}
+```
+
+## Scope
+
+Unlike Component, Dagger does not use singleton scope by default and instead injects a new instance of a type at each injection point,
+in the example above we want `MySdk` and `MySdkInteropAdapter` to be singletons so they are are annotated with `@Singleton`.
+
+See [Scoped bindings](https://dagger.dev/dev-guide/#singletons-and-scoped-bindings) for more details.
+
+### Support multiple instances of the SDK per `FirebaseApp`(multi-resource)
+
+As mentioned in [Firebase Components]({{ site.baseurl }}{% link components/components.md %}), some SDKs support multi-resource mode,
+which effectively means that there are 2 scopes at play:
+
+1. `@Singleton` scope that the main `MultiResourceComponent` has.
+2. Each instance of the sdk will have its own scope.
+
+```mermaid
+flowchart LR
+  subgraph FirebaseApp
+    direction TB
+    subgraph FirebaseComponents
+      direction BT
+      subgraph GlobalComponents[Outside of SDK]
+        direction LR
+        
+        FirebaseOptions
+        SomeInterop
+        Executor["@Background Executor"]
+      end
+
+      subgraph DatabaseComponent["@Singleton DatabaseMultiDb"]
+        direction TB
+        subgraph Singleton["@Singleton"]
+          SomeImpl -.-> SomeInterop
+          SomeImpl -.-> Executor
+        end
+          
+        subgraph Default["@DbScope SDK(default)"]
+          MainClassDefault[FirebaseDatabase] --> SomeImpl
+          SomeOtherImplDefault[SomeOtherImpl] -.-> FirebaseOptions
+          MainClassDefault --> SomeOtherImplDefault
+        end
+        subgraph MyDbName["@DbScope SDK(myDbName)"]
+          MainClassMyDbName[FirebaseDatabase] --> SomeImpl
+          SomeOtherImplMyDbName[SomeOtherImpl] -.-> FirebaseOptions
+          MainClassMyDbName --> SomeOtherImplMyDbName
+        end
+      end
+    end
+  end
+  
+  classDef green fill:#4db6ac
+  classDef blue fill:#1a73e8
+  class GlobalComponents green
+  class DatabaseComponent green
+  class Default blue
+  class MyDbName blue
+```
+
+As you can see above, `DatabaseMultiDb` and `SomeImpl` are singletons, while `FirebaseDatabase` and `SomeOtherImpl` are scoped per `database name`.
+
+It can be easily achieved with the help of [Dagger's subcomponents](https://dagger.dev/dev-guide/subcomponents).
+
+For example:
+
+```kotlin
+@Scope
+annotation class DbScope
+
+@Component(modules = DatabaseComponent.MainModule::class)
+interface DatabaseComponent {
+    fun getMultiDb() : DatabaseMultiDb
+
+    @Component.Builder
+    interface Builder {
+        // usual setters for Firebase component dependencies
+        // ...
+        fun build() : DatabaseComponent
+    }
+
+    @Module(subcomponents = DbInstanceComponent::class)
+    interface MainModule {}
+
+    @Subcomponent(modules = DbInstanceComponent.InstanceModule::class)
+    @DbScope
+    interface DbInstanceComponent {
+        fun factory() : Factory
+
+        @Subcomponent.Factory
+        interface Factory {
+            fun create(@BindsInstance @Named("dbName") dbName: String)
+        }
+    }
+
+    @Module
+    interface InstanceModule {
+        // ...
+    }
+}
+```
+
+Annotating `FirebaseDatabase`:
+
+```kotlin
+@DbScope
+class FirebaseDatabase @Inject constructor(options: FirebaseOptions, @Named dbName: String) {
+  // ...
+}
+```
+
+Implementing `DatabaseMultiDb`:
+
+```kotlin
+@Singleton
+class DatabaseMultiDb @Inject constructor(private val factory: DbInstanceComponent.Factory) {
+  private val instances = mutableMapOf<String, FirebaseDatabase>()
+  
+  @Synchronized
+  fun get(dbName: String) : FirebaseDatabase {
+    if (!instances.containsKey(dbName)) {
+      mInstances.put(dbName, factory.create(dbName))
+    }
+    return mInstances.get(dbName);
+  }
+}
+```
diff --git a/contributor-docs/components/components.md b/contributor-docs/components/components.md
new file mode 100644
index 00000000000..de624274aab
--- /dev/null
+++ b/contributor-docs/components/components.md
@@ -0,0 +1,243 @@
+---
+has_children: true
+permalink: /components/
+nav_order: 4
+---
+
+# Firebase Components
+{: .no_toc}
+
+1. TOC
+{:toc}
+
+Firebase is known for being easy to use and requiring no/minimal configuration at runtime.
+Just adding SDKs to the app makes them discover each other to provide additional functionality,
+e.g. `Firestore` automatically integrates with `Auth` if present in the app.
+
+* Firebase SDKs have required and optional dependencies on other Firebase SDKs
+* SDKs have different initialization requirements, e.g. `Analytics` and `Crashlytics` must be
+  initialized upon application startup, while some are initialized on demand only.
+
+To accommodate these requirements Firebase uses a component model that discovers SDKs present in the app,
+determines their dependencies and provides them to dependent SDKs via a `Dependency Injection` mechanism.
+
+This page describes the aforementioned Component Model, how it works and why it's needed.
+
+## Design Considerations
+
+### Transparent/invisible to 3p Developers
+
+To provide good developer experience, we don't want developers to think about how SDKs work and interoperate internally.
+Instead we want our SDKs to have a simple API surface that hides all of the internal details.
+Most products have an API surface that allows developers to get aninstance of a given SDK via `FirebaseFoo.getInstance()`
+and start using it right away.
+
+### Simple to use and integrate with for component developers
+
+* The component model is lightweight in terms of integration effort. It is not opinionated on how components are structured.
+* The component model should require as little cooperation from components runtime as possible.
+* It provides component developers with an API that is easy to use correctly, and hard to use incorrectly.
+* Does not sacrifice testability of individual components in isolation
+
+### Performant at startup and initialization
+
+The runtime does as little work as possible during initialization.
+
+## What is a Component?
+
+A Firebase Component is an entity that:
+
+* Implements one or more interfaces
+* Has a list of dependencies(required or optional). See [Dependencies]({{ site.baseurl }}{% link components/dependencies.md %})
+* Has initialization requirements(e.g. eager in default app)
+* Defines a factory creates an instance of the component’s interface given it's dependencies.
+  (In other words describes how to create the given component.)
+
+Example:
+
+```java
+// Defines a component that is registered as both `FirebaseAuth` and `InternalAuthProvider`.
+Component<FirebaseAuth> auth = Component.builder(FirebaseAuth.class, InternalAuthProvider.class)
+    // Declares dependencies
+    .add(Dependency.required(FirebaseOptions.class))
+    // Defines a factory
+    .factory(container -> new FirebaseAuth(container.get(FirebaseOptions.class)))
+    .eagerInDefaultApp() // alwaysEager() or lazy(), lazy is the default.
+    .build()
+```
+
+All components are singletons within a Component Container(e.g. one instance per FirebaseApp).
+There are however SDKs that need the ability to expose multiple objects per FirebaseApp,
+for example RTBD(as well as Storage and Firestore) has multidb support which allows developers
+to access one or more databases within one FirebaseApp. To address this requirement,
+SDKs have to register their components in the following form(or similar):
+
+```java
+// This is the singleton holder of different instances of FirebaseDatabase.
+interface RtdbComponent {
+  FirebaseDatabase getDefault();
+  FirebaseDatabase get(String databaseName);
+}
+```
+
+As you can see in the previous section, components are just values and don't have any behavior per se,
+essentially they are just blueprints of how to create them and what dependencies they need.
+
+So there needs to be some ComponentRuntime that can discover and wire them together into a dependency graph,
+in order to do that, there needs to be an agreed upon location where SDKs can register the components they provide.
+
+The next 2 sections describe how it's done.
+
+## Component Registration
+
+In order to define the `Components` an SDK provides, it needs to define a class that implements `ComponentRegistrar`,
+this class contains all component definitions the SDK wants to register with the runtime:
+
+```java
+public class MyRegistrar implements ComponentRegistrar {
+  /// Returns a one or more Components that will be registered in
+  /// FirebaseApp and participate in dependency resolution and injection.
+  @Override
+  public Collection<FirebaseComponent<?>> getComponents() {
+    Arrays.asList(Component.builder(MyType.class)
+        /* ... */
+        .build());
+  }
+}
+```
+
+## Component Discovery
+
+In addition to creating the `ComponentRegistrar` class, SDKs also need to add them to their `AndroidManifest.xml` under `ComponentDiscoveryService`:
+
+```xml
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <application>
+      <service android:name="com.google.firebase.components.ComponentDiscoveryService"
+          android:exported="false">
+          <meta-data
+              android:name="com.google.firebase.components:com.google.firebase.foo.FirebaseFooRegistrar"
+              android:value="com.google.firebase.components.ComponentRegistrar" />
+      </service>
+  </application>
+</manifest>
+```
+
+When the final app is built, manifest registrar entries will all end up inside the above `service` as metadata key- value pairs.
+At this point `FirebaseApp` will instantiate them and use the `ComponentRuntime` to construct the component graph.
+
+## Dependency resolution and initialization
+
+### Definitions and constraints
+
+* **Component A depends on Component B** if `B` depends on an `interface` that `A` implements.
+* **For any Interface I, only one component is allowed to implement I**(with the exception of
+  [Set Dependencies]({{ site.baseurl }}{% link components/dependencies.md %}#set-dependencies)). If this invariant is violated, the container will
+  fail to start at runtime.
+* **There must not be any dependency cycles** among components. See Dependency Cycle Resolution on how this limitation can
+  be mitigated
+* **Components are initialized lazily by default**(unless a component is declared eager) and are initialized when requested
+  by an application either directly or transitively.
+
+The initialization phase of the FirebaseApp will consist of the following steps:
+
+1. Get a list of available FirebaseComponents that were discovered by the Discovery mechanism
+2. Topologically sort components based on their declared dependencies - failing if a dependency cycle is detected or multiple implementations are registered for any interface.
+3. Store a map of {iface -> ComponentFactory} so that components can be instantiated on demand(Note that component instantiation does not yet happen)
+4. Initialize EAGER components or schedule them to initialize on device unlock, if in direct boot mode.
+
+### Initialization example
+
+Below is an example illustration of the state of the component graph after initialization:
+
+```mermaid
+flowchart TD
+    Analytics --> Installations
+    Auth --> Context
+    Auth --> FirebaseOptions
+    Context[android.os.Context]
+    Crashlytics --> Installations
+    Crashlytics --> FirebaseApp
+    Crashlytics --> FirebaseOptions
+    Crashlytics -.-> Analytics
+    Crashlytics --> Context
+    Database -.-> Auth
+    Database --> Context
+    Database --> FirebaseApp
+    Database --> FirebaseOptions
+    Firestore -.-> Auth
+    Messaging --> Installations
+    Messaging --> FirebaseOptions
+    Messaging --> Context
+    RemoteConfig --> FirebaseApp
+    RemoteConfig --> Context
+    RemoteConfig --> Installations
+    
+    
+    classDef eager fill:#4db66e,stroke:#4db6ac,color:#000;
+    classDef transitive fill:#4db6ac,stroke:#4db6ac,color:#000;
+    classDef always fill:#1a73e8,stroke:#7baaf7,color:#fff;
+    
+    class Analytics eager
+    class Crashlytics eager
+    class Context always
+    class FirebaseOptions always
+    class FirebaseApp always
+    class Installations transitive
+```
+
+There are **2 explicitly eager** components in this example: `Crashlytics` and `Analytics`.
+These components are initialized when `FirebaseApp` is initialized. `Installations` is initialized eagerly because
+eager components depends on it(see Prefer Lazy dependencies to avoid this as mush as possible).
+`FirebaseApp`, `FirebaseOptions` and `Android Context` are always present in the Component Container and are considered initialized as well.
+
+*The rest of the components are left uninitialized and will remain so until the client application requests them or an eager
+component initializes them by using a Lazy dependency.*
+For example, if the application calls `FirebaseDatabase.getInstance()`, the container will initialize `Auth` and `Database`
+and will return `Database` to the user.
+
+### Support multiple instances of the SDK per `FirebaseApp`(multi-resource)
+
+Some SDKs support multi-resource mode of operation, where it's possible to create more than one instance per `FirebaseApp`.
+
+Examples:
+
+* RTDB allows more than one database in a single Firebase project, so it's possible to instantiate one instance of the sdk per datbase
+
+```kotlin
+val rtdbOne = Firebase.database(app) // uses default database
+val rtdbTwo = Firebase.database(app, "dbName")
+```
+
+* Firestore, functions, and others support the same usage pattern
+
+To allow for that, such SDKs register a singleton "MultiResource" [Firebase component]({{ site.baseurl }}{% link components/components.md %}),
+which creates instances per resource(e.g. db name).
+
+Example
+
+```kotlin
+class DatabaseComponent(private val app: FirebaseApp, private val tokenProvider: InternalTokenProvider) {
+  private val instances: MutableMap<String, FirebaseDatabase> = new HashMap<>();
+
+  @Synchronized
+  fun get(dbName: String) : FirebaseDatabase {
+    if (!instances.containsKey(dbName)) {
+      instances.put(dbName, FirebaseDatabase(app, tokenProvider, dbName))
+    }
+    return instances.get(dbName);
+  }
+}
+
+class FirebaseDatabase(
+    app: FirebaseApp,
+    tokenProvider: InternalTokenProvider,
+    private val String dbName)
+
+    companion object {
+      fun getInstance(app : FirebaseApp) = getInstance("default")
+      fun getInstance(app : FirebaseApp, dbName: String) = 
+        app.get(DatabaseComponent::class.java).get("default")
+    }
+
+```
diff --git a/contributor-docs/components/dependencies.md b/contributor-docs/components/dependencies.md
new file mode 100644
index 00000000000..587fe109ab1
--- /dev/null
+++ b/contributor-docs/components/dependencies.md
@@ -0,0 +1,188 @@
+---
+parent: Firebase Components
+---
+
+# Dependencies
+{: .no_toc}
+
+1. TOC
+{:toc}
+
+This page gives an overview of the different dependency types supported by the Components Framework.
+
+## Background
+
+As discussed in [Firebase Components]({{ site.baseurl }}{% link components/components.md %}), in order
+for a `Component` to be injected with the things it needs to function, it has to declare its dependencies.
+These dependencies are then made available and injected into `Components` at runtime.
+
+Firebase Components provide different types of dependencies.
+
+## Lazy vs Eager dependencies
+
+When it comes to initialize a component, there are 2 ways of provide its dependencies.
+
+### Direct Injection
+
+With this type of injection, the component gets an instance of its dependency directly.
+
+```kotlin
+class MyComponent(private val dep : MyDep) {
+  fun someMethod() {
+    dep.use();
+  }
+}
+```
+
+As you can see above the component's dependency is passed by value directly,
+which means that the dependency needs to be fully initialized before
+it's handed off to the requesting component. As a result `MyComponent` may have to pay the cost
+of initializing `MyDep` just to be created.
+
+### Lazy/Provider Injection
+
+With this type of injection, instead of getting an instance of the dependency directly, the dependency
+is passed into the `Component` with the help of a `com.google.firebase.inject.Provider`
+
+```java
+public interface Provider<T> { T get(); }
+```
+
+```kotlin
+class MyComponent(private val dep : Provider<MyDep>) {
+  fun someMethod() {
+    // Since all components are singletons, each call to
+    // get() will return the same instance.
+    dep.get().use();
+  }
+}
+```
+
+On the surface this does not look like a big change, but it has an important side effect. In order to create
+an instance of `MyComponent`, we don't need to initialize `MyDep` anymore. Instead, initialization can be
+delayed until `MyDep` is actually used.
+
+It is also benefitial to use a `Provider` in the context of [Play's dynamic feature delivery](https://developer.android.com/guide/playcore/feature-delivery).
+See [Dynamic Module Support]({{ site.baseurl }}{% link components/dynamic_modules.md %}) for more details.
+
+## Required dependencies
+
+This type of dependency informs the `ComponentRuntime` that a given `Component` cannot function without a dependency.
+When the dependency is missing during initialization, `ComponentRuntime` will throw a `MissingDependencyException`.
+This type of dependency is useful for built-in components that are always present like `Context`, `FirebaseApp`,
+`FirebaseOptions`, [Executors]({{ site.baseurl }}{% link components/executors.md %}).
+
+To declare a required dependency use one of the following in your `ComponentRegistrar`:
+
+```java
+  // Required directly injected dependency
+  .add(Dependency.required(MyDep.class))
+  // Required lazily injected dependency
+  .add(Dependency.requiredProvider(MyOtherDep.class))
+  .factory( c -> new MyComponent(c.get(MyDep.class), c.getProvider(MyOtherDep.class)))
+  .build();
+```
+
+## Optional Dependencies
+
+This type of dependencies is useful when your `Component` can operate normally when the dependency is not
+available, but can have enhanced functionality when present. e.g. `Firestore` can work without `Auth` but
+provides secure database access when `Auth` is present.
+
+To declare an optional dependency use the following in your `ComponentRegistrar`:
+
+```java
+  .add(Dependency.optionalProvider(MyDep.class))
+  .factory(c -> new MyComponent(c.getProvider(MyDep.class)))
+  .build();
+```
+
+The provider will return `null` if the dependency is not present in the app.
+
+{: .warning }
+When the app uses [Play's dynamic feature delivery](https://developer.android.com/guide/playcore/feature-delivery),
+`provider.get()` will return your dependency when it becomes available.  To support this use case, don't store references to the result of `provider.get()` calls.
+
+See [Dynamic Module Support]({{ site.baseurl }}{% link components/dynamic_modules.md %}) for details
+
+{: .warning }
+See Deferred dependencies if you your dependency has a callback based API
+
+## Deferred Dependencies
+
+Useful for optional dependencies which have a listener-style API, i.e. the dependent component registers a
+listener with the dependency and never calls it again (instead the dependency will call the registered listener).
+A good example is `Firestore`'s use of `Auth`, where `Firestore` registers a token change listener to get
+notified when a new token is available. The problem is that when `Firestore` initializes, `Auth` may not be
+present in the app, and is instead part of a dynamic module that can be loaded at runtime on demand.
+
+To solve this problem, Components have a notion of a `Deferred` dependency. A deferred is defined as follows:
+
+```java
+public interface Deferred<T> {
+  interface DeferredHandler<T> {
+    @DeferredApi
+    void handle(Provider<T> provider);
+  }
+
+  void whenAvailable(DeferredHandler<T> handler);
+}
+```
+
+To use it a component needs to call `Dependency.deferred(SomeType.class)`:
+
+```kotlin
+class MyComponent(deferred: Deferred<SomeType>) {
+  init {
+    deferred.whenAvailable { someType ->
+      someType.registerListener(myListener)
+    }
+  }
+}
+```
+
+See [Dynamic Module Support]({{ site.baseurl }}{% link components/dynamic_modules.md %}) for details
+
+## Set Dependencies
+
+The Components Framework allows registering components to be part of a set, such components are registered explicitly to be a part of a `Set<T>` as opposed to be a unique value of `T`:
+
+```java
+// Sdk 1
+Component.intoSet(new SomeTypeImpl(), SomeType.class);
+// Sdk 2
+Component.intoSetBuilder(SomeType.class)
+  .add(Dependency(SomeDep.class))
+  .factory(c -> new SomeOtherImpl(c.get(SomeDep.class)))
+  .build();
+```
+
+With the above setup each SDK contributes a value of `SomeType` into a `Set<SomeType>` which becomes available as a
+`Set` dependency.
+
+To consume such a set the interested `Component` needs to declare a special kind of dependency in one of 2 ways:
+
+* `Dependency.setOf(SomeType.class)`, a dependency of type `Set<SomeType>`.
+* `Dependency.setOfProvider(SomeType.class)`, a dependency of type `Provider<Set<SomeType>>`. The advantage of this
+  is that the `Set` is not initialized until the first call to `provider.get()` at which point all elements of the
+  set will get initialized.
+
+{: .warning }
+Similar to optional `Provider` dependencies, where an optional dependency can become available at runtime due to
+[Play's dynamic feature delivery](https://developer.android.com/guide/playcore/feature-delivery),
+`Set` dependencies can change at runtime by new elements getting added to the set.
+So make sure to hold on to the original `Set` to be able to observe new values in it as they are added.
+
+Example:
+
+```kotlin
+class MyClass(private val set1: Set<SomeType>, private val set2: Provider<Set<SomeOtherType>>)
+```
+
+```java
+Component.builder(MyClass.class)
+    .add(Dependency.setOf(SomeType.class))
+    .add(Dependency.setOfProvider(SomeOtherType.class))
+    .factory(c -> MyClass(c.setOf(SomeType.class), c.setOfProvider(SomeOtherType.class)))
+    .build();
+```
diff --git a/contributor-docs/components/dynamic_modules.md b/contributor-docs/components/dynamic_modules.md
new file mode 100644
index 00000000000..a0d9cdb06e7
--- /dev/null
+++ b/contributor-docs/components/dynamic_modules.md
@@ -0,0 +1,7 @@
+---
+parent: Firebase Components
+---
+
+# Dynamic Module Support
+
+TODO
diff --git a/contributor-docs/components/executors.md b/contributor-docs/components/executors.md
new file mode 100644
index 00000000000..f7fdc7c3a7b
--- /dev/null
+++ b/contributor-docs/components/executors.md
@@ -0,0 +1,298 @@
+---
+parent: Firebase Components
+---
+
+# Executors
+{: .no_toc}
+
+1. TOC
+{:toc}
+
+## Intro
+
+OS threads are a limited resource that needs to be used with care. In order to minimize the number of threads used by Firebase
+as a whole and to increase resource sharing Firebase Common provides a set of standard
+[executors](https://developer.android.com/reference/java/util/concurrent/Executor)
+and [coroutine dispatchers](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines/-coroutine-dispatcher/)
+for use by all Firebase SDKs.
+
+These executors are available as components and can be requested by product SDKs as component dependencies.
+
+Example:
+
+```java
+public class MyRegistrar implements ComponentRegistrar {
+  public List<Component<?>> getComponents() {
+    Qualified<Executor> backgroundExecutor = Qualified.qualified(Background.class, Executor.class);
+    Qualified<ExecutorService> liteExecutorService = Qualified.qualified(Lightweight.class, ExecutorService.class);
+    
+    return Collections.singletonList(
+      Component.builder(MyComponent.class)
+        .add(Dependency.required(backgroundExecutor))
+        .add(Dependency.required(liteExecutorService))
+        .factory(c -> new MyComponent(c.get(backgroundExecutor), c.get(liteExecutorService)))
+        .build());
+  }
+}
+```
+
+All executors(with the exception of `@UiThread`) are available as the following interfaces:
+
+* `Executor`
+* `ExecutorService`
+* `ScheduledExecutorService`
+* `CoroutineDispatcher`
+
+`@UiThread` is provided only as a plain `Executor`.
+
+### Validation
+
+All SDKs have a custom linter check that detects creation of thread pools and threads,
+this is to ensure SDKs use the above executors instead of creating their own.
+
+## Choose the right executor
+
+Use the following diagram to pick the right executor for the task you have at hand.
+
+```mermaid
+flowchart TD
+    Start[Start] --> DoesBlock{Does it block?}
+    DoesBlock -->|No| NeedUi{Does it need to run\n on UI thread?}
+    NeedUi --> |Yes| UiExecutor[[UiThread Executor]]
+    NeedUi --> |No| TakesLong{Does it take more than\n 10ms to execute?}
+    TakesLong --> |No| LiteExecutor[[Lightweight Executor]]
+    TakesLong --> |Yes| BgExecutor[[Background Executor]]
+    DoesBlock --> |Yes| DiskIO{Does it block only\n on disk IO?}
+    DiskIO --> |Yes| BgExecutor
+    DiskIO --> |No| BlockExecutor[[Blocking Executor]]
+    
+    
+    classDef start fill:#4db6ac,stroke:#4db6ac,color:#000;
+    class Start start
+    
+    classDef condition fill:#f8f9fa,stroke:#bdc1c6,color:#000;
+    class DoesBlock condition;
+    class NeedUi condition;
+    class TakesLong condition;
+    class DiskIO condition;
+    
+    classDef executor fill:#1a73e8,stroke:#7baaf7,color:#fff;
+    class UiExecutor executor;
+    class LiteExecutor executor;
+    class BgExecutor executor;
+    class BlockExecutor executor;
+```
+
+### UiThread
+
+Used to schedule tasks on application's UI thread, internally it uses a Handler to post runnables onto the main looper.
+
+Example:
+
+```java
+// Java
+Qualified<Executor> uiExecutor = qualified(UiThread.class, Executor.class);
+```
+
+```kotlin
+// Kotlin
+Qualified<CoroutineDispatcher> dispatcher = qualified(UiThread::class.java, CoroutineDispatcher::class.java);
+```
+
+### Lightweight
+
+Use for tasks that never block and don't take to long to execute. Backed by a thread pool of N threads
+where N is the amount of parallelism available on the device(number of CPU cores)
+
+Example:
+
+```java
+// Java
+Qualified<Executor> liteExecutor = qualified(Lightweight.class, Executor.class);
+```
+
+```kotlin
+// Kotlin
+Qualified<CoroutineDispatcher> dispatcher = qualified(Lightweight::class.java, CoroutineDispatcher::class.java);
+```
+
+### Background
+
+Use for tasks that may block on disk IO(use `@Blocking` for network IO or blocking on other threads).
+Backed by 4 threads.
+
+Example:
+
+```java
+// Java
+Qualified<Executor> bgExecutor = qualified(Background.class, Executor.class);
+```
+
+```kotlin
+// Kotlin
+Qualified<CoroutineDispatcher> dispatcher = qualified(Background::class.java, CoroutineDispatcher::class.java);
+```
+
+### Blocking
+
+Use for tasks that can block for arbitrary amounts of time, this includes network IO.
+
+Example:
+
+```java
+// Java
+Qualified<Executor> blockingExecutor = qualified(Blocking.class, Executor.class);
+```
+
+```kotlin
+// Kotlin
+Qualified<CoroutineDispatcher> dispatcher = qualified(Blocking::class.java, CoroutineDispatcher::class.java);
+```
+
+### Other executors
+
+#### Direct executor
+
+{: .warning }
+Prefer `@Lightweight` instead of using direct executor as it could cause dead locks and stack overflows.
+
+For any trivial tasks that don't need to run asynchronously
+
+Example:
+
+```kotlin
+FirebaseExecutors.directExecutor()
+```
+
+#### Sequential Executor
+
+When you need an executor that runs tasks sequentially and guarantees any memory access is synchronized prefer to use a sequential executor instead of creating a `newSingleThreadedExecutor()`.
+
+Example:
+
+```java
+// Pick the appropriate underlying executor using the chart above
+Qualified<Executor> bgExecutor = qualified(Background.class, Executor.class);
+// ...
+Executor sequentialExecutor = FirebaseExecutors.newSequentialExecutor(c.get(bgExecutor));
+```
+
+## Proper Kotlin usage
+
+A `CoroutineContext` should be preferred when possible over an explicit `Executor`
+or `CoroutineDispatcher`. You should only use an `Executor` at the highest 
+(or inversely the lowest) level of your implementations. Most classes should not 
+be concerned with the existence of an `Executor`.
+
+Keep in mind that you can combine `CoroutineContext` with other `CoroutineScope` 
+or `CoroutineContext`. And that all `suspend` functions inherent their `coroutineContext`:
+
+```kotlin
+suspend fun createSession(): Session {
+  val context = backgroundDispatcher.coroutineContext + coroutineContext
+  return Session(context)
+}
+```
+
+To learn more, you should give the following Kotlin wiki page a read:
+
+[Coroutine context and dispatchers](https://kotlinlang.org/docs/coroutine-context-and-dispatchers.html#dispatchers-and-threads)
+
+## Testing
+
+### Using Executors in tests
+
+`@Lightweight` and `@Background` executors have StrictMode enabled and throw exceptions on violations.
+For example trying to do Network IO on either of them will throw.
+With that in mind, when it comes to writing tests, prefer to use the common executors as opposed to creating
+your own thread pools. This will ensure that your code uses the appropriate executor and does not slow down
+all of Firebase by using the wrong one.
+
+To do that, you should prefer relying on Components to inject the right executor even in tests. 
+This will ensure your tests are always using the executor that is actually used in your SDK build.
+If your SDK uses Dagger, see [Dependency Injection]({{ site.baseurl }}{% link
+best_practices/dependency_injection.md %})
+and [Dagger's testing guide](https://dagger.dev/dev-guide/testing).
+
+When the above is not an option, you can use `TestOnlyExecutors`, but make sure you're testing your code with 
+the same executor that is used in production code:
+
+```kotlin
+dependencies {
+  // ...
+  testImplementation(project(":integ-testing"))
+  // or
+  androidTestImplementation(project(":integ-testing"))
+}
+```
+
+This gives access to
+
+```java
+TestOnlyExecutors.ui();
+TestOnlyExecutors.background();
+TestOnlyExecutors.blocking();
+TestOnlyExecutors.lite();
+```
+
+### Policy violations in tests
+
+Unit tests require [Robolectric](https://github.com/robolectric/robolectric) to
+function correctly, and this comes with a major drawback; no policy validation.
+
+Robolectric supports `StrictMode`- but does not provide the backing for its
+policy mechanisms to fire on violations. As such, you'll be able to do things
+like using `TestOnlyExecutors.background()` to execute blocking actions; usage
+that would have otherwise crashed in a real application.
+
+Unfortunately, there is no easy way to fix this for unit tests. You can get
+around the issue by moving the tests to an emulator (integration tests)- but
+those can be more expensive than your standard unit test, so you may want to
+take that into consideration when planning your testing strategy.
+
+### StandardTestDispatcher support
+
+The [kotlin.coroutines.test](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-test/)
+library provides support for a number of different mechanisms in tests. Some of the more
+famous features include:
+
+- [advanceUntilIdle](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-test/kotlinx.coroutines.test/-test-coroutine-scheduler/advance-until-idle.html)
+- [advanceTimeBy](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-test/kotlinx.coroutines.test/-test-coroutine-scheduler/advance-time-by.html)
+- [runCurrent](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-test/kotlinx.coroutines.test/-test-coroutine-scheduler/run-current.html)
+
+These features are all backed by `StandardTestDispatcher`, or more appropriately,
+the `TestScope` provided in a `runTest` block.
+
+Unfortunately, `TestOnlyExecutors` does not natively bind with `TestScope`.
+Meaning, should you use `TestOnlyExecutors` in your tests- you won't be able to utilize
+the features provided by `TestScope`:
+
+```kotlin
+@Test
+fun doesStuff() = runTest {
+    val scope = CoroutineScope(TestOnlyExecutors.background().asCoroutineDispatcher())
+    scope.launch {
+      // ... does stuff
+    }
+
+    runCurrent() // doesn't invoke scope ??
+  }
+```
+
+To help fix this, we provide an extension method on `TestScope` called
+`firebaseExecutors`. It facilitates the binding of `TestOnlyExecutors` with the
+current `TestScope`.
+
+For example, here's how you could use this extension method in a test:
+
+```kotlin
+@Test
+fun doesStuff() = runTest {
+    val scope = CoroutineScope(firebaseExecutors.background)
+    scope.launch {
+      // ... does stuff
+    }
+
+    runCurrent()
+  }
+```
\ No newline at end of file
diff --git a/contributor-docs/how_firebase_works.md b/contributor-docs/how_firebase_works.md
new file mode 100644
index 00000000000..2424bda6b3c
--- /dev/null
+++ b/contributor-docs/how_firebase_works.md
@@ -0,0 +1,85 @@
+---
+nav_order: 3
+---
+
+# How Firebase Works
+
+## Background
+
+### Eager Initialization
+
+One of the biggest strengths for Firebase clients is the ease of integration. In a common case, a developer has very few things to do to integrate with Firebase. There is no need to initialize/configure Firebase at runtime. Firebase automatically initializes at application start and begins providing value to developers. A few notable examples:
+
+* `Analytics` automatically tracks app events
+* `Firebase Performance` automatically tracks app startup time, all network requests and screen performance
+* `Crashlytics` automatically captures all application crashes, ANRs and non-fatals
+
+This feature makes onboarding and adoption very simple. However, comes with the great responsibility of keeping the application snappy. We shouldn't slow down application startup for 3p developers as it can stand in the way of user adoption of their application.
+
+### Automatic Inter-Product Discovery
+
+When present together in an application, Firebase products can detect each other and automatically provide additional functionality to the developer, e.g.:
+
+* `Firestore` automatically detects `Auth` and `AppCheck` to protect read/write access to the database
+* `Crashlytics` integrates with `Analytics`, when available, to provide additional insights into the application behavior and enables safe app rollouts
+
+## FirebaseApp at the Core of Firebase
+
+Regardless of what Firebase SDKs are present in the app, the main initialization point of Firebase is `FirebaseApp`. It acts as a container for all SDKs, manages their configuration, initialization and lifecycle.
+
+### Initialization
+
+`FirebaseApp` gets initialized with the help of `FirebaseApp#initializeApp()`. This happens [automatically at app startup](https://firebase.blog/posts/2016/12/how-does-firebase-initialize-on-android) or manually by the developer.
+
+During initialization, `FirebaseApp` discovers all Firebase SDKs present in the app, determines the dependency graph between products(for inter-product functionality) and initializes `eager` products that need to start immediately, e.g. `Crashlytics` and `FirebasePerformance`.
+
+### Firebase Configuration
+
+`FirebaseApp` contains Firebase configuration for all products to use, namely `FirebaseOptions`, which tells Firebase which `Firebase` project to talk to, which real-time database to use, etc.
+
+### Additional Services/Components
+
+In addition to `FirebaseOptions`, `FirebaseApp` registers additional components that product SDKs can request via dependency injection. To name a few:
+
+* `android.content.Context`(Application context)
+* [Common Executors]({{ site.baseurl }}{% link components/executors.md %})
+* `FirebaseOptions`
+* Various internal components
+
+## Discovery and Dependency Injection
+
+There are multiple considerations that lead to the current design of how Firebase SDKs initialize.
+
+1. Certain SDKs need to initialize at app startup.
+2. SDKs have optional dependencies on other products that get enabled when the developer adds the dependency to their app.
+
+To enable this functionality, Firebase uses a runtime discovery and dependency injection framework [firebase-components](https://github.com/firebase/firebase-android-sdk/tree/master/firebase-components).
+
+To integrate with this framework SDKs register the components they provide via a `ComponentRegistrar` and declare any dependencies they need to initialize, e.g.
+
+```java
+public class MyRegistrar implements ComponentRegistrar {
+  @Override
+  public List<Component<?>> getComponents() {
+    return Arrays.asList(
+        // declare the component
+        Component.builder(MyComponent.class)
+            // declare dependencies
+            .add(Dependency.required(Context.class))
+            .add(Dependency.required(FirebaseOptions.class))
+            .add(Dependency.optionalProvider(InternalAuthProvider.class))
+            // let the runtime know how to create your component.
+            .factory(
+                diContainer ->
+                    new MyComponent(
+                        diContainer.get(Context.class),
+                        diContainer.get(FirebaseOptions.class),
+                        diContainer.get(InternalAuthProvider.class)))
+            .build());
+  }
+}
+```
+
+This registrar is then registered in `AndroidManifest.xml` of the SDK and is used by `FirebaseApp` to discover all components and construct the dependency graph.
+
+More details in [Firebase Components]({{ site.baseurl }}{% link components/components.md %}).
diff --git a/contributor-docs/onboarding/as_open_project.png b/contributor-docs/onboarding/as_open_project.png
new file mode 100644
index 00000000000..543f4a31090
Binary files /dev/null and b/contributor-docs/onboarding/as_open_project.png differ
diff --git a/contributor-docs/onboarding/env_setup.md b/contributor-docs/onboarding/env_setup.md
new file mode 100644
index 00000000000..95427f8a66a
--- /dev/null
+++ b/contributor-docs/onboarding/env_setup.md
@@ -0,0 +1,50 @@
+---
+parent: Onboarding
+---
+
+# Development Environment Setup
+
+This page describes software and configuration required to work on code in the
+[Firebase/firebase-android-sdk](https://github.com/firebase/firebase-android-sdk)
+repository.
+
+{:toc}
+
+## JDK
+
+The currently required version of the JDK is `11`. Any other versions are
+unsupported and using them could result in build failures.
+
+## Android Studio
+
+In general, the most recent version of Android Studio should work. The version
+that is tested at the time of this writing is `Dolphin | 2021.3.1`.
+
+Download it here:
+[Download Android Studio](https://developer.android.com/studio)
+
+## Emulators
+
+If you plan to run tests on emulators(you should), you should be able to install
+them directly from Android Studio's AVD manager.
+
+## Github (Googlers Only)
+
+To onboard and get write access to the github repository you need to have a
+github account fully linked with [go/github](http://go/github).
+
+File a bug using this
+[bug template](http://b/issues/new?component=312729&template=1016566) and wait
+for access to be granted.
+
+After that configure github keys as usual using this
+[Github documentation page](https://docs.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh).
+
+## Importing the repository
+
+1. Clone the repository with `git clone --recurse-submodules
+    git@github.com:firebase/firebase-android-sdk.git`.
+1. Open Android Studio and click "Open an existing project".
+    ![Open an existing project](as_open_project.png)
+1. Find the `firebase-android-sdk` directory and open.
+1. To run integration/device tests you will need a `google-services.json` file.
diff --git a/contributor-docs/onboarding/new_sdk.md b/contributor-docs/onboarding/new_sdk.md
new file mode 100644
index 00000000000..2e155b29e9e
--- /dev/null
+++ b/contributor-docs/onboarding/new_sdk.md
@@ -0,0 +1,227 @@
+---
+parent: Onboarding
+---
+
+# Creating a new Firebase SDK
+{: .no_toc}
+
+1. TOC
+{:toc}
+
+Want to create a new SDK in
+[firebase/firebase-android-sdk](https://github.com/firebase/firebase-android-sdk)?
+Read on.
+
+{:toc}
+
+## Repository layout and Gradle
+
+[firebase/firebase-android-sdk](https://github.com/firebase/firebase-android-sdk)
+uses a multi-project Gradle build to organize the different libraries it hosts.
+As a consequence, each project/product within this repo is hosted under its own
+subdirectory with its respective build file(s).
+
+```bash
+firebase-android-sdk
+├── buildSrc
+├── appcheck
+│   └── firebase-appcheck
+│   └── firebase-appcheck-playintegrity
+├── firebase-annotations
+├── firebase-common
+│   └── firebase-common.gradle # note the name of the build file
+│   └── ktx
+│      └── ktx.gradle.kts # it can also be kts
+└── build.gradle # root project build file.
+```
+
+Most commonly, SDKs are located as immediate child directories of the root
+directory, with the directory name being the exact name of the Maven artifact ID
+the library will have once released. e.g. `firebase-common` directory
+hosts code for the `com.google.firebase:firebase-common` SDK.
+
+{: .warning }
+Note that the build file name for any given SDK is not `build.gradle` or `build.gradle.kts`
+but rather mirrors the name of the sdk, e.g.
+`firebase-common/firebase-common.gradle` or `firebase-common/firebase-common.gradle.kts`.
+
+All of the core Gradle build logic lives in `buildSrc` and is used by all
+SDKs.
+
+SDKs can be grouped together for convenience by placing them in a directory of
+choice.
+
+## Creating an SDK
+
+Let's say you want to create an SDK named `firebase-foo`
+
+1. Create a directory called `firebase-foo`.
+1. Create a file `firebase-foo/firebase-foo.gradle.kts`.
+1. Add `firebase-foo` line to `subprojects.cfg` at the root of the tree.
+
+### Update `firebase-foo.gradle.kts` with the following content
+
+<details open markdown="block">
+  <summary>
+    firebase-foo.gradle.kts
+  </summary>
+```kotlin
+plugins {
+  id("firebase-library")
+  // Uncomment for Kotlin
+  // id("kotlin-android")
+}
+
+firebaseLibrary {
+    // enable this only if you have tests in `androidTest`.
+    testLab.enabled = true
+    publishSources = true
+    publishJavadoc = true
+}
+
+android {
+  val targetSdkVersion : Int by rootProject
+  val minSdkVersion : Int by rootProject
+
+  compileSdk = targetSdkVersion
+  defaultConfig {
+    namespace = "com.google.firebase.foo"
+    // change this if you have custom needs.
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+  }
+
+  testOptions.unitTests.isIncludeAndroidResources = true
+}
+
+dependencies {
+  implementation("com.google.firebase:firebase-common:21.0.0")
+  implementation("com.google.firebase:firebase-components:18.0.0")
+}
+
+```
+</details>
+
+### Create `src/main/AndroidManifest.xml` with the following content:
+
+<details open markdown="block">
+  <summary>
+    src/main/AndroidManifest.xml
+  </summary>
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright {{ 'now' | date: "%Y" }} Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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">
+  <application>
+      <service android:name="com.google.firebase.components.ComponentDiscoveryService"
+          android:exported="false">
+          <meta-data
+              android:name="com.google.firebase.components:com.google.firebase.foo.FirebaseFooRegistrar"
+              android:value="com.google.firebase.components.ComponentRegistrar" />
+      </service>
+  </application>
+</manifest>
+```
+
+</details>
+
+### Create `com.google.firebase.foo.FirebaseFoo`
+
+For Kotlin
+<details open markdown="block">
+  <summary>
+    src/main/kotlin/com/google/firebase/foo/FirebaseFoo.kt
+  </summary>
+
+```kotlin
+class FirebaseFoo {
+  companion object {
+    @JvmStatic
+    val instance: FirebaseFoo
+      get() = getInstance(Firebase.app)
+
+    @JvmStatic fun getInstance(app: FirebaseApp): FirebaseFoo = app.get(FirebaseFoo::class.java)
+  }
+}
+```
+
+</details>
+
+For Java
+<details markdown="block">
+  <summary>
+    src/main/java/com/google/firebase/foo/FirebaseFoo.java
+  </summary>
+
+```java
+public class FirebaseFoo {
+  public static FirebaseFoo getInstance() {
+    return getInstance(FirebaseApp.getInstance());
+  }
+  public static FirebaseFoo getInstance(FirebaseApp app) {
+    return app.get(FirebaseFoo.class);
+  }
+}
+```
+
+</details>
+
+### Create `com.google.firebase.foo.FirebaseFooRegistrar`
+
+For Kotlin
+<details open markdown="block">
+  <summary>
+    src/main/kotlin/com/google/firebase/foo/FirebaseFooRegistrar.kt
+  </summary>
+
+{: .warning }
+You should strongly consider using [Dependency Injection]({{ site.baseurl }}{% link best_practices/dependency_injection.md %})
+to instantiate your sdk instead of manually constructing its instance in the `factory()` below.
+
+```kotlin
+class FirebaseFooRegistrar : ComponentRegistrar {
+  override fun getComponents() =
+    listOf(
+      Component.builder(FirebaseFoo::class.java).factory { container -> FirebaseFoo() }.build(),
+      LibraryVersionComponent.create("fire-foo", BuildConfig.VERSION_NAME)
+    )
+}
+```
+
+</details>
+
+For Java
+<details markdown="block">
+  <summary>
+    src/main/java/com/google/firebase/foo/FirebaseFooRegistrar.java
+  </summary>
+
+```java
+public class FirebaseFooRegistrar implements ComponentRegistrar {
+  @Override
+  public List<Component<?>> getComponents() {
+    return Arrays.asList(
+        Component.builder(FirebaseFoo.class).factory(c -> new FirebaseFoo()).build(),
+        LibraryVersionComponent.create("fire-foo", BuildConfig.VERSION_NAME));
+
+  }
+}
+```
+
+</details>
+
+Continue to [How Firebase works]({{ site.baseurl }}{% link how_firebase_works.md %}).
diff --git a/contributor-docs/onboarding/onboarding.md b/contributor-docs/onboarding/onboarding.md
new file mode 100644
index 00000000000..b7291dde2bc
--- /dev/null
+++ b/contributor-docs/onboarding/onboarding.md
@@ -0,0 +1,7 @@
+---
+has_children: true
+permalink: /onboarding/
+nav_order: 2
+---
+
+# Onboarding
diff --git a/docs/executors.md b/docs/executors.md
new file mode 100644
index 00000000000..8cf1d423405
--- /dev/null
+++ b/docs/executors.md
@@ -0,0 +1,3 @@
+# Executors
+
+Moved to [This page](https://firebase.github.io/firebase-android-sdk/components/executors).
diff --git a/docs/ktx/firestore.md b/docs/ktx/firestore.md
index d50ab83b8b6..276f6bc0820 100644
--- a/docs/ktx/firestore.md
+++ b/docs/ktx/firestore.md
@@ -27,6 +27,64 @@ val firestore = Firebase.firestore
 val anotherFirestore = Firebase.firestore(Firebase.app("myApp"))
 ```
 
+### Get a document
+
+**Kotlin**
+```kotlin
+firestore.collection("cities")
+    .document("LON")
+    .addSnapshotListener { document: DocumentSnapshot?, error:  ->
+        if (error != null) { 
+            // Handle error
+            return@addSnapshotListener
+        }
+        if (document != null) {
+            // Use document
+        }
+    }
+```
+
+**Kotlin + KTX**
+```kotlin
+firestore.collection("cities")
+    .document("LON")
+    .snapshots()
+    .collect { document: DocumentSnapshot ->
+        // Use document
+    }
+```
+
+### Query documents
+
+**Kotlin**
+```kotlin
+firestore.collection("cities")
+    .whereEqualTo("capital", true)
+    .addSnapshotListener { documents: QuerySnapshot?, error ->
+        if (error != null) {
+            // Handle error
+            return@addSnapshotListener
+        }
+        if (documents != null) {
+            for (document in documents) {
+                // Use document
+            }
+        }
+    }
+```
+
+**Kotlin + KTX**
+```kotlin
+firestore.collection("cities")
+    .whereEqualTo("capital", true)
+    .snapshots()
+    .collect { documents: QuerySnapshot ->
+        for (document in documents) {
+            // Use document
+        }
+    }
+```
+
 ### Convert a DocumentSnapshot field to a POJO
 
 **Kotlin**
diff --git a/docs/make_release_notes.py b/docs/make_release_notes.py
new file mode 100644
index 00000000000..268dbd7672e
--- /dev/null
+++ b/docs/make_release_notes.py
@@ -0,0 +1,450 @@
+#!/usr/bin/env python3
+
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Converts GitHub flavored markdown changelogs to release notes.
+"""
+
+import argparse
+import configparser
+import json
+import re
+import os
+import string
+from dataclasses import dataclass, field
+
+# TODO(b/279610345) - Replace this with a Gradle task
+@dataclass
+class Changelog:
+    path: str
+    target_path: str
+    alt_name: str
+    version_name: str
+    has_ktx: bool = True
+    ktx_placeholder: str = None
+    version: str = field(init=False)
+
+    def __post_init__(self):
+        self.version = self._get_version()
+
+    def get_header(self):
+        version_str = f'{{: #{self.version_name}_v{self.version.replace(".", "-")}}}'
+        return f'### {self.alt_name} version {self.version} {version_str}\n'
+
+    def get_ktx_header(self):
+        if not self.has_ktx:
+            return ''
+        version_str = f'{{: #{self.version_name}-ktx_v{self.version.replace(".", "-")}}}'
+        return f'#### {self.alt_name} Kotlin extensions version {self.version} {version_str}\n'
+
+    def _get_version(self):
+        properties = os.path.join(os.path.dirname(self.path),
+                                  'gradle.properties')
+        if not os.path.exists(properties):
+            return PLACEHOLDER_VERSION
+
+        with open(properties, 'r') as fd:
+            for line in fd:
+                if line.startswith('version='):
+                    return line.removeprefix('version=').strip()
+        return PLACEHOLDER_VERSION
+
+
+REPO = 'firebase/firebase-android-sdk'
+CHANGE_TYPE_MAPPING = {'added': 'feature'}
+PLACEHOLDER_VERSION = 'xx.x.x'
+PRODUCTS = {
+    'firebase-abt':
+        Changelog(path='firebase-abt/CHANGELOG.md',
+                  target_path='firebase-abt',
+                  has_ktx=False,
+                  alt_name='{{ab_testing}}',
+                  version_name='ab-testing'),
+    'firebase-appdistribution':
+        Changelog(path='firebase-appdistribution/CHANGELOG.md',
+                  target_path='firebase-appdistribution',
+                  has_ktx=False,
+                  alt_name='{{appdistro}}',
+                  version_name='app-distro'),
+    'firebase-appdistribution-api':
+        Changelog(path='firebase-appdistribution-api/CHANGELOG.md',
+                  target_path='firebase-appdistribution-api',
+                  alt_name='{{appdistro}} API',
+                  ktx_placeholder='firebase-appdistribution-api',
+                  version_name='app-distro-api'),
+    'firebase-config':
+        Changelog(path='firebase-config/CHANGELOG.md',
+                  target_path='firebase-config',
+                  alt_name='{{remote_config}}',
+                  ktx_placeholder='firebase-config',
+                  version_name='remote-config'),
+    'firebase-crashlytics':
+        Changelog(path='firebase-crashlytics/CHANGELOG.md',
+                  target_path='firebase-crashlytics',
+                  alt_name='{{crashlytics}}',
+                  ktx_placeholder='firebase-crashlytics',
+                  version_name='crashlytics'),
+    'firebase-crashlytics-ndk':
+        Changelog(path='firebase-crashlytics-ndk/CHANGELOG.md',
+                  target_path='firebase-crashlytics-ndk',
+                  has_ktx=False,
+                  alt_name='{{crashlytics}} NDK',
+                  version_name='crashlytics-ndk'),
+    'firebase-database':
+        Changelog(path='firebase-database/CHANGELOG.md',
+                  target_path='firebase-database',
+                  alt_name='{{database}}',
+                  ktx_placeholder='firebase-database',
+                  version_name='realtime-database'),
+    'firebase-dynamic-links':
+        Changelog(path='firebase-dynamic-links/CHANGELOG.md',
+                  target_path='firebase-dynamic-links',
+                  alt_name='{{ddls}}',
+                  ktx_placeholder='firebase-dynamic-links',
+                  version_name='dynamic-links'),
+    'firebase-firestore':
+        Changelog(path='firebase-firestore/CHANGELOG.md',
+                  target_path='firebase-firestore',
+                  alt_name='{{firestore}}',
+                  ktx_placeholder='firebase-firestore',
+                  version_name='firestore'),
+    'firebase-functions':
+        Changelog(path='firebase-functions/CHANGELOG.md',
+                  target_path='firebase-functions',
+                  alt_name='{{functions_client}}',
+                  ktx_placeholder='firebase-functions',
+                  version_name='functions-client'),
+    'firebase-dynamic-module-support':
+        Changelog(
+            path=
+            'firebase-components/firebase-dynamic-module-support/CHANGELOG.md',
+            target_path='firebase-dynamic-module-support',
+            has_ktx=False,
+            alt_name='Dynamic feature modules support',
+            version_name='dynamic-feature-modules-support'),
+    'firebase-inappmessaging':
+        Changelog(path='firebase-inappmessaging/CHANGELOG.md',
+                  target_path='firebase-inappmessaging',
+                  alt_name='{{inappmessaging}}',
+                  ktx_placeholder='firebase-inappmessaging',
+                  version_name='inappmessaging'),
+    'firebase-inappmessaging-display':
+        Changelog(path='firebase-inappmessaging-display/CHANGELOG.md',
+                  target_path='firebase-inappmessaging-display',
+                  alt_name='{{inappmessaging}} Display',
+                  ktx_placeholder='firebase-inappmessaging-display',
+                  version_name='inappmessaging-display'),
+    'firebase-installations':
+        Changelog(path='firebase-installations/CHANGELOG.md',
+                  target_path='firebase-installations',
+                  alt_name='{{firebase_installations}}',
+                  ktx_placeholder='firebase-installations',
+                  version_name='installations'),
+    'firebase-messaging':
+        Changelog(path='firebase-messaging/CHANGELOG.md',
+                  target_path='firebase-messaging',
+                  alt_name='{{messaging_longer}}',
+                  ktx_placeholder='firebase-messaging',
+                  version_name='messaging'),
+    'firebase-messaging-directboot':
+        Changelog(path='firebase-messaging-directboot/CHANGELOG.md',
+                  target_path='firebase-messaging-directboot',
+                  has_ktx=False,
+                  alt_name='Cloud Messaging Direct Boot',
+                  version_name='messaging-directboot'),
+    'firebase-ml-modeldownloader':
+        Changelog(path='firebase-ml-modeldownloader/CHANGELOG.md',
+                  target_path='firebase-ml-modeldownloader',
+                  alt_name='{{firebase_ml}}',
+                  ktx_placeholder='firebase-ml-modeldownloader',
+                  version_name='firebaseml-modeldownloader'),
+    'firebase-perf':
+        Changelog(path='firebase-perf/CHANGELOG.md',
+                  target_path='firebase-perf',
+                  alt_name='{{perfmon}}',
+                  ktx_placeholder='firebase-performance',
+                  version_name='performance'),
+    'firebase-storage':
+        Changelog(path='firebase-storage/CHANGELOG.md',
+                  target_path='firebase-storage-api',
+                  alt_name='{{firebase_storage_full}}',
+                  ktx_placeholder='firebase-storage',
+                  version_name='storage'),
+    'appcheck:firebase-appcheck':
+        Changelog(path='appcheck/firebase-appcheck/CHANGELOG.md',
+                  target_path='firebase-appcheck',
+                  alt_name='{{app_check}}',
+                  ktx_placeholder='firebase-appcheck',
+                  version_name='appcheck'),
+    'appcheck:firebase-appcheck-debug':
+        Changelog(path='appcheck/firebase-appcheck-debug/CHANGELOG.md',
+                  target_path='firebase-appcheck-debug',
+                  has_ktx=False,
+                  alt_name='{{app_check}} Debug',
+                  version_name='appcheck-debug'),
+    'appcheck:firebase-appcheck-debug-testing':
+        Changelog(path='appcheck/firebase-appcheck-debug-testing/CHANGELOG.md',
+                  target_path='firebase-appcheck-debug-testing',
+                  has_ktx=False,
+                  alt_name='{{app_check}} Debug Testing',
+                  version_name='appcheck-debug-testing'),
+    'appcheck:firebase-appcheck-playintegrity':
+        Changelog(path='appcheck/firebase-appcheck-playintegrity/CHANGELOG.md',
+                  target_path='firebase-appcheck-playintegrity',
+                  has_ktx=False,
+                  alt_name='{{app_check}} Play integrity',
+                  version_name='appcheck-playintegrity')
+}
+KTX_PLACEHOLDER_TEXT = """
+The Kotlin extensions library transitively includes the updated
+`PLACEHOLDER_NAME` library. The Kotlin extensions library has no additional
+updates.
+"""
+
+
+def read_release_cfg(release_cfg_path):
+    with open(release_cfg_path) as fd:
+        config = json.load(fd)
+    return config
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Create release notes.')
+    parser.add_argument('--releasecfg',
+                        default='release.json',
+                        required=False,
+                        help='Path to the release.cfg file to use')
+    parser.add_argument('--products',
+                        required=False,
+                        help='Comma separated list of products to process')
+    parser.add_argument('--generated_name',
+                        required=False,
+                        default=None,
+                        help='Name for generated files, without extension.')
+    args = parser.parse_args()
+
+    release_cfg = None
+    if os.path.exists(args.releasecfg):
+        release_cfg = read_release_cfg(args.releasecfg)
+
+    if args.products:
+        products = args.products.split(',')
+    else:
+        products = list(release_cfg['libraries'])
+
+    if args.generated_name:
+        generated_name = args.generated_name
+    else:
+        generated_name = release_cfg['name'].lower().strip()
+
+    for product in products:
+        if product.startswith(':'):
+            product = product.removeprefix(':')
+        if not product in PRODUCTS:
+            print(f'Ignored: {product}')
+            continue
+
+        changelog = PRODUCTS[product]
+        renderer = Renderer(changelog)
+        translator = Translator(renderer)
+        path = f'build/changelog/android/client/{changelog.target_path}/_releases'
+        os.makedirs(path, exist_ok=True)
+        with open(f'{path}/{generated_name}.md', 'w') as fd:
+            fd.write(
+                translator.translate(
+                    read_changelog_section(changelog, 'Unreleased')))
+
+
+class Renderer(object):
+
+    def __init__(self, changelog):
+        self.changelog = changelog
+
+    def heading(self, heading):
+        return heading
+
+    def bullet(self, spacing):
+        """Renders a bullet in a list.
+
+    All bulleted lists in devsite are '*' style.
+    """
+        return f'{spacing}* '
+
+    def change_type(self, tag):
+        """Renders a change type tag as the appropriate double-braced macro.
+
+    That is "[fixed]" is rendered as "{{fixed}}".
+    """
+        tag = CHANGE_TYPE_MAPPING.get(tag, tag)
+        return '{{%s}}' % tag
+
+    def url(self, url):
+        m = re.match(r'^(?:https:)?(//github.com/(.*)/issues/(\d+))$', url)
+        if m:
+            link = m.group(1)
+            repo = m.group(2)
+            issue = m.group(3)
+
+            if repo == REPO:
+                text = f'#{issue}'
+            else:
+                text = f'{repo}#{issue}'
+
+            return f'[{text}]({link})'
+
+        return url
+
+    def local_issue_link(self, issues):
+        """Renders a local issue link as a proper markdown URL.
+
+    Transforms (#1234, #1235) into
+    ([#1234](//github.com/firebase/firebase-android-sdk/issues/1234),
+    [#1235](//github.com/firebase/firebase-android-sdk/issues/1235)).
+    """
+        issue_link_list = []
+        issue_list = issues.split(', ')
+        translate = str.maketrans('', '', string.punctuation)
+        for issue in issue_list:
+            issue = issue.translate(translate)
+            link = f'//github.com/{REPO}/issues/{issue}'
+            issue_link_list.append(f'[#{issue}]({link})')
+        return '(' + ', '.join(issue_link_list) + ')'
+
+    def text(self, text):
+        """Passes through any other text."""
+        return text
+
+
+class Translator(object):
+
+    def __init__(self, renderer):
+        self.renderer = renderer
+
+    def translate(self, text):
+        result = ''
+        while text:
+            for key in self.rules:
+                rule = getattr(self, key)
+                m = rule.match(text)
+                if not m:
+                    continue
+
+                callback = getattr(self, 'parse_' + key)
+                callback_result = callback(m)
+                result += callback_result
+
+                text = text[len(m.group(0)):]
+                break
+
+        return result
+
+    heading = re.compile(r'^#{1,6} .*')
+
+    def parse_heading(self, m):
+        return self.renderer.heading(m.group(0))
+
+    bullet = re.compile(r'^(\s*)[*+-] ')
+
+    def parse_bullet(self, m):
+        return self.renderer.bullet(m.group(1))
+
+    change_type = re.compile(
+        r'\['  # opening square bracket
+        r'(\w+)'  # tag word (like "feature" or "changed")
+        r'\]'  # closing square bracket
+        r'(?!\()'  # not followed by opening paren (that would be a link)
+    )
+
+    def parse_change_type(self, m):
+        return self.renderer.change_type(m.group(1))
+
+    url = re.compile(r'^(https?://[^\s<]+[^<.,:;"\')\]\s])')
+
+    def parse_url(self, m):
+        return self.renderer.url(m.group(1))
+
+    local_issue_link = re.compile(
+        r'\('  # opening paren
+        r'(#(\d+)(, )?)+'  # list of hash and issue number, comma-delimited
+        r'\)'  # closing paren
+    )
+
+    def parse_local_issue_link(self, m):
+        return self.renderer.local_issue_link(m.group(0))
+
+    text = re.compile(r'^[\s\S]+?(?=[(\[\n]|https?://|$)')
+
+    def parse_text(self, m):
+        return self.renderer.text(m.group(0))
+
+    rules = [
+        'heading', 'bullet', 'change_type', 'url', 'local_issue_link', 'text'
+    ]
+
+
+def read_changelog_section(changelog, single_version=None):
+    """Reads a single section of the changelog from the given filename.
+
+  If single_version is None, reads the first section with a number in its
+  heading. Otherwise, reads the first section with single_version in its
+  heading.
+
+  Args:
+    - single_version: specifies a string to look for in headings.
+
+  Returns:
+    A string containing the heading and contents of the heading.
+  """
+    with open(changelog.path, 'r') as fd:
+        # Discard all lines until we see a heading that either has the version the
+        # user asked for or any version.
+        if single_version:
+            initial_heading = re.compile(r'^#{1,6} .*%s' %
+                                         re.escape(single_version))
+        else:
+            initial_heading = re.compile(r'^#{1,6} ([^\d]*)\d')
+
+        heading = re.compile(r'^#{1,6} ')
+
+        initial = True
+        result = []
+        for line in fd:
+            if initial:
+                if initial_heading.match(line):
+                    initial = False
+                    result.append(f'{changelog.get_header()}\n')
+
+            else:
+                if heading.match(line):
+                    break
+
+                result.append(line)
+
+        # Prune extra newlines
+        while result and result[-1] == '\n':
+            result.pop()
+
+        # Append ktx section
+        if changelog.has_ktx:
+            result.append('\n')
+            result.append(changelog.get_ktx_header())
+            result.append(
+                KTX_PLACEHOLDER_TEXT.replace('PLACEHOLDER_NAME',
+                                             changelog.ktx_placeholder))
+
+        return ''.join(result)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/encoders/README.md b/encoders/README.md
index d0c6bb3ba9d..6a33fcb1c81 100644
--- a/encoders/README.md
+++ b/encoders/README.md
@@ -121,3 +121,28 @@ public class SimpleProto {
   public byte[] toByteArray();
 }
 ```
+
+### Annotation Processing on Kotlin
+
+The default gradle `annotationProcessor` import doesn't run the processor over kotlin code, so we need to use `kapt`
+
+1. Add the plugin to your build
+
+```gradle
+plugins {
+    id 'java-library'
+    id 'com.google.protobuf'
+    id 'kotlin-kapt'
+}
+```
+
+2. Replace your `annotationProcessor` tag with `kapt`
+
+```gradle
+dependencies {
+    implementation project(":encoders:firebase-encoders")
+    implementation project(":encoders:firebase-encoders-proto")
+    // annotationProcessor project(":encoders:firebase-encoders-processor")
+    kapt project(":encoders:firebase-encoders-processor")
+}
+```
\ No newline at end of file
diff --git a/encoders/encoders.gradle b/encoders/encoders.gradle
index 66b1b1df547..767d9ad6cb5 100644
--- a/encoders/encoders.gradle
+++ b/encoders/encoders.gradle
@@ -15,6 +15,5 @@
 
 configure(subprojects) {
     group = 'com.google.firebase'
-    apply plugin: 'com.github.sherter.google-java-format'
 }
 
diff --git a/encoders/firebase-decoders-json/CHANGELOG.md b/encoders/firebase-decoders-json/CHANGELOG.md
new file mode 100644
index 00000000000..f514bbb890e
--- /dev/null
+++ b/encoders/firebase-decoders-json/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Unreleased
+
+
diff --git a/encoders/firebase-decoders-json/firebase-decoders-json.gradle b/encoders/firebase-decoders-json/firebase-decoders-json.gradle
index eb1b76714d0..7117928ae77 100644
--- a/encoders/firebase-decoders-json/firebase-decoders-json.gradle
+++ b/encoders/firebase-decoders-json/firebase-decoders-json.gradle
@@ -19,10 +19,12 @@ plugins {
 firebaseLibrary {
     publishSources = true
     publishJavadoc = false
+    publishReleaseNotes = false
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.decoders.json"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
@@ -45,14 +47,13 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
 
     testImplementation 'androidx.test:runner:1.2.0'
-    testImplementation 'androidx.test.ext:junit:1.1.1'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.13-rc-1'
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.13-rc-1'
     testImplementation 'org.mockito:mockito-core:2.25.0'
-
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
 
 tasks.withType(JavaCompile) {
     options.compilerArgs << "-Werror"
-}
\ No newline at end of file
+}
diff --git a/encoders/firebase-decoders-json/src/main/AndroidManifest.xml b/encoders/firebase-decoders-json/src/main/AndroidManifest.xml
index 385457db8bc..9f5acfe8dcf 100644
--- a/encoders/firebase-decoders-json/src/main/AndroidManifest.xml
+++ b/encoders/firebase-decoders-json/src/main/AndroidManifest.xml
@@ -12,5 +12,4 @@
 <!-- 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="com.google.firebase.decoders.json" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/encoders/firebase-encoders-json/CHANGELOG.md b/encoders/firebase-encoders-json/CHANGELOG.md
new file mode 100644
index 00000000000..f514bbb890e
--- /dev/null
+++ b/encoders/firebase-encoders-json/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Unreleased
+
+
diff --git a/encoders/firebase-encoders-json/firebase-encoders-json.gradle b/encoders/firebase-encoders-json/firebase-encoders-json.gradle
index 06ca3323d7f..ec1a5a74290 100644
--- a/encoders/firebase-encoders-json/firebase-encoders-json.gradle
+++ b/encoders/firebase-encoders-json/firebase-encoders-json.gradle
@@ -14,26 +14,32 @@
 
 plugins {
     id 'firebase-library'
+    id 'kotlin-android'
 }
 
 firebaseLibrary {
     publishSources = true
     publishJavadoc = false
+    publishReleaseNotes = false
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.encoders.json"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-      minSdkVersion project.minSdkVersion
-      targetSdkVersion project.targetSdkVersion
-      versionName version
-      testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
+        versionName version
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     testOptions {
         unitTests {
             includeAndroidResources = true
@@ -42,16 +48,16 @@ android {
 }
 
 dependencies {
+    api 'com.google.firebase:firebase-encoders:17.0.0'
+
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation project(':encoders:firebase-encoders')
 
     testImplementation 'androidx.test:runner:1.3.0'
-    testImplementation 'androidx.test.ext:junit:1.1.2'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.13'
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     testImplementation "com.google.truth:truth:1.0.1"
+    testImplementation 'junit:junit:4.13'
     testImplementation 'org.mockito:mockito-core:3.3.3'
-
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
 
 tasks.withType(JavaCompile) {
diff --git a/encoders/firebase-encoders-json/gradle.properties b/encoders/firebase-encoders-json/gradle.properties
index 4627d039e9d..7064e6cd1ba 100644
--- a/encoders/firebase-encoders-json/gradle.properties
+++ b/encoders/firebase-encoders-json/gradle.properties
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=18.0.1
-latestReleasedVersion=18.0.0
+version=18.0.2
+latestReleasedVersion=18.0.1
diff --git a/encoders/firebase-encoders-json/src/main/AndroidManifest.xml b/encoders/firebase-encoders-json/src/main/AndroidManifest.xml
index bb9b1c4ebd1..19f479e4fd1 100644
--- a/encoders/firebase-encoders-json/src/main/AndroidManifest.xml
+++ b/encoders/firebase-encoders-json/src/main/AndroidManifest.xml
@@ -13,8 +13,7 @@
 <!-- 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="com.google.firebase.encoders.json">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 </manifest>
diff --git a/encoders/firebase-encoders-json/src/main/java/com/google/firebase/encoders/json/JsonValueObjectEncoderContext.java b/encoders/firebase-encoders-json/src/main/java/com/google/firebase/encoders/json/JsonValueObjectEncoderContext.java
index 46be355bd39..65050c402c0 100644
--- a/encoders/firebase-encoders-json/src/main/java/com/google/firebase/encoders/json/JsonValueObjectEncoderContext.java
+++ b/encoders/firebase-encoders-json/src/main/java/com/google/firebase/encoders/json/JsonValueObjectEncoderContext.java
@@ -317,7 +317,11 @@ JsonValueObjectEncoderContext add(@Nullable Object o, boolean inline) throws IOE
 
     // Process enum last if it does not have a custom encoder registered.
     if (o instanceof Enum) {
-      add(((Enum) o).name());
+      if (o instanceof NumberedEnum) {
+        add(((NumberedEnum) o).getNumber());
+      } else {
+        add(((Enum<?>) o).name());
+      }
       return this;
     }
 
diff --git a/encoders/firebase-encoders-json/src/main/java/com/google/firebase/encoders/json/NumberedEnum.kt b/encoders/firebase-encoders-json/src/main/java/com/google/firebase/encoders/json/NumberedEnum.kt
new file mode 100644
index 00000000000..f0adeffb170
--- /dev/null
+++ b/encoders/firebase-encoders-json/src/main/java/com/google/firebase/encoders/json/NumberedEnum.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.encoders.json
+
+/** Represents an explicitly numbered enum for json serialization. */
+interface NumberedEnum {
+  val number: Int
+}
diff --git a/encoders/firebase-encoders-json/src/test/java/com/google/firebase/encoders/json/DummyEnum.kt b/encoders/firebase-encoders-json/src/test/java/com/google/firebase/encoders/json/DummyEnum.kt
new file mode 100644
index 00000000000..236678f0f86
--- /dev/null
+++ b/encoders/firebase-encoders-json/src/test/java/com/google/firebase/encoders/json/DummyEnum.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.encoders.json
+
+internal enum class DummyEnum(override val number: Int) : NumberedEnum {
+  VALUE_1(1),
+  VALUE_2(2),
+}
diff --git a/encoders/firebase-encoders-json/src/test/java/com/google/firebase/encoders/json/JsonValueObjectEncoderContextTest.java b/encoders/firebase-encoders-json/src/test/java/com/google/firebase/encoders/json/JsonValueObjectEncoderContextTest.java
index 1195a60be86..cb1932f107b 100644
--- a/encoders/firebase-encoders-json/src/test/java/com/google/firebase/encoders/json/JsonValueObjectEncoderContextTest.java
+++ b/encoders/firebase-encoders-json/src/test/java/com/google/firebase/encoders/json/JsonValueObjectEncoderContextTest.java
@@ -219,6 +219,18 @@ public void testEncodingEnum_withCustomEncoder() {
     assertThat(result).isEqualTo("[\"value_1\",\"value_2\"]");
   }
 
+  @Test
+  public void testEncodingNumberedEnum() {
+    String result =
+        new JsonDataEncoderBuilder()
+            .build()
+            .encode(
+                new DummyEnum[] {
+                  DummyEnum.VALUE_1, DummyEnum.VALUE_2, DummyEnum.VALUE_1, DummyEnum.VALUE_1
+                });
+    assertThat(result).isEqualTo("[1,2,1,1]");
+  }
+
   @Test
   public void testEncodingCollection() throws IOException {
     ObjectEncoder<InnerDummyClass> anotherObjectEncoder =
diff --git a/encoders/firebase-encoders-processor/CHANGELOG.md b/encoders/firebase-encoders-processor/CHANGELOG.md
new file mode 100644
index 00000000000..f514bbb890e
--- /dev/null
+++ b/encoders/firebase-encoders-processor/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Unreleased
+
+
diff --git a/encoders/firebase-encoders-processor/firebase-encoders-processor.gradle b/encoders/firebase-encoders-processor/firebase-encoders-processor.gradle
index 37c3da04265..140928763fd 100644
--- a/encoders/firebase-encoders-processor/firebase-encoders-processor.gradle
+++ b/encoders/firebase-encoders-processor/firebase-encoders-processor.gradle
@@ -20,8 +20,8 @@ def jvm = org.gradle.internal.jvm.Jvm.current()
 
 
 dependencies {
-    implementation project(':encoders:firebase-encoders')
-    implementation 'com.google.auto.service:auto-service-annotations:1.0-rc6'
+    implementation 'com.google.firebase:firebase-encoders:17.0.0'
+    implementation 'com.google.auto.service:auto-service-annotations:1.0.1'
     implementation 'com.squareup:javapoet:1.13.0'
     compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
     implementation 'com.google.guava:guava:28.1-jre'
@@ -49,8 +49,6 @@ dependencies {
 
 test {
     testLogging.showStandardStreams = true
-}
+    jvmArgs '--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED'
 
-googleJavaFormat {
-    exclude 'src/test/resources/**'
-}
\ No newline at end of file
+}
diff --git a/encoders/firebase-encoders-processor/src/main/java/com/google/firebase/encoders/processor/EncodableProcessor.java b/encoders/firebase-encoders-processor/src/main/java/com/google/firebase/encoders/processor/EncodableProcessor.java
index 09009e86ce1..39549a83e73 100644
--- a/encoders/firebase-encoders-processor/src/main/java/com/google/firebase/encoders/processor/EncodableProcessor.java
+++ b/encoders/firebase-encoders-processor/src/main/java/com/google/firebase/encoders/processor/EncodableProcessor.java
@@ -25,6 +25,7 @@
 import com.google.firebase.encoders.processor.getters.AnnotationProperty;
 import com.google.firebase.encoders.processor.getters.Getter;
 import com.google.firebase.encoders.processor.getters.GetterFactory;
+import com.squareup.javapoet.AnnotationSpec;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.FieldSpec;
@@ -108,6 +109,10 @@ private void processClass(Element element) {
     // before and after 9. See https://github.com/google/dagger/pull/882
     TypeSpec.Builder encoderBuilder =
         TypeSpec.classBuilder(className)
+            .addAnnotation(
+                AnnotationSpec.builder(SuppressWarnings.class)
+                    .addMember("value", "\"KotlinInternal\"")
+                    .build())
             .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
             .addSuperinterface(configurator)
             .addField(
diff --git a/encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoder.java b/encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoder.java
index 0b9e3325aed..f6cc58210b6 100644
--- a/encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoder.java
+++ b/encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoder.java
@@ -19,9 +19,11 @@
 import com.google.firebase.encoders.config.EncoderConfig;
 import java.io.IOException;
 import java.lang.Override;
+import java.lang.SuppressWarnings;
 
 /**
  * @hide */
+@SuppressWarnings("KotlinInternal")
 public final class AutoGenericsEncoder implements Configurator {
     public static final int CODEGEN_VERSION = 2;
 
diff --git a/encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoderWithUnknownType.java b/encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoderWithUnknownType.java
index 9c7863eb143..59ebec0844e 100644
--- a/encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoderWithUnknownType.java
+++ b/encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoderWithUnknownType.java
@@ -19,9 +19,12 @@
 import com.google.firebase.encoders.config.EncoderConfig;
 import java.io.IOException;
 import java.lang.Override;
+import java.lang.SuppressWarnings;
+
 
 /**
  * @hide */
+@SuppressWarnings("KotlinInternal")
 public final class AutoGenericClassEncoder implements Configurator {
     public static final int CODEGEN_VERSION = 2;
 
diff --git a/encoders/firebase-encoders-processor/src/test/resources/ExpectedMyClassEncoderWithExtraProperty.java b/encoders/firebase-encoders-processor/src/test/resources/ExpectedMyClassEncoderWithExtraProperty.java
index 6b99f3b13d1..410d5f3af00 100644
--- a/encoders/firebase-encoders-processor/src/test/resources/ExpectedMyClassEncoderWithExtraProperty.java
+++ b/encoders/firebase-encoders-processor/src/test/resources/ExpectedMyClassEncoderWithExtraProperty.java
@@ -20,9 +20,11 @@
 import com.google.firebase.encoders.config.EncoderConfig;
 import java.io.IOException;
 import java.lang.Override;
+import java.lang.SuppressWarnings;
 
 /**
  * @hide */
+@SuppressWarnings("KotlinInternal")
 public final class AutoMyClassEncoder implements Configurator {
   public static final int CODEGEN_VERSION = 2;
 
diff --git a/encoders/firebase-encoders-processor/src/test/resources/ExpectedRecursiveGenericEncoder.java b/encoders/firebase-encoders-processor/src/test/resources/ExpectedRecursiveGenericEncoder.java
index 824792cda1f..e97d3cf29b1 100644
--- a/encoders/firebase-encoders-processor/src/test/resources/ExpectedRecursiveGenericEncoder.java
+++ b/encoders/firebase-encoders-processor/src/test/resources/ExpectedRecursiveGenericEncoder.java
@@ -21,9 +21,11 @@
 import com.google.firebase.encoders.config.EncoderConfig;
 import java.io.IOException;
 import java.lang.Override;
+import java.lang.SuppressWarnings;
 
 /**
  * @hide */
+@SuppressWarnings("KotlinInternal")
 public final class AutoMainClassEncoder implements Configurator {
     public static final int CODEGEN_VERSION = 2;
 
diff --git a/encoders/firebase-encoders-processor/src/test/resources/ExpectedSimpleClassEncoder.java b/encoders/firebase-encoders-processor/src/test/resources/ExpectedSimpleClassEncoder.java
index 31fa19cb3de..4a35fc716de 100644
--- a/encoders/firebase-encoders-processor/src/test/resources/ExpectedSimpleClassEncoder.java
+++ b/encoders/firebase-encoders-processor/src/test/resources/ExpectedSimpleClassEncoder.java
@@ -19,9 +19,11 @@
 import com.google.firebase.encoders.config.EncoderConfig;
 import java.io.IOException;
 import java.lang.Override;
+import java.lang.SuppressWarnings;
 
 /**
  * @hide */
+@SuppressWarnings("KotlinInternal")
 public final class AutoSimpleClassEncoder implements Configurator {
   public static final int CODEGEN_VERSION = 2;
 
diff --git a/encoders/firebase-encoders-processor/src/test/resources/ExpectedTypeWithListEncoder.java b/encoders/firebase-encoders-processor/src/test/resources/ExpectedTypeWithListEncoder.java
index 3f04bcec5dd..64cdae4b154 100644
--- a/encoders/firebase-encoders-processor/src/test/resources/ExpectedTypeWithListEncoder.java
+++ b/encoders/firebase-encoders-processor/src/test/resources/ExpectedTypeWithListEncoder.java
@@ -19,9 +19,11 @@
 import com.google.firebase.encoders.config.EncoderConfig;
 import java.io.IOException;
 import java.lang.Override;
+import java.lang.SuppressWarnings;
 
 /**
  * @hide */
+@SuppressWarnings("KotlinInternal")
 public final class AutoTypeWithListEncoder implements Configurator {
     public static final int CODEGEN_VERSION = 2;
 
diff --git a/encoders/firebase-encoders-proto/CHANGELOG.md b/encoders/firebase-encoders-proto/CHANGELOG.md
new file mode 100644
index 00000000000..f514bbb890e
--- /dev/null
+++ b/encoders/firebase-encoders-proto/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Unreleased
+
+
diff --git a/encoders/firebase-encoders-proto/api.txt b/encoders/firebase-encoders-proto/api.txt
index 0841355e2b9..a669c677061 100644
--- a/encoders/firebase-encoders-proto/api.txt
+++ b/encoders/firebase-encoders-proto/api.txt
@@ -5,7 +5,7 @@ package com.google.firebase.encoders.proto {
     method public int getNumber();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface Protobuf {
+  @com.google.firebase.encoders.annotations.ExtraProperty @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface Protobuf {
     method public abstract com.google.firebase.encoders.proto.Protobuf.IntEncoding intEncoding() default com.google.firebase.encoders.proto.Protobuf.IntEncoding.DEFAULT;
     method public abstract int tag();
   }
diff --git a/encoders/firebase-encoders-proto/firebase-encoders-proto.gradle b/encoders/firebase-encoders-proto/firebase-encoders-proto.gradle
index 0db94422a2e..a613d3ac7b0 100644
--- a/encoders/firebase-encoders-proto/firebase-encoders-proto.gradle
+++ b/encoders/firebase-encoders-proto/firebase-encoders-proto.gradle
@@ -20,6 +20,7 @@ plugins {
 firebaseLibrary {
     publishSources = true
     publishJavadoc = false
+    publishReleaseNotes = false
 }
 
 java {
@@ -35,19 +36,19 @@ protobuf {
 
 
 dependencies {
+    api 'com.google.firebase:firebase-encoders:17.0.0'
+
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation project(':encoders:firebase-encoders')
 
     annotationProcessor project(':encoders:firebase-encoders-processor')
 
     testAnnotationProcessor project(':encoders:firebase-encoders-processor')
 
     testImplementation 'com.google.guava:guava:31.0-jre'
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'com.google.protobuf:protobuf-java-util:3.11.0'
-    testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0'
+    testImplementation "com.google.protobuf:protobuf-java-util:$protobufJavaUtilVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-
+    testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0'
+    testImplementation 'junit:junit:4.13.1'
 }
 
 tasks.withType(JavaCompile) {
diff --git a/encoders/firebase-encoders-proto/src/main/java/com/google/firebase/encoders/proto/ProtobufDataEncoderContext.java b/encoders/firebase-encoders-proto/src/main/java/com/google/firebase/encoders/proto/ProtobufDataEncoderContext.java
index 665f5561da1..7054d7b989a 100644
--- a/encoders/firebase-encoders-proto/src/main/java/com/google/firebase/encoders/proto/ProtobufDataEncoderContext.java
+++ b/encoders/firebase-encoders-proto/src/main/java/com/google/firebase/encoders/proto/ProtobufDataEncoderContext.java
@@ -100,6 +100,7 @@ public ObjectEncoderContext add(@NonNull FieldDescriptor field, @Nullable Object
     return add(field, obj, true);
   }
 
+  @SuppressWarnings("EnumOrdinal")
   ObjectEncoderContext add(
       @NonNull FieldDescriptor field, @Nullable Object obj, boolean skipDefault)
       throws IOException {
diff --git a/encoders/firebase-encoders-reflective/CHANGELOG.md b/encoders/firebase-encoders-reflective/CHANGELOG.md
new file mode 100644
index 00000000000..f514bbb890e
--- /dev/null
+++ b/encoders/firebase-encoders-reflective/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Unreleased
+
+
diff --git a/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle b/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
index a199efc9ac6..93dfa58995d 100644
--- a/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
+++ b/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
@@ -19,10 +19,12 @@ plugins {
 firebaseLibrary {
     publishSources = true
     publishJavadoc = false
+    publishReleaseNotes = false
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.encoders.reflective"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
@@ -42,15 +44,15 @@ android {
 }
 
 dependencies {
+    api 'com.google.firebase:firebase-encoders:17.0.0'
+    api 'com.google.firebase:firebase-encoders-json:18.0.0'
+
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation project(':encoders:firebase-encoders')
-    implementation project(':encoders:firebase-encoders-json')
 
     testImplementation 'androidx.test:runner:1.3.0'
-    testImplementation 'androidx.test.ext:junit:1.1.2'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.13'
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     testImplementation 'com.google.truth:truth:1.0.1'
+    testImplementation 'junit:junit:4.13'
     testImplementation 'org.mockito:mockito-core:3.3.3'
-
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
diff --git a/encoders/firebase-encoders-reflective/src/main/AndroidManifest.xml b/encoders/firebase-encoders-reflective/src/main/AndroidManifest.xml
index d9dadc3481f..19f479e4fd1 100644
--- a/encoders/firebase-encoders-reflective/src/main/AndroidManifest.xml
+++ b/encoders/firebase-encoders-reflective/src/main/AndroidManifest.xml
@@ -13,8 +13,7 @@
 <!-- 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="com.google.firebase.encoders.reflective">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 </manifest>
diff --git a/encoders/firebase-encoders/CHANGELOG.md b/encoders/firebase-encoders/CHANGELOG.md
new file mode 100644
index 00000000000..f514bbb890e
--- /dev/null
+++ b/encoders/firebase-encoders/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Unreleased
+
+
diff --git a/encoders/firebase-encoders/firebase-encoders.gradle b/encoders/firebase-encoders/firebase-encoders.gradle
index 133ff5869f1..7d766ee5612 100644
--- a/encoders/firebase-encoders/firebase-encoders.gradle
+++ b/encoders/firebase-encoders/firebase-encoders.gradle
@@ -19,6 +19,7 @@ plugins {
 firebaseLibrary {
     publishSources = true
     publishJavadoc = false
+    publishReleaseNotes = false
 }
 
 java {
@@ -30,9 +31,8 @@ java {
 dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
 
-    testImplementation 'junit:junit:4.13'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-
+    testImplementation 'junit:junit:4.13'
 }
 
 tasks.withType(JavaCompile) {
diff --git a/encoders/protoc-gen-firebase-encoders/CHANGELOG.md b/encoders/protoc-gen-firebase-encoders/CHANGELOG.md
new file mode 100644
index 00000000000..f514bbb890e
--- /dev/null
+++ b/encoders/protoc-gen-firebase-encoders/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Unreleased
+
+
diff --git a/encoders/protoc-gen-firebase-encoders/protoc-gen-firebase-encoders.gradle b/encoders/protoc-gen-firebase-encoders/protoc-gen-firebase-encoders.gradle
index d3638b435e5..0c147cabaa3 100644
--- a/encoders/protoc-gen-firebase-encoders/protoc-gen-firebase-encoders.gradle
+++ b/encoders/protoc-gen-firebase-encoders/protoc-gen-firebase-encoders.gradle
@@ -15,9 +15,9 @@
 plugins {
     id "org.jetbrains.kotlin.jvm"
     id "java-library"
-    id "com.github.johnrengelman.shadow" version "5.2.0"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
     id "com.google.protobuf"
-    id "org.jetbrains.kotlin.kapt"
+    id "kotlin-kapt"
 }
 
 protobuf {
@@ -26,19 +26,24 @@ protobuf {
     }
 }
 
+kapt {
+    generateStubs = false
+    correctErrorTypes = true
+}
+
 jar {
     manifest.attributes "Main-Class": "com.google.firebase.encoders.proto.codegen.MainKt"
 }
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72"
 
-    implementation "com.google.protobuf:protobuf-java:3.14.0"
-    implementation 'com.squareup:javapoet:1.13.0'
+dependencies {
+    implementation 'com.google.dagger:dagger:2.43.2'
     implementation 'com.google.guava:guava:30.0-jre'
-    implementation 'com.google.dagger:dagger:2.31.2'
-    kapt 'com.google.dagger:dagger-compiler:2.31.2'
+    implementation "com.google.protobuf:protobuf-java:3.21.9"
+    implementation 'com.squareup:javapoet:1.13.0'
+
+    kapt 'com.google.dagger:dagger-compiler:2.43.2'
 
-    testImplementation 'junit:junit:4.13.1'
     testImplementation "com.google.truth:truth:1.0.1"
+    testImplementation 'junit:junit:4.13.1'
 }
diff --git a/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/CodeGenerator.kt b/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/CodeGenerator.kt
index ac08deb749b..b37e5cfa14a 100644
--- a/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/CodeGenerator.kt
+++ b/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/CodeGenerator.kt
@@ -1,16 +1,18 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.encoders.proto.codegen
 
@@ -32,459 +34,523 @@ import java.io.OutputStream
 import javax.inject.Inject
 import javax.lang.model.element.Modifier
 
-private val ENCODER_CLASS = ClassName.get(
-        "com.google.firebase.encoders.proto", "ProtobufEncoder")
+private val ENCODER_CLASS = ClassName.get("com.google.firebase.encoders.proto", "ProtobufEncoder")
 private val ENCODABLE_ANNOTATION =
-        ClassName.get("com.google.firebase.encoders.annotations", "Encodable")
-private val PROTOBUF_ANNOTATION = ClassName.get(
-        "com.google.firebase.encoders.proto", "Protobuf")
+  ClassName.get("com.google.firebase.encoders.annotations", "Encodable")
+private val PROTOBUF_ANNOTATION = ClassName.get("com.google.firebase.encoders.proto", "Protobuf")
 private val FIELD_ANNOTATION = ENCODABLE_ANNOTATION.nestedClass("Field")
 private val IGNORE_ANNOTATION = ENCODABLE_ANNOTATION.nestedClass("Ignore")
 
 internal class Gen(
-    private val messages: Collection<UserDefined>,
-    private val vendorPackage: String
+  private val messages: Collection<UserDefined>,
+  private val vendorPackage: String
 ) {
 
-    private val rootEncoder = ClassName.get(vendorPackage, "ProtoEncoderDoNotUse")
-    private val index = mutableMapOf<UserDefined, TypeSpec.Builder>()
-    val rootClasses = mutableMapOf<UserDefined, TypeSpec.Builder>()
+  private val rootEncoder = ClassName.get(vendorPackage, "ProtoEncoderDoNotUse")
+  private val index = mutableMapOf<UserDefined, TypeSpec.Builder>()
+  val rootClasses = mutableMapOf<UserDefined, TypeSpec.Builder>()
 
-    fun generate() {
-        if (messages.isEmpty()) {
-            return
-        }
-
-        rootClasses[Message(
-                owner = Owner.Package(vendorPackage, vendorPackage, "unknown"),
-                name = "ProtoEncoderDoNotUse",
-                fields = listOf())] = protoEncoder()
+  fun generate() {
+    if (messages.isEmpty()) {
+      return
+    }
 
-        for (message in messages) {
-            generate(message)
-        }
+    rootClasses[
+      Message(
+        owner = Owner.Package(vendorPackage, vendorPackage, "unknown"),
+        name = "ProtoEncoderDoNotUse",
+        fields = listOf()
+      )] = protoEncoder()
 
-        // Messages generated above are "shallow". Meaning that they don't include their nested
-        // message types. Below we are addressing that by nesting messages within their respective
-        // containing classes.
-        for (type in index.keys) {
-            (type.owner as? Owner.MsgRef)?.let {
-                index[it.message]!!.addType(index[type]!!.build())
-            }
-        }
+    for (message in messages) {
+      generate(message)
     }
 
-    /**
-     * Generates the "root" `@Encodable` class.
-     *
-     * This class is the only `@Encodable`-annotated class in the codegen. This ensures that we
-     * generate an encoder exactly once per message and there is no code duplication.
-     *
-     * All "included" messages(as per plugin config) delegate to this class to implement encoding.
-     */
-    private fun protoEncoder(): TypeSpec.Builder {
-        return TypeSpec.classBuilder(rootEncoder)
-                .addAnnotation(ENCODABLE_ANNOTATION)
-                .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
-                .addMethod(MethodSpec.constructorBuilder()
-                        .addModifiers(Modifier.PRIVATE)
-                        .build())
-                .addField(FieldSpec.builder(
-                        ENCODER_CLASS,
-                        "ENCODER",
-                        Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL)
-                        .initializer("\$T.builder().configureWith(AutoProtoEncoderDoNotUseEncoder.CONFIG).build()", ENCODER_CLASS)
-                        .build())
-                .addMethod(MethodSpec.methodBuilder("encode")
-                        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                        .returns(ArrayTypeName.of(TypeName.BYTE))
-                        .addParameter(Any::class.java, "value")
-                        .addCode("return ENCODER.encode(value);\n")
-                        .build())
-                .addMethod(MethodSpec.methodBuilder("encode")
-                        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                        .addException(IOException::class.java)
-                        .addParameter(Any::class.java, "value")
-                        .addParameter(OutputStream::class.java, "output")
-                        .addCode("ENCODER.encode(value, output);\n")
-                        .build())
-                .apply {
-                    for (message in messages) {
-                        addMethod(MethodSpec.methodBuilder("get${message.name.capitalize()}")
-                                .returns(message.toTypeName())
-                                .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
-                                .build())
-                    }
-                }
+    // Messages generated above are "shallow". Meaning that they don't include their nested
+    // message types. Below we are addressing that by nesting messages within their respective
+    // containing classes.
+    for (type in index.keys) {
+      (type.owner as? Owner.MsgRef)?.let { index[it.message]!!.addType(index[type]!!.build()) }
     }
+  }
+
+  /**
+   * Generates the "root" `@Encodable` class.
+   *
+   * This class is the only `@Encodable`-annotated class in the codegen. This ensures that we
+   * generate an encoder exactly once per message and there is no code duplication.
+   *
+   * All "included" messages(as per plugin config) delegate to this class to implement encoding.
+   */
+  private fun protoEncoder(): TypeSpec.Builder {
+    return TypeSpec.classBuilder(rootEncoder)
+      .addAnnotation(ENCODABLE_ANNOTATION)
+      .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
+      .addMethod(MethodSpec.constructorBuilder().addModifiers(Modifier.PRIVATE).build())
+      .addField(
+        FieldSpec.builder(
+            ENCODER_CLASS,
+            "ENCODER",
+            Modifier.PRIVATE,
+            Modifier.STATIC,
+            Modifier.FINAL
+          )
+          .initializer(
+            "\$T.builder().configureWith(AutoProtoEncoderDoNotUseEncoder.CONFIG).build()",
+            ENCODER_CLASS
+          )
+          .build()
+      )
+      .addMethod(
+        MethodSpec.methodBuilder("encode")
+          .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+          .returns(ArrayTypeName.of(TypeName.BYTE))
+          .addParameter(Any::class.java, "value")
+          .addCode("return ENCODER.encode(value);\n")
+          .build()
+      )
+      .addMethod(
+        MethodSpec.methodBuilder("encode")
+          .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+          .addException(IOException::class.java)
+          .addParameter(Any::class.java, "value")
+          .addParameter(OutputStream::class.java, "output")
+          .addCode("ENCODER.encode(value, output);\n")
+          .build()
+      )
+      .apply {
+        for (message in messages) {
+          addMethod(
+            MethodSpec.methodBuilder("get${message.name.capitalize()}")
+              .returns(message.toTypeName())
+              .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
+              .build()
+          )
+        }
+      }
+  }
 
-    private fun generate(type: UserDefined) {
-        if (type in index) return
+  private fun generate(type: UserDefined) {
+    if (type in index) return
 
-        index[type] = TypeSpec.classBuilder("Dummy")
+    index[type] = TypeSpec.classBuilder("Dummy")
 
-        val builder = when (type) {
-            is ProtoEnum -> generateEnum(type)
-            is Message -> {
-                val classBuilder = generateClass(type)
-                classBuilder.addType(generateBuilder(type))
+    val builder =
+      when (type) {
+        is ProtoEnum -> generateEnum(type)
+        is Message -> {
+          val classBuilder = generateClass(type)
+          classBuilder.addType(generateBuilder(type))
 
-                for (field in type.fields) {
-                    (field.type as? UserDefined)?.let {
-                        generate(it)
-                    }
-                }
-                classBuilder
-            }
+          for (field in type.fields) {
+            (field.type as? UserDefined)?.let { generate(it) }
+          }
+          classBuilder
         }
-        if (type.owner is Owner.Package) {
-            rootClasses[type] = builder
-        }
-        index[type] = builder
+      }
+    if (type.owner is Owner.Package) {
+      rootClasses[type] = builder
     }
-
-    /**
-     * Generates an enum.
-     *
-     * Example generated enum:
-     *
-     * ```java
-     * import com.google.firebase.encoders.proto.ProtoEnum;
-     *
-     * public enum Foo implements ProtoEnum {
-     *   DEFAULT(0),
-     *   EXAMPLE(1);
-     *
-     *   private final int number_;
-     *   Foo(int number_) {
-     *     this.number_ = number_;
-     *   }
-     *
-     *   @Override
-     *   public int getNumber() {
-     *     return number_;
-     *   }
-     * }
-     * ```
-     */
-    private fun generateEnum(type: ProtoEnum): TypeSpec.Builder {
-        val builder = TypeSpec.enumBuilder(type.name).apply {
-            addModifiers(Modifier.PUBLIC)
-            this.addSuperinterface(
-                    ClassName.get("com.google.firebase.encoders.proto", "ProtoEnum"))
-            for (value in type.values) {
-                addEnumConstant("${value.name}(${value.value})")
-            }
+    index[type] = builder
+  }
+
+  /**
+   * Generates an enum.
+   *
+   * Example generated enum:
+   *
+   * ```java
+   * import com.google.firebase.encoders.proto.ProtoEnum;
+   *
+   * public enum Foo implements ProtoEnum {
+   *   DEFAULT(0),
+   *   EXAMPLE(1);
+   *
+   *   private final int number_;
+   *   Foo(int number_) {
+   *     this.number_ = number_;
+   *   }
+   *
+   *   @Override
+   *   public int getNumber() {
+   *     return number_;
+   *   }
+   * }
+   * ```
+   */
+  private fun generateEnum(type: ProtoEnum): TypeSpec.Builder {
+    val builder =
+      TypeSpec.enumBuilder(type.name).apply {
+        addModifiers(Modifier.PUBLIC)
+        this.addSuperinterface(ClassName.get("com.google.firebase.encoders.proto", "ProtoEnum"))
+        for (value in type.values) {
+          addEnumConstant("${value.name}(${value.value})")
         }
-        builder.addField(FieldSpec.builder(TypeName.INT, "number_", Modifier.PRIVATE, Modifier.FINAL).build())
-        builder.addMethod(MethodSpec.constructorBuilder()
-                .addModifiers(Modifier.PRIVATE)
-                .addParameter(TypeName.INT, "number_")
-                .addCode("this.number_ = number_;\n").build())
-        builder.addMethod(MethodSpec.methodBuilder("getNumber")
-                .addModifiers(Modifier.PUBLIC)
-                .addAnnotation(Override::class.java)
-                .returns(TypeName.INT)
-                .addCode("return number_;\n")
-                .build())
-        return builder
+      }
+    builder.addField(
+      FieldSpec.builder(TypeName.INT, "number_", Modifier.PRIVATE, Modifier.FINAL).build()
+    )
+    builder.addMethod(
+      MethodSpec.constructorBuilder()
+        .addModifiers(Modifier.PRIVATE)
+        .addParameter(TypeName.INT, "number_")
+        .addCode("this.number_ = number_;\n")
+        .build()
+    )
+    builder.addMethod(
+      MethodSpec.methodBuilder("getNumber")
+        .addModifiers(Modifier.PUBLIC)
+        .addAnnotation(Override::class.java)
+        .returns(TypeName.INT)
+        .addCode("return number_;\n")
+        .build()
+    )
+    return builder
+  }
+
+  /**
+   * Generates a class that corresponds to a proto message.
+   *
+   * Example class:
+   * ```java
+   * public final class Foo {
+   *   private final int field_;
+   *   private final List<String> str_;
+   *   private Foo(int field_, List<String> str_) {
+   *     this.field_ = field_;
+   *     this.str_ = str_;
+   *   }
+   *
+   *   @Protobuf(tag = 1)
+   *   public int getField() { return field_; }
+   *
+   *   @Protobuf(tag = 2)
+   *   @Field(name = "str")
+   *   public List<String> getStrList() { return field_; }
+   *
+   *   // see generateBuilder() below
+   *   public static class Builder {}
+   *   public static Builder newBuilder() ;
+   *
+   *   public static Foo getDefaultInstance();
+   *
+   *   // these are generated only for types explicitly specified in the plugin config.
+   *   public void writeTo(OutputStream output) throws IOException;
+   *   public byte[] toByteArray();
+   *
+   * }
+   * ```
+   */
+  // TODO(vkryachko): generate equals() and hashCode()
+  private fun generateClass(type: Message): TypeSpec.Builder {
+    val messageClass =
+      if (type.owner is Owner.Package) {
+        TypeSpec.classBuilder(type.name).addModifiers(Modifier.PUBLIC, Modifier.FINAL)
+      } else {
+        TypeSpec.classBuilder(type.name)
+          .addModifiers(Modifier.PUBLIC, Modifier.FINAL, Modifier.STATIC)
+      }
+    if (type in messages) {
+      messageClass
+        .addMethod(
+          MethodSpec.methodBuilder("toByteArray")
+            .addModifiers(Modifier.PUBLIC)
+            .returns(ArrayTypeName.of(TypeName.BYTE))
+            .addCode("return \$T.encode(this);\n", rootEncoder)
+            .build()
+        )
+        .addMethod(
+          MethodSpec.methodBuilder("writeTo")
+            .addModifiers(Modifier.PUBLIC)
+            .addException(IOException::class.java)
+            .addParameter(OutputStream::class.java, "output")
+            .addCode("\$T.encode(this, output);\n", rootEncoder)
+            .build()
+        )
     }
-
-    /**
-     * Generates a class that corresponds to a proto message.
-     *
-     * Example class:
-     * ```java
-     * public final class Foo {
-     *   private final int field_;
-     *   private final List<String> str_;
-     *   private Foo(int field_, List<String> str_) {
-     *     this.field_ = field_;
-     *     this.str_ = str_;
-     *   }
-     *
-     *   @Protobuf(tag = 1)
-     *   public int getField() { return field_; }
-     *
-     *   @Protobuf(tag = 2)
-     *   @Field(name = "str")
-     *   public List<String> getStrList() { return field_; }
-     *
-     *   // see generateBuilder() below
-     *   public static class Builder {}
-     *   public static Builder newBuilder() ;
-     *
-     *   public static Foo getDefaultInstance();
-     *
-     *   // these are generated only for types explicitly specified in the plugin config.
-     *   public void writeTo(OutputStream output) throws IOException;
-     *   public byte[] toByteArray();
-     *
-     * }
-     * ```
-     */
-    // TODO(vkryachko): generate equals() and hashCode()
-    private fun generateClass(type: Message): TypeSpec.Builder {
-        val messageClass = if (type.owner is Owner.Package) {
-            TypeSpec.classBuilder(type.name).addModifiers(Modifier.PUBLIC, Modifier.FINAL)
-        } else {
-            TypeSpec.classBuilder(type.name).addModifiers(Modifier.PUBLIC, Modifier.FINAL, Modifier.STATIC)
-        }
-        if (type in messages) {
-            messageClass
-                    .addMethod(MethodSpec.methodBuilder("toByteArray")
-                            .addModifiers(Modifier.PUBLIC)
-                            .returns(ArrayTypeName.of(TypeName.BYTE))
-                            .addCode("return \$T.encode(this);\n", rootEncoder)
-                            .build())
-                    .addMethod(MethodSpec.methodBuilder("writeTo")
-                            .addModifiers(Modifier.PUBLIC)
-                            .addException(IOException::class.java)
-                            .addParameter(OutputStream::class.java, "output")
-                            .addCode("\$T.encode(this, output);\n", rootEncoder)
-                            .build())
-        }
-        val messageTypeName = ClassName.bestGuess(type.name)
-
-        val constructor = MethodSpec.constructorBuilder()
-        messageClass.addMethod(MethodSpec.methodBuilder("newBuilder")
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                .returns(ClassName.bestGuess("Builder"))
-                .addCode("return new Builder();\n")
-                .build())
-
-        for (field in type.fields) {
-            messageClass.addField(FieldSpec.builder(field.typeName, "${field.name}_", Modifier.PRIVATE, Modifier.FINAL).build())
-            constructor.addParameter(field.typeName, "${field.name}_")
-            constructor.addCode("this.${field.name}_ = ${field.name}_;\n")
-
-            if (field.repeated || field.type !is Message) {
-                messageClass.addMethod(MethodSpec.methodBuilder("get${field.camelCaseName}${if (field.repeated) "List" else ""}")
-                        .addModifiers(Modifier.PUBLIC)
-                        .addAnnotation(AnnotationSpec.builder(PROTOBUF_ANNOTATION)
-                                .addMember("tag", "${field.number}")
-                                .apply {
-                                    field.type.intEncoding?.let {
-                                        addMember("intEncoding", it)
-                                    }
-                                }
-                                .build())
-                        .apply {
-                            if (field.repeated) {
-                                addAnnotation(AnnotationSpec.builder(FIELD_ANNOTATION)
-                                        .addMember("name", "\$S", field.lowerCamelCaseName)
-                                        .build())
-                            }
-                        }
-                        .returns(field.typeName)
-                        .addCode("return ${field.name}_;\n")
-                        .build())
-            } else {
-                // this method is for use as public API, it never returns null and falls back to
-                // returning default instances.
-                messageClass.addMethod(MethodSpec.methodBuilder("get${field.camelCaseName}")
-                        .addModifiers(Modifier.PUBLIC)
-                        .addAnnotation(AnnotationSpec.builder(IGNORE_ANNOTATION).build())
-                        .returns(field.typeName)
-                        .addCode("return ${field.name}_ == null ? \$T.getDefaultInstance() : ${field.name}_;\n", field.typeName)
-                        .build())
-                // this method can return null and is needed by the encoder to make sure we don't
-                // try to encode default instances, which is:
-                // 1. inefficient
-                // 2. can lead to infinite recursion in case of self-referential types.
-                messageClass.addMethod(MethodSpec.methodBuilder("get${field.camelCaseName}Internal")
-                        .addModifiers(Modifier.PUBLIC)
-                        .addAnnotation(AnnotationSpec.builder(PROTOBUF_ANNOTATION)
-                                .addMember("tag", "${field.number}")
-                                .build())
-                        .addAnnotation(AnnotationSpec.builder(FIELD_ANNOTATION)
-                                .addMember("name", "\$S", field.lowerCamelCaseName)
-                                .build())
-                        .returns(field.typeName)
-                        .addCode("return ${field.name}_;\n")
-                        .build())
+    val messageTypeName = ClassName.bestGuess(type.name)
+
+    val constructor = MethodSpec.constructorBuilder()
+    messageClass.addMethod(
+      MethodSpec.methodBuilder("newBuilder")
+        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+        .returns(ClassName.bestGuess("Builder"))
+        .addCode("return new Builder();\n")
+        .build()
+    )
+
+    for (field in type.fields) {
+      messageClass.addField(
+        FieldSpec.builder(field.typeName, "${field.name}_", Modifier.PRIVATE, Modifier.FINAL)
+          .build()
+      )
+      constructor.addParameter(field.typeName, "${field.name}_")
+      constructor.addCode("this.${field.name}_ = ${field.name}_;\n")
+
+      if (field.repeated || field.type !is Message) {
+        messageClass.addMethod(
+          MethodSpec.methodBuilder("get${field.camelCaseName}${if (field.repeated) "List" else ""}")
+            .addModifiers(Modifier.PUBLIC)
+            .addAnnotation(
+              AnnotationSpec.builder(PROTOBUF_ANNOTATION)
+                .addMember("tag", "${field.number}")
+                .apply { field.type.intEncoding?.let { addMember("intEncoding", it) } }
+                .build()
+            )
+            .apply {
+              if (field.repeated) {
+                addAnnotation(
+                  AnnotationSpec.builder(FIELD_ANNOTATION)
+                    .addMember("name", "\$S", field.lowerCamelCaseName)
+                    .build()
+                )
+              }
             }
-        }
-        messageClass.addMethod(constructor.build())
-        messageClass.addField(FieldSpec.builder(
-                messageTypeName,
-                "DEFAULT_INSTANCE",
-                Modifier.PRIVATE,
-                Modifier.STATIC,
-                Modifier.FINAL)
-                .initializer("new Builder().build()", messageTypeName)
-                .build())
-        messageClass.addMethod(MethodSpec.methodBuilder("getDefaultInstance")
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-                .returns(messageTypeName)
-                .addCode("return DEFAULT_INSTANCE;\n").build())
-        return messageClass
+            .returns(field.typeName)
+            .addCode("return ${field.name}_;\n")
+            .build()
+        )
+      } else {
+        // this method is for use as public API, it never returns null and falls back to
+        // returning default instances.
+        messageClass.addMethod(
+          MethodSpec.methodBuilder("get${field.camelCaseName}")
+            .addModifiers(Modifier.PUBLIC)
+            .addAnnotation(AnnotationSpec.builder(IGNORE_ANNOTATION).build())
+            .returns(field.typeName)
+            .addCode(
+              "return ${field.name}_ == null ? \$T.getDefaultInstance() : ${field.name}_;\n",
+              field.typeName
+            )
+            .build()
+        )
+        // this method can return null and is needed by the encoder to make sure we don't
+        // try to encode default instances, which is:
+        // 1. inefficient
+        // 2. can lead to infinite recursion in case of self-referential types.
+        messageClass.addMethod(
+          MethodSpec.methodBuilder("get${field.camelCaseName}Internal")
+            .addModifiers(Modifier.PUBLIC)
+            .addAnnotation(
+              AnnotationSpec.builder(PROTOBUF_ANNOTATION)
+                .addMember("tag", "${field.number}")
+                .build()
+            )
+            .addAnnotation(
+              AnnotationSpec.builder(FIELD_ANNOTATION)
+                .addMember("name", "\$S", field.lowerCamelCaseName)
+                .build()
+            )
+            .returns(field.typeName)
+            .addCode("return ${field.name}_;\n")
+            .build()
+        )
+      }
     }
-
-    /**
-     * Generates a builder for a proto message.
-     *
-     * Example builder:
-     * ```java
-     * public static final class Builder {
-     *   public Foo build();
-     *   public Builder setField(int value);
-     *   public Builder setStrList(List<String> value);
-     *   public Builder addStr(String value);
-     * }
-     * ```
-     */
-    // TODO(vkryachko): oneof setters should clear other oneof cases.
-    private fun generateBuilder(type: Message): TypeSpec {
-        val messageTypeName = ClassName.bestGuess(type.name)
-
-        val builder = TypeSpec.classBuilder("Builder")
-                .addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
-
-        val buildMethodArgs = type.fields.joinToString(", ") {
-            if (it.repeated) "java.util.Collections.unmodifiableList(${it.name}_)"
-            else "${it.name}_"
-        }
-        builder.addMethod(MethodSpec.methodBuilder("build")
-                .addModifiers(Modifier.PUBLIC)
-                .returns(messageTypeName)
-                .addCode("return new \$T(\$L);\n", messageTypeName, buildMethodArgs)
-                .build())
-
-        val builderConstructor = MethodSpec.constructorBuilder()
-
-        for (field in type.fields) {
-            builder.addField(FieldSpec.builder(field.typeName, "${field.name}_", Modifier.PRIVATE).build())
-            builderConstructor.addCode("this.${field.name}_ = ").apply {
-                field.type.let { t ->
-                    when (t) {
-                        is Message -> when {
-                            field.repeated -> addCode("new \$T<>()", ClassName.get(ArrayList::class.java))
-                            else -> addCode("null")
-                        }
-                        is Primitive ->
-                            if (field.repeated)
-                                addCode("new \$T<>()", ClassName.get(ArrayList::class.java))
-                            else
-                                addCode(t.defaultValue)
-                        is ProtoEnum ->
-                            if (field.repeated)
-                                addCode("new \$T<>()", ClassName.get(ArrayList::class.java))
-                            else
-                                addCode(t.defaultValue.replace("$", "."))
-                        is Unresolved -> TODO()
-                    }
+    messageClass.addMethod(constructor.build())
+    messageClass.addField(
+      FieldSpec.builder(
+          messageTypeName,
+          "DEFAULT_INSTANCE",
+          Modifier.PRIVATE,
+          Modifier.STATIC,
+          Modifier.FINAL
+        )
+        .initializer("new Builder().build()", messageTypeName)
+        .build()
+    )
+    messageClass.addMethod(
+      MethodSpec.methodBuilder("getDefaultInstance")
+        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+        .returns(messageTypeName)
+        .addCode("return DEFAULT_INSTANCE;\n")
+        .build()
+    )
+    return messageClass
+  }
+
+  /**
+   * Generates a builder for a proto message.
+   *
+   * Example builder:
+   * ```java
+   * public static final class Builder {
+   *   public Foo build();
+   *   public Builder setField(int value);
+   *   public Builder setStrList(List<String> value);
+   *   public Builder addStr(String value);
+   * }
+   * ```
+   */
+  // TODO(vkryachko): oneof setters should clear other oneof cases.
+  private fun generateBuilder(type: Message): TypeSpec {
+    val messageTypeName = ClassName.bestGuess(type.name)
+
+    val builder =
+      TypeSpec.classBuilder("Builder")
+        .addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
+
+    val buildMethodArgs =
+      type.fields.joinToString(", ") {
+        if (it.repeated) "java.util.Collections.unmodifiableList(${it.name}_)" else "${it.name}_"
+      }
+    builder.addMethod(
+      MethodSpec.methodBuilder("build")
+        .addModifiers(Modifier.PUBLIC)
+        .returns(messageTypeName)
+        .addCode("return new \$T(\$L);\n", messageTypeName, buildMethodArgs)
+        .build()
+    )
+
+    val builderConstructor = MethodSpec.constructorBuilder()
+
+    for (field in type.fields) {
+      builder.addField(
+        FieldSpec.builder(field.typeName, "${field.name}_", Modifier.PRIVATE).build()
+      )
+      builderConstructor
+        .addCode("this.${field.name}_ = ")
+        .apply {
+          field.type.let { t ->
+            when (t) {
+              is Message ->
+                when {
+                  field.repeated -> addCode("new \$T<>()", ClassName.get(ArrayList::class.java))
+                  else -> addCode("null")
                 }
-            }.addCode(";\n")
-            if (field.repeated) {
-                builder.addMethod(MethodSpec.methodBuilder("add${field.camelCaseName}")
-                        .addModifiers(Modifier.PUBLIC)
-                        .returns(ClassName.bestGuess("Builder"))
-                        .addParameter(field.type.toTypeName(), "${field.name}_")
-                        .addCode("this.${field.name}_.add(${field.name}_);\n")
-                        .addCode("return this;\n")
-                        .build())
+              is Primitive ->
+                if (field.repeated) addCode("new \$T<>()", ClassName.get(ArrayList::class.java))
+                else addCode(t.defaultValue)
+              is ProtoEnum ->
+                if (field.repeated) addCode("new \$T<>()", ClassName.get(ArrayList::class.java))
+                else addCode(t.defaultValue.replace("$", "."))
+              is Unresolved -> TODO()
             }
-            builder.addMethod(MethodSpec.methodBuilder("set${field.camelCaseName}${if (field.repeated) "List" else ""}")
-                    .addModifiers(Modifier.PUBLIC)
-                    .returns(ClassName.bestGuess("Builder"))
-                    .addParameter(field.typeName, "${field.name}_")
-                    .addCode("this.${field.name}_ = ${field.name}_;\n")
-                    .addCode("return this;\n")
-                    .build())
+          }
         }
-        builder.addMethod(builderConstructor.build())
-        return builder.build()
+        .addCode(";\n")
+      if (field.repeated) {
+        builder.addMethod(
+          MethodSpec.methodBuilder("add${field.camelCaseName}")
+            .addModifiers(Modifier.PUBLIC)
+            .returns(ClassName.bestGuess("Builder"))
+            .addParameter(field.type.toTypeName(), "${field.name}_")
+            .addCode("this.${field.name}_.add(${field.name}_);\n")
+            .addCode("return this;\n")
+            .build()
+        )
+      }
+      builder.addMethod(
+        MethodSpec.methodBuilder("set${field.camelCaseName}${if (field.repeated) "List" else ""}")
+          .addModifiers(Modifier.PUBLIC)
+          .returns(ClassName.bestGuess("Builder"))
+          .addParameter(field.typeName, "${field.name}_")
+          .addCode("this.${field.name}_ = ${field.name}_;\n")
+          .addCode("return this;\n")
+          .build()
+      )
     }
+    builder.addMethod(builderConstructor.build())
+    return builder.build()
+  }
 }
 
 private fun ProtobufType.toTypeName(): TypeName {
-    return when (this) {
-        Primitive.INT32 -> TypeName.INT
-        Primitive.SINT32 -> TypeName.INT
-        Primitive.FIXED32 -> TypeName.INT
-        Primitive.SFIXED32 -> TypeName.INT
-        Primitive.FLOAT -> TypeName.FLOAT
-        Primitive.INT64 -> TypeName.LONG
-        Primitive.SINT64 -> TypeName.LONG
-        Primitive.FIXED64 -> TypeName.LONG
-        Primitive.SFIXED64 -> TypeName.LONG
-        Primitive.DOUBLE -> TypeName.DOUBLE
-        Primitive.BOOLEAN -> TypeName.BOOLEAN
-        Primitive.STRING -> ClassName.get(String::class.java)
-        Primitive.BYTES -> ArrayTypeName.of(TypeName.BYTE)
-        is Message -> {
-            return when (owner) {
-                is Owner.Package -> ClassName.get(owner.javaName, name)
-                is Owner.MsgRef -> (owner.message.toTypeName() as ClassName).nestedClass(name)
-            }
-        }
-        is ProtoEnum -> {
-            return when (owner) {
-                is Owner.Package -> ClassName.get(owner.javaName, name)
-                is Owner.MsgRef -> (owner.message.toTypeName() as ClassName).nestedClass(name)
-            }
-        }
-        is Unresolved -> throw AssertionError("Impossible!")
+  return when (this) {
+    Primitive.INT32 -> TypeName.INT
+    Primitive.SINT32 -> TypeName.INT
+    Primitive.FIXED32 -> TypeName.INT
+    Primitive.SFIXED32 -> TypeName.INT
+    Primitive.FLOAT -> TypeName.FLOAT
+    Primitive.INT64 -> TypeName.LONG
+    Primitive.SINT64 -> TypeName.LONG
+    Primitive.FIXED64 -> TypeName.LONG
+    Primitive.SFIXED64 -> TypeName.LONG
+    Primitive.DOUBLE -> TypeName.DOUBLE
+    Primitive.BOOLEAN -> TypeName.BOOLEAN
+    Primitive.STRING -> ClassName.get(String::class.java)
+    Primitive.BYTES -> ArrayTypeName.of(TypeName.BYTE)
+    is Message -> {
+      return when (owner) {
+        is Owner.Package -> ClassName.get(owner.javaName, name)
+        is Owner.MsgRef -> (owner.message.toTypeName() as ClassName).nestedClass(name)
+      }
     }
+    is ProtoEnum -> {
+      return when (owner) {
+        is Owner.Package -> ClassName.get(owner.javaName, name)
+        is Owner.MsgRef -> (owner.message.toTypeName() as ClassName).nestedClass(name)
+      }
+    }
+    is Unresolved -> throw AssertionError("Impossible!")
+  }
 }
 
 val ProtoField.typeName: TypeName
-    get() {
-        if (!repeated) {
-            return type.toTypeName()
-        }
-        return ParameterizedTypeName.get(ClassName.get(List::class.java), type.boxed)
+  get() {
+    if (!repeated) {
+      return type.toTypeName()
     }
+    return ParameterizedTypeName.get(ClassName.get(List::class.java), type.boxed)
+  }
 
 private val ProtobufType.boxed: TypeName
-    get() {
-        return when (this) {
-            Primitive.INT32, Primitive.SINT32, Primitive.FIXED32, Primitive.SFIXED32 ->
-                ClassName.get("java.lang", "Integer")
-            Primitive.INT64, Primitive.SINT64, Primitive.FIXED64, Primitive.SFIXED64 ->
-                ClassName.get("java.lang", "Long")
-            Primitive.FLOAT -> ClassName.get("java.lang", "Float")
-            Primitive.DOUBLE -> ClassName.get("java.lang", "Double")
-            Primitive.BOOLEAN -> ClassName.get("java.lang", "Boolean")
-            Primitive.STRING -> ClassName.get("java.lang", "String")
-            Primitive.BYTES -> ArrayTypeName.of(TypeName.BYTE)
-            else -> toTypeName()
-        }
+  get() {
+    return when (this) {
+      Primitive.INT32,
+      Primitive.SINT32,
+      Primitive.FIXED32,
+      Primitive.SFIXED32 -> ClassName.get("java.lang", "Integer")
+      Primitive.INT64,
+      Primitive.SINT64,
+      Primitive.FIXED64,
+      Primitive.SFIXED64 -> ClassName.get("java.lang", "Long")
+      Primitive.FLOAT -> ClassName.get("java.lang", "Float")
+      Primitive.DOUBLE -> ClassName.get("java.lang", "Double")
+      Primitive.BOOLEAN -> ClassName.get("java.lang", "Boolean")
+      Primitive.STRING -> ClassName.get("java.lang", "String")
+      Primitive.BYTES -> ArrayTypeName.of(TypeName.BYTE)
+      else -> toTypeName()
     }
+  }
 
 val ProtobufType.intEncoding: String?
-    get() {
-        return when (this) {
-            is Primitive.SINT32, Primitive.SINT64 ->
-                "com.google.firebase.encoders.proto.Protobuf.IntEncoding.SIGNED"
-            is Primitive.FIXED32, Primitive.FIXED64, Primitive.SFIXED32, Primitive.SFIXED64 ->
-                "com.google.firebase.encoders.proto.Protobuf.IntEncoding.FIXED"
-            else -> null
-        }
+  get() {
+    return when (this) {
+      is Primitive.SINT32,
+      Primitive.SINT64 -> "com.google.firebase.encoders.proto.Protobuf.IntEncoding.SIGNED"
+      is Primitive.FIXED32,
+      Primitive.FIXED64,
+      Primitive.SFIXED32,
+      Primitive.SFIXED64 -> "com.google.firebase.encoders.proto.Protobuf.IntEncoding.FIXED"
+      else -> null
     }
+  }
 
 val ProtoEnum.defaultValue: String
-    get() = "$javaName.${values.find { it.value == 0 }?.name}"
+  get() = "$javaName.${values.find { it.value == 0 }?.name}"
 
 class CodeGenerator @Inject constructor(private val config: CodeGenConfig) {
 
-    fun generate(messages: Collection<UserDefined>): CodeGeneratorResponse {
-        val gen = Gen(messages, config.vendorPackage)
-        gen.generate()
-
-        val responseBuilder = CodeGeneratorResponse.newBuilder()
-        for ((type, typeBuilder) in gen.rootClasses.entries) {
-            val typeSpec = typeBuilder.build()
-            val packageName = type.owner.javaName
-            val out = StringBuilder()
-            val file = JavaFile.builder(packageName, typeSpec).build()
-            file.writeTo(out)
-            val qualifiedName = if (packageName.isEmpty()) typeSpec.name else "$packageName.${typeSpec.name}"
-            val fileName = "${qualifiedName.replace('.', '/')}.java"
-            responseBuilder.addFile(CodeGeneratorResponse.File.newBuilder().setContent(out.toString()).setName(fileName))
-        }
-
-        return responseBuilder.build()
+  fun generate(messages: Collection<UserDefined>): CodeGeneratorResponse {
+    val gen = Gen(messages, config.vendorPackage)
+    gen.generate()
+
+    val responseBuilder = CodeGeneratorResponse.newBuilder()
+    for ((type, typeBuilder) in gen.rootClasses.entries) {
+      val typeSpec = typeBuilder.build()
+      val packageName = type.owner.javaName
+      val out = StringBuilder()
+      val file = JavaFile.builder(packageName, typeSpec).build()
+      file.writeTo(out)
+      val qualifiedName =
+        if (packageName.isEmpty()) typeSpec.name else "$packageName.${typeSpec.name}"
+      val fileName = "${qualifiedName.replace('.', '/')}.java"
+      responseBuilder.addFile(
+        CodeGeneratorResponse.File.newBuilder().setContent(out.toString()).setName(fileName)
+      )
     }
+
+    return responseBuilder.build()
+  }
 }
diff --git a/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Configuration.kt b/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Configuration.kt
index 59d394297e9..70ba46c5116 100644
--- a/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Configuration.kt
+++ b/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Configuration.kt
@@ -1,16 +1,18 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.encoders.proto.codegen
 
@@ -18,20 +20,20 @@ import com.google.firebase.encoders.proto.CodeGenConfig
 import com.google.protobuf.TextFormat
 
 object ConfigReader {
-    fun read(readable: Readable): CodeGenConfig {
-        val builder = CodeGenConfig.newBuilder()
-        try {
-            TextFormat.merge(readable, builder)
-        } catch (ex: TextFormat.ParseException) {
-            throw InvalidConfigException("Unable to parse config.", ex)
-        }
-        val config = builder.build()
-        if (config.vendorPackage.isEmpty()) {
-            throw InvalidConfigException("vendor_package is not set in config.")
-        }
-
-        return config
+  fun read(readable: Readable): CodeGenConfig {
+    val builder = CodeGenConfig.newBuilder()
+    try {
+      TextFormat.merge(readable, builder)
+    } catch (ex: TextFormat.ParseException) {
+      throw InvalidConfigException("Unable to parse config.", ex)
+    }
+    val config = builder.build()
+    if (config.vendorPackage.isEmpty()) {
+      throw InvalidConfigException("vendor_package is not set in config.")
     }
+
+    return config
+  }
 }
 
 class InvalidConfigException(msg: String, cause: Throwable? = null) : RuntimeException(msg, cause)
diff --git a/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Main.kt b/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Main.kt
index c8df676fa20..4cfc78eac35 100644
--- a/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Main.kt
+++ b/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Main.kt
@@ -1,16 +1,18 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.encoders.proto.codegen
 
@@ -28,26 +30,22 @@ import java.io.StringWriter
 import javax.inject.Inject
 
 fun driver(input: InputStream, output: OutputStream) {
-    val request = CodeGeneratorRequest.parseFrom(input)
-    if (request.parameter.isEmpty()) {
-        throw InvalidConfigException("Required plugin option is missing. " +
-                "Please specify the config file path via plugin options.")
-    }
-    val cfgFile = File(request.parameter)
-    if (!cfgFile.exists() || !cfgFile.isFile) {
-        throw InvalidConfigException("Config file '$cfgFile' does not exist or is a directory.")
-    }
+  val request = CodeGeneratorRequest.parseFrom(input)
+  if (request.parameter.isEmpty()) {
+    throw InvalidConfigException(
+      "Required plugin option is missing. " +
+        "Please specify the config file path via plugin options."
+    )
+  }
+  val cfgFile = File(request.parameter)
+  if (!cfgFile.exists() || !cfgFile.isFile) {
+    throw InvalidConfigException("Config file '$cfgFile' does not exist or is a directory.")
+  }
 
-    val config = cfgFile.reader().use {
-        ConfigReader.read(it)
-    }
+  val config = cfgFile.reader().use { ConfigReader.read(it) }
 
-    val component: MainComponent = DaggerMainComponent.builder()
-            .config(config)
-            .build()
-    component.plugin
-            .run(request.protoFileList)
-            .writeTo(output)
+  val component: MainComponent = DaggerMainComponent.builder().config(config).build()
+  component.plugin.run(request.protoFileList).writeTo(output)
 }
 
 /**
@@ -58,33 +56,33 @@ fun driver(input: InputStream, output: OutputStream) {
  * `stdout`.
  */
 fun main(args: Array<String>) {
-    runCatching {
-        driver(System.`in`, System.out)
-    }.onFailure {
-        val stringWriter = StringWriter()
-        it.printStackTrace(PrintWriter(stringWriter))
-        CodeGeneratorResponse.newBuilder()
-            .setError(stringWriter.toString())
-            .build()
-            .writeTo(System.out)
+  runCatching { driver(System.`in`, System.out) }
+    .onFailure {
+      val stringWriter = StringWriter()
+      it.printStackTrace(PrintWriter(stringWriter))
+      CodeGeneratorResponse.newBuilder()
+        .setError(stringWriter.toString())
+        .build()
+        .writeTo(System.out)
     }
 }
 
-class Plugin @Inject constructor(private val parser: DescriptorParser, private val generator: CodeGenerator) {
-    fun run(protoFiles: List<FileDescriptorProto>): CodeGeneratorResponse {
-        return generator.generate(parser.parse(protoFiles))
-    }
+class Plugin
+@Inject
+constructor(private val parser: DescriptorParser, private val generator: CodeGenerator) {
+  fun run(protoFiles: List<FileDescriptorProto>): CodeGeneratorResponse {
+    return generator.generate(parser.parse(protoFiles))
+  }
 }
 
 @Component(modules = [ParsingModule::class])
 interface MainComponent {
-    val plugin: Plugin
+  val plugin: Plugin
 
-    @Component.Builder
-    interface Builder {
-        @BindsInstance
-        fun config(config: CodeGenConfig): Builder
+  @Component.Builder
+  interface Builder {
+    @BindsInstance fun config(config: CodeGenConfig): Builder
 
-        fun build(): MainComponent
-    }
+    fun build(): MainComponent
+  }
 }
diff --git a/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Parsing.kt b/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Parsing.kt
index ba4f00899ab..12b28e1c960 100644
--- a/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Parsing.kt
+++ b/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Parsing.kt
@@ -1,16 +1,18 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.encoders.proto.codegen
 
@@ -26,11 +28,9 @@ import dagger.Binds
 import dagger.Module
 import javax.inject.Inject
 
-/**
- * Transforms the protobuf message descriptors into a message graph for later use in codegen.
- */
+/** Transforms the protobuf message descriptors into a message graph for later use in codegen. */
 interface DescriptorParser {
-    fun parse(protoFiles: List<FileDescriptorProto>): Collection<UserDefined>
+  fun parse(protoFiles: List<FileDescriptorProto>): Collection<UserDefined>
 }
 
 /**
@@ -43,123 +43,134 @@ interface DescriptorParser {
  * extensions are indistinguishable from message's own fields.
  */
 class DefaultParser @Inject constructor(private val config: CodeGenConfig) : DescriptorParser {
-    override fun parse(files: List<FileDescriptorProto>): List<UserDefined> {
-        val parsedTypes = files.asSequence().flatMap { file ->
-            val javaPackage = "${config.vendorPackage}.${file.`package`}"
-
-            val parent = Owner.Package(file.`package`, javaPackage, file.name)
-            parseEnums(parent, file.enumTypeList).plus(parseMessages(parent, file.messageTypeList))
-        }.toList()
+  override fun parse(files: List<FileDescriptorProto>): List<UserDefined> {
+    val parsedTypes =
+      files
+        .asSequence()
+        .flatMap { file ->
+          val javaPackage = "${config.vendorPackage}.${file.`package`}"
+
+          val parent = Owner.Package(file.`package`, javaPackage, file.name)
+          parseEnums(parent, file.enumTypeList).plus(parseMessages(parent, file.messageTypeList))
+        }
+        .toList()
 
-        val extensions = discoverExtensions(files)
+    val extensions = discoverExtensions(files)
 
-        for (type in parsedTypes) {
-            val msgExtensions = extensions[type.protobufFullName]
-            if (type !is Message || msgExtensions == null) {
-                continue
-            }
-            type.addFields(msgExtensions)
-        }
-        resolveReferences(parsedTypes)
-        return parsedTypes.filter {
-            config.includeList.contains(it.protobufFullName)
-        }
+    for (type in parsedTypes) {
+      val msgExtensions = extensions[type.protobufFullName]
+      if (type !is Message || msgExtensions == null) {
+        continue
+      }
+      type.addFields(msgExtensions)
     }
-
-    private fun resolveReferences(types: Collection<UserDefined>) {
-        val messageIndex = types.asSequence()
-                .map { it.protobufFullName to it }
-                .toMap()
-        for (userDefined in types) {
-            if (userDefined !is Message) {
-                continue
-            }
-            for (field in userDefined.fields) {
-                (field.type as? Unresolved)?.run {
-                    field.type = messageIndex[this.protobufName]
-                                ?: throw IllegalArgumentException("Unresolved reference to $protobufName in ${userDefined.protobufFullName}.")
-                }
-            }
+    resolveReferences(parsedTypes)
+    return parsedTypes.filter { config.includeList.contains(it.protobufFullName) }
+  }
+
+  private fun resolveReferences(types: Collection<UserDefined>) {
+    val messageIndex = types.asSequence().map { it.protobufFullName to it }.toMap()
+    for (userDefined in types) {
+      if (userDefined !is Message) {
+        continue
+      }
+      for (field in userDefined.fields) {
+        (field.type as? Unresolved)?.run {
+          field.type =
+            messageIndex[this.protobufName]
+              ?: throw IllegalArgumentException(
+                "Unresolved reference to $protobufName in ${userDefined.protobufFullName}."
+              )
         }
+      }
     }
-
-    private fun discoverExtensions(
-        files: List<FileDescriptorProto>
-    ): ImmutableMultimap<String, ProtoField> {
-
-        val extensions: ImmutableListMultimap.Builder<String, ProtoField> =
-                ImmutableListMultimap.builder<String, ProtoField>()
-        for (file in files) {
-            for (field in file.extensionList) {
-                extensions.put(
-                    field.extendee.trimStart('.'),
-                    ProtoField(
-                        field.name,
-                        field.determineType(),
-                        field.number,
-                        field.label == FieldDescriptorProto.Label.LABEL_REPEATED))
-            }
-        }
-        return extensions.build()
+  }
+
+  private fun discoverExtensions(
+    files: List<FileDescriptorProto>
+  ): ImmutableMultimap<String, ProtoField> {
+
+    val extensions: ImmutableListMultimap.Builder<String, ProtoField> =
+      ImmutableListMultimap.builder<String, ProtoField>()
+    for (file in files) {
+      for (field in file.extensionList) {
+        extensions.put(
+          field.extendee.trimStart('.'),
+          ProtoField(
+            field.name,
+            field.determineType(),
+            field.number,
+            field.label == FieldDescriptorProto.Label.LABEL_REPEATED
+          )
+        )
+      }
     }
-
-    private fun parseEnums(parent: Owner, enums: List<DescriptorProtos.EnumDescriptorProto>): Sequence<ProtoEnum> {
-        return enums.asSequence().map { enum ->
-            ProtoEnum(parent, enum.name, enum.valueList.map {
-                ProtoEnum.Value(it.name, it.number)
-            })
-        }
+    return extensions.build()
+  }
+
+  private fun parseEnums(
+    parent: Owner,
+    enums: List<DescriptorProtos.EnumDescriptorProto>
+  ): Sequence<ProtoEnum> {
+    return enums.asSequence().map { enum ->
+      ProtoEnum(parent, enum.name, enum.valueList.map { ProtoEnum.Value(it.name, it.number) })
     }
+  }
+
+  private fun parseMessages(
+    parent: Owner,
+    messages: List<DescriptorProtos.DescriptorProto>
+  ): Sequence<UserDefined> {
+    return messages.asSequence().flatMap { msg ->
+      val m =
+        Message(
+          owner = parent,
+          name = msg.name,
+          fields =
+            msg.fieldList.map {
+              ProtoField(
+                name = it.name,
+                type = it.determineType(),
+                number = it.number,
+                repeated = it.label == FieldDescriptorProto.Label.LABEL_REPEATED
+              )
+            }
+        )
+      val newParent = Owner.MsgRef(m)
 
-    private fun parseMessages(parent: Owner, messages: List<DescriptorProtos.DescriptorProto>): Sequence<UserDefined> {
-        return messages.asSequence().flatMap { msg ->
-            val m = Message(
-                    owner = parent,
-                    name = msg.name,
-                    fields = msg.fieldList.map {
-                        ProtoField(
-                                name = it.name,
-                                type = it.determineType(),
-                                number = it.number,
-                                repeated = it.label == FieldDescriptorProto.Label.LABEL_REPEATED
-                        )
-                    })
-            val newParent = Owner.MsgRef(m)
-
-            sequenceOf(m)
-                    .plus(parseEnums(newParent, msg.enumTypeList))
-                    .plus(parseMessages(newParent, msg.nestedTypeList))
-        }
+      sequenceOf(m)
+        .plus(parseEnums(newParent, msg.enumTypeList))
+        .plus(parseMessages(newParent, msg.nestedTypeList))
     }
+  }
 }
 
 private fun FieldDescriptorProto.determineType(): ProtobufType {
-    if (typeName != "") {
-        return Unresolved(typeName.trimStart('.'))
-    }
-
-    return when (type) {
-        FieldDescriptorProto.Type.TYPE_INT32 -> Primitive.INT32
-        FieldDescriptorProto.Type.TYPE_DOUBLE -> Primitive.DOUBLE
-        FieldDescriptorProto.Type.TYPE_FLOAT -> Primitive.FLOAT
-        FieldDescriptorProto.Type.TYPE_INT64 -> Primitive.INT64
-        FieldDescriptorProto.Type.TYPE_UINT64 -> Primitive.INT64
-        FieldDescriptorProto.Type.TYPE_FIXED64 -> Primitive.FIXED64
-        FieldDescriptorProto.Type.TYPE_FIXED32 -> Primitive.FIXED32
-        FieldDescriptorProto.Type.TYPE_BOOL -> Primitive.BOOLEAN
-        FieldDescriptorProto.Type.TYPE_STRING -> Primitive.STRING
-        FieldDescriptorProto.Type.TYPE_BYTES -> Primitive.BYTES
-        FieldDescriptorProto.Type.TYPE_UINT32 -> Primitive.INT32
-        FieldDescriptorProto.Type.TYPE_SFIXED32 -> Primitive.SFIXED32
-        FieldDescriptorProto.Type.TYPE_SFIXED64 -> Primitive.SFIXED64
-        FieldDescriptorProto.Type.TYPE_SINT32 -> Primitive.SINT32
-        FieldDescriptorProto.Type.TYPE_SINT64 -> Primitive.SINT64
-        else -> throw IllegalArgumentException("$type is not supported")
-    }
+  if (typeName != "") {
+    return Unresolved(typeName.trimStart('.'))
+  }
+
+  return when (type) {
+    FieldDescriptorProto.Type.TYPE_INT32 -> Primitive.INT32
+    FieldDescriptorProto.Type.TYPE_DOUBLE -> Primitive.DOUBLE
+    FieldDescriptorProto.Type.TYPE_FLOAT -> Primitive.FLOAT
+    FieldDescriptorProto.Type.TYPE_INT64 -> Primitive.INT64
+    FieldDescriptorProto.Type.TYPE_UINT64 -> Primitive.INT64
+    FieldDescriptorProto.Type.TYPE_FIXED64 -> Primitive.FIXED64
+    FieldDescriptorProto.Type.TYPE_FIXED32 -> Primitive.FIXED32
+    FieldDescriptorProto.Type.TYPE_BOOL -> Primitive.BOOLEAN
+    FieldDescriptorProto.Type.TYPE_STRING -> Primitive.STRING
+    FieldDescriptorProto.Type.TYPE_BYTES -> Primitive.BYTES
+    FieldDescriptorProto.Type.TYPE_UINT32 -> Primitive.INT32
+    FieldDescriptorProto.Type.TYPE_SFIXED32 -> Primitive.SFIXED32
+    FieldDescriptorProto.Type.TYPE_SFIXED64 -> Primitive.SFIXED64
+    FieldDescriptorProto.Type.TYPE_SINT32 -> Primitive.SINT32
+    FieldDescriptorProto.Type.TYPE_SINT64 -> Primitive.SINT64
+    else -> throw IllegalArgumentException("$type is not supported")
+  }
 }
 
 @Module
 abstract class ParsingModule {
-    @Binds
-    abstract fun bindParser(parser: DefaultParser): DescriptorParser
+  @Binds abstract fun bindParser(parser: DefaultParser): DescriptorParser
 }
diff --git a/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Types.kt b/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Types.kt
index f87b12504d8..9a902916cf7 100644
--- a/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Types.kt
+++ b/encoders/protoc-gen-firebase-encoders/src/main/kotlin/com/google/firebase/encoders/proto/codegen/Types.kt
@@ -1,22 +1,24 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.encoders.proto.codegen
 
 /** Represents a protocol buffer type. */
 sealed class ProtobufType {
-    abstract val javaName: String
+  abstract val javaName: String
 }
 
 /**
@@ -28,23 +30,23 @@ sealed class ProtobufType {
  * @property defaultValue Default literal value of a primitive type according to the proto3 spec.
  */
 sealed class Primitive(override val javaName: String, val defaultValue: String) : ProtobufType() {
-    override fun toString(): String = this::class.java.simpleName
-
-    object INT32 : Primitive("int", "0")
-    object SINT32 : Primitive("int", "0")
-    object FIXED32 : Primitive("int", "0")
-    object SFIXED32 : Primitive("int", "0")
-    object FLOAT : Primitive("float", "0")
-
-    object INT64 : Primitive("long", "0")
-    object SINT64 : Primitive("long", "0")
-    object FIXED64 : Primitive("long", "0")
-    object SFIXED64 : Primitive("long", "0")
-    object DOUBLE : Primitive("double", "0")
-
-    object BOOLEAN : Primitive("boolean", "false")
-    object STRING : Primitive("String", "\"\"")
-    object BYTES : Primitive("byte[]", "new byte[0]")
+  override fun toString(): String = this::class.java.simpleName
+
+  object INT32 : Primitive("int", "0")
+  object SINT32 : Primitive("int", "0")
+  object FIXED32 : Primitive("int", "0")
+  object SFIXED32 : Primitive("int", "0")
+  object FLOAT : Primitive("float", "0")
+
+  object INT64 : Primitive("long", "0")
+  object SINT64 : Primitive("long", "0")
+  object FIXED64 : Primitive("long", "0")
+  object SFIXED64 : Primitive("long", "0")
+  object DOUBLE : Primitive("double", "0")
+
+  object BOOLEAN : Primitive("boolean", "false")
+  object STRING : Primitive("String", "\"\"")
+  object BYTES : Primitive("byte[]", "new byte[0]")
 }
 
 /**
@@ -53,49 +55,52 @@ sealed class Primitive(override val javaName: String, val defaultValue: String)
  * Can be one of [Message] or [ProtoEnum].
  */
 sealed class UserDefined : ProtobufType() {
-    /** A fully qualified protobuf message name, i.e. `com.example.Outer.Inner`. */
-    abstract val protobufFullName: String
-
-    /** Specifies the scope that this type is defined in, i.e. a [Owner.Package] or a parent [Message]. */
-    abstract val owner: Owner
-
-    /** Unqualified name of this type */
-    abstract val name: String
-
-    /** A fully qualified java name of this type, i.e. `com.example.Outer$Inner`. */
-    override val javaName: String
-        get() = "${owner.javaName}${owner.scopeSeparator}$name"
-
-    /** Represents a protobuf `message` type. */
-    class Message(
-        override val owner: Owner,
-        override val name: String,
-        fields: List<ProtoField>
-    ) : UserDefined() {
-        private var mutableFields: List<ProtoField> = fields
-        override val protobufFullName: String
-            get() = "${owner.protobufFullName}.$name"
-
-        override fun toString(): String {
-            return "Message(owner=$owner,name=$name,fields=$fields)"
-        }
-
-        val fields: List<ProtoField>
-            get() = mutableFields
-
-        fun addFields(fields: Iterable<ProtoField>) {
-            mutableFields = mutableFields + fields
-        }
+  /** A fully qualified protobuf message name, i.e. `com.example.Outer.Inner`. */
+  abstract val protobufFullName: String
+
+  /**
+   * Specifies the scope that this type is defined in, i.e. a [Owner.Package] or a parent [Message].
+   */
+  abstract val owner: Owner
+
+  /** Unqualified name of this type */
+  abstract val name: String
+
+  /** A fully qualified java name of this type, i.e. `com.example.Outer$Inner`. */
+  override val javaName: String
+    get() = "${owner.javaName}${owner.scopeSeparator}$name"
+
+  /** Represents a protobuf `message` type. */
+  class Message(override val owner: Owner, override val name: String, fields: List<ProtoField>) :
+    UserDefined() {
+    private var mutableFields: List<ProtoField> = fields
+    override val protobufFullName: String
+      get() = "${owner.protobufFullName}.$name"
+
+    override fun toString(): String {
+      return "Message(owner=$owner,name=$name,fields=$fields)"
     }
 
-    /** Represents a protobuf `enum` type. */
-    data class ProtoEnum(override val owner: Owner, override val name: String, val values: List<Value>) : UserDefined() {
-        override val protobufFullName: String
-            get() = "${owner.protobufFullName}.$name"
+    val fields: List<ProtoField>
+      get() = mutableFields
 
-        /** Represents possible enum values including name and field number. */
-        data class Value(val name: String, val value: Int)
+    fun addFields(fields: Iterable<ProtoField>) {
+      mutableFields = mutableFields + fields
     }
+  }
+
+  /** Represents a protobuf `enum` type. */
+  data class ProtoEnum(
+    override val owner: Owner,
+    override val name: String,
+    val values: List<Value>
+  ) : UserDefined() {
+    override val protobufFullName: String
+      get() = "${owner.protobufFullName}.$name"
+
+    /** Represents possible enum values including name and field number. */
+    data class Value(val name: String, val value: Int)
+  }
 }
 
 /**
@@ -106,18 +111,18 @@ sealed class UserDefined : ProtobufType() {
  * possible, when a message `A` has a field of type `A` either directly or transitively.
  *
  * To address that all non-primitive fields are initially set to [Unresolved], and once all messages
- * are parsed, all unresolved references are replaced with their respective
- * [protobuf types][protobufName].
+ * are parsed, all unresolved references are replaced with their respective [protobuf types]
+ * [protobufName].
  *
  * @property protobufName Fully-qualified protobuf name of the message/enum.
  */
 data class Unresolved(val protobufName: String) : ProtobufType() {
-    override val javaName: String
-        get() =
-            throw UnsupportedOperationException(
-                "Unresolved types don't have a javaName, they are intended to be resolved " +
-                    "after parsing is complete."
-            )
+  override val javaName: String
+    get() =
+      throw UnsupportedOperationException(
+        "Unresolved types don't have a javaName, they are intended to be resolved " +
+          "after parsing is complete."
+      )
 }
 
 /**
@@ -128,30 +133,31 @@ data class Unresolved(val protobufName: String) : ProtobufType() {
  * [Owner.Package] or [UserDefined.Message] (represented by [Owner.MsgRef]) respectively.
  */
 sealed class Owner(val scopeSeparator: Char) {
-    abstract val protobufFullName: String
-    abstract val fileName: String
-    abstract val javaName: String
+  abstract val protobufFullName: String
+  abstract val fileName: String
+  abstract val javaName: String
 
-    /** Represents a package that a protobuf type belongs to. */
-    data class Package(val name: String, val javaPackage: String, override val fileName: String) : Owner('.') {
-        override val protobufFullName: String
-            get() = name
+  /** Represents a package that a protobuf type belongs to. */
+  data class Package(val name: String, val javaPackage: String, override val fileName: String) :
+    Owner('.') {
+    override val protobufFullName: String
+      get() = name
 
-        override val javaName: String
-            get() = javaPackage
-    }
-
-    /** Represents a message that contains nested protobuf types. */
-    data class MsgRef(val message: UserDefined.Message) : Owner('$') {
-        override val protobufFullName: String
-            get() = message.protobufFullName
-        override val fileName: String
-            get() = message.owner.fileName
-        override val javaName: String
-            get() = message.javaName
+    override val javaName: String
+      get() = javaPackage
+  }
+
+  /** Represents a message that contains nested protobuf types. */
+  data class MsgRef(val message: UserDefined.Message) : Owner('$') {
+    override val protobufFullName: String
+      get() = message.protobufFullName
+    override val fileName: String
+      get() = message.owner.fileName
+    override val javaName: String
+      get() = message.javaName
 
-        override fun toString(): String = "MsgRef(name=${message.protobufFullName})"
-    }
+    override fun toString(): String = "MsgRef(name=${message.protobufFullName})"
+  }
 }
 
 private val SNAKE_CASE_REGEX = "_[a-zA-Z]".toRegex()
@@ -161,11 +167,19 @@ private val SNAKE_CASE_REGEX = "_[a-zA-Z]".toRegex()
  *
  * @property name name of the field as defined in the proto file, usually camel_cased.
  * @property type this property is mutable because it's not always possible specify the type
+ * ```
  *      upfront. See [Unresolved] for details.
- * */
-data class ProtoField(val name: String, var type: ProtobufType, val number: Int, val repeated: Boolean = false) {
-    /** Custom toString() needed to avoid stackoverflow if case of message reference cycles. */
-    override fun toString(): String = "ProtoField(\"$name\":$number, ${
+ * ```
+ */
+data class ProtoField(
+  val name: String,
+  var type: ProtobufType,
+  val number: Int,
+  val repeated: Boolean = false
+) {
+  /** Custom toString() needed to avoid stackoverflow if case of message reference cycles. */
+  override fun toString(): String =
+    "ProtoField(\"$name\":$number, ${
     type.let {
         when (it) {
             is UserDefined.Message -> it.protobufFullName
@@ -174,14 +188,11 @@ data class ProtoField(val name: String, var type: ProtobufType, val number: Int,
     }
     })"
 
-    val lowerCamelCaseName: String
-        get() {
-            return SNAKE_CASE_REGEX.replace(name) {
-                it.value.replace("_", "")
-                        .toUpperCase()
-            }
-        }
+  val lowerCamelCaseName: String
+    get() {
+      return SNAKE_CASE_REGEX.replace(name) { it.value.replace("_", "").toUpperCase() }
+    }
 
-    val camelCaseName: String
-        get() = lowerCamelCaseName.capitalize()
+  val camelCaseName: String
+    get() = lowerCamelCaseName.capitalize()
 }
diff --git a/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/ConfigTests.kt b/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/ConfigTests.kt
index 7c87cbf83b5..0148e758576 100644
--- a/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/ConfigTests.kt
+++ b/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/ConfigTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.encoders.proto.codegen
 
@@ -24,27 +26,29 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class ConfigTests {
-    @Test
-    fun `read() with valid txtpb file should succeed`() {
-        val vendorPackage = "com.example"
-        val myProto = "com.example.proto.MyProto"
-        val config = ConfigReader.read("""
+  @Test
+  fun `read() with valid txtpb file should succeed`() {
+    val vendorPackage = "com.example"
+    val myProto = "com.example.proto.MyProto"
+    val config =
+      ConfigReader.read(
+        """
             vendor_package: "$vendorPackage"
             include: "$myProto"
-        """.trimIndent())
+        """
+          .trimIndent()
+      )
 
-        assertThat(config).isEqualTo(CodeGenConfig.newBuilder()
-                .setVendorPackage(vendorPackage)
-                .addInclude(myProto)
-                .build())
-    }
+    assertThat(config)
+      .isEqualTo(
+        CodeGenConfig.newBuilder().setVendorPackage(vendorPackage).addInclude(myProto).build()
+      )
+  }
 
-    @Test
-    fun `read() with invalid file should fail`() {
-        assertThrows(InvalidConfigException::class.java) {
-            ConfigReader.read("invalid")
-        }
-    }
+  @Test
+  fun `read() with invalid file should fail`() {
+    assertThrows(InvalidConfigException::class.java) { ConfigReader.read("invalid") }
+  }
 }
 
 private fun ConfigReader.read(value: String): CodeGenConfig = read(CharBuffer.wrap(value))
diff --git a/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/DriverTests.kt b/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/DriverTests.kt
index 6e1093bd872..b3eedac764c 100644
--- a/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/DriverTests.kt
+++ b/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/DriverTests.kt
@@ -1,16 +1,19 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.encoders.proto.codegen
 
 import com.google.common.truth.Truth.assertThat
@@ -25,70 +28,60 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class DriverTests {
-    object DevNullOutputStream : OutputStream() {
-        override fun write(b: Int) {}
-    }
+  object DevNullOutputStream : OutputStream() {
+    override fun write(b: Int) {}
+  }
 
-    @Test
-    fun `driver should throw if config file is not specified`() {
-        val thrown = assertThrows(InvalidConfigException::class.java) {
-            driver(CodeGeneratorRequest.getDefaultInstance().asInput(), DevNullOutputStream)
-        }
-        assertThat(thrown.message).contains("Required plugin option is missing")
-    }
-    @Test
-    fun `driver should throw if config file does not exist`() {
-        val requestInput = CodeGeneratorRequest.newBuilder()
-                .setParameter("does_not_exist.txtpb")
-                .build()
-                .asInput()
-        val thrown = assertThrows(InvalidConfigException::class.java) {
-            driver(requestInput, DevNullOutputStream)
-        }
-        assertThat(thrown.message).contains("does not exist")
-    }
+  @Test
+  fun `driver should throw if config file is not specified`() {
+    val thrown =
+      assertThrows(InvalidConfigException::class.java) {
+        driver(CodeGeneratorRequest.getDefaultInstance().asInput(), DevNullOutputStream)
+      }
+    assertThat(thrown.message).contains("Required plugin option is missing")
+  }
+  @Test
+  fun `driver should throw if config file does not exist`() {
+    val requestInput =
+      CodeGeneratorRequest.newBuilder().setParameter("does_not_exist.txtpb").build().asInput()
+    val thrown =
+      assertThrows(InvalidConfigException::class.java) { driver(requestInput, DevNullOutputStream) }
+    assertThat(thrown.message).contains("does not exist")
+  }
 
-    @Test
-    fun `driver should throw if config file has syntax error`() {
-        val cfg = File.createTempFile("invalid_cfg", null)
-        cfg.writeText("invalid")
-        val requestInput = CodeGeneratorRequest.newBuilder()
-                .setParameter(cfg.absolutePath)
-                .build()
-                .asInput()
+  @Test
+  fun `driver should throw if config file has syntax error`() {
+    val cfg = File.createTempFile("invalid_cfg", null)
+    cfg.writeText("invalid")
+    val requestInput =
+      CodeGeneratorRequest.newBuilder().setParameter(cfg.absolutePath).build().asInput()
 
-        val thrown = assertThrows(InvalidConfigException::class.java) {
-            driver(requestInput, DevNullOutputStream)
-        }
-        assertThat(thrown.cause).isInstanceOf(TextFormat.ParseException::class.java)
-    }
+    val thrown =
+      assertThrows(InvalidConfigException::class.java) { driver(requestInput, DevNullOutputStream) }
+    assertThat(thrown.cause).isInstanceOf(TextFormat.ParseException::class.java)
+  }
 
-    @Test
-    fun `driver should throw if vendor_package is empty`() {
-        val cfg = File.createTempFile("invalid_cfg", null)
-        cfg.writeText("include: \"\"")
-        val requestInput = CodeGeneratorRequest.newBuilder()
-                .setParameter(cfg.absolutePath)
-                .build()
-                .asInput()
+  @Test
+  fun `driver should throw if vendor_package is empty`() {
+    val cfg = File.createTempFile("invalid_cfg", null)
+    cfg.writeText("include: \"\"")
+    val requestInput =
+      CodeGeneratorRequest.newBuilder().setParameter(cfg.absolutePath).build().asInput()
 
-        val thrown = assertThrows(InvalidConfigException::class.java) {
-            driver(requestInput, DevNullOutputStream)
-        }
-        assertThat(thrown.message).contains("vendor_package is not set")
-    }
+    val thrown =
+      assertThrows(InvalidConfigException::class.java) { driver(requestInput, DevNullOutputStream) }
+    assertThat(thrown.message).contains("vendor_package is not set")
+  }
 
-    @Test
-    fun `driver should succeed if config is valid`() {
-        val cfg = File.createTempFile("valid_cfg", null)
-        cfg.writeText("vendor_package: \"com.example\"")
-        val requestInput = CodeGeneratorRequest.newBuilder()
-                .setParameter(cfg.absolutePath)
-                .build()
-                .asInput()
+  @Test
+  fun `driver should succeed if config is valid`() {
+    val cfg = File.createTempFile("valid_cfg", null)
+    cfg.writeText("vendor_package: \"com.example\"")
+    val requestInput =
+      CodeGeneratorRequest.newBuilder().setParameter(cfg.absolutePath).build().asInput()
 
-        driver(requestInput, DevNullOutputStream)
-    }
+    driver(requestInput, DevNullOutputStream)
+  }
 }
 
 private fun CodeGeneratorRequest.asInput() = toByteString().newInput()
diff --git a/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/ParsingTests.kt b/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/ParsingTests.kt
index d2b101bcc39..db96acbe81d 100644
--- a/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/ParsingTests.kt
+++ b/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/ParsingTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.encoders.proto.codegen
 
@@ -31,139 +33,152 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class ParsingTests {
-    @Test
-    fun `parse with simple message, enum and import should succeed`() {
-        val result = parse(
-                SimpleProto.getDescriptor().file,
-                Timestamp.getDescriptor().file,
-                include = listOf(SimpleProto.getDefaultInstance()))
-
-        val msg = result.messageAt(0)
-        assertThat(msg.protobufFullName).isEqualTo("com.google.firebase.testing.SimpleProto")
-        assertThat(msg.javaName).isEqualTo("com.example.com.google.firebase.testing.SimpleProto")
-
-        assertThat(msg.fields).containsAtLeast(
-                ProtoField(name = "value", number = 1, type = Primitive.INT32),
-                ProtoField(name = "str", number = 2, type = Primitive.STRING, repeated = true)
-        )
-        val timestamp = msg.fields.withName("time")
-        assertThat(timestamp.number).isEqualTo(3)
-        assertThat(timestamp.repeated).isEqualTo(false)
-
-        val tsMsg = timestamp.messageType
-        assertThat(tsMsg.javaName).isEqualTo("com.example.google.protobuf.Timestamp")
-        assertThat(tsMsg.protobufFullName).isEqualTo("google.protobuf.Timestamp")
-        assertThat(tsMsg.fields).containsExactly(
-                ProtoField(name = "seconds", number = 1, type = Primitive.INT64),
-                ProtoField(name = "nanos", number = 2, type = Primitive.INT32)
-        )
-
-        val enum = msg.fields.withName("my_enum").type as? ProtoEnum
-                ?: throw AssertionError("my_enum is not an enum")
-
-        assertThat(enum.javaName).isEqualTo("com.example.com.google.firebase.testing.SimpleProto\$MyEnum")
-        assertThat(enum.values).containsExactly(
-                ProtoEnum.Value("DEFAULT", 0),
-                ProtoEnum.Value("EXAMPLE", 1)
-        )
-    }
-
-    @Test
-    fun `parse all primitive types should succeed`() {
-
-        val result = parse(
-                Types.getDescriptor().file,
-                include = listOf(Types.getDefaultInstance()))
-
-        val msg = result.messageAt(0)
-        assertThat(msg.protobufFullName).isEqualTo("com.google.firebase.testing.Types")
-        assertThat(msg.javaName).isEqualTo("com.example.com.google.firebase.testing.Types")
-
-        val types32 = msg.messageFieldNamed("types32")
-
-        assertThat(types32.fields).containsExactly(
-                ProtoField(name = "i", number = 1, type = Primitive.INT32),
-                ProtoField(name = "si", number = 2, type = Primitive.SINT32),
-                ProtoField(name = "f", number = 3, type = Primitive.FIXED32),
-                ProtoField(name = "sf", number = 4, type = Primitive.SFIXED32),
-                ProtoField(name = "fl", number = 5, type = Primitive.FLOAT),
-                ProtoField(name = "ui", number = 6, type = Primitive.INT32)
-        )
-
-        val types64 = msg.messageFieldNamed("types64")
-
-        assertThat(types64.fields).containsExactly(
-                ProtoField(name = "i", number = 1, type = Primitive.INT64),
-                ProtoField(name = "si", number = 2, type = Primitive.SINT64),
-                ProtoField(name = "f", number = 3, type = Primitive.FIXED64),
-                ProtoField(name = "sf", number = 4, type = Primitive.SFIXED64),
-                ProtoField(name = "db", number = 5, type = Primitive.DOUBLE),
-                ProtoField(name = "ui", number = 6, type = Primitive.INT64)
-        )
-
-        val other = msg.messageFieldNamed("other")
-
-        assertThat(other.fields).containsExactly(
-                ProtoField(name = "boolean", number = 1, type = Primitive.BOOLEAN),
-                ProtoField(name = "str", number = 2, type = Primitive.STRING),
-                ProtoField(name = "bts", number = 3, type = Primitive.BYTES)
-        )
-    }
-
-    @Test
-    fun `parse with self-referencing message should succeed`() {
-        val result = parse(
-                LinkedListProto.getDescriptor().file,
-                include = listOf(LinkedListProto.getDefaultInstance()))
-
-        val msg = result.messageAt(0)
-        assertThat(msg.name).isEqualTo("LinkedListProto")
-        assertThat(msg.fields).containsExactly(
-                ProtoField(name = "value", number = 1, type = Primitive.INT32),
-                ProtoField(name = "self", number = 2, type = msg))
-    }
-
-    @Test
-    fun `parse with extensions should add fields to extended message`() {
-        val result = parse(
-                Extendable.getDescriptor().file,
-                include = listOf(Extendable.getDefaultInstance()))
-
-        val msg = result.messageAt(0)
-        assertThat(msg.fields).hasSize(2)
-
-        assertThat(msg.fields.withName("extended")).isEqualTo(
-                ProtoField(name = "extended", number = 101, type = Primitive.STRING))
-
-        val nested = msg.messageFieldNamed("nested")
-        val ext = nested.messageFieldNamed("ext")
-        assertThat(ext).isSameInstanceAs(msg)
-    }
+  @Test
+  fun `parse with simple message, enum and import should succeed`() {
+    val result =
+      parse(
+        SimpleProto.getDescriptor().file,
+        Timestamp.getDescriptor().file,
+        include = listOf(SimpleProto.getDefaultInstance())
+      )
+
+    val msg = result.messageAt(0)
+    assertThat(msg.protobufFullName).isEqualTo("com.google.firebase.testing.SimpleProto")
+    assertThat(msg.javaName).isEqualTo("com.example.com.google.firebase.testing.SimpleProto")
+
+    assertThat(msg.fields)
+      .containsAtLeast(
+        ProtoField(name = "value", number = 1, type = Primitive.INT32),
+        ProtoField(name = "str", number = 2, type = Primitive.STRING, repeated = true)
+      )
+    val timestamp = msg.fields.withName("time")
+    assertThat(timestamp.number).isEqualTo(3)
+    assertThat(timestamp.repeated).isEqualTo(false)
+
+    val tsMsg = timestamp.messageType
+    assertThat(tsMsg.javaName).isEqualTo("com.example.google.protobuf.Timestamp")
+    assertThat(tsMsg.protobufFullName).isEqualTo("google.protobuf.Timestamp")
+    assertThat(tsMsg.fields)
+      .containsExactly(
+        ProtoField(name = "seconds", number = 1, type = Primitive.INT64),
+        ProtoField(name = "nanos", number = 2, type = Primitive.INT32)
+      )
+
+    val enum =
+      msg.fields.withName("my_enum").type as? ProtoEnum
+        ?: throw AssertionError("my_enum is not an enum")
+
+    assertThat(enum.javaName)
+      .isEqualTo("com.example.com.google.firebase.testing.SimpleProto\$MyEnum")
+    assertThat(enum.values)
+      .containsExactly(ProtoEnum.Value("DEFAULT", 0), ProtoEnum.Value("EXAMPLE", 1))
+  }
+
+  @Test
+  fun `parse all primitive types should succeed`() {
+
+    val result = parse(Types.getDescriptor().file, include = listOf(Types.getDefaultInstance()))
+
+    val msg = result.messageAt(0)
+    assertThat(msg.protobufFullName).isEqualTo("com.google.firebase.testing.Types")
+    assertThat(msg.javaName).isEqualTo("com.example.com.google.firebase.testing.Types")
+
+    val types32 = msg.messageFieldNamed("types32")
+
+    assertThat(types32.fields)
+      .containsExactly(
+        ProtoField(name = "i", number = 1, type = Primitive.INT32),
+        ProtoField(name = "si", number = 2, type = Primitive.SINT32),
+        ProtoField(name = "f", number = 3, type = Primitive.FIXED32),
+        ProtoField(name = "sf", number = 4, type = Primitive.SFIXED32),
+        ProtoField(name = "fl", number = 5, type = Primitive.FLOAT),
+        ProtoField(name = "ui", number = 6, type = Primitive.INT32)
+      )
+
+    val types64 = msg.messageFieldNamed("types64")
+
+    assertThat(types64.fields)
+      .containsExactly(
+        ProtoField(name = "i", number = 1, type = Primitive.INT64),
+        ProtoField(name = "si", number = 2, type = Primitive.SINT64),
+        ProtoField(name = "f", number = 3, type = Primitive.FIXED64),
+        ProtoField(name = "sf", number = 4, type = Primitive.SFIXED64),
+        ProtoField(name = "db", number = 5, type = Primitive.DOUBLE),
+        ProtoField(name = "ui", number = 6, type = Primitive.INT64)
+      )
+
+    val other = msg.messageFieldNamed("other")
+
+    assertThat(other.fields)
+      .containsExactly(
+        ProtoField(name = "boolean", number = 1, type = Primitive.BOOLEAN),
+        ProtoField(name = "str", number = 2, type = Primitive.STRING),
+        ProtoField(name = "bts", number = 3, type = Primitive.BYTES)
+      )
+  }
+
+  @Test
+  fun `parse with self-referencing message should succeed`() {
+    val result =
+      parse(
+        LinkedListProto.getDescriptor().file,
+        include = listOf(LinkedListProto.getDefaultInstance())
+      )
+
+    val msg = result.messageAt(0)
+    assertThat(msg.name).isEqualTo("LinkedListProto")
+    assertThat(msg.fields)
+      .containsExactly(
+        ProtoField(name = "value", number = 1, type = Primitive.INT32),
+        ProtoField(name = "self", number = 2, type = msg)
+      )
+  }
+
+  @Test
+  fun `parse with extensions should add fields to extended message`() {
+    val result =
+      parse(Extendable.getDescriptor().file, include = listOf(Extendable.getDefaultInstance()))
+
+    val msg = result.messageAt(0)
+    assertThat(msg.fields).hasSize(2)
+
+    assertThat(msg.fields.withName("extended"))
+      .isEqualTo(ProtoField(name = "extended", number = 101, type = Primitive.STRING))
+
+    val nested = msg.messageFieldNamed("nested")
+    val ext = nested.messageFieldNamed("ext")
+    assertThat(ext).isSameInstanceAs(msg)
+  }
 }
 
-private fun parse(vararg files: FileDescriptor, include: List<GeneratedMessageV3> = listOf()): List<UserDefined> {
-    return DefaultParser(CodeGenConfig.newBuilder()
-            .setVendorPackage("com.example")
-            .addAllInclude(include.map { it.descriptorForType.fullName })
-            .build()).parse(files.map { it.toProto() })
+private fun parse(
+  vararg files: FileDescriptor,
+  include: List<GeneratedMessageV3> = listOf()
+): List<UserDefined> {
+  return DefaultParser(
+      CodeGenConfig.newBuilder()
+        .setVendorPackage("com.example")
+        .addAllInclude(include.map { it.descriptorForType.fullName })
+        .build()
+    )
+    .parse(files.map { it.toProto() })
 }
 
 private fun List<UserDefined>.messageAt(index: Int): Message {
-    assertThat(this).hasSize(index + 1)
-    assertThat(this[index]).isInstanceOf(Message::class.java)
-    return this[index] as Message
+  assertThat(this).hasSize(index + 1)
+  assertThat(this[index]).isInstanceOf(Message::class.java)
+  return this[index] as Message
 }
 
 private fun List<ProtoField>.withName(name: String): ProtoField {
-    return this.find { it.name == name } ?: throw AssertionError(
-            "Did not find expected $name field in the message"
-    )
+  return this.find { it.name == name }
+    ?: throw AssertionError("Did not find expected $name field in the message")
 }
 
 private val ProtoField.messageType: Message
-    get() = type as? Message ?: throw AssertionError("Field $name is not a message.")
+  get() = type as? Message ?: throw AssertionError("Field $name is not a message.")
 
 private fun Message.messageFieldNamed(name: String): Message {
-    return this.fields.asSequence().find { it.name == name }?.messageType
-                ?: throw AssertionError("Did not find expected $name field in the message")
+  return this.fields.asSequence().find { it.name == name }?.messageType
+    ?: throw AssertionError("Did not find expected $name field in the message")
 }
diff --git a/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/TypeTests.kt b/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/TypeTests.kt
index 8f89fe0afc4..2f95837b6f0 100644
--- a/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/TypeTests.kt
+++ b/encoders/protoc-gen-firebase-encoders/src/test/kotlin/com/google/firebase/encoders/proto/codegen/TypeTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.encoders.proto.codegen
 
@@ -21,74 +23,59 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class TypeTests {
-    @Test
-    fun `proto and java qualified names work as expected`() {
-        val package1 = Owner.Package("com.example", "com.example.proto", "my_proto.proto")
-        val helloMsg = UserDefined.Message(owner = package1, name = "Hello", fields = listOf())
-        val worldMsg = UserDefined.Message(Owner.MsgRef(helloMsg), "World", fields = listOf())
+  @Test
+  fun `proto and java qualified names work as expected`() {
+    val package1 = Owner.Package("com.example", "com.example.proto", "my_proto.proto")
+    val helloMsg = UserDefined.Message(owner = package1, name = "Hello", fields = listOf())
+    val worldMsg = UserDefined.Message(Owner.MsgRef(helloMsg), "World", fields = listOf())
 
-        assertThat(helloMsg.protobufFullName).isEqualTo("com.example.Hello")
-        assertThat(helloMsg.javaName).isEqualTo("com.example.proto.Hello")
+    assertThat(helloMsg.protobufFullName).isEqualTo("com.example.Hello")
+    assertThat(helloMsg.javaName).isEqualTo("com.example.proto.Hello")
 
-        assertThat(worldMsg.protobufFullName).isEqualTo("com.example.Hello.World")
-        assertThat(worldMsg.javaName).isEqualTo("com.example.proto.Hello\$World")
-    }
+    assertThat(worldMsg.protobufFullName).isEqualTo("com.example.Hello.World")
+    assertThat(worldMsg.javaName).isEqualTo("com.example.proto.Hello\$World")
+  }
 
-    @Test
-    fun `ProtoField#toString() method should not cause stack overflow`() {
-        /*
-        syntax = "proto3";
-        package com.example;
-        option java_package = "com.example.proto";
+  @Test
+  fun `ProtoField#toString() method should not cause stack overflow`() {
+    /*
+    syntax = "proto3";
+    package com.example;
+    option java_package = "com.example.proto";
 
-        message Hello {
-            message World {
-              Hello hello = 1;
-              int64 my_long = 2;
-            }
-            World world = 1;
-            repeated int32 my_int = 2;
+    message Hello {
+        message World {
+          Hello hello = 1;
+          int64 my_long = 2;
         }
-         */
-        val package1 = Owner.Package("com.example", "com.example.proto", "my_proto.proto")
-        val worldField = ProtoField(
-            name = "world",
-            type = Unresolved("com.example.Hello.World"),
-            number = 1
-        )
-        val helloField = ProtoField(
-            name = "hello",
-            type = Unresolved("com.example.Hello"),
-            number = 1
-        )
-        val helloMsg = UserDefined.Message(
-            owner = package1,
-            name = "Hello",
-            fields = listOf(
-                worldField,
-                ProtoField(
-                    name = "my_int",
-                    type = Primitive.INT32,
-                    number = 2,
-                    repeated = true
-                )
-            )
-        )
-        val worldMsg = UserDefined.Message(
-            owner = Owner.MsgRef(helloMsg),
-            name = "World",
-            fields = listOf(
-                helloField,
-                ProtoField(
-                    name = "my_long",
-                    type = Primitive.INT64,
-                    number = 2
-                )
-            )
-        )
-        worldField.type = worldMsg
-        helloField.type = helloMsg
-
-        assertThat(helloMsg.fields[0].toString()).contains("com.example.Hello.World")
+        World world = 1;
+        repeated int32 my_int = 2;
     }
+     */
+    val package1 = Owner.Package("com.example", "com.example.proto", "my_proto.proto")
+    val worldField =
+      ProtoField(name = "world", type = Unresolved("com.example.Hello.World"), number = 1)
+    val helloField = ProtoField(name = "hello", type = Unresolved("com.example.Hello"), number = 1)
+    val helloMsg =
+      UserDefined.Message(
+        owner = package1,
+        name = "Hello",
+        fields =
+          listOf(
+            worldField,
+            ProtoField(name = "my_int", type = Primitive.INT32, number = 2, repeated = true)
+          )
+      )
+    val worldMsg =
+      UserDefined.Message(
+        owner = Owner.MsgRef(helloMsg),
+        name = "World",
+        fields =
+          listOf(helloField, ProtoField(name = "my_long", type = Primitive.INT64, number = 2))
+      )
+    worldField.type = worldMsg
+    helloField.type = helloMsg
+
+    assertThat(helloMsg.fields[0].toString()).contains("com.example.Hello.World")
+  }
 }
diff --git a/encoders/protoc-gen-firebase-encoders/tests/tests.gradle b/encoders/protoc-gen-firebase-encoders/tests/tests.gradle
index 5ac335081d1..103e76428ac 100644
--- a/encoders/protoc-gen-firebase-encoders/tests/tests.gradle
+++ b/encoders/protoc-gen-firebase-encoders/tests/tests.gradle
@@ -47,11 +47,11 @@ protobuf {
 }
 
 dependencies {
+    testAnnotationProcessor project(":encoders:firebase-encoders-processor")
+
     testImplementation project(":encoders:firebase-encoders")
     testImplementation project(":encoders:firebase-encoders-proto")
-    testImplementation "com.google.protobuf:protobuf-java:3.14.0"
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation "com.google.protobuf:protobuf-java:3.21.9"
     testImplementation "com.google.truth:truth:1.0.1"
-
-    testAnnotationProcessor project(":encoders:firebase-encoders-processor")
+    testImplementation 'junit:junit:4.13.1'
 }
diff --git a/firebase-abt/CHANGELOG.md b/firebase-abt/CHANGELOG.md
new file mode 100644
index 00000000000..d488ea79620
--- /dev/null
+++ b/firebase-abt/CHANGELOG.md
@@ -0,0 +1,47 @@
+# Unreleased
+
+
+# 22.0.0
+* [changed] Bump internal dependencies
+
+# 21.1.2
+* [changed] Bump internal dependencies.
+
+# 21.1.1
+* [changed] Internal changes to improve experiment reporting.
+
+# 21.1.0
+* [changed] Internal changes to ensure functionality alignment with other
+  SDK releases.
+
+# 21.0.2
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+# 21.0.1
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+
+# 21.0.0
+* [changed] Internal infrastructure improvements.
+* [changed] Internal changes to support dynamic feature modules.
+
+# 20.0.0
+* [removed] Removed the protocol buffer dependency and moved relevant protocol
+  buffer definitions to [inappmessaging_longer]. If you use [ab_testing]
+  with [inappmessaging], you'll need to update to
+  [inappmessaging] v19.1.2 or later.
+
+# 19.0.1
+* [changed] Internal changes to ensure functionality alignment with other SDK releases.
+
+# 17.1.1
+* [changed] Updated API to support the latest [remote_config] update.
+* [changed] Updated minSdkVersion to API level 16.
+
+# 17.1.0
+* [changed] Updated API to support the latest [remote_config] update.
+
diff --git a/firebase-abt/firebase-abt.gradle b/firebase-abt/firebase-abt.gradle
index 46241c3b494..88b2828ee0c 100644
--- a/firebase-abt/firebase-abt.gradle
+++ b/firebase-abt/firebase-abt.gradle
@@ -19,6 +19,7 @@ plugins {
 firebaseLibrary {
     testLab.enabled = false
     publishSources = true
+    publishJavadoc = false
 }
 
 android {
@@ -27,7 +28,8 @@ android {
         abortOnError false
     }
 
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.abt"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
@@ -46,17 +48,21 @@ android {
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
+    api 'com.google.firebase:firebase-common:21.0.0'
+    api 'com.google.firebase:firebase-components:18.0.0'
+
+    implementation 'com.google.android.gms:play-services-basement:18.1.0'
     implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
-    implementation 'com.google.android.gms:play-services-basement:18.0.0'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
+
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22")
+
+    testImplementation 'androidx.test:runner:1.2.0'
+    testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     testImplementation 'com.google.truth:truth:0.44'
+    testImplementation 'io.grpc:grpc-testing:1.12.0'
     testImplementation 'junit:junit:4.13-beta-2'
-    testImplementation 'androidx.test:runner:1.2.0'
+    testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'io.grpc:grpc-testing:1.12.0'
-    testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
diff --git a/firebase-abt/gradle.properties b/firebase-abt/gradle.properties
index ec7468f8665..97257e8c980 100644
--- a/firebase-abt/gradle.properties
+++ b/firebase-abt/gradle.properties
@@ -1,2 +1,2 @@
-version=21.0.1
-latestReleasedVersion=21.0.0
+version=22.0.1
+latestReleasedVersion=22.0.0
diff --git a/firebase-abt/src/main/AndroidManifest.xml b/firebase-abt/src/main/AndroidManifest.xml
index 803d6a25c68..e34314defe3 100644
--- a/firebase-abt/src/main/AndroidManifest.xml
+++ b/firebase-abt/src/main/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.abt">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="14"/>-->
+  <!--<uses-sdk android:minSdkVersion="21"/>-->
   <application>
     <service android:name="com.google.firebase.components.ComponentDiscoveryService">
       <meta-data
diff --git a/firebase-abt/src/main/java/com/google/firebase/abt/FirebaseABTesting.java b/firebase-abt/src/main/java/com/google/firebase/abt/FirebaseABTesting.java
index 15ce789b78d..d3f89e99bbf 100644
--- a/firebase-abt/src/main/java/com/google/firebase/abt/FirebaseABTesting.java
+++ b/firebase-abt/src/main/java/com/google/firebase/abt/FirebaseABTesting.java
@@ -30,10 +30,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Deque;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Manages Firebase A/B Testing Experiments.
@@ -144,11 +142,11 @@ public void removeAllExperiments() throws AbtException {
   }
 
   /**
-   * Gets the origin service's list of experiments in the app.
+   * Gets the origin service's list of experiments in the app via the Analytics SDK.
    *
    * <p>Note: This is a blocking call and therefore should be called from a worker thread.
    *
-   * @return the origin service's list of experiments in the app.
+   * @return the origin service's list of experiments in the app as {@link AbtExperimentInfo}s.
    * @throws AbtException If there is no Analytics SDK.
    */
   @WorkerThread
@@ -204,12 +202,10 @@ public void reportActiveExperiment(AbtExperimentInfo activeExperiment) throws Ab
   public void validateRunningExperiments(List<AbtExperimentInfo> runningExperiments)
       throws AbtException {
     throwAbtExceptionIfAnalyticsIsNull();
-    Set<String> runningExperimentIds = new HashSet<>();
-    for (AbtExperimentInfo runningExperiment : runningExperiments) {
-      runningExperimentIds.add(runningExperiment.getExperimentId());
-    }
+
+    // Get all experiments in Analytics and remove the ones that aren't running.
     List<ConditionalUserProperty> experimentsToRemove =
-        getExperimentsToRemove(getAllExperimentsInAnalytics(), runningExperimentIds);
+        getExperimentsToRemove(getAllExperiments(), runningExperiments);
     removeExperiments(experimentsToRemove);
   }
 
@@ -245,34 +241,29 @@ private void replaceAllExperimentsWith(List<AbtExperimentInfo> replacementExperi
       return;
     }
 
-    Set<String> replacementExperimentIds = new HashSet<>();
-    for (AbtExperimentInfo replacementExperiment : replacementExperiments) {
-      replacementExperimentIds.add(replacementExperiment.getExperimentId());
-    }
-
-    List<ConditionalUserProperty> experimentsInAnalytics = getAllExperimentsInAnalytics();
-    Set<String> idsOfExperimentsInAnalytics = new HashSet<>();
-    for (ConditionalUserProperty experimentInAnalytics : experimentsInAnalytics) {
-      idsOfExperimentsInAnalytics.add(experimentInAnalytics.name);
-    }
+    // Get all experiments in Analytics.
+    List<AbtExperimentInfo> experimentsInAnalytics = getAllExperiments();
 
+    // Remove experiments no longer assigned.
     List<ConditionalUserProperty> experimentsToRemove =
-        getExperimentsToRemove(experimentsInAnalytics, replacementExperimentIds);
+        getExperimentsToRemove(experimentsInAnalytics, replacementExperiments);
     removeExperiments(experimentsToRemove);
 
+    // Add newly assigned or updated (changed variant id).
     List<AbtExperimentInfo> experimentsToAdd =
-        getExperimentsToAdd(replacementExperiments, idsOfExperimentsInAnalytics);
+        getExperimentsToAdd(replacementExperiments, experimentsInAnalytics);
     addExperiments(experimentsToAdd);
   }
 
   /** Returns this origin's experiments in Analytics that are no longer assigned to this App. */
   private ArrayList<ConditionalUserProperty> getExperimentsToRemove(
-      List<ConditionalUserProperty> experimentsInAnalytics, Set<String> replacementExperimentIds) {
+      List<AbtExperimentInfo> experimentsInAnalytics,
+      List<AbtExperimentInfo> replacementExperiments) {
 
     ArrayList<ConditionalUserProperty> experimentsToRemove = new ArrayList<>();
-    for (ConditionalUserProperty experimentInAnalytics : experimentsInAnalytics) {
-      if (!replacementExperimentIds.contains(experimentInAnalytics.name)) {
-        experimentsToRemove.add(experimentInAnalytics);
+    for (AbtExperimentInfo experimentInAnalytics : experimentsInAnalytics) {
+      if (!experimentsListContainsExperiment(replacementExperiments, experimentInAnalytics)) {
+        experimentsToRemove.add(experimentInAnalytics.toConditionalUserProperty(originService));
       }
     }
     return experimentsToRemove;
@@ -283,17 +274,33 @@ private ArrayList<ConditionalUserProperty> getExperimentsToRemove(
    * to this origin's list of experiments in Analytics.
    */
   private ArrayList<AbtExperimentInfo> getExperimentsToAdd(
-      List<AbtExperimentInfo> replacementExperiments, Set<String> idsOfExperimentsInAnalytics) {
+      List<AbtExperimentInfo> replacementExperiments,
+      List<AbtExperimentInfo> experimentInfoFromAnalytics) {
 
     ArrayList<AbtExperimentInfo> experimentsToAdd = new ArrayList<>();
     for (AbtExperimentInfo replacementExperiment : replacementExperiments) {
-      if (!idsOfExperimentsInAnalytics.contains(replacementExperiment.getExperimentId())) {
+      if (!experimentsListContainsExperiment(experimentInfoFromAnalytics, replacementExperiment)) {
         experimentsToAdd.add(replacementExperiment);
       }
     }
     return experimentsToAdd;
   }
 
+  private boolean experimentsListContainsExperiment(
+      List<AbtExperimentInfo> experiments, AbtExperimentInfo experiment) {
+    String experimentId = experiment.getExperimentId();
+    String variantId = experiment.getVariantId();
+
+    for (AbtExperimentInfo experimentInfo : experiments) {
+      if (experimentInfo.getExperimentId().equals(experimentId)
+          && experimentInfo.getVariantId().equals(variantId)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   /** Adds the given experiments to the origin's list in Analytics. */
   private void addExperiments(List<AbtExperimentInfo> experimentsToAdd) {
 
@@ -369,7 +376,7 @@ private int getMaxUserPropertiesInAnalytics() {
    * Returns a list of all this origin's experiments in this App's Analytics SDK.
    *
    * <p>The list is sorted chronologically by the experiment start time, with the oldest experiment
-   * at index 0.
+   * at index 0. Experiments are stored as {@link ConditionalUserProperty}s in Analytics.
    */
   @WorkerThread
   private List<ConditionalUserProperty> getAllExperimentsInAnalytics() {
diff --git a/firebase-abt/src/main/java/com/google/firebase/abt/component/AbtRegistrar.java b/firebase-abt/src/main/java/com/google/firebase/abt/component/AbtRegistrar.java
index 862b42b5770..137adab8633 100644
--- a/firebase-abt/src/main/java/com/google/firebase/abt/component/AbtRegistrar.java
+++ b/firebase-abt/src/main/java/com/google/firebase/abt/component/AbtRegistrar.java
@@ -32,11 +32,13 @@
  */
 @Keep
 public class AbtRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-abt";
 
   @Override
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(AbtComponent.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(Context.class))
             .add(Dependency.optionalProvider(AnalyticsConnector.class))
             .factory(
@@ -45,6 +47,6 @@ public List<Component<?>> getComponents() {
                         container.get(Context.class),
                         container.getProvider(AnalyticsConnector.class)))
             .build(),
-        LibraryVersionComponent.create("fire-abt", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-abt/src/test/java/com/google/firebase/abt/FirebaseABTestingTest.java b/firebase-abt/src/test/java/com/google/firebase/abt/FirebaseABTestingTest.java
index a98c05f317f..c8e2c6d8fdd 100644
--- a/firebase-abt/src/test/java/com/google/firebase/abt/FirebaseABTestingTest.java
+++ b/firebase-abt/src/test/java/com/google/firebase/abt/FirebaseABTestingTest.java
@@ -54,14 +54,27 @@ public class FirebaseABTestingTest {
   private static final String TEST_EXPERIMENT_1_ID = "1";
   private static final String TEST_EXPERIMENT_2_ID = "2";
 
+  private static final String TEST_VARIANT_ID_A = "VARIANT_A";
+  private static final String TEST_VARIANT_ID_B = "VARIANT_B";
+
   private static final AbtExperimentInfo TEST_ABT_EXPERIMENT_1 =
       createExperimentInfo(
           TEST_EXPERIMENT_1_ID,
+          TEST_VARIANT_ID_A,
           /*triggerEventName=*/ "",
           /*experimentStartTimeInEpochMillis=*/ 1000L);
-  private static final AbtExperimentInfo TEST_ABT_EXPERIMENT_2 =
+  private static final AbtExperimentInfo TEST_ABT_EXPERIMENT_2_VARIANT_A =
+      createExperimentInfo(
+          TEST_EXPERIMENT_2_ID,
+          TEST_VARIANT_ID_A,
+          "trigger_event_2",
+          /*experimentStartTimeInEpochMillis=*/ 2000L);
+  private static final AbtExperimentInfo TEST_ABT_EXPERIMENT_2_VARIANT_B =
       createExperimentInfo(
-          TEST_EXPERIMENT_2_ID, "trigger_event_2", /*experimentStartTimeInEpochMillis=*/ 2000L);
+          TEST_EXPERIMENT_2_ID,
+          TEST_VARIANT_ID_B,
+          "trigger_event_2",
+          /*experimentStartTimeInEpochMillis=*/ 2000L);
 
   private static final int MAX_ALLOWED_EXPERIMENTS_IN_ANALYTICS = 100;
 
@@ -91,7 +104,7 @@ public void replaceAllExperiments_noExperimentsInAnalytics_experimentsCorrectlyS
 
     firebaseAbt.replaceAllExperiments(
         Lists.newArrayList(
-            TEST_ABT_EXPERIMENT_1.toStringMap(), TEST_ABT_EXPERIMENT_2.toStringMap()));
+            TEST_ABT_EXPERIMENT_1.toStringMap(), TEST_ABT_EXPERIMENT_2_VARIANT_A.toStringMap()));
 
     ArgumentCaptor<ConditionalUserProperty> analyticsExperimentArgumentCaptor =
         ArgumentCaptor.forClass(ConditionalUserProperty.class);
@@ -107,7 +120,8 @@ public void replaceAllExperiments_noExperimentsInAnalytics_experimentsCorrectlyS
 
     // Validates that TEST_ABT_EXPERIMENT_1 and TEST_ABT_EXPERIMENT_2 have been set in Analytics.
     assertThat(analyticsExperiment1.toStringMap()).isEqualTo(TEST_ABT_EXPERIMENT_1.toStringMap());
-    assertThat(analyticsExperiment2.toStringMap()).isEqualTo(TEST_ABT_EXPERIMENT_2.toStringMap());
+    assertThat(analyticsExperiment2.toStringMap())
+        .isEqualTo(TEST_ABT_EXPERIMENT_2_VARIANT_A.toStringMap());
   }
 
   @Test
@@ -117,10 +131,11 @@ public void replaceAllExperiments_existExperimentsInAnalytics_experimentsCorrect
         .thenReturn(
             Lists.newArrayList(
                 TEST_ABT_EXPERIMENT_1.toConditionalUserProperty(ORIGIN_SERVICE),
-                TEST_ABT_EXPERIMENT_2.toConditionalUserProperty(ORIGIN_SERVICE)));
+                TEST_ABT_EXPERIMENT_2_VARIANT_A.toConditionalUserProperty(ORIGIN_SERVICE)));
 
-    AbtExperimentInfo newExperiment3 = createExperimentInfo("3", "", 1000L);
-    AbtExperimentInfo newExperiment4 = createExperimentInfo("4", "trigger_event_4", 1000L);
+    AbtExperimentInfo newExperiment3 = createExperimentInfo("3", TEST_VARIANT_ID_A, "", 1000L);
+    AbtExperimentInfo newExperiment4 =
+        createExperimentInfo("4", TEST_VARIANT_ID_A, "trigger_event_4", 1000L);
 
     // Simulates the case where experiment 1 is assigned (as before), experiment 2 is no longer
     // assigned; experiment 3 and experiment 4 are newly assigned.
@@ -146,6 +161,47 @@ public void replaceAllExperiments_existExperimentsInAnalytics_experimentsCorrect
         .isEqualTo(newExperiment4.toStringMap());
   }
 
+  @Test
+  public void
+      replaceAllExperiments_existExperimentsInAnalyticsWithDifferentVariants_experimentsCorrectlySetInAnalytics()
+          throws Exception {
+    when(mockAnalyticsConnector.getConditionalUserProperties(ORIGIN_SERVICE, ""))
+        .thenReturn(
+            Lists.newArrayList(
+                TEST_ABT_EXPERIMENT_1.toConditionalUserProperty(ORIGIN_SERVICE),
+                TEST_ABT_EXPERIMENT_2_VARIANT_A.toConditionalUserProperty(ORIGIN_SERVICE)));
+
+    AbtExperimentInfo newExperiment3 = createExperimentInfo("3", "b", "", 1000L);
+    AbtExperimentInfo newExperiment4 = createExperimentInfo("4", "a", "trigger_event_4", 1000L);
+
+    // Simulates the case where experiments 1 and 2 are removed,
+    // experiment 2 is re-set with a new variant, and experiments 3 and 4 are newly added.
+    firebaseAbt.replaceAllExperiments(
+        Lists.newArrayList(
+            TEST_ABT_EXPERIMENT_2_VARIANT_B.toStringMap(),
+            newExperiment3.toStringMap(),
+            newExperiment4.toStringMap()));
+
+    // Validates that experiment 1 is cleared, experiment 2 is updated,
+    // and experiment 3 and experiment 4 are set in Analytics.
+    ArgumentCaptor<ConditionalUserProperty> analyticsExperimentArgumentCaptor =
+        ArgumentCaptor.forClass(ConditionalUserProperty.class);
+    verify(mockAnalyticsConnector, times(1))
+        .clearConditionalUserProperty(TEST_EXPERIMENT_1_ID, null, null);
+    verify(mockAnalyticsConnector, times(1))
+        .clearConditionalUserProperty(TEST_EXPERIMENT_2_ID, null, null);
+    verify(mockAnalyticsConnector, times(3))
+        .setConditionalUserProperty(analyticsExperimentArgumentCaptor.capture());
+
+    List<ConditionalUserProperty> actualValues = analyticsExperimentArgumentCaptor.getAllValues();
+    assertThat(AbtExperimentInfo.fromConditionalUserProperty(actualValues.get(0)).toStringMap())
+        .isEqualTo(TEST_ABT_EXPERIMENT_2_VARIANT_B.toStringMap());
+    assertThat(AbtExperimentInfo.fromConditionalUserProperty(actualValues.get(1)).toStringMap())
+        .isEqualTo(newExperiment3.toStringMap());
+    assertThat(AbtExperimentInfo.fromConditionalUserProperty(actualValues.get(2)).toStringMap())
+        .isEqualTo(newExperiment4.toStringMap());
+  }
+
   @Test
   public void replaceAllExperiments_totalExperimentsExceedsAnalyticsLimit_oldExperimentsDiscarded()
       throws Exception {
@@ -155,17 +211,18 @@ public void replaceAllExperiments_totalExperimentsExceedsAnalyticsLimit_oldExper
         .thenReturn(
             Lists.newArrayList(
                 TEST_ABT_EXPERIMENT_1.toConditionalUserProperty(ORIGIN_SERVICE),
-                TEST_ABT_EXPERIMENT_2.toConditionalUserProperty(ORIGIN_SERVICE)));
+                TEST_ABT_EXPERIMENT_2_VARIANT_A.toConditionalUserProperty(ORIGIN_SERVICE)));
 
-    AbtExperimentInfo newExperiment3 = createExperimentInfo("3", "", 1000L);
-    AbtExperimentInfo newExperiment4 = createExperimentInfo("4", "trigger_event_4", 1000L);
+    AbtExperimentInfo newExperiment3 = createExperimentInfo("3", TEST_VARIANT_ID_A, "", 1000L);
+    AbtExperimentInfo newExperiment4 =
+        createExperimentInfo("4", TEST_VARIANT_ID_A, "trigger_event_4", 1000L);
 
     // Simulates the case where experiment 1 and 2 are assigned (as before), experiment 3 and
     // experiment 4 are newly assigned.
     firebaseAbt.replaceAllExperiments(
         Lists.newArrayList(
             TEST_ABT_EXPERIMENT_1.toStringMap(),
-            TEST_ABT_EXPERIMENT_2.toStringMap(),
+            TEST_ABT_EXPERIMENT_2_VARIANT_A.toStringMap(),
             newExperiment3.toStringMap(),
             newExperiment4.toStringMap()));
 
@@ -231,7 +288,7 @@ public void removeAllExperiments_existExperimentsInAnalytics_experimentsClearedF
         .thenReturn(
             Lists.newArrayList(
                 TEST_ABT_EXPERIMENT_1.toConditionalUserProperty(ORIGIN_SERVICE),
-                TEST_ABT_EXPERIMENT_2.toConditionalUserProperty(ORIGIN_SERVICE)));
+                TEST_ABT_EXPERIMENT_2_VARIANT_A.toConditionalUserProperty(ORIGIN_SERVICE)));
 
     firebaseAbt.removeAllExperiments();
 
@@ -266,7 +323,7 @@ public void getAllExperiments_existExperimentsInAnalytics_returnAllExperiments()
         .thenReturn(
             Lists.newArrayList(
                 TEST_ABT_EXPERIMENT_1.toConditionalUserProperty(ORIGIN_SERVICE),
-                TEST_ABT_EXPERIMENT_2.toConditionalUserProperty(ORIGIN_SERVICE)));
+                TEST_ABT_EXPERIMENT_2_VARIANT_A.toConditionalUserProperty(ORIGIN_SERVICE)));
 
     List<AbtExperimentInfo> abtExperimentInfoList = firebaseAbt.getAllExperiments();
 
@@ -274,7 +331,7 @@ public void getAllExperiments_existExperimentsInAnalytics_returnAllExperiments()
     assertThat(abtExperimentInfoList.get(0).toStringMap())
         .isEqualTo(TEST_ABT_EXPERIMENT_1.toStringMap());
     assertThat(abtExperimentInfoList.get(1).toStringMap())
-        .isEqualTo(TEST_ABT_EXPERIMENT_2.toStringMap());
+        .isEqualTo(TEST_ABT_EXPERIMENT_2_VARIANT_A.toStringMap());
   }
 
   @Test
@@ -298,7 +355,7 @@ public void getAllExperiments_analyticsSdkUnavailable_throwsAbtException() {
         .thenReturn(
             Lists.newArrayList(
                 TEST_ABT_EXPERIMENT_1.toConditionalUserProperty(ORIGIN_SERVICE),
-                TEST_ABT_EXPERIMENT_2.toConditionalUserProperty(ORIGIN_SERVICE)));
+                TEST_ABT_EXPERIMENT_2_VARIANT_A.toConditionalUserProperty(ORIGIN_SERVICE)));
 
     // Update to just one experiment running
     firebaseAbt.validateRunningExperiments(Lists.newArrayList(TEST_ABT_EXPERIMENT_1));
@@ -315,11 +372,11 @@ public void validateRunningExperiments_noinactiveExperimentsInAnalytics_cleansUp
         .thenReturn(
             Lists.newArrayList(
                 TEST_ABT_EXPERIMENT_1.toConditionalUserProperty(ORIGIN_SERVICE),
-                TEST_ABT_EXPERIMENT_2.toConditionalUserProperty(ORIGIN_SERVICE)));
+                TEST_ABT_EXPERIMENT_2_VARIANT_A.toConditionalUserProperty(ORIGIN_SERVICE)));
 
     // Update still says the same two experiments are running
     firebaseAbt.validateRunningExperiments(
-        Lists.newArrayList(TEST_ABT_EXPERIMENT_1, TEST_ABT_EXPERIMENT_2));
+        Lists.newArrayList(TEST_ABT_EXPERIMENT_1, TEST_ABT_EXPERIMENT_2_VARIANT_A));
 
     // Verify nothing cleared
     verify(mockAnalyticsConnector, never()).clearConditionalUserProperty(any(), any(), any());
@@ -346,11 +403,14 @@ public void reportActiveExperiment_setsNullTriggerCondition() throws Exception {
   }
 
   private static AbtExperimentInfo createExperimentInfo(
-      String experimentId, String triggerEventName, long experimentStartTimeInEpochMillis) {
+      String experimentId,
+      String variantId,
+      String triggerEventName,
+      long experimentStartTimeInEpochMillis) {
 
     return new AbtExperimentInfo(
         experimentId,
-        VARIANT_ID_VALUE,
+        variantId,
         triggerEventName,
         new Date(experimentStartTimeInEpochMillis),
         TRIGGER_TIMEOUT_IN_MILLIS_VALUE,
diff --git a/firebase-annotations/CHANGELOG.md b/firebase-annotations/CHANGELOG.md
new file mode 100644
index 00000000000..5b97d49e713
--- /dev/null
+++ b/firebase-annotations/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Unreleased
+* [changed] Hid Executors from public API, as they are intended to be internal
+  anyhow.
diff --git a/firebase-annotations/api.txt b/firebase-annotations/api.txt
new file mode 100644
index 00000000000..8a3d66957cd
--- /dev/null
+++ b/firebase-annotations/api.txt
@@ -0,0 +1,15 @@
+// Signature format: 2.0
+package com.google.firebase.annotations {
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface PreviewApi {
+  }
+
+}
+
+package com.google.firebase.annotations.concurrent {
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @javax.inject.Qualifier public @interface Background {
+  }
+
+}
+
diff --git a/firebase-annotations/firebase-annotations.gradle b/firebase-annotations/firebase-annotations.gradle.kts
similarity index 66%
rename from firebase-annotations/firebase-annotations.gradle
rename to firebase-annotations/firebase-annotations.gradle.kts
index e77114c5afb..37e1ac99520 100644
--- a/firebase-annotations/firebase-annotations.gradle
+++ b/firebase-annotations/firebase-annotations.gradle.kts
@@ -13,19 +13,23 @@
 // limitations under the License.
 
 plugins {
-    id 'firebase-java-library'
+  id("firebase-java-library")
 }
 
 firebaseLibrary {
-    publishSources = true
-    publishJavadoc = false
+  publishSources = true
+  publishJavadoc = false
+  publishReleaseNotes = false
 }
 
 java {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+}
+tasks.withType<JavaCompile> {
+  options.compilerArgs.add("-Werror")
 }
 
-tasks.withType(JavaCompile) {
-    options.compilerArgs << "-Werror"
+dependencies {
+  implementation(libs.javax.inject)
 }
diff --git a/firebase-annotations/gradle.properties b/firebase-annotations/gradle.properties
index 5940a48cf2e..15b213d9867 100644
--- a/firebase-annotations/gradle.properties
+++ b/firebase-annotations/gradle.properties
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=16.0.1
-latestReleasedVersion=16.0.0
\ No newline at end of file
+version=17.0.0
+latestReleasedVersion=16.2.0
diff --git a/firebase-annotations/src/main/java/com/google/firebase/annotations/PreviewApi.java b/firebase-annotations/src/main/java/com/google/firebase/annotations/PreviewApi.java
new file mode 100644
index 00000000000..19dfe858cc5
--- /dev/null
+++ b/firebase-annotations/src/main/java/com/google/firebase/annotations/PreviewApi.java
@@ -0,0 +1,28 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that this object (class, method, etc) is experimental and that both its signature and
+ * implementation are subject to change. An API marked with this annotation provides no guarantee of
+ * API stability or backward-compatibility.
+ */
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR})
+@Documented
+public @interface PreviewApi {}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/SessionSettingsData.java b/firebase-annotations/src/main/java/com/google/firebase/annotations/concurrent/Background.java
similarity index 51%
rename from firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/SessionSettingsData.java
rename to firebase-annotations/src/main/java/com/google/firebase/annotations/concurrent/Background.java
index 39a58dae65c..5626ea94a78 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/SessionSettingsData.java
+++ b/firebase-annotations/src/main/java/com/google/firebase/annotations/concurrent/Background.java
@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,18 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.crashlytics.internal.settings.model;
+package com.google.firebase.annotations.concurrent;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import javax.inject.Qualifier;
 
 /**
- * Immutable value object used to represent the "session" portion of the App settings data in
- * memory.
+ * An executor/coroutine dispatcher for long running tasks including disk IO, heavy CPU
+ * computations.
+ *
+ * <p>For operations that can block for long periods of time, like network requests, use the {@link
+ * Blocking} executor.
  */
-public class SessionSettingsData {
-  public final int maxCustomExceptionEvents;
-  public final int maxCompleteSessionsCount;
-
-  public SessionSettingsData(int maxCustomExceptionEvents, int maxCompleteSessionsCount) {
-    this.maxCustomExceptionEvents = maxCustomExceptionEvents;
-    this.maxCompleteSessionsCount = maxCompleteSessionsCount;
-  }
-}
+@Qualifier
+@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
+public @interface Background {}
diff --git a/alternative-settings.gradle b/firebase-annotations/src/main/java/com/google/firebase/annotations/concurrent/Blocking.java
similarity index 56%
rename from alternative-settings.gradle
rename to firebase-annotations/src/main/java/com/google/firebase/annotations/concurrent/Blocking.java
index 3d12659e72c..5461c5a3e11 100644
--- a/alternative-settings.gradle
+++ b/firebase-annotations/src/main/java/com/google/firebase/annotations/concurrent/Blocking.java
@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,16 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-rootProject.name = 'com.google.firebase'
-//Note: do not add subprojects to this file. Instead add them to subprojects.gradle
+package com.google.firebase.annotations.concurrent;
 
-apply from: 'gradle/projectSettings.gradle'
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import javax.inject.Qualifier;
 
-discoverSubprojects(file('subprojects.cfg')).each {
-  include ":$it"
-}
-
-renameBuildScripts(rootProject)
-rootProject.buildFileName = 'alternative-root-project.gradle'
-
-apply from: new File(settingsDir, 'gradle/buildCache.gradle')
+/**
+ * An executor/coroutine dispatcher for tasks that can block for long periods of time, e.g network
+ * IO.
+ *
+ * @hide
+ */
+@Qualifier
+@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
+public @interface Blocking {}
diff --git a/firebase-annotations/src/main/java/com/google/firebase/annotations/concurrent/Lightweight.java b/firebase-annotations/src/main/java/com/google/firebase/annotations/concurrent/Lightweight.java
new file mode 100644
index 00000000000..1dfa9f342f3
--- /dev/null
+++ b/firebase-annotations/src/main/java/com/google/firebase/annotations/concurrent/Lightweight.java
@@ -0,0 +1,28 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.annotations.concurrent;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
+/**
+ * An executor/coroutine dispatcher for lightweight tasks that never block (on IO or other tasks).
+ *
+ * @hide
+ */
+@Qualifier
+@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
+public @interface Lightweight {}
diff --git a/firebase-annotations/src/main/java/com/google/firebase/annotations/concurrent/UiThread.java b/firebase-annotations/src/main/java/com/google/firebase/annotations/concurrent/UiThread.java
new file mode 100644
index 00000000000..f0a9c644ea8
--- /dev/null
+++ b/firebase-annotations/src/main/java/com/google/firebase/annotations/concurrent/UiThread.java
@@ -0,0 +1,28 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.annotations.concurrent;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
+/**
+ * An executor/coroutine dispatcher for work that must run on the UI thread.
+ *
+ * @hide
+ */
+@Qualifier
+@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
+public @interface UiThread {}
diff --git a/firebase-appdistribution-api/CHANGELOG.md b/firebase-appdistribution-api/CHANGELOG.md
new file mode 100644
index 00000000000..29549bb802f
--- /dev/null
+++ b/firebase-appdistribution-api/CHANGELOG.md
@@ -0,0 +1,140 @@
+# Unreleased
+
+
+# 17.0.0
+* [changed] Bump internal dependencies
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appdistribution-api` library. The Kotlin extensions library has no additional
+updates.
+
+# 16.0.0-beta12
+* [unchanged] Updated to accommodate the release of the updated
+  [appdistro] library.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appdistribution-api` library. The Kotlin extensions library has no additional
+updates.
+
+# 16.0.0-beta11
+* [changed] Added Kotlin extensions (KTX) APIs from
+  `com.google.firebase:firebase-appdistribution-api-ktx`
+  to `com.google.firebase:firebase-appdistribution-api` under the
+  `com.google.firebase.appdistribution` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-appdistribution-api-ktx` have been
+  added to
+  `com.google.firebase:firebase-appdistribution-api` under the
+  `com.google.firebase.appdistribution` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-appdistribution-api-ktx`
+  are now deprecated. As early as April 2024, we'll no longer release KTX modules. For details,
+  see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appdistribution-api` library. The Kotlin extensions library has no additional
+updates.
+
+# 16.0.0-beta09
+* [feature] Improved development mode to allow all API calls to be made without having to sign in.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appdistribution-api` library. The Kotlin extensions library has no
+additional updates.
+
+# 16.0.0-beta08
+* [fixed] Fixed an issue where a crash happened whenever a feedback
+  notification was shown on devices running Android 4.4 and lower.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appdistribution-api` library. The Kotlin extensions library has no
+additional updates.
+
+# 16.0.0-beta07
+* [feature] Added support for testers to attach JPEG screenshots to their
+  feedback.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appdistribution-api` library. The Kotlin extensions library has no
+additional updates.
+
+# 16.0.0-beta06
+* [feature] Added support for in-app tester feedback. To learn more, see
+  [Collect feedback from testers](/docs/app-distribution/collect-feedback-from-testers?platform=android).
+* [fixed] Fixed a bug where only the last listener added to an `UpdateTask`
+  using `addOnProgressListener()` would receive updates.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appdistribution-api` library. The Kotlin extensions library has no additional
+updates.
+
+# 16.0.0-beta05
+* [unchanged] Updated to accommodate the release of the updated
+  [appdistro] Kotlin extensions library.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+  `firebase-appdistribution-api` library. The Kotlin extensions library has
+  the following additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-appdistribution-api-ktx` as a transitive dependency, which
+  exposes the `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks)
+  into a Kotlin coroutine.
+
+# 16.0.0-beta04
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appdistribution-api` library. The Kotlin extensions library has no
+additional updates.
+
+# 16.0.0-beta03
+* [feature] The [appdistro] SDK has been split into two libraries:
+
+  * `firebase-appdistribution-api` - The API-only library<br>
+    This new API-only library is functional only when the full
+    [appdistro] SDK implementation (`firebase-appdistribution`) is present.
+    `firebase-appdistribution-api` can be included in all
+    [build variants](https://developer.android.com/studio/build/build-variants){: .external}.
+
+  * `firebase-appdistribution` - The full SDK implementation<br>
+    This full SDK implementation is optional and should only be included in
+    pre-release builds.
+
+  Visit the documentation to learn how to
+  [add these SDKs](/docs/app-distribution/set-up-alerts?platform=android#add-appdistro)
+  to your Android app.
+
+
+## Kotlin
+With the removal of the Kotlin extensions library
+`firebase-appdistribution-ktx`, its functionality has been moved to the new
+API-only library: `firebase-appdistribution-api-ktx`.
+
+This new Kotlin extensions library transitively includes the
+`firebase-appdistribution-api` library. The Kotlin extensions library has no
+additional updates.
+
diff --git a/firebase-appdistribution-api/api.txt b/firebase-appdistribution-api/api.txt
new file mode 100644
index 00000000000..7fd9a1c89aa
--- /dev/null
+++ b/firebase-appdistribution-api/api.txt
@@ -0,0 +1,116 @@
+// Signature format: 2.0
+package com.google.firebase.appdistribution {
+
+  public interface AppDistributionRelease {
+    method @NonNull public com.google.firebase.appdistribution.BinaryType getBinaryType();
+    method @NonNull public String getDisplayVersion();
+    method @Nullable public String getReleaseNotes();
+    method @NonNull public long getVersionCode();
+  }
+
+  public enum BinaryType {
+    enum_constant public static final com.google.firebase.appdistribution.BinaryType AAB;
+    enum_constant public static final com.google.firebase.appdistribution.BinaryType APK;
+  }
+
+  public interface FirebaseAppDistribution {
+    method public void cancelFeedbackNotification();
+    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.appdistribution.AppDistributionRelease> checkForNewRelease();
+    method @NonNull public static com.google.firebase.appdistribution.FirebaseAppDistribution getInstance();
+    method public boolean isTesterSignedIn();
+    method public void showFeedbackNotification(@StringRes int, @NonNull com.google.firebase.appdistribution.InterruptionLevel);
+    method public void showFeedbackNotification(@NonNull CharSequence, @NonNull com.google.firebase.appdistribution.InterruptionLevel);
+    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> signInTester();
+    method public void signOutTester();
+    method public void startFeedback(@StringRes int);
+    method public void startFeedback(@NonNull CharSequence);
+    method public void startFeedback(@StringRes int, @Nullable android.net.Uri);
+    method public void startFeedback(@NonNull CharSequence, @Nullable android.net.Uri);
+    method @NonNull public com.google.firebase.appdistribution.UpdateTask updateApp();
+    method @NonNull public com.google.firebase.appdistribution.UpdateTask updateIfNewReleaseAvailable();
+  }
+
+  public class FirebaseAppDistributionException extends com.google.firebase.FirebaseException {
+    method @NonNull public com.google.firebase.appdistribution.FirebaseAppDistributionException.Status getErrorCode();
+    method @Nullable public com.google.firebase.appdistribution.AppDistributionRelease getRelease();
+  }
+
+  public enum FirebaseAppDistributionException.Status {
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status API_DISABLED;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status AUTHENTICATION_CANCELED;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status AUTHENTICATION_FAILURE;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status DOWNLOAD_FAILURE;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status HOST_ACTIVITY_INTERRUPTED;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status INSTALLATION_CANCELED;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status INSTALLATION_FAILURE;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status NETWORK_FAILURE;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status NOT_IMPLEMENTED;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status UNKNOWN;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status UPDATE_NOT_AVAILABLE;
+  }
+
+  public final class FirebaseAppDistributionKt {
+    method @NonNull public static operator com.google.firebase.appdistribution.BinaryType component1(@NonNull com.google.firebase.appdistribution.AppDistributionRelease);
+    method public static operator long component1(@NonNull com.google.firebase.appdistribution.UpdateProgress);
+    method @NonNull public static operator String component2(@NonNull com.google.firebase.appdistribution.AppDistributionRelease);
+    method public static operator long component2(@NonNull com.google.firebase.appdistribution.UpdateProgress);
+    method public static operator long component3(@NonNull com.google.firebase.appdistribution.AppDistributionRelease);
+    method @NonNull public static operator com.google.firebase.appdistribution.UpdateStatus component3(@NonNull com.google.firebase.appdistribution.UpdateProgress);
+    method @Nullable public static operator String component4(@NonNull com.google.firebase.appdistribution.AppDistributionRelease);
+    method @NonNull public static com.google.firebase.appdistribution.FirebaseAppDistribution getAppDistribution(@NonNull com.google.firebase.Firebase);
+  }
+
+  public enum InterruptionLevel {
+    enum_constant public static final com.google.firebase.appdistribution.InterruptionLevel DEFAULT;
+    enum_constant public static final com.google.firebase.appdistribution.InterruptionLevel HIGH;
+    enum_constant public static final com.google.firebase.appdistribution.InterruptionLevel LOW;
+    enum_constant public static final com.google.firebase.appdistribution.InterruptionLevel MAX;
+    enum_constant public static final com.google.firebase.appdistribution.InterruptionLevel MIN;
+  }
+
+  public interface OnProgressListener {
+    method public void onProgressUpdate(@NonNull com.google.firebase.appdistribution.UpdateProgress);
+  }
+
+  public interface UpdateProgress {
+    method public long getApkBytesDownloaded();
+    method public long getApkFileTotalBytes();
+    method @NonNull public com.google.firebase.appdistribution.UpdateStatus getUpdateStatus();
+  }
+
+  public enum UpdateStatus {
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus DOWNLOADED;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus DOWNLOADING;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus DOWNLOAD_FAILED;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus INSTALL_CANCELED;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus INSTALL_FAILED;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus NEW_RELEASE_CHECK_FAILED;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus NEW_RELEASE_NOT_AVAILABLE;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus PENDING;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus REDIRECTED_TO_PLAY;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus UPDATE_CANCELED;
+  }
+
+  public abstract class UpdateTask extends com.google.android.gms.tasks.Task<java.lang.Void> {
+    ctor public UpdateTask();
+    method @NonNull public abstract com.google.firebase.appdistribution.UpdateTask addOnProgressListener(@NonNull com.google.firebase.appdistribution.OnProgressListener);
+    method @NonNull public abstract com.google.firebase.appdistribution.UpdateTask addOnProgressListener(@Nullable java.util.concurrent.Executor, @NonNull com.google.firebase.appdistribution.OnProgressListener);
+  }
+
+}
+
+package com.google.firebase.appdistribution.ktx {
+
+  public final class FirebaseAppDistributionKt {
+    method @Deprecated @NonNull public static operator com.google.firebase.appdistribution.BinaryType component1(@NonNull com.google.firebase.appdistribution.AppDistributionRelease);
+    method @Deprecated public static operator long component1(@NonNull com.google.firebase.appdistribution.UpdateProgress);
+    method @Deprecated @NonNull public static operator String component2(@NonNull com.google.firebase.appdistribution.AppDistributionRelease);
+    method @Deprecated public static operator long component2(@NonNull com.google.firebase.appdistribution.UpdateProgress);
+    method @Deprecated public static operator long component3(@NonNull com.google.firebase.appdistribution.AppDistributionRelease);
+    method @Deprecated @NonNull public static operator com.google.firebase.appdistribution.UpdateStatus component3(@NonNull com.google.firebase.appdistribution.UpdateProgress);
+    method @Deprecated @Nullable public static operator String component4(@NonNull com.google.firebase.appdistribution.AppDistributionRelease);
+    method @Deprecated @NonNull public static com.google.firebase.appdistribution.FirebaseAppDistribution getAppDistribution(@NonNull com.google.firebase.ktx.Firebase);
+  }
+
+}
+
diff --git a/firebase-appdistribution-api/firebase-appdistribution-api.gradle b/firebase-appdistribution-api/firebase-appdistribution-api.gradle
new file mode 100644
index 00000000000..8efe6fbbdef
--- /dev/null
+++ b/firebase-appdistribution-api/firebase-appdistribution-api.gradle
@@ -0,0 +1,76 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+    id 'firebase-library'
+    id("kotlin-android")
+}
+
+firebaseLibrary {
+    libraryGroup "appdistribution"
+}
+
+android {
+    namespace "com.google.firebase.appdistribution"
+    compileSdkVersion project.compileSdkVersion
+    
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion project.targetSdkVersion
+        multiDexEnabled true
+        versionName version
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+}
+
+dependencies {
+    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
+
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+
+    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
+
+    annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
+
+    testImplementation project(':firebase-appdistribution-api')
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation 'org.mockito:mockito-inline:3.4.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation "org.mockito:mockito-android:3.4.0"
+}
diff --git a/firebase-appdistribution-api/gradle.properties b/firebase-appdistribution-api/gradle.properties
new file mode 100644
index 00000000000..49c27a619a3
--- /dev/null
+++ b/firebase-appdistribution-api/gradle.properties
@@ -0,0 +1,16 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+version=17.0.1
+latestReleasedVersion=17.0.0
diff --git a/firebase-appdistribution-api/ktx/api.txt b/firebase-appdistribution-api/ktx/api.txt
new file mode 100644
index 00000000000..f7139bec523
--- /dev/null
+++ b/firebase-appdistribution-api/ktx/api.txt
@@ -0,0 +1,8 @@
+// Signature format: 2.0
+package com.google.firebase.appdistribution.ktx {
+
+  public final class LoggingKt {
+  }
+
+}
+
diff --git a/firebase-appdistribution-api/ktx/gradle.properties b/firebase-appdistribution-api/ktx/gradle.properties
new file mode 100644
index 00000000000..9eff84e6c72
--- /dev/null
+++ b/firebase-appdistribution-api/ktx/gradle.properties
@@ -0,0 +1 @@
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-appdistribution/ktx/ktx.gradle b/firebase-appdistribution-api/ktx/ktx.gradle
similarity index 68%
rename from firebase-appdistribution/ktx/ktx.gradle
rename to firebase-appdistribution-api/ktx/ktx.gradle
index 3fd3ac89e52..1bc3bec40ed 100644
--- a/firebase-appdistribution/ktx/ktx.gradle
+++ b/firebase-appdistribution-api/ktx/ktx.gradle
@@ -14,20 +14,22 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-appdistribution')
+    libraryGroup "appdistribution"
     testLab.enabled = true
-    publishJavadoc = true
+    publishJavadoc = false
+    publishReleaseNotes = false
     publishSources = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.appdistribution.ktx"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
@@ -40,25 +42,30 @@ android {
         }
         androidTest.java.srcDirs += 'src/androidTest/kotlin'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api(project(":firebase-appdistribution-api"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
 
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-common:ktx')
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation project(path: ':firebase-appdistribution')
+    implementation("com.google.firebase:firebase-components:18.0.0")
 
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
     androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:core:1.2.0'
+    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'junit:junit:4.12'
 }
diff --git a/firebase-appdistribution-api/ktx/src/androidTest/AndroidManifest.xml b/firebase-appdistribution-api/ktx/src/androidTest/AndroidManifest.xml
new file mode 100644
index 00000000000..b8b4e405e38
--- /dev/null
+++ b/firebase-appdistribution-api/ktx/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
+  <!--<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />-->
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <application>
+    <uses-library android:name="android.test.runner" />
+  </application>
+
+  <instrumentation
+    android:name="androidx.test.runner.AndroidJUnitRunner"
+    android:targetPackage="com.google.firebase.appdistribution.ktx" />
+</manifest>
diff --git a/firebase-appdistribution-api/ktx/src/androidTest/kotlin/com/google/firebase/app/distribution/ktx/FirebaseAppDistributionTests.kt b/firebase-appdistribution-api/ktx/src/androidTest/kotlin/com/google/firebase/app/distribution/ktx/FirebaseAppDistributionTests.kt
new file mode 100644
index 00000000000..a818396f7c6
--- /dev/null
+++ b/firebase-appdistribution-api/ktx/src/androidTest/kotlin/com/google/firebase/app/distribution/ktx/FirebaseAppDistributionTests.kt
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.appdistribution.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.appdistribution.AppDistributionRelease
+import com.google.firebase.appdistribution.BinaryType
+import com.google.firebase.appdistribution.FirebaseAppDistribution
+import com.google.firebase.appdistribution.UpdateProgress
+import com.google.firebase.appdistribution.UpdateStatus
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+class FirebaseAppDistributionTests : BaseTestCase() {
+  @Test
+  fun appDistribution_default_callsDefaultGetInstance() {
+    assertThat(Firebase.appDistribution).isSameInstanceAs(FirebaseAppDistribution.getInstance())
+  }
+
+  @Test
+  fun appDistributionReleaseDestructuringDeclarationsWork() {
+    val mockAppDistributionRelease =
+      object : AppDistributionRelease {
+        override fun getDisplayVersion(): String = "1.0.0"
+
+        override fun getVersionCode(): Long = 1L
+
+        override fun getReleaseNotes(): String = "Changelog..."
+
+        override fun getBinaryType(): BinaryType = BinaryType.AAB
+      }
+
+    val (type, displayVersion, versionCode, notes) = mockAppDistributionRelease
+
+    assertThat(type).isEqualTo(mockAppDistributionRelease.binaryType)
+    assertThat(displayVersion).isEqualTo(mockAppDistributionRelease.displayVersion)
+    assertThat(versionCode).isEqualTo(mockAppDistributionRelease.versionCode)
+    assertThat(notes).isEqualTo(mockAppDistributionRelease.releaseNotes)
+  }
+
+  @Test
+  fun updateProgressDestructuringDeclarationsWork() {
+    val mockUpdateProgress =
+      object : UpdateProgress {
+        override fun getApkBytesDownloaded(): Long = 1200L
+
+        override fun getApkFileTotalBytes(): Long = 9000L
+
+        override fun getUpdateStatus(): UpdateStatus = UpdateStatus.DOWNLOADING
+      }
+
+    val (downloaded, total, status) = mockUpdateProgress
+
+    assertThat(downloaded).isEqualTo(mockUpdateProgress.apkBytesDownloaded)
+    assertThat(total).isEqualTo(mockUpdateProgress.apkFileTotalBytes)
+    assertThat(status).isEqualTo(mockUpdateProgress.updateStatus)
+  }
+}
+
+internal const val LIBRARY_NAME: String = "fire-appdistribution-ktx"
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun libraryRegistrationAtRuntime() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
+}
diff --git a/firebase-appdistribution/ktx/src/main/AndroidManifest.xml b/firebase-appdistribution-api/ktx/src/main/AndroidManifest.xml
similarity index 85%
rename from firebase-appdistribution/ktx/src/main/AndroidManifest.xml
rename to firebase-appdistribution-api/ktx/src/main/AndroidManifest.xml
index 027e0a9ef28..45c1bb0580b 100644
--- a/firebase-appdistribution/ktx/src/main/AndroidManifest.xml
+++ b/firebase-appdistribution-api/ktx/src/main/AndroidManifest.xml
@@ -12,13 +12,12 @@
 <!-- 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="com.google.firebase.appdistribution.ktx">
-    <uses-sdk android:minSdkVersion="16"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-sdk android:minSdkVersion="21"/>
 
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.appdistribution.ktx.FirebaseAppDistributionKtxRegistrar"
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.appdistribution.ktx.FirebaseAppdistributionApiLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
diff --git a/firebase-appdistribution-api/ktx/src/main/kotlin/com/google/firebase/appdistribution/ktx/Logging.kt b/firebase-appdistribution-api/ktx/src/main/kotlin/com/google/firebase/appdistribution/ktx/Logging.kt
new file mode 100644
index 00000000000..e0e7e27519b
--- /dev/null
+++ b/firebase-appdistribution-api/ktx/src/main/kotlin/com/google/firebase/appdistribution/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.appdistribution.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.appdistribution.BuildConfig
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-appdistribution-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseAppdistributionApiLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-appdistribution-api/src/main/AndroidManifest.xml b/firebase-appdistribution-api/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..191b6865567
--- /dev/null
+++ b/firebase-appdistribution-api/src/main/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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">
+    <application>
+        <service
+            android:name="com.google.firebase.components.ComponentDiscoveryService"
+            android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.appdistribution.FirebaseAppDistributionKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+            <meta-data
+                android:name="com.google.firebase.components:com.google.firebase.appdistribution.FirebaseAppDistributionApiRegistrar"
+                android:value="com.google.firebase.components.ComponentRegistrar" />
+        </service>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/AppDistributionRelease.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/AppDistributionRelease.java
new file mode 100644
index 00000000000..3936838bdfa
--- /dev/null
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/AppDistributionRelease.java
@@ -0,0 +1,41 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * The release information returned by {@link FirebaseAppDistribution#checkForNewRelease} when a new
+ * version is available for the signed in tester.
+ */
+public interface AppDistributionRelease {
+
+  /** Returns the short bundle version of this build (example: 1.0.0). */
+  @NonNull
+  String getDisplayVersion();
+
+  /** Returns the version code of this build (example: 123). */
+  @NonNull
+  long getVersionCode();
+
+  /** Returns the release notes for this build. */
+  @Nullable
+  String getReleaseNotes();
+
+  /** Returns the binary type for this build. */
+  @NonNull
+  BinaryType getBinaryType();
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/BinaryType.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/BinaryType.java
similarity index 96%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/BinaryType.java
rename to firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/BinaryType.java
index 81b99c1a4eb..3e4e4b70609 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/BinaryType.java
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/BinaryType.java
@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistribution.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistribution.java
new file mode 100644
index 00000000000..3f9fb3ee9e5
--- /dev/null
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistribution.java
@@ -0,0 +1,262 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution;
+
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.appdistribution.internal.FirebaseAppDistributionProxy;
+
+/**
+ * The Firebase App Distribution API provides methods to update the app to the most recent
+ * pre-release build.
+ *
+ * <p>If you don't include the {@code com.google.firebase:firebase-appdistribution} artifact in your
+ * build, then all methods will be stubs and the {@link Task Tasks} and {@link UpdateTask
+ * UpdateTasks} will fail with {@link FirebaseAppDistributionException.Status#NOT_IMPLEMENTED}.
+ *
+ * <p>By default, Firebase App Distribution is automatically initialized.
+ *
+ * <p>Call {@link #getInstance()} to get the singleton instance of {@link FirebaseAppDistribution}.
+ */
+public interface FirebaseAppDistribution {
+
+  /**
+   * Updates the app to the newest release, if one is available.
+   *
+   * <p>Returns the release information or {@code null} if no update is found. Performs the
+   * following actions:
+   *
+   * <ol>
+   *   <li>If the tester is not signed in, presents the tester with a Google Sign-in UI.
+   *   <li>Checks if a newer release is available. If so, presents the tester with a confirmation
+   *       dialog to begin the download.
+   *   <li>If the newest release is an APK, downloads the binary and starts an installation. If the
+   *       newest release is an AAB, directs the tester to the Play app to complete the download and
+   *       installation.
+   * </ol>
+   *
+   * <p>If you don't include the {@code com.google.firebase:firebase-appdistribution} artifact in
+   * your build, then this method returns a failed {@link Task} with {@link
+   * FirebaseAppDistributionException.Status#NOT_IMPLEMENTED}.
+   */
+  @NonNull
+  UpdateTask updateIfNewReleaseAvailable();
+
+  /**
+   * Returns {@code true} if the App Distribution tester is signed in.
+   *
+   * <p>If you don't include the {@code com.google.firebase:firebase-appdistribution} artifact in
+   * your build, then this method always returns {@code false}.
+   */
+  boolean isTesterSignedIn();
+
+  /**
+   * Signs in the App Distribution tester. Presents the tester with a Google sign in UI.
+   *
+   * <p>If you don't include the {@code com.google.firebase:firebase-appdistribution} artifact in
+   * your build, then this method returns a failed {@link Task} with {@link
+   * FirebaseAppDistributionException.Status#NOT_IMPLEMENTED}.
+   */
+  @NonNull
+  Task<Void> signInTester();
+
+  /**
+   * Signs out the App Distribution tester.
+   *
+   * <p>If you don't include the {@code com.google.firebase:firebase-appdistribution} artifact in
+   * your build, then this method is a no-op.
+   */
+  void signOutTester();
+
+  /**
+   * Returns an {@link AppDistributionRelease} if an update is available for the current signed in
+   * tester, or {@code null} otherwise.
+   *
+   * <p>If you don't include the {@code com.google.firebase:firebase-appdistribution} artifact in
+   * your build, then this method returns a failed {@link Task} with {@link
+   * FirebaseAppDistributionException.Status#NOT_IMPLEMENTED}.
+   */
+  @NonNull
+  Task<AppDistributionRelease> checkForNewRelease();
+
+  /**
+   * Updates app to the {@link AppDistributionRelease} returned by {@link #checkForNewRelease}.
+   *
+   * <p>If the newest release is an APK, downloads the binary and starts an installation. If the
+   * newest release is an AAB, directs the tester to the Play app to complete the download and
+   * installation.
+   *
+   * <p>Fails the {@link Task} with {@link
+   * FirebaseAppDistributionException.Status#UPDATE_NOT_AVAILABLE} if no new release is cached from
+   * {@link #checkForNewRelease}.
+   *
+   * <p>If you don't include the {@code com.google.firebase:firebase-appdistribution} artifact in
+   * your build, then this method returns a failed {@link UpdateTask} with {@link
+   * FirebaseAppDistributionException.Status#NOT_IMPLEMENTED}.
+   */
+  @NonNull
+  UpdateTask updateApp();
+
+  /**
+   * Takes a screenshot, and starts an activity to collect and submit feedback from the tester.
+   *
+   * <p>Performs the following actions:
+   *
+   * <ol>
+   *   <li>Takes a screenshot of the current activity.
+   *   <li>If the tester is not signed in, presents the tester with a Google Sign-in UI.
+   *   <li>Starts a full screen activity for the tester to compose and submit the feedback.
+   * </ol>
+   *
+   * @param additionalFormText string resource ID of text that will be shown to the tester before
+   *     they submit feedback. If you’re a customer who would like to provide notice to your testers
+   *     about collection and processing of their feedback data, you can use this text to provide
+   *     such notice.
+   */
+  void startFeedback(@StringRes int additionalFormText);
+
+  /**
+   * Takes a screenshot, and starts an activity to collect and submit feedback from the tester.
+   *
+   * <p>Performs the following actions:
+   *
+   * <ol>
+   *   <li>Takes a screenshot of the current activity.
+   *   <li>If the tester is not signed in, presents the tester with a Google Sign-in UI.
+   *   <li>Starts a full screen activity for the tester to compose and submit the feedback.
+   * </ol>
+   *
+   * @param additionalFormText text that will be shown to the tester before they submit feedback. If
+   *     you’re a customer who would like to provide notice to your testers about collection and
+   *     processing of their feedback data, you can use this text to provide such notice.
+   */
+  void startFeedback(@NonNull CharSequence additionalFormText);
+
+  /**
+   * Starts an activity to collect and submit feedback from the tester, along with the given
+   * screenshot.
+   *
+   * <p>Performs the following actions:
+   *
+   * <ol>
+   *   <li>If the tester is not signed in, presents the tester with a Google Sign-in UI.
+   *   <li>Starts a full screen activity for the tester to compose and submit the feedback.
+   * </ol>
+   *
+   * @param additionalFormText string resource ID of text that will be shown to the tester before
+   *     they submit feedback. If you’re a customer who would like to provide notice to your testers
+   *     about collection and processing of their feedback data, you can use this text to provide
+   *     such notice.
+   * @param screenshot URI to a bitmap containing a screenshot that will be included with the
+   *     report, or null to not include a screenshot
+   */
+  void startFeedback(@StringRes int additionalFormText, @Nullable Uri screenshot);
+
+  /**
+   * Starts an activity to collect and submit feedback from the tester, along with the given
+   * screenshot.
+   *
+   * <p>Performs the following actions:
+   *
+   * <ol>
+   *   <li>If the tester is not signed in, presents the tester with a Google Sign-in UI.
+   *   <li>Starts a full screen activity for the tester to compose and submit the feedback.
+   * </ol>
+   *
+   * @param additionalFormText text that will be shown to the tester before they submit feedback. If
+   *     you’re a customer who would like to provide notice to your testers about collection and
+   *     processing of their feedback data, you can use this text to provide such notice.
+   * @param screenshot URI to a bitmap containing a screenshot that will be included with the
+   *     report, or null to not include a screenshot
+   */
+  void startFeedback(@NonNull CharSequence additionalFormText, @Nullable Uri screenshot);
+
+  /**
+   * Displays a notification that, when tapped, will take a screenshot of the current activity, then
+   * start a new activity to collect and submit feedback from the tester along with the screenshot.
+   *
+   * <p>On Android 13 and above, this method requires the runtime permission for sending
+   * notifications: <a
+   * href="https://developer.android.com/develop/ui/views/notifications/notification-permission">{@code
+   * POST_NOTIFICATIONS}</a>. If your app targets Android 13 (API level 33) or above, you should <a
+   * href="https://developer.android.com/training/permissions/requesting">request the
+   * permission</a>.
+   *
+   * <p>When the notification is tapped:
+   *
+   * <ol>
+   *   <li>If the app is open, takes a screenshot of the current activity.
+   *   <li>If the tester is not signed in, presents the tester with a Google Sign-in UI.
+   *   <li>Starts a full screen activity for the tester to compose and submit the feedback.
+   * </ol>
+   *
+   * @param additionalFormText string resource ID of text that will be shown to the tester before
+   *     they submit feedback. If you’re a customer who would like to provide notice to your testers
+   *     about collection and processing of their feedback data, you can use this text to provide
+   *     such notice.
+   * @param interruptionLevel the level of interruption for the feedback notification. On platforms
+   *     below Android 8, this corresponds to a <a
+   *     href="https://developer.android.com/develop/ui/views/notifications/channels#importance">notification
+   *     channel importance</a> and once set cannot be changed except by the tester.
+   */
+  void showFeedbackNotification(
+      @StringRes int additionalFormText, @NonNull InterruptionLevel interruptionLevel);
+
+  /**
+   * Displays a notification that, when tapped, will take a screenshot of the current activity, then
+   * start a new activity to collect and submit feedback from the tester along with the screenshot.
+   *
+   * <p>On Android 13 and above, this method requires the runtime permission for sending
+   * notifications: <a
+   * href="https://developer.android.com/develop/ui/views/notifications/notification-permission">{@code
+   * POST_NOTIFICATIONS}</a>. If your app targets Android 13 (API level 33) or above, you should <a
+   * href="https://developer.android.com/training/permissions/requesting">request the
+   * permission</a>.
+   *
+   * <p>When the notification is tapped:
+   *
+   * <ol>
+   *   <li>If the app is open, takes a screenshot of the current activity.
+   *   <li>If the tester is not signed in, presents the tester with a Google Sign-in UI.
+   *   <li>Starts a full screen activity for the tester to compose and submit the feedback.
+   * </ol>
+   *
+   * @param additionalFormText text that will be shown to the tester before they submit feedback. If
+   *     you’re a customer who would like to provide notice to your testers about collection and
+   *     processing of their feedback data, you can use this text to provide such notice.
+   * @param interruptionLevel the level of interruption for the feedback notification. On platforms
+   *     below Android 8, this corresponds to a <a
+   *     href="https://developer.android.com/develop/ui/views/notifications/channels#importance">notification
+   *     channel importance</a> and once set cannot be changed except by the tester.
+   */
+  void showFeedbackNotification(
+      @NonNull CharSequence additionalFormText, @NonNull InterruptionLevel interruptionLevel);
+
+  /**
+   * Hides the notification shown with {@link #showFeedbackNotification(int, InterruptionLevel)} or
+   * {@link #showFeedbackNotification(CharSequence, InterruptionLevel)}.
+   */
+  void cancelFeedbackNotification();
+
+  /** Gets the singleton {@link FirebaseAppDistribution} instance. */
+  @NonNull
+  static FirebaseAppDistribution getInstance() {
+    return FirebaseApp.getInstance().get(FirebaseAppDistributionProxy.class);
+  }
+}
diff --git a/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistribution.kt b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistribution.kt
new file mode 100644
index 00000000000..6b9d58291f8
--- /dev/null
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistribution.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.appdistribution
+
+import androidx.annotation.Keep
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+
+/** Returns the [FirebaseAppDistribution] instance of the default [FirebaseApp]. */
+val Firebase.appDistribution: FirebaseAppDistribution
+  get() = FirebaseAppDistribution.getInstance()
+
+/**
+ * Destructuring declaration for [AppDistributionRelease] to provide binaryType.
+ *
+ * @return the binaryType of the [AppDistributionRelease]
+ */
+operator fun AppDistributionRelease.component1() = binaryType
+
+/**
+ * Destructuring declaration for [AppDistributionRelease] to provide displayVersion.
+ *
+ * @return the displayVersion of the [AppDistributionRelease]
+ */
+operator fun AppDistributionRelease.component2() = displayVersion
+
+/**
+ * Destructuring declaration for [AppDistributionRelease] to provide versionCode.
+ *
+ * @return the versionCode of the [AppDistributionRelease]
+ */
+operator fun AppDistributionRelease.component3() = versionCode
+
+/**
+ * Destructuring declaration for [AppDistributionRelease] to provide releaseNotes.
+ *
+ * @return the releaseNotes of the [AppDistributionRelease]
+ */
+operator fun AppDistributionRelease.component4() = releaseNotes
+
+/**
+ * Destructuring declaration for [UpdateProgress] to provide apkBytesDownloaded.
+ *
+ * @return the apkBytesDownloaded of the [UpdateProgress]
+ */
+operator fun UpdateProgress.component1() = apkBytesDownloaded
+
+/**
+ * Destructuring declaration for [UpdateProgress] to provide apkFileTotalBytes.
+ *
+ * @return the apkFileTotalBytes of the [UpdateProgress]
+ */
+operator fun UpdateProgress.component2() = apkFileTotalBytes
+
+/**
+ * Destructuring declaration for [UpdateProgress] to provide updateStatus.
+ *
+ * @return the updateStatus of the [UpdateProgress]
+ */
+operator fun UpdateProgress.component3() = updateStatus
+
+/** @suppress */
+@Keep
+class FirebaseAppDistributionKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionApiRegistrar.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionApiRegistrar.java
new file mode 100644
index 00000000000..5cf9aeeb0c0
--- /dev/null
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionApiRegistrar.java
@@ -0,0 +1,55 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution;
+
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import com.google.firebase.appdistribution.internal.FirebaseAppDistributionProxy;
+import com.google.firebase.components.Component;
+import com.google.firebase.components.ComponentContainer;
+import com.google.firebase.components.ComponentRegistrar;
+import com.google.firebase.components.Dependency;
+import com.google.firebase.platforminfo.LibraryVersionComponent;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Registers {@link FirebaseAppDistributionProxy}.
+ *
+ * @hide
+ */
+@Keep
+public class FirebaseAppDistributionApiRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-appdistribution-api";
+
+  @Override
+  public @NonNull List<Component<?>> getComponents() {
+    return Arrays.asList(
+        Component.builder(FirebaseAppDistributionProxy.class)
+            .name(LIBRARY_NAME)
+            .add(Dependency.optionalProvider(FirebaseAppDistribution.class))
+            .factory(this::buildFirebaseAppDistributionProxy)
+            // construct FirebaseAppDistribution instance on startup so we can register for
+            // activity lifecycle callbacks before the API is called
+            .alwaysEager()
+            .build(),
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
+  }
+
+  private FirebaseAppDistributionProxy buildFirebaseAppDistributionProxy(
+      ComponentContainer container) {
+    return new FirebaseAppDistributionProxy(container.getProvider(FirebaseAppDistribution.class));
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionException.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionException.java
similarity index 53%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionException.java
rename to firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionException.java
index 71ea7b4a133..6194489323f 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionException.java
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionException.java
@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,8 +26,9 @@ public enum Status {
     UNKNOWN,
 
     /**
-     * The authentication process failed. The tester was either not signed in, or something went
-     * wrong. Try signing in again by calling {@link FirebaseAppDistribution#signInTester}.
+     * The authentication process failed. The tester was either not signed in, does not have access,
+     * or something went wrong. Try signing in again by calling {@link
+     * FirebaseAppDistribution#signInTester}.
      */
     AUTHENTICATION_FAILURE,
 
@@ -59,8 +60,8 @@ public enum Status {
 
     /**
      * An update was not available for the current tester and app. Make sure that {@link
-     * FirebaseAppDistribution#checkForNewRelease} returns with a non-null {@link
-     * AppDistributionRelease} before calling {@link FirebaseAppDistribution#updateApp},
+     * FirebaseAppDistribution#checkForNewRelease} returns with a non-null <br>
+     * {@link AppDistributionRelease} before calling {@link FirebaseAppDistribution#updateApp}
      */
     UPDATE_NOT_AVAILABLE,
 
@@ -69,32 +70,52 @@ public enum Status {
      * calling {@link FirebaseAppDistribution#updateIfNewReleaseAvailable()} again.
      */
     HOST_ACTIVITY_INTERRUPTED,
+
+    /**
+     * This API is not implemented.
+     *
+     * <p>This build was compiled against the API only. This may be intentional if this variant is
+     * intended for use in production. Otherwise you may need to include a dependency on {@code
+     * com.google.firebase:firebase-appdistribution}.
+     */
+    NOT_IMPLEMENTED,
+
+    /**
+     * The Firebase App Distribution Tester API is disabled for this project.
+     *
+     * <p>Before you use the App Distribution SDK in your app, you must enable the API in the Google
+     * Cloud console. For more information, see the <a
+     * href="https://firebase.google.com/docs/app-distribution/set-up-alerts?platform=android">documentation</a>.
+     * If you enabled this API recently, wait a few minutes for the action to propagate to the App
+     * Distribution systems, and retry.
+     */
+    API_DISABLED,
   }
 
   @NonNull private final Status status;
   @Nullable private final AppDistributionRelease release;
 
-  FirebaseAppDistributionException(@NonNull String message, @NonNull Status status) {
-    super(message);
-    this.status = status;
-    this.release = null;
+  /** @hide */
+  public FirebaseAppDistributionException(@NonNull String message, @NonNull Status status) {
+    this(message, status, (AppDistributionRelease) null);
   }
 
-  FirebaseAppDistributionException(
+  /** @hide */
+  public FirebaseAppDistributionException(
       @NonNull String message, @NonNull Status status, @Nullable AppDistributionRelease release) {
     super(message);
     this.status = status;
     this.release = release;
   }
 
-  FirebaseAppDistributionException(
+  /** @hide */
+  public FirebaseAppDistributionException(
       @NonNull String message, @NonNull Status status, @NonNull Throwable cause) {
-    super(message, cause);
-    this.status = status;
-    this.release = null;
+    this(message, status, null, cause);
   }
 
-  FirebaseAppDistributionException(
+  /** @hide */
+  public FirebaseAppDistributionException(
       @NonNull String message,
       @NonNull Status status,
       @Nullable AppDistributionRelease release,
@@ -115,48 +136,4 @@ public AppDistributionRelease getRelease() {
   public Status getErrorCode() {
     return status;
   }
-
-  static FirebaseAppDistributionException wrap(Throwable t) {
-    // We never want to wrap a FirebaseAppDistributionException
-    if (t instanceof FirebaseAppDistributionException) {
-      return (FirebaseAppDistributionException) t;
-    }
-    return new FirebaseAppDistributionException(
-        String.format("%s: %s", ErrorMessages.UNKNOWN_ERROR, t.getMessage()), Status.UNKNOWN, t);
-  }
-
-  static class ErrorMessages {
-    public static final String NETWORK_ERROR =
-        "Failed to fetch releases due to unknown network error.";
-
-    public static final String JSON_PARSING_ERROR =
-        "Error parsing service response when checking for new release. This was most likely due to a transient condition and may be corrected by retrying.";
-
-    public static final String AUTHENTICATION_ERROR =
-        "Failed to authenticate the tester. The tester was either not signed in, or something went wrong. Try signing in again.";
-
-    public static final String AUTHORIZATION_ERROR =
-        "Failed to authorize the tester. The tester is not authorized to test this app. Verify that the tester has accepted an invitation to test this app.";
-
-    public static final String AUTHENTICATION_CANCELED = "Tester canceled the authentication flow.";
-
-    public static final String NOT_FOUND_ERROR =
-        "Release not found. An update was not available for the current tester and app. Make sure that FirebaseAppDistribution#checkForNewRelease returns with a non-null  AppDistributionRelease before calling FirebaseAppDistribution#updateApp";
-
-    public static final String TIMEOUT_ERROR =
-        "Failed to fetch releases due to timeout. Check the tester's internet connection and try again.";
-
-    public static final String UPDATE_CANCELED = "Tester canceled the update.";
-
-    public static final String UNKNOWN_ERROR = "Unknown error.";
-
-    public static final String DOWNLOAD_URL_NOT_FOUND =
-        "Download URL not found. This was a most likely due to a transient condition and may be corrected by retrying.";
-
-    public static final String HOST_ACTIVITY_INTERRUPTED =
-        "Host activity interrupted while dialog was showing. Try calling FirebaseAppDistribution#updateIfNewReleaseAvailable again.";
-
-    public static final String APK_INSTALLATION_FAILED =
-        "The APK failed to install or installation was canceled by the tester.";
-  }
 }
diff --git a/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/InterruptionLevel.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/InterruptionLevel.java
new file mode 100644
index 00000000000..082cc4ce6af
--- /dev/null
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/InterruptionLevel.java
@@ -0,0 +1,81 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution;
+
+import android.app.NotificationManager;
+import androidx.core.app.NotificationCompat;
+
+/** An enum specifying the level of interruption of a notification when it is created. */
+public enum InterruptionLevel {
+
+  /**
+   * Minimum interruption level.
+   *
+   * <p>Translates to {@link NotificationManager#IMPORTANCE_MIN} on Android O+ and {@link
+   * NotificationCompat#PRIORITY_MIN} on older platforms.
+   */
+  MIN(NotificationManager.IMPORTANCE_MIN, NotificationCompat.PRIORITY_MIN),
+
+  /**
+   * Low interruption level.
+   *
+   * <p>Translates to {@link NotificationManager#IMPORTANCE_LOW} on Android O+ and {@link
+   * NotificationCompat#PRIORITY_LOW} on older platforms.
+   */
+  LOW(NotificationManager.IMPORTANCE_LOW, NotificationCompat.PRIORITY_LOW),
+
+  /**
+   * Default interruption level.
+   *
+   * <p>Translates to {@link NotificationManager#IMPORTANCE_DEFAULT} on Android O+ and {@link
+   * NotificationCompat#PRIORITY_DEFAULT} on older platforms.
+   */
+  DEFAULT(NotificationManager.IMPORTANCE_DEFAULT, NotificationCompat.PRIORITY_DEFAULT),
+
+  /**
+   * High interruption level.
+   *
+   * <p>Translates to {@link NotificationManager#IMPORTANCE_HIGH} on Android O+ and {@link
+   * NotificationCompat#PRIORITY_HIGH} on older platforms.
+   */
+  HIGH(NotificationManager.IMPORTANCE_HIGH, NotificationCompat.PRIORITY_HIGH),
+
+  /**
+   * Maximum interruption level.
+   *
+   * <p>Translates to {@link NotificationManager#IMPORTANCE_HIGH} on Android O+ and {@link
+   * NotificationCompat#PRIORITY_MAX} on older platforms.
+   */
+  MAX(NotificationManager.IMPORTANCE_HIGH, NotificationCompat.PRIORITY_MAX);
+
+  /**
+   * The notification channel importance corresponding to this interruption level on Android O+.
+   *
+   * @hide
+   */
+  public final int channelImportance;
+
+  /**
+   * The notification priority corresponding to this interruption level on older platforms.
+   *
+   * @hide
+   */
+  public final int notificationPriority;
+
+  InterruptionLevel(int channelImportance, int notificationPriority) {
+    this.channelImportance = channelImportance;
+    this.notificationPriority = notificationPriority;
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/OnProgressListener.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/OnProgressListener.java
similarity index 96%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/OnProgressListener.java
rename to firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/OnProgressListener.java
index 8f8f3ac8e72..2a51462d5bb 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/OnProgressListener.java
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/OnProgressListener.java
@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/UpdateProgress.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/UpdateProgress.java
new file mode 100644
index 00000000000..bd38499477e
--- /dev/null
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/UpdateProgress.java
@@ -0,0 +1,40 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution;
+
+import androidx.annotation.NonNull;
+
+/** Represents a progress update or a final state from updating an app. */
+public interface UpdateProgress {
+  /**
+   * Returns the number of bytes downloaded so far for an APK.
+   *
+   * @returns the number of bytes downloaded, or -1 if called when updating to an AAB or if no new
+   *     release is available.
+   */
+  long getApkBytesDownloaded();
+
+  /**
+   * Returns the file size of the APK file to download in bytes.
+   *
+   * @returns the file size in bytes, or -1 if called when updating to an AAB or if no new release
+   *     is available.
+   */
+  long getApkFileTotalBytes();
+
+  /** Returns the current {@link UpdateStatus} of the update. */
+  @NonNull
+  UpdateStatus getUpdateStatus();
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/UpdateStatus.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/UpdateStatus.java
similarity index 98%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/UpdateStatus.java
rename to firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/UpdateStatus.java
index a90e0354c50..193a1d49c2c 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/UpdateStatus.java
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/UpdateStatus.java
@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/UpdateTask.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/UpdateTask.java
similarity index 98%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/UpdateTask.java
rename to firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/UpdateTask.java
index a14ca7a45e3..4c49ed4d3a8 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/UpdateTask.java
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/UpdateTask.java
@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionProxy.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionProxy.java
new file mode 100644
index 00000000000..82e3714820a
--- /dev/null
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionProxy.java
@@ -0,0 +1,115 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.internal;
+
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.appdistribution.AppDistributionRelease;
+import com.google.firebase.appdistribution.FirebaseAppDistribution;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.InterruptionLevel;
+import com.google.firebase.appdistribution.UpdateTask;
+import com.google.firebase.inject.Provider;
+
+/**
+ * This implementation of the Firebase App Distribution API proxies to the real implementation
+ * ({@code FirebaseAppDistributionImpl}) provided by the {@code
+ * com.google.firebase:firebase-appdistribution} artifact. If that artifact is not included in the
+ * build, then the stubs will return failed {@link Task Tasks}/{@link UpdateTask UpdateTasks} with
+ * {@link FirebaseAppDistributionException.Status#NOT_IMPLEMENTED}.
+ */
+public class FirebaseAppDistributionProxy implements FirebaseAppDistribution {
+  private final FirebaseAppDistribution delegate;
+
+  public FirebaseAppDistributionProxy(
+      Provider<FirebaseAppDistribution> firebaseAppDistributionImplProvider) {
+    FirebaseAppDistribution impl = firebaseAppDistributionImplProvider.get();
+    delegate = impl != null ? impl : new FirebaseAppDistributionStub();
+  }
+
+  @NonNull
+  @Override
+  public UpdateTask updateIfNewReleaseAvailable() {
+    return delegate.updateIfNewReleaseAvailable();
+  }
+
+  @Override
+  public boolean isTesterSignedIn() {
+    return delegate.isTesterSignedIn();
+  }
+
+  @NonNull
+  @Override
+  public Task<Void> signInTester() {
+    return delegate.signInTester();
+  }
+
+  @Override
+  public void signOutTester() {
+    delegate.signOutTester();
+  }
+
+  @NonNull
+  @Override
+  public synchronized Task<AppDistributionRelease> checkForNewRelease() {
+    return delegate.checkForNewRelease();
+  }
+
+  @NonNull
+  @Override
+  public UpdateTask updateApp() {
+    return delegate.updateApp();
+  }
+
+  @Override
+  public void startFeedback(@StringRes int additionalFormText) {
+    delegate.startFeedback(additionalFormText);
+  }
+
+  @Override
+  public void startFeedback(@NonNull CharSequence additionalFormText) {
+    delegate.startFeedback(additionalFormText);
+  }
+
+  @Override
+  public void startFeedback(@StringRes int additionalFormText, @Nullable Uri screenshotUri) {
+    delegate.startFeedback(additionalFormText, screenshotUri);
+  }
+
+  @Override
+  public void startFeedback(@NonNull CharSequence additionalFormText, @Nullable Uri screenshotUri) {
+    delegate.startFeedback(additionalFormText, screenshotUri);
+  }
+
+  @Override
+  public void showFeedbackNotification(
+      @StringRes int additionalFormText, @NonNull InterruptionLevel interruptionLevel) {
+    delegate.showFeedbackNotification(additionalFormText, interruptionLevel);
+  }
+
+  @Override
+  public void showFeedbackNotification(
+      @NonNull CharSequence additionalFormText, @NonNull InterruptionLevel interruptionLevel) {
+    delegate.showFeedbackNotification(additionalFormText, interruptionLevel);
+  }
+
+  @Override
+  public void cancelFeedbackNotification() {
+    delegate.cancelFeedbackNotification();
+  }
+}
diff --git a/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionStub.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionStub.java
new file mode 100644
index 00000000000..7cff2a3ae70
--- /dev/null
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionStub.java
@@ -0,0 +1,291 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.internal;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import com.google.android.gms.tasks.Continuation;
+import com.google.android.gms.tasks.OnCanceledListener;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.SuccessContinuation;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.appdistribution.AppDistributionRelease;
+import com.google.firebase.appdistribution.FirebaseAppDistribution;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.appdistribution.InterruptionLevel;
+import com.google.firebase.appdistribution.OnProgressListener;
+import com.google.firebase.appdistribution.UpdateTask;
+import java.util.concurrent.Executor;
+
+/**
+ * This stuib implementation of the Firebase App Distribution API will return failed {@link Task
+ * Tasks}/{@link UpdateTask UpdateTasks} with {@link
+ * FirebaseAppDistributionException.Status#NOT_IMPLEMENTED}.
+ */
+// TODO(b/261013680): Use an explicit executor in continuations.
+@SuppressLint("TaskMainThread")
+public class FirebaseAppDistributionStub implements FirebaseAppDistribution {
+  @NonNull
+  @Override
+  public UpdateTask updateIfNewReleaseAvailable() {
+    return new NotImplementedUpdateTask();
+  }
+
+  @Override
+  public boolean isTesterSignedIn() {
+    return false;
+  }
+
+  @NonNull
+  @Override
+  public Task<Void> signInTester() {
+    return getNotImplementedTask();
+  }
+
+  @Override
+  public void signOutTester() {}
+
+  @NonNull
+  @Override
+  public synchronized Task<AppDistributionRelease> checkForNewRelease() {
+    return getNotImplementedTask();
+  }
+
+  @NonNull
+  @Override
+  public UpdateTask updateApp() {
+    return new NotImplementedUpdateTask();
+  }
+
+  @Override
+  public void startFeedback(@StringRes int additionalFormText) {}
+
+  @Override
+  public void startFeedback(@NonNull CharSequence additionalFormText) {}
+
+  @Override
+  public void startFeedback(@StringRes int additionalFormText, @Nullable Uri screenshotUri) {}
+
+  @Override
+  public void startFeedback(
+      @NonNull CharSequence additionalFormText, @Nullable Uri screenshotUri) {}
+
+  @Override
+  public void showFeedbackNotification(
+      @StringRes int additionalFormText, @NonNull InterruptionLevel interruptionLevel) {}
+
+  @Override
+  public void showFeedbackNotification(
+      @NonNull CharSequence additionalFormText, @NonNull InterruptionLevel interruptionLevel) {}
+
+  @Override
+  public void cancelFeedbackNotification() {}
+
+  private static <TResult> Task<TResult> getNotImplementedTask() {
+    return Tasks.forException(
+        new FirebaseAppDistributionException(
+            "This API is not implemented. The build was compiled against the API only.",
+            Status.NOT_IMPLEMENTED));
+  }
+
+  private static class NotImplementedUpdateTask extends UpdateTask {
+    private final Task<Void> task = getNotImplementedTask();
+
+    @NonNull
+    @Override
+    public <TContinuationResult> Task<TContinuationResult> continueWith(
+        @NonNull Continuation<Void, TContinuationResult> continuation) {
+      return task.continueWith(continuation);
+    }
+
+    @NonNull
+    @Override
+    public <TContinuationResult> Task<TContinuationResult> continueWith(
+        @NonNull Executor executor, @NonNull Continuation<Void, TContinuationResult> continuation) {
+      return task.continueWith(executor, continuation);
+    }
+
+    @NonNull
+    @Override
+    public <TContinuationResult> Task<TContinuationResult> continueWithTask(
+        @NonNull Continuation<Void, Task<TContinuationResult>> continuation) {
+      return task.continueWithTask(continuation);
+    }
+
+    @NonNull
+    @Override
+    public <TContinuationResult> Task<TContinuationResult> continueWithTask(
+        @NonNull Executor executor,
+        @NonNull Continuation<Void, Task<TContinuationResult>> continuation) {
+      return task.continueWithTask(executor, continuation);
+    }
+
+    @NonNull
+    @Override
+    public <TContinuationResult> Task<TContinuationResult> onSuccessTask(
+        @NonNull SuccessContinuation<Void, TContinuationResult> successContinuation) {
+      return task.onSuccessTask(successContinuation);
+    }
+
+    @NonNull
+    @Override
+    public <TContinuationResult> Task<TContinuationResult> onSuccessTask(
+        @NonNull Executor executor,
+        @NonNull SuccessContinuation<Void, TContinuationResult> successContinuation) {
+      return task.onSuccessTask(executor, successContinuation);
+    }
+
+    @NonNull
+    @Override
+    public UpdateTask addOnProgressListener(@NonNull OnProgressListener listener) {
+      return this;
+    }
+
+    @NonNull
+    @Override
+    public UpdateTask addOnProgressListener(
+        @Nullable Executor executor, @NonNull OnProgressListener listener) {
+      return this;
+    }
+
+    @Override
+    public boolean isComplete() {
+      return task.isComplete();
+    }
+
+    @Override
+    public boolean isSuccessful() {
+      return task.isSuccessful();
+    }
+
+    @Override
+    public boolean isCanceled() {
+      return task.isCanceled();
+    }
+
+    @Nullable
+    @Override
+    public Void getResult() {
+      return task.getResult();
+    }
+
+    @Nullable
+    @Override
+    public <X extends Throwable> Void getResult(@NonNull Class<X> aClass) throws X {
+      return task.getResult(aClass);
+    }
+
+    @Nullable
+    @Override
+    public Exception getException() {
+      return task.getException();
+    }
+
+    @NonNull
+    @Override
+    public Task<Void> addOnSuccessListener(
+        @NonNull OnSuccessListener<? super Void> onSuccessListener) {
+      task.addOnSuccessListener(onSuccessListener);
+      return this;
+    }
+
+    @NonNull
+    @Override
+    public Task<Void> addOnSuccessListener(
+        @NonNull Executor executor, @NonNull OnSuccessListener<? super Void> onSuccessListener) {
+      task.addOnSuccessListener(executor, onSuccessListener);
+      return this;
+    }
+
+    @NonNull
+    @Override
+    public Task<Void> addOnSuccessListener(
+        @NonNull Activity activity, @NonNull OnSuccessListener<? super Void> onSuccessListener) {
+      task.addOnSuccessListener(activity, onSuccessListener);
+      return this;
+    }
+
+    @NonNull
+    @Override
+    public Task<Void> addOnFailureListener(@NonNull OnFailureListener onFailureListener) {
+      task.addOnFailureListener(onFailureListener);
+      return this;
+    }
+
+    @NonNull
+    @Override
+    public Task<Void> addOnFailureListener(
+        @NonNull Executor executor, @NonNull OnFailureListener onFailureListener) {
+      task.addOnFailureListener(executor, onFailureListener);
+      return this;
+    }
+
+    @NonNull
+    @Override
+    public Task<Void> addOnFailureListener(
+        @NonNull Activity activity, @NonNull OnFailureListener onFailureListener) {
+      task.addOnFailureListener(activity, onFailureListener);
+      return this;
+    }
+
+    @NonNull
+    @Override
+    public Task<Void> addOnCompleteListener(@NonNull OnCompleteListener<Void> onCompleteListener) {
+      return task.addOnCompleteListener(onCompleteListener);
+    }
+
+    @NonNull
+    @Override
+    public Task<Void> addOnCompleteListener(
+        @NonNull Executor executor, @NonNull OnCompleteListener<Void> onCompleteListener) {
+      return task.addOnCompleteListener(executor, onCompleteListener);
+    }
+
+    @NonNull
+    @Override
+    public Task<Void> addOnCompleteListener(
+        @NonNull Activity activity, @NonNull OnCompleteListener<Void> onCompleteListener) {
+      return task.addOnCompleteListener(activity, onCompleteListener);
+    }
+
+    @NonNull
+    @Override
+    public Task<Void> addOnCanceledListener(@NonNull OnCanceledListener onCanceledListener) {
+      return task.addOnCanceledListener(onCanceledListener);
+    }
+
+    @NonNull
+    @Override
+    public Task<Void> addOnCanceledListener(
+        @NonNull Executor executor, @NonNull OnCanceledListener onCanceledListener) {
+      return task.addOnCanceledListener(executor, onCanceledListener);
+    }
+
+    @NonNull
+    @Override
+    public Task<Void> addOnCanceledListener(
+        @NonNull Activity activity, @NonNull OnCanceledListener onCanceledListener) {
+      return task.addOnCanceledListener(activity, onCanceledListener);
+    }
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/package-info.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/internal/package-info.java
similarity index 100%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/package-info.java
rename to firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/internal/package-info.java
diff --git a/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/ktx/FirebaseAppDistribution.kt b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/ktx/FirebaseAppDistribution.kt
new file mode 100644
index 00000000000..ccee214d131
--- /dev/null
+++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/ktx/FirebaseAppDistribution.kt
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.appdistribution.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.FirebaseApp
+import com.google.firebase.appdistribution.AppDistributionRelease
+import com.google.firebase.appdistribution.FirebaseAppDistribution
+import com.google.firebase.appdistribution.UpdateProgress
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.ktx.Firebase
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseAppDistribution] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-appdistribution-api-ktx` are now deprecated. As early as April
+ * 2024, we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.appDistribution: FirebaseAppDistribution
+  get() = FirebaseAppDistribution.getInstance()
+
+/**
+ * Destructuring declaration for [AppDistributionRelease] to provide binaryType.
+ *
+ * @return the binaryType of the [AppDistributionRelease]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-appdistribution-api-ktx` are now deprecated. As early as April
+ * 2024, we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun AppDistributionRelease.component1() = binaryType
+
+/**
+ * Destructuring declaration for [AppDistributionRelease] to provide displayVersion.
+ *
+ * @return the displayVersion of the [AppDistributionRelease]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-appdistribution-api-ktx` are now deprecated. As early as April
+ * 2024, we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun AppDistributionRelease.component2() = displayVersion
+
+/**
+ * Destructuring declaration for [AppDistributionRelease] to provide versionCode.
+ *
+ * @return the versionCode of the [AppDistributionRelease]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-appdistribution-api-ktx` are now deprecated. As early as April
+ * 2024, we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun AppDistributionRelease.component3() = versionCode
+
+/**
+ * Destructuring declaration for [AppDistributionRelease] to provide releaseNotes.
+ *
+ * @return the releaseNotes of the [AppDistributionRelease]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-appdistribution-api-ktx` are now deprecated. As early as April
+ * 2024, we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun AppDistributionRelease.component4() = releaseNotes
+
+/**
+ * Destructuring declaration for [UpdateProgress] to provide apkBytesDownloaded.
+ *
+ * @return the apkBytesDownloaded of the [UpdateProgress]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-appdistribution-api-ktx` are now deprecated. As early as April
+ * 2024, we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun UpdateProgress.component1() = apkBytesDownloaded
+
+/**
+ * Destructuring declaration for [UpdateProgress] to provide apkFileTotalBytes.
+ *
+ * @return the apkFileTotalBytes of the [UpdateProgress]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-appdistribution-api-ktx` are now deprecated. As early as April
+ * 2024, we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun UpdateProgress.component2() = apkFileTotalBytes
+
+/**
+ * Destructuring declaration for [UpdateProgress] to provide updateStatus.
+ *
+ * @return the updateStatus of the [UpdateProgress]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-appdistribution-api-ktx` are now deprecated. As early as April
+ * 2024, we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun UpdateProgress.component3() = updateStatus
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-appdistribution-api-ktx` are now deprecated. As early as April
+ * 2024, we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+@Keep
+class FirebaseAppDistributionKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-appdistribution-api/src/test/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionProxyTest.java b/firebase-appdistribution-api/src/test/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionProxyTest.java
new file mode 100644
index 00000000000..3c0a207e250
--- /dev/null
+++ b/firebase-appdistribution-api/src/test/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionProxyTest.java
@@ -0,0 +1,171 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.internal;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+
+import android.app.Activity;
+import com.google.android.gms.tasks.RuntimeExecutionException;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.appdistribution.FirebaseAppDistribution;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.appdistribution.UpdateTask;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicBoolean;
+import junit.framework.AssertionFailedError;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.LooperMode;
+
+@RunWith(RobolectricTestRunner.class)
+@LooperMode(LooperMode.Mode.LEGACY)
+public class FirebaseAppDistributionProxyTest {
+
+  private FirebaseAppDistribution firebaseAppDistribution;
+  private TestActivity activity;
+  private Executor executor = Runnable::run;
+
+  static class TestActivity extends Activity {}
+
+  @Before
+  public void setup() {
+    firebaseAppDistribution = new FirebaseAppDistributionProxy(() -> null);
+    activity = Robolectric.buildActivity(TestActivity.class).create().get();
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable() {
+    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+    assertTaskFailsWithNotImplemented(updateTask);
+    assertUpdateTaskListeners(updateTask);
+  }
+
+  @Test
+  public void isTesterSignedIn_returnsFalse() {
+    assertThat(firebaseAppDistribution.isTesterSignedIn()).isFalse();
+  }
+
+  @Test
+  public void signInTester_failsWithNotImplemented() {
+    assertTaskFailsWithNotImplemented(firebaseAppDistribution.signInTester());
+  }
+
+  @Test
+  public void signOutTester_doesNotThrow() {
+    firebaseAppDistribution.signOutTester();
+  }
+
+  @Test
+  public void checkForNewRelease_failsWithNotImplemented() {
+    assertTaskFailsWithNotImplemented(firebaseAppDistribution.checkForNewRelease());
+  }
+
+  @Test
+  public void updateApp() {
+    UpdateTask updateTask = firebaseAppDistribution.updateApp();
+    assertTaskFailsWithNotImplemented(updateTask);
+    assertUpdateTaskListeners(updateTask);
+    assertTaskContinuations(updateTask);
+  }
+
+  private void assertUpdateTaskListeners(UpdateTask updateTask) {
+    assertTaskListeners(updateTask);
+
+    updateTask.addOnProgressListener(
+        up -> {
+          throw new AssertionFailedError("UpdateTask should not update progress");
+        });
+    updateTask.addOnProgressListener(
+        executor,
+        up -> {
+          throw new AssertionFailedError("UpdateTask should not update progress");
+        });
+  }
+
+  private void assertTaskListeners(Task<?> task) {
+    AtomicBoolean wasCalled = new AtomicBoolean(false);
+    task.addOnFailureListener(e -> wasCalled.set(true));
+    assertThat(wasCalled.get()).isTrue();
+
+    wasCalled.set(false);
+    task.addOnFailureListener(executor, e -> wasCalled.set(true));
+    assertThat(wasCalled.get()).isTrue();
+
+    wasCalled.set(false);
+    task.addOnFailureListener(activity, e -> wasCalled.set(true));
+    assertThat(wasCalled.get()).isTrue();
+
+    task.addOnSuccessListener(
+        r -> {
+          throw new AssertionFailedError("UpdateTask should not call success listener");
+        });
+    task.addOnSuccessListener(
+        executor,
+        r -> {
+          throw new AssertionFailedError("UpdateTask should not call success listener");
+        });
+    task.addOnSuccessListener(
+        activity,
+        r -> {
+          throw new AssertionFailedError("UpdateTask should not call success listener");
+        });
+
+    task.addOnCanceledListener(
+        () -> {
+          throw new AssertionFailedError("UpdateTask should not call canceled listener");
+        });
+    task.addOnCanceledListener(
+        executor,
+        () -> {
+          throw new AssertionFailedError("UpdateTask should not call canceled listener");
+        });
+    task.addOnCanceledListener(
+        activity,
+        () -> {
+          throw new AssertionFailedError("UpdateTask should not call canceled listener");
+        });
+  }
+
+  private void assertTaskContinuations(Task<?> task) {
+    // Should not throw exceptions
+    task.continueWith(result -> Tasks.forResult(null));
+    task.continueWith(result -> null);
+    task.continueWith(executor, result -> Tasks.forResult(null));
+    task.continueWith(executor, result -> null);
+
+    task.onSuccessTask(result -> Tasks.forResult(null));
+    task.onSuccessTask(executor, result -> Tasks.forResult(null));
+  }
+
+  private void assertTaskFailsWithNotImplemented(Task task) {
+    assertThat(task.isSuccessful()).isFalse();
+    assertThat(task.isCanceled()).isFalse();
+    Exception e = task.getException();
+    assertThat(e).isInstanceOf(FirebaseAppDistributionException.class);
+    assertThat(((FirebaseAppDistributionException) e).getErrorCode())
+        .isEqualTo(Status.NOT_IMPLEMENTED);
+    assertThat(((FirebaseAppDistributionException) e).getRelease()).isNull();
+    assertThat(task.isComplete()).isTrue();
+    assertThat(assertThrows(RuntimeExecutionException.class, () -> task.getResult()))
+        .hasCauseThat()
+        .isEqualTo(e);
+  }
+}
diff --git a/firebase-appdistribution/CHANGELOG.md b/firebase-appdistribution/CHANGELOG.md
index 11819eef7f0..44b5f65223c 100644
--- a/firebase-appdistribution/CHANGELOG.md
+++ b/firebase-appdistribution/CHANGELOG.md
@@ -1,2 +1,82 @@
 # Unreleased
-- Initial public beta release
\ No newline at end of file
+
+
+# 17.0.0
+* [changed] Bump internal dependencies
+
+# 16.0.0-beta12
+* [changed] Bump internal dependencies.
+
+# 16.0.0-beta10
+* [fixed] Updated the third-party license file to include Dagger's license.
+
+# 16.0.0-beta09
+* [feature] Improved development mode to allow all API calls to be made without having to sign in.
+
+# 16.0.0-beta08
+* [fixed] Fixed an issue where a crash happened whenever a feedback
+  notification was shown on devices running Android 4.4 and lower.
+
+# 16.0.0-beta07
+* [feature] Added support for testers to attach JPEG screenshots to their
+  feedback.
+
+# 16.0.0-beta06
+* [feature] Added support for in-app tester feedback. To learn more, see
+  [Collect feedback from testers](/docs/app-distribution/collect-feedback-from-testers).
+* [fixed] Fixed a bug where only the last listener added to an `UpdateTask`
+  using `addOnProgressListener()` would receive updates.
+
+# 16.0.0-beta05
+* [unchanged] Updated to accommodate the release of the updated
+  [appdistro] Kotlin extensions library.
+
+# 16.0.0-beta03
+* [feature] The [appdistro] SDK has been split into two libraries:
+
+  * `firebase-appdistribution-api` - The API-only library<br>
+    This new API-only library is functional only when the full
+    [appdistro] SDK implementation (`firebase-appdistribution`) is present.
+    `firebase-appdistribution-api` can be included in all
+    [build variants](https://developer.android.com/studio/build/build-variants){: .external}.
+
+  * `firebase-appdistribution` - The full SDK implementation<br>
+    This full SDK implementation is optional and should only be included in
+    pre-release builds.
+
+  Visit the documentation to learn how to
+  [add these SDKs](/docs/app-distribution/set-up-alerts?platform=android#add-appdistro)
+  to your Android app.
+
+
+## Kotlin
+* [removed] The Kotlin extensions library `firebase-appdistribution-ktx`
+  has been removed. All its functionality has been moved to the new API-only
+  library: `firebase-appdistribution-api-ktx`.
+
+# 16.0.0-beta02
+* [fixed] Fixed a bug that prevented testers from signing in when the app had
+an underscore in the package name.
+* [fixed] Fixed a UI bug where the APK download notification displayed the
+incorrect error message.
+* [changed] Internal improvements to tests.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the base
+`firebase-app-distribution` library. The Kotlin extensions library has no
+additional updates.
+
+# 16.0.0-beta01
+* [feature] The [appdistro] Android SDK is now available in beta. You
+  can use this SDK to notify testers in-app when a new test build is available.
+  To learn more, visit the
+  [[appdistro] reference documentation](/docs/reference/android/com/google/firebase/appdistribution/package-summary).
+
+
+## Kotlin
+The [appdistro] Android library with Kotlin extensions is now available in
+beta. The Kotlin extensions library transitively includes the base
+`firebase-app-distribution` library. To learn more, visit the
+[[appdistro] KTX reference documentation](/docs/reference/kotlin/com/google/firebase/appdistribution/ktx/package-summary).
+
diff --git a/firebase-appdistribution/api.txt b/firebase-appdistribution/api.txt
index e4819fe2aa5..d802177e249 100644
--- a/firebase-appdistribution/api.txt
+++ b/firebase-appdistribution/api.txt
@@ -1,75 +1 @@
 // Signature format: 2.0
-package com.google.firebase.appdistribution {
-
-  public abstract class AppDistributionRelease {
-    ctor public AppDistributionRelease();
-    method @NonNull public abstract com.google.firebase.appdistribution.BinaryType getBinaryType();
-    method @NonNull public abstract String getDisplayVersion();
-    method @Nullable public abstract String getReleaseNotes();
-    method @NonNull public abstract long getVersionCode();
-  }
-
-  public enum BinaryType {
-    enum_constant public static final com.google.firebase.appdistribution.BinaryType AAB;
-    enum_constant public static final com.google.firebase.appdistribution.BinaryType APK;
-  }
-
-  public class FirebaseAppDistribution {
-    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.appdistribution.AppDistributionRelease> checkForNewRelease();
-    method @NonNull public static com.google.firebase.appdistribution.FirebaseAppDistribution getInstance();
-    method public boolean isTesterSignedIn();
-    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> signInTester();
-    method public void signOutTester();
-    method @NonNull public com.google.firebase.appdistribution.UpdateTask updateApp();
-    method @NonNull public com.google.firebase.appdistribution.UpdateTask updateIfNewReleaseAvailable();
-  }
-
-  public class FirebaseAppDistributionException extends com.google.firebase.FirebaseException {
-    method @NonNull public com.google.firebase.appdistribution.FirebaseAppDistributionException.Status getErrorCode();
-    method @Nullable public com.google.firebase.appdistribution.AppDistributionRelease getRelease();
-  }
-
-  public enum FirebaseAppDistributionException.Status {
-    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status AUTHENTICATION_CANCELED;
-    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status AUTHENTICATION_FAILURE;
-    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status DOWNLOAD_FAILURE;
-    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status HOST_ACTIVITY_INTERRUPTED;
-    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status INSTALLATION_CANCELED;
-    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status INSTALLATION_FAILURE;
-    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status NETWORK_FAILURE;
-    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status UNKNOWN;
-    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status UPDATE_NOT_AVAILABLE;
-  }
-
-  public interface OnProgressListener {
-    method public void onProgressUpdate(@NonNull com.google.firebase.appdistribution.UpdateProgress);
-  }
-
-  public abstract class UpdateProgress {
-    ctor public UpdateProgress();
-    method @NonNull public abstract long getApkBytesDownloaded();
-    method @NonNull public abstract long getApkFileTotalBytes();
-    method @NonNull public abstract com.google.firebase.appdistribution.UpdateStatus getUpdateStatus();
-  }
-
-  public enum UpdateStatus {
-    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus DOWNLOADED;
-    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus DOWNLOADING;
-    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus DOWNLOAD_FAILED;
-    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus INSTALL_CANCELED;
-    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus INSTALL_FAILED;
-    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus NEW_RELEASE_CHECK_FAILED;
-    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus NEW_RELEASE_NOT_AVAILABLE;
-    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus PENDING;
-    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus REDIRECTED_TO_PLAY;
-    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus UPDATE_CANCELED;
-  }
-
-  public abstract class UpdateTask extends com.google.android.gms.tasks.Task<java.lang.Void> {
-    ctor public UpdateTask();
-    method @NonNull public abstract com.google.firebase.appdistribution.UpdateTask addOnProgressListener(@NonNull com.google.firebase.appdistribution.OnProgressListener);
-    method @NonNull public abstract com.google.firebase.appdistribution.UpdateTask addOnProgressListener(@Nullable java.util.concurrent.Executor, @NonNull com.google.firebase.appdistribution.OnProgressListener);
-  }
-
-}
-
diff --git a/firebase-appdistribution/firebase-appdistribution.gradle b/firebase-appdistribution/firebase-appdistribution.gradle
index 9a16dc971fb..d8e98eb86d9 100644
--- a/firebase-appdistribution/firebase-appdistribution.gradle
+++ b/firebase-appdistribution/firebase-appdistribution.gradle
@@ -14,17 +14,27 @@
 
 plugins {
     id 'firebase-library'
+    id 'firebase-vendor'
+}
+
+firebaseLibrary {
+    libraryGroup "appdistribution"
+    publishJavadoc = false
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.appdistribution.impl"
+    compileSdkVersion project.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         multiDexEnabled true
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -37,24 +47,63 @@ android {
     }
 }
 
+thirdPartyLicenses {
+    add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"
+}
+
 dependencies {
-    implementation 'org.jetbrains:annotations:15.0'
-    implementation project(':firebase-components')
-    implementation project(':firebase-installations-interop')
-    implementation project(':firebase-common')
-    runtimeOnly project(':firebase-installations')
+    vendor (libs.dagger.dagger) {
+        exclude group: "javax.inject", module: "javax.inject"
+    }
 
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'org.mockito:mockito-inline:3.4.0'
-    androidTestImplementation "org.mockito:mockito-android:3.4.0"
-    testImplementation 'androidx.test:core:1.2.0'
+    api("com.google.firebase:firebase-appdistribution-api:16.0.0-beta11") {
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    api 'com.google.firebase:firebase-common:21.0.0'
+    api 'com.google.firebase:firebase-components:18.0.0'
+    api('com.google.firebase:firebase-installations-interop:17.1.0') {
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
 
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation "androidx.browser:browser:1.3.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    implementation libs.javax.inject
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22")
 
     compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
+
+    runtimeOnly('com.google.firebase:firebase-installations:17.1.3') {
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+
     annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation "androidx.browser:browser:1.3.0"
-}
\ No newline at end of file
+    annotationProcessor libs.dagger.compiler
+
+    testImplementation project(path: ':firebase-appdistribution')
+    testImplementation(project(":integ-testing")){
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+
+    androidTestImplementation(project(":integ-testing")){
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    androidTestImplementation "androidx.annotation:annotation:1.0.0"
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
+    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
+    androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
+}
diff --git a/firebase-appdistribution/gradle.properties b/firebase-appdistribution/gradle.properties
index 510e2ba1e4a..6bde188fe15 100644
--- a/firebase-appdistribution/gradle.properties
+++ b/firebase-appdistribution/gradle.properties
@@ -12,4 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=0.0.1
\ No newline at end of file
+version=17.0.1
+latestReleasedVersion=17.0.0
diff --git a/firebase-appdistribution/ktx/api.txt b/firebase-appdistribution/ktx/api.txt
deleted file mode 100644
index b9175165c95..00000000000
--- a/firebase-appdistribution/ktx/api.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Signature format: 2.0
-package com.google.firebase.appdistribution.ktx {
-
-  public final class FirebaseAppDistributionKt {
-    ctor public FirebaseAppDistributionKt();
-    method @NonNull public static com.google.firebase.appdistribution.FirebaseAppDistribution getAppDistribution(@NonNull com.google.firebase.ktx.Firebase);
-  }
-
-}
-
diff --git a/firebase-appdistribution/ktx/src/androidTest/kotlin/com/google/firebase/app/distribution/ktx/FirebaseAppDistributionTests.kt b/firebase-appdistribution/ktx/src/androidTest/kotlin/com/google/firebase/app/distribution/ktx/FirebaseAppDistributionTests.kt
deleted file mode 100644
index fba14856225..00000000000
--- a/firebase-appdistribution/ktx/src/androidTest/kotlin/com/google/firebase/app/distribution/ktx/FirebaseAppDistributionTests.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution.ktx
-
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
-import com.google.common.truth.Truth
-import com.google.firebase.FirebaseApp
-import com.google.firebase.FirebaseOptions
-import com.google.firebase.appdistribution.FirebaseAppDistribution
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.ktx.app
-import com.google.firebase.ktx.initialize
-import com.google.firebase.platforminfo.UserAgentPublisher
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-const val APP_ID = "APP_ID"
-const val API_KEY = "API_KEY"
-
-const val EXISTING_APP = "existing"
-
-@RunWith(AndroidJUnit4ClassRunner::class)
-abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
-
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build(),
-                EXISTING_APP
-        )
-    }
-
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
-}
-
-@RunWith(AndroidJUnit4ClassRunner::class)
-class FirebaseAppDistributionTests : BaseTestCase() {
-    @Test
-    fun appDistribution_default_callsDefaultGetInstance() {
-        Truth.assertThat(Firebase.appDistribution).isSameInstanceAs(FirebaseAppDistribution.getInstance())
-    }
-}
-
-internal const val LIBRARY_NAME: String = "fire-appdistribution-ktx"
-
-@RunWith(AndroidJUnit4ClassRunner::class)
-class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun libraryRegistrationAtRuntime() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        Truth.assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
-}
diff --git a/firebase-appdistribution/ktx/src/main/kotlin/com/google/firebase/appdistribution/ktx/FirebaseAppDistribution.kt b/firebase-appdistribution/ktx/src/main/kotlin/com/google/firebase/appdistribution/ktx/FirebaseAppDistribution.kt
deleted file mode 100644
index 748a5141357..00000000000
--- a/firebase-appdistribution/ktx/src/main/kotlin/com/google/firebase/appdistribution/ktx/FirebaseAppDistribution.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution.ktx
-
-import androidx.annotation.Keep
-import com.google.firebase.BuildConfig
-import com.google.firebase.FirebaseApp
-import com.google.firebase.appdistribution.FirebaseAppDistribution
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.platforminfo.LibraryVersionComponent
-
-/** Returns the [FirebaseAppDistribution] instance of the default [FirebaseApp]. */
-val Firebase.appDistribution: FirebaseAppDistribution
-    get() = FirebaseAppDistribution.getInstance()
-
-internal const val LIBRARY_NAME: String = "fire-appdistribution-ktx"
-
-/** @suppress */
-@Keep
-class FirebaseAppDistributionKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-appdistribution/src/androidTest/AndroidManifest.xml b/firebase-appdistribution/src/androidTest/AndroidManifest.xml
new file mode 100644
index 00000000000..70f1229df91
--- /dev/null
+++ b/firebase-appdistribution/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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">
+
+    <application>
+        <uses-library android:name="android.test.runner"/>
+    </application>
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.google.firebase.appdistribution" />
+</manifest>
diff --git a/firebase-appdistribution/src/androidTest/java/com/google/firebase/appdistribution/StrictModeTest.java b/firebase-appdistribution/src/androidTest/java/com/google/firebase/appdistribution/StrictModeTest.java
new file mode 100644
index 00000000000..1dd80c24e2a
--- /dev/null
+++ b/firebase-appdistribution/src/androidTest/java/com/google/firebase/appdistribution/StrictModeTest.java
@@ -0,0 +1,48 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.appdistribution.internal.FirebaseAppDistributionProxy;
+import com.google.firebase.testing.integ.StrictModeRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class StrictModeTest {
+
+  @Rule public StrictModeRule strictMode = new StrictModeRule();
+
+  @Test
+  public void initializingFirebaseAppdistribution_shouldNotViolateStrictMode() {
+    strictMode.runOnMainThread(
+        () -> {
+          FirebaseApp app =
+              FirebaseApp.initializeApp(
+                  ApplicationProvider.getApplicationContext(),
+                  new FirebaseOptions.Builder()
+                      .setApiKey("api")
+                      .setProjectId("123")
+                      .setApplicationId("appId")
+                      .build(),
+                  "hello");
+          app.get(FirebaseAppDistribution.class);
+          app.get(FirebaseAppDistributionProxy.class);
+        });
+  }
+}
diff --git a/firebase-appdistribution/src/main/AndroidManifest.xml b/firebase-appdistribution/src/main/AndroidManifest.xml
index 23e2c671ce8..ef91581edc3 100644
--- a/firebase-appdistribution/src/main/AndroidManifest.xml
+++ b/firebase-appdistribution/src/main/AndroidManifest.xml
@@ -13,12 +13,12 @@
 <!-- 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="com.google.firebase.appdistribution">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application>
@@ -26,27 +26,37 @@
             android:name="com.google.firebase.components.ComponentDiscoveryService"
             android:exported="false">
             <meta-data
-                android:name="com.google.firebase.components:com.google.firebase.appdistribution.FirebaseAppDistributionRegistrar"
+                android:name="com.google.firebase.components:com.google.firebase.appdistribution.impl.FirebaseAppDistributionRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
+
         <!-- The launch mode for Install Activity is singleTask to ensure that after the unknown sources UI
         or the installation flow is complete, the Install Activity does not get recreated which causes loss of state
          See here for more info - https://developer.android.com/guide/components/activities/tasks-and-back-stack#ManifestForTasks -->
-        <activity android:name="com.google.firebase.appdistribution.internal.InstallActivity" android:exported="true" android:launchMode="singleTask"/>
+        <activity android:name="com.google.firebase.appdistribution.impl.InstallActivity" android:exported="true" android:launchMode="singleTask"/>
 
-        <activity android:name="com.google.firebase.appdistribution.internal.SignInResultActivity" android:exported="true">
+        <activity android:name="com.google.firebase.appdistribution.impl.SignInResultActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
-                <data android:scheme="appdistribution-${applicationId}" android:host="authredirect" />
+                <data android:scheme="intent" android:host="appdistribution" android:path="/${applicationId}"/>
 
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".FeedbackActivity"
+            android:exported="false"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+
+        <activity
+            android:name=".TakeScreenshotAndStartFeedbackActivity"
+            android:exported="false" />
+
         <provider
-            android:name="com.google.firebase.appdistribution.internal.FirebaseAppDistributionFileProvider"
+            android:name="com.google.firebase.appdistribution.impl.FirebaseAppDistributionFileProvider"
             android:authorities="${applicationId}.FirebaseAppDistributionFileProvider"
             android:exported="false"
             android:grantUriPermissions="true">
@@ -55,4 +65,4 @@
                 android:resource="@xml/firebase_app_distribution_provider_paths" />
         </provider>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ApkInstaller.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ApkInstaller.java
deleted file mode 100644
index 64ea7d1460b..00000000000
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ApkInstaller.java
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskException;
-
-import android.app.Activity;
-import android.content.Intent;
-import androidx.annotation.GuardedBy;
-import androidx.annotation.Nullable;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.TaskCompletionSource;
-import com.google.firebase.appdistribution.internal.InstallActivity;
-import com.google.firebase.appdistribution.internal.LogWrapper;
-
-/** Class that handles installing APKs in {@link FirebaseAppDistribution}. */
-class ApkInstaller {
-  private static final String TAG = "ApkInstaller:";
-  private final FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier;
-
-  @GuardedBy("installTaskLock")
-  private TaskCompletionSource<Void> installTaskCompletionSource;
-
-  private final Object installTaskLock = new Object();
-
-  ApkInstaller(FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier) {
-    this.lifeCycleNotifier = lifeCycleNotifier;
-    lifeCycleNotifier.addOnActivityStartedListener(this::onActivityStarted);
-    lifeCycleNotifier.addOnActivityDestroyedListener(this::onActivityDestroyed);
-  }
-
-  ApkInstaller() {
-    this(FirebaseAppDistributionLifecycleNotifier.getInstance());
-  }
-
-  void onActivityStarted(@Nullable Activity activity) {
-    synchronized (installTaskLock) {
-      if (installTaskCompletionSource == null
-          || installTaskCompletionSource.getTask().isComplete()
-          || activity == null) {
-        return;
-      }
-    }
-  }
-
-  void onActivityDestroyed(@Nullable Activity activity) {
-    if (activity instanceof InstallActivity) {
-      // Since install activity is destroyed but app is still active, installation has failed /
-      // cancelled.
-      this.trySetInstallTaskError();
-    }
-  }
-
-  Task<Void> installApk(String path, Activity currentActivity) {
-    synchronized (installTaskLock) {
-      startInstallActivity(path, currentActivity);
-
-      if (this.installTaskCompletionSource == null
-          || this.installTaskCompletionSource.getTask().isComplete()) {
-        this.installTaskCompletionSource = new TaskCompletionSource<>();
-      }
-      return installTaskCompletionSource.getTask();
-    }
-  }
-
-  private void startInstallActivity(String path, Activity currentActivity) {
-    Intent intent = new Intent(currentActivity, InstallActivity.class);
-    intent.putExtra("INSTALL_PATH", path);
-    currentActivity.startActivity(intent);
-    LogWrapper.getInstance().v(TAG + "Prompting tester with install activity ");
-  }
-
-  void trySetInstallTaskError() {
-    synchronized (installTaskLock) {
-      safeSetTaskException(
-          installTaskCompletionSource,
-          new FirebaseAppDistributionException(
-              FirebaseAppDistributionException.ErrorMessages.APK_INSTALLATION_FAILED,
-              FirebaseAppDistributionException.Status.INSTALLATION_FAILURE));
-    }
-  }
-}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistribution.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistribution.java
deleted file mode 100644
index 779ba633e78..00000000000
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistribution.java
+++ /dev/null
@@ -1,535 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_CANCELED;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.HOST_ACTIVITY_INTERRUPTED;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.UPDATE_NOT_AVAILABLE;
-import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskException;
-import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskResult;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import androidx.annotation.GuardedBy;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.TaskCompletionSource;
-import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.appdistribution.internal.LogWrapper;
-import com.google.firebase.appdistribution.internal.SignInStorage;
-import com.google.firebase.inject.Provider;
-import com.google.firebase.installations.FirebaseInstallationsApi;
-
-/**
- * The Firebase App Distribution API provides methods to update the app to the most recent
- * pre-release build.
- *
- * <p>By default, Firebase App Distribution is automatically initialized.
- *
- * <p>Call {@link FirebaseAppDistribution#getInstance()} to get the singleton instance of
- * FirebaseAppDistribution.
- */
-public class FirebaseAppDistribution {
-
-  private static final int UNKNOWN_RELEASE_FILE_SIZE = -1;
-
-  private final FirebaseApp firebaseApp;
-  private final TesterSignInManager testerSignInManager;
-  private final NewReleaseFetcher newReleaseFetcher;
-  private final FirebaseAppDistributionLifecycleNotifier lifecycleNotifier;
-  private final ApkUpdater apkUpdater;
-  private final AabUpdater aabUpdater;
-  private final SignInStorage signInStorage;
-
-  private final Object updateIfNewReleaseTaskLock = new Object();
-
-  @GuardedBy("updateIfNewReleaseTaskLock")
-  private UpdateTaskImpl cachedUpdateIfNewReleaseTask;
-
-  private final Object cachedNewReleaseLock = new Object();
-
-  @GuardedBy("cachedNewReleaseLock")
-  private AppDistributionReleaseInternal cachedNewRelease;
-
-  private Task<AppDistributionRelease> cachedCheckForNewReleaseTask;
-  private AlertDialog updateConfirmationDialog;
-  private AlertDialog signInConfirmationDialog;
-  @Nullable private Activity dialogHostActivity = null;
-
-  private boolean remakeSignInConfirmationDialog = false;
-  private boolean remakeUpdateConfirmationDialog = false;
-
-  private TaskCompletionSource<Void> showSignInDialogTask = null;
-  private TaskCompletionSource<Void> showUpdateDialogTask = null;
-
-  /** Constructor for FirebaseAppDistribution. */
-  @VisibleForTesting
-  FirebaseAppDistribution(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull TesterSignInManager testerSignInManager,
-      @NonNull NewReleaseFetcher newReleaseFetcher,
-      @NonNull ApkUpdater apkUpdater,
-      @NonNull AabUpdater aabUpdater,
-      @NonNull SignInStorage signInStorage,
-      @NonNull FirebaseAppDistributionLifecycleNotifier lifecycleNotifier) {
-    this.firebaseApp = firebaseApp;
-    this.testerSignInManager = testerSignInManager;
-    this.newReleaseFetcher = newReleaseFetcher;
-    this.apkUpdater = apkUpdater;
-    this.aabUpdater = aabUpdater;
-    this.signInStorage = signInStorage;
-    this.lifecycleNotifier = lifecycleNotifier;
-    lifecycleNotifier.addOnActivityDestroyedListener(this::onActivityDestroyed);
-    lifecycleNotifier.addOnActivityPausedListener(this::onActivityPaused);
-    lifecycleNotifier.addOnActivityResumedListener(this::onActivityResumed);
-  }
-
-  /** Constructor for FirebaseAppDistribution. */
-  FirebaseAppDistribution(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider,
-      @NonNull SignInStorage signInStorage,
-      @NonNull FirebaseAppDistributionLifecycleNotifier lifecycleNotifier) {
-    this(
-        firebaseApp,
-        new TesterSignInManager(firebaseApp, firebaseInstallationsApiProvider, signInStorage),
-        new NewReleaseFetcher(
-            firebaseApp,
-            new FirebaseAppDistributionTesterApiClient(),
-            firebaseInstallationsApiProvider),
-        new ApkUpdater(firebaseApp, new ApkInstaller()),
-        new AabUpdater(),
-        signInStorage,
-        lifecycleNotifier);
-  }
-
-  /** Constructor for FirebaseAppDistribution. */
-  FirebaseAppDistribution(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider) {
-    this(
-        firebaseApp,
-        firebaseInstallationsApiProvider,
-        new SignInStorage(firebaseApp.getApplicationContext()),
-        FirebaseAppDistributionLifecycleNotifier.getInstance());
-  }
-
-  /** Gets the singleton {@link FirebaseAppDistribution} instance. */
-  @NonNull
-  public static FirebaseAppDistribution getInstance() {
-    return FirebaseApp.getInstance().get(FirebaseAppDistribution.class);
-  }
-
-  /**
-   * Updates the app to the newest release, if one is available.
-   *
-   * <p>Returns the release information or {@code null} if no update is found. Performs the
-   * following actions:
-   *
-   * <ol>
-   *   <li>If tester is not signed in, presents the tester with a Google Sign-in UI.
-   *   <li>Checks if a newer release is available. If so, presents the tester with a confirmation
-   *       dialog to begin the download.
-   *   <li>If the newest release is an APK, downloads the binary and starts an installation. If the
-   *       newest release is an AAB, directs the tester to the Play app to complete the download and
-   *       installation.
-   * </ol>
-   */
-  @NonNull
-  public UpdateTask updateIfNewReleaseAvailable() {
-    synchronized (updateIfNewReleaseTaskLock) {
-      if (updateIfNewReleaseAvailableIsTaskInProgress()) {
-        return cachedUpdateIfNewReleaseTask;
-      }
-      cachedUpdateIfNewReleaseTask = new UpdateTaskImpl();
-      remakeSignInConfirmationDialog = false;
-      remakeUpdateConfirmationDialog = false;
-      dialogHostActivity = null;
-    }
-
-    lifecycleNotifier
-        .applyToForegroundActivityTask(this::showSignInConfirmationDialog)
-        .onSuccessTask(unused -> signInTester())
-        .onSuccessTask(unused -> checkForNewRelease())
-        .continueWithTask(
-            task -> {
-              if (!task.isSuccessful()) {
-                postProgressToCachedUpdateIfNewReleaseTask(
-                    UpdateProgress.builder()
-                        .setApkBytesDownloaded(UNKNOWN_RELEASE_FILE_SIZE)
-                        .setApkFileTotalBytes(UNKNOWN_RELEASE_FILE_SIZE)
-                        .setUpdateStatus(UpdateStatus.NEW_RELEASE_CHECK_FAILED)
-                        .build());
-              }
-              // if the task failed, this get() will cause the error to propagate to the handler
-              // below
-              AppDistributionRelease release = task.getResult();
-              if (release == null) {
-                postProgressToCachedUpdateIfNewReleaseTask(
-                    UpdateProgress.builder()
-                        .setApkFileTotalBytes(UNKNOWN_RELEASE_FILE_SIZE)
-                        .setApkBytesDownloaded(UNKNOWN_RELEASE_FILE_SIZE)
-                        .setUpdateStatus(UpdateStatus.NEW_RELEASE_NOT_AVAILABLE)
-                        .build());
-                setCachedUpdateIfNewReleaseResult();
-                return Tasks.forResult(null);
-              }
-              return lifecycleNotifier.applyToForegroundActivityTask(
-                  activity -> showUpdateConfirmationDialog(activity, release));
-            })
-        .onSuccessTask(
-            unused ->
-                updateApp(true)
-                    .addOnProgressListener(this::postProgressToCachedUpdateIfNewReleaseTask))
-        .addOnFailureListener(this::setCachedUpdateIfNewReleaseCompletionError);
-
-    synchronized (updateIfNewReleaseTaskLock) {
-      return cachedUpdateIfNewReleaseTask;
-    }
-  }
-
-  private Task<Void> showSignInConfirmationDialog(Activity hostActivity) {
-    if (isTesterSignedIn()) {
-      return Tasks.forResult(null);
-    }
-
-    if (showSignInDialogTask == null || showSignInDialogTask.getTask().isComplete()) {
-      showSignInDialogTask = new TaskCompletionSource<>();
-    }
-
-    dialogHostActivity = hostActivity;
-
-    // We may not be on the main (UI) thread in some cases, specifically if the developer calls
-    // the basic config from the background. If we are already on the main thread, this will
-    // execute immediately.
-    hostActivity.runOnUiThread(
-        () -> {
-          signInConfirmationDialog = new AlertDialog.Builder(hostActivity).create();
-
-          Context context = firebaseApp.getApplicationContext();
-          signInConfirmationDialog.setTitle(context.getString(R.string.signin_dialog_title));
-          signInConfirmationDialog.setMessage(context.getString(R.string.singin_dialog_message));
-
-          signInConfirmationDialog.setButton(
-              AlertDialog.BUTTON_POSITIVE,
-              context.getString(R.string.singin_yes_button),
-              (dialogInterface, i) -> showSignInDialogTask.setResult(null));
-
-          signInConfirmationDialog.setButton(
-              AlertDialog.BUTTON_NEGATIVE,
-              context.getString(R.string.singin_no_button),
-              (dialogInterface, i) ->
-                  showSignInDialogTask.setException(
-                      new FirebaseAppDistributionException(
-                          FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_CANCELED,
-                          AUTHENTICATION_CANCELED)));
-
-          signInConfirmationDialog.setOnCancelListener(
-              dialogInterface ->
-                  showSignInDialogTask.setException(
-                      new FirebaseAppDistributionException(
-                          FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_CANCELED,
-                          AUTHENTICATION_CANCELED)));
-
-          signInConfirmationDialog.show();
-        });
-    return showSignInDialogTask.getTask();
-  }
-
-  /** Signs in the App Distribution tester. Presents the tester with a Google sign in UI. */
-  @NonNull
-  public Task<Void> signInTester() {
-    return this.testerSignInManager.signInTester();
-  }
-
-  /**
-   * Returns an {@link AppDistributionRelease} if an update is available for the current signed in
-   * tester, or {@code null} otherwise.
-   */
-  @NonNull
-  public synchronized Task<AppDistributionRelease> checkForNewRelease() {
-    if (cachedCheckForNewReleaseTask != null && !cachedCheckForNewReleaseTask.isComplete()) {
-      LogWrapper.getInstance().v("Response in progress");
-      return cachedCheckForNewReleaseTask;
-    }
-    if (!isTesterSignedIn()) {
-      return Tasks.forException(
-          new FirebaseAppDistributionException("Tester is not signed in", AUTHENTICATION_FAILURE));
-    }
-
-    cachedCheckForNewReleaseTask =
-        this.newReleaseFetcher
-            .checkForNewRelease()
-            .onSuccessTask(
-                appDistributionReleaseInternal -> {
-                  setCachedNewRelease(appDistributionReleaseInternal);
-                  return Tasks.forResult(
-                      ReleaseUtils.convertToAppDistributionRelease(appDistributionReleaseInternal));
-                })
-            .addOnFailureListener(
-                e -> {
-                  if (e instanceof FirebaseAppDistributionException
-                      && ((FirebaseAppDistributionException) e).getErrorCode()
-                          == AUTHENTICATION_FAILURE) {
-                    // If CheckForNewRelease returns authentication error, the FID is no longer
-                    // valid or does not have access to the latest release. So sign out the tester
-                    // to force FID re-registration
-                    signOutTester();
-                  }
-                });
-
-    return cachedCheckForNewReleaseTask;
-  }
-
-  /**
-   * Updates app to the {@link AppDistributionRelease} returned by {@link #checkForNewRelease}.
-   *
-   * <p>If the newest release is an APK, downloads the binary and starts an installation. If the
-   * newest release is an AAB, directs the tester to the Play app to complete the download and
-   * installation.
-   *
-   * <p>Cancels task with {@link Status#UPDATE_NOT_AVAILABLE} if no new release is cached from
-   * {@link #checkForNewRelease}.
-   */
-  @NonNull
-  public UpdateTask updateApp() {
-    return updateApp(false);
-  }
-
-  /**
-   * Overloaded updateApp with boolean input showDownloadInNotificationsManager. Set to true for
-   * basic configuration and false for advanced configuration.
-   */
-  private UpdateTask updateApp(boolean showDownloadInNotificationManager) {
-    synchronized (cachedNewReleaseLock) {
-      if (!isTesterSignedIn()) {
-        UpdateTaskImpl updateTask = new UpdateTaskImpl();
-        updateTask.setException(
-            new FirebaseAppDistributionException(
-                "Tester is not signed in", AUTHENTICATION_FAILURE));
-        return updateTask;
-      }
-      if (cachedNewRelease == null) {
-        LogWrapper.getInstance().v("New release not found.");
-        return getErrorUpdateTask(
-            new FirebaseAppDistributionException(
-                FirebaseAppDistributionException.ErrorMessages.NOT_FOUND_ERROR,
-                UPDATE_NOT_AVAILABLE));
-      }
-      if (cachedNewRelease.getDownloadUrl() == null) {
-        LogWrapper.getInstance().v("Download failed to execute.");
-        return getErrorUpdateTask(
-            new FirebaseAppDistributionException(
-                FirebaseAppDistributionException.ErrorMessages.DOWNLOAD_URL_NOT_FOUND,
-                FirebaseAppDistributionException.Status.DOWNLOAD_FAILURE));
-      }
-
-      if (cachedNewRelease.getBinaryType() == BinaryType.AAB) {
-        return this.aabUpdater.updateAab(cachedNewRelease);
-      } else {
-        return this.apkUpdater.updateApk(cachedNewRelease, showDownloadInNotificationManager);
-      }
-    }
-  }
-
-  /** Returns {@code true} if the App Distribution tester is signed in. */
-  public boolean isTesterSignedIn() {
-    return this.signInStorage.getSignInStatus();
-  }
-
-  /** Signs out the App Distribution tester. */
-  public void signOutTester() {
-    setCachedNewRelease(null);
-    this.signInStorage.setSignInStatus(false);
-  }
-
-  @VisibleForTesting
-  void onActivityResumed(Activity activity) {
-    if (awaitingSignInDialogConfirmation()) {
-      if (dialogHostActivity != null && dialogHostActivity != activity) {
-        showSignInDialogTask.setException(
-            new FirebaseAppDistributionException(
-                FirebaseAppDistributionException.ErrorMessages.HOST_ACTIVITY_INTERRUPTED,
-                HOST_ACTIVITY_INTERRUPTED));
-      } else {
-        showSignInConfirmationDialog(activity);
-      }
-    }
-
-    if (awaitingUpdateDialogConfirmation()) {
-      if (dialogHostActivity != null && dialogHostActivity != activity) {
-        showUpdateDialogTask.setException(
-            new FirebaseAppDistributionException(
-                FirebaseAppDistributionException.ErrorMessages.HOST_ACTIVITY_INTERRUPTED,
-                HOST_ACTIVITY_INTERRUPTED));
-      } else {
-        synchronized (cachedNewReleaseLock) {
-          showUpdateConfirmationDialog(
-              activity, ReleaseUtils.convertToAppDistributionRelease(cachedNewRelease));
-        }
-      }
-    }
-  }
-
-  @VisibleForTesting
-  void onActivityPaused(Activity activity) {
-    if (activity == dialogHostActivity) {
-      remakeSignInConfirmationDialog =
-          signInConfirmationDialog != null && signInConfirmationDialog.isShowing();
-      remakeUpdateConfirmationDialog =
-          updateConfirmationDialog != null && updateConfirmationDialog.isShowing();
-      dismissDialogs();
-    }
-  }
-
-  @VisibleForTesting
-  void onActivityDestroyed(@NonNull Activity activity) {
-    // If the dialogHostActivity is being destroyed it is set to null. This is to ensure onResume
-    // shows the dialog on a configuration change and does not check the activity reference.
-    if (activity == dialogHostActivity) {
-      dialogHostActivity = null;
-    }
-  }
-
-  @VisibleForTesting
-  void setCachedNewRelease(@Nullable AppDistributionReleaseInternal newRelease) {
-    synchronized (cachedNewReleaseLock) {
-      this.cachedNewRelease = newRelease;
-    }
-  }
-
-  @VisibleForTesting
-  AppDistributionReleaseInternal getCachedNewRelease() {
-    synchronized (cachedNewReleaseLock) {
-      return this.cachedNewRelease;
-    }
-  }
-
-  private Task<Void> showUpdateConfirmationDialog(
-      Activity hostActivity, AppDistributionRelease newRelease) {
-
-    if (showUpdateDialogTask == null || showUpdateDialogTask.getTask().isComplete()) {
-      showUpdateDialogTask = new TaskCompletionSource<>();
-    }
-
-    Context context = firebaseApp.getApplicationContext();
-    dialogHostActivity = hostActivity;
-
-    // We should already be on the main (UI) thread here, but be explicit just to be safe. If we are
-    // already on the main thread, this will execute immediately.
-    hostActivity.runOnUiThread(
-        () -> {
-          updateConfirmationDialog = new AlertDialog.Builder(hostActivity).create();
-          updateConfirmationDialog.setTitle(context.getString(R.string.update_dialog_title));
-
-          StringBuilder message =
-              new StringBuilder(
-                  String.format(
-                      "Version %s (%s) is available.",
-                      newRelease.getDisplayVersion(), newRelease.getVersionCode()));
-
-          if (newRelease.getReleaseNotes() != null && !newRelease.getReleaseNotes().isEmpty()) {
-            message.append(String.format("\n\nRelease notes: %s", newRelease.getReleaseNotes()));
-          }
-          updateConfirmationDialog.setMessage(message);
-
-          updateConfirmationDialog.setButton(
-              AlertDialog.BUTTON_POSITIVE,
-              context.getString(R.string.update_yes_button),
-              (dialogInterface, i) -> showUpdateDialogTask.setResult(null));
-
-          updateConfirmationDialog.setButton(
-              AlertDialog.BUTTON_NEGATIVE,
-              context.getString(R.string.update_no_button),
-              (dialogInterface, i) ->
-                  showUpdateDialogTask.setException(
-                      new FirebaseAppDistributionException(
-                          FirebaseAppDistributionException.ErrorMessages.UPDATE_CANCELED,
-                          Status.INSTALLATION_CANCELED)));
-
-          updateConfirmationDialog.setOnCancelListener(
-              dialogInterface ->
-                  showUpdateDialogTask.setException(
-                      new FirebaseAppDistributionException(
-                          FirebaseAppDistributionException.ErrorMessages.UPDATE_CANCELED,
-                          Status.INSTALLATION_CANCELED)));
-
-          updateConfirmationDialog.show();
-        });
-
-    return showUpdateDialogTask.getTask();
-  }
-
-  private void setCachedUpdateIfNewReleaseCompletionError(Exception e) {
-    synchronized (updateIfNewReleaseTaskLock) {
-      safeSetTaskException(cachedUpdateIfNewReleaseTask, e);
-    }
-    dismissDialogs();
-  }
-
-  private void postProgressToCachedUpdateIfNewReleaseTask(UpdateProgress progress) {
-    synchronized (updateIfNewReleaseTaskLock) {
-      if (cachedUpdateIfNewReleaseTask != null && !cachedUpdateIfNewReleaseTask.isComplete()) {
-        cachedUpdateIfNewReleaseTask.updateProgress(progress);
-      }
-    }
-  }
-
-  private void setCachedUpdateIfNewReleaseResult() {
-    synchronized (updateIfNewReleaseTaskLock) {
-      safeSetTaskResult(cachedUpdateIfNewReleaseTask);
-    }
-    dismissDialogs();
-  }
-
-  private void dismissDialogs() {
-    if (signInConfirmationDialog != null && signInConfirmationDialog.isShowing()) {
-      signInConfirmationDialog.dismiss();
-    }
-    if (updateConfirmationDialog != null && updateConfirmationDialog.isShowing()) {
-      updateConfirmationDialog.dismiss();
-    }
-  }
-
-  private UpdateTaskImpl getErrorUpdateTask(Exception e) {
-    UpdateTaskImpl updateTask = new UpdateTaskImpl();
-    updateTask.setException(e);
-    return updateTask;
-  }
-
-  private boolean updateIfNewReleaseAvailableIsTaskInProgress() {
-    synchronized (updateIfNewReleaseTaskLock) {
-      return cachedUpdateIfNewReleaseTask != null && !cachedUpdateIfNewReleaseTask.isComplete();
-    }
-  }
-
-  private boolean awaitingSignInDialogConfirmation() {
-    return (showSignInDialogTask != null
-        && !showSignInDialogTask.getTask().isComplete()
-        && remakeSignInConfirmationDialog);
-  }
-
-  private boolean awaitingUpdateDialogConfirmation() {
-    return (showUpdateDialogTask != null
-        && !showUpdateDialogTask.getTask().isComplete()
-        && remakeUpdateConfirmationDialog);
-  }
-}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionLifecycleNotifier.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionLifecycleNotifier.java
deleted file mode 100644
index afbedbf40a2..00000000000
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionLifecycleNotifier.java
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import android.app.Activity;
-import android.app.Application;
-import android.os.Bundle;
-import androidx.annotation.GuardedBy;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import com.google.android.gms.tasks.SuccessContinuation;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.TaskCompletionSource;
-import com.google.android.gms.tasks.Tasks;
-import java.util.ArrayDeque;
-import java.util.Queue;
-import java.util.concurrent.Executor;
-
-class FirebaseAppDistributionLifecycleNotifier implements Application.ActivityLifecycleCallbacks {
-
-  /** An {@link Executor} that runs tasks on the current thread. */
-  private static final Executor DIRECT_EXECUTOR = Runnable::run;
-
-  /** A functional interface for a function that takes an activity and does something with it. */
-  interface ActivityConsumer<T> {
-    void consume(Activity activity);
-  }
-
-  private static FirebaseAppDistributionLifecycleNotifier instance;
-  private final Object lock = new Object();
-
-  @GuardedBy("lock")
-  private Activity currentActivity;
-
-  /** A queue of listeners that trigger when the activity is foregrounded. */
-  @GuardedBy("lock")
-  private final Queue<OnActivityCreatedListener> onActivityCreatedListeners = new ArrayDeque<>();
-
-  /** A queue of listeners that trigger when the activity is foregrounded. */
-  @GuardedBy("lock")
-  private final Queue<OnActivityStartedListener> onActivityStartedListeners = new ArrayDeque<>();
-
-  /** A queue of listeners that trigger when the activity is resumed. */
-  @GuardedBy("lock")
-  private final Queue<OnActivityResumedListener> onActivityResumedListeners = new ArrayDeque<>();
-
-  /** A queue of listeners that trigger when the activity is backgrounded. */
-  @GuardedBy("lock")
-  private final Queue<OnActivityPausedListener> onActivityPausedListeners = new ArrayDeque<>();
-
-  /** A queue of listeners that trigger when the activity is destroyed. */
-  @GuardedBy("lock")
-  private final Queue<OnActivityDestroyedListener> onDestroyedListeners = new ArrayDeque<>();
-
-  @VisibleForTesting
-  FirebaseAppDistributionLifecycleNotifier() {}
-
-  static synchronized FirebaseAppDistributionLifecycleNotifier getInstance() {
-    if (instance == null) {
-      instance = new FirebaseAppDistributionLifecycleNotifier();
-    }
-    return instance;
-  }
-
-  interface OnActivityCreatedListener {
-    void onCreated(Activity activity);
-  }
-
-  interface OnActivityStartedListener {
-    void onStarted(Activity activity);
-  }
-
-  interface OnActivityResumedListener {
-    void onResumed(Activity activity);
-  }
-
-  interface OnActivityPausedListener {
-    void onPaused(Activity activity);
-  }
-
-  interface OnActivityDestroyedListener {
-    void onDestroyed(Activity activity);
-  }
-
-  /**
-   * Apply a function to a foreground activity, when one is available, returning a {@link Task} that
-   * will complete immediately after the function is applied.
-   *
-   * <p>The consumer function will be called immediately once the activity is available. This may be
-   * on the main thread or the calling thread, depending on whether or not there is already a
-   * foreground activity available when this method is called.
-   */
-  Task<Void> applyToForegroundActivity(ActivityConsumer consumer) {
-    return getForegroundActivity()
-        .onSuccessTask(
-            // Use direct executor to ensure the consumer is called while Activity is in foreground
-            DIRECT_EXECUTOR,
-            activity -> {
-              try {
-                consumer.consume(activity);
-                return Tasks.forResult(null);
-              } catch (Throwable t) {
-                return Tasks.forException(FirebaseAppDistributionException.wrap(t));
-              }
-            });
-  }
-
-  /**
-   * Apply a function to a foreground activity, when one is available, returning a {@link Task} that
-   * will complete with the result of the Task returned by that function.
-   *
-   * <p>The continuation function will be called immediately once the activity is available. This
-   * may be on the main thread or the calling thread, depending on whether or not there is already a
-   * foreground activity available when this method is called.
-   */
-  <T> Task<T> applyToForegroundActivityTask(SuccessContinuation<Activity, T> continuation) {
-    return getForegroundActivity()
-        .onSuccessTask(
-            // Use direct executor to ensure the consumer is called while Activity is in foreground
-            DIRECT_EXECUTOR,
-            activity -> {
-              try {
-                return continuation.then(activity);
-              } catch (Throwable t) {
-                return Tasks.forException(FirebaseAppDistributionException.wrap(t));
-              }
-            });
-  }
-
-  private Task<Activity> getForegroundActivity() {
-    synchronized (lock) {
-      if (currentActivity != null) {
-        return Tasks.forResult(currentActivity);
-      }
-      TaskCompletionSource<Activity> task = new TaskCompletionSource<>();
-
-      addOnActivityResumedListener(
-          new OnActivityResumedListener() {
-            @Override
-            public void onResumed(Activity activity) {
-              task.setResult(activity);
-              removeOnActivityResumedListener(this);
-            }
-          });
-
-      return task.getTask();
-    }
-  }
-
-  void addOnActivityCreatedListener(@NonNull OnActivityCreatedListener listener) {
-    synchronized (lock) {
-      this.onActivityCreatedListeners.add(listener);
-    }
-  }
-
-  void addOnActivityStartedListener(@NonNull OnActivityStartedListener listener) {
-    synchronized (lock) {
-      this.onActivityStartedListeners.add(listener);
-    }
-  }
-
-  void addOnActivityDestroyedListener(@NonNull OnActivityDestroyedListener listener) {
-    synchronized (lock) {
-      this.onDestroyedListeners.add(listener);
-    }
-  }
-
-  void addOnActivityResumedListener(@NonNull OnActivityResumedListener listener) {
-    synchronized (lock) {
-      this.onActivityResumedListeners.add(listener);
-    }
-  }
-
-  void removeOnActivityResumedListener(@NonNull OnActivityResumedListener listener) {
-    synchronized (lock) {
-      this.onActivityResumedListeners.remove(listener);
-    }
-  }
-
-  void addOnActivityPausedListener(@NonNull OnActivityPausedListener listener) {
-    synchronized (lock) {
-      this.onActivityPausedListeners.add(listener);
-    }
-  }
-
-  @Override
-  public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle bundle) {
-    synchronized (lock) {
-      currentActivity = activity;
-      for (OnActivityCreatedListener listener : onActivityCreatedListeners) {
-        listener.onCreated(activity);
-      }
-    }
-  }
-
-  @Override
-  public void onActivityStarted(@NonNull Activity activity) {
-    synchronized (lock) {
-      currentActivity = activity;
-      for (OnActivityStartedListener listener : onActivityStartedListeners) {
-        listener.onStarted(activity);
-      }
-    }
-  }
-
-  @Override
-  public void onActivityResumed(@NonNull Activity activity) {
-    synchronized (lock) {
-      currentActivity = activity;
-      for (OnActivityResumedListener listener : onActivityResumedListeners) {
-        listener.onResumed(activity);
-      }
-    }
-  }
-
-  @Override
-  public void onActivityPaused(@NonNull Activity activity) {
-    synchronized (lock) {
-      if (this.currentActivity == activity) {
-        this.currentActivity = null;
-      }
-      for (OnActivityPausedListener listener : onActivityPausedListeners) {
-        listener.onPaused(activity);
-      }
-    }
-  }
-
-  @Override
-  public void onActivityStopped(@NonNull Activity activity) {}
-
-  @Override
-  public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle bundle) {}
-
-  @Override
-  public void onActivityDestroyed(@NonNull Activity activity) {
-    synchronized (lock) {
-      if (this.currentActivity == activity) {
-        this.currentActivity = null;
-      }
-
-      for (OnActivityDestroyedListener listener : onDestroyedListeners) {
-        listener.onDestroyed(activity);
-      }
-    }
-  }
-}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionNotificationsManager.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionNotificationsManager.java
deleted file mode 100644
index 20986de5181..00000000000
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionNotificationsManager.java
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.core.app.NotificationCompat;
-import com.google.firebase.appdistribution.internal.LogWrapper;
-
-class FirebaseAppDistributionNotificationsManager {
-  private static final String TAG = "NotificationsManager:";
-  private static final String NOTIFICATION_CHANNEL_ID =
-      "com.google.firebase.appdistribution.notification_channel_id";
-
-  @VisibleForTesting
-  static final String NOTIFICATION_TAG = "com.google.firebase.appdistribution.tag";
-
-  private final Context context;
-  private final AppIconSource appIconSource;
-
-  FirebaseAppDistributionNotificationsManager(Context context) {
-    this(context, new AppIconSource());
-  }
-
-  @VisibleForTesting
-  FirebaseAppDistributionNotificationsManager(Context context, AppIconSource appIconSource) {
-    this.context = context;
-    this.appIconSource = appIconSource;
-  }
-
-  void updateNotification(long totalBytes, long downloadedBytes, UpdateStatus status) {
-    NotificationManager notificationManager = createNotificationManager(context);
-    NotificationCompat.Builder notificationBuilder =
-        new NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID)
-            .setOnlyAlertOnce(true)
-            .setSmallIcon(appIconSource.getNonAdaptiveIconOrDefault(context))
-            .setContentTitle(context.getString(getNotificationContentTitleId(status)))
-            .setProgress(
-                100,
-                (int) (((float) downloadedBytes / (float) totalBytes) * 100),
-                /*indeterminate = */ false);
-    PendingIntent appLaunchIntent = createAppLaunchIntent();
-    if (appLaunchIntent != null) {
-      notificationBuilder.setContentIntent(appLaunchIntent);
-    }
-    notificationManager.notify(NOTIFICATION_TAG, /*id =*/ 0, notificationBuilder.build());
-  }
-
-  int getNotificationContentTitleId(UpdateStatus status) {
-    if (isErrorState(status)) {
-      return R.string.download_failed;
-    } else if (status.equals(UpdateStatus.DOWNLOADED)) {
-      return R.string.download_completed;
-    } else {
-      return R.string.downloading_app_update;
-    }
-  }
-
-  // CHECK THIS LATER
-  private boolean isErrorState(UpdateStatus status) {
-    return status.equals(UpdateStatus.DOWNLOAD_FAILED)
-        || status.equals(UpdateStatus.INSTALL_FAILED)
-        || status.equals(UpdateStatus.INSTALL_CANCELED)
-        || status.equals(UpdateStatus.NEW_RELEASE_CHECK_FAILED)
-        || status.equals(UpdateStatus.UPDATE_CANCELED);
-  }
-
-  private NotificationManager createNotificationManager(Context context) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      NotificationChannel channel =
-          new NotificationChannel(
-              NOTIFICATION_CHANNEL_ID,
-              context.getString(R.string.notifications_channel_name),
-              NotificationManager.IMPORTANCE_DEFAULT);
-      channel.setDescription(context.getString(R.string.notifications_channel_description));
-      // Register the channel with the system; you can't change the importance
-      // or other notification behaviors after this
-      NotificationManager notificationManager =
-          (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-      notificationManager.createNotificationChannel(channel);
-      return notificationManager;
-    } else {
-      return (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-    }
-  }
-
-  @Nullable
-  private PendingIntent createAppLaunchIntent() {
-    // Query the package manager for the best launch intent for the app
-    Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
-    if (intent == null) {
-      LogWrapper.getInstance().w(TAG + "No activity found to launch app");
-      return null;
-    }
-    return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_ONE_SHOT);
-  }
-}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionRegistrar.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionRegistrar.java
deleted file mode 100644
index 3c0c65871ea..00000000000
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionRegistrar.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import android.app.Application;
-import android.content.Context;
-import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.appdistribution.internal.LogWrapper;
-import com.google.firebase.components.Component;
-import com.google.firebase.components.ComponentContainer;
-import com.google.firebase.components.ComponentRegistrar;
-import com.google.firebase.components.Dependency;
-import com.google.firebase.installations.FirebaseInstallationsApi;
-import com.google.firebase.platforminfo.LibraryVersionComponent;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Registers FirebaseAppDistribution.
- *
- * @hide
- */
-@Keep
-public class FirebaseAppDistributionRegistrar implements ComponentRegistrar {
-
-  private static String TAG = "Registrar:";
-
-  @Override
-  public @NonNull List<Component<?>> getComponents() {
-    return Arrays.asList(
-        Component.builder(FirebaseAppDistribution.class)
-            .add(Dependency.required(FirebaseApp.class))
-            .add(Dependency.requiredProvider(FirebaseInstallationsApi.class))
-            .factory(this::buildFirebaseAppDistribution)
-            // construct FirebaseAppDistribution instance on startup so we can register for
-            // activity lifecycle callbacks before the API is called
-            .alwaysEager()
-            .build(),
-        LibraryVersionComponent.create("fire-appdistribution", BuildConfig.VERSION_NAME));
-  }
-
-  private FirebaseAppDistribution buildFirebaseAppDistribution(ComponentContainer container) {
-    FirebaseApp firebaseApp = container.get(FirebaseApp.class);
-    FirebaseAppDistribution appDistribution =
-        new FirebaseAppDistribution(
-            firebaseApp, container.getProvider(FirebaseInstallationsApi.class));
-    FirebaseAppDistributionLifecycleNotifier lifecycleNotifier =
-        FirebaseAppDistributionLifecycleNotifier.getInstance();
-
-    Context context = firebaseApp.getApplicationContext();
-    if (context instanceof Application) {
-      Application firebaseApplication = (Application) context;
-      firebaseApplication.registerActivityLifecycleCallbacks(lifecycleNotifier);
-    } else {
-      LogWrapper.getInstance()
-          .e(
-              TAG
-                  + "Context "
-                  + context
-                  + " was not an Application, can't register for lifecycle callbacks. SDK might not"
-                  + " function correctly.");
-    }
-
-    return appDistribution;
-  }
-}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionTesterApiClient.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionTesterApiClient.java
deleted file mode 100644
index f214cd712a1..00000000000
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionTesterApiClient.java
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import com.google.android.gms.common.util.AndroidUtilsLight;
-import com.google.android.gms.common.util.Hex;
-import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.appdistribution.internal.LogWrapper;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import javax.net.ssl.HttpsURLConnection;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-class FirebaseAppDistributionTesterApiClient {
-
-  private static final String RELEASE_ENDPOINT_URL_FORMAT =
-      "https://firebaseapptesters.googleapis.com/v1alpha/devices/-/testerApps/%s/installations/%s/releases";
-  private static final String REQUEST_METHOD_GET = "GET";
-  private static final String API_KEY_HEADER = "x-goog-api-key";
-  private static final String INSTALLATION_AUTH_HEADER = "X-Goog-Firebase-Installations-Auth";
-  private static final String X_ANDROID_PACKAGE_HEADER_KEY = "X-Android-Package";
-  private static final String X_ANDROID_CERT_HEADER_KEY = "X-Android-Cert";
-  // Format of "X-Client-Version": "{ClientId}/{ClientVersion}"
-  private static final String X_CLIENT_VERSION_HEADER_KEY = "X-Client-Version";
-
-  private static final String BUILD_VERSION_JSON_KEY = "buildVersion";
-  private static final String DISPLAY_VERSION_JSON_KEY = "displayVersion";
-  private static final String RELEASE_NOTES_JSON_KEY = "releaseNotes";
-  private static final String BINARY_TYPE_JSON_KEY = "binaryType";
-  private static final String CODE_HASH_KEY = "codeHash";
-  private static final String APK_HASH_KEY = "apkHash";
-  private static final String IAS_ARTIFACT_ID_KEY = "iasArtifactId";
-  private static final String DOWNLOAD_URL_KEY = "downloadUrl";
-
-  private static final String TAG = "TesterApiClient:";
-
-  public static final int DEFAULT_BUFFER_SIZE = 8192;
-
-  private final HttpsUrlConnectionFactory httpsUrlConnectionFactory;
-
-  FirebaseAppDistributionTesterApiClient() {
-    this(new HttpsUrlConnectionFactory());
-  }
-
-  @VisibleForTesting
-  FirebaseAppDistributionTesterApiClient(
-      @NonNull HttpsUrlConnectionFactory httpsUrlConnectionFactory) {
-    this.httpsUrlConnectionFactory = httpsUrlConnectionFactory;
-  }
-
-  /**
-   * Fetches and returns the latest release for the app that the tester has access to, or null if
-   * the tester doesn't have access to any releases.
-   */
-  @Nullable
-  AppDistributionReleaseInternal fetchNewRelease(
-      @NonNull String fid,
-      @NonNull String appId,
-      @NonNull String apiKey,
-      @NonNull String authToken,
-      @NonNull Context context)
-      throws FirebaseAppDistributionException {
-    HttpsURLConnection connection = null;
-    int responseCode;
-    String responseBody;
-    try {
-      connection = openHttpsUrlConnection(appId, fid, apiKey, authToken, context);
-      responseCode = connection.getResponseCode();
-      responseBody = readResponseBody(connection);
-    } catch (IOException e) {
-      throw new FirebaseAppDistributionException(
-          FirebaseAppDistributionException.ErrorMessages.NETWORK_ERROR, Status.NETWORK_FAILURE, e);
-    } finally {
-      if (connection != null) {
-        connection.disconnect();
-      }
-    }
-
-    if (!isResponseSuccess(responseCode)) {
-      throw getExceptionForHttpResponse(responseCode);
-    }
-
-    return parseNewRelease(responseBody);
-  }
-
-  private String readResponseBody(HttpsURLConnection connection) throws IOException {
-    boolean isSuccess = isResponseSuccess(connection.getResponseCode());
-    try (InputStream inputStream =
-        isSuccess ? connection.getInputStream() : connection.getErrorStream()) {
-      if (inputStream == null && !isSuccess) {
-        // If the server returns a response with an error code and no response body, getErrorStream
-        // returns null. We return an empty string to reflect the empty body.
-        return "";
-      }
-      return convertInputStreamToString(new BufferedInputStream(inputStream));
-    }
-  }
-
-  private static boolean isResponseSuccess(int responseCode) {
-    return responseCode >= 200 && responseCode < 300;
-  }
-
-  private AppDistributionReleaseInternal parseNewRelease(String responseBody)
-      throws FirebaseAppDistributionException {
-    try {
-      JSONObject responseJson = new JSONObject(responseBody);
-      if (!responseJson.has("releases")) {
-        return null;
-      }
-      JSONArray releasesJson = responseJson.getJSONArray("releases");
-      if (releasesJson.length() == 0) {
-        return null;
-      }
-      JSONObject newReleaseJson = releasesJson.getJSONObject(0);
-      final String displayVersion = newReleaseJson.getString(DISPLAY_VERSION_JSON_KEY);
-      final String buildVersion = newReleaseJson.getString(BUILD_VERSION_JSON_KEY);
-      String releaseNotes = tryGetValue(newReleaseJson, RELEASE_NOTES_JSON_KEY);
-      String codeHash = tryGetValue(newReleaseJson, CODE_HASH_KEY);
-      String apkHash = tryGetValue(newReleaseJson, APK_HASH_KEY);
-      String iasArtifactId = tryGetValue(newReleaseJson, IAS_ARTIFACT_ID_KEY);
-      String downloadUrl = tryGetValue(newReleaseJson, DOWNLOAD_URL_KEY);
-
-      final BinaryType binaryType =
-          newReleaseJson.getString(BINARY_TYPE_JSON_KEY).equals("APK")
-              ? BinaryType.APK
-              : BinaryType.AAB;
-
-      AppDistributionReleaseInternal newRelease =
-          AppDistributionReleaseInternal.builder()
-              .setDisplayVersion(displayVersion)
-              .setBuildVersion(buildVersion)
-              .setReleaseNotes(releaseNotes)
-              .setBinaryType(binaryType)
-              .setIasArtifactId(iasArtifactId)
-              .setCodeHash(codeHash)
-              .setApkHash(apkHash)
-              .setDownloadUrl(downloadUrl)
-              .build();
-
-      LogWrapper.getInstance().v("Zip hash for the new release " + newRelease.getApkHash());
-      return newRelease;
-    } catch (JSONException e) {
-      LogWrapper.getInstance().e(TAG + "Error parsing the new release.", e);
-      throw new FirebaseAppDistributionException(
-          FirebaseAppDistributionException.ErrorMessages.JSON_PARSING_ERROR, Status.UNKNOWN, e);
-    }
-  }
-
-  private FirebaseAppDistributionException getExceptionForHttpResponse(int responseCode) {
-    switch (responseCode) {
-      case 400:
-        return new FirebaseAppDistributionException(
-            "Bad request when fetching new release", Status.UNKNOWN);
-      case 401:
-        return new FirebaseAppDistributionException(
-            FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_ERROR,
-            Status.AUTHENTICATION_FAILURE);
-      case 403:
-        return new FirebaseAppDistributionException(
-            FirebaseAppDistributionException.ErrorMessages.AUTHORIZATION_ERROR,
-            Status.AUTHENTICATION_FAILURE);
-      case 404:
-        return new FirebaseAppDistributionException(
-            "App or tester not found when fetching new release", Status.AUTHENTICATION_FAILURE);
-      case 408:
-      case 504:
-        return new FirebaseAppDistributionException(
-            FirebaseAppDistributionException.ErrorMessages.TIMEOUT_ERROR, Status.NETWORK_FAILURE);
-      default:
-        return new FirebaseAppDistributionException(
-            "Received error status when fetching new release: " + responseCode, Status.UNKNOWN);
-    }
-  }
-
-  private String tryGetValue(JSONObject jsonObject, String key) {
-    try {
-      return jsonObject.getString(key);
-    } catch (JSONException e) {
-      return "";
-    }
-  }
-
-  private HttpsURLConnection openHttpsUrlConnection(
-      String appId, String fid, String apiKey, String authToken, Context context)
-      throws IOException {
-    HttpsURLConnection httpsURLConnection;
-    String url = String.format(RELEASE_ENDPOINT_URL_FORMAT, appId, fid);
-    httpsURLConnection = httpsUrlConnectionFactory.openConnection(url);
-    httpsURLConnection.setRequestMethod(REQUEST_METHOD_GET);
-    httpsURLConnection.setRequestProperty(API_KEY_HEADER, apiKey);
-    httpsURLConnection.setRequestProperty(INSTALLATION_AUTH_HEADER, authToken);
-    httpsURLConnection.addRequestProperty(X_ANDROID_PACKAGE_HEADER_KEY, context.getPackageName());
-    httpsURLConnection.addRequestProperty(
-        X_ANDROID_CERT_HEADER_KEY, getFingerprintHashForPackage(context));
-    httpsURLConnection.addRequestProperty(
-        X_CLIENT_VERSION_HEADER_KEY, String.format("android-sdk/%s", BuildConfig.VERSION_NAME));
-    return httpsURLConnection;
-  }
-
-  private static String convertInputStreamToString(InputStream is) throws IOException {
-    ByteArrayOutputStream result = new ByteArrayOutputStream();
-    byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
-    int length;
-    while ((length = is.read(buffer)) != -1) {
-      result.write(buffer, 0, length);
-    }
-    return result.toString();
-  }
-
-  /** Gets the Android package's SHA-1 fingerprint. */
-  private String getFingerprintHashForPackage(Context context) {
-    byte[] hash;
-
-    try {
-      hash = AndroidUtilsLight.getPackageCertificateHashBytes(context, context.getPackageName());
-
-      if (hash == null) {
-        LogWrapper.getInstance()
-            .e(
-                TAG
-                    + "Could not get fingerprint hash for X-Android-Cert header. Package is not signed: "
-                    + context.getPackageName());
-        return null;
-      } else {
-        return Hex.bytesToStringUppercase(hash, /* zeroTerminated= */ false);
-      }
-    } catch (PackageManager.NameNotFoundException e) {
-      LogWrapper.getInstance()
-          .e(
-              TAG
-                  + "Could not get fingerprint hash for X-Android-Cert header. No such package: "
-                  + context.getPackageName(),
-              e);
-      return null;
-    }
-  }
-}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/NewReleaseFetcher.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/NewReleaseFetcher.java
deleted file mode 100644
index 22e4ffaab0c..00000000000
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/NewReleaseFetcher.java
+++ /dev/null
@@ -1,238 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import static com.google.firebase.appdistribution.ReleaseIdentificationUtils.calculateApkHash;
-import static com.google.firebase.appdistribution.ReleaseIdentificationUtils.getPackageInfo;
-import static com.google.firebase.appdistribution.ReleaseIdentificationUtils.getPackageInfoWithMetadata;
-import static com.google.firebase.appdistribution.TaskUtils.runAsyncInTask;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.core.content.pm.PackageInfoCompat;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.appdistribution.internal.LogWrapper;
-import com.google.firebase.inject.Provider;
-import com.google.firebase.installations.FirebaseInstallationsApi;
-import com.google.firebase.installations.InstallationTokenResult;
-import java.io.File;
-import java.util.Locale;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-/**
- * Class that handles fetching the latest release from App Distribution and determining if it is a
- * new release.
- */
-class NewReleaseFetcher {
-  private static final String TAG = "CheckForNewReleaseClient:";
-
-  private final FirebaseApp firebaseApp;
-  private final FirebaseAppDistributionTesterApiClient firebaseAppDistributionTesterApiClient;
-  private final Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider;
-  private final Context context;
-  // Maintain an in-memory mapping from source file to APK hash to avoid re-calculating the hash
-  private static final ConcurrentMap<String, String> cachedApkHashes = new ConcurrentHashMap<>();
-
-  Task<AppDistributionReleaseInternal> cachedCheckForNewRelease = null;
-  private final Executor taskExecutor; // Executor to run task listeners on a background thread
-
-  NewReleaseFetcher(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull FirebaseAppDistributionTesterApiClient firebaseAppDistributionTesterApiClient,
-      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider) {
-    this(
-        firebaseApp,
-        firebaseAppDistributionTesterApiClient,
-        firebaseInstallationsApiProvider,
-        Executors.newSingleThreadExecutor());
-  }
-
-  NewReleaseFetcher(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull FirebaseAppDistributionTesterApiClient firebaseAppDistributionTesterApiClient,
-      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider,
-      @NonNull Executor executor) {
-    this.firebaseApp = firebaseApp;
-    this.firebaseAppDistributionTesterApiClient = firebaseAppDistributionTesterApiClient;
-    this.firebaseInstallationsApiProvider = firebaseInstallationsApiProvider;
-    this.taskExecutor = executor;
-    this.context = firebaseApp.getApplicationContext();
-  }
-
-  @NonNull
-  public synchronized Task<AppDistributionReleaseInternal> checkForNewRelease() {
-
-    if (cachedCheckForNewRelease != null && !cachedCheckForNewRelease.isComplete()) {
-      return cachedCheckForNewRelease;
-    }
-
-    Task<String> installationIdTask = firebaseInstallationsApiProvider.get().getId();
-    // forceRefresh is false to get locally cached token if available
-    Task<InstallationTokenResult> installationAuthTokenTask =
-        firebaseInstallationsApiProvider.get().getToken(false);
-
-    this.cachedCheckForNewRelease =
-        Tasks.whenAllSuccess(installationIdTask, installationAuthTokenTask)
-            .continueWithTask(TaskUtils::handleTaskFailure)
-            .onSuccessTask(
-                unused ->
-                    getNewReleaseFromClientTask(
-                        installationIdTask.getResult(),
-                        firebaseApp.getOptions().getApplicationId(),
-                        firebaseApp.getOptions().getApiKey(),
-                        installationAuthTokenTask.getResult().getToken()));
-
-    return cachedCheckForNewRelease;
-  }
-
-  private Task<AppDistributionReleaseInternal> getNewReleaseFromClientTask(
-      String fid, String appId, String apiKey, String authToken) {
-    return runAsyncInTask(
-        taskExecutor, () -> getNewReleaseFromClient(fid, appId, apiKey, authToken));
-  }
-
-  @Nullable
-  @VisibleForTesting
-  AppDistributionReleaseInternal getNewReleaseFromClient(
-      String fid, String appId, String apiKey, String authToken)
-      throws FirebaseAppDistributionException {
-    AppDistributionReleaseInternal retrievedNewRelease =
-        firebaseAppDistributionTesterApiClient.fetchNewRelease(
-            fid, appId, apiKey, authToken, firebaseApp.getApplicationContext());
-
-    if (retrievedNewRelease == null) {
-      LogWrapper.getInstance().v(TAG + "Tester does not have access to any releases");
-      return null;
-    }
-
-    long newReleaseBuildVersion = parseBuildVersion(retrievedNewRelease.getBuildVersion());
-
-    if (isOlderBuildVersion(newReleaseBuildVersion)) {
-      LogWrapper.getInstance().v(TAG + "New release has lower version code than current release");
-      return null;
-    }
-
-    if (isNewerBuildVersion(newReleaseBuildVersion)
-        || !isSameAsInstalledRelease(retrievedNewRelease)
-        || hasDifferentAppVersionName(retrievedNewRelease)) {
-      return retrievedNewRelease;
-    } else {
-      LogWrapper.getInstance().v(TAG + "New release is older or is currently installed");
-      return null;
-    }
-  }
-
-  private long parseBuildVersion(String buildVersion) throws FirebaseAppDistributionException {
-    try {
-      return Long.parseLong(buildVersion);
-    } catch (NumberFormatException e) {
-      throw new FirebaseAppDistributionException(
-          "Could not parse build version of new release: " + buildVersion, Status.UNKNOWN, e);
-    }
-  }
-
-  private boolean isOlderBuildVersion(long newReleaseBuildVersion)
-      throws FirebaseAppDistributionException {
-    return newReleaseBuildVersion < getInstalledAppVersionCode(context);
-  }
-
-  private boolean isNewerBuildVersion(long newReleaseBuildVersion)
-      throws FirebaseAppDistributionException {
-    return newReleaseBuildVersion > getInstalledAppVersionCode(context);
-  }
-
-  private boolean hasDifferentAppVersionName(AppDistributionReleaseInternal newRelease)
-      throws FirebaseAppDistributionException {
-    return !newRelease.getDisplayVersion().equals(getInstalledAppVersionName(context));
-  }
-
-  @VisibleForTesting
-  boolean isSameAsInstalledRelease(AppDistributionReleaseInternal newRelease)
-      throws FirebaseAppDistributionException {
-    if (newRelease.getBinaryType().equals(BinaryType.APK)) {
-      return hasSameHashAsInstalledRelease(newRelease);
-    }
-
-    if (newRelease.getIasArtifactId() == null || newRelease.getIasArtifactId().isEmpty()) {
-      LogWrapper.getInstance()
-          .w(TAG + "AAB release missing IAS Artifact ID. Assuming new release is different.");
-      return false;
-    }
-
-    String installedIasArtifactId;
-    try {
-      installedIasArtifactId =
-          ReleaseIdentificationUtils.extractInternalAppSharingArtifactId(
-              firebaseApp.getApplicationContext());
-    } catch (FirebaseAppDistributionException e) {
-      LogWrapper.getInstance()
-          .w(
-              TAG + "Could not get installed IAS artifact ID. Assuming new release is different.",
-              e);
-      return false;
-    }
-
-    return newRelease.getIasArtifactId().equals(installedIasArtifactId);
-  }
-
-  private long getInstalledAppVersionCode(Context context) throws FirebaseAppDistributionException {
-    return PackageInfoCompat.getLongVersionCode(getPackageInfo(context));
-  }
-
-  private String getInstalledAppVersionName(Context context)
-      throws FirebaseAppDistributionException {
-    return getPackageInfo(context).versionName;
-  }
-
-  @VisibleForTesting
-  String extractApkHash(PackageInfo packageInfo) {
-    File sourceFile = new File(packageInfo.applicationInfo.sourceDir);
-
-    String key =
-        String.format(
-            Locale.ENGLISH, "%s.%d", sourceFile.getAbsolutePath(), sourceFile.lastModified());
-    if (!cachedApkHashes.containsKey(key)) {
-      cachedApkHashes.put(key, calculateApkHash(sourceFile));
-    }
-    return cachedApkHashes.get(key);
-  }
-
-  private boolean hasSameHashAsInstalledRelease(AppDistributionReleaseInternal newRelease)
-      throws FirebaseAppDistributionException {
-    Context context = firebaseApp.getApplicationContext();
-    PackageInfo metadataPackageInfo = getPackageInfoWithMetadata(context);
-    String installedReleaseApkHash = extractApkHash(metadataPackageInfo);
-
-    if (installedReleaseApkHash == null || installedReleaseApkHash.isEmpty()) {
-      throw new FirebaseAppDistributionException(
-          "Could not calculate hash of installed APK", Status.UNKNOWN);
-    } else if (newRelease.getApkHash().isEmpty()) {
-      throw new FirebaseAppDistributionException(
-          "Missing APK hash from new release", Status.UNKNOWN);
-    }
-    // If the hash of the zipped APK for the retrieved newRelease is equal to the stored hash
-    // of the installed release, then they are the same release.
-    return installedReleaseApkHash.equals(newRelease.getApkHash());
-  }
-}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ReleaseIdentificationUtils.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ReleaseIdentificationUtils.java
deleted file mode 100644
index 5fa9e176396..00000000000
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ReleaseIdentificationUtils.java
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.appdistribution.internal.LogWrapper;
-import java.io.File;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-final class ReleaseIdentificationUtils {
-  private static final String TAG = "ReleaseIdentification";
-  private static final int BYTES_IN_LONG = 8;
-  private static final int NO_FLAGS = 0;
-
-  /**
-   * Get the package info for the currently installed app.
-   *
-   * @throws FirebaseAppDistributionException if the package name can't be found.
-   */
-  static PackageInfo getPackageInfo(Context context) throws FirebaseAppDistributionException {
-    return getPackageInfoWithFlags(context, NO_FLAGS);
-  }
-
-  /**
-   * Get the package info for the currently installed app, with the PackageManager.GET_META_DATA
-   * flag set.
-   *
-   * @throws FirebaseAppDistributionException if the package name can't be found.
-   */
-  static PackageInfo getPackageInfoWithMetadata(Context context)
-      throws FirebaseAppDistributionException {
-    return getPackageInfoWithFlags(context, PackageManager.GET_META_DATA);
-  }
-
-  private static PackageInfo getPackageInfoWithFlags(Context context, int flags)
-      throws FirebaseAppDistributionException {
-    try {
-      return context.getPackageManager().getPackageInfo(context.getPackageName(), flags);
-    } catch (PackageManager.NameNotFoundException e) {
-      throw new FirebaseAppDistributionException(
-          "Unable to find package with name " + context.getPackageName(), Status.UNKNOWN, e);
-    }
-  }
-
-  static String extractInternalAppSharingArtifactId(@NonNull Context appContext)
-      throws FirebaseAppDistributionException {
-    PackageInfo packageInfo = getPackageInfoWithMetadata(appContext);
-    if (packageInfo.applicationInfo.metaData == null) {
-      throw new FirebaseAppDistributionException("Missing package info metadata", Status.UNKNOWN);
-    }
-    String id =
-        packageInfo.applicationInfo.metaData.getString("com.android.vending.internal.apk.id");
-    if (id == null) {
-      throw new FirebaseAppDistributionException(
-          "IAS artifact ID missing from package info metadata ", Status.UNKNOWN);
-    }
-    return id;
-  }
-
-  @Nullable
-  static String calculateApkHash(@NonNull File file) {
-    LogWrapper.getInstance().v(TAG + "Calculating release id for " + file.getPath());
-    LogWrapper.getInstance().v(TAG + "File size: " + file.length());
-
-    long start = System.currentTimeMillis();
-    long entries = 0;
-    String zipFingerprint = null;
-    try {
-      MessageDigest digest = MessageDigest.getInstance("SHA-256");
-      ArrayList<Byte> checksums = new ArrayList<>();
-
-      // Since calculating the codeHash returned from the release backend is computationally
-      // expensive, we has the existing checksum data from the ZipFile and compare it to
-      // (1) the apk hash returned by the backend, or (2) look up a mapping from the apk zip hash to
-      // the
-      // full codehash, and compare that to the codehash to the backend
-      ZipFile zis = new ZipFile(file);
-      try {
-        Enumeration<? extends ZipEntry> zipEntries = zis.entries();
-        while (zipEntries.hasMoreElements()) {
-          ZipEntry zip = zipEntries.nextElement();
-          entries += 1;
-          byte[] crcBytes = longToByteArray(zip.getCrc());
-          for (byte b : crcBytes) {
-            checksums.add(b);
-          }
-        }
-      } finally {
-        zis.close();
-      }
-      byte[] checksumByteArray = digest.digest(arrayListToByteArray(checksums));
-      StringBuilder sb = new StringBuilder();
-      for (byte b : checksumByteArray) {
-        sb.append(String.format("%02x", b));
-      }
-      zipFingerprint = sb.toString();
-
-    } catch (IOException | NoSuchAlgorithmException e) {
-      LogWrapper.getInstance().v(TAG + "id calculation failed for " + file.getPath());
-      return null;
-    } finally {
-      long elapsed = System.currentTimeMillis() - start;
-      if (elapsed > 2 * 1000) {
-        LogWrapper.getInstance()
-            .v(
-                TAG
-                    + String.format(
-                        "Long id calculation time %d ms and %d entries for %s",
-                        elapsed, entries, file.getPath()));
-      }
-
-      LogWrapper.getInstance()
-          .v(TAG + String.format("Finished calculating %d entries in %d ms", entries, elapsed));
-      LogWrapper.getInstance()
-          .v(TAG + String.format("%s hashes to %s", file.getPath(), zipFingerprint));
-    }
-
-    return zipFingerprint;
-  }
-
-  private static byte[] longToByteArray(long x) {
-    ByteBuffer buffer = ByteBuffer.allocate(BYTES_IN_LONG);
-    buffer.putLong(x);
-    return buffer.array();
-  }
-
-  private static byte[] arrayListToByteArray(ArrayList<Byte> list) {
-    byte[] result = new byte[list.size()];
-    for (int i = 0; i < list.size(); i++) {
-      result[i] = list.get(i);
-    }
-    return result;
-  }
-}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/TesterSignInManager.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/TesterSignInManager.java
deleted file mode 100644
index 3133b51d7c8..00000000000
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/TesterSignInManager.java
+++ /dev/null
@@ -1,239 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_CANCELED;
-import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskException;
-import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskResult;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import androidx.annotation.GuardedBy;
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-import androidx.browser.customtabs.CustomTabsIntent;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.TaskCompletionSource;
-import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.appdistribution.internal.InstallActivity;
-import com.google.firebase.appdistribution.internal.LogWrapper;
-import com.google.firebase.appdistribution.internal.SignInResultActivity;
-import com.google.firebase.appdistribution.internal.SignInStorage;
-import com.google.firebase.inject.Provider;
-import com.google.firebase.installations.FirebaseInstallationsApi;
-import java.util.List;
-
-/** Class that handles signing in the tester. */
-class TesterSignInManager {
-  private static final String TAG = "TesterSignInManager:";
-  private static final String SIGNIN_REDIRECT_URL =
-      "https://appdistribution.firebase.google.com/pub/testerapps/%s/installations/%s/buildalerts?appName=%s&packageName=%s";
-
-  private final FirebaseApp firebaseApp;
-  private final Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider;
-  private final SignInStorage signInStorage;
-  private final FirebaseAppDistributionLifecycleNotifier lifecycleNotifier;
-
-  private final Object signInTaskLock = new Object();
-
-  @GuardedBy("signInTaskLock")
-  private boolean hasBeenSentToBrowserForCurrentTask = false;
-
-  @GuardedBy("signInTaskLock")
-  private TaskCompletionSource<Void> signInTaskCompletionSource = null;
-
-  TesterSignInManager(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider,
-      @NonNull final SignInStorage signInStorage) {
-    this(
-        firebaseApp,
-        firebaseInstallationsApiProvider,
-        signInStorage,
-        FirebaseAppDistributionLifecycleNotifier.getInstance());
-  }
-
-  @VisibleForTesting
-  TesterSignInManager(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider,
-      @NonNull final SignInStorage signInStorage,
-      @NonNull FirebaseAppDistributionLifecycleNotifier lifecycleNotifier) {
-    this.firebaseApp = firebaseApp;
-    this.firebaseInstallationsApiProvider = firebaseInstallationsApiProvider;
-    this.signInStorage = signInStorage;
-    this.lifecycleNotifier = lifecycleNotifier;
-
-    lifecycleNotifier.addOnActivityCreatedListener(this::onActivityCreated);
-    lifecycleNotifier.addOnActivityStartedListener(this::onActivityStarted);
-  }
-
-  @VisibleForTesting
-  void onActivityCreated(Activity activity) {
-    // We call finish() in the onCreate method of the SignInResultActivity, so we must set the
-    // result of the signIn Task in the onActivityCreated callback
-    if (activity instanceof SignInResultActivity) {
-      LogWrapper.getInstance().v("Sign in completed");
-      this.setSuccessfulSignInResult();
-      this.signInStorage.setSignInStatus(true);
-    }
-  }
-
-  @VisibleForTesting
-  void onActivityStarted(Activity activity) {
-    if (activity instanceof SignInResultActivity || activity instanceof InstallActivity) {
-      // SignInResult and InstallActivity are internal to the SDK and should not be treated as
-      // reentering the app
-      return;
-    } else {
-      // Throw error if app reentered during sign in
-      synchronized (signInTaskLock) {
-        if (awaitingResultFromBrowser()) {
-          LogWrapper.getInstance().e("App Resumed without sign in flow completing.");
-          setSignInTaskCompletionError(
-              new FirebaseAppDistributionException(
-                  FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_CANCELED,
-                  AUTHENTICATION_CANCELED));
-        }
-      }
-    }
-  }
-
-  @NonNull
-  public Task<Void> signInTester() {
-    if (signInStorage.getSignInStatus()) {
-      LogWrapper.getInstance().v(TAG + "Tester is already signed in.");
-      return Tasks.forResult(null);
-    }
-
-    synchronized (signInTaskLock) {
-      if (signInTaskCompletionSource != null
-          && !signInTaskCompletionSource.getTask().isComplete()) {
-        LogWrapper.getInstance()
-            .v(TAG + "Detected In-Progress sign in task. Returning the same task.");
-        return signInTaskCompletionSource.getTask();
-      }
-
-      signInTaskCompletionSource = new TaskCompletionSource<>();
-      hasBeenSentToBrowserForCurrentTask = false;
-
-      firebaseInstallationsApiProvider
-          .get()
-          .getId()
-          .addOnFailureListener(
-              handleTaskFailure(
-                  FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_ERROR,
-                  Status.AUTHENTICATION_FAILURE))
-          .onSuccessTask(this::getForegroundActivityAndOpenSignInFlow)
-          // Catch any unexpected failures to be safe.
-          .addOnFailureListener(
-              handleTaskFailure(
-                  FirebaseAppDistributionException.ErrorMessages.UNKNOWN_ERROR, Status.UNKNOWN));
-
-      return signInTaskCompletionSource.getTask();
-    }
-  }
-
-  private Task<Void> getForegroundActivityAndOpenSignInFlow(String fid) {
-    return lifecycleNotifier.applyToForegroundActivity(
-        activity -> {
-          // Launch the intent outside of the synchronized block because we don't need to wait
-          // for the lock, and we don't want to risk the activity leaving the foreground in
-          // the meantime.
-          openSignInFlowInBrowser(fid, activity);
-          // This synchronized block is required by the @GuardedBy annotation, but is not
-          // practically required in this case because the only reads of this variable are on
-          // the main thread, which this callback is also running on.
-          synchronized (signInTaskLock) {
-            hasBeenSentToBrowserForCurrentTask = true;
-          }
-        });
-  }
-
-  private OnFailureListener handleTaskFailure(String message, Status status) {
-    return e -> {
-      LogWrapper.getInstance().e(TAG + message, e);
-      setSignInTaskCompletionError(new FirebaseAppDistributionException(message, status, e));
-    };
-  }
-
-  private boolean awaitingResultFromBrowser() {
-    synchronized (signInTaskLock) {
-      return signInTaskCompletionSource != null
-          && !signInTaskCompletionSource.getTask().isComplete()
-          && hasBeenSentToBrowserForCurrentTask;
-    }
-  }
-
-  private void setSignInTaskCompletionError(FirebaseAppDistributionException e) {
-    synchronized (signInTaskLock) {
-      safeSetTaskException(signInTaskCompletionSource, e);
-    }
-  }
-
-  private void setSuccessfulSignInResult() {
-    synchronized (signInTaskLock) {
-      safeSetTaskResult(signInTaskCompletionSource, null);
-    }
-  }
-
-  private static String getApplicationName(Context context) {
-    try {
-      return context.getApplicationInfo().loadLabel(context.getPackageManager()).toString();
-    } catch (Exception e) {
-      LogWrapper.getInstance().e(TAG + "Unable to retrieve App name", e);
-      return "";
-    }
-  }
-
-  private void openSignInFlowInBrowser(String fid, Activity activity) {
-    Context context = firebaseApp.getApplicationContext();
-    Uri uri =
-        Uri.parse(
-            String.format(
-                SIGNIN_REDIRECT_URL,
-                firebaseApp.getOptions().getApplicationId(),
-                fid,
-                getApplicationName(context),
-                context.getPackageName()));
-    LogWrapper.getInstance().v(TAG + "Opening sign in flow in browser at " + uri);
-    if (supportsCustomTabs(context)) {
-      // If we can launch a chrome view, try that.
-      CustomTabsIntent customTabsIntent = new CustomTabsIntent.Builder().build();
-      Intent intent = customTabsIntent.intent;
-      intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-      customTabsIntent.launchUrl(activity, uri);
-    } else {
-      // If we can't launch a chrome view try to launch anything that can handle a URL.
-      Intent browserIntent = new Intent(Intent.ACTION_VIEW, uri);
-      browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-      activity.startActivity(browserIntent);
-    }
-  }
-
-  private boolean supportsCustomTabs(Context context) {
-    Intent customTabIntent = new Intent("android.support.customtabs.action.CustomTabsService");
-    customTabIntent.setPackage("com.android.chrome");
-    List<ResolveInfo> resolveInfos =
-        context.getPackageManager().queryIntentServices(customTabIntent, 0);
-    return resolveInfos != null && !resolveInfos.isEmpty();
-  }
-}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AabUpdater.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AabUpdater.java
similarity index 53%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AabUpdater.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AabUpdater.java
index 314b3b3afa3..59f8b4bee76 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AabUpdater.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AabUpdater.java
@@ -12,61 +12,55 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.DOWNLOAD_FAILURE;
 import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
-import static com.google.firebase.appdistribution.TaskUtils.runAsyncInTask;
-import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskException;
+import static com.google.firebase.appdistribution.impl.TaskUtils.runAsyncInTask;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
-import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
-import com.google.firebase.appdistribution.internal.InstallActivity;
-import com.google.firebase.appdistribution.internal.LogWrapper;
-import com.google.firebase.appdistribution.internal.SignInResultActivity;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.FirebaseAppDistribution;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.UpdateStatus;
+import com.google.firebase.appdistribution.UpdateTask;
 import java.io.IOException;
 import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.net.ssl.HttpsURLConnection;
 
 /** Class that handles updateApp functionality for AABs in {@link FirebaseAppDistribution}. */
+@Singleton // Only one update should happen at a time, even across FirebaseAppDistribution instances
 class AabUpdater {
-  private static final String TAG = "AabUpdater:";
+  private static final String TAG = "AabUpdater";
 
   private final FirebaseAppDistributionLifecycleNotifier lifecycleNotifier;
   private final HttpsUrlConnectionFactory httpsUrlConnectionFactory;
-  private final Executor executor;
+  @Blocking private final Executor blockingExecutor;
+  @Lightweight private final Executor lightweightExecutor;
+  private final UpdateTaskCache updateTaskCache;
 
-  private final Object updateAabLock = new Object();
-
-  @GuardedBy("updateAabLock")
-  private UpdateTaskImpl cachedUpdateTask;
-
-  @GuardedBy("updateAabLock")
   private AppDistributionReleaseInternal aabReleaseInProgress;
-
-  @GuardedBy("updateAabLock")
   private boolean hasBeenSentToPlayForCurrentTask = false;
 
-  AabUpdater() {
-    this(
-        FirebaseAppDistributionLifecycleNotifier.getInstance(),
-        new HttpsUrlConnectionFactory(),
-        Executors.newSingleThreadExecutor());
-  }
-
+  @Inject
   AabUpdater(
       @NonNull FirebaseAppDistributionLifecycleNotifier lifecycleNotifier,
       @NonNull HttpsUrlConnectionFactory httpsUrlConnectionFactory,
-      @NonNull Executor executor) {
+      @NonNull @Blocking Executor blockingExecutor,
+      @NonNull @Lightweight Executor lightweightExecutor) {
     this.lifecycleNotifier = lifecycleNotifier;
     this.httpsUrlConnectionFactory = httpsUrlConnectionFactory;
     lifecycleNotifier.addOnActivityStartedListener(this::onActivityStarted);
-    this.executor = executor;
+    this.blockingExecutor = blockingExecutor;
+    this.lightweightExecutor = lightweightExecutor;
+    this.updateTaskCache = new UpdateTaskCache(lightweightExecutor);
   }
 
   @VisibleForTesting
@@ -74,35 +68,42 @@ void onActivityStarted(Activity activity) {
     if (activity instanceof SignInResultActivity || activity instanceof InstallActivity) {
       return;
     }
-    // If app resumes and update is in progress, assume that installation didn't happen and cancel
-    // the task
-    synchronized (updateAabLock) {
-      if (awaitingUpdateFromPlay()) {
-        this.tryCancelAabUpdateTask();
-      }
+    // If app resumes and update is in progress, assume that installation didn't happen and fail the
+    // task
+    if (hasBeenSentToPlayForCurrentTask) {
+      updateTaskCache
+          .setException(
+              new FirebaseAppDistributionException(
+                  ErrorMessages.UPDATE_CANCELED,
+                  FirebaseAppDistributionException.Status.INSTALLATION_CANCELED,
+                  ReleaseUtils.convertToAppDistributionRelease(aabReleaseInProgress)))
+          .addOnSuccessListener(
+              lightweightExecutor,
+              unused -> LogWrapper.e(TAG, "App Resumed without update completing."));
     }
   }
 
-  UpdateTaskImpl updateAab(@NonNull AppDistributionReleaseInternal newRelease) {
-    synchronized (updateAabLock) {
-      if (cachedUpdateTask != null && !cachedUpdateTask.isComplete()) {
-        return cachedUpdateTask;
-      }
-
-      cachedUpdateTask = new UpdateTaskImpl();
-      aabReleaseInProgress = newRelease;
-      hasBeenSentToPlayForCurrentTask = false;
-
-      // On a background thread, fetch the redirect URL and open it in the Play app
-      runAsyncInTask(executor, () -> fetchDownloadRedirectUrl(newRelease.getDownloadUrl()))
-          .onSuccessTask(
-              redirectUrl ->
-                  lifecycleNotifier.applyToForegroundActivity(
-                      activity -> openRedirectUrlInPlay(redirectUrl, activity)))
-          .addOnFailureListener(this::setUpdateTaskCompletionError);
-
-      return cachedUpdateTask;
-    }
+  UpdateTask updateAab(@NonNull AppDistributionReleaseInternal newRelease) {
+    return updateTaskCache.getOrCreateUpdateTask(
+        () -> {
+          UpdateTaskImpl cachedUpdateTask = new UpdateTaskImpl();
+          aabReleaseInProgress = newRelease;
+          hasBeenSentToPlayForCurrentTask = false;
+
+          // On a background thread, fetch the redirect URL and open it in the Play app
+          runAsyncInTask(
+                  blockingExecutor, () -> fetchDownloadRedirectUrl(newRelease.getDownloadUrl()))
+              .onSuccessTask(
+                  lightweightExecutor,
+                  redirectUrl ->
+                      lifecycleNotifier.consumeForegroundActivity(
+                          activity -> openRedirectUrlInPlay(redirectUrl, activity)))
+              .addOnFailureListener(
+                  lightweightExecutor,
+                  e -> cachedUpdateTask.setException(FirebaseAppDistributionExceptions.wrap(e)));
+
+          return cachedUpdateTask;
+        });
   }
 
   private String fetchDownloadRedirectUrl(String downloadUrl)
@@ -152,45 +153,14 @@ private void openRedirectUrlInPlay(String redirectUrl, Activity hostActivity) {
     Intent updateIntent = new Intent(Intent.ACTION_VIEW);
     updateIntent.setData(Uri.parse(redirectUrl));
     updateIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    LogWrapper.getInstance().v(TAG + "Redirecting to play");
-
-    // Launch the intent before the synchronized block to avoid failing to update in the rare
-    // scenario where the activity moves to the background while we're awaiting the lock.
+    LogWrapper.v(TAG, "Redirecting to play");
     hostActivity.startActivity(updateIntent);
-
-    synchronized (updateAabLock) {
-      cachedUpdateTask.updateProgress(
-          UpdateProgress.builder()
-              .setApkBytesDownloaded(-1)
-              .setApkFileTotalBytes(-1)
-              .setUpdateStatus(UpdateStatus.REDIRECTED_TO_PLAY)
-              .build());
-      hasBeenSentToPlayForCurrentTask = true;
-    }
-  }
-
-  private void setUpdateTaskCompletionError(Exception e) {
-    synchronized (updateAabLock) {
-      safeSetTaskException(cachedUpdateTask, FirebaseAppDistributionException.wrap(e));
-    }
-  }
-
-  void tryCancelAabUpdateTask() {
-    synchronized (updateAabLock) {
-      safeSetTaskException(
-          cachedUpdateTask,
-          new FirebaseAppDistributionException(
-              FirebaseAppDistributionException.ErrorMessages.UPDATE_CANCELED,
-              FirebaseAppDistributionException.Status.INSTALLATION_CANCELED,
-              ReleaseUtils.convertToAppDistributionRelease(aabReleaseInProgress)));
-    }
-  }
-
-  private boolean awaitingUpdateFromPlay() {
-    synchronized (updateAabLock) {
-      return cachedUpdateTask != null
-          && !cachedUpdateTask.isComplete()
-          && hasBeenSentToPlayForCurrentTask;
-    }
+    updateTaskCache.setProgress(
+        UpdateProgressImpl.builder()
+            .setApkBytesDownloaded(-1)
+            .setApkFileTotalBytes(-1)
+            .setUpdateStatus(UpdateStatus.REDIRECTED_TO_PLAY)
+            .build());
+    hasBeenSentToPlayForCurrentTask = true;
   }
 }
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ApkInstaller.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ApkInstaller.java
new file mode 100644
index 00000000000..b33780e4f0e
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ApkInstaller.java
@@ -0,0 +1,69 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import android.app.Activity;
+import android.content.Intent;
+import androidx.annotation.Nullable;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.FirebaseAppDistribution;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import java.util.concurrent.Executor;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/** Class that handles installing APKs in {@link FirebaseAppDistribution}. */
+@Singleton // Only one update should happen at a time, even across FirebaseAppDistribution instances
+class ApkInstaller {
+  private static final String TAG = "ApkInstaller";
+
+  private final TaskCompletionSourceCache<Void> installTaskCompletionSourceCache;
+
+  @Inject
+  ApkInstaller(
+      FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier,
+      @Lightweight Executor lightweightExecutor) {
+    this.installTaskCompletionSourceCache = new TaskCompletionSourceCache<>(lightweightExecutor);
+    lifeCycleNotifier.addOnActivityDestroyedListener(this::onActivityDestroyed);
+  }
+
+  void onActivityDestroyed(@Nullable Activity activity) {
+    if (activity instanceof InstallActivity) {
+      // Since install activity is destroyed but app is still active, installation has failed /
+      // cancelled.
+      installTaskCompletionSourceCache.setException(
+          new FirebaseAppDistributionException(
+              ErrorMessages.APK_INSTALLATION_FAILED,
+              FirebaseAppDistributionException.Status.INSTALLATION_FAILURE));
+    }
+  }
+
+  Task<Void> installApk(String path, Activity currentActivity) {
+    return installTaskCompletionSourceCache.getOrCreateTaskFromCompletionSource(
+        () -> {
+          startInstallActivity(path, currentActivity);
+          return new TaskCompletionSource<>();
+        });
+  }
+
+  private void startInstallActivity(String path, Activity currentActivity) {
+    Intent intent = new Intent(currentActivity, InstallActivity.class);
+    intent.putExtra("INSTALL_PATH", path);
+    currentActivity.startActivity(intent);
+    LogWrapper.v(TAG, "Prompting tester with install activity");
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ApkUpdater.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ApkUpdater.java
similarity index 58%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ApkUpdater.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ApkUpdater.java
index 015c5f92e70..d242e3523a2 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ApkUpdater.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ApkUpdater.java
@@ -12,127 +12,102 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.DOWNLOAD_FAILURE;
 import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
-import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskException;
-import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskResult;
 
 import android.content.Context;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.TaskCompletionSource;
-import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.FirebaseAppDistribution;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.appdistribution.internal.LogWrapper;
+import com.google.firebase.appdistribution.UpdateStatus;
+import com.google.firebase.appdistribution.UpdateTask;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
 import java.util.jar.JarFile;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.net.ssl.HttpsURLConnection;
 
 /** Class that handles updateApp functionality for APKs in {@link FirebaseAppDistribution}. */
+@Singleton // Only one update should happen at a time, even across FirebaseAppDistribution instances
 class ApkUpdater {
-
+  private static final String TAG = "ApkUpdater";
   private static final int UPDATE_INTERVAL_MS = 250;
-  private static final String TAG = "ApkUpdater:";
   private static final String REQUEST_METHOD_GET = "GET";
   private static final String DEFAULT_APK_FILE_NAME = "downloaded_release.apk";
 
-  private TaskCompletionSource<File> downloadTaskCompletionSource;
-  private final Executor taskExecutor; // Executor to run task listeners on a background thread
+  private final @Blocking Executor blockingExecutor;
+  private final @Lightweight Executor lightweightExecutor;
   private final Context context;
   private final ApkInstaller apkInstaller;
   private final FirebaseAppDistributionNotificationsManager appDistributionNotificationsManager;
   private final HttpsUrlConnectionFactory httpsUrlConnectionFactory;
   private final FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier;
+  private UpdateTaskCache cachedUpdateTask;
 
-  @GuardedBy("updateTaskLock")
-  private UpdateTaskImpl cachedUpdateTask;
-
-  private final Object updateTaskLock = new Object();
-
-  public ApkUpdater(@NonNull FirebaseApp firebaseApp, @NonNull ApkInstaller apkInstaller) {
-    this(
-        Executors.newSingleThreadExecutor(),
-        firebaseApp.getApplicationContext(),
-        apkInstaller,
-        new FirebaseAppDistributionNotificationsManager(firebaseApp.getApplicationContext()),
-        new HttpsUrlConnectionFactory(),
-        FirebaseAppDistributionLifecycleNotifier.getInstance());
-  }
-
-  @VisibleForTesting
-  public ApkUpdater(
-      @NonNull Executor taskExecutor,
+  @Inject
+  ApkUpdater(
       @NonNull Context context,
       @NonNull ApkInstaller apkInstaller,
       @NonNull FirebaseAppDistributionNotificationsManager appDistributionNotificationsManager,
       @NonNull HttpsUrlConnectionFactory httpsUrlConnectionFactory,
-      @NonNull FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier) {
-    this.taskExecutor = taskExecutor;
+      @NonNull FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier,
+      @NonNull @Blocking Executor blockingExecutor,
+      @NonNull @Lightweight Executor lightweightExecutor) {
+    this.blockingExecutor = blockingExecutor;
+    this.lightweightExecutor = lightweightExecutor;
     this.context = context;
     this.apkInstaller = apkInstaller;
     this.appDistributionNotificationsManager = appDistributionNotificationsManager;
     this.httpsUrlConnectionFactory = httpsUrlConnectionFactory;
     this.lifeCycleNotifier = lifeCycleNotifier;
+    this.cachedUpdateTask = new UpdateTaskCache(lightweightExecutor);
   }
 
-  UpdateTaskImpl updateApk(
+  UpdateTask updateApk(
       @NonNull AppDistributionReleaseInternal newRelease, boolean showNotification) {
-    synchronized (updateTaskLock) {
-      if (cachedUpdateTask != null && !cachedUpdateTask.isComplete()) {
-        return cachedUpdateTask;
-      }
-
-      cachedUpdateTask = new UpdateTaskImpl();
-    }
-
-    downloadApk(newRelease, showNotification)
-        .addOnSuccessListener(taskExecutor, file -> installApk(file, showNotification))
-        .addOnFailureListener(
-            taskExecutor,
-            e -> {
-              setUpdateTaskCompletionErrorWithDefault(
-                  e, "Failed to download APK", Status.DOWNLOAD_FAILURE);
-            });
-
-    synchronized (updateTaskLock) {
-      return cachedUpdateTask;
-    }
+    return cachedUpdateTask.getOrCreateUpdateTask(
+        () -> {
+          downloadApk(newRelease, showNotification)
+              .addOnSuccessListener(lightweightExecutor, file -> installApk(file, showNotification))
+              .addOnFailureListener(
+                  lightweightExecutor,
+                  e ->
+                      setUpdateTaskCompletionErrorWithDefault(
+                          e, "Failed to download APK", Status.DOWNLOAD_FAILURE));
+          return new UpdateTaskImpl();
+        });
   }
 
   private void installApk(File file, boolean showDownloadNotificationManager) {
     lifeCycleNotifier
         .applyToForegroundActivityTask(
             activity -> apkInstaller.installApk(file.getPath(), activity))
-        .addOnSuccessListener(
-            taskExecutor,
-            unused -> {
-              synchronized (updateTaskLock) {
-                safeSetTaskResult(cachedUpdateTask);
-              }
-            })
+        .addOnSuccessListener(lightweightExecutor, unused -> cachedUpdateTask.setResult())
         .addOnFailureListener(
-            taskExecutor,
+            blockingExecutor, // Getting the file length performs disk IO
             e -> {
+              long fileLength = file.length();
               postUpdateProgress(
-                  file.length(),
-                  file.length(),
+                  fileLength,
+                  fileLength,
                   UpdateStatus.INSTALL_FAILED,
-                  showDownloadNotificationManager);
+                  showDownloadNotificationManager,
+                  R.string.install_failed);
               setUpdateTaskCompletionErrorWithDefault(
-                  e,
-                  FirebaseAppDistributionException.ErrorMessages.APK_INSTALLATION_FAILED,
-                  Status.INSTALLATION_FAILURE);
+                  e, ErrorMessages.APK_INSTALLATION_FAILED, Status.INSTALLATION_FAILURE);
             });
   }
 
@@ -140,25 +115,11 @@ private void installApk(File file, boolean showDownloadNotificationManager) {
   @NonNull
   Task<File> downloadApk(
       @NonNull AppDistributionReleaseInternal newRelease, boolean showNotification) {
-    if (downloadTaskCompletionSource != null
-        && !downloadTaskCompletionSource.getTask().isComplete()) {
-      return downloadTaskCompletionSource.getTask();
-    }
-
-    downloadTaskCompletionSource = new TaskCompletionSource<>();
-
-    taskExecutor.execute(
-        () -> {
-          try {
-            makeApkDownloadRequest(newRelease, showNotification);
-          } catch (FirebaseAppDistributionException e) {
-            safeSetTaskException(downloadTaskCompletionSource, e);
-          }
-        });
-    return downloadTaskCompletionSource.getTask();
+    return TaskUtils.runAsyncInTask(
+        blockingExecutor, () -> makeApkDownloadRequest(newRelease, showNotification));
   }
 
-  private void makeApkDownloadRequest(
+  private File makeApkDownloadRequest(
       @NonNull AppDistributionReleaseInternal newRelease, boolean showNotification)
       throws FirebaseAppDistributionException {
     String downloadUrl = newRelease.getDownloadUrl();
@@ -179,17 +140,23 @@ private void makeApkDownloadRequest(
     }
 
     long responseLength = connection.getContentLength();
-    postUpdateProgress(responseLength, 0, UpdateStatus.PENDING, showNotification);
+    postUpdateProgress(
+        responseLength, 0, UpdateStatus.PENDING, showNotification, R.string.downloading_app_update);
     String fileName = getApkFileName();
-    LogWrapper.getInstance().v(TAG + "Attempting to download APK to disk");
+    LogWrapper.v(TAG, "Attempting to download APK to disk");
 
     long bytesDownloaded = downloadToDisk(connection, responseLength, fileName, showNotification);
 
     File apkFile = context.getFileStreamPath(fileName);
     validateJarFile(apkFile, responseLength, showNotification, bytesDownloaded);
 
-    postUpdateProgress(responseLength, bytesDownloaded, UpdateStatus.DOWNLOADED, showNotification);
-    safeSetTaskResult(downloadTaskCompletionSource, apkFile);
+    postUpdateProgress(
+        responseLength,
+        bytesDownloaded,
+        UpdateStatus.DOWNLOADED,
+        showNotification,
+        R.string.download_completed);
+    return apkFile;
   }
 
   private static boolean isResponseSuccess(int responseCode) {
@@ -220,25 +187,37 @@ private long downloadToDisk(
         if (currentTimeMs - lastMsUpdated > UPDATE_INTERVAL_MS) {
           lastMsUpdated = currentTimeMs;
           postUpdateProgress(
-              totalSize, bytesDownloaded, UpdateStatus.DOWNLOADING, showNotification);
+              totalSize,
+              bytesDownloaded,
+              UpdateStatus.DOWNLOADING,
+              showNotification,
+              R.string.downloading_app_update);
         }
       }
     } catch (IOException e) {
       postUpdateProgress(
-          totalSize, bytesDownloaded, UpdateStatus.DOWNLOAD_FAILED, showNotification);
+          totalSize,
+          bytesDownloaded,
+          UpdateStatus.DOWNLOAD_FAILED,
+          showNotification,
+          R.string.download_failed);
       throw new FirebaseAppDistributionException("Failed to download APK", DOWNLOAD_FAILURE, e);
     }
     return bytesDownloaded;
   }
 
-  private void validateJarFile(
-      File apkFile, long totalSize, boolean showNotification, long bytesDownloaded)
+  @VisibleForTesting
+  void validateJarFile(File apkFile, long totalSize, boolean showNotification, long bytesDownloaded)
       throws FirebaseAppDistributionException {
     try {
       new JarFile(apkFile).close();
     } catch (IOException e) {
       postUpdateProgress(
-          totalSize, bytesDownloaded, UpdateStatus.DOWNLOAD_FAILED, showNotification);
+          totalSize,
+          bytesDownloaded,
+          UpdateStatus.DOWNLOAD_FAILED,
+          showNotification,
+          R.string.download_failed);
       throw new FirebaseAppDistributionException(
           "Downloaded APK was not a valid JAR file", DOWNLOAD_FAILURE, e);
     }
@@ -250,41 +229,36 @@ private String getApkFileName() {
           context.getApplicationInfo().loadLabel(context.getPackageManager()).toString();
       return applicationName + ".apk";
     } catch (Exception e) {
-      LogWrapper.getInstance()
-          .w(
-              TAG
-                  + "Unable to retrieve app name. Using generic file name for APK: "
-                  + DEFAULT_APK_FILE_NAME);
+      LogWrapper.w(
+          TAG,
+          "Unable to retrieve app name. Using generic file name for APK: " + DEFAULT_APK_FILE_NAME);
       return DEFAULT_APK_FILE_NAME;
     }
   }
 
-  private void setUpdateTaskCompletionError(FirebaseAppDistributionException e) {
-    synchronized (updateTaskLock) {
-      safeSetTaskException(cachedUpdateTask, e);
-    }
-  }
-
   private void setUpdateTaskCompletionErrorWithDefault(Exception e, String message, Status status) {
     if (e instanceof FirebaseAppDistributionException) {
-      setUpdateTaskCompletionError((FirebaseAppDistributionException) e);
+      cachedUpdateTask.setException((FirebaseAppDistributionException) e);
     } else {
-      setUpdateTaskCompletionError(new FirebaseAppDistributionException(message, status, e));
+      cachedUpdateTask.setException(new FirebaseAppDistributionException(message, status, e));
     }
   }
 
   private void postUpdateProgress(
-      long totalBytes, long downloadedBytes, UpdateStatus status, boolean showNotification) {
-    synchronized (updateTaskLock) {
-      cachedUpdateTask.updateProgress(
-          UpdateProgress.builder()
-              .setApkFileTotalBytes(totalBytes)
-              .setApkBytesDownloaded(downloadedBytes)
-              .setUpdateStatus(status)
-              .build());
-    }
+      long totalBytes,
+      long downloadedBytes,
+      UpdateStatus status,
+      boolean showNotification,
+      int stringResourceId) {
+    cachedUpdateTask.setProgress(
+        UpdateProgressImpl.builder()
+            .setApkFileTotalBytes(totalBytes)
+            .setApkBytesDownloaded(downloadedBytes)
+            .setUpdateStatus(status)
+            .build());
     if (showNotification) {
-      appDistributionNotificationsManager.updateNotification(totalBytes, downloadedBytes, status);
+      appDistributionNotificationsManager.showAppUpdateNotification(
+          totalBytes, downloadedBytes, stringResourceId);
     }
   }
 }
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AppDistributionRelease.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppDistributionReleaseImpl.java
similarity index 74%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AppDistributionRelease.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppDistributionReleaseImpl.java
index 8618bf54ccf..3563d9e1702 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AppDistributionRelease.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppDistributionReleaseImpl.java
@@ -12,41 +12,44 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.auto.value.AutoValue;
+import com.google.firebase.appdistribution.AppDistributionRelease;
+import com.google.firebase.appdistribution.BinaryType;
 
-/**
- * The release information returned by {@link FirebaseAppDistribution#checkForNewRelease} when a new
- * version is available for the signed in tester.
- */
+/** The default implementation of {@link AppDistributionRelease}. */
 @AutoValue
-public abstract class AppDistributionRelease {
+abstract class AppDistributionReleaseImpl implements AppDistributionRelease {
 
   @NonNull
   static Builder builder() {
-    return new com.google.firebase.appdistribution.AutoValue_AppDistributionRelease.Builder();
+    return new AutoValue_AppDistributionReleaseImpl.Builder();
   }
 
   /** Returns the short bundle version of this build (example: 1.0.0). */
+  @Override
   @NonNull
   public abstract String getDisplayVersion();
 
   /** Returns the version code of this build (example: 123). */
+  @Override
   @NonNull
   public abstract long getVersionCode();
 
   /** Returns the release notes for this build. */
+  @Override
   @Nullable
   public abstract String getReleaseNotes();
 
   /** Returns the binary type for this build. */
+  @Override
   @NonNull
   public abstract BinaryType getBinaryType();
 
-  /** Builder for {@link AppDistributionRelease}. */
+  /** Builder for {@link AppDistributionReleaseImpl}. */
   @AutoValue.Builder
   abstract static class Builder {
 
@@ -63,6 +66,6 @@ abstract static class Builder {
     abstract Builder setBinaryType(@NonNull BinaryType value);
 
     @NonNull
-    abstract AppDistributionRelease build();
+    abstract AppDistributionReleaseImpl build();
   }
 }
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AppDistributionReleaseInternal.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppDistributionReleaseInternal.java
similarity index 92%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AppDistributionReleaseInternal.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppDistributionReleaseInternal.java
index 0f0ca02ca6d..20bb24e4bff 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AppDistributionReleaseInternal.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppDistributionReleaseInternal.java
@@ -12,14 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.auto.value.AutoValue;
+import com.google.firebase.appdistribution.BinaryType;
 
 /**
  * This class represents the AppDistributionRelease object returned by the App Distribution backend.
+ *
+ * <p>TODO(lkellogg): Combine this with AppDistributionReleaseImpl
  */
 @AutoValue
 abstract class AppDistributionReleaseInternal {
@@ -64,6 +67,9 @@ static Builder builder() {
   @Nullable
   abstract String getDownloadUrl();
 
+  @NonNull
+  abstract Builder toBuilder();
+
   /** Builder for {@link AppDistributionReleaseInternal}. */
   @AutoValue.Builder
   abstract static class Builder {
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppDistroComponent.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppDistroComponent.java
new file mode 100644
index 00000000000..39556f4bfe3
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppDistroComponent.java
@@ -0,0 +1,125 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.appdistribution.FirebaseAppDistribution;
+import com.google.firebase.inject.Provider;
+import com.google.firebase.installations.FirebaseInstallationsApi;
+import dagger.Binds;
+import dagger.BindsInstance;
+import dagger.Component;
+import dagger.Module;
+import dagger.Provides;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import javax.inject.Singleton;
+
+@Component(modules = AppDistroComponent.MainModule.class)
+@Singleton
+interface AppDistroComponent {
+
+  /** Get the default instance of AppDistroComponent. */
+  static AppDistroComponent getInstance() {
+    // TODO(b/266704696): This currently only supports one FirebaseApp app-wide
+    return FirebaseApp.getInstance().get(AppDistroComponent.class);
+  }
+
+  // Provided classes
+  FirebaseAppDistribution getAppDistribution();
+
+  FirebaseAppDistributionLifecycleNotifier getLifecycleNotifier();
+
+  // Provided instances
+  @Component.Builder
+  interface Builder {
+
+    @BindsInstance
+    Builder setApplicationContext(Context context);
+
+    @BindsInstance
+    Builder setOptions(FirebaseOptions options);
+
+    @BindsInstance
+    Builder setApp(FirebaseApp app);
+
+    @BindsInstance
+    Builder setFis(Provider<FirebaseInstallationsApi> fis);
+
+    @BindsInstance
+    Builder setBackgroundExecutor(@Background ScheduledExecutorService executor);
+
+    @BindsInstance
+    Builder setBlockingExecutor(@Blocking ScheduledExecutorService executor);
+
+    @BindsInstance
+    Builder setLightweightExecutor(@Lightweight ScheduledExecutorService executor);
+
+    @BindsInstance
+    Builder setUiThreadExecutor(@UiThread Executor executor);
+
+    AppDistroComponent build();
+  }
+
+  // Activity injectors
+  void inject(FeedbackActivity activity);
+
+  void inject(TakeScreenshotAndStartFeedbackActivity activity);
+
+  @Module
+  abstract class MainModule {
+    @Binds
+    abstract FirebaseAppDistribution bindAppDistro(FirebaseAppDistributionImpl impl);
+
+    @Binds
+    @Background
+    abstract ExecutorService bindBackgroundExecutorService(
+        @Background ScheduledExecutorService ses);
+
+    @Binds
+    @Background
+    abstract Executor bindBackgroundExecutor(@Background ExecutorService es);
+
+    @Binds
+    @Lightweight
+    abstract ExecutorService bindLightweightExecutorService(
+        @Lightweight ScheduledExecutorService ses);
+
+    @Binds
+    @Lightweight
+    abstract Executor bindLightweightExecutor(@Lightweight ExecutorService es);
+
+    @Binds
+    @Blocking
+    abstract ExecutorService bindBlockingExecutorService(@Blocking ScheduledExecutorService ses);
+
+    @Binds
+    @Blocking
+    abstract Executor bindBlockingExecutor(@Blocking ExecutorService es);
+
+    @Provides
+    static ContentResolver bindContentResolver(Context applicationContext) {
+      return applicationContext.getContentResolver();
+    }
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AppIconSource.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppIconSource.java
similarity index 86%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AppIconSource.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppIconSource.java
index 286a73bd36d..42718051fd3 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/AppIconSource.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppIconSource.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -21,13 +21,16 @@
 import android.os.Build;
 import android.os.Build.VERSION;
 import androidx.core.content.ContextCompat;
-import com.google.firebase.appdistribution.internal.LogWrapper;
+import javax.inject.Inject;
 
 class AppIconSource {
-  private static final String TAG = "AppIconSource: ";
+  private static final String TAG = "AppIconSource";
 
   private static final int DEFAULT_ICON = android.R.drawable.sym_def_app_icon;
 
+  @Inject
+  AppIconSource() {}
+
   /**
    * Get an icon for the given app context, or a default icon if the app icon is adaptive or does
    * not exist.
@@ -51,8 +54,8 @@ int getNonAdaptiveIconOrDefault(Context context) {
     }
 
     if (isAdaptiveIcon(icon)) {
-      LogWrapper.getInstance()
-          .e(TAG + "Adaptive icons cannot be used in notifications. Ignoring icon id: " + iconId);
+      LogWrapper.e(
+          TAG, "Adaptive icons cannot be used in notifications. Ignoring icon id: " + iconId);
       return DEFAULT_ICON;
     }
 
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/DevModeDetector.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/DevModeDetector.java
new file mode 100644
index 00000000000..c4566dfa941
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/DevModeDetector.java
@@ -0,0 +1,50 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import androidx.annotation.Nullable;
+import java.lang.reflect.Method;
+import javax.inject.Inject;
+
+/**
+ * A detector to recognize when the SDK is in development mode, which disables any functionality
+ * that requires the tester to have signed in.
+ */
+class DevModeDetector {
+
+  @Inject
+  DevModeDetector() {}
+
+  boolean isDevModeEnabled() {
+    return Boolean.valueOf(getSystemProperty("debug.firebase.appdistro.devmode"));
+  }
+
+  @Nullable
+  @SuppressWarnings({"unchecked", "PrivateApi"})
+  private static String getSystemProperty(String propertyName) {
+    String className = "android.os.SystemProperties";
+    try {
+      Class<?> sysProps = Class.forName(className);
+      Method method = sysProps.getDeclaredMethod("get", String.class);
+      Object result = method.invoke(null, propertyName);
+      if (result != null && String.class.isAssignableFrom(result.getClass())) {
+        return (String) result;
+      }
+    } catch (Exception e) {
+      // do nothing
+    }
+    return null;
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ErrorMessages.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ErrorMessages.java
new file mode 100644
index 00000000000..3b95c53618b
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ErrorMessages.java
@@ -0,0 +1,59 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+class ErrorMessages {
+
+  static final String NETWORK_ERROR = "Request failed with unknown network error.";
+
+  static final String JSON_PARSING_ERROR =
+      "Error parsing service response. This was most likely due to a transient condition and may be corrected by retrying.";
+
+  static final String JSON_SERIALIZATION_ERROR = "Error building request body.";
+
+  static final String AUTHENTICATION_ERROR =
+      "Failed to authenticate the tester. The tester was either not signed in, or something went wrong. Try signing in again.";
+
+  static final String AUTHORIZATION_ERROR =
+      "Failed to authorize the tester. The tester does not have access to this resource (or it may not exist).";
+
+  static final String AUTHENTICATION_CANCELED = "Tester canceled the authentication flow.";
+
+  static final String RELEASE_NOT_FOUND_ERROR =
+      "Release not found. An update was not available for the current tester and app. Make sure that checkForNewRelease() returns with a non-null AppDistributionRelease before calling updateApp()";
+
+  static final String NOT_FOUND_ERROR = "Resource not found (or the tester may not have access).";
+
+  static final String TIMEOUT_ERROR =
+      "Request timed out. Check the tester's internet connection and try again.";
+
+  static final String UPDATE_CANCELED = "Tester canceled the update.";
+
+  static final String UNKNOWN_ERROR = "Unknown error.";
+
+  static final String DOWNLOAD_URL_NOT_FOUND =
+      "Download URL not found. This was a most likely due to a transient condition and may be corrected by retrying.";
+
+  static final String HOST_ACTIVITY_INTERRUPTED =
+      "Host activity interrupted while dialog was showing. Try calling the API again.";
+
+  static final String APK_INSTALLATION_FAILED =
+      "The APK failed to install or installation was canceled by the tester.";
+
+  static final String API_DISABLED =
+      "The App Distribution Tester API is disabled; you must enable it in the Google Cloud console. If you enabled this API recently, wait a few minutes for the action to propagate to our systems and retry.";
+
+  private ErrorMessages() {}
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackActivity.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackActivity.java
new file mode 100644
index 00000000000..93db7347faf
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackActivity.java
@@ -0,0 +1,236 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.method.LinkMovementMethod;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.UiThread;
+import java.io.IOException;
+import java.util.concurrent.Executor;
+import javax.inject.Inject;
+
+/** Activity for tester to compose and submit feedback. */
+public class FeedbackActivity extends AppCompatActivity {
+  private static final String TAG = "FeedbackActivity";
+  private static final int SCREENSHOT_TARGET_WIDTH_PX = 600;
+  private static final int SCREENSHOT_TARGET_HEIGHT_PX = -1; // scale proportionally
+
+  public static final String RELEASE_NAME_KEY =
+      "com.google.firebase.appdistribution.FeedbackActivity.RELEASE_NAME";
+  public static final String ADDITIONAL_FORM_TEXT_KEY =
+      "com.google.firebase.appdistribution.FeedbackActivity.ADDITIONAL_FORM_TEXT";
+  public static final String SCREENSHOT_URI_KEY =
+      "com.google.firebase.appdistribution.FeedbackActivity.SCREENSHOT_URI";
+  public static final String FEEDBACK_TRIGGER_KEY =
+      "com.google.firebase.appdistribution.FeedbackActivity.FEEDBACK_TRIGGER";
+
+  private final ActivityResultLauncher<Intent> chooseScreenshotLauncher =
+      registerForActivityResult(new StartActivityForResult(), this::handleChooseScreenshotResult);
+
+  @Inject FeedbackSender feedbackSender;
+  @Inject @Blocking Executor blockingExecutor;
+  @Inject @UiThread Executor uiThreadExecutor;
+
+  @Nullable private String releaseName; // in development-mode the releaseName might be null
+  private CharSequence additionalFormText;
+  @Nullable private Uri screenshotUri;
+  private FeedbackTrigger feedbackTrigger = FeedbackTrigger.UNKNOWN;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    // Inject members before calling super.onCreate to avoid issues with fragment restoration
+    AppDistroComponent.getInstance().inject(this);
+
+    super.onCreate(savedInstanceState);
+
+    if (savedInstanceState != null) {
+      releaseName = savedInstanceState.getString(RELEASE_NAME_KEY);
+      additionalFormText = savedInstanceState.getCharSequence(ADDITIONAL_FORM_TEXT_KEY);
+      String feedbackTriggerKey = savedInstanceState.getString(FEEDBACK_TRIGGER_KEY);
+      if (feedbackTriggerKey != null) {
+        feedbackTrigger = FeedbackTrigger.fromString(feedbackTriggerKey);
+      }
+      String screenshotUriString = savedInstanceState.getString(SCREENSHOT_URI_KEY);
+      if (screenshotUriString != null) {
+        screenshotUri = Uri.parse(screenshotUriString);
+      }
+    } else {
+      releaseName = getIntent().getStringExtra(RELEASE_NAME_KEY);
+      additionalFormText = getIntent().getCharSequenceExtra(ADDITIONAL_FORM_TEXT_KEY);
+      if (getIntent().hasExtra(FEEDBACK_TRIGGER_KEY)) {
+        feedbackTrigger =
+            FeedbackTrigger.fromString(getIntent().getStringExtra(FEEDBACK_TRIGGER_KEY));
+      }
+      if (getIntent().hasExtra(SCREENSHOT_URI_KEY)) {
+        screenshotUri = Uri.parse(getIntent().getStringExtra(SCREENSHOT_URI_KEY));
+      }
+    }
+
+    setupView();
+  }
+
+  @Override
+  protected void onSaveInstanceState(@NonNull Bundle outState) {
+    outState.putString(RELEASE_NAME_KEY, releaseName);
+    outState.putCharSequence(ADDITIONAL_FORM_TEXT_KEY, additionalFormText);
+    outState.putString(SCREENSHOT_URI_KEY, screenshotUri.toString());
+    outState.putString(FEEDBACK_TRIGGER_KEY, feedbackTrigger.toString());
+    super.onSaveInstanceState(outState);
+  }
+
+  private void setupView() {
+    setTheme(R.style.FeedbackTheme);
+    setContentView(R.layout.activity_feedback);
+
+    TextView additionalFormTextView = this.findViewById(R.id.additionalFormText);
+    additionalFormTextView.setText(additionalFormText);
+    additionalFormTextView.setMovementMethod(LinkMovementMethod.getInstance());
+
+    findViewById(R.id.backButton).setOnClickListener(v -> finish());
+    findViewById(R.id.sendButton).setOnClickListener(this::submitFeedback);
+
+    findViewById(R.id.chooseScreenshotButton)
+        .setOnClickListener(
+            v -> {
+              Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+              intent.addCategory(Intent.CATEGORY_OPENABLE);
+              intent.setType("*/*");
+              intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[] {"image/png", "image/jpeg"});
+              chooseScreenshotLauncher.launch(intent);
+            });
+
+    setupScreenshot();
+  }
+
+  private void setupScreenshot() {
+    blockingExecutor.execute(
+        () -> {
+          // Do I/O on separate thread in order to not block the UI
+          Bitmap screenshot = readScreenshot(screenshotUri);
+          if (screenshot != null) {
+            runOnUiThread(
+                () -> {
+                  ImageView imageView = findViewById(R.id.screenshotImageView);
+                  imageView.setImageBitmap(screenshot);
+                  imageView.setVisibility(VISIBLE);
+                  CheckBox checkBox = findViewById(R.id.screenshotCheckBox);
+                  checkBox.setChecked(true);
+                  checkBox.setOnClickListener(
+                      v -> imageView.setVisibility(checkBox.isChecked() ? VISIBLE : GONE));
+                });
+          } else {
+            runOnUiThread(
+                () -> {
+                  CheckBox checkBox = findViewById(R.id.screenshotCheckBox);
+                  checkBox.setText(R.string.no_screenshot);
+                  checkBox.setClickable(false);
+                  checkBox.setChecked(false);
+                });
+          }
+        });
+  }
+
+  private void handleChooseScreenshotResult(ActivityResult activityResult) {
+    int resultCode = activityResult.getResultCode();
+    Intent intent = activityResult.getData();
+    if (resultCode == Activity.RESULT_OK && intent != null && intent.getData() != null) {
+      Uri uri = intent.getData();
+      LogWrapper.d(TAG, "Selected custom screenshot URI: " + uri);
+      screenshotUri = uri;
+      setupScreenshot();
+    } else {
+      LogWrapper.d(TAG, "No custom screenshot selected. Not changing screenshot URI.");
+    }
+  }
+
+  @Nullable
+  private Bitmap readScreenshot(@Nullable Uri uri) {
+    if (uri == null) {
+      return null;
+    }
+    Bitmap bitmap;
+    try {
+      bitmap =
+          ImageUtils.readScaledImage(
+              getContentResolver(), uri, SCREENSHOT_TARGET_WIDTH_PX, SCREENSHOT_TARGET_HEIGHT_PX);
+    } catch (IOException | SecurityException e) {
+      LogWrapper.e(TAG, "Could not read screenshot image from URI: " + uri, e);
+      return null;
+    }
+    if (bitmap == null) {
+      LogWrapper.e(TAG, "Could not decode screenshot image from URI: " + uri);
+    }
+    return bitmap;
+  }
+
+  public void submitFeedback(View view) {
+    setSubmittingStateEnabled(true);
+    if (releaseName == null) {
+      Toast.makeText(this, R.string.feedback_no_release, Toast.LENGTH_LONG).show();
+      LogWrapper.w(TAG, "Not submitting feedback because development mode is enabled.");
+      finish();
+      return;
+    }
+    EditText feedbackText = findViewById(R.id.feedbackText);
+    CheckBox screenshotCheckBox = findViewById(R.id.screenshotCheckBox);
+    feedbackSender
+        .sendFeedback(
+            releaseName,
+            feedbackText.getText().toString(),
+            screenshotCheckBox.isChecked() ? screenshotUri : null,
+            feedbackTrigger)
+        .addOnSuccessListener(
+            uiThreadExecutor,
+            unused -> {
+              LogWrapper.i(TAG, "Feedback submitted");
+              Toast.makeText(this, "Feedback submitted", Toast.LENGTH_LONG).show();
+              finish();
+            })
+        .addOnFailureListener(
+            uiThreadExecutor,
+            e -> {
+              LogWrapper.e(TAG, "Failed to submit feedback", e);
+              Toast.makeText(this, "Error submitting feedback", Toast.LENGTH_LONG).show();
+              setSubmittingStateEnabled(false);
+            });
+  }
+
+  public void setSubmittingStateEnabled(boolean loading) {
+    findViewById(R.id.sendButton).setVisibility(loading ? GONE : VISIBLE);
+    findViewById(R.id.sendSpinner).setVisibility(loading ? VISIBLE : GONE);
+    findViewById(R.id.feedbackText).setEnabled(!loading);
+    findViewById(R.id.feedbackText).setFocusable(!loading);
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackSender.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackSender.java
new file mode 100644
index 00000000000..859b603c876
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackSender.java
@@ -0,0 +1,166 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.OpenableColumns;
+import androidx.annotation.Nullable;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import java.util.concurrent.Executor;
+import javax.inject.Inject;
+
+/** Sends tester feedback to the Tester API. */
+class FeedbackSender {
+  static final String CONTENT_TYPE_JPEG = "image/jpeg";
+  static final String CONTENT_TYPE_PNG = "image/png";
+
+  private static final String TAG = "FeedbackSender";
+  private static final String FILE_EXTENSION_JPG = ".jpg";
+  private static final String FILE_EXTENSION_JPEG = ".jpeg";
+  private static final String FILE_EXTENSION_PNG = ".png";
+  private static final String DEFAULT_FILENAME = "screenshot.png";
+
+  private final ContentResolver contentResolver;
+  private final FirebaseAppDistributionTesterApiClient testerApiClient;
+  @Lightweight private final Executor lightweightExecutor;
+
+  @Inject
+  FeedbackSender(
+      ContentResolver contentResolver,
+      FirebaseAppDistributionTesterApiClient testerApiClient,
+      @Lightweight Executor lightweightExecutor) {
+    this.contentResolver = contentResolver;
+    this.testerApiClient = testerApiClient;
+    this.lightweightExecutor = lightweightExecutor;
+  }
+
+  /** Send feedback text and optionally a screenshot to the Tester API for the given release. */
+  Task<Void> sendFeedback(
+      String releaseName,
+      String feedbackText,
+      @Nullable Uri screenshotUri,
+      FeedbackTrigger trigger) {
+    return testerApiClient
+        .createFeedback(releaseName, feedbackText)
+        .onSuccessTask(
+            lightweightExecutor, feedbackName -> attachScreenshot(feedbackName, screenshotUri))
+        .onSuccessTask(
+            lightweightExecutor,
+            feedbackName -> testerApiClient.commitFeedback(feedbackName, trigger));
+  }
+
+  private Task<String> attachScreenshot(String feedbackName, @Nullable Uri screenshotUri) {
+    if (screenshotUri == null) {
+      return Tasks.forResult(feedbackName);
+    }
+    if (!screenshotUri.getScheme().equals("file") && !screenshotUri.getScheme().equals("content")) {
+      return Tasks.forException(
+          new FirebaseAppDistributionException(
+              String.format(
+                  "Screenshot URI '%s' was not a content or file URI. Not starting feedback.",
+                  screenshotUri),
+              Status.UNKNOWN));
+    }
+    String contentType = getContentType(screenshotUri);
+    return testerApiClient.attachScreenshot(
+        feedbackName,
+        screenshotUri,
+        getScreenshotFilename(screenshotUri, contentType),
+        contentType);
+  }
+
+  private String getContentType(Uri screenshotUri) {
+    String contentType = null;
+    if (screenshotUri.getScheme().equals("file")) {
+      contentType = getContentTypeForFilename(screenshotUri.getLastPathSegment());
+    } else if (screenshotUri.getScheme().equals("content")) {
+      contentType = contentResolver.getType(screenshotUri);
+    }
+
+    if (contentType != null) {
+      return contentType;
+    }
+
+    LogWrapper.w(
+        TAG, String.format("Could not get content type for URI %s. Assuming PNG.", screenshotUri));
+    return CONTENT_TYPE_PNG;
+  }
+
+  private String getScreenshotFilename(Uri screenshotUri, String contentType) {
+    if (screenshotUri.getScheme().equals("file")) {
+      return screenshotUri.getLastPathSegment();
+    } else {
+      return getContentFilename(screenshotUri, contentType);
+    }
+  }
+
+  private String getContentFilename(Uri contentUri, String contentType) {
+    try (Cursor returnCursor =
+        contentResolver.query(
+            contentUri,
+            new String[] {OpenableColumns.DISPLAY_NAME},
+            /* selection= */ null,
+            /* projectionArgs= */ null,
+            /* sortOrder= */ null)) {
+      if (returnCursor == null) {
+        LogWrapper.w(
+            TAG,
+            String.format("Unable to get filename from URI '%s', using content type", contentUri));
+        return getDefaultFilename(contentType);
+      }
+      int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+      returnCursor.moveToFirst();
+      String name = returnCursor.getString(nameIndex);
+      return name;
+    } catch (Exception e) {
+      LogWrapper.e(
+          TAG,
+          String.format("Error getting filename from URI '%s', using content type", contentUri),
+          e);
+      return getDefaultFilename(contentType);
+    }
+  }
+
+  private String getDefaultFilename(String contentType) {
+    if (contentType.equals(CONTENT_TYPE_JPEG)) {
+      return "screenshot.jpg";
+    } else if (contentType.equals(CONTENT_TYPE_PNG)) {
+      return "screenshot.png";
+    } else {
+      LogWrapper.w(
+          TAG,
+          String.format(
+              "Unexpected content type '%s', using filename without extension", contentType));
+      return "screenshot";
+    }
+  }
+
+  @Nullable
+  private static String getContentTypeForFilename(String filename) {
+    if (filename.endsWith(FILE_EXTENSION_JPG) || filename.endsWith(FILE_EXTENSION_JPEG)) {
+      return CONTENT_TYPE_JPEG;
+    } else if (filename.endsWith(FILE_EXTENSION_PNG)) {
+      return CONTENT_TYPE_PNG;
+    } else {
+      return null;
+    }
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackTrigger.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackTrigger.java
new file mode 100644
index 00000000000..a92c2f11afc
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FeedbackTrigger.java
@@ -0,0 +1,43 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+/** Feedback trigger type */
+enum FeedbackTrigger {
+  NOTIFICATION("notification"),
+  CUSTOM("custom"),
+  UNKNOWN("unknown");
+
+  private final String value;
+
+  FeedbackTrigger(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+
+  public static FeedbackTrigger fromString(String value) {
+    if (value.equals(NOTIFICATION.value)) {
+      return NOTIFICATION;
+    } else if (value.equals(CUSTOM.value)) {
+      return CUSTOM;
+    } else {
+      return UNKNOWN;
+    }
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionExceptions.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionExceptions.java
new file mode 100644
index 00000000000..82d50075c46
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionExceptions.java
@@ -0,0 +1,34 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+
+/** Utilities for interacting with {@link FirebaseAppDistributionException}. */
+class FirebaseAppDistributionExceptions {
+
+  static FirebaseAppDistributionException wrap(Throwable t) {
+    // We never want to wrap a FirebaseAppDistributionException
+    if (t instanceof FirebaseAppDistributionException) {
+      return (FirebaseAppDistributionException) t;
+    }
+    return new FirebaseAppDistributionException(
+        String.format("%s: %s", ErrorMessages.UNKNOWN_ERROR, t.getMessage()),
+        Status.UNKNOWN,
+        null,
+        t);
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionFileProvider.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionFileProvider.java
similarity index 92%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionFileProvider.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionFileProvider.java
index 9b99c916dc1..fb65a28b9a3 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/FirebaseAppDistributionFileProvider.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionFileProvider.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution.internal;
+package com.google.firebase.appdistribution.impl;
 
 import androidx.core.content.FileProvider;
 
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionImpl.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionImpl.java
new file mode 100644
index 00000000000..f6459ede5e9
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionImpl.java
@@ -0,0 +1,662 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_CANCELED;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.HOST_ACTIVITY_INTERRUPTED;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.UPDATE_NOT_AVAILABLE;
+import static com.google.firebase.appdistribution.impl.TaskUtils.safeSetTaskException;
+import static com.google.firebase.appdistribution.impl.TaskUtils.safeSetTaskResult;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.appdistribution.AppDistributionRelease;
+import com.google.firebase.appdistribution.BinaryType;
+import com.google.firebase.appdistribution.FirebaseAppDistribution;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.appdistribution.InterruptionLevel;
+import com.google.firebase.appdistribution.UpdateProgress;
+import com.google.firebase.appdistribution.UpdateStatus;
+import com.google.firebase.appdistribution.UpdateTask;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * This class is the "real" implementation of the Firebase App Distribution API which should only be
+ * included in pre-release builds.
+ */
+// TODO(b/266704696): This currently only supports one FirebaseAppDistribution instance app-wide
+@Singleton
+class FirebaseAppDistributionImpl implements FirebaseAppDistribution {
+
+  private static final String TAG = "Impl";
+  private static final int UNKNOWN_RELEASE_FILE_SIZE = -1;
+
+  private final Context applicationContext;
+  private final TesterSignInManager testerSignInManager;
+  private final NewReleaseFetcher newReleaseFetcher;
+  private final FirebaseAppDistributionLifecycleNotifier lifecycleNotifier;
+  private final ApkUpdater apkUpdater;
+  private final AabUpdater aabUpdater;
+  private final SignInStorage signInStorage;
+  private final ReleaseIdentifier releaseIdentifier;
+  private final ScreenshotTaker screenshotTaker;
+  @Lightweight private final Executor lightweightExecutor;
+  @UiThread private final Executor uiThreadExecutor;
+  private final SequentialReference<AppDistributionReleaseInternal> cachedNewRelease;
+  private final TaskCache<AppDistributionRelease> checkForNewReleaseTaskCache;
+  private final UpdateTaskCache updateIfNewReleaseAvailableTaskCache;
+  private final FirebaseAppDistributionNotificationsManager notificationsManager;
+  private final AtomicBoolean feedbackInProgress = new AtomicBoolean(false);
+
+  @Nullable private AlertDialog updateConfirmationDialog;
+  @Nullable private AlertDialog signInConfirmationDialog;
+  @Nullable private Activity dialogHostActivity;
+  private boolean remakeSignInConfirmationDialog = false;
+  private boolean remakeUpdateConfirmationDialog = false;
+  @Nullable private TaskCompletionSource<Void> showSignInDialogTask;
+  @Nullable private TaskCompletionSource<Void> showUpdateDialogTask;
+
+  @Inject
+  FirebaseAppDistributionImpl(
+      @NonNull Context applicationContext,
+      @NonNull TesterSignInManager testerSignInManager,
+      @NonNull NewReleaseFetcher newReleaseFetcher,
+      @NonNull ApkUpdater apkUpdater,
+      @NonNull AabUpdater aabUpdater,
+      @NonNull SignInStorage signInStorage,
+      @NonNull FirebaseAppDistributionLifecycleNotifier lifecycleNotifier,
+      @NonNull ReleaseIdentifier releaseIdentifier,
+      @NonNull ScreenshotTaker screenshotTaker,
+      @NonNull FirebaseAppDistributionNotificationsManager notificationsManager,
+      @NonNull @Lightweight Executor lightweightExecutor,
+      @NonNull @UiThread Executor uiThreadExecutor) {
+    this.applicationContext = applicationContext;
+    this.testerSignInManager = testerSignInManager;
+    this.newReleaseFetcher = newReleaseFetcher;
+    this.apkUpdater = apkUpdater;
+    this.aabUpdater = aabUpdater;
+    this.signInStorage = signInStorage;
+    this.releaseIdentifier = releaseIdentifier;
+    this.lifecycleNotifier = lifecycleNotifier;
+    this.screenshotTaker = screenshotTaker;
+    this.lightweightExecutor = lightweightExecutor;
+    this.uiThreadExecutor = uiThreadExecutor;
+    this.cachedNewRelease = new SequentialReference<>(lightweightExecutor);
+    this.checkForNewReleaseTaskCache = new TaskCache<>(lightweightExecutor);
+    this.updateIfNewReleaseAvailableTaskCache = new UpdateTaskCache(lightweightExecutor);
+    this.notificationsManager = notificationsManager;
+    lifecycleNotifier.addOnActivityDestroyedListener(this::onActivityDestroyed);
+    lifecycleNotifier.addOnActivityPausedListener(this::onActivityPaused);
+    lifecycleNotifier.addOnActivityResumedListener(this::onActivityResumed);
+  }
+
+  @Override
+  @NonNull
+  public UpdateTask updateIfNewReleaseAvailable() {
+    return updateIfNewReleaseAvailableTaskCache.getOrCreateUpdateTask(
+        () -> {
+          UpdateTaskImpl updateTask = new UpdateTaskImpl();
+          remakeSignInConfirmationDialog = false;
+          remakeUpdateConfirmationDialog = false;
+          dialogHostActivity = null;
+
+          signInWithConfirmationIfNeeded()
+              .onSuccessTask(lightweightExecutor, unused -> checkForNewRelease())
+              .continueWithTask(
+                  lightweightExecutor,
+                  task -> {
+                    if (!task.isSuccessful()) {
+                      postProgressToCachedUpdateIfNewReleaseTask(
+                          updateTask,
+                          UpdateProgressImpl.builder()
+                              .setApkBytesDownloaded(UNKNOWN_RELEASE_FILE_SIZE)
+                              .setApkFileTotalBytes(UNKNOWN_RELEASE_FILE_SIZE)
+                              .setUpdateStatus(UpdateStatus.NEW_RELEASE_CHECK_FAILED)
+                              .build());
+                    }
+                    // if the task failed, this get() will cause the error to propagate to the
+                    // handler below
+                    AppDistributionRelease release = task.getResult();
+                    if (release == null) {
+                      postProgressToCachedUpdateIfNewReleaseTask(
+                          updateTask,
+                          UpdateProgressImpl.builder()
+                              .setApkFileTotalBytes(UNKNOWN_RELEASE_FILE_SIZE)
+                              .setApkBytesDownloaded(UNKNOWN_RELEASE_FILE_SIZE)
+                              .setUpdateStatus(UpdateStatus.NEW_RELEASE_NOT_AVAILABLE)
+                              .build());
+                      setCachedUpdateIfNewReleaseResult(updateTask);
+                      return Tasks.forResult(null);
+                    }
+                    return lifecycleNotifier.applyToForegroundActivityTask(
+                        activity -> showUpdateConfirmationDialog(activity, release));
+                  })
+              .onSuccessTask(
+                  lightweightExecutor,
+                  unused ->
+                      updateApp(true)
+                          .addOnProgressListener(
+                              lightweightExecutor,
+                              updateProgress ->
+                                  postProgressToCachedUpdateIfNewReleaseTask(
+                                      updateTask, updateProgress)))
+              .addOnFailureListener(
+                  lightweightExecutor,
+                  exception -> setCachedUpdateIfNewReleaseCompletionError(updateTask, exception));
+
+          return updateTask;
+        });
+  }
+
+  @NonNull
+  private Task<Void> signInWithConfirmationIfNeeded() {
+    return signInStorage
+        .getSignInStatus()
+        .onSuccessTask(
+            lightweightExecutor,
+            signedIn -> {
+              if (signedIn) {
+                return Tasks.forResult(null);
+              }
+              return lifecycleNotifier
+                  .applyToForegroundActivityTask(this::showSignInConfirmationDialog)
+                  .onSuccessTask(lightweightExecutor, unused -> signInTester());
+            });
+  }
+
+  @NonNull
+  private Task<Void> showSignInConfirmationDialog(Activity hostActivity) {
+    if (showSignInDialogTask == null || showSignInDialogTask.getTask().isComplete()) {
+      showSignInDialogTask = new TaskCompletionSource<>();
+    }
+
+    dialogHostActivity = hostActivity;
+
+    // We may not be on the main (UI) thread in some cases, specifically if the developer calls
+    // the basic config from the background. If we are already on the main thread, this will
+    // execute immediately.
+    hostActivity.runOnUiThread(
+        () -> {
+          signInConfirmationDialog = new AlertDialog.Builder(hostActivity).create();
+
+          signInConfirmationDialog.setTitle(
+              applicationContext.getString(R.string.signin_dialog_title));
+          signInConfirmationDialog.setMessage(
+              applicationContext.getString(R.string.singin_dialog_message));
+
+          signInConfirmationDialog.setButton(
+              AlertDialog.BUTTON_POSITIVE,
+              applicationContext.getString(R.string.singin_yes_button),
+              (dialogInterface, i) -> showSignInDialogTask.setResult(null));
+
+          signInConfirmationDialog.setButton(
+              AlertDialog.BUTTON_NEGATIVE,
+              applicationContext.getString(R.string.singin_no_button),
+              (dialogInterface, i) ->
+                  showSignInDialogTask.setException(
+                      new FirebaseAppDistributionException(
+                          ErrorMessages.AUTHENTICATION_CANCELED, AUTHENTICATION_CANCELED)));
+
+          signInConfirmationDialog.setOnCancelListener(
+              dialogInterface ->
+                  showSignInDialogTask.setException(
+                      new FirebaseAppDistributionException(
+                          ErrorMessages.AUTHENTICATION_CANCELED, AUTHENTICATION_CANCELED)));
+
+          signInConfirmationDialog.show();
+        });
+    return showSignInDialogTask.getTask();
+  }
+
+  @Override
+  public boolean isTesterSignedIn() {
+    return signInStorage.getSignInStatusBlocking();
+  }
+
+  @Override
+  @NonNull
+  public Task<Void> signInTester() {
+    return testerSignInManager.signInTester();
+  }
+
+  @Override
+  public void signOutTester() {
+    // Set sign in status first so isTesterSigned returns the correct state as soon as possible
+    signInStorage.setSignInStatus(false);
+    cachedNewRelease.set(null);
+  }
+
+  @Override
+  public Task<AppDistributionRelease> checkForNewRelease() {
+    return checkForNewReleaseTaskCache.getOrCreateTask(
+        () ->
+            assertTesterIsSignedIn()
+                .onSuccessTask(
+                    lightweightExecutor, unused -> newReleaseFetcher.checkForNewRelease())
+                .onSuccessTask(lightweightExecutor, release -> cachedNewRelease.set(release))
+                .onSuccessTask(
+                    lightweightExecutor,
+                    release ->
+                        Tasks.forResult(ReleaseUtils.convertToAppDistributionRelease(release)))
+                .addOnFailureListener(
+                    lightweightExecutor,
+                    e -> {
+                      if (e instanceof FirebaseAppDistributionException
+                          && ((FirebaseAppDistributionException) e).getErrorCode()
+                              == AUTHENTICATION_FAILURE) {
+                        // If CheckForNewRelease returns authentication error, the FID is no longer
+                        // valid or does not have access to the latest release. So sign out the
+                        // tester to force FID re-registration
+                        signOutTester();
+                      }
+                    }));
+  }
+
+  private Task<Void> assertTesterIsSignedIn() {
+    return signInStorage
+        .getSignInStatus()
+        .onSuccessTask(
+            lightweightExecutor,
+            signedIn -> {
+              if (!signedIn) {
+                return Tasks.forException(
+                    new FirebaseAppDistributionException(
+                        "Tester is not signed in", AUTHENTICATION_FAILURE));
+              }
+              return Tasks.forResult(null);
+            });
+  }
+
+  @Override
+  @NonNull
+  public UpdateTask updateApp() {
+    return updateApp(false);
+  }
+
+  /**
+   * Overloaded updateApp with boolean input showDownloadInNotificationsManager. Set to true for
+   * basic configuration and false for advanced configuration.
+   */
+  private UpdateTask updateApp(boolean showDownloadInNotificationManager) {
+    return TaskUtils.onSuccessUpdateTask(
+        assertTesterIsSignedIn(),
+        lightweightExecutor,
+        unused ->
+            TaskUtils.onSuccessUpdateTask(
+                cachedNewRelease.get(),
+                lightweightExecutor,
+                release -> {
+                  if (release == null) {
+                    LogWrapper.v(TAG, "New release not found.");
+                    return getErrorUpdateTask(
+                        new FirebaseAppDistributionException(
+                            ErrorMessages.RELEASE_NOT_FOUND_ERROR, UPDATE_NOT_AVAILABLE));
+                  }
+                  if (release.getDownloadUrl() == null) {
+                    LogWrapper.v(TAG, "Download failed to execute.");
+                    return getErrorUpdateTask(
+                        new FirebaseAppDistributionException(
+                            ErrorMessages.DOWNLOAD_URL_NOT_FOUND,
+                            FirebaseAppDistributionException.Status.DOWNLOAD_FAILURE));
+                  }
+
+                  if (release.getBinaryType() == BinaryType.AAB) {
+                    return aabUpdater.updateAab(release);
+                  } else {
+                    return apkUpdater.updateApk(release, showDownloadInNotificationManager);
+                  }
+                }));
+  }
+
+  @Override
+  public void startFeedback(@StringRes int additionalFormText) {
+    startFeedback(applicationContext.getText(additionalFormText), FeedbackTrigger.CUSTOM);
+  }
+
+  @Override
+  public void startFeedback(@NonNull CharSequence additionalFormText) {
+    startFeedback(additionalFormText, FeedbackTrigger.CUSTOM);
+  }
+
+  void startFeedback(@NonNull CharSequence additionalFormText, FeedbackTrigger trigger) {
+    if (!feedbackInProgress.compareAndSet(/* expect= */ false, /* update= */ true)) {
+      LogWrapper.i(TAG, "Ignoring startFeedback() call because feedback is already in progress");
+      return;
+    }
+    LogWrapper.i(TAG, "Starting feedback");
+    screenshotTaker
+        .takeScreenshot()
+        .addOnFailureListener(
+            lightweightExecutor,
+            e -> {
+              LogWrapper.e(TAG, "Failed to take screenshot for feedback", e);
+              doStartFeedback(additionalFormText, null, trigger);
+            })
+        .addOnSuccessListener(
+            lightweightExecutor,
+            screenshotUri -> doStartFeedback(additionalFormText, screenshotUri, trigger));
+  }
+
+  @Override
+  public void startFeedback(@StringRes int additionalFormText, @Nullable Uri screenshotUri) {
+    startFeedback(getText(additionalFormText), screenshotUri, FeedbackTrigger.CUSTOM);
+  }
+
+  @Override
+  public void startFeedback(@NonNull CharSequence additionalFormText, @Nullable Uri screenshotUri) {
+    startFeedback(additionalFormText, screenshotUri, FeedbackTrigger.CUSTOM);
+  }
+
+  private void startFeedback(
+      @NonNull CharSequence additionalFormText,
+      @Nullable Uri screenshotUri,
+      FeedbackTrigger trigger) {
+    if (!screenshotUri.getScheme().equals("content") && !screenshotUri.getScheme().equals("file")) {
+      LogWrapper.e(
+          TAG,
+          String.format(
+              "Screenshot URI %s was not a content or file URI. Not starting feedback.",
+              screenshotUri));
+      return;
+    }
+    if (!feedbackInProgress.compareAndSet(/* expect= */ false, /* update= */ true)) {
+      LogWrapper.i(TAG, "Ignoring startFeedback() call because feedback is already in progress");
+      return;
+    }
+    if (screenshotUri == null) {
+      LogWrapper.w(
+          TAG, "Screenshot URI was null. No default screenshot will be provided for feedback.");
+    }
+    doStartFeedback(additionalFormText, screenshotUri, trigger);
+  }
+
+  @Override
+  public void showFeedbackNotification(
+      @StringRes int additionalFormText, @NonNull InterruptionLevel interruptionLevel) {
+    showFeedbackNotification(getText(additionalFormText), interruptionLevel);
+  }
+
+  @Override
+  public void showFeedbackNotification(
+      @NonNull CharSequence additionalFormText, @NonNull InterruptionLevel interruptionLevel) {
+    notificationsManager.showFeedbackNotification(additionalFormText, interruptionLevel);
+  }
+
+  @Override
+  public void cancelFeedbackNotification() {
+    notificationsManager.cancelFeedbackNotification();
+  }
+
+  private void doStartFeedback(
+      CharSequence additionalFormText, @Nullable Uri screenshotUri, FeedbackTrigger trigger) {
+    testerSignInManager
+        .signInTester()
+        .addOnFailureListener(
+            lightweightExecutor,
+            e -> {
+              feedbackInProgress.set(false);
+              LogWrapper.e(TAG, "Failed to sign in tester. Could not collect feedback.", e);
+            })
+        .onSuccessTask(
+            lightweightExecutor,
+            unused ->
+                releaseIdentifier
+                    .identifyRelease()
+                    .addOnFailureListener(
+                        uiThreadExecutor,
+                        e -> {
+                          feedbackInProgress.set(false);
+                          LogWrapper.e(TAG, "Failed to identify release", e);
+                          Toast.makeText(
+                                  applicationContext,
+                                  R.string.feedback_unidentified_release,
+                                  Toast.LENGTH_LONG)
+                              .show();
+                        })
+                    .onSuccessTask(
+                        lightweightExecutor,
+                        releaseName ->
+                            // in development-mode the releaseName might be null
+                            launchFeedbackActivity(
+                                    releaseName, additionalFormText, screenshotUri, trigger)
+                                .addOnFailureListener(
+                                    uiThreadExecutor,
+                                    e -> {
+                                      feedbackInProgress.set(false);
+                                      LogWrapper.e(TAG, "Failed to launch feedback flow", e);
+                                      Toast.makeText(
+                                              applicationContext,
+                                              R.string.feedback_launch_failed,
+                                              Toast.LENGTH_LONG)
+                                          .show();
+                                    })));
+  }
+
+  private Task<Void> launchFeedbackActivity(
+      @Nullable String releaseName,
+      CharSequence additionalFormText,
+      @Nullable Uri screenshotUri,
+      FeedbackTrigger trigger) {
+    LogWrapper.d(TAG, "Getting activity to launch feedback");
+    return lifecycleNotifier.consumeForegroundActivity(
+        activity -> {
+          LogWrapper.i(TAG, "Launching feedback activity");
+          Intent intent = new Intent(activity, FeedbackActivity.class);
+          // in development-mode the releaseName might be null
+          intent.putExtra(FeedbackActivity.RELEASE_NAME_KEY, releaseName);
+          intent.putExtra(FeedbackActivity.ADDITIONAL_FORM_TEXT_KEY, additionalFormText);
+          intent.putExtra(FeedbackActivity.FEEDBACK_TRIGGER_KEY, trigger.toString());
+          if (screenshotUri != null) {
+            intent.putExtra(FeedbackActivity.SCREENSHOT_URI_KEY, screenshotUri.toString());
+          }
+          activity.startActivity(intent);
+        });
+  }
+
+  @VisibleForTesting
+  boolean isFeedbackInProgress() {
+    return feedbackInProgress.get();
+  }
+
+  @VisibleForTesting
+  void onActivityResumed(Activity activity) {
+    if (awaitingSignInDialogConfirmation()) {
+      if (dialogHostActivity != null && dialogHostActivity != activity) {
+        showSignInDialogTask.setException(
+            new FirebaseAppDistributionException(
+                ErrorMessages.HOST_ACTIVITY_INTERRUPTED, HOST_ACTIVITY_INTERRUPTED));
+      } else {
+        showSignInConfirmationDialog(activity);
+      }
+    }
+
+    if (awaitingUpdateDialogConfirmation()) {
+      if (dialogHostActivity != null && dialogHostActivity != activity) {
+        showUpdateDialogTask.setException(
+            new FirebaseAppDistributionException(
+                ErrorMessages.HOST_ACTIVITY_INTERRUPTED, HOST_ACTIVITY_INTERRUPTED));
+      } else {
+        cachedNewRelease
+            .get()
+            .addOnSuccessListener(
+                lightweightExecutor,
+                release ->
+                    showUpdateConfirmationDialog(
+                        activity, ReleaseUtils.convertToAppDistributionRelease(release)));
+      }
+    }
+  }
+
+  @VisibleForTesting
+  void onActivityPaused(Activity activity) {
+    if (activity == dialogHostActivity) {
+      remakeSignInConfirmationDialog =
+          signInConfirmationDialog != null && signInConfirmationDialog.isShowing();
+      remakeUpdateConfirmationDialog =
+          updateConfirmationDialog != null && updateConfirmationDialog.isShowing();
+      dismissDialogs();
+    }
+  }
+
+  @VisibleForTesting
+  void onActivityDestroyed(@NonNull Activity activity) {
+    // If the dialogHostActivity is being destroyed it is set to null. This is to ensure onResume
+    // shows the dialog on a configuration change and does not check the activity reference.
+    if (activity == dialogHostActivity) {
+      dialogHostActivity = null;
+    }
+
+    if (activity instanceof FeedbackActivity) {
+      LogWrapper.i(TAG, "FeedbackActivity destroyed");
+      if (activity.isFinishing()) {
+        feedbackInProgress.set(false);
+
+        // If the feedback activity finishes, clean up the screenshot that was taken before starting
+        // the activity. If this does not happen for some reason it will be cleaned up the next time
+        // before taking a new screenshot.
+        screenshotTaker.deleteScreenshot();
+      }
+    }
+  }
+
+  @VisibleForTesting
+  SequentialReference<AppDistributionReleaseInternal> getCachedNewRelease() {
+    return cachedNewRelease;
+  }
+
+  private Task<Void> showUpdateConfirmationDialog(
+      Activity hostActivity, AppDistributionRelease newRelease) {
+
+    if (showUpdateDialogTask == null || showUpdateDialogTask.getTask().isComplete()) {
+      showUpdateDialogTask = new TaskCompletionSource<>();
+    }
+
+    dialogHostActivity = hostActivity;
+
+    // We should already be on the main (UI) thread here, but be explicit just to be safe. If we are
+    // already on the main thread, this will execute immediately.
+    hostActivity.runOnUiThread(
+        () -> {
+          updateConfirmationDialog = new AlertDialog.Builder(hostActivity).create();
+          updateConfirmationDialog.setTitle(
+              applicationContext.getString(R.string.update_dialog_title));
+
+          StringBuilder message =
+              new StringBuilder(
+                  String.format(
+                      applicationContext.getString(R.string.update_version_available),
+                      newRelease.getDisplayVersion(),
+                      newRelease.getVersionCode()));
+
+          if (newRelease.getReleaseNotes() != null && !newRelease.getReleaseNotes().isEmpty()) {
+            message
+                .append("\n\n")
+                .append(applicationContext.getString(R.string.update_release_notes))
+                .append(" ")
+                .append(newRelease.getReleaseNotes());
+          }
+          updateConfirmationDialog.setMessage(message);
+
+          updateConfirmationDialog.setButton(
+              AlertDialog.BUTTON_POSITIVE,
+              applicationContext.getString(R.string.update_yes_button),
+              (dialogInterface, i) -> showUpdateDialogTask.setResult(null));
+
+          updateConfirmationDialog.setButton(
+              AlertDialog.BUTTON_NEGATIVE,
+              applicationContext.getString(R.string.update_no_button),
+              (dialogInterface, i) ->
+                  showUpdateDialogTask.setException(
+                      new FirebaseAppDistributionException(
+                          ErrorMessages.UPDATE_CANCELED, Status.INSTALLATION_CANCELED)));
+
+          updateConfirmationDialog.setOnCancelListener(
+              dialogInterface ->
+                  showUpdateDialogTask.setException(
+                      new FirebaseAppDistributionException(
+                          ErrorMessages.UPDATE_CANCELED, Status.INSTALLATION_CANCELED)));
+
+          updateConfirmationDialog.show();
+        });
+
+    return showUpdateDialogTask.getTask();
+  }
+
+  private void setCachedUpdateIfNewReleaseCompletionError(UpdateTaskImpl updateTask, Exception e) {
+    safeSetTaskException(updateTask, e);
+    dismissDialogs();
+  }
+
+  private void postProgressToCachedUpdateIfNewReleaseTask(
+      UpdateTaskImpl updateTask, UpdateProgress progress) {
+    if (updateTask != null && !updateTask.isComplete()) {
+      updateTask.updateProgress(progress);
+    }
+  }
+
+  private void setCachedUpdateIfNewReleaseResult(UpdateTaskImpl updateTask) {
+    safeSetTaskResult(updateTask);
+    dismissDialogs();
+  }
+
+  private void dismissDialogs() {
+    if (signInConfirmationDialog != null && signInConfirmationDialog.isShowing()) {
+      signInConfirmationDialog.dismiss();
+    }
+    if (updateConfirmationDialog != null && updateConfirmationDialog.isShowing()) {
+      updateConfirmationDialog.dismiss();
+    }
+  }
+
+  private UpdateTaskImpl getErrorUpdateTask(Exception e) {
+    UpdateTaskImpl updateTask = new UpdateTaskImpl();
+    updateTask.setException(e);
+    return updateTask;
+  }
+
+  private boolean awaitingSignInDialogConfirmation() {
+    return (showSignInDialogTask != null
+        && !showSignInDialogTask.getTask().isComplete()
+        && remakeSignInConfirmationDialog);
+  }
+
+  private boolean awaitingUpdateDialogConfirmation() {
+    return (showUpdateDialogTask != null
+        && !showUpdateDialogTask.getTask().isComplete()
+        && remakeUpdateConfirmationDialog);
+  }
+
+  private CharSequence getText(int resourceId) {
+    return applicationContext.getText(resourceId);
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionLifecycleNotifier.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionLifecycleNotifier.java
new file mode 100644
index 00000000000..d13a82f9dd8
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionLifecycleNotifier.java
@@ -0,0 +1,401 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.firebase.appdistribution.impl.TaskUtils.runAsyncInTask;
+
+import android.app.Activity;
+import android.app.Application;
+import android.app.Application.ActivityLifecycleCallbacks;
+import android.os.Bundle;
+import android.os.Looper;
+import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import com.google.android.gms.tasks.SuccessContinuation;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.concurrent.FirebaseExecutors;
+import java.util.ArrayDeque;
+import java.util.Queue;
+import java.util.concurrent.Executor;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton // Only one lifecycle notifier is required across the entire app
+class FirebaseAppDistributionLifecycleNotifier {
+
+  /** A functional interface for a function that takes an activity and does something with it. */
+  interface ActivityConsumer {
+    void consume(Activity activity);
+  }
+
+  /** A functional interface for a function that takes an activity and produces a new value. */
+  interface ActivityFunction<T> {
+    T apply(@NonNull Activity activity) throws FirebaseAppDistributionException;
+  }
+
+  /**
+   * A functional interface for a function that takes a nullable activity and produces a new value.
+   */
+  interface NullableActivityFunction<T> {
+    T apply(@Nullable Activity activity) throws FirebaseAppDistributionException;
+  }
+
+  @UiThread private final Executor uiThreadExecutor;
+  @VisibleForTesting final LifecycleCallbacks lifecycleCallbacks = new LifecycleCallbacks();
+  private final Object lock = new Object();
+
+  @GuardedBy("lock")
+  private boolean lifecycleCallbacksRegistered = false;
+
+  @GuardedBy("lock")
+  private Activity currentActivity;
+
+  @GuardedBy("lock")
+  private Activity previousActivity;
+
+  /** A queue of listeners that trigger when the activity is foregrounded. */
+  @GuardedBy("lock")
+  private final Queue<OnActivityCreatedListener> onActivityCreatedListeners = new ArrayDeque<>();
+
+  /** A queue of listeners that trigger when the activity is foregrounded. */
+  @GuardedBy("lock")
+  private final Queue<OnActivityStartedListener> onActivityStartedListeners = new ArrayDeque<>();
+
+  /** A queue of listeners that trigger when the activity is resumed. */
+  @GuardedBy("lock")
+  private final Queue<OnActivityResumedListener> onActivityResumedListeners = new ArrayDeque<>();
+
+  /** A queue of listeners that trigger when the activity is backgrounded. */
+  @GuardedBy("lock")
+  private final Queue<OnActivityPausedListener> onActivityPausedListeners = new ArrayDeque<>();
+
+  /** A queue of listeners that trigger when the activity is destroyed. */
+  @GuardedBy("lock")
+  private final Queue<OnActivityDestroyedListener> onDestroyedListeners = new ArrayDeque<>();
+
+  @Inject
+  FirebaseAppDistributionLifecycleNotifier(@UiThread Executor uiThreadExecutor) {
+    this.uiThreadExecutor = uiThreadExecutor;
+  }
+
+  interface OnActivityCreatedListener {
+    void onCreated(Activity activity);
+  }
+
+  interface OnActivityStartedListener {
+    void onStarted(Activity activity);
+  }
+
+  interface OnActivityResumedListener {
+    void onResumed(Activity activity);
+  }
+
+  interface OnActivityPausedListener {
+    void onPaused(Activity activity);
+  }
+
+  interface OnActivityDestroyedListener {
+    void onDestroyed(Activity activity);
+  }
+
+  /**
+   * Register for activity lifecycle callbacks for the application.
+   *
+   * <p>This must be called for this class to provide information about activity state.
+   */
+  void registerActivityLifecycleCallbacks(Application application) {
+    synchronized (lock) {
+      // Make sure we register for callbacks only once, so callbacks are not called twice
+      if (!lifecycleCallbacksRegistered) {
+        application.registerActivityLifecycleCallbacks(lifecycleCallbacks);
+        lifecycleCallbacksRegistered = true;
+      }
+    }
+  }
+
+  /**
+   * Apply a function to a foreground activity, when one is available, returning a {@link Task} that
+   * will complete immediately after the function is applied.
+   *
+   * <p>The function will always be called on the UI thread.
+   */
+  <T> Task<T> applyToForegroundActivity(ActivityFunction<T> function) {
+    return getForegroundActivity()
+        .onSuccessTask(
+            // Use direct executor to ensure the consumer is called while Activity is in foreground
+            FirebaseExecutors.directExecutor(),
+            activity -> {
+              try {
+                return Tasks.forResult(function.apply(activity));
+              } catch (Throwable t) {
+                return Tasks.forException(FirebaseAppDistributionExceptions.wrap(t));
+              }
+            });
+  }
+
+  /**
+   * Apply a function to a foreground activity, when one is available, returning a {@link Task} that
+   * will complete immediately after the function is applied.
+   *
+   * <p>If the foreground activity is of type {@code classToIgnore}, the previously active activity
+   * will be passed to the function, which may be null if there was no previously active activity or
+   * the activity has been destroyed.
+   *
+   * <p>The function will always be called on the UI thread.
+   */
+  <T, A extends Activity> Task<T> applyToNullableForegroundActivity(
+      Class<A> classToIgnore, NullableActivityFunction<T> function) {
+    return getForegroundActivity(classToIgnore)
+        .onSuccessTask(
+            // Use direct executor to ensure the consumer is called while Activity is in foreground
+            FirebaseExecutors.directExecutor(),
+            activity -> {
+              try {
+                return Tasks.forResult(function.apply(activity));
+              } catch (Throwable t) {
+                return Tasks.forException(FirebaseAppDistributionExceptions.wrap(t));
+              }
+            });
+  }
+
+  /**
+   * Apply a function to a foreground activity, when one is available, returning a {@link Task} that
+   * will complete with the result of the Task returned by that function.
+   *
+   * <p>If the foreground activity is of type {@code classToIgnore}, the previously active activity
+   * will be passed to the function, which may be null if there was no previously active activity or
+   * the activity has been destroyed.
+   *
+   * <p>The function will always be called on the UI thread.
+   */
+  <T, A extends Activity> Task<T> applyToNullableForegroundActivityTask(
+      Class<A> classToIgnore, SuccessContinuation<Activity, T> continuation) {
+    return getForegroundActivity(classToIgnore)
+        .onSuccessTask(
+            // Use direct executor to ensure the consumer is called while Activity is in foreground
+            FirebaseExecutors.directExecutor(),
+            activity -> {
+              try {
+                return continuation.then(activity);
+              } catch (Throwable t) {
+                return Tasks.forException(FirebaseAppDistributionExceptions.wrap(t));
+              }
+            });
+  }
+
+  /** A version of {@link #applyToForegroundActivity} that does not produce a value. */
+  Task<Void> consumeForegroundActivity(ActivityConsumer consumer) {
+    return getForegroundActivity()
+        .onSuccessTask(
+            // Use direct executor to ensure the consumer is called while Activity is in foreground
+            FirebaseExecutors.directExecutor(),
+            activity -> {
+              try {
+                consumer.consume(activity);
+                return Tasks.forResult(null);
+              } catch (Throwable t) {
+                return Tasks.forException(FirebaseAppDistributionExceptions.wrap(t));
+              }
+            });
+  }
+
+  /**
+   * Apply a function to a foreground activity, when one is available, returning a {@link Task} that
+   * will complete with the result of the Task returned by that function.
+   *
+   * <p>The function will always be called on the UI thread.
+   */
+  <T> Task<T> applyToForegroundActivityTask(SuccessContinuation<Activity, T> continuation) {
+    return getForegroundActivity()
+        .onSuccessTask(
+            // Use direct executor to ensure the consumer is called while Activity is in foreground
+            FirebaseExecutors.directExecutor(),
+            activity -> {
+              try {
+                return continuation.then(activity);
+              } catch (Throwable t) {
+                return Tasks.forException(FirebaseAppDistributionExceptions.wrap(t));
+              }
+            });
+  }
+
+  Task<Activity> getForegroundActivity() {
+    return getForegroundActivity(/* classToIgnore= */ null);
+  }
+
+  <A extends Activity> Task<Activity> getForegroundActivity(@Nullable Class<A> classToIgnore) {
+    synchronized (lock) {
+      if (currentActivity != null) {
+        Activity foregroundActivity = getCurrentActivityWithIgnoredClass(classToIgnore);
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+          // We're already on the UI thread, so just complete the task with the activity
+          return Tasks.forResult(foregroundActivity);
+        } else {
+          // Run in UI thread so that returned Task will be completed on the UI thread
+          return runAsyncInTask(
+              uiThreadExecutor, () -> getCurrentActivityWithIgnoredClass(classToIgnore));
+        }
+      }
+    }
+
+    TaskCompletionSource<Activity> task = new TaskCompletionSource<>();
+    addOnActivityResumedListener(
+        new OnActivityResumedListener() {
+          @Override
+          public void onResumed(Activity activity) {
+            // Since this method is run on the UI thread, the Task is completed on the UI thread
+            task.setResult(getCurrentActivityWithIgnoredClass(classToIgnore));
+            removeOnActivityResumedListener(this);
+          }
+        });
+    return task.getTask();
+  }
+
+  @Nullable
+  private <A extends Activity> Activity getCurrentActivityWithIgnoredClass(
+      @Nullable Class<A> classToIgnore) {
+    synchronized (lock) {
+      if (classToIgnore != null && classToIgnore.isInstance(currentActivity)) {
+        return previousActivity;
+      } else {
+        return currentActivity;
+      }
+    }
+  }
+
+  private void updateCurrentActivity(@Nullable Activity activity) {
+    synchronized (lock) {
+      if (currentActivity != activity) {
+        if (currentActivity != null) {
+          // Store a reference to the previous activity in case the current activity is ignored
+          // later in call to applyToNullableForegroundActivity()
+          previousActivity = currentActivity;
+        }
+        currentActivity = activity;
+      }
+    }
+  }
+
+  void addOnActivityCreatedListener(@NonNull OnActivityCreatedListener listener) {
+    synchronized (lock) {
+      this.onActivityCreatedListeners.add(listener);
+    }
+  }
+
+  void addOnActivityStartedListener(@NonNull OnActivityStartedListener listener) {
+    synchronized (lock) {
+      this.onActivityStartedListeners.add(listener);
+    }
+  }
+
+  void addOnActivityDestroyedListener(@NonNull OnActivityDestroyedListener listener) {
+    synchronized (lock) {
+      this.onDestroyedListeners.add(listener);
+    }
+  }
+
+  void addOnActivityResumedListener(@NonNull OnActivityResumedListener listener) {
+    synchronized (lock) {
+      this.onActivityResumedListeners.add(listener);
+    }
+  }
+
+  void removeOnActivityResumedListener(@NonNull OnActivityResumedListener listener) {
+    synchronized (lock) {
+      this.onActivityResumedListeners.remove(listener);
+    }
+  }
+
+  void addOnActivityPausedListener(@NonNull OnActivityPausedListener listener) {
+    synchronized (lock) {
+      this.onActivityPausedListeners.add(listener);
+    }
+  }
+
+  @VisibleForTesting
+  class LifecycleCallbacks implements ActivityLifecycleCallbacks {
+
+    @Override
+    public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle bundle) {
+      synchronized (lock) {
+        updateCurrentActivity(activity);
+        for (OnActivityCreatedListener listener : onActivityCreatedListeners) {
+          listener.onCreated(activity);
+        }
+      }
+    }
+
+    @Override
+    public void onActivityStarted(@NonNull Activity activity) {
+      synchronized (lock) {
+        updateCurrentActivity(activity);
+        for (OnActivityStartedListener listener : onActivityStartedListeners) {
+          listener.onStarted(activity);
+        }
+      }
+    }
+
+    @Override
+    public void onActivityResumed(@NonNull Activity activity) {
+      synchronized (lock) {
+        updateCurrentActivity(activity);
+        for (OnActivityResumedListener listener : onActivityResumedListeners) {
+          listener.onResumed(activity);
+        }
+      }
+    }
+
+    @Override
+    public void onActivityPaused(@NonNull Activity activity) {
+      synchronized (lock) {
+        if (currentActivity == activity) {
+          updateCurrentActivity(null);
+        }
+        for (OnActivityPausedListener listener : onActivityPausedListeners) {
+          listener.onPaused(activity);
+        }
+      }
+    }
+
+    @Override
+    public void onActivityStopped(@NonNull Activity activity) {}
+
+    @Override
+    public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle bundle) {}
+
+    @Override
+    public void onActivityDestroyed(@NonNull Activity activity) {
+      synchronized (lock) {
+        // If an activity is destroyed, delete all references to it, including the previous activity
+        if (currentActivity == activity) {
+          updateCurrentActivity(null);
+        }
+        if (previousActivity == activity) {
+          previousActivity = null;
+        }
+
+        for (OnActivityDestroyedListener listener : onDestroyedListeners) {
+          listener.onDestroyed(activity);
+        }
+      }
+    }
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionNotificationsManager.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionNotificationsManager.java
new file mode 100644
index 00000000000..67445d51992
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionNotificationsManager.java
@@ -0,0 +1,277 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.firebase.appdistribution.impl.FirebaseAppDistributionNotificationsManager.NotificationType.APP_UPDATE;
+import static com.google.firebase.appdistribution.impl.FirebaseAppDistributionNotificationsManager.NotificationType.FEEDBACK;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import android.app.Activity;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.appdistribution.InterruptionLevel;
+import com.google.firebase.appdistribution.impl.FirebaseAppDistributionLifecycleNotifier.OnActivityPausedListener;
+import com.google.firebase.appdistribution.impl.FirebaseAppDistributionLifecycleNotifier.OnActivityResumedListener;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+class FirebaseAppDistributionNotificationsManager
+    implements OnActivityPausedListener, OnActivityResumedListener {
+
+  private static final String TAG = "NotificationsManager";
+
+  private static final String PACKAGE_PREFIX = "com.google.firebase.appdistribution";
+
+  @VisibleForTesting
+  static final String CHANNEL_GROUP_ID = prependPackage("notification_channel_group_id");
+
+  @VisibleForTesting
+  enum NotificationType {
+    APP_UPDATE("notification_channel_id", "app_update_notification_tag"),
+    FEEDBACK("feedback_notification_channel_id", "feedback_notification_tag");
+
+    final String channelId;
+    final String tag;
+    final int id;
+
+    NotificationType(String channelId, String tag) {
+      this.channelId = prependPackage(channelId);
+      this.tag = prependPackage(tag);
+      this.id = ordinal();
+    }
+  }
+
+  private final Context context;
+  private final AppIconSource appIconSource;
+  private final NotificationManagerCompat notificationManager;
+  @Lightweight private final ScheduledExecutorService scheduledExecutorService;
+  @UiThread private final Executor uiThreadExecutor;
+
+  private Notification feedbackNotificationToBeShown;
+  private ScheduledFuture<?> feedbackNotificationCancellationFuture;
+
+  @Inject
+  FirebaseAppDistributionNotificationsManager(
+      Context context,
+      AppIconSource appIconSource,
+      FirebaseAppDistributionLifecycleNotifier lifecycleNotifier,
+      @Lightweight ScheduledExecutorService scheduledExecutorService,
+      @UiThread Executor uiThreadExecutor) {
+    this.context = context;
+    this.appIconSource = appIconSource;
+    this.notificationManager = NotificationManagerCompat.from(context);
+    lifecycleNotifier.addOnActivityPausedListener(this);
+    lifecycleNotifier.addOnActivityResumedListener(this);
+    this.scheduledExecutorService = scheduledExecutorService;
+    this.uiThreadExecutor = uiThreadExecutor;
+  }
+
+  void showAppUpdateNotification(long totalBytes, long downloadedBytes, int stringResourceId) {
+    // Create the NotificationChannel, but only on API 26+ because
+    // the NotificationChannel class is new and not in the support library
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      LogWrapper.i(TAG, "Creating app update notification channel group");
+      createChannel(
+          APP_UPDATE,
+          R.string.app_update_notification_channel_name,
+          R.string.app_update_notification_channel_description,
+          InterruptionLevel.DEFAULT);
+    }
+
+    if (!notificationManager.areNotificationsEnabled()) {
+      LogWrapper.w(
+          TAG, "Not showing app update notifications because app notifications are disabled");
+      return;
+    }
+
+    NotificationCompat.Builder notificationBuilder =
+        new NotificationCompat.Builder(context, APP_UPDATE.channelId)
+            .setOnlyAlertOnce(true)
+            .setSmallIcon(appIconSource.getNonAdaptiveIconOrDefault(context))
+            .setContentTitle(context.getString(stringResourceId))
+            .setProgress(
+                /* max= */ 100,
+                /* progress= */ (int) (((float) downloadedBytes / (float) totalBytes) * 100),
+                /* indeterminate= */ false);
+    PendingIntent appLaunchIntent = createAppLaunchIntent();
+    if (appLaunchIntent != null) {
+      notificationBuilder.setContentIntent(appLaunchIntent);
+    }
+    notificationManager.notify(APP_UPDATE.tag, APP_UPDATE.id, notificationBuilder.build());
+  }
+
+  @Nullable
+  private PendingIntent createAppLaunchIntent() {
+    // Query the package manager for the best launch intent for the app
+    Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+    if (intent == null) {
+      LogWrapper.w(TAG, "No activity found to launch app");
+      return null;
+    }
+    return getPendingIntent(intent, PendingIntent.FLAG_ONE_SHOT);
+  }
+
+  private PendingIntent getPendingIntent(Intent intent, int extraFlags) {
+    // Specify mutability because it is required starting at SDK level 31, but FLAG_IMMUTABLE is
+    // only supported starting at SDK level 23
+    int commonFlags =
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_IMMUTABLE : 0;
+    return PendingIntent.getActivity(
+        context, /* requestCode = */ 0, intent, extraFlags | commonFlags);
+  }
+
+  public void showFeedbackNotification(
+      @NonNull CharSequence additionalFormText, @NonNull InterruptionLevel interruptionLevel) {
+    // Create the NotificationChannel, but only on API 26+ because
+    // the NotificationChannel class is new and not in the support library
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      LogWrapper.i(TAG, "Creating feedback notification channel group");
+      createChannel(
+          FEEDBACK,
+          R.string.feedback_notification_channel_name,
+          R.string.feedback_notification_channel_description,
+          interruptionLevel);
+    }
+
+    if (!notificationManager.areNotificationsEnabled()) {
+      LogWrapper.w(TAG, "Not showing notification because app notifications are disabled");
+      return;
+    }
+
+    uiThreadExecutor.execute(
+        () -> {
+          // ensure that class state is managed on same thread as lifecycle callbacks
+          cancelFeedbackCancellationFuture();
+          feedbackNotificationToBeShown =
+              buildFeedbackNotification(additionalFormText, interruptionLevel);
+          doShowFeedbackNotification();
+        });
+  }
+
+  // this must be run on the main (UI) thread
+  private void doShowFeedbackNotification() {
+    LogWrapper.i(TAG, "Showing feedback notification");
+    notificationManager.notify(FEEDBACK.tag, FEEDBACK.id, feedbackNotificationToBeShown);
+  }
+
+  private Notification buildFeedbackNotification(
+      @NonNull CharSequence additionalFormText, @NonNull InterruptionLevel interruptionLevel) {
+    Intent intent = new Intent(context, TakeScreenshotAndStartFeedbackActivity.class);
+    intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+    intent.putExtra(
+        TakeScreenshotAndStartFeedbackActivity.ADDITIONAL_FORM_TEXT_EXTRA_KEY, additionalFormText);
+    ApplicationInfo applicationInfo = context.getApplicationInfo();
+    PackageManager packageManager = context.getPackageManager();
+    CharSequence appLabel = packageManager.getApplicationLabel(applicationInfo);
+    return new NotificationCompat.Builder(context, FEEDBACK.channelId)
+        .setSmallIcon(R.drawable.ic_rate_review)
+        .setContentTitle(context.getString(R.string.feedback_notification_title))
+        .setContentText(context.getString(R.string.feedback_notification_text, appLabel))
+        .setPriority(interruptionLevel.notificationPriority)
+        .setOngoing(true)
+        .setOnlyAlertOnce(true)
+        .setAutoCancel(false)
+        .setContentIntent(getPendingIntent(intent, /* extraFlags= */ 0))
+        .build();
+  }
+
+  public void cancelFeedbackNotification() {
+    uiThreadExecutor.execute(
+        () -> {
+          // ensure that class state is managed on same thread as lifecycle callbacks
+          feedbackNotificationToBeShown = null;
+          cancelFeedbackCancellationFuture();
+          doCancelFeedbackNotification();
+        });
+  }
+
+  public void doCancelFeedbackNotification() {
+    LogWrapper.i(TAG, "Canceling feedback notification");
+    NotificationManagerCompat.from(context).cancel(FEEDBACK.tag, FEEDBACK.id);
+  }
+
+  @RequiresApi(Build.VERSION_CODES.O)
+  private void createChannel(
+      NotificationType notification,
+      int name,
+      int description,
+      InterruptionLevel interruptionLevel) {
+    notificationManager.createNotificationChannelGroup(
+        new NotificationChannelGroup(
+            CHANNEL_GROUP_ID, context.getString(R.string.notifications_group_name)));
+    NotificationChannel channel =
+        new NotificationChannel(
+            notification.channelId, context.getString(name), interruptionLevel.channelImportance);
+    channel.setDescription(context.getString(description));
+    channel.setGroup(CHANNEL_GROUP_ID);
+    // Register the channel with the system; you can't change the importance
+    // or other notification behaviors after this
+    notificationManager.createNotificationChannel(channel);
+  }
+
+  // this runs on the main (UI) thread
+  @Override
+  public void onPaused(Activity activity) {
+    LogWrapper.d(TAG, "Activity paused");
+    if (feedbackNotificationToBeShown != null) {
+      LogWrapper.d(TAG, "Scheduling cancelFeedbackNotification");
+      cancelFeedbackCancellationFuture();
+      feedbackNotificationCancellationFuture =
+          scheduledExecutorService.schedule(this::doCancelFeedbackNotification, 1, SECONDS);
+    }
+  }
+
+  // this runs on the main (UI) thread
+  @Override
+  public void onResumed(Activity activity) {
+    LogWrapper.d(TAG, "Activity resumed");
+    if (feedbackNotificationToBeShown != null) {
+      cancelFeedbackCancellationFuture();
+      doShowFeedbackNotification();
+    }
+  }
+
+  // this must be run on the main (UI) thread
+  private void cancelFeedbackCancellationFuture() {
+    if (feedbackNotificationCancellationFuture != null) {
+      LogWrapper.d(TAG, "Canceling feedbackNotificationCancellationFuture");
+      feedbackNotificationCancellationFuture.cancel(false);
+      feedbackNotificationCancellationFuture = null;
+    }
+  }
+
+  private static String prependPackage(String id) {
+    return String.format("%s.%s", PACKAGE_PREFIX, id);
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionRegistrar.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionRegistrar.java
new file mode 100644
index 00000000000..2d4ac64ee60
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionRegistrar.java
@@ -0,0 +1,114 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import android.app.Application;
+import android.content.Context;
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.appdistribution.FirebaseAppDistribution;
+import com.google.firebase.components.Component;
+import com.google.firebase.components.ComponentRegistrar;
+import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import com.google.firebase.installations.FirebaseInstallationsApi;
+import com.google.firebase.platforminfo.LibraryVersionComponent;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+
+/**
+ * Registers FirebaseAppDistribution and related components.
+ *
+ * @hide
+ */
+@Keep
+public class FirebaseAppDistributionRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-appdistribution";
+
+  private static String TAG = "Registrar";
+
+  @Override
+  public @NonNull List<Component<?>> getComponents() {
+    Qualified<ScheduledExecutorService> backgroundExecutor =
+        Qualified.qualified(Background.class, ScheduledExecutorService.class);
+    Qualified<ScheduledExecutorService> blockingExecutor =
+        Qualified.qualified(Blocking.class, ScheduledExecutorService.class);
+    Qualified<ScheduledExecutorService> lightweightExecutor =
+        Qualified.qualified(Lightweight.class, ScheduledExecutorService.class);
+    Qualified<Executor> uiThreadExecutor = Qualified.qualified(UiThread.class, Executor.class);
+    return Arrays.asList(
+        Component.builder(FirebaseAppDistribution.class)
+            .name(LIBRARY_NAME)
+            .add(Dependency.required(Context.class))
+            .add(Dependency.required(AppDistroComponent.class))
+            .factory(
+                c ->
+                    buildFirebaseAppDistribution(
+                        c.get(AppDistroComponent.class), c.get(Context.class)))
+            // construct FirebaseAppDistribution instance on startup so we can register for
+            // activity lifecycle callbacks before the API is called
+            .alwaysEager()
+            .build(),
+        Component.builder(AppDistroComponent.class)
+            .add(Dependency.required(Context.class))
+            .add(Dependency.required(FirebaseOptions.class))
+            .add(Dependency.required(FirebaseApp.class))
+            .add(Dependency.requiredProvider(FirebaseInstallationsApi.class))
+            .add(Dependency.required(backgroundExecutor))
+            .add(Dependency.required(blockingExecutor))
+            .add(Dependency.required(lightweightExecutor))
+            .add(Dependency.required(uiThreadExecutor))
+            .factory(
+                container ->
+                    DaggerAppDistroComponent.builder()
+                        .setApplicationContext(container.get(Context.class))
+                        .setOptions(container.get(FirebaseOptions.class))
+                        .setApp(container.get(FirebaseApp.class))
+                        .setFis(container.getProvider(FirebaseInstallationsApi.class))
+                        .setBackgroundExecutor(container.get(backgroundExecutor))
+                        .setBlockingExecutor(container.get(blockingExecutor))
+                        .setLightweightExecutor(container.get(lightweightExecutor))
+                        .setUiThreadExecutor(container.get(uiThreadExecutor))
+                        .build())
+            .build(),
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
+  }
+
+  private FirebaseAppDistribution buildFirebaseAppDistribution(
+      AppDistroComponent appDistroComponent, Context applicationContext) {
+
+    if (applicationContext instanceof Application) {
+      Application application = (Application) applicationContext;
+      appDistroComponent.getLifecycleNotifier().registerActivityLifecycleCallbacks(application);
+    } else {
+      LogWrapper.e(
+          TAG,
+          String.format(
+              "Context %s was not an Application, can't register for lifecycle callbacks. SDK"
+                  + " might not function correctly.",
+              applicationContext));
+    }
+
+    return appDistroComponent.getAppDistribution();
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionTesterApiClient.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionTesterApiClient.java
new file mode 100644
index 00000000000..3a8a29e4764
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionTesterApiClient.java
@@ -0,0 +1,289 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.firebase.appdistribution.impl.TaskUtils.runAsyncInTask;
+
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.appdistribution.BinaryType;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.inject.Provider;
+import com.google.firebase.installations.FirebaseInstallationsApi;
+import com.google.firebase.installations.InstallationTokenResult;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Executor;
+import javax.inject.Inject;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/** Client that makes requests to the App Distribution Tester API. */
+class FirebaseAppDistributionTesterApiClient {
+  private static final String TAG = "TesterApiClient";
+
+  /** A potentially long-running job that requires a FID and a FIS auth token */
+  private interface FidDependentJob<TResult> {
+    TResult run(String fid, String token) throws FirebaseAppDistributionException;
+  }
+
+  private static final String FIND_RELEASE_APK_HASH_PARAM = "apkHash";
+  private static final String FIND_RELEASE_IAS_ARTIFACT_ID_PARAM = "iasArtifactId";
+
+  private static final String BUILD_VERSION_JSON_KEY = "buildVersion";
+  private static final String DISPLAY_VERSION_JSON_KEY = "displayVersion";
+  private static final String RELEASE_NOTES_JSON_KEY = "releaseNotes";
+  private static final String BINARY_TYPE_JSON_KEY = "binaryType";
+  private static final String CODE_HASH_KEY = "codeHash";
+  private static final String APK_HASH_KEY = "apkHash";
+  private static final String IAS_ARTIFACT_ID_KEY = "iasArtifactId";
+  private static final String DOWNLOAD_URL_KEY = "downloadUrl";
+
+  private static final String FETCH_NEW_RELEASE_TAG = "Fetching new release";
+  private static final String FIND_RELEASE_TAG = "Finding installed release";
+  private static final String CREATE_FEEDBACK_TAG = "Creating feedback";
+  private static final String COMMIT_FEEDBACK_TAG = "Committing feedback";
+  private static final String UPLOAD_SCREENSHOT_TAG = "Uploading screenshot";
+  private static final String X_APP_DISTRO_FEEDBACK_TRIGGER = "X-APP-DISTRO-FEEDBACK-TRIGGER";
+
+  private final FirebaseOptions firebaseOptions;
+  private final Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider;
+  private final TesterApiHttpClient testerApiHttpClient;
+  private final Executor blockingExecutor;
+
+  @Inject
+  FirebaseAppDistributionTesterApiClient(
+      @NonNull FirebaseOptions firebaseOptions,
+      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider,
+      @NonNull TesterApiHttpClient testerApiHttpClient,
+      @NonNull @Blocking Executor blockingExecutor) {
+    this.firebaseOptions = firebaseOptions;
+    this.firebaseInstallationsApiProvider = firebaseInstallationsApiProvider;
+    this.testerApiHttpClient = testerApiHttpClient;
+    this.blockingExecutor = blockingExecutor;
+  }
+
+  /**
+   * Fetches and returns a {@link Task} that will complete with the latest release for the app that
+   * the tester has access to, or {@code null} if the tester doesn't have access to any releases.
+   */
+  @NonNull
+  Task<AppDistributionReleaseInternal> fetchNewRelease() {
+    return runWithFidAndToken(
+        (fid, token) -> {
+          String path =
+              String.format(
+                  "v1alpha/devices/-/testerApps/%s/installations/%s/releases",
+                  firebaseOptions.getApplicationId(), fid);
+          JSONObject responseBody =
+              testerApiHttpClient.makeGetRequest(FETCH_NEW_RELEASE_TAG, path, token);
+          return parseNewRelease(responseBody);
+        });
+  }
+
+  /**
+   * Fetches and returns the name of the installed release given the hash of the installed APK.
+   *
+   * <p>The returned {@link Task} will fail with {@link Status#AUTHENTICATION_FAILURE} if the tester
+   * does not have access to the release, or if it doesn't exist.
+   */
+  @NonNull
+  Task<String> findReleaseUsingApkHash(String apkHash) {
+    return runWithFidAndToken(
+        (fid, token) -> findRelease(fid, token, FIND_RELEASE_APK_HASH_PARAM, apkHash));
+  }
+
+  /**
+   * Fetches and returns the name of the installed release given the IAS artifact ID of the
+   * installed app bundle.
+   *
+   * <p>The returned {@link Task} will fail with {@link Status#AUTHENTICATION_FAILURE} if the tester
+   * does not have access to the release, or if it doesn't exist.
+   */
+  @NonNull
+  Task<String> findReleaseUsingIasArtifactId(String iasArtifactId) {
+    return runWithFidAndToken(
+        (fid, token) -> findRelease(fid, token, FIND_RELEASE_IAS_ARTIFACT_ID_PARAM, iasArtifactId));
+  }
+
+  private String findRelease(String fid, String token, String binaryIdParam, String binaryIdValue)
+      throws FirebaseAppDistributionException {
+    String path =
+        String.format(
+            "v1alpha/projects/%s/installations/%s/releases:find?%s=%s",
+            firebaseOptions.getGcmSenderId(), // Project number
+            fid,
+            binaryIdParam,
+            binaryIdValue);
+    JSONObject responseBody = testerApiHttpClient.makeGetRequest(FIND_RELEASE_TAG, path, token);
+    return parseJsonFieldFromResponse(responseBody, "release");
+  }
+
+  /** Creates a new feedback from the given text, and returns the feedback name. */
+  @NonNull
+  Task<String> createFeedback(String testerReleaseName, String feedbackText) {
+    return runWithFidAndToken(
+        (unused, token) -> {
+          LogWrapper.i(TAG, "Creating feedback for release: " + testerReleaseName);
+          String path = String.format("v1alpha/%s/feedbackReports", testerReleaseName);
+          String requestBody = buildCreateFeedbackBody(feedbackText).toString();
+          JSONObject responseBody =
+              testerApiHttpClient.makeJsonPostRequest(
+                  CREATE_FEEDBACK_TAG, path, token, requestBody);
+          return parseJsonFieldFromResponse(responseBody, "name");
+        });
+  }
+
+  /**
+   * Attaches a screenshot to feedback.
+   *
+   * @return a {@link Task} containing the feedback name, for convenience when chaining subsequent
+   *     requests off of this task
+   */
+  Task<String> attachScreenshot(
+      String feedbackName, Uri screenshotUri, String filename, String contentType) {
+    return runWithFidAndToken(
+        (unused, token) -> {
+          LogWrapper.i(TAG, "Uploading screenshot for feedback: " + feedbackName);
+          String path =
+              String.format("upload/v1alpha/%s:uploadArtifact?type=SCREENSHOT", feedbackName);
+          testerApiHttpClient.makeUploadRequest(
+              UPLOAD_SCREENSHOT_TAG, path, token, filename, contentType, screenshotUri);
+          return feedbackName;
+        });
+  }
+
+  /** Commits the feedback with the given name. */
+  @NonNull
+  Task<Void> commitFeedback(String feedbackName, FeedbackTrigger trigger) {
+    return runWithFidAndToken(
+        (unused, token) -> {
+          LogWrapper.i(TAG, "Committing feedback: " + feedbackName);
+          String path = "v1alpha/" + feedbackName + ":commit";
+          Map<String, String> extraHeaders = new HashMap<>();
+          extraHeaders.put(X_APP_DISTRO_FEEDBACK_TRIGGER, trigger.toString());
+          testerApiHttpClient.makeJsonPostRequest(
+              COMMIT_FEEDBACK_TAG, path, token, /* requestBody= */ "", extraHeaders);
+          return null;
+        });
+  }
+
+  private static JSONObject buildCreateFeedbackBody(String feedbackText)
+      throws FirebaseAppDistributionException {
+    JSONObject feedbackJsonObject = new JSONObject();
+    try {
+      feedbackJsonObject.put("text", feedbackText);
+    } catch (JSONException e) {
+      throw new FirebaseAppDistributionException(
+          ErrorMessages.JSON_SERIALIZATION_ERROR, Status.UNKNOWN, e);
+    }
+    return feedbackJsonObject;
+  }
+
+  private AppDistributionReleaseInternal parseNewRelease(JSONObject responseJson)
+      throws FirebaseAppDistributionException {
+    if (!responseJson.has("releases")) {
+      return null;
+    }
+    try {
+      JSONArray releasesJson = responseJson.getJSONArray("releases");
+      if (releasesJson.length() == 0) {
+        return null;
+      }
+      JSONObject newReleaseJson = releasesJson.getJSONObject(0);
+      final String displayVersion = newReleaseJson.getString(DISPLAY_VERSION_JSON_KEY);
+      final String buildVersion = newReleaseJson.getString(BUILD_VERSION_JSON_KEY);
+      String releaseNotes = tryGetValue(newReleaseJson, RELEASE_NOTES_JSON_KEY);
+      String codeHash = tryGetValue(newReleaseJson, CODE_HASH_KEY);
+      String apkHash = tryGetValue(newReleaseJson, APK_HASH_KEY);
+      String iasArtifactId = tryGetValue(newReleaseJson, IAS_ARTIFACT_ID_KEY);
+      String downloadUrl = tryGetValue(newReleaseJson, DOWNLOAD_URL_KEY);
+
+      final BinaryType binaryType =
+          newReleaseJson.getString(BINARY_TYPE_JSON_KEY).equals("APK")
+              ? BinaryType.APK
+              : BinaryType.AAB;
+
+      AppDistributionReleaseInternal newRelease =
+          AppDistributionReleaseInternal.builder()
+              .setDisplayVersion(displayVersion)
+              .setBuildVersion(buildVersion)
+              .setReleaseNotes(releaseNotes)
+              .setBinaryType(binaryType)
+              .setIasArtifactId(iasArtifactId)
+              .setCodeHash(codeHash)
+              .setApkHash(apkHash)
+              .setDownloadUrl(downloadUrl)
+              .build();
+
+      LogWrapper.v(TAG, "Zip hash for the new release " + newRelease.getApkHash());
+      return newRelease;
+    } catch (JSONException e) {
+      LogWrapper.e(TAG, "Error parsing the new release.", e);
+      throw new FirebaseAppDistributionException(
+          ErrorMessages.JSON_PARSING_ERROR, Status.UNKNOWN, e);
+    }
+  }
+
+  private String parseJsonFieldFromResponse(JSONObject responseJson, String fieldName)
+      throws FirebaseAppDistributionException {
+    try {
+      return responseJson.getString(fieldName);
+    } catch (JSONException e) {
+      LogWrapper.e(TAG, String.format("Field '%s' missing from response", fieldName), e);
+      throw new FirebaseAppDistributionException(
+          ErrorMessages.JSON_PARSING_ERROR, Status.UNKNOWN, e);
+    }
+  }
+
+  private String tryGetValue(JSONObject jsonObject, String key) {
+    try {
+      return jsonObject.getString(key);
+    } catch (JSONException e) {
+      return "";
+    }
+  }
+
+  /**
+   * Asynchronously runs a potentially long-running job that depends on a FID and a FIS auth token.
+   */
+  private <TResult> Task<TResult> runWithFidAndToken(FidDependentJob<TResult> job) {
+    Task<String> installationIdTask = firebaseInstallationsApiProvider.get().getId();
+    // forceRefresh is false to get locally cached token if available
+    Task<InstallationTokenResult> installationAuthTokenTask =
+        firebaseInstallationsApiProvider.get().getToken(/* forceRefresh= */ false);
+
+    return Tasks.whenAllSuccess(installationIdTask, installationAuthTokenTask)
+        .continueWithTask(blockingExecutor, TaskUtils::handleTaskFailure)
+        .onSuccessTask(
+            blockingExecutor,
+            resultsList -> {
+              // Tasks.whenAllSuccess combines task results into a list
+              if (resultsList.size() != 2) {
+                throw new FirebaseAppDistributionException(
+                    "Expected 2 task results, got " + resultsList.size(), Status.UNKNOWN);
+              }
+              String fid = (String) resultsList.get(0);
+              InstallationTokenResult tokenResult = (InstallationTokenResult) resultsList.get(1);
+              return runAsyncInTask(blockingExecutor, () -> job.run(fid, tokenResult.getToken()));
+            });
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/HttpsUrlConnectionFactory.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/HttpsUrlConnectionFactory.java
similarity index 87%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/HttpsUrlConnectionFactory.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/HttpsUrlConnectionFactory.java
index 15f2fbed468..99c064b228c 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/HttpsUrlConnectionFactory.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/HttpsUrlConnectionFactory.java
@@ -12,13 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import java.io.IOException;
 import java.net.URL;
+import javax.inject.Inject;
 import javax.net.ssl.HttpsURLConnection;
 
 class HttpsUrlConnectionFactory {
+
+  @Inject
+  HttpsUrlConnectionFactory() {}
+
   HttpsURLConnection openConnection(String url) throws IOException {
     return (HttpsURLConnection) new URL(url).openConnection();
   }
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ImageUtils.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ImageUtils.java
new file mode 100644
index 00000000000..8f825307da6
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ImageUtils.java
@@ -0,0 +1,103 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import android.content.ContentResolver;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Rect;
+import android.net.Uri;
+import androidx.annotation.Nullable;
+import com.google.auto.value.AutoValue;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ImageUtils {
+  private static final String TAG = "ImageUtils";
+
+  private ImageUtils() {}
+
+  @AutoValue
+  abstract static class ImageSize {
+    abstract int width();
+
+    abstract int height();
+
+    static ImageSize read(InputStream inputStream) {
+      final BitmapFactory.Options options = new BitmapFactory.Options();
+      options.inJustDecodeBounds = true;
+      BitmapFactory.decodeStream(inputStream, /* outPadding= */ (Rect) null, options);
+      return new AutoValue_ImageUtils_ImageSize(options.outWidth, options.outHeight);
+    }
+  }
+
+  /**
+   * Read an image, scaled as small as possible according to the target size.
+   *
+   * <p>The returned bitmap will be scaled down, preserving the aspect ratio, by the largest power
+   * of 2 that results in the width and height still being larger than the target.
+   *
+   * <p>Based on https://developer.android.com/topic/performance/graphics/load-bitmap#load-bitmap.
+   *
+   * @return the image, or null if it could not be decoded
+   * @throws IllegalArgumentException if target height or width are less than or equal to zero
+   * @throws SecurityException if the app does not have access to the image
+   * @throws IOException if the image can't be read
+   */
+  @Nullable
+  static Bitmap readScaledImage(
+      ContentResolver contentResolver, Uri uri, int targetWidth, int targetHeight)
+      throws IOException {
+    if (targetWidth <= 0 && targetHeight <= 0) {
+      throw new IllegalArgumentException(
+          String.format(
+              "Tried to read image with bad dimensions: %dx%d", targetWidth, targetHeight));
+    }
+
+    // Read the dimensions of the image first
+    ImageSize imageSize;
+    try (InputStream inputStream = contentResolver.openInputStream(uri)) {
+      imageSize = ImageSize.read(inputStream);
+    }
+    LogWrapper.d(TAG, "Read screenshot image size: " + imageSize);
+
+    // Read the actual image, scaled using the actual and target dimensions
+    final BitmapFactory.Options options = new BitmapFactory.Options();
+    options.inSampleSize =
+        calculateInSampleSize(imageSize.width(), imageSize.height(), targetWidth, targetHeight);
+    // Get a fresh input stream because we've exhausted the last one
+    try (InputStream inputStream = contentResolver.openInputStream(uri)) {
+      return BitmapFactory.decodeStream(inputStream, /* outPadding= */ (Rect) null, options);
+    }
+  }
+
+  private static int calculateInSampleSize(
+      int sourceWidth, int sourceHeight, int targetWidth, int targetHeight) {
+    int inSampleSize = 1;
+    if (sourceHeight > targetHeight || sourceWidth > targetWidth) {
+      final int halfHeight = sourceHeight / 2;
+      final int halfWidth = sourceWidth / 2;
+
+      // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+      // height and width larger than the target height and width
+      while ((halfHeight / inSampleSize) >= targetHeight
+          && (halfWidth / inSampleSize) >= targetWidth) {
+        inSampleSize *= 2;
+      }
+    }
+
+    return inSampleSize;
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/InstallActivity.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/InstallActivity.java
similarity index 82%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/InstallActivity.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/InstallActivity.java
index 004d64bb52f..52852cef1fc 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/InstallActivity.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/InstallActivity.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution.internal;
+package com.google.firebase.appdistribution.impl;
 
 import android.app.AlertDialog;
 import android.content.Intent;
@@ -23,7 +23,6 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.FileProvider;
 import com.google.firebase.appdistribution.FirebaseAppDistribution;
-import com.google.firebase.appdistribution.R;
 import java.io.File;
 
 /**
@@ -31,7 +30,8 @@
  * finished.
  */
 public class InstallActivity extends AppCompatActivity {
-  private static final String TAG = "InstallActivity: ";
+  private static final String TAG = "InstallActivity";
+
   private boolean installInProgress = false;
   private AlertDialog enableUnknownSourcesDialog;
 
@@ -49,10 +49,9 @@ protected void onResume() {
     // If we re-enter InstallActivity after install is already kicked off, we can assume that either
     // installation failure or tester canceled the install.
     if (installInProgress) {
-      LogWrapper.getInstance()
-          .e(
-              TAG
-                  + "Activity resumed when installation was already in progress. Installation was either canceled or failed");
+      LogWrapper.e(
+          TAG,
+          "Activity resumed when installation was already in progress. Installation was either canceled or failed");
       finish();
       return;
     }
@@ -60,10 +59,9 @@ protected void onResume() {
     if (!isUnknownSourcesEnabled()) {
       // See comment about install progress above. Same applies to unknown sources UI.
       if (enableUnknownSourcesDialog.isShowing()) {
-        LogWrapper.getInstance()
-            .e(
-                TAG
-                    + "Unknown sources enablement was already in progress. It was either canceled or failed");
+        LogWrapper.e(
+            TAG,
+            "Unknown sources enablement was already in progress. It was either canceled or failed");
         enableUnknownSourcesDialog.dismiss();
         finish();
         return;
@@ -80,8 +78,7 @@ protected void onDestroy() {
     super.onDestroy();
     if (enableUnknownSourcesDialog.isShowing()) {
       enableUnknownSourcesDialog.dismiss();
-      LogWrapper.getInstance()
-          .e(TAG + "Unknown sources enablement canceled. Activity was destroyed");
+      LogWrapper.e(TAG, "Unknown sources enablement canceled. Activity was destroyed");
     }
   }
 
@@ -93,10 +90,8 @@ private boolean isUnknownSourcesEnabled() {
         return Settings.Secure.getInt(getContentResolver(), Settings.Secure.INSTALL_NON_MARKET_APPS)
             == 1;
       } catch (Settings.SettingNotFoundException e) {
-        LogWrapper.getInstance()
-            .e(
-                TAG + "Unable to determine if unknown sources is enabled. Assuming it's enabled.",
-                e);
+        LogWrapper.e(
+            TAG, "Unable to determine if unknown sources is enabled. Assuming it's enabled.", e);
         return true;
       }
     }
@@ -122,7 +117,7 @@ private void showUnknownSourcesUi() {
   }
 
   private void dismissUnknownSourcesDialogCallback() {
-    LogWrapper.getInstance().v(TAG + "Unknown sources dialog canceled");
+    LogWrapper.v(TAG, "Unknown sources dialog canceled");
     finish();
   }
 
@@ -132,7 +127,7 @@ private Intent getUnknownSourcesIntent() {
       intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES);
       intent.setData(Uri.parse("package:" + getPackageName()));
       intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-      LogWrapper.getInstance().v(TAG + "Starting unknown sources in new task");
+      LogWrapper.v(TAG, "Starting unknown sources in new task");
     } else {
       intent = new Intent(Settings.ACTION_SECURITY_SETTINGS);
       intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -158,14 +153,14 @@ private void startAndroidPackageInstallerIntent() {
       intent.setDataAndType(apkUri, APK_MIME_TYPE);
       intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
     } else {
-      LogWrapper.getInstance().d("Requesting a vanilla URI");
+      LogWrapper.d(TAG, "Requesting a vanilla URI");
       intent.setDataAndType(Uri.fromFile(apkFile), APK_MIME_TYPE);
     }
 
     // These flags open the installation activity in a new task and to prevent earlier installation
     // tasks from causing future ones to fail we use the clear task flag
     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-    LogWrapper.getInstance().v("Kicking off install as new activity");
+    LogWrapper.v(TAG, "Kicking off install as new activity");
     startActivity(intent);
   }
 }
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/LogWrapper.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/LogWrapper.java
new file mode 100644
index 00000000000..a34d3e5f61f
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/LogWrapper.java
@@ -0,0 +1,57 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import android.util.Log;
+import androidx.annotation.NonNull;
+
+/** Wrapper that handles Android logcat logging. */
+class LogWrapper {
+  private static final String LOG_TAG = "FirebaseAppDistribution";
+
+  static void d(@NonNull String additionalTag, @NonNull String msg) {
+    Log.d(LOG_TAG, prependTag(additionalTag, msg));
+  }
+
+  static void v(@NonNull String additionalTag, @NonNull String msg) {
+    Log.v(LOG_TAG, prependTag(additionalTag, msg));
+  }
+
+  static void i(@NonNull String additionalTag, @NonNull String msg) {
+    Log.i(LOG_TAG, prependTag(additionalTag, msg));
+  }
+
+  static void w(@NonNull String additionalTag, @NonNull String msg) {
+    Log.w(LOG_TAG, prependTag(additionalTag, msg));
+  }
+
+  static void w(@NonNull String additionalTag, @NonNull String msg, @NonNull Throwable tr) {
+    Log.w(LOG_TAG, prependTag(additionalTag, msg), tr);
+  }
+
+  static void e(@NonNull String additionalTag, @NonNull String msg) {
+    Log.e(LOG_TAG, prependTag(additionalTag, msg));
+  }
+
+  static void e(@NonNull String additionalTag, @NonNull String msg, @NonNull Throwable tr) {
+    Log.e(LOG_TAG, prependTag(additionalTag, msg), tr);
+  }
+
+  private static String prependTag(String tag, String msg) {
+    return String.format("%s: %s", tag, msg);
+  }
+
+  private LogWrapper() {}
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/NewReleaseFetcher.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/NewReleaseFetcher.java
new file mode 100644
index 00000000000..660f608270f
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/NewReleaseFetcher.java
@@ -0,0 +1,187 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.firebase.appdistribution.impl.PackageInfoUtils.getPackageInfo;
+
+import android.content.Context;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.content.pm.PackageInfoCompat;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.BinaryType;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import java.util.concurrent.Executor;
+import javax.inject.Inject;
+
+/**
+ * Class that handles fetching the latest release from App Distribution and determining if it is a
+ * new release.
+ */
+class NewReleaseFetcher {
+  private static final String TAG = "NewReleaseFetcher";
+
+  private final FirebaseAppDistributionTesterApiClient firebaseAppDistributionTesterApiClient;
+  private final ReleaseIdentifier releaseIdentifier;
+  private final DevModeDetector devModeDetector;
+  private @Lightweight Executor lightweightExecutor;
+  private final Context context;
+
+  TaskCache<AppDistributionReleaseInternal> cachedCheckForNewRelease;
+
+  @Inject
+  NewReleaseFetcher(
+      @NonNull Context applicationContext,
+      @NonNull FirebaseAppDistributionTesterApiClient firebaseAppDistributionTesterApiClient,
+      ReleaseIdentifier releaseIdentifier,
+      DevModeDetector devModeDetector,
+      @Lightweight Executor lightweightExecutor) {
+    this.firebaseAppDistributionTesterApiClient = firebaseAppDistributionTesterApiClient;
+    this.context = applicationContext;
+    this.releaseIdentifier = releaseIdentifier;
+    this.devModeDetector = devModeDetector;
+    this.lightweightExecutor = lightweightExecutor;
+    this.cachedCheckForNewRelease = new TaskCache<>(lightweightExecutor);
+  }
+
+  @NonNull
+  public Task<AppDistributionReleaseInternal> checkForNewRelease() {
+    if (devModeDetector.isDevModeEnabled()) {
+      LogWrapper.w(TAG, "Not checking for new release because development mode is enabled.");
+      return Tasks.forResult(null);
+    }
+    return cachedCheckForNewRelease.getOrCreateTask(
+        () ->
+            firebaseAppDistributionTesterApiClient
+                .fetchNewRelease()
+                .onSuccessTask(
+                    lightweightExecutor,
+                    release ->
+                        isNewerRelease(release)
+                            .onSuccessTask(
+                                lightweightExecutor,
+                                isNewer -> Tasks.forResult(isNewer ? release : null))));
+  }
+
+  private Task<Boolean> isNewerRelease(AppDistributionReleaseInternal retrievedNewRelease)
+      throws FirebaseAppDistributionException {
+    if (retrievedNewRelease == null) {
+      LogWrapper.v(TAG, "Tester does not have access to any releases");
+      return Tasks.forResult(false);
+    }
+
+    long newReleaseBuildVersion = parseBuildVersion(retrievedNewRelease.getBuildVersion());
+
+    if (isOlderBuildVersion(newReleaseBuildVersion)) {
+      LogWrapper.v(TAG, "New release has lower version code than current release");
+      return Tasks.forResult(false);
+    }
+
+    if (isNewerBuildVersion(newReleaseBuildVersion)
+        || hasDifferentAppVersionName(retrievedNewRelease)) {
+      return Tasks.forResult(true);
+    }
+
+    return hasSameBinaryIdentifier(retrievedNewRelease)
+        .onSuccessTask(
+            lightweightExecutor,
+            hasSameBinaryIdentifier -> {
+              if (hasSameBinaryIdentifier) {
+                // The release has the same app version name and binary identifier, and has either
+                // an equal or older build version
+                LogWrapper.v(TAG, "New release is older or is currently installed");
+                return Tasks.forResult(false);
+              }
+              return Tasks.forResult(true);
+            });
+  }
+
+  private long parseBuildVersion(String buildVersion) throws FirebaseAppDistributionException {
+    try {
+      return Long.parseLong(buildVersion);
+    } catch (NumberFormatException e) {
+      throw new FirebaseAppDistributionException(
+          "Could not parse build version of new release: " + buildVersion, Status.UNKNOWN, e);
+    }
+  }
+
+  private boolean isOlderBuildVersion(long newReleaseBuildVersion)
+      throws FirebaseAppDistributionException {
+    return newReleaseBuildVersion < getInstalledAppVersionCode(context);
+  }
+
+  private boolean isNewerBuildVersion(long newReleaseBuildVersion)
+      throws FirebaseAppDistributionException {
+    return newReleaseBuildVersion > getInstalledAppVersionCode(context);
+  }
+
+  private boolean hasDifferentAppVersionName(AppDistributionReleaseInternal newRelease)
+      throws FirebaseAppDistributionException {
+    return !newRelease.getDisplayVersion().equals(getInstalledAppVersionName(context));
+  }
+
+  @VisibleForTesting
+  Task<Boolean> hasSameBinaryIdentifier(AppDistributionReleaseInternal newRelease)
+      throws FirebaseAppDistributionException {
+    if (newRelease.getBinaryType().equals(BinaryType.APK)) {
+      return hasSameHashAsInstalledRelease(newRelease);
+    }
+    return Tasks.forResult(hasSameIasArtifactId(newRelease));
+  }
+
+  boolean hasSameIasArtifactId(AppDistributionReleaseInternal newRelease) {
+    if (newRelease.getIasArtifactId() == null || newRelease.getIasArtifactId().isEmpty()) {
+      LogWrapper.w(TAG, "AAB release missing IAS Artifact ID. Assuming new release is different.");
+      return false;
+    }
+
+    String installedIasArtifactId;
+    try {
+      installedIasArtifactId = releaseIdentifier.extractInternalAppSharingArtifactId();
+    } catch (FirebaseAppDistributionException e) {
+      LogWrapper.w(
+          TAG, "Could not get installed IAS artifact ID. Assuming new release is different.", e);
+      return false;
+    }
+
+    return newRelease.getIasArtifactId().equals(installedIasArtifactId);
+  }
+
+  private long getInstalledAppVersionCode(Context context) throws FirebaseAppDistributionException {
+    return PackageInfoCompat.getLongVersionCode(getPackageInfo(context));
+  }
+
+  private String getInstalledAppVersionName(Context context)
+      throws FirebaseAppDistributionException {
+    return getPackageInfo(context).versionName;
+  }
+
+  private Task<Boolean> hasSameHashAsInstalledRelease(AppDistributionReleaseInternal newRelease)
+      throws FirebaseAppDistributionException {
+    if (newRelease.getApkHash().isEmpty()) {
+      return Tasks.forException(
+          new FirebaseAppDistributionException(
+              "Missing APK hash from new release", Status.UNKNOWN));
+    }
+    return releaseIdentifier
+        .extractApkHash()
+        .onSuccessTask(
+            lightweightExecutor,
+            apkHash -> Tasks.forResult(apkHash.equals(newRelease.getApkHash())));
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/PackageInfoUtils.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/PackageInfoUtils.java
new file mode 100644
index 00000000000..0cd04e19353
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/PackageInfoUtils.java
@@ -0,0 +1,56 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+
+final class PackageInfoUtils {
+
+  private static final int NO_FLAGS = 0;
+
+  /**
+   * Get the package info for the currently installed app.
+   *
+   * @throws FirebaseAppDistributionException if the package name can't be found.
+   */
+  static PackageInfo getPackageInfo(Context context) throws FirebaseAppDistributionException {
+    return getPackageInfoWithFlags(context, NO_FLAGS);
+  }
+
+  /**
+   * Get the package info for the currently installed app, with the PackageManager.GET_META_DATA
+   * flag set.
+   *
+   * @throws FirebaseAppDistributionException if the package name can't be found.
+   */
+  static PackageInfo getPackageInfoWithMetadata(Context context)
+      throws FirebaseAppDistributionException {
+    return getPackageInfoWithFlags(context, PackageManager.GET_META_DATA);
+  }
+
+  private static PackageInfo getPackageInfoWithFlags(Context context, int flags)
+      throws FirebaseAppDistributionException {
+    try {
+      return context.getPackageManager().getPackageInfo(context.getPackageName(), flags);
+    } catch (PackageManager.NameNotFoundException e) {
+      throw new FirebaseAppDistributionException(
+          "Unable to find package with name " + context.getPackageName(), Status.UNKNOWN, e);
+    }
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ReleaseIdentifier.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ReleaseIdentifier.java
new file mode 100644
index 00000000000..806191f7f62
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ReleaseIdentifier.java
@@ -0,0 +1,218 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.firebase.appdistribution.impl.PackageInfoUtils.getPackageInfoWithMetadata;
+import static com.google.firebase.appdistribution.impl.TaskUtils.runAsyncInTask;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import javax.inject.Inject;
+
+/** Identifies the installed release using binary identifiers. */
+class ReleaseIdentifier {
+
+  private static final String TAG = "ReleaseIdentifier";
+
+  private static final int BYTES_IN_LONG = 8;
+  static final String IAS_ARTIFACT_ID_METADATA_KEY = "com.android.vending.internal.apk.id";
+
+  private final ConcurrentMap<String, String> cachedApkHashes = new ConcurrentHashMap<>();
+  private final Context applicationContext;
+  private final FirebaseAppDistributionTesterApiClient testerApiClient;
+
+  private final DevModeDetector devModeDetector;
+  @Background private final Executor backgroundExecutor;
+  @Lightweight private final Executor lightweightExecutor;
+
+  @Inject
+  ReleaseIdentifier(
+      Context applicationContext,
+      FirebaseAppDistributionTesterApiClient testerApiClient,
+      DevModeDetector devModeDetector,
+      @Background Executor backgroundExecutor,
+      @Lightweight Executor lightweightExecutor) {
+    this.applicationContext = applicationContext;
+    this.testerApiClient = testerApiClient;
+    this.devModeDetector = devModeDetector;
+    this.backgroundExecutor = backgroundExecutor;
+    this.lightweightExecutor = lightweightExecutor;
+  }
+
+  /**
+   * Identify the currently installed release, returning the release name.
+   *
+   * <p>Will return {@code Task} with a {@code null} result in "development mode" which allows the
+   * UI to be used, but no actual feedback to be submitted.
+   */
+  Task<String> identifyRelease() {
+    if (devModeDetector.isDevModeEnabled()) {
+      return Tasks.forResult(null);
+    }
+
+    // Attempt to find release using IAS artifact ID, which identifies app bundle releases
+    String iasArtifactId = null;
+    try {
+      iasArtifactId = extractInternalAppSharingArtifactId();
+    } catch (FirebaseAppDistributionException e) {
+      LogWrapper.w(
+          TAG,
+          "Error extracting IAS artifact ID to identify app bundle. Assuming release is an APK.");
+    }
+    if (iasArtifactId != null) {
+      return testerApiClient.findReleaseUsingIasArtifactId(iasArtifactId);
+    }
+
+    // If we can't find an IAS artifact ID, we assume the installed release is an APK
+    return extractApkHash()
+        .onSuccessTask(lightweightExecutor, testerApiClient::findReleaseUsingApkHash);
+  }
+
+  /**
+   * Extract the IAS artifact ID of the installed app.
+   *
+   * @return null if the IAS artifact ID was not present in the app metadata, which will happen if
+   *     the app was installed via APK
+   */
+  @Nullable
+  String extractInternalAppSharingArtifactId() throws FirebaseAppDistributionException {
+    PackageInfo packageInfo = getPackageInfoWithMetadata(applicationContext);
+    if (packageInfo.applicationInfo.metaData == null) {
+      throw new FirebaseAppDistributionException("Missing package info metadata", Status.UNKNOWN);
+    }
+    return packageInfo.applicationInfo.metaData.getString(IAS_ARTIFACT_ID_METADATA_KEY);
+  }
+
+  /**
+   * Extract the SHA-256 hash of the installed APK.
+   *
+   * <p>The result is stored in an in-memory cache to avoid computing it repeatedly.
+   */
+  Task<String> extractApkHash() {
+    return runAsyncInTask(
+        backgroundExecutor,
+        () -> {
+          PackageInfo metadataPackageInfo = getPackageInfoWithMetadata(applicationContext);
+          String installedReleaseApkHash = extractApkHash(metadataPackageInfo);
+          if (installedReleaseApkHash == null || installedReleaseApkHash.isEmpty()) {
+            throw new FirebaseAppDistributionException(
+                "Could not calculate hash of installed APK", Status.UNKNOWN);
+          }
+          return installedReleaseApkHash;
+        });
+  }
+
+  private String extractApkHash(PackageInfo packageInfo) {
+    File sourceFile = new File(packageInfo.applicationInfo.sourceDir);
+
+    String key =
+        String.format(
+            Locale.ENGLISH, "%s.%d", sourceFile.getAbsolutePath(), sourceFile.lastModified());
+    if (!cachedApkHashes.containsKey(key)) {
+      cachedApkHashes.put(key, calculateApkHash(sourceFile));
+    }
+    return cachedApkHashes.get(key);
+  }
+
+  @VisibleForTesting
+  @Nullable
+  String calculateApkHash(@NonNull File file) {
+    LogWrapper.v(
+        TAG,
+        String.format("Calculating release id for %s (%d bytes)", file.getPath(), file.length()));
+
+    long start = System.currentTimeMillis();
+    long entries = 0;
+    String zipFingerprint = null;
+    try {
+      MessageDigest digest = MessageDigest.getInstance("SHA-256");
+      ArrayList<Byte> checksums = new ArrayList<>();
+
+      // Since calculating the codeHash returned from the release backend is computationally
+      // expensive, we has the existing checksum data from the ZipFile and compare it to
+      // (1) the apk hash returned by the backend, or (2) look up a mapping from the apk zip hash to
+      // the full codehash, and compare that to the codehash to the backend
+      ZipFile zis = new ZipFile(file);
+      try {
+        Enumeration<? extends ZipEntry> zipEntries = zis.entries();
+        while (zipEntries.hasMoreElements()) {
+          ZipEntry zip = zipEntries.nextElement();
+          entries += 1;
+          byte[] crcBytes = longToByteArray(zip.getCrc());
+          for (byte b : crcBytes) {
+            checksums.add(b);
+          }
+        }
+      } finally {
+        zis.close();
+      }
+      byte[] checksumByteArray = digest.digest(arrayListToByteArray(checksums));
+      StringBuilder sb = new StringBuilder();
+      for (byte b : checksumByteArray) {
+        sb.append(String.format("%02x", b));
+      }
+      zipFingerprint = sb.toString();
+
+    } catch (IOException | NoSuchAlgorithmException e) {
+      LogWrapper.v(TAG, "id calculation failed for " + file.getPath());
+      return null;
+    } finally {
+      long elapsed = System.currentTimeMillis() - start;
+      LogWrapper.v(
+          TAG,
+          String.format(
+              "Computed hash of %s (%d entries, %d ms elapsed): %s",
+              file.getPath(), entries, elapsed, zipFingerprint));
+    }
+
+    return zipFingerprint;
+  }
+
+  private static byte[] longToByteArray(long x) {
+    ByteBuffer buffer = ByteBuffer.allocate(BYTES_IN_LONG);
+    buffer.putLong(x);
+    return buffer.array();
+  }
+
+  private static byte[] arrayListToByteArray(ArrayList<Byte> list) {
+    byte[] result = new byte[list.size()];
+    for (int i = 0; i < list.size(); i++) {
+      result[i] = list.get(i);
+    }
+    return result;
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ReleaseUtils.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ReleaseUtils.java
similarity index 86%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ReleaseUtils.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ReleaseUtils.java
index b0b0314e406..b8f4e26bf4d 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/ReleaseUtils.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ReleaseUtils.java
@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
+
+import com.google.firebase.appdistribution.AppDistributionRelease;
 
 class ReleaseUtils {
   static AppDistributionRelease convertToAppDistributionRelease(
@@ -26,11 +28,13 @@ static AppDistributionRelease convertToAppDistributionRelease(
     } catch (NumberFormatException e) {
       versionCode = 0;
     }
-    return AppDistributionRelease.builder()
+    return AppDistributionReleaseImpl.builder()
         .setVersionCode(versionCode)
         .setDisplayVersion(internalRelease.getDisplayVersion())
         .setReleaseNotes(internalRelease.getReleaseNotes())
         .setBinaryType(internalRelease.getBinaryType())
         .build();
   }
+
+  private ReleaseUtils() {}
 }
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ScreenshotTaker.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ScreenshotTaker.java
new file mode 100644
index 00000000000..b65d56c3158
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ScreenshotTaker.java
@@ -0,0 +1,168 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Handler;
+import android.view.PixelCopy;
+import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import java.io.BufferedOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.concurrent.Executor;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/** A class that takes screenshots of the host app. */
+@Singleton // All instances store images at the same URI, so there should really only be one
+class ScreenshotTaker {
+
+  private static final String TAG = "ScreenshotTaker";
+
+  static final String SCREENSHOT_FILE_NAME =
+      "com.google.firebase.appdistribution_feedback_screenshot.png";
+
+  private final Context applicationContext;
+  private final FirebaseAppDistributionLifecycleNotifier lifecycleNotifier;
+  @Background private final Executor backgroundExecutor;
+
+  @Inject
+  ScreenshotTaker(
+      Context applicationContext,
+      FirebaseAppDistributionLifecycleNotifier lifecycleNotifier,
+      @Background Executor backgroundExecutor) {
+    this.applicationContext = applicationContext;
+    this.lifecycleNotifier = lifecycleNotifier;
+    this.backgroundExecutor = backgroundExecutor;
+  }
+
+  /**
+   * Take a screenshot of the running host app and write it to a file.
+   *
+   * @return a {@link Task} that will complete with the file URI in app-level storage where the
+   *     screenshot was written, or null if no activity could be found to screenshot.
+   */
+  Task<Uri> takeScreenshot() {
+    return captureScreenshot()
+        .onSuccessTask(backgroundExecutor, bitmap -> Tasks.forResult(writeToFile(bitmap)));
+  }
+
+  @VisibleForTesting
+  Task<Bitmap> captureScreenshot() {
+    return lifecycleNotifier.applyToNullableForegroundActivityTask(
+        // Ignore TakeScreenshotAndStartFeedbackActivity class if it's the current activity
+        TakeScreenshotAndStartFeedbackActivity.class,
+        activity -> {
+          if (activity == null) {
+            // TakeScreenshotAndStartFeedbackActivity was the current activity and there was no
+            // active previous activity
+            return Tasks.forResult(null);
+          }
+          // We only take the screenshot here because this will be called on the main thread, so we
+          // want to do as little work as possible
+          try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+              return captureScreenshotOreo(activity);
+            } else {
+              return Tasks.forResult(captureScreenshotLegacy(activity));
+            }
+          } catch (Exception | OutOfMemoryError e) {
+            throw new FirebaseAppDistributionException(
+                "Failed to take screenshot", Status.UNKNOWN, e);
+          }
+        });
+  }
+
+  private static Bitmap getBitmapForScreenshot(Activity activity) {
+    View view = activity.getWindow().getDecorView().getRootView();
+    return Bitmap.createBitmap(view.getWidth(), view.getHeight(), Bitmap.Config.RGB_565);
+  }
+
+  private static Bitmap captureScreenshotLegacy(Activity activity) {
+    Bitmap bitmap = getBitmapForScreenshot(activity);
+    Canvas canvas = new Canvas(bitmap);
+    activity.getWindow().getDecorView().getRootView().draw(canvas);
+    return bitmap;
+  }
+
+  @TargetApi(Build.VERSION_CODES.O)
+  private static Task<Bitmap> captureScreenshotOreo(Activity activity) {
+    Bitmap bitmap = getBitmapForScreenshot(activity);
+    TaskCompletionSource<Bitmap> taskCompletionSource = new TaskCompletionSource<>();
+    try {
+      // PixelCopy can handle Bitmaps with Bitmap.Config.HARDWARE
+      PixelCopy.request(
+          activity.getWindow(),
+          bitmap,
+          result -> {
+            if (result == PixelCopy.SUCCESS) {
+              taskCompletionSource.setResult(bitmap);
+            } else {
+              taskCompletionSource.setException(
+                  new FirebaseAppDistributionException(
+                      String.format("PixelCopy request failed: %s", result), Status.UNKNOWN));
+            }
+          },
+          new Handler());
+    } catch (IllegalArgumentException e) {
+      taskCompletionSource.setException(
+          new FirebaseAppDistributionException("Bad PixelCopy request", Status.UNKNOWN, e));
+    }
+    return taskCompletionSource.getTask();
+  }
+
+  @Nullable
+  private Uri writeToFile(@Nullable Bitmap bitmap) throws FirebaseAppDistributionException {
+    if (bitmap == null) {
+      return null;
+    }
+
+    // First delete the previous file if it's still there
+    deleteScreenshot();
+
+    try (BufferedOutputStream outputStream = openFileOutputStream()) {
+      // PNG is a lossless format, the compression factor (100) is ignored
+      bitmap.compress(Bitmap.CompressFormat.PNG, /* quality= */ 100, outputStream);
+    } catch (IOException e) {
+      throw new FirebaseAppDistributionException(
+          "Failed to write screenshot to storage", Status.UNKNOWN, e);
+    }
+    return Uri.fromFile(applicationContext.getFileStreamPath(SCREENSHOT_FILE_NAME));
+  }
+
+  @VisibleForTesting
+  void deleteScreenshot() {
+    applicationContext.deleteFile(SCREENSHOT_FILE_NAME);
+  }
+
+  private BufferedOutputStream openFileOutputStream() throws FileNotFoundException {
+    return new BufferedOutputStream(
+        applicationContext.openFileOutput(SCREENSHOT_FILE_NAME, Context.MODE_PRIVATE));
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/SequentialReference.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/SequentialReference.java
new file mode 100644
index 00000000000..9d200777a0f
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/SequentialReference.java
@@ -0,0 +1,65 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.firebase.concurrent.FirebaseExecutors;
+import java.util.concurrent.Executor;
+
+/**
+ * A reference to an object that uses a sequential executor to ensure non-concurrent reads and
+ * writes while preventing lock contention.
+ */
+class SequentialReference<T> {
+
+  private final Executor sequentialExecutor;
+  private T value;
+
+  /**
+   * Constructor for a {@link SequentialReference} that controls access using its own sequential
+   * executor backed by the given base executor.
+   */
+  SequentialReference(Executor baseExecutor) {
+    this.sequentialExecutor = FirebaseExecutors.newSequentialExecutor(baseExecutor);
+  }
+
+  /**
+   * Sets the value, returning a {@link Task} will complete once it is set.
+   *
+   * <p>For convenience when chaining tasks together, the result of the returned task is the value.
+   */
+  Task<T> set(T newValue) {
+    TaskCompletionSource<T> taskCompletionSource = new TaskCompletionSource<>();
+    sequentialExecutor.execute(
+        () -> {
+          value = newValue;
+          taskCompletionSource.setResult(value);
+        });
+    return taskCompletionSource.getTask();
+  }
+
+  /**
+   * Gets a {@link Task} that will complete with the value.
+   *
+   * <p>In some cases the value may have changed by the time any callbacks attached to the returned
+   * {@link Task} are called.
+   */
+  Task<T> get() {
+    TaskCompletionSource<T> taskCompletionSource = new TaskCompletionSource<>();
+    sequentialExecutor.execute(() -> taskCompletionSource.setResult(value));
+    return taskCompletionSource.getTask();
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/SignInResultActivity.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/SignInResultActivity.java
similarity index 87%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/SignInResultActivity.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/SignInResultActivity.java
index 1c8e0a31862..4a97333cd13 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/SignInResultActivity.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/SignInResultActivity.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution.internal;
+package com.google.firebase.appdistribution.impl;
 
 import android.os.Bundle;
 import androidx.annotation.NonNull;
@@ -23,12 +23,12 @@
  * when SignInResultActivity is created.
  */
 public class SignInResultActivity extends AppCompatActivity {
-  private static final String TAG = "SignInResultActivity:";
+  private static final String TAG = "SignInResultActivity";
 
   @Override
   public void onCreate(@NonNull Bundle savedInstanceBundle) {
     super.onCreate(savedInstanceBundle);
-    LogWrapper.getInstance().v(TAG + "The tester is signing in");
+    LogWrapper.v(TAG, "The tester is signing in");
     // While this does not appear to be achieving much, handling the redirect in this way
     // ensures that we can remove the browser tab from the back stack. See the documentation
     // on AuthorizationManagementActivity for more details.
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/SignInStorage.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/SignInStorage.java
new file mode 100644
index 00000000000..76163680adc
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/SignInStorage.java
@@ -0,0 +1,102 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import androidx.annotation.VisibleForTesting;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.annotations.concurrent.Background;
+import java.util.concurrent.Executor;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/** Class that handles storage for App Distribution SignIn persistence. */
+// TODO(b/266704696): This currently only supports one FirebaseAppDistribution instance app-wide
+@Singleton
+class SignInStorage {
+  static final String TAG = "SignInStorage";
+
+  @VisibleForTesting
+  static final String SIGNIN_PREFERENCES_NAME = "FirebaseAppDistributionSignInStorage";
+
+  @VisibleForTesting static final String SIGN_IN_KEY = "firebase_app_distribution_signin";
+
+  @VisibleForTesting
+  static final String DEV_MODE_SIGN_IN_KEY = "firebase_app_distribution_signin_dev_mode";
+
+  private final Context applicationContext;
+  private final DevModeDetector devModeDetector;
+  @Background private final Executor backgroundExecutor;
+  private SharedPreferences sharedPreferences;
+
+  private interface SharedPreferencesFunction<T> {
+    T apply(SharedPreferences sharedPreferences);
+  }
+
+  @Inject
+  SignInStorage(
+      Context applicationContext,
+      DevModeDetector devModeDetector,
+      @Background Executor backgroundExecutor) {
+    this.applicationContext = applicationContext;
+    this.devModeDetector = devModeDetector;
+    this.backgroundExecutor = backgroundExecutor;
+  }
+
+  Task<Void> setSignInStatus(boolean testerSignedIn) {
+    return applyToSharedPreferences(
+        sharedPreferences -> {
+          sharedPreferences.edit().putBoolean(storageKey(), testerSignedIn).apply();
+          return null;
+        });
+  }
+
+  Task<Boolean> getSignInStatus() {
+    return applyToSharedPreferences(
+        sharedPreferences -> sharedPreferences.getBoolean(storageKey(), false));
+  }
+
+  boolean getSignInStatusBlocking() {
+    return getAndCacheSharedPreferences().getBoolean(storageKey(), false);
+  }
+
+  private SharedPreferences getAndCacheSharedPreferences() {
+    // This may construct a new SharedPreferences object, which requires storage I/O
+    sharedPreferences =
+        applicationContext.getSharedPreferences(SIGNIN_PREFERENCES_NAME, Context.MODE_PRIVATE);
+    return sharedPreferences;
+  }
+
+  private <T> Task<T> applyToSharedPreferences(SharedPreferencesFunction<T> func) {
+    // Check nullness of sharedPreferences directly even though multiple threads could be calling
+    // this function at once. This isn't a problem because: 1) once it is set it will never be reset
+    // back to null, and 2) even if it is initialized twice on different threads the second call
+    // will get the exact same instance.
+    if (sharedPreferences != null) {
+      return Tasks.forResult(func.apply(sharedPreferences));
+    }
+    TaskCompletionSource<T> taskCompletionSource = new TaskCompletionSource<>();
+    backgroundExecutor.execute(
+        () -> taskCompletionSource.setResult(func.apply(getAndCacheSharedPreferences())));
+    return taskCompletionSource.getTask();
+  }
+
+  private String storageKey() {
+    return devModeDetector.isDevModeEnabled() ? DEV_MODE_SIGN_IN_KEY : SIGN_IN_KEY;
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TakeScreenshotAndStartFeedbackActivity.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TakeScreenshotAndStartFeedbackActivity.java
new file mode 100644
index 00000000000..ecd5f3ea3cf
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TakeScreenshotAndStartFeedbackActivity.java
@@ -0,0 +1,44 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import android.app.Activity;
+import android.os.Bundle;
+import javax.inject.Inject;
+
+public class TakeScreenshotAndStartFeedbackActivity extends Activity {
+
+  private static final String TAG = "TakeScreenshotAndStartFeedbackActivity";
+
+  public static final String ADDITIONAL_FORM_TEXT_EXTRA_KEY =
+      "com.google.firebase.appdistribution.TakeScreenshotAndStartFeedbackActivity.ADDITIONAL_FORM_TEXT";
+
+  @Inject FirebaseAppDistributionImpl firebaseAppDistribution;
+
+  private CharSequence additionalFormText;
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    // Inject members before calling super.onCreate to avoid issues with fragment restoration
+    AppDistroComponent.getInstance().inject(this);
+
+    super.onCreate(savedInstanceState);
+    additionalFormText = getIntent().getCharSequenceExtra(ADDITIONAL_FORM_TEXT_EXTRA_KEY);
+    LogWrapper.i(TAG, "Capturing screenshot and starting feedback");
+    firebaseAppDistribution.startFeedback(additionalFormText, FeedbackTrigger.NOTIFICATION);
+
+    finish();
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TaskCache.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TaskCache.java
new file mode 100644
index 00000000000..b370aea77de
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TaskCache.java
@@ -0,0 +1,72 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.concurrent.FirebaseExecutors;
+import java.util.concurrent.Executor;
+
+/**
+ * A cache for a {@link Task}, for use in cases where we only ever want one active task at a time
+ * for a particular operation.
+ *
+ * <p>If you need a reference to an underlying TaskCompletionSource, use {@link
+ * TaskCompletionSourceCache} instead.
+ */
+class TaskCache<T> {
+
+  /** A functional interface for a producer of a new {@link Task}. */
+  @FunctionalInterface
+  interface TaskProducer<T> {
+
+    /** Produce a new {@link Task}. */
+    Task<T> produce();
+  }
+
+  private Task<T> cachedTask;
+  private final Executor sequentialExecutor;
+
+  /**
+   * Constructor for a {@link TaskCache} that controls access using its own sequential executor
+   * backed by the given base executor.
+   *
+   * @param baseExecutor Executor (typically {@link Lightweight}) to back the sequential executor.
+   */
+  TaskCache(Executor baseExecutor) {
+    sequentialExecutor = FirebaseExecutors.newSequentialExecutor(baseExecutor);
+  }
+
+  /**
+   * Gets a cached {@link Task}, if there is one and it is not completed, or else calls the given
+   * {@code producer} and caches the return value.
+   */
+  Task<T> getOrCreateTask(TaskProducer<T> producer) {
+    TaskCompletionSource<T> taskCompletionSource = new TaskCompletionSource<>();
+    sequentialExecutor.execute(
+        () -> {
+          if (!isOngoing(cachedTask)) {
+            cachedTask = producer.produce();
+          }
+          TaskUtils.shadowTask(taskCompletionSource, cachedTask);
+        });
+    return taskCompletionSource.getTask();
+  }
+
+  private static <T> boolean isOngoing(Task<T> task) {
+    return task != null && !task.isComplete();
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TaskCompletionSourceCache.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TaskCompletionSourceCache.java
new file mode 100644
index 00000000000..4790f2da9ec
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TaskCompletionSourceCache.java
@@ -0,0 +1,130 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.concurrent.FirebaseExecutors;
+import java.util.concurrent.Executor;
+
+/**
+ * A cache for a {@link TaskCompletionSource}, for use in cases where we only ever want one active
+ * task at a time for a particular operation.
+ *
+ * <p>This is equivalent to {@link UpdateTaskCache} but for Tasks.
+ */
+class TaskCompletionSourceCache<T> {
+
+  /** A functional interface for a producer of a new {@link TaskCompletionSource}. */
+  @FunctionalInterface
+  interface TaskCompletionSourceProducer<T> {
+
+    /** Produce a new {@link TaskCompletionSource}. */
+    TaskCompletionSource<T> produce();
+  }
+
+  private TaskCompletionSource<T> cachedTaskCompletionSource;
+  private final Executor sequentialExecutor;
+
+  /**
+   * Constructor for a {@link TaskCompletionSourceCache} that controls access using its own
+   * sequential executor backed by the given base executor.
+   *
+   * @param baseExecutor Executor to back the sequential executor. This can be a {@link Lightweight}
+   *     executor unless the {@link TaskCompletionSourceProducer} passed to {@link
+   *     #getOrCreateTaskFromCompletionSource} needs to be executed on a different executor.
+   */
+  TaskCompletionSourceCache(Executor baseExecutor) {
+    sequentialExecutor = FirebaseExecutors.newSequentialExecutor(baseExecutor);
+  }
+
+  /**
+   * Gets a cached {@link TaskCompletionSource}, if there is one and it is not completed, or else
+   * calls the given {@code producer} and caches the return value.
+   */
+  Task<T> getOrCreateTaskFromCompletionSource(TaskCompletionSourceProducer<T> producer) {
+    TaskCompletionSource<T> taskCompletionSource = new TaskCompletionSource<>();
+    sequentialExecutor.execute(
+        () -> {
+          if (cachedTaskCompletionSource == null
+              || cachedTaskCompletionSource.getTask().isComplete()) {
+            cachedTaskCompletionSource = producer.produce();
+          }
+          TaskUtils.shadowTask(taskCompletionSource, cachedTaskCompletionSource.getTask());
+        });
+    return taskCompletionSource.getTask();
+  }
+
+  /**
+   * Sets the result on the cached {@link TaskCompletionSource}.
+   *
+   * <p>The task must be created using {@link #getOrCreateTaskFromCompletionSource} before calling
+   * this method.
+   *
+   * @return A task that resolves when the change is applied, or fails with {@link
+   *     IllegalStateException} if the task was not created yet or was already completed.
+   */
+  Task<Void> setResult(T result) {
+    return executeIfOngoing(() -> cachedTaskCompletionSource.setResult(result));
+  }
+
+  /**
+   * Sets the exception on the cached {@link TaskCompletionSource}, if there is one and it is not
+   * completed.
+   *
+   * <p>The task must be created using {@link #getOrCreateTaskFromCompletionSource} before calling
+   * this method.
+   *
+   * @return A task that resolves when the change is applied, or fails with {@link
+   *     IllegalStateException} if the task was not created yet or was already completed.
+   */
+  Task<Void> setException(Exception e) {
+    return executeIfOngoing(() -> cachedTaskCompletionSource.setException(e));
+  }
+
+  /**
+   * Returns a task indicating whether the cached {@link TaskCompletionSource} has been initialized
+   * and is not yet completed.
+   */
+  Task<Boolean> isOngoing() {
+    TaskCompletionSource<Boolean> taskCompletionSource = new TaskCompletionSource<>();
+    sequentialExecutor.execute(
+        () ->
+            taskCompletionSource.setResult(
+                cachedTaskCompletionSource != null
+                    && !cachedTaskCompletionSource.getTask().isComplete()));
+    return taskCompletionSource.getTask();
+  }
+
+  private Task<Void> executeIfOngoing(Runnable r) {
+    TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
+    sequentialExecutor.execute(
+        () -> {
+          if (cachedTaskCompletionSource == null) {
+            taskCompletionSource.setException(
+                new IllegalStateException(
+                    "Tried to set exception before calling getOrCreateTaskFromCompletionSource()"));
+          } else if (cachedTaskCompletionSource.getTask().isComplete()) {
+            taskCompletionSource.setException(
+                new IllegalStateException("Tried to set exception on a completed task"));
+          } else {
+            r.run();
+            taskCompletionSource.setResult(null);
+          }
+        });
+    return taskCompletionSource.getTask();
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/TaskUtils.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TaskUtils.java
similarity index 64%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/TaskUtils.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TaskUtils.java
index 909e69104bf..79e6e3472a8 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/TaskUtils.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TaskUtils.java
@@ -12,17 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
+import com.google.android.gms.tasks.SuccessContinuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.appdistribution.internal.LogWrapper;
+import com.google.firebase.appdistribution.UpdateTask;
+import com.google.firebase.concurrent.FirebaseExecutors;
 import java.util.concurrent.Executor;
 
 class TaskUtils {
-  private static final String TAG = "TaskUtils:";
+  private static final String TAG = "TaskUtils";
 
   /**
    * A functional interface to wrap a function that returns some result of a possibly long-running
@@ -32,6 +35,14 @@ interface Operation<TResult> {
     TResult run() throws FirebaseAppDistributionException;
   }
 
+  /**
+   * A function that is called to continue execution when a {@link Task} succeeds, and returns an
+   * {@link UpdateTask}.
+   */
+  interface UpdateTaskContinuation<TResult> {
+    UpdateTask then(TResult result) throws FirebaseAppDistributionException;
+  }
+
   /**
    * Runs a long running operation inside a {@link Task}, wrapping any errors in {@link
    * FirebaseAppDistributionException}.
@@ -56,7 +67,7 @@ static <TResult> Task<TResult> runAsyncInTask(Executor executor, Operation<TResu
           try {
             taskCompletionSource.setResult(operation.run());
           } catch (Throwable t) {
-            taskCompletionSource.setException(FirebaseAppDistributionException.wrap(t));
+            taskCompletionSource.setException(FirebaseAppDistributionExceptions.wrap(t));
           }
         });
     return taskCompletionSource.getTask();
@@ -78,10 +89,10 @@ static <TResult> Task<TResult> runAsyncInTask(Executor executor, Operation<TResu
   static <TResult> Task<TResult> handleTaskFailure(Task<TResult> task) {
     if (task.isComplete() && !task.isSuccessful()) {
       Exception e = task.getException();
-      LogWrapper.getInstance().e(TAG + "Task failed to complete due to " + e.getMessage(), e);
+      LogWrapper.e(TAG, "Task failed to complete", e);
       return e instanceof FirebaseAppDistributionException
           ? task
-          : Tasks.forException(FirebaseAppDistributionException.wrap(e));
+          : Tasks.forException(FirebaseAppDistributionExceptions.wrap(e));
     }
     return task;
   }
@@ -110,4 +121,39 @@ static void safeSetTaskResult(UpdateTaskImpl task) {
       task.setResult();
     }
   }
+
+  /**
+   * Returns an {@link UpdateTask} that will be completed with the result of applying the specified
+   * {@link UpdateTaskContinuation} to the given {@link Task} when the task completes successfully.
+   *
+   * <p>This is equivalent to {@link Task#onSuccessTask(Executor, SuccessContinuation)} but for a
+   * continuation that returns an {@link UpdateTask}.
+   */
+  static <T> UpdateTask onSuccessUpdateTask(
+      Task<T> task, Executor executor, UpdateTaskContinuation<T> continuation) {
+    UpdateTaskImpl updateTask = new UpdateTaskImpl();
+    task.addOnSuccessListener(
+            executor,
+            result -> {
+              try {
+                updateTask.shadow(continuation.then(result));
+              } catch (Throwable t) {
+                updateTask.setException(FirebaseAppDistributionExceptions.wrap(t));
+              }
+            })
+        .addOnFailureListener(executor, updateTask::setException);
+    return updateTask;
+  }
+
+  /** Set a {@link TaskCompletionSource} to be resolved with the result of another {@link Task}. */
+  static <T> void shadowTask(TaskCompletionSource<T> taskCompletionSource, Task<T> task) {
+    // Using direct executor here ensures that any handlers that were themselves added using a
+    // direct executor will behave as expected: they'll be executed on the thread that sets the
+    // result.
+    task.addOnSuccessListener(FirebaseExecutors.directExecutor(), taskCompletionSource::setResult)
+        .addOnFailureListener(
+            FirebaseExecutors.directExecutor(), taskCompletionSource::setException);
+  }
+
+  private TaskUtils() {}
 }
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TesterApiDisabledErrorDetails.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TesterApiDisabledErrorDetails.java
new file mode 100644
index 00000000000..a4632f91c28
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TesterApiDisabledErrorDetails.java
@@ -0,0 +1,110 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import androidx.annotation.Nullable;
+import com.google.auto.value.AutoValue;
+import java.util.ArrayList;
+import java.util.List;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Details about a {@code SERVICE_DISABLED} error returned by the Tester API.
+ *
+ * <p>Error structure is described in the <a
+ * href="https://cloud.google.com/apis/design/errors#error_details">Cloud APIs documentation</a>.
+ */
+@AutoValue
+abstract class TesterApiDisabledErrorDetails {
+
+  @AutoValue
+  abstract static class HelpLink {
+    abstract String description();
+
+    abstract String url();
+
+    static HelpLink create(String description, String url) {
+      return new AutoValue_TesterApiDisabledErrorDetails_HelpLink(description, url);
+    }
+  }
+
+  abstract List<HelpLink> helpLinks();
+
+  String formatLinks() {
+    StringBuilder stringBuilder = new StringBuilder();
+    for (HelpLink link : helpLinks()) {
+      stringBuilder.append(String.format("%s: %s\n", link.description(), link.url()));
+    }
+    return stringBuilder.toString();
+  }
+
+  /**
+   * Try to parse API disabled error details from a response body.
+   *
+   * <p>If the response is an API disabled error but there is a failure parsing the help links, it
+   * will still return the details with any links it could parse before the failure.
+   *
+   * @param responseBody
+   * @return the details, or {@code null} if the response was not in the expected format
+   */
+  @Nullable
+  static TesterApiDisabledErrorDetails tryParse(String responseBody) {
+    try {
+      // Get the error details object
+      JSONArray details =
+          new JSONObject(responseBody).getJSONObject("error").getJSONArray("details");
+      JSONObject errorInfo = getDetailWithType(details, "type.googleapis.com/google.rpc.ErrorInfo");
+      if (errorInfo.getString("reason").equals("SERVICE_DISABLED")) {
+        return new AutoValue_TesterApiDisabledErrorDetails(parseHelpLinks(details));
+      }
+    } catch (JSONException e) {
+      // Error was not in expected API disabled error format
+    }
+    return null;
+  }
+
+  private static JSONObject getDetailWithType(JSONArray details, String type) throws JSONException {
+    for (int i = 0; i < details.length(); i++) {
+      JSONObject detail = details.getJSONObject(i);
+      if (detail.getString("@type").equals(type)) {
+        return detail;
+      }
+    }
+    throw new JSONException("No detail present with type: " + type);
+  }
+
+  static List<HelpLink> parseHelpLinks(JSONArray details) {
+    List<HelpLink> helpLinks = new ArrayList<>();
+    try {
+      JSONObject help = getDetailWithType(details, "type.googleapis.com/google.rpc.Help");
+      JSONArray linksJson = help.getJSONArray("links");
+      for (int i = 0; i < linksJson.length(); i++) {
+        helpLinks.add(parseHelpLink(linksJson.getJSONObject(i)));
+      }
+    } catch (JSONException e) {
+      // If we have an issue parsing the links, we don't want to fail the entire error parsing, so
+      // go ahead and return what we have
+    }
+    return helpLinks;
+  }
+
+  private static HelpLink parseHelpLink(JSONObject json) throws JSONException {
+    String description = json.getString("description");
+    String url = json.getString("url");
+    return HelpLink.create(description, url);
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TesterApiHttpClient.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TesterApiHttpClient.java
new file mode 100644
index 00000000000..4a9a34b40f0
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TesterApiHttpClient.java
@@ -0,0 +1,331 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import com.google.android.gms.common.util.AndroidUtilsLight;
+import com.google.android.gms.common.util.Hex;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Map;
+import javax.inject.Inject;
+import javax.net.ssl.HttpsURLConnection;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/** Client that makes FIS-authenticated GET and POST requests to the App Distribution Tester API. */
+class TesterApiHttpClient {
+  private static final String TAG = "TesterApiHttpClient";
+
+  /** Functional interface for a function that writes a request body to an output stream */
+  interface RequestBodyWriter {
+    void write(OutputStream os) throws IOException;
+  }
+
+  private static final String APP_TESTERS_HOST = "firebaseapptesters.googleapis.com";
+  private static final String REQUEST_METHOD_GET = "GET";
+  private static final String REQUEST_METHOD_POST = "POST";
+  private static final String CONTENT_TYPE_HEADER_KEY = "Content-Type";
+  private static final String JSON_CONTENT_TYPE = "application/json";
+  private static final String API_KEY_HEADER = "x-goog-api-key";
+  private static final String INSTALLATION_AUTH_HEADER = "X-Goog-Firebase-Installations-Auth";
+  private static final String X_ANDROID_PACKAGE_HEADER_KEY = "X-Android-Package";
+  private static final String X_ANDROID_CERT_HEADER_KEY = "X-Android-Cert";
+  // Format of "X-Client-Version": "{ClientId}/{ClientVersion}"
+  private static final String X_CLIENT_VERSION_HEADER_KEY = "X-Client-Version";
+  private static final String X_GOOG_UPLOAD_PROTOCOL_HEADER = "X-Goog-Upload-Protocol";
+  private static final String X_GOOG_UPLOAD_PROTOCOL_RAW = "raw";
+  private static final String X_GOOG_UPLOAD_FILE_NAME_HEADER = "X-Goog-Upload-File-Name";
+  private static final String X_GOOG_UPLOAD_FILE_NAME = "screenshot.png";
+  // StandardCharsets.UTF_8 requires API level 19
+  private static final String UTF_8 = "UTF-8";
+
+  private static final int DEFAULT_BUFFER_SIZE = 8192;
+
+  private final Context applicationContext;
+  private final FirebaseOptions firebaseOptions;
+  private final HttpsUrlConnectionFactory httpsUrlConnectionFactory;
+
+  @Inject
+  TesterApiHttpClient(
+      Context applicationContext,
+      FirebaseOptions firebaseOptions,
+      HttpsUrlConnectionFactory httpsUrlConnectionFactory) {
+    this.applicationContext = applicationContext;
+    this.firebaseOptions = firebaseOptions;
+    this.httpsUrlConnectionFactory = httpsUrlConnectionFactory;
+  }
+
+  /**
+   * Make a GET request to the tester API at the given path using a FIS token for auth.
+   *
+   * @return the response body
+   */
+  JSONObject makeGetRequest(String tag, String path, String token)
+      throws FirebaseAppDistributionException {
+    HttpsURLConnection connection = null;
+    try {
+      connection = openHttpsUrlConnection(getTesterApiUrl(path), token);
+      return readResponse(tag, connection);
+    } catch (IOException e) {
+      throw getException(tag, ErrorMessages.NETWORK_ERROR, Status.NETWORK_FAILURE, e);
+    } finally {
+      if (connection != null) {
+        connection.disconnect();
+      }
+    }
+  }
+
+  /**
+   * Make a POST request to the tester API at the given path using a FIS token for auth.
+   *
+   * @return the response body
+   */
+  JSONObject makeJsonPostRequest(String tag, String path, String token, String requestBody)
+      throws FirebaseAppDistributionException {
+    return makeJsonPostRequest(tag, path, token, requestBody, new HashMap<>());
+  }
+
+  JSONObject makeJsonPostRequest(
+      String tag, String path, String token, String requestBody, Map<String, String> extraHeaders)
+      throws FirebaseAppDistributionException {
+    byte[] bytes;
+    try {
+      bytes = requestBody.getBytes(UTF_8);
+    } catch (UnsupportedEncodingException e) {
+      throw new FirebaseAppDistributionException(
+          "Unsupported encoding: " + UTF_8, Status.UNKNOWN, e);
+    }
+    return makePostRequest(
+        tag,
+        path,
+        token,
+        JSON_CONTENT_TYPE,
+        extraHeaders,
+        outputStream -> outputStream.write(bytes));
+  }
+
+  /**
+   * Make an upload request to the tester API at the given path using a FIS token for auth.
+   *
+   * <p>Uploads the content with gzip encoding.
+   *
+   * @return the response body
+   */
+  JSONObject makeUploadRequest(
+      String tag, String path, String token, String filename, String contentType, Uri contentUri)
+      throws FirebaseAppDistributionException {
+    Map<String, String> extraHeaders = new HashMap<>();
+    ContentResolver contentResolver = applicationContext.getContentResolver();
+    extraHeaders.put(X_GOOG_UPLOAD_PROTOCOL_HEADER, X_GOOG_UPLOAD_PROTOCOL_RAW);
+    extraHeaders.put(X_GOOG_UPLOAD_FILE_NAME_HEADER, filename);
+    RequestBodyWriter requestBodyWriter =
+        outputStream -> {
+          try (InputStream inputStream = contentResolver.openInputStream(contentUri)) {
+            writeInputStreamToOutputStream(inputStream, outputStream);
+          }
+        };
+    return makePostRequest(tag, path, token, contentType, extraHeaders, requestBodyWriter);
+  }
+
+  private JSONObject makePostRequest(
+      String tag,
+      String path,
+      String token,
+      String contentType,
+      Map<String, String> extraHeaders,
+      RequestBodyWriter requestBodyWriter)
+      throws FirebaseAppDistributionException {
+    HttpsURLConnection connection = null;
+    try {
+      connection = openHttpsUrlConnection(getTesterApiUrl(path), token);
+      connection.setDoOutput(true);
+      connection.setRequestMethod(REQUEST_METHOD_POST);
+      connection.addRequestProperty(CONTENT_TYPE_HEADER_KEY, contentType);
+      for (Map.Entry<String, String> e : extraHeaders.entrySet()) {
+        connection.addRequestProperty(e.getKey(), e.getValue());
+      }
+      try (OutputStream outputStream = connection.getOutputStream()) {
+        requestBodyWriter.write(outputStream);
+      } catch (IOException e) {
+        throw getException(tag, "Error writing network request body", Status.UNKNOWN, e);
+      }
+      return readResponse(tag, connection);
+    } catch (IOException e) {
+      throw getException(tag, ErrorMessages.NETWORK_ERROR, Status.NETWORK_FAILURE, e);
+    } finally {
+      if (connection != null) {
+        connection.disconnect();
+      }
+    }
+  }
+
+  private static String getTesterApiUrl(String path) {
+    return String.format("https://%s/%s", APP_TESTERS_HOST, path);
+  }
+
+  private static JSONObject readResponse(String tag, HttpsURLConnection connection)
+      throws IOException, FirebaseAppDistributionException {
+    int responseCode = connection.getResponseCode();
+    String responseBody = readResponseBody(connection);
+    LogWrapper.v(tag, String.format("Response (%d): %s", responseCode, responseBody));
+    if (!isResponseSuccess(responseCode)) {
+      throw getExceptionForHttpResponse(tag, responseCode, responseBody);
+    }
+    return parseJson(tag, responseBody);
+  }
+
+  private static JSONObject parseJson(String tag, String json)
+      throws FirebaseAppDistributionException {
+    try {
+      return new JSONObject(json);
+    } catch (JSONException e) {
+      throw getException(tag, ErrorMessages.JSON_PARSING_ERROR, Status.UNKNOWN, e);
+    }
+  }
+
+  private static String readResponseBody(HttpsURLConnection connection) throws IOException {
+    boolean isSuccess = isResponseSuccess(connection.getResponseCode());
+    try (InputStream inputStream =
+        isSuccess ? connection.getInputStream() : connection.getErrorStream()) {
+      if (inputStream == null && !isSuccess) {
+        // If the server returns a response with an error code and no response body, getErrorStream
+        // returns null. We return an empty string to reflect the empty body.
+        return "";
+      }
+      try (ByteArrayOutputStream result = new ByteArrayOutputStream()) {
+        writeInputStreamToOutputStream(inputStream, result);
+        return result.toString();
+      }
+    }
+  }
+
+  private static boolean isResponseSuccess(int responseCode) {
+    return responseCode >= 200 && responseCode < 300;
+  }
+
+  private HttpsURLConnection openHttpsUrlConnection(String url, String authToken)
+      throws IOException {
+    LogWrapper.v(TAG, "Opening connection to " + url);
+    HttpsURLConnection httpsURLConnection;
+    httpsURLConnection = httpsUrlConnectionFactory.openConnection(url);
+    httpsURLConnection.setRequestMethod(REQUEST_METHOD_GET);
+    httpsURLConnection.setRequestProperty(API_KEY_HEADER, firebaseOptions.getApiKey());
+    httpsURLConnection.setRequestProperty(INSTALLATION_AUTH_HEADER, authToken);
+    httpsURLConnection.addRequestProperty(
+        X_ANDROID_PACKAGE_HEADER_KEY, applicationContext.getPackageName());
+    httpsURLConnection.addRequestProperty(
+        X_ANDROID_CERT_HEADER_KEY, getFingerprintHashForPackage());
+    httpsURLConnection.addRequestProperty(
+        X_CLIENT_VERSION_HEADER_KEY, String.format("android-sdk/%s", BuildConfig.VERSION_NAME));
+    return httpsURLConnection;
+  }
+
+  private static FirebaseAppDistributionException getExceptionForHttpResponse(
+      String tag, int responseCode, String responseBody) {
+    switch (responseCode) {
+      case 400:
+        return getException(tag, "Bad request", Status.UNKNOWN);
+      case 401:
+        return getException(tag, ErrorMessages.AUTHENTICATION_ERROR, Status.AUTHENTICATION_FAILURE);
+      case 403:
+        return getExceptionFor403(tag, responseBody);
+      case 404:
+        return getException(tag, ErrorMessages.NOT_FOUND_ERROR, Status.AUTHENTICATION_FAILURE);
+      case 408:
+      case 504:
+        return getException(tag, ErrorMessages.TIMEOUT_ERROR, Status.NETWORK_FAILURE);
+      default:
+        return getException(tag, "Received error status: " + responseCode, Status.UNKNOWN);
+    }
+  }
+
+  private static FirebaseAppDistributionException getExceptionFor403(
+      String tag, String responseBody) {
+    // Check if this is an API disabled error
+    TesterApiDisabledErrorDetails apiDisabledErrorDetails =
+        TesterApiDisabledErrorDetails.tryParse(responseBody);
+    if (apiDisabledErrorDetails != null) {
+      String messageWithHelpLinks =
+          String.format(
+              "%s\n\n%s", ErrorMessages.API_DISABLED, apiDisabledErrorDetails.formatLinks());
+      return getException(tag, messageWithHelpLinks, Status.API_DISABLED);
+    }
+
+    // Otherwise return a basic 403 exception
+    return getException(tag, ErrorMessages.AUTHORIZATION_ERROR, Status.AUTHENTICATION_FAILURE);
+  }
+
+  private static FirebaseAppDistributionException getException(
+      String tag, String message, Status status) {
+    return new FirebaseAppDistributionException(tagMessage(tag, message), status);
+  }
+
+  private static FirebaseAppDistributionException getException(
+      String tag, String message, Status status, Throwable t) {
+    return new FirebaseAppDistributionException(tagMessage(tag, message), status, t);
+  }
+
+  private static String tagMessage(String tag, String message) {
+    return String.format("%s: %s", tag, message);
+  }
+
+  private static void writeInputStreamToOutputStream(InputStream is, OutputStream os)
+      throws IOException {
+    byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
+    int length;
+    while ((length = is.read(buffer)) != -1) {
+      os.write(buffer, 0, length);
+    }
+  }
+
+  /** Gets the Android package's SHA-1 fingerprint. */
+  private String getFingerprintHashForPackage() {
+    byte[] hash;
+
+    try {
+      hash =
+          AndroidUtilsLight.getPackageCertificateHashBytes(
+              applicationContext, applicationContext.getPackageName());
+
+      if (hash == null) {
+        LogWrapper.e(
+            TAG,
+            "Could not get fingerprint hash for X-Android-Cert header. Package is not signed: "
+                + applicationContext.getPackageName());
+        return null;
+      } else {
+        return Hex.bytesToStringUppercase(hash, /* zeroTerminated= */ false);
+      }
+    } catch (PackageManager.NameNotFoundException e) {
+      LogWrapper.e(
+          TAG,
+          "Could not get fingerprint hash for X-Android-Cert header. No such package: "
+              + applicationContext.getPackageName(),
+          e);
+      return null;
+    }
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TesterSignInManager.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TesterSignInManager.java
new file mode 100644
index 00000000000..50ae6cbef29
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TesterSignInManager.java
@@ -0,0 +1,221 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_CANCELED;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.UNKNOWN;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.browser.customtabs.CustomTabsIntent;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.inject.Provider;
+import com.google.firebase.installations.FirebaseInstallationsApi;
+import java.util.List;
+import java.util.concurrent.Executor;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/** Class that handles signing in the tester. */
+// TODO(b/266704696): This currently only supports one FirebaseAppDistribution instance app-wide
+@Singleton
+class TesterSignInManager {
+  private static final String TAG = "TesterSignInManager";
+
+  private static final String SIGNIN_REDIRECT_URL =
+      "https://appdistribution.firebase.google.com/pub/testerapps/%s/installations/%s/buildalerts?appName=%s&packageName=%s&newRedirectScheme=true";
+
+  private final Context applicationContext;
+  private final FirebaseOptions firebaseOptions;
+  private final Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider;
+  private final SignInStorage signInStorage;
+  private final FirebaseAppDistributionLifecycleNotifier lifecycleNotifier;
+
+  private final DevModeDetector devModeDetector;
+  @Lightweight private final Executor lightweightExecutor;
+  private final TaskCompletionSourceCache<Void> signInTaskCompletionSourceCache;
+
+  private boolean hasBeenSentToBrowserForCurrentTask = false;
+
+  @Inject
+  TesterSignInManager(
+      Context applicationContext,
+      FirebaseOptions firebaseOptions,
+      Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider,
+      SignInStorage signInStorage,
+      FirebaseAppDistributionLifecycleNotifier lifecycleNotifier,
+      DevModeDetector devModeDetector,
+      @Lightweight Executor lightweightExecutor) {
+    this.applicationContext = applicationContext;
+    this.firebaseOptions = firebaseOptions;
+    this.firebaseInstallationsApiProvider = firebaseInstallationsApiProvider;
+    this.signInStorage = signInStorage;
+    this.lifecycleNotifier = lifecycleNotifier;
+    this.devModeDetector = devModeDetector;
+    this.lightweightExecutor = lightweightExecutor;
+    this.signInTaskCompletionSourceCache = new TaskCompletionSourceCache<>(lightweightExecutor);
+
+    lifecycleNotifier.addOnActivityCreatedListener(this::onActivityCreated);
+    lifecycleNotifier.addOnActivityResumedListener(this::onActivityResumed);
+  }
+
+  @VisibleForTesting
+  void onActivityCreated(Activity activity) {
+    // We call finish() in the onCreate method of the SignInResultActivity, so we must set the
+    // result of the signIn Task in the onActivityCreated callback
+    if (activity instanceof SignInResultActivity) {
+      LogWrapper.v(TAG, "Sign in completed");
+      this.signInStorage
+          .setSignInStatus(true)
+          .addOnSuccessListener(
+              lightweightExecutor, unused -> signInTaskCompletionSourceCache.setResult(null))
+          .addOnFailureListener(
+              lightweightExecutor,
+              handleTaskFailure("Error storing tester sign in state", UNKNOWN));
+    }
+  }
+
+  @VisibleForTesting
+  void onActivityResumed(Activity activity) {
+    if (activity instanceof SignInResultActivity || activity instanceof InstallActivity) {
+      // SignInResult and InstallActivity are internal to the SDK and should not be treated as
+      // reentering the app
+      return;
+    }
+
+    // Throw error if app reentered during sign in
+    if (hasBeenSentToBrowserForCurrentTask) {
+      signInTaskCompletionSourceCache
+          .setException(
+              new FirebaseAppDistributionException(
+                  ErrorMessages.AUTHENTICATION_CANCELED, AUTHENTICATION_CANCELED))
+          .addOnSuccessListener(
+              lightweightExecutor,
+              unused -> LogWrapper.e(TAG, "App resumed without sign in flow completing."));
+    }
+  }
+
+  @NonNull
+  public Task<Void> signInTester() {
+    return signInStorage
+        .getSignInStatus()
+        .onSuccessTask(
+            lightweightExecutor,
+            signedIn -> {
+              if (signedIn) {
+                LogWrapper.v(TAG, "Tester is already signed in.");
+                return Tasks.forResult(null);
+              }
+              return doSignInTester();
+            });
+  }
+
+  private Task<Void> doSignInTester() {
+    if (devModeDetector.isDevModeEnabled()) {
+      LogWrapper.w(TAG, "Skipping actual tester sign in because dev mode is enabled");
+      signInStorage.setSignInStatus(true);
+      return Tasks.forResult(null);
+    }
+    return signInTaskCompletionSourceCache.getOrCreateTaskFromCompletionSource(
+        () -> {
+          TaskCompletionSource<Void> signInTaskCompletionSource = new TaskCompletionSource<>();
+          hasBeenSentToBrowserForCurrentTask = false;
+          firebaseInstallationsApiProvider
+              .get()
+              .getId()
+              .addOnFailureListener(
+                  lightweightExecutor,
+                  handleTaskFailure(ErrorMessages.AUTHENTICATION_ERROR, AUTHENTICATION_FAILURE))
+              .addOnSuccessListener(
+                  lightweightExecutor,
+                  fid ->
+                      getForegroundActivityAndOpenSignInFlow(fid)
+                          .addOnFailureListener(
+                              lightweightExecutor,
+                              handleTaskFailure(ErrorMessages.UNKNOWN_ERROR, UNKNOWN)));
+          return signInTaskCompletionSource;
+        });
+  }
+
+  private Task<Void> getForegroundActivityAndOpenSignInFlow(String fid) {
+    return lifecycleNotifier.consumeForegroundActivity(
+        activity -> {
+          openSignInFlowInBrowser(fid, activity);
+          hasBeenSentToBrowserForCurrentTask = true;
+        });
+  }
+
+  private OnFailureListener handleTaskFailure(String message, Status status) {
+    return e -> {
+      LogWrapper.e(TAG, message, e);
+      signInTaskCompletionSourceCache.setException(
+          new FirebaseAppDistributionException(message, status, e));
+    };
+  }
+
+  private static String getApplicationName(Context context) {
+    try {
+      return context.getApplicationInfo().loadLabel(context.getPackageManager()).toString();
+    } catch (Exception e) {
+      LogWrapper.e(TAG, "Unable to retrieve App name", e);
+      return "";
+    }
+  }
+
+  private void openSignInFlowInBrowser(String fid, Activity activity) {
+    Uri uri =
+        Uri.parse(
+            String.format(
+                SIGNIN_REDIRECT_URL,
+                firebaseOptions.getApplicationId(),
+                fid,
+                getApplicationName(applicationContext),
+                applicationContext.getPackageName()));
+    LogWrapper.v(TAG, "Opening sign in flow in browser at " + uri);
+    if (supportsCustomTabs(applicationContext)) {
+      // If we can launch a chrome view, try that.
+      CustomTabsIntent customTabsIntent = new CustomTabsIntent.Builder().build();
+      Intent intent = customTabsIntent.intent;
+      intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+      customTabsIntent.launchUrl(activity, uri);
+    } else {
+      // If we can't launch a chrome view try to launch anything that can handle a URL.
+      Intent browserIntent = new Intent(Intent.ACTION_VIEW, uri);
+      browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+      activity.startActivity(browserIntent);
+    }
+  }
+
+  private boolean supportsCustomTabs(Context context) {
+    Intent customTabIntent = new Intent("android.support.customtabs.action.CustomTabsService");
+    customTabIntent.setPackage("com.android.chrome");
+    List<ResolveInfo> resolveInfos =
+        context.getPackageManager().queryIntentServices(customTabIntent, 0);
+    return resolveInfos != null && !resolveInfos.isEmpty();
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/UpdateProgress.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/UpdateProgressImpl.java
similarity index 67%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/UpdateProgress.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/UpdateProgressImpl.java
index 64b907f591c..87d4fb79d14 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/UpdateProgress.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/UpdateProgressImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,19 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.auto.value.AutoValue;
+import com.google.firebase.appdistribution.UpdateProgress;
+import com.google.firebase.appdistribution.UpdateStatus;
 
 /** Represents a progress update or a final state from updating an app. */
 @AutoValue
-public abstract class UpdateProgress {
+abstract class UpdateProgressImpl implements UpdateProgress {
 
   @NonNull
-  static UpdateProgress.Builder builder() {
-    return new com.google.firebase.appdistribution.AutoValue_UpdateProgress.Builder();
+  static UpdateProgressImpl.Builder builder() {
+    return new AutoValue_UpdateProgressImpl.Builder();
   }
 
   /**
@@ -33,7 +35,7 @@ static UpdateProgress.Builder builder() {
    * @returns the number of bytes downloaded, or -1 if called when updating to an AAB or if no new
    *     release is available.
    */
-  @NonNull
+  @Override
   public abstract long getApkBytesDownloaded();
 
   /**
@@ -42,27 +44,28 @@ static UpdateProgress.Builder builder() {
    * @returns the file size in bytes, or -1 if called when updating to an AAB or if no new release
    *     is available.
    */
-  @NonNull
+  @Override
   public abstract long getApkFileTotalBytes();
 
   /** Returns the current {@link UpdateStatus} of the update. */
+  @Override
   @NonNull
   public abstract UpdateStatus getUpdateStatus();
 
-  /** Builder for {@link UpdateProgress}. */
+  /** Builder for {@link UpdateProgressImpl}. */
   @AutoValue.Builder
   abstract static class Builder {
 
     @NonNull
-    abstract UpdateProgress.Builder setApkBytesDownloaded(@NonNull long value);
+    abstract UpdateProgressImpl.Builder setApkBytesDownloaded(@NonNull long value);
 
     @NonNull
-    abstract UpdateProgress.Builder setApkFileTotalBytes(@NonNull long value);
+    abstract UpdateProgressImpl.Builder setApkFileTotalBytes(@NonNull long value);
 
     @NonNull
-    abstract UpdateProgress.Builder setUpdateStatus(@Nullable UpdateStatus value);
+    abstract UpdateProgressImpl.Builder setUpdateStatus(@Nullable UpdateStatus value);
 
     @NonNull
-    abstract UpdateProgress build();
+    abstract UpdateProgressImpl build();
   }
 }
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/UpdateTaskCache.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/UpdateTaskCache.java
new file mode 100644
index 00000000000..159a24a65a5
--- /dev/null
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/UpdateTaskCache.java
@@ -0,0 +1,130 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.UpdateProgress;
+import com.google.firebase.appdistribution.UpdateTask;
+import com.google.firebase.concurrent.FirebaseExecutors;
+import java.util.concurrent.Executor;
+
+/**
+ * A cache for an {@link UpdateTaskImpl}, for use in cases where we only ever want one active task
+ * at a time for a particular operation.
+ *
+ * <p>This is equivalent to {@link TaskCompletionSourceCache} but for UpdateTasks.
+ */
+class UpdateTaskCache {
+
+  /** A functional interface for a producer of a new {@link UpdateTaskImpl}. */
+  @FunctionalInterface
+  interface UpdateTaskProducer {
+
+    /** Produce a new {@link UpdateTaskImpl}. */
+    UpdateTaskImpl produce();
+  }
+
+  private UpdateTaskImpl cachedUpdateTaskImpl;
+  private final Executor sequentialExecutor;
+
+  /**
+   * Constructor for a {@link UpdateTaskCache} that controls access using its own sequential
+   * executor backed by the given base executor.
+   *
+   * @param baseExecutor Executor to back the sequential executor, including running any {@link
+   *     UpdateTaskProducer} passed to {@link #getOrCreateUpdateTask}.
+   */
+  UpdateTaskCache(Executor baseExecutor) {
+    sequentialExecutor = FirebaseExecutors.newSequentialExecutor(baseExecutor);
+  }
+
+  /**
+   * Gets a cached {@link UpdateTask}, if there is an ongoing one, or else calls the given {@code
+   * producer} to produce a new {@link UpdateTaskImpl} and caches the return value.
+   *
+   * <p>The producer's {@link UpdateTaskProducer#produce} method will be called on the sequential
+   * executor, to prevent the task from being updated while it's producing the new one.
+   */
+  UpdateTask getOrCreateUpdateTask(UpdateTaskProducer producer) {
+    UpdateTaskImpl impl = new UpdateTaskImpl();
+    sequentialExecutor.execute(
+        () -> {
+          if (cachedUpdateTaskImpl == null || cachedUpdateTaskImpl.isComplete()) {
+            cachedUpdateTaskImpl = producer.produce();
+          }
+          impl.shadow(cachedUpdateTaskImpl);
+        });
+    return impl;
+  }
+
+  /**
+   * Sets the progress on the cached {@link UpdateTaskImpl}, if there is one and it is not
+   * completed.
+   *
+   * <p>The task must be created using {@link #getOrCreateUpdateTask} before calling this method.
+   *
+   * @return A task that resolves when the change is applied, or fails with {@link
+   *     IllegalStateException} if the task was not created yet or was already completed.
+   */
+  Task<Void> setProgress(UpdateProgress progress) {
+    return executeIfOngoing(() -> cachedUpdateTaskImpl.updateProgress(progress));
+  }
+
+  /**
+   * Sets the result on the cached {@link UpdateTaskImpl}, if there is one and it is not completed.
+   *
+   * <p>The task must be created using {@link #getOrCreateUpdateTask} before calling this method.
+   *
+   * @return A task that resolves when the change is applied, or fails with {@link
+   *     IllegalStateException} if the task was not created yet or was already completed.
+   */
+  Task<Void> setResult() {
+    return executeIfOngoing(() -> cachedUpdateTaskImpl.setResult());
+  }
+
+  /**
+   * Sets the exception on the cached {@link UpdateTaskImpl}, if there is one and it is not
+   * completed.
+   *
+   * <p>The task must be created using {@link #getOrCreateUpdateTask} before calling this method.
+   *
+   * @return A task that resolves when the change is applied, or fails with {@link
+   *     IllegalStateException} if the task was not created yet or was already completed.
+   */
+  Task<Void> setException(FirebaseAppDistributionException e) {
+    return executeIfOngoing(() -> cachedUpdateTaskImpl.setException(e));
+  }
+
+  private Task<Void> executeIfOngoing(Runnable r) {
+    TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
+    sequentialExecutor.execute(
+        () -> {
+          if (cachedUpdateTaskImpl == null) {
+            taskCompletionSource.setException(
+                new IllegalStateException(
+                    "Tried to set exception before calling getOrCreateUpdateTask()"));
+          } else if (cachedUpdateTaskImpl.isComplete()) {
+            taskCompletionSource.setException(
+                new IllegalStateException("Tried to set exception on a completed task"));
+          } else {
+            r.run();
+            taskCompletionSource.setResult(null);
+          }
+        });
+    return taskCompletionSource.getTask();
+  }
+}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/UpdateTaskImpl.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/UpdateTaskImpl.java
similarity index 66%
rename from firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/UpdateTaskImpl.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/UpdateTaskImpl.java
index baf6743fecf..2267fff413e 100644
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/UpdateTaskImpl.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/UpdateTaskImpl.java
@@ -12,27 +12,36 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import android.app.Activity;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.OnCanceledListener;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.SuccessContinuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.TaskExecutors;
+import com.google.firebase.appdistribution.OnProgressListener;
+import com.google.firebase.appdistribution.UpdateProgress;
+import com.google.firebase.appdistribution.UpdateTask;
+import com.google.firebase.concurrent.FirebaseExecutors;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Executor;
 
 /** Implementation of UpdateTask, the return type of updateApp. */
 class UpdateTaskImpl extends UpdateTask {
+
   @Nullable
   @GuardedBy("lock")
-  private ManagedListener listener = null;
+  private List<ManagedListener> listeners = new ArrayList<>();
 
   private final Object lock = new Object();
   private final Object taskCompletionLock = new Object();
@@ -45,22 +54,36 @@ class UpdateTaskImpl extends UpdateTask {
 
   UpdateTaskImpl() {
     synchronized (taskCompletionLock) {
-      this.taskCompletionSource = new TaskCompletionSource<>();
+      taskCompletionSource = new TaskCompletionSource<>();
     }
   }
 
   void updateProgress(@NonNull UpdateProgress updateProgress) {
     synchronized (lock) {
       snapshot = updateProgress;
-      if (this.listener != null) {
-        this.listener.invoke(updateProgress);
+      for (ManagedListener listener : listeners) {
+        listener.invoke(updateProgress);
       }
     }
   }
 
+  /**
+   * Listen to all completion and progress events on the given {@link UpdateTask}, updating the
+   * progress or completing this task with the same changes.
+   */
+  void shadow(UpdateTask updateTask) {
+    // Using direct executor here ensures that any handlers that were themselves added using a
+    // direct executor will behave as expected: they'll be executed on the thread that sets the
+    // result or updates progress.
+    updateTask
+        .addOnProgressListener(FirebaseExecutors.directExecutor(), this::updateProgress)
+        .addOnSuccessListener(FirebaseExecutors.directExecutor(), unused -> setResult())
+        .addOnFailureListener(FirebaseExecutors.directExecutor(), this::setException);
+  }
+
   private Task<Void> getTask() {
-    synchronized (this.taskCompletionLock) {
-      return this.taskCompletionSource.getTask();
+    synchronized (taskCompletionLock) {
+      return taskCompletionSource.getTask();
     }
   }
 
@@ -76,9 +99,9 @@ public UpdateTask addOnProgressListener(
       @Nullable Executor executor, @NonNull OnProgressListener listener) {
     ManagedListener managedListener = new ManagedListener(executor, listener);
     synchronized (lock) {
-      this.listener = managedListener;
+      listeners.add(managedListener);
       if (snapshot != null) {
-        this.listener.invoke(snapshot);
+        managedListener.invoke(snapshot);
       }
     }
     return this;
@@ -198,16 +221,60 @@ public Task<Void> addOnCanceledListener(
     return getTask().addOnCanceledListener(activity, onCanceledListener);
   }
 
+  @NonNull
+  @Override
+  public <TContinuationResult> Task<TContinuationResult> continueWith(
+      @NonNull Continuation<Void, TContinuationResult> continuation) {
+    return getTask().continueWith(continuation);
+  }
+
+  @NonNull
+  @Override
+  public <TContinuationResult> Task<TContinuationResult> continueWith(
+      @NonNull Executor executor, @NonNull Continuation<Void, TContinuationResult> continuation) {
+    return getTask().continueWith(executor, continuation);
+  }
+
+  @NonNull
+  @Override
+  public <TContinuationResult> Task<TContinuationResult> continueWithTask(
+      @NonNull Continuation<Void, Task<TContinuationResult>> continuation) {
+    return getTask().continueWithTask(continuation);
+  }
+
+  @NonNull
+  @Override
+  public <TContinuationResult> Task<TContinuationResult> continueWithTask(
+      @NonNull Executor executor,
+      @NonNull Continuation<Void, Task<TContinuationResult>> continuation) {
+    return getTask().continueWithTask(executor, continuation);
+  }
+
+  @NonNull
+  @Override
+  public <TContinuationResult> Task<TContinuationResult> onSuccessTask(
+      @NonNull SuccessContinuation<Void, TContinuationResult> successContinuation) {
+    return getTask().onSuccessTask(successContinuation);
+  }
+
+  @NonNull
+  @Override
+  public <TContinuationResult> Task<TContinuationResult> onSuccessTask(
+      @NonNull Executor executor,
+      @NonNull SuccessContinuation<Void, TContinuationResult> successContinuation) {
+    return getTask().onSuccessTask(executor, successContinuation);
+  }
+
   @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
   public void setResult() {
 
     synchronized (lock) {
-      this.listener = null;
+      listeners.clear();
     }
 
     synchronized (taskCompletionLock) {
-      if (!this.taskCompletionSource.getTask().isComplete()) {
-        this.taskCompletionSource.setResult(null);
+      if (!taskCompletionSource.getTask().isComplete()) {
+        taskCompletionSource.setResult(null);
       }
     }
   }
@@ -216,12 +283,12 @@ public void setResult() {
   public void setException(@NonNull Exception exception) {
 
     synchronized (lock) {
-      this.listener = null;
+      listeners.clear();
     }
 
     synchronized (taskCompletionLock) {
-      if (!this.taskCompletionSource.getTask().isComplete()) {
-        this.taskCompletionSource.setException(exception);
+      if (!taskCompletionSource.getTask().isComplete()) {
+        taskCompletionSource.setException(exception);
       }
     }
   }
diff --git a/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/internal/package-info.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/package-info.java
similarity index 91%
rename from appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/internal/package-info.java
rename to firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/package-info.java
index fc32f4cc824..006df90ac2c 100644
--- a/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/internal/package-info.java
+++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/package-info.java
@@ -13,4 +13,4 @@
 // limitations under the License.
 
 /** @hide */
-package com.google.firebase.appcheck.safetynet.internal;
+package com.google.firebase.appdistribution.impl;
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/LogWrapper.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/LogWrapper.java
deleted file mode 100644
index 966095a3110..00000000000
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/LogWrapper.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution.internal;
-
-import android.util.Log;
-import androidx.annotation.NonNull;
-
-/** Wrapper that handles Android logcat logging. */
-public class LogWrapper {
-
-  private static final String LOG_TAG = "FirebaseAppDistribution";
-  private static LogWrapper instance;
-
-  @NonNull
-  public static synchronized LogWrapper getInstance() {
-    if (instance == null) {
-      instance = new LogWrapper();
-    }
-
-    return instance;
-  }
-
-  public void d(@NonNull String msg) {
-    Log.d(LOG_TAG, msg);
-  }
-
-  public void v(@NonNull String msg) {
-    Log.v(LOG_TAG, msg);
-  }
-
-  public void i(@NonNull String msg) {
-    Log.i(LOG_TAG, msg);
-  }
-
-  public void w(@NonNull String msg) {
-    Log.w(LOG_TAG, msg);
-  }
-
-  public void w(@NonNull String msg, @NonNull Throwable tr) {
-    Log.w(LOG_TAG, msg, tr);
-  }
-
-  public void e(@NonNull String msg) {
-    Log.e(LOG_TAG, msg);
-  }
-
-  public void e(@NonNull String msg, @NonNull Throwable tr) {
-    Log.e(LOG_TAG, msg, tr);
-  }
-
-  private LogWrapper() {}
-}
diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/SignInStorage.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/SignInStorage.java
deleted file mode 100644
index 7a4e4a73119..00000000000
--- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/internal/SignInStorage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution.internal;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-/** Class that handles storage for App Distribution SignIn persistence. */
-public class SignInStorage {
-
-  private static final String SIGNIN_PREFERENCES_NAME = "FirebaseAppDistributionSignInStorage";
-  private static final String SIGNIN_TAG = "firebase_app_distribution_signin";
-
-  private final SharedPreferences signInSharedPreferences;
-
-  public SignInStorage(Context applicationContext) {
-    this.signInSharedPreferences =
-        applicationContext.getSharedPreferences(SIGNIN_PREFERENCES_NAME, Context.MODE_PRIVATE);
-  }
-
-  public void setSignInStatus(boolean testerSignedIn) {
-    this.signInSharedPreferences.edit().putBoolean(SIGNIN_TAG, testerSignedIn).apply();
-  }
-
-  public boolean getSignInStatus() {
-    return signInSharedPreferences.getBoolean(SIGNIN_TAG, false);
-  }
-}
diff --git a/firebase-appdistribution/src/main/res/drawable-anydpi-v24/ic_rate_review.xml b/firebase-appdistribution/src/main/res/drawable-anydpi-v24/ic_rate_review.xml
new file mode 100644
index 00000000000..f7ce71154b5
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/drawable-anydpi-v24/ic_rate_review.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.92"
+      android:scaleY="0.92"
+      android:translateX="0.96"
+      android:translateY="0.96">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,14v-2.47l6.88,-6.88c0.2,-0.2 0.51,-0.2 0.71,0l1.77,1.77c0.2,0.2 0.2,0.51 0,0.71L8.47,14L6,14zM18,14h-7.5l2,-2L18,12v2z"/>
+  </group>
+</vector>
diff --git a/firebase-appdistribution/src/main/res/drawable-hdpi/ic_rate_review.png b/firebase-appdistribution/src/main/res/drawable-hdpi/ic_rate_review.png
new file mode 100644
index 00000000000..c463d65d665
Binary files /dev/null and b/firebase-appdistribution/src/main/res/drawable-hdpi/ic_rate_review.png differ
diff --git a/firebase-appdistribution/src/main/res/drawable-mdpi/ic_rate_review.png b/firebase-appdistribution/src/main/res/drawable-mdpi/ic_rate_review.png
new file mode 100644
index 00000000000..b649099a49f
Binary files /dev/null and b/firebase-appdistribution/src/main/res/drawable-mdpi/ic_rate_review.png differ
diff --git a/firebase-appdistribution/src/main/res/drawable-xhdpi/ic_rate_review.png b/firebase-appdistribution/src/main/res/drawable-xhdpi/ic_rate_review.png
new file mode 100644
index 00000000000..19350f9be93
Binary files /dev/null and b/firebase-appdistribution/src/main/res/drawable-xhdpi/ic_rate_review.png differ
diff --git a/firebase-appdistribution/src/main/res/drawable-xxhdpi/ic_rate_review.png b/firebase-appdistribution/src/main/res/drawable-xxhdpi/ic_rate_review.png
new file mode 100644
index 00000000000..edbeba392a4
Binary files /dev/null and b/firebase-appdistribution/src/main/res/drawable-xxhdpi/ic_rate_review.png differ
diff --git a/firebase-appdistribution/src/main/res/drawable/btn_disabled_stroked.xml b/firebase-appdistribution/src/main/res/drawable/btn_disabled_stroked.xml
new file mode 100644
index 00000000000..cbb21ffadb8
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/drawable/btn_disabled_stroked.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#0D000000" />
+    <corners android:radius="8dp"/>
+    <stroke android:width="1dp" android:color="#0F000000" />
+</shape>
\ No newline at end of file
diff --git a/firebase-appdistribution/src/main/res/drawable/btn_stroked.xml b/firebase-appdistribution/src/main/res/drawable/btn_stroked.xml
new file mode 100644
index 00000000000..6f42cd30ab7
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/drawable/btn_stroked.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#00000000"/>
+    <corners android:radius="8dp"/>
+    <stroke android:width="1dp" android:color="#1A000000" />
+</shape>
\ No newline at end of file
diff --git a/firebase-appdistribution/src/main/res/drawable/btn_stroked_background.xml b/firebase-appdistribution/src/main/res/drawable/btn_stroked_background.xml
new file mode 100644
index 00000000000..7f5b30e6fac
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/drawable/btn_stroked_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Drawable state list for background of basic button -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- disabled button background -->
+    <item android:state_enabled="false" android:drawable="@drawable/btn_disabled_stroked" />
+    <!-- default button background -->
+    <item android:drawable="@drawable/btn_stroked" />
+</selector>
\ No newline at end of file
diff --git a/firebase-appdistribution/src/main/res/drawable/card_background.xml b/firebase-appdistribution/src/main/res/drawable/card_background.xml
new file mode 100644
index 00000000000..f6b94ad7dbb
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/drawable/card_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="8dp"/>
+    <padding android:left="10dp" android:right="10dp" android:top="10dp" android:bottom="10dp"/>
+    <stroke android:width="1dp" android:color="#CCCCCC"/>
+</shape>
diff --git a/firebase-appdistribution/src/main/res/drawable/ic_baseline_arrow_back_24.xml b/firebase-appdistribution/src/main/res/drawable/ic_baseline_arrow_back_24.xml
new file mode 100644
index 00000000000..8452791cfd2
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/drawable/ic_baseline_arrow_back_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/firebase-appdistribution/src/main/res/drawable/ic_baseline_send_24.xml b/firebase-appdistribution/src/main/res/drawable/ic_baseline_send_24.xml
new file mode 100644
index 00000000000..3abc6cb33be
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/drawable/ic_baseline_send_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+</vector>
diff --git a/firebase-appdistribution/src/main/res/layout/activity_feedback.xml b/firebase-appdistribution/src/main/res/layout/activity_feedback.xml
new file mode 100644
index 00000000000..0bc52ba13ec
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/layout/activity_feedback.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".FeedbackActivity"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="16dp">
+
+        <ImageButton
+            android:id="@+id/backButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="0"
+            android:background="@null"
+            android:contentDescription="@string/back_button_description"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
+            app:srcCompat="@drawable/ic_baseline_arrow_back_24" />
+
+        <TextView
+            android:id="@+id/sendFeedbackText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:layout_marginStart="16dp"
+            android:layout_marginLeft="16dp"
+            android:text="@string/send_feedback"
+            android:textSize="24sp" />
+
+        <ImageButton
+            android:id="@+id/sendButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="0"
+            android:background="@null"
+            android:contentDescription="@string/send_button_description"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
+            app:srcCompat="@drawable/ic_baseline_send_24" />
+
+        <ProgressBar
+            android:id="@+id/sendSpinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="0"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
+            android:visibility="gone"/>
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/topDivider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_weight="0"
+        android:background="?android:attr/listDivider" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="3"
+        android:padding="16dp" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <EditText
+                android:id="@+id/feedbackText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:background="@null"
+                android:gravity="start"
+                android:hint="@string/feedback_text_hint"
+                android:inputType="textMultiLine"
+                android:minLines="5"
+                android:singleLine="false"
+                android:textAlignment="textStart"
+                android:paddingBottom="24dp"
+                tools:ignore="InefficientWeight,TextContrastCheck" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/card_background"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <CheckBox
+                        android:id="@+id/screenshotCheckBox"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentLeft="true"
+                        android:text="@string/screenshot" />
+                    <Button
+                        style="@style/FeedbackTheme.Button.Stroked"
+                        android:id="@+id/chooseScreenshotButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
+                        android:text="Gallery"/>
+                </RelativeLayout>
+
+                <ImageView
+                    android:id="@+id/screenshotImageView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:adjustViewBounds="true"
+                    android:contentDescription="@string/screenshot_image_description"/>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+    <View
+        android:id="@+id/bottomDivider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/listDivider" />
+
+    <TextView
+        android:id="@+id/additionalFormText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:padding="16dp" />
+
+</LinearLayout>
diff --git a/firebase-appdistribution/src/main/res/values-b+es+419/strings.xml b/firebase-appdistribution/src/main/res/values-b+es+419/strings.xml
new file mode 100644
index 00000000000..406727d402d
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-b+es+419/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Habilita funciones de prueba</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Habilita funciones de prueba como alertas de compilaciones nuevas y comentarios en la app.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Habilitar</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Ahora no</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Hay una nueva versión disponible</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">La versión %1$s (%2$d) está disponible.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Notas de la versión:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Actualización</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Cancelar</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Descargando actualización en la app…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Descarga completa</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Falló la descarga</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Error de instalación</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">Actualizaciones de la app</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Muestra el progreso de las actualizaciones en la app</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">No se pudo proporcionar el comentario</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">No se encontró la versión. Es posible que esta app no haya sido instalada por App Distribution o que ya no tengas acceso a ella.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Habría enviado comentarios, pero no lo hizo debido al modo de desarrollador.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Comentarios</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Muestra una notificación para ingresar comentarios sobre la app</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">Deseamos obtener tus comentarios.</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Presiona para ingresar comentarios sobre %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Instalación de fuentes desconocidas</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Para instalar la actualización, habilita la instalación de fuentes desconocidas</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Configuración</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Atrás</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Enviar comentarios</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Enviar</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">¿Tienes comentarios? Dinos cómo podemos mejorar esta app.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Captura de pantalla</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Captura de pantalla (no disponible)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Imagen de la captura de pantalla</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-de/strings.xml b/firebase-appdistribution/src/main/res/values-de/strings.xml
new file mode 100644
index 00000000000..4e62a310193
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-de/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Testing-Funktionen aktivieren</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Aktivieren Sie Testing-Funktionen wie Benachrichtigungen zu neuen Builds und In-App-Feedback.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Aktivieren</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Später</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Neue Version verfügbar</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">Version %1$s (%2$d) ist verfügbar.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Versionshinweise:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Aktualisieren</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Abbrechen</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">In-App-Update wird heruntergeladen…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Herunterladen abgeschlossen</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Download fehlgeschlagen</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Installation fehlgeschlagen</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App-Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">App-Updates</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Zeigt den Fortschritt von In-App-Updates an</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Feedback-Funktion konnte nicht gestartet werden</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Release nicht gefunden. Diese App wurde möglicherweise nicht mit Firebase App-Distribution installiert oder Sie haben keinen Zugriff mehr darauf.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Das Feedback konnte nicht gesendet werden, da der Entwicklungsmodus aktiviert ist.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Feedback</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Zeigt Benachrichtigung an, Feedback zur App einzugeben</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">Ihre Meinung ist uns wichtig.</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Tippen, um Feedback zu %1$s einzugeben</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Installation aus unbekannten Quellen</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Zum Installieren des Updates müssen Sie die Installation aus unbekannten Quellen aktivieren</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Einstellungen</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Zurück</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Feedback geben</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Senden</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Sie möchten Feedback geben? Teilen Sie uns mit, wie wir diese App besser machen können.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Screenshot</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Screenshot (nicht verfügbar)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Screenshot</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-en-rGB/strings.xml b/firebase-appdistribution/src/main/res/values-en-rGB/strings.xml
new file mode 100644
index 00000000000..fb76b57a5a1
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-en-rGB/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Enable testing features</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Enable testing features like new build alerts and in-app feedback.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Enable</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Not now</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">New version available</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">Version %1$s (%2$d) is available.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Release notes:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Update</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Cancel</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Downloading in-app update…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Download complete</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Download failed</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Install failed</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">App updates</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Shows progress of in-app updates</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Failed to launch feedback</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Release not found. This app may not have been installed by App Distribution, or you may no longer have access.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Would have sent feedback, but did not due to development mode.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Feedback</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Shows notification to enter feedback about app</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">We want your feedback!</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Tap to enter feedback for %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Installation from unknown sources</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">To install the update, enable installation from unknown sources</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Settings</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Back</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Send feedback</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Send</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Have feedback? Let us know how we can make this app better.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Screenshot</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Screenshot (not available)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Screenshot image</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-es/strings.xml b/firebase-appdistribution/src/main/res/values-es/strings.xml
new file mode 100644
index 00000000000..a693d3a22f4
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-es/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Habilitar funciones de prueba</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Habilita las funciones de prueba, como las alertas de compilación nueva y las sugerencias en la aplicación.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Habilitar</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Ahora no</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Nueva versión disponible</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">La versión %1$s (%2$d) está disponible.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Notas de la versión:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Actualizar</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Cancelar</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Descargando actualización en la aplicación…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Descarga completada</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Descarga fallida</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Instalación fallida</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">Actualizaciones de la aplicación</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Muestra el progreso de las actualizaciones en la aplicación</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">No se ha podido lanzar la sugerencia</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Versión no encontrada. Es posible que esta aplicación no se haya instalado con App Distribution o que ya no tengas acceso a ella.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">No se enviaron sugerencias debido al modo de desarrollo.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Sugerencias</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Muestra una notificación para aportar sugerencias sobre la aplicación</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">¡Queremos conocer tu opinión!</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Toca para introducir sugerencias sobre %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Instalación desde fuentes desconocidas</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Para instalar la actualización, habilita la función para instalar contenido desde fuentes desconocidas</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Ajustes</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Atrás</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Enviar sugerencias</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Enviar</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">¿Tienes alguna sugerencia? Nos encantaría que nos indicaras cómo podemos mejorar esta aplicación.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Captura de pantalla</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Captura de pantalla (no disponible)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Imagen de captura de pantalla</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-fr/strings.xml b/firebase-appdistribution/src/main/res/values-fr/strings.xml
new file mode 100644
index 00000000000..075d1d177a6
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-fr/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Activez les fonctionnalités de test</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Activez les fonctionnalités de test comme les alertes de nouvelle version et les commentaires dans l\'application.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Activer</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Pas maintenant</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Nouvelle version disponible</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">La version %1$s (%2$d) est disponible.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Notes de version :</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Mettre à jour</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Annuler</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Téléchargement de la mise à jour dans l\'application…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Téléchargement terminé</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Échec du téléchargement</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Échec de l\'installation</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">Mises à jour de l\'application</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Affiche la progression des mises à jour dans l\'application</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Échec du lancement des commentaires</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Version introuvable. Cette application n\'a peut-être pas été installée par App Distribution, ou vous n\'y avez peut-être plus accès.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">J\'aurais envoyé des commentaires, mais je ne l\'ai pas fait à cause du mode de développement.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Commentaires</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Affiche une notification pour saisir des commentaires à propos de l\'application</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">Votre avis nous intéresse !</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Appuyez pour saisir des commentaires sur %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Installation à partir de sources inconnues</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Pour installer la mise à jour, activez l\'installation à partir de sources inconnues</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Paramètres</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Retour</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Envoyer des commentaires</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Envoyer</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Des commentaires ? Aidez-nous à améliorer cette application.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Capture d\'écran</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Capture d\'écran (non disponible)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Image de capture d\'écran</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-hi/strings.xml b/firebase-appdistribution/src/main/res/values-hi/strings.xml
new file mode 100644
index 00000000000..93f24b46090
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-hi/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">जांच करने की सुविधाएं चालू करना</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">बिल्ड की नई चेतावनियां और ऐप्लिकेशन के बारे में सुझाव, राय या शिकायत जैसी जांच करने की सुविधाएं चालू करना.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">चालू करें</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">अभी नहीं</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">नया वर्शन उपलब्ध है</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">%1$s (%2$d) वर्शन उपलब्ध है.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">प्रॉडक्ट की जानकारी:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">अपडेट करें</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">रद्द करें</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">ऐप्लिकेशन का अपडेट डाउनलोड हो रहा है…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">डाउनलोड हो गया</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">डाउनलोड नहीं हो सका</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">इंस्टॉल नहीं हो सका</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">ऐप्लिकेशन के अपडेट</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">ऐप्लिकेशन के अपडेट की प्रोग्रेस दिखाता है</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">राय, सुझाव या शिकायत लॉन्च नहीं हो सकी</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">रिलीज़ नहीं मिली. इस ऐप्लिकेशन को शायद App Distribution की मदद से इंस्टॉल नहीं किया गया है या फिर आपके पास इसका ऐक्सेस नहीं है.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">राय, सुझाव या शिकायत भेजी गई होती, लेकिन डेवलपमेंट मोड की वजह से ऐसा नहीं हो पाया.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">राय, सुझाव या शिकायत</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">ऐप्लिकेशन के बारे में राय, सुझाव या शिकायत भेजने पर सूचना दिखाता है</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">हमें आपकी राय, सुझाव या शिकायत का इंतज़ार है!</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">%1$s के बारे में राय, सुझाव या शिकायत भेजने के लिए टैप करें</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">अज्ञात सोर्स से इंस्टॉल किया गया</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">अपडेट इंस्टॉल करने के लिए, अज्ञात सोर्स से इंस्टॉल करने की सुविधा चालू करें</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">सेटिंग</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">वापस जाएं</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">सुझाव, राय या शिकायत भेजें</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">भेजें</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">क्या आपको कोई राय, सुझाव या शिकायत भेजनी है? हमें बताएं कि इस ऐप्लिकेशन को हम और किस तरह बेहतर बना सकते हैं.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">स्क्रीनशॉट</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">स्क्रीनशॉट (उपलब्ध नहीं है)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">स्क्रीनशॉट की इमेज</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-in/strings.xml b/firebase-appdistribution/src/main/res/values-in/strings.xml
new file mode 100644
index 00000000000..88e0329f441
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-in/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Aktifkan fitur pengujian</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Aktifkan fitur pengujian seperti pemberitahuan build baru dan masukan dalam aplikasi.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Aktifkan</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Lain kali</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Tersedia versi baru</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">Versi %1$s (%2$d) tersedia.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Catatan rilis:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Perbarui</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Batal</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Mendownload update dalam aplikasi…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Download selesai</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Download gagal</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Penginstalan gagal</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">Update aplikasi</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Menampilkan progres update dalam aplikasi</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Gagal meluncurkan masukan</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Rilis tidak ditemukan. Aplikasi ini mungkin belum diinstal oleh App Distribution, atau Anda mungkin tidak lagi memiliki akses.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Masukan akan dikirimkan, tetapi tidak jadi karena adanya mode pengembangan.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Masukan</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Menampilkan notifikasi untuk memasukkan masukan tentang aplikasi</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">Kami ingin masukan dari Anda</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Ketuk untuk memasukkan masukan untuk %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Penginstalan dari Sumber yang tidak dikenal</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Untuk menginstal update, aktifkan penginstalan dari sumber tidak dikenal</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Setelan</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Kembali</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Kirim masukan</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Kirim</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Ada masukan? Beri tahu kami bagaimana kami dapat membuat aplikasi ini lebih baik.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Screenshot</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Screenshot (tidak tersedia)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Gambar screenshot</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-it/strings.xml b/firebase-appdistribution/src/main/res/values-it/strings.xml
new file mode 100644
index 00000000000..e95ecb854ed
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-it/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Abilita le funzionalità di test</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Abilita funzionalità di test come avvisi di nuove build e feedback in-app.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Abilita</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Non ora</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Nuova versione disponibile</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">La versione %1$s (%2$d) è disponibile.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Note di rilascio:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Aggiorna</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Annulla</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Download dell\'aggiornamento in-app…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Download completato</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Download non riuscito</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Installazione non riuscita</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">Aggiornamenti delle app</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Mostra l\'avanzamento degli aggiornamenti in-app</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Impossibile avviare il feedback</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Release non trovata. Quest\'app potrebbe non essere stata installata da App Distribution o potresti non avere più accesso.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Avrebbe inviato feedback, ma non lo ha fatto a causa della modalità di sviluppo.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Feedback</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Mostra la notifica per inserire feedback sull\'app</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">Vorremmo sapere cosa ne pensi.</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Tocca per inserire il feedback for %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Installazione da origini sconosciute</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Per installare l\'aggiornamento, abilita l\'installazione da origini sconosciute</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Impostazioni</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Indietro</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Invia feedback</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Invia</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Vuoi lasciare un feedback? Facci sapere come possiamo migliorare questa app.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Screenshot</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Screenshot non disponibile</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Immagine screenshot</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-iw/strings.xml b/firebase-appdistribution/src/main/res/values-iw/strings.xml
new file mode 100644
index 00000000000..3ec7ddadacd
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-iw/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">הפעלת תכונות בדיקה</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">הפעלת תכונות בדיקה כמו התראות על גרסאות build חדשות ומשוב בתוך האפליקציה.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">הפעלה</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">לא עכשיו</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">גרסה חדשה זמינה</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">גרסה %1$s‏ (%2$d) זמינה.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">נתוני גרסה:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">עדכון</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">ביטול</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">מתבצעת הורדה של עדכון בתוך האפליקציה…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">ההורדה הושלמה</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">ההורדה נכשלה</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">ההתקנה נכשלה</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">הפצת אפליקציות ב-Firebase</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">עדכונים לאפליקציה</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">מוצגת ההתקדמות בהתקנה של העדכונים בתוך האפליקציה</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">הפעלת המשוב נכשלה</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">הגרסה לא נמצאה. ייתכן שהאפליקציה הזו לא הותקנה על ידי התכונה \'הפצת אפליקציות\', או שאין לך גישה יותר.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">המשוב היה נשלח, אבל הוא לא נשלח עקב מצב פיתוח.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">משוב</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">מוצגת התראה להזין משוב על האפליקציה</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">נשמח לקבל ממך משוב!</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">יש להקיש כדי להזין משוב על %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">התקנה ממקורות לא מוכרים</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">כדי להתקין את העדכון, צריך לאפשר התקנה ממקורות לא מוכרים</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">הגדרות</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">חזרה</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">שליחת משוב</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">שליחה</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">רוצה לשלוח לנו משוב? נשמח לשמוע איך נוכל לשפר את האפליקציה.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">צילום מסך</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">צילום מסך (לא זמין)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">צילום מסך</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-ja/strings.xml b/firebase-appdistribution/src/main/res/values-ja/strings.xml
new file mode 100644
index 00000000000..9bc2bc2462d
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-ja/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">テスト機能の有効化</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">新しいビルドのアラートやアプリ内フィードバックなどのテスト機能を有効にします。</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">有効にする</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">後で行う</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">新しいバージョンが利用可能</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">バージョン %1$s（%2$d）が利用可能です。</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">リリースノート: </string>
+  <string name="update_yes_button" translation_description="Text on button to start update">更新</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">キャンセル</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">アプリ内アップデートをダウンロードしています…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">ダウンロードが完了しました</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">ダウンロードが失敗しました</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">インストールに失敗しました</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">アプリのアップデート</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">アプリ内アップデートの進行状況を表示します</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">フィードバックを開始できませんでした</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">リリースが見つかりませんでした。このアプリは App Distribution によってインストールされていないか、アクセスできなくなっている可能性があります。</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">開発モードのためフィードバックが送信されませんでした。</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">フィードバック</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">アプリに関するフィードバックを入力するための通知を表示します</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">フィードバックをお寄せください</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">タップして %1$s のフィードバックを入力</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">提供元不明のアプリのインストール</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">アップデートをインストールするには、提供元不明のアプリのインストールを有効にしてください</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">設定</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">戻る</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">フィードバックを送信</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">送信</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">アプリ改善のために役立つフィードバックがありましたら、お知らせください。</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">スクリーンショット</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">スクリーンショット（利用不可）</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">スクリーンショット画像</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-ko/strings.xml b/firebase-appdistribution/src/main/res/values-ko/strings.xml
new file mode 100644
index 00000000000..b6abf22b734
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-ko/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">테스팅 기능 사용</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">새 빌드 알림, 인앱 의견 보내기와 같은 테스팅 기능을 사용 설정합니다.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">사용 설정</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">지금은 아님</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">새 버전 사용 가능</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">%1$s 버전(%2$d)을 사용할 수 있습니다.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">출시 노트:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">업데이트</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">취소</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">인앱 업데이트 다운로드 중…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">다운로드가 완료되었습니다.</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">다운로드 실패</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">설치 실패</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase 앱 배포</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">앱 업데이트</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">인앱 업데이트 진행 진행률 표시</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">의견 보내기를 실행할 수 없음</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">출시 버전을 찾을 수 없습니다. 이 앱은 앱 배포를 통해 설치되지 않았거나 더 이상 액세스할 수 없습니다.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">의견을 보냈지만 개발 모드이기 때문에 전송되지 않았습니다.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">의견 보내기</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">앱에 대한 의견을 입력할 수 있도록 알림을 표시</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">여러분의 의견을 기다립니다.</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">탭하여 %1$s 버전에 대한 의견 입력하기</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">알 수 없는 출처의 설치</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">업데이트를 설치하려면 알 수 없는 출처의 설치를 허용하세요</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">설정</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">뒤로</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">의견 보내기</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">보내기</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">의견이 있으신가요? 이 앱을 개선할 방법을 알려주세요.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">스크린샷</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">스크린샷(사용할 수 없음)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">스크린샷 이미지</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-nl/strings.xml b/firebase-appdistribution/src/main/res/values-nl/strings.xml
new file mode 100644
index 00000000000..92254c5daee
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-nl/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Testfuncties aanzetten</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Zet testfuncties aan, zoals meldingen over nieuwe builds en feedback vanuit de app.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Aanzetten</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Niet nu</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Nieuwe versie beschikbaar</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">Versie %1$s (%2$d) is beschikbaar.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Release-opmerkingen:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Updaten</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Annuleren</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">In-app update downloaden…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Downloaden is voltooid</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Downloaden is mislukt</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Installatie is mislukt</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">App-updates</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Hier staat de voortgang van in-app updates</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Feedbackfunctie kan niet worden gestart</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Release is niet gevonden. Deze app is misschien niet geïnstalleerd door App Distribution of u heeft misschien geen toegang meer.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Er is geen feedback gestuurd omdat u in de ontwikkelaarsmodus werkt.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Feedback</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Geeft een melding weer om feedback over de app te geven</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">We zijn benieuwd naar uw feedback.</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Tik om feedback te geven over %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Installatie vanaf onbekende bronnen</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Als u de update wilt installeren, moet u installatie vanaf onbekende bronnen aanzetten</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Instellingen</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Terug</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Feedback sturen</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Sturen</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Heeft u feedback? Vertel ons dan hoe we deze app beter kunnen maken.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Screenshot</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Screenshot (niet beschikbaar)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Screenshotafbeelding</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-pl/strings.xml b/firebase-appdistribution/src/main/res/values-pl/strings.xml
new file mode 100644
index 00000000000..ec07d74993f
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-pl/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Włącz funkcje testów</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Włącz funkcje testów takie jak alerty o nowych kompilacjach i przesyłanie opinii w aplikacji.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Włącz</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Nie teraz</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Dostępna jest nowa wersja</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">Wersja %1$s (%2$d) jest dostępna.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Informacje o wersji:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Zaktualizuj</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Anuluj</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Pobieram aktualizację w aplikacji…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Pobieranie zakończone</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Nie udało się pobrać</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Nie udało się zainstalować</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Rozpowszechnianie aplikacji przez Firebase</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">Aktualizacje aplikacji</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Pokazuje postęp aktualizacji w aplikacji</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Nie udało się uruchomić opinii</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Nie znaleziono wersji Ta aplikacja mogła nie zostać zainstalowana przez Rozpowszechnianie aplikacji lub nie masz już dostępu.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Nie udało się przesłać opinii ze względu na tryb deweloperski.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Prześlij opinię</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Wyświetla powiadomienie z prośbą o napisanie opinii o aplikacji</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">Chętnie poznamy Twoje zdanie.</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Kliknij, aby przesłać opinię na temat %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Instalacja z nieznanych źródeł</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Aby zainstalować aktualizację, zezwól na instalację z nieznanych źródeł</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Ustawienia</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Wstecz</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Prześlij opinię</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Wyślij</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Chcesz przekazać nam opinię? Podpowiedz nam, jak możemy poprawić tę aplikację.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Zrzut ekranu</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Zrzut ekranu nie jest dostępny</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Obraz ze zrzutem ekranu</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-pt-rBR/strings.xml b/firebase-appdistribution/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 00000000000..ab353e7f86a
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Ativar testes de recursos</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Participe de testes de recursos como alertas de novos builds e feedback no app.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Ativar</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Agora não</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Nova versão disponível</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">A versão %1$s (%2$d) está disponível.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Notas da versão:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Atualizar</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Cancelar</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Fazendo o download da atualização no app…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Download concluído</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Falha no download</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Falha na instalação</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">Atualizações do app</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Mostra o progresso das atualizações no app</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Falha no envio do feedback</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Versão não encontrada. É possível que o aplicativo não tenha sido instalado pelo App Distribution ou não esteja mais acessível.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Não enviamos feedback devido ao modo de desenvolvimento.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Feedback</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Mostra a notificação para inserir feedback sobre o app</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">Envie seu feedback!</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Toque para inserir feedback sobre o %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Instalação de fontes desconhecidas</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Ative essa opção para instalar a atualização</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Configurações</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Voltar</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Enviar feedback</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Enviar</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Quer enviar feedback? Conte como podemos melhorar o app.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Captura de tela</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Captura de tela (indisponível)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Imagem da captura de tela</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-ru/strings.xml b/firebase-appdistribution/src/main/res/values-ru/strings.xml
new file mode 100644
index 00000000000..703887c8a0c
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-ru/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Включить функции тестирования</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Включить функции тестирования, например уведомления о новых сборках и обратную связь в приложении.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Включить</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Не сейчас</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Доступна новая версия</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">Доступна версия приложения &quot;%1$s&quot; (%2$d).</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Примечания к выпуску:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Обновить</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Отмена</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Скачивание обновления…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Скачивание завершено</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Ошибка скачивания</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Ошибка установки</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">Обновления приложения</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Показывает прогресс при обновлении приложения</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Не удалось перейти к разделу обратной связи</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Выпуск не найден. Возможно, это приложение не было установлено через App Distribution, или у вас больше нет доступа.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Отзыв не был отправлен из-за режима разработчика.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Обратная связь</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Уведомление с просьбой оставить отзыв о приложении</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">Поделитесь своим мнением!</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Нажмите здесь, чтобы оставить обратную связь о приложении &quot;%1$s&quot;</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Установка из неизвестных источников</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Чтобы установить обновление, разрешите установку из неизвестных источников</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Настройки</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Назад</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Отправить отзыв</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Отправить</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Хотите поделиться с нами своим мнением? Расскажите, как сделать приложение лучше.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Скриншот</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Скриншот (недоступен)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Скриншот</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-th/strings.xml b/firebase-appdistribution/src/main/res/values-th/strings.xml
new file mode 100644
index 00000000000..f34598dfe84
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-th/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">เปิดใช้ฟีเจอร์การทดสอบ</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">เปิดใช้ฟีเจอร์การทดสอบ เช่น การแจ้งเตือนเกี่ยวกับเวอร์ชันใหม่และความคิดเห็นในแอป</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">เปิดใช้</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">ไว้ทีหลัง</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">มีเวอร์ชันใหม่พร้อมใช้งาน</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">เวอร์ชัน %1$s (%2$d) พร้อมใช้งานแล้ว</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">บันทึกประจำรุ่น:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">อัปเดต</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">ยกเลิก</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">กำลังดาวน์โหลดการอัปเดตในแอป…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">ดาวน์โหลดเรียบร้อย</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">ดาวน์โหลดไม่สำเร็จ</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">ติดตั้งไม่สำเร็จ</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">การอัปเดตแอป</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">แสดงความคืบหน้าของการอัปเดตในแอป</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">เปิดใช้งานความคิดเห็นไม่สำเร็จ</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">ไม่พบรุ่น แอปนี้อาจไม่ได้รับการติดตั้งโดย App Distribution หรือคุณอาจไม่มีสิทธิ์เข้าถึงแล้ว</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">ระบบอาจส่งความคิดเห็นแล้ว แต่อาจไม่ได้ใช้โหมดการพัฒนาซอฟต์แวร์</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">ความคิดเห็น</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">แสดงการแจ้งเตือนเพื่อป้อนความคิดเห็นเกี่ยวกับแอป</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">เราอยากฟังความคิดเห็นจากคุณ</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">แตะเพื่อป้อนความคิดเห็นสำหรับ %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">การติดตั้งจากแหล่งที่มาที่ไม่รู้จัก</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">หากต้องการติดตั้งการอัปเดต ให้เปิดใช้การติดตั้งจากแหล่งที่มาที่ไม่รู้จัก</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">การตั้งค่า</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">กลับ</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">ส่งความคิดเห็น</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">ส่ง</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">หากคุณมีความคิดเห็น โปรดแจ้งให้เราทราบว่าควรปรับปรุงแอปนี้ให้ดีขึ้นอย่างไร</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">ภาพหน้าจอ</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">ภาพหน้าจอ (ไม่มี)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">ภาพหน้าจอ</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-tr/strings.xml b/firebase-appdistribution/src/main/res/values-tr/strings.xml
new file mode 100644
index 00000000000..ed1bd52219a
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-tr/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Test edilen özellikleri etkinleştirin</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Yeni derleme uyarıları ve uygulama içi geri bildirim gibi test edilen özellikleri etkinleştirin.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Etkinleştir</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Şimdi değil</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Yeni sürüm mevcut.</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">Sürüm %1$s (%2$d) mevcut.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Sürüm notları:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Güncelle</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">İptal</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Uygulama içi güncelleme indiriliyor…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">İndirme işlemi tamamlandı.</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">İndirme başarısız oldu.</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Yükleme başarısız oldu.</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">Uygulama güncellemeleri</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Uygulama içi güncellemelerin ilerleme durumunu gösterir.</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Geri bildirim başlatılamadı.</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Sürüm bulunamadı. Bu uygulama App Distribution tarafından yüklenmemiş olabilir ya da artık erişiminiz olmayabilir.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Normalde geri bildirim gönderilir ancak geliştirici modunda olduğunuz için geri bildirim gönderilmedi.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Geri bildirim</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Uygulamayla ilgili geri bildirim girilecek bildirimi gösterir.</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">Geri bildirimlerinizi bizimle paylaşın.</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">%1$s hakkında geri bildirim göndermek için buraya dokunun.</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Bilinmeyen kaynaklardan yükleme</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Güncellemeyi yüklemek için bilinmeyen kaynaklardan yüklemeye izin verin.</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Ayarlar</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Geri</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Geri bildirim gönder</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Gönder</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Geri bildirim vermek ister misiniz? Bu uygulamayı nasıl geliştirebileceğimizle ilgili fikirlerinizi paylaşın.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Ekran görüntüsü</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Ekran görüntüsü (mevcut değil)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Ekran görüntüsü resmi</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-uk/strings.xml b/firebase-appdistribution/src/main/res/values-uk/strings.xml
new file mode 100644
index 00000000000..b7a5df0b964
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-uk/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Увімкнути функції тестування</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Увімкніть такі функції тестування, як створення нових сповіщень і відгуків у додатку.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Увімкнути</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Не зараз</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Доступна нова версія</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">Доступна версія %1$s (%2$d).</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Примітки до випуску</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Оновити</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Скасувати</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Завантаження оновлень додатка…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Завантаження завершено</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Помилка завантаження</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Не вдалося встановити</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">Оновлення додатка</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Прогрес в оновленні додатка</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Не вдалося запустити функцію створення відгуку</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Випуск не знайдено. Можливо, цей додаток не був установлений за допомогою App Distribution або ви більше не маєте доступу до нього.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Відгук не вдалося надіслати через режим розробника.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Відгук</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Показує сповіщення для введення відгуку про додаток</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">Нас цікавить ваша думка!</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Натисніть, щоб ввести відгук для додатка %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Встановлення з невідомих джерел</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Щоб установити оновлення, дозвольте встановлення з невідомих джерел</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Налаштування</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Назад</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Надіслати відгук</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Надіслати</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Хочете надіслати відгук? Порадьте нам, що можна покращити в цьому додатку.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Знімок екрана</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Знімок екрана (недоступний)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Знімок екрана</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-vi/strings.xml b/firebase-appdistribution/src/main/res/values-vi/strings.xml
new file mode 100644
index 00000000000..3a4698d32f2
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-vi/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Bật các tính năng thử nghiệm</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Bật các tính năng thử nghiệm như thông báo về bản dựng mới và phản hồi trong ứng dụng.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Bật</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Để sau</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">Đã có phiên bản mới</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">Phiên bản %1$s (%2$d) hiện đã ra mắt.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Ghi chú phát hành:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Cập nhật</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Huỷ</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Đang tải bản cập nhật trong ứng dụng xuống…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Đã tải xuống xong</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Không tải xuống được</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Không cài đặt được</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Phân phối ứng dụng Firebase</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">Cập nhật ứng dụng</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Hiện tiến trình của các bản cập nhật trong ứng dụng</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Không chạy được tính năng phản hồi</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Không tìm thấy bản phát hành. Ứng dụng này có thể không phải do tính năng Phân phối ứng dụng cài đặt hoặc bạn hiện đã mất quyền truy cập.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Đúng ra là đã gửi phản hồi, nhưng không gửi được do chế độ nhà phát triển.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Phản hồi</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Hiện thông báo mời nhập ý kiến phản hồi về ứng dụng</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">Chúng tôi rất mong nhận được ý kiến phản hồi của bạn!</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Nhấn để nhập ý kiến phản hồi về ứng dụng %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Cài đặt từ nguồn không rõ ràng</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">Để cài đặt bản cập nhật, hãy cho phép cài đặt từ nguồn không rõ ràng</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Cài đặt</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Quay lại</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Gửi ý kiến phản hồi</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Gửi</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Bạn có ý kiến phản hồi? Hãy cho chúng tôi biết cách cải thiện ứng dụng này.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Ảnh chụp màn hình</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Ảnh chụp màn hình (không có)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Ảnh chụp màn hình</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-zh-rCN/strings.xml b/firebase-appdistribution/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000000..0cfdc873965
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">启用测试功能</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">启用新版本提醒和应用内反馈等测试功能。</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">启用</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">以后再说</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">有新版本可用</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">版本 %1$s (%2$d) 可用。</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">版本说明：</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">更新</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">取消</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">正在下载应用内更新…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">下载完成</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">下载失败</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">安装失败</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">应用更新</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">显示应用内更新进度</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">启动反馈失败</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">未找到版本。App Distribution 可能尚未安装此应用，或者您可能无法继续使用此应用。</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">系统应当发送反馈，但由于处于开发模式而没有发送。</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">反馈</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">显示输入有关应用反馈的通知</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">我们期待您的反馈！</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">点按以输入对 %1$s 的反馈</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">从未知来源安装</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">如需安装更新，请启用“从未知来源安装”</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">设置</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">返回</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">发送反馈</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">发送</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">有反馈意见？请提供宝贵意见，帮助我们改善此应用的使用体验。</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">屏幕截图</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">屏幕截图（不可用）</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">屏幕截图图片</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values-zh-rTW/strings.xml b/firebase-appdistribution/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000000..90a5c92552a
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">啟用測試功能</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">啟用新版本快訊和應用程式內意見回饋等測試功能。</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">啟用</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">暫時不要</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">已推出新版本</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">已推出版本 %1$s (%2$d)。</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">版本資訊：</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">更新</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">取消</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">正在下載應用程式內更新…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">下載完成</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">下載失敗</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">無法安裝</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase 應用程式發布</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">應用程式更新</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">顯示應用程式內更新的進度</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">無法啟動意見回饋功能</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">找不到發布版本。這個應用程式可能不是由「應用程式發布」安裝，或是你已無法存取。</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">目前處於開發模式，因此意見回饋未成功傳送。</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">意見回饋</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">顯示通知，以便輸入應用程式相關意見回饋</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">敬請提供意見！</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">輕觸即可輸入「%1$s」的意見回饋</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">不明來源提供的安裝項目</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">如要安裝更新內容，請啟用透過不明來源安裝的選項</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">設定</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">返回</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">提供意見</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">傳送</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">想要提供意見嗎？請告訴我們這個應用程式有哪些部分需要改進。</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">螢幕截圖</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">螢幕截圖 (無)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">螢幕截圖圖片</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values/strings.xml b/firebase-appdistribution/src/main/res/values/strings.xml
index faa9aea881f..edd781148cd 100644
--- a/firebase-appdistribution/src/main/res/values/strings.xml
+++ b/firebase-appdistribution/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright 2021 Google LLC -->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
 <!-- -->
 <!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
 <!-- you may not use this file except in compliance with the License. -->
@@ -13,21 +14,37 @@
 <!-- limitations under the License. -->
 
 <resources>
-
-  <string name="signin_dialog_title">Enable new build alerts</string>
-  <string name="singin_dialog_message">Get in-app alerts when new builds are ready to test.</string>
-  <string name="singin_yes_button">Turn on</string>
-  <string name="singin_no_button">Not now</string>
-  <string name="no_update_available">No new release available, try calling checkForUpdate.</string>
-  <string name="update_dialog_title">New Version Available</string>
-  <string name="update_yes_button">Update</string>
-  <string name="update_no_button">Cancel</string>
-  <string name="downloading_app_update">Downloading in-app update...</string>
-  <string name="download_completed">Download completed</string>
-  <string name="download_failed">Download failed</string>
-  <string name="notifications_channel_name">App Distribution App Update Downloads</string>
-  <string name="notifications_channel_description">Shows download progress of in-app updates from App Distribution SDK</string>
-  <string name="unknown_sources_dialog_title">Enable Unknown Sources</string>
-  <string name="unknown_sources_dialog_description">To install the update enable unknown sources</string>
-  <string name="unknown_sources_yes_button">Settings</string>
-</resources>
\ No newline at end of file
+  <string name="signin_dialog_title" translation_description="Title of the dialog encouraging the user to enable Firebase App Distribution features">Enable testing features</string>
+  <string name="singin_dialog_message" translation_description="Content of the dialog encouraging the user to enable Firebase App Distribution features">Enable testing features like new build alerts and in-app feedback.</string>
+  <string name="singin_yes_button" translation_description="Text on button to enable Firebase App Distribution features">Enable</string>
+  <string name="singin_no_button" translation_description="Text on button to decline Firebase App Distribution features">Not now</string>
+  <string name="update_dialog_title" translation_description="Title of the dialog explaining to the user that a new version of the application is available">New version available</string>
+  <string name="update_version_available" translation_description="Version string (and code) of the available update">Version %1$s (%2$d) is available.</string>
+  <string name="update_release_notes" translation_description="Text prefixing release notes">Release notes:</string>
+  <string name="update_yes_button" translation_description="Text on button to start update">Update</string>
+  <string name="update_no_button" translation_description="Text on button to cancel update">Cancel</string>
+  <string name="downloading_app_update" translation_description="Title of the notification showing during download of update">Downloading in-app update…</string>
+  <string name="download_completed" translation_description="Title of notification when download of update has completed">Download complete</string>
+  <string name="download_failed" translation_description="Title of notification when download of update has failed">Download failed</string>
+  <string name="install_failed" translation_description="Title of notification when installation of update has failed">Install failed</string>
+  <string name="notifications_group_name" translation_description="Title of the notification channel group for the SDK">Firebase App Distribution</string>
+  <string name="app_update_notification_channel_name" translation_description="Name of the notification channel for in-app updates">App updates</string>
+  <string name="app_update_notification_channel_description" translation_description="Description of the notification channel for in-app updates">Shows progress of in-app updates</string>
+  <string name="feedback_launch_failed" translation_description="Toast explaining that launching the feedback functionality failed">Failed to launch feedback</string>
+  <string name="feedback_unidentified_release" translation_description="Toast explaining feedback can't be provided, because release can't be found">Release not found. This app may not have been installed by App Distribution, or you may no longer have access.</string>
+  <string name="feedback_no_release" translation_description="Toast explaining that feedback would have been sent, but was not, since development mode was active">Would have sent feedback, but did not due to development mode.</string>
+  <string name="feedback_notification_channel_name" translation_description="Name of the notification channel for in-app feedback">Feedback</string>
+  <string name="feedback_notification_channel_description" translation_description="Description of the notification channel for in-app feedback">Shows notification to enter feedback about app</string>
+  <string name="feedback_notification_title" translation_description="Title of notification encouraging testers to enter feedback">We want your feedback!</string>
+  <string name="feedback_notification_text" translation_description="Text of notification encouraging testers to enter feedback for the app">Tap to enter feedback for %1$s</string>
+  <string name="unknown_sources_dialog_title" translation_description="Title of dialog describing that installation from unknown sources needs to be enabled">Installation from unknown Sources</string>
+  <string name="unknown_sources_dialog_description" translation_description="Text of dialog describing why installation from unknown sources needs to be enabled">To install the update, enable installation from unknown sources</string>
+  <string name="unknown_sources_yes_button" translation_description="Label on button launching settings to enable installation from unknown sources">Settings</string>
+  <string name="back_button_description" translation_description="Description for image button (back) which aborts feedback">Back</string>
+  <string name="send_feedback" translation_description="Text next to send button which sends feedback">Send feedback</string>
+  <string name="send_button_description" translation_description="Description of image button (send) which sends feedback">Send</string>
+  <string name="feedback_text_hint" translation_description="Default text hint displayed in the text box where user should type their feedback">Have feedback? Let us know how we can make this app better.</string>
+  <string name="screenshot" translation_description="Text displayed next to the checkbox which can be toggled to include/exclude a screenshot with the feedback">Screenshot</string>
+  <string name="no_screenshot" translation_description="Text displayed when there is no screenshot available to be included with the feedback">Screenshot (not available)</string>
+  <string name="screenshot_image_description" translation_description="Description for the screenshot image">Screenshot image</string>
+</resources>
diff --git a/firebase-appdistribution/src/main/res/values/themes.xml b/firebase-appdistribution/src/main/res/values/themes.xml
new file mode 100644
index 00000000000..87bff5ca504
--- /dev/null
+++ b/firebase-appdistribution/src/main/res/values/themes.xml
@@ -0,0 +1,9 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="FeedbackTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorAccent">#000000</item>
+    </style>
+    <style name="FeedbackTheme.Button.Stroked" parent="Widget.AppCompat.Button.Colored">
+        <item name="android:background">@drawable/btn_stroked_background</item>
+        <item name="android:textColor">#1a73e8</item>
+    </style>
+</resources>
diff --git a/firebase-appdistribution/src/test/assets/apiDisabledBadLinkResponse.json b/firebase-appdistribution/src/test/assets/apiDisabledBadLinkResponse.json
new file mode 100644
index 00000000000..7d017a2c226
--- /dev/null
+++ b/firebase-appdistribution/src/test/assets/apiDisabledBadLinkResponse.json
@@ -0,0 +1,38 @@
+{
+  "error": {
+    "code": 403,
+    "message": "Firebase App Testers API has not been used in project 123456789 before or it is disabled. Enable it by visiting https://console.developers.google.com/apis/api/firebaseapptesters.googleapis.com/overview?project=123456789 then retry. If you enabled this API recently, wait a few minutes for the action to propagate to our systems and retry.",
+    "status": "PERMISSION_DENIED",
+    "details": [
+      {
+        "@type": "type.googleapis.com/google.rpc.Help",
+        "links": [
+          {
+            "description": "One link",
+            "url": "http://google.com"
+          },
+          {
+            "description": "Another link",
+            "url": "http://gmail.com"
+          },
+          {
+            "bad": "link"
+          },
+          {
+            "description": "One more link",
+            "url": "http://somethingelse.com"
+          }
+        ]
+      },
+      {
+        "@type": "type.googleapis.com/google.rpc.ErrorInfo",
+        "reason": "SERVICE_DISABLED",
+        "domain": "googleapis.com",
+        "metadata": {
+          "consumer": "projects/123456789",
+          "service": "firebaseapptesters.googleapis.com"
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/firebase-appdistribution/src/test/assets/apiDisabledResponse.json b/firebase-appdistribution/src/test/assets/apiDisabledResponse.json
new file mode 100644
index 00000000000..aef90e88363
--- /dev/null
+++ b/firebase-appdistribution/src/test/assets/apiDisabledResponse.json
@@ -0,0 +1,27 @@
+{
+  "error": {
+    "code": 403,
+    "message": "Firebase App Testers API has not been used in project 123456789 before or it is disabled. Enable it by visiting https://console.developers.google.com/apis/api/firebaseapptesters.googleapis.com/overview?project=123456789 then retry. If you enabled this API recently, wait a few minutes for the action to propagate to our systems and retry.",
+    "status": "PERMISSION_DENIED",
+    "details": [
+      {
+        "@type": "type.googleapis.com/google.rpc.Help",
+        "links": [
+          {
+            "description": "Google developers console API activation",
+            "url": "https://console.developers.google.com/apis/api/firebaseapptesters.googleapis.com/overview?project=123456789"
+          }
+        ]
+      },
+      {
+        "@type": "type.googleapis.com/google.rpc.ErrorInfo",
+        "reason": "SERVICE_DISABLED",
+        "domain": "googleapis.com",
+        "metadata": {
+          "consumer": "projects/123456789",
+          "service": "firebaseapptesters.googleapis.com"
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/firebase-appdistribution/src/test/assets/testSimpleResponse.json b/firebase-appdistribution/src/test/assets/testSimpleResponse.json
new file mode 100644
index 00000000000..c2d98758704
--- /dev/null
+++ b/firebase-appdistribution/src/test/assets/testSimpleResponse.json
@@ -0,0 +1,3 @@
+{
+  "fieldName": "fieldValue"
+}
\ No newline at end of file
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionLifecycleNotifierTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionLifecycleNotifierTest.java
deleted file mode 100644
index e4abe9d0c11..00000000000
--- a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionLifecycleNotifierTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.firebase.appdistribution.TestUtils.assertTaskFailure;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import com.google.android.gms.tasks.SuccessContinuation;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.appdistribution.FirebaseAppDistributionLifecycleNotifier.ActivityConsumer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class FirebaseAppDistributionLifecycleNotifierTest {
-  private TestActivity activity;
-  private FirebaseAppDistributionLifecycleNotifier lifecycleNotifier;
-
-  static class TestActivity extends Activity {}
-
-  @Before
-  public void setup() {
-    activity = Robolectric.buildActivity(TestActivity.class).create().get();
-    lifecycleNotifier = new FirebaseAppDistributionLifecycleNotifier();
-  }
-
-  @Test
-  public void applyToForegroundActivity_noCurrentActivity_succeedsAndCallsConsumer() {
-    ActivityConsumer consumer = spy(ActivityConsumer.class);
-    Task<Void> task = lifecycleNotifier.applyToForegroundActivity(consumer);
-
-    // Simulate an activity resuming
-    lifecycleNotifier.onActivityResumed(activity);
-
-    assertThat(task.isComplete()).isTrue();
-    assertThat(task.isSuccessful()).isTrue();
-    assertThat(task.getResult()).isNull();
-    verify(consumer).consume(activity);
-  }
-
-  @Test
-  public void applyToForegroundActivity_withCurrentActivity_succeedsAndCallsConsumer() {
-    // Resume an activity so there is a current foreground activity already when
-    // applyToForegroundActivity is called
-    lifecycleNotifier.onActivityResumed(activity);
-
-    ActivityConsumer consumer = spy(ActivityConsumer.class);
-    Task<Void> task = lifecycleNotifier.applyToForegroundActivity(consumer);
-
-    assertThat(task.isComplete()).isTrue();
-    assertThat(task.isSuccessful()).isTrue();
-    assertThat(task.getResult()).isEqualTo(null);
-    verify(consumer).consume(activity);
-  }
-
-  @Test
-  public void applyToForegroundActivity_consumerThrows_fails() {
-    RuntimeException consumerException = new RuntimeException("exception in consumer");
-    ActivityConsumer consumer = spy(ActivityConsumer.class);
-    doThrow(consumerException).when(consumer).consume(activity);
-    Task<Void> task = lifecycleNotifier.applyToForegroundActivity(consumer);
-
-    // Simulate an activity resuming
-    lifecycleNotifier.onActivityResumed(activity);
-
-    assertTaskFailure(task, Status.UNKNOWN, "Unknown", consumerException);
-  }
-
-  @Test
-  public void applyToForegroundActivityTask_withCurrentActivity_succeedsAndCallsConsumer()
-      throws Exception {
-    // Resume an activity so there is a current foreground activity already when
-    // applyToForegroundActivityTask is called
-    lifecycleNotifier.onActivityResumed(activity);
-
-    SuccessContinuation<Activity, String> continuation = spy(SuccessContinuation.class);
-    when(continuation.then(activity)).thenReturn(Tasks.forResult("result"));
-    Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
-
-    assertThat(task.isComplete()).isTrue();
-    assertThat(task.isSuccessful()).isTrue();
-    assertThat(task.getResult()).isEqualTo("result");
-  }
-
-  @Test
-  public void applyToForegroundActivityTask_noCurrentActivity_succeedsAndCallsConsumer()
-      throws Exception {
-    SuccessContinuation<Activity, String> continuation = spy(SuccessContinuation.class);
-    when(continuation.then(activity)).thenReturn(Tasks.forResult("result"));
-    Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
-
-    // Simulate an activity resuming
-    lifecycleNotifier.onActivityResumed(activity);
-
-    assertThat(task.isComplete()).isTrue();
-    assertThat(task.isSuccessful()).isTrue();
-    assertThat(task.getResult()).isEqualTo("result");
-  }
-
-  @Test
-  public void applyToForegroundActivityTask_continuationThrows_fails() throws Exception {
-    SuccessContinuation<Activity, String> continuation = spy(SuccessContinuation.class);
-    FirebaseAppDistributionException continuationException =
-        new FirebaseAppDistributionException(
-            "exception in continuation task", Status.AUTHENTICATION_CANCELED);
-    when(continuation.then(activity)).thenThrow(continuationException);
-    Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
-
-    // Simulate an activity resuming
-    lifecycleNotifier.onActivityResumed(activity);
-
-    assertTaskFailure(task, Status.AUTHENTICATION_CANCELED, "exception in continuation task");
-  }
-
-  @Test
-  public void applyToForegroundActivityTask_continuationThrowsUnknownException_wrapsException()
-      throws Exception {
-    SuccessContinuation<Activity, String> continuation = spy(SuccessContinuation.class);
-    RuntimeException continuationException = new RuntimeException("exception in continuation");
-    when(continuation.then(activity)).thenThrow(continuationException);
-    Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
-
-    // Simulate an activity resuming
-    lifecycleNotifier.onActivityResumed(activity);
-
-    assertTaskFailure(task, Status.UNKNOWN, "Unknown", continuationException);
-  }
-
-  @Test
-  public void applyToForegroundActivityTask_continuationTaskFails_failsWithSameException()
-      throws Exception {
-    SuccessContinuation<Activity, String> continuation = spy(SuccessContinuation.class);
-    RuntimeException continuationException = new RuntimeException("exception in continuation");
-    when(continuation.then(activity)).thenReturn(Tasks.forException(continuationException));
-    Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
-
-    // Simulate an activity resuming
-    lifecycleNotifier.onActivityResumed(activity);
-
-    assertThat(task.isSuccessful()).isFalse();
-    assertThat(task.getException()).isInstanceOf(RuntimeException.class);
-    RuntimeException e = (RuntimeException) task.getException();
-    assertThat(e).hasMessageThat().isEqualTo("exception in continuation");
-  }
-}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionNotificationsManagerTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionNotificationsManagerTest.java
deleted file mode 100644
index c69c5b39063..00000000000
--- a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionNotificationsManagerTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import static android.content.Context.NOTIFICATION_SERVICE;
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionNotificationsManager.NOTIFICATION_TAG;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import androidx.test.core.app.ApplicationProvider;
-import com.google.firebase.FirebaseApp;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class FirebaseAppDistributionNotificationsManagerTest {
-
-  private FirebaseAppDistributionNotificationsManager firebaseAppDistributionNotificationsManager;
-  private NotificationManager notificationManager;
-
-  @Before
-  public void setup() {
-    MockitoAnnotations.initMocks(this);
-    FirebaseApp.clearInstancesForTest();
-    notificationManager =
-        (NotificationManager)
-            ApplicationProvider.getApplicationContext().getSystemService(NOTIFICATION_SERVICE);
-    firebaseAppDistributionNotificationsManager =
-        new FirebaseAppDistributionNotificationsManager(
-            ApplicationProvider.getApplicationContext());
-  }
-
-  @Test
-  public void updateNotification_withProgress() {
-    firebaseAppDistributionNotificationsManager.updateNotification(
-        1000, 900, UpdateStatus.DOWNLOADING);
-    assertThat(shadowOf(notificationManager).size()).isEqualTo(1);
-    Notification notification = shadowOf(notificationManager).getNotification(NOTIFICATION_TAG, 0);
-    assertThat(shadowOf(notification).getProgress()).isEqualTo(90);
-    assertThat(shadowOf(notification).getContentTitle().toString()).contains("Downloading");
-  }
-
-  @Test
-  public void updateNotification_withError() {
-    firebaseAppDistributionNotificationsManager.updateNotification(
-        1000, 1000, UpdateStatus.DOWNLOAD_FAILED);
-    assertThat(shadowOf(notificationManager).size()).isEqualTo(1);
-    Notification notification = shadowOf(notificationManager).getNotification(NOTIFICATION_TAG, 0);
-    assertThat(shadowOf(notification).getProgress()).isEqualTo(100);
-    assertThat(shadowOf(notification).getContentTitle().toString()).contains("Download failed");
-  }
-
-  @Test
-  public void updateNotification_withSuccess() {
-    firebaseAppDistributionNotificationsManager.updateNotification(
-        1000, 1000, UpdateStatus.DOWNLOADED);
-    assertThat(shadowOf(notificationManager).size()).isEqualTo(1);
-    Notification notification = shadowOf(notificationManager).getNotification(NOTIFICATION_TAG, 0);
-    assertThat(shadowOf(notification).getProgress()).isEqualTo(100);
-    assertThat(shadowOf(notification).getContentTitle().toString()).contains("Download completed");
-  }
-
-  @Test
-  public void updateNotification_withZeroTotalBytes_shows0Percent() {
-    firebaseAppDistributionNotificationsManager.updateNotification(0, 0, UpdateStatus.DOWNLOADING);
-    assertThat(shadowOf(notificationManager).size()).isEqualTo(1);
-    Notification notification = shadowOf(notificationManager).getNotification(NOTIFICATION_TAG, 0);
-    assertThat(shadowOf(notification).getProgress()).isEqualTo(0);
-  }
-}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionTest.java
deleted file mode 100644
index f99bae1830d..00000000000
--- a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionTest.java
+++ /dev/null
@@ -1,599 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_ERROR;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.ErrorMessages.JSON_PARSING_ERROR;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.ErrorMessages.NETWORK_ERROR;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.ErrorMessages.NOT_FOUND_ERROR;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.ErrorMessages.UPDATE_CANCELED;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_CANCELED;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.HOST_ACTIVITY_INTERRUPTED;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.INSTALLATION_CANCELED;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
-import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.UPDATE_NOT_AVAILABLE;
-import static com.google.firebase.appdistribution.TestUtils.applyToForegroundActivityTaskAnswer;
-import static com.google.firebase.appdistribution.TestUtils.assertTaskFailure;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.os.Bundle;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.core.content.pm.ApplicationInfoBuilder;
-import androidx.test.core.content.pm.PackageInfoBuilder;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
-import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.appdistribution.internal.SignInStorage;
-import com.google.firebase.installations.InstallationTokenResult;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.shadows.ShadowAlertDialog;
-import org.robolectric.shadows.ShadowPackageManager;
-
-@RunWith(RobolectricTestRunner.class)
-public class FirebaseAppDistributionTest {
-  private static final String TEST_API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";
-  private static final String TEST_APP_ID_1 = "1:123456789:android:abcdef";
-  private static final String TEST_PROJECT_ID = "777777777777";
-  private static final String TEST_AUTH_TOKEN = "fad.auth.token";
-  private static final String TEST_IAS_ARTIFACT_ID = "ias-artifact-id";
-  private static final String IAS_ARTIFACT_ID_KEY = "com.android.vending.internal.apk.id";
-  private static final String TEST_URL = "https://test-url";
-  private static final long INSTALLED_VERSION_CODE = 2;
-
-  private static final AppDistributionReleaseInternal.Builder TEST_RELEASE_NEWER_AAB_INTERNAL =
-      AppDistributionReleaseInternal.builder()
-          .setBuildVersion("3")
-          .setDisplayVersion("3.0")
-          .setReleaseNotes("Newer version.")
-          .setBinaryType(BinaryType.AAB)
-          .setDownloadUrl(TEST_URL);
-
-  private static final AppDistributionRelease TEST_RELEASE_NEWER_AAB =
-      AppDistributionRelease.builder()
-          .setVersionCode(3)
-          .setDisplayVersion("3.0")
-          .setReleaseNotes("Newer version.")
-          .setBinaryType(BinaryType.AAB)
-          .build();
-
-  private static final AppDistributionReleaseInternal.Builder TEST_RELEASE_NEWER_APK_INTERNAL =
-      AppDistributionReleaseInternal.builder()
-          .setBuildVersion("3")
-          .setDisplayVersion("3.0")
-          .setReleaseNotes("Newer version.")
-          .setBinaryType(BinaryType.APK)
-          .setDownloadUrl(TEST_URL);
-
-  private FirebaseAppDistribution firebaseAppDistribution;
-  private TestActivity activity;
-  private FirebaseApp firebaseApp;
-
-  @Mock private InstallationTokenResult mockInstallationTokenResult;
-  @Mock private TesterSignInManager mockTesterSignInManager;
-  @Mock private NewReleaseFetcher mockNewReleaseFetcher;
-  @Mock private ApkUpdater mockApkUpdater;
-  @Mock private AabUpdater mockAabUpdater;
-  @Mock private SignInStorage mockSignInStorage;
-  @Mock private FirebaseAppDistributionLifecycleNotifier mockLifecycleNotifier;
-  private TestActivity mockedActivity;
-
-  static class TestActivity extends Activity {}
-
-  @Before
-  public void setup() throws FirebaseAppDistributionException {
-
-    MockitoAnnotations.initMocks(this);
-
-    FirebaseApp.clearInstancesForTest();
-
-    firebaseApp =
-        FirebaseApp.initializeApp(
-            ApplicationProvider.getApplicationContext(),
-            new FirebaseOptions.Builder()
-                .setApplicationId(TEST_APP_ID_1)
-                .setProjectId(TEST_PROJECT_ID)
-                .setApiKey(TEST_API_KEY)
-                .build());
-
-    firebaseAppDistribution =
-        spy(
-            new FirebaseAppDistribution(
-                firebaseApp,
-                mockTesterSignInManager,
-                mockNewReleaseFetcher,
-                mockApkUpdater,
-                mockAabUpdater,
-                mockSignInStorage,
-                mockLifecycleNotifier));
-
-    when(mockTesterSignInManager.signInTester()).thenReturn(Tasks.forResult(null));
-
-    when(mockInstallationTokenResult.getToken()).thenReturn(TEST_AUTH_TOKEN);
-
-    ShadowPackageManager shadowPackageManager =
-        shadowOf(ApplicationProvider.getApplicationContext().getPackageManager());
-
-    ApplicationInfo applicationInfo =
-        ApplicationInfoBuilder.newBuilder()
-            .setPackageName(ApplicationProvider.getApplicationContext().getPackageName())
-            .build();
-    applicationInfo.metaData = new Bundle();
-    applicationInfo.metaData.putString(IAS_ARTIFACT_ID_KEY, TEST_IAS_ARTIFACT_ID);
-    PackageInfo packageInfo =
-        PackageInfoBuilder.newBuilder()
-            .setPackageName(ApplicationProvider.getApplicationContext().getPackageName())
-            .setApplicationInfo(applicationInfo)
-            .build();
-    packageInfo.setLongVersionCode(INSTALLED_VERSION_CODE);
-    shadowPackageManager.installPackage(packageInfo);
-
-    activity = spy(Robolectric.buildActivity(TestActivity.class).create().get());
-    when(mockLifecycleNotifier.applyToForegroundActivityTask(any()))
-        .thenAnswer(applyToForegroundActivityTaskAnswer(activity));
-    when(mockSignInStorage.getSignInStatus()).thenReturn(true);
-  }
-
-  @Test
-  public void checkForNewRelease_whenCheckForNewReleaseFails_throwsError() {
-    when(mockNewReleaseFetcher.checkForNewRelease())
-        .thenReturn(
-            Tasks.forException(
-                new FirebaseAppDistributionException(
-                    FirebaseAppDistributionException.ErrorMessages.JSON_PARSING_ERROR,
-                    Status.NETWORK_FAILURE)));
-
-    Task<AppDistributionRelease> task = firebaseAppDistribution.checkForNewRelease();
-    assertTaskFailure(task, NETWORK_FAILURE, JSON_PARSING_ERROR);
-  }
-
-  @Test
-  public void checkForNewRelease_testerIsNotSignedIn_taskFails() {
-    when(firebaseAppDistribution.isTesterSignedIn()).thenReturn(false);
-
-    Task<AppDistributionRelease> task = firebaseAppDistribution.checkForNewRelease();
-
-    assertTaskFailure(task, AUTHENTICATION_FAILURE, "Tester is not signed in");
-  }
-
-  @Test
-  public void checkForNewRelease_whenCheckForNewReleaseSucceeds_returnsRelease() {
-    when(mockNewReleaseFetcher.checkForNewRelease())
-        .thenReturn(
-            Tasks.forResult(
-                TEST_RELEASE_NEWER_AAB_INTERNAL.setReleaseNotes("Newer version.").build()));
-
-    Task<AppDistributionRelease> task = firebaseAppDistribution.checkForNewRelease();
-
-    assertNotNull(task.getResult());
-    assertEquals(TEST_RELEASE_NEWER_AAB, task.getResult());
-    assertEquals(
-        TEST_RELEASE_NEWER_AAB_INTERNAL.build(), firebaseAppDistribution.getCachedNewRelease());
-  }
-
-  @Test
-  public void checkForNewRelease_authenticationFailure_signOutTester() {
-    when(mockNewReleaseFetcher.checkForNewRelease())
-        .thenReturn(
-            Tasks.forException(
-                new FirebaseAppDistributionException("Test", AUTHENTICATION_FAILURE)));
-    firebaseAppDistribution.checkForNewRelease();
-    verify(mockSignInStorage, times(1)).setSignInStatus(false);
-  }
-
-  @Test
-  public void updateApp_whenNotSignedIn_throwsError() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(false);
-
-    UpdateTask updateTask = firebaseAppDistribution.updateApp();
-
-    assertTaskFailure(updateTask, AUTHENTICATION_FAILURE, "Tester is not signed in");
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenNewAabReleaseAvailable_showsUpdateDialog() {
-    when(mockNewReleaseFetcher.checkForNewRelease())
-        .thenReturn(Tasks.forResult((TEST_RELEASE_NEWER_AAB_INTERNAL.build())));
-
-    firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    AlertDialog dialog = assertAlertDialogShown();
-    assertEquals(
-        String.format(
-            "Version %s (%s) is available.\n\nRelease notes: %s",
-            TEST_RELEASE_NEWER_AAB.getDisplayVersion(),
-            TEST_RELEASE_NEWER_AAB.getVersionCode(),
-            TEST_RELEASE_NEWER_AAB.getReleaseNotes()),
-        shadowOf(dialog).getMessage().toString());
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_fromABackgroundThread_showsUpdateDialog()
-      throws InterruptedException {
-    when(mockNewReleaseFetcher.checkForNewRelease())
-        .thenReturn(Tasks.forResult((TEST_RELEASE_NEWER_AAB_INTERNAL.build())));
-
-    ExecutorService executorService = Executors.newSingleThreadExecutor();
-    executorService.submit(() -> firebaseAppDistribution.updateIfNewReleaseAvailable());
-    TestUtils.awaitAsyncOperations(executorService);
-
-    assertAlertDialogShown();
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenReleaseNotesEmpty_doesNotShowReleaseNotes() {
-    when(mockNewReleaseFetcher.checkForNewRelease())
-        .thenReturn(Tasks.forResult((TEST_RELEASE_NEWER_AAB_INTERNAL.setReleaseNotes("").build())));
-
-    firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    AlertDialog dialog = assertAlertDialogShown();
-    assertEquals(
-        String.format(
-            "Version %s (%s) is available.",
-            TEST_RELEASE_NEWER_AAB.getDisplayVersion(), TEST_RELEASE_NEWER_AAB.getVersionCode()),
-        shadowOf(dialog).getMessage().toString());
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenNoReleaseAvailable_updateDialogNotShown() {
-    when(mockNewReleaseFetcher.checkForNewRelease()).thenReturn(Tasks.forResult(null));
-
-    UpdateTask task = firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    List<UpdateProgress> progressEvents = new ArrayList<>();
-    task.addOnProgressListener(progressEvents::add);
-
-    assertEquals(1, progressEvents.size());
-    assertEquals(UpdateStatus.NEW_RELEASE_NOT_AVAILABLE, progressEvents.get(0).getUpdateStatus());
-    assertNull(ShadowAlertDialog.getLatestAlertDialog());
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenActivityBackgrounded_updateDialogNotShown() {
-    when(mockNewReleaseFetcher.checkForNewRelease()).thenReturn(Tasks.forResult(null));
-
-    UpdateTask task = firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    List<UpdateProgress> progressEvents = new ArrayList<>();
-    task.addOnProgressListener(progressEvents::add);
-
-    assertEquals(1, progressEvents.size());
-    assertEquals(UpdateStatus.NEW_RELEASE_NOT_AVAILABLE, progressEvents.get(0).getUpdateStatus());
-    assertNull(ShadowAlertDialog.getLatestAlertDialog());
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenSignInCancelled_checkForUpdateNotCalled() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(false);
-    when(mockTesterSignInManager.signInTester())
-        .thenReturn(
-            Tasks.forException(
-                new FirebaseAppDistributionException(
-                    FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_CANCELED,
-                    AUTHENTICATION_CANCELED)));
-
-    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    AlertDialog signInDialog = assertAlertDialogShown();
-    signInDialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
-
-    verify(mockTesterSignInManager, times(1)).signInTester();
-    verify(mockNewReleaseFetcher, never()).checkForNewRelease();
-    assertTaskFailure(
-        updateTask,
-        AUTHENTICATION_CANCELED,
-        FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_CANCELED);
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenSignInFailed_checkForUpdateNotCalled() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(false);
-    when(mockTesterSignInManager.signInTester())
-        .thenReturn(
-            Tasks.forException(
-                new FirebaseAppDistributionException(
-                    FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_ERROR,
-                    AUTHENTICATION_FAILURE)));
-
-    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    AlertDialog signInDialog = assertAlertDialogShown();
-    signInDialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
-
-    assertTaskFailure(updateTask, AUTHENTICATION_FAILURE, AUTHENTICATION_ERROR);
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenDialogDismissed_taskFails() {
-    when(mockNewReleaseFetcher.checkForNewRelease())
-        .thenReturn(Tasks.forResult(TEST_RELEASE_NEWER_AAB_INTERNAL.build()));
-
-    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
-    AlertDialog updateDialog = assertAlertDialogShown();
-    updateDialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick(); // dismiss dialog
-
-    assertFalse(updateDialog.isShowing());
-    assertFalse(updateTask.isSuccessful());
-    assertTaskFailure(updateTask, INSTALLATION_CANCELED, UPDATE_CANCELED);
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenDialogCanceled_taskFails() {
-    when(mockNewReleaseFetcher.checkForNewRelease())
-        .thenReturn(Tasks.forResult(TEST_RELEASE_NEWER_AAB_INTERNAL.build()));
-
-    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    AlertDialog updateDialog = assertAlertDialogShown();
-    updateDialog.onBackPressed(); // cancels the dialog
-
-    assertFalse(updateDialog.isShowing());
-
-    assertTaskFailure(updateTask, INSTALLATION_CANCELED, UPDATE_CANCELED);
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenCheckForUpdateFails_updateAppNotCalled() {
-    when(mockNewReleaseFetcher.checkForNewRelease())
-        .thenReturn(
-            Tasks.forException(
-                new FirebaseAppDistributionException(
-                    FirebaseAppDistributionException.ErrorMessages.NETWORK_ERROR,
-                    FirebaseAppDistributionException.Status.NETWORK_FAILURE)));
-
-    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
-    List<UpdateProgress> progressEvents = new ArrayList<>();
-    updateTask.addOnProgressListener(progressEvents::add);
-
-    assertEquals(1, progressEvents.size());
-    assertEquals(UpdateStatus.NEW_RELEASE_CHECK_FAILED, progressEvents.get(0).getUpdateStatus());
-
-    verify(firebaseAppDistribution, never()).updateApp();
-    assertTaskFailure(updateTask, NETWORK_FAILURE, NETWORK_ERROR);
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenTesterIsSignedIn_doesNotOpenDialog() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(true);
-
-    firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    assertNull(ShadowAlertDialog.getLatestAlertDialog());
-  }
-
-  @Test
-  public void signInTester_whenDialogDismissed_taskFails() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(false);
-    Task updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    AlertDialog dialog = assertAlertDialogShown();
-    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick(); // dismiss dialog
-
-    assertFalse(updateTask.isSuccessful());
-    Exception e = updateTask.getException();
-    assertTrue(e instanceof FirebaseAppDistributionException);
-    assertEquals(AUTHENTICATION_CANCELED, ((FirebaseAppDistributionException) e).getErrorCode());
-    assertEquals(
-        FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_CANCELED, e.getMessage());
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenSignInDialogCanceled_taskFails() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(false);
-    Task signInTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    AlertDialog dialog = assertAlertDialogShown();
-    dialog.onBackPressed(); // cancel dialog
-
-    assertFalse(signInTask.isSuccessful());
-    Exception e = signInTask.getException();
-    assertTrue(e instanceof FirebaseAppDistributionException);
-    assertEquals(AUTHENTICATION_CANCELED, ((FirebaseAppDistributionException) e).getErrorCode());
-    assertEquals(
-        FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_CANCELED, e.getMessage());
-  }
-
-  private AlertDialog assertAlertDialogShown() {
-    assertTrue(ShadowAlertDialog.getLatestDialog() instanceof AlertDialog);
-    AlertDialog dialog = (AlertDialog) ShadowAlertDialog.getLatestDialog();
-    assertTrue(dialog.isShowing());
-
-    return dialog;
-  }
-
-  @Test
-  public void signOutTester_setsSignInStatusFalse() {
-    firebaseAppDistribution.signOutTester();
-    verify(mockSignInStorage).setSignInStatus(false);
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_receiveProgressUpdateFromUpdateApp() {
-    AppDistributionReleaseInternal newRelease = TEST_RELEASE_NEWER_AAB_INTERNAL.build();
-    when(mockNewReleaseFetcher.checkForNewRelease()).thenReturn(Tasks.forResult(newRelease));
-    UpdateTaskImpl mockTask = new UpdateTaskImpl();
-    when(mockAabUpdater.updateAab(newRelease)).thenReturn(mockTask);
-    mockTask.updateProgress(
-        UpdateProgress.builder()
-            .setApkFileTotalBytes(1)
-            .setApkBytesDownloaded(1)
-            .setUpdateStatus(UpdateStatus.DOWNLOADING)
-            .build());
-
-    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    List<UpdateProgress> progressEvents = new ArrayList<>();
-    updateTask.addOnProgressListener(progressEvents::add);
-
-    // Clicking the update button.
-    AlertDialog updateDialog = (AlertDialog) ShadowAlertDialog.getLatestDialog();
-    updateDialog.getButton(Dialog.BUTTON_POSITIVE).performClick();
-
-    // Update flow
-    assertEquals(1, progressEvents.size());
-    assertEquals(UpdateStatus.DOWNLOADING, progressEvents.get(0).getUpdateStatus());
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_fromABackgroundThread_showsSignInDialog()
-      throws InterruptedException, ExecutionException {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(false);
-
-    ExecutorService executorService = Executors.newSingleThreadExecutor();
-    Future<UpdateTask> future =
-        executorService.submit(() -> firebaseAppDistribution.updateIfNewReleaseAvailable());
-    TestUtils.awaitAsyncOperations(executorService);
-
-    assertAlertDialogShown();
-    assertFalse(((UpdateTask) future.get()).isComplete());
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenScreenRotates_signInConfirmationDialogReappears() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(false);
-    when(activity.isChangingConfigurations()).thenReturn(true);
-
-    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    // Mimic activity recreation due to a configuration change
-    firebaseAppDistribution.onActivityDestroyed(activity);
-    firebaseAppDistribution.onActivityResumed(activity);
-
-    assertAlertDialogShown();
-    assertFalse(updateTask.isComplete());
-  }
-
-  @Test
-  public void updateIfNewReleaseAvailable_whenScreenRotates_updateDialogReappears() {
-    AppDistributionReleaseInternal newRelease = TEST_RELEASE_NEWER_AAB_INTERNAL.build();
-    when(mockNewReleaseFetcher.checkForNewRelease()).thenReturn(Tasks.forResult(newRelease));
-    when(activity.isChangingConfigurations()).thenReturn(true);
-
-    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    // Mimic activity recreation due to a configuration change
-    firebaseAppDistribution.onActivityDestroyed(activity);
-    firebaseAppDistribution.onActivityResumed(activity);
-
-    assertAlertDialogShown();
-    assertFalse(updateTask.isComplete());
-  }
-
-  @Test
-  public void
-      updateIfNewReleaseAvailable_whenSignInDialogShowingAndNewActivityStarts_signInTaskCancelled() {
-    TestActivity testActivity2 = new TestActivity();
-    when(mockSignInStorage.getSignInStatus()).thenReturn(false);
-
-    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    // Mimic different activity getting resumed
-    firebaseAppDistribution.onActivityPaused(activity);
-    firebaseAppDistribution.onActivityResumed(testActivity2);
-
-    assertTaskFailure(
-        updateTask,
-        HOST_ACTIVITY_INTERRUPTED,
-        FirebaseAppDistributionException.ErrorMessages.HOST_ACTIVITY_INTERRUPTED);
-  }
-
-  @Test
-  public void
-      updateIfNewReleaseAvailable_whenUpdateDialogShowingAndNewActivityStarts_updateTaskCancelled() {
-    TestActivity testActivity2 = new TestActivity();
-    AppDistributionReleaseInternal newRelease = TEST_RELEASE_NEWER_AAB_INTERNAL.build();
-    when(mockNewReleaseFetcher.checkForNewRelease()).thenReturn(Tasks.forResult(newRelease));
-
-    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
-
-    // Mimic different activity getting resumed
-    firebaseAppDistribution.onActivityPaused(activity);
-    firebaseAppDistribution.onActivityResumed(testActivity2);
-
-    assertTaskFailure(
-        updateTask,
-        HOST_ACTIVITY_INTERRUPTED,
-        FirebaseAppDistributionException.ErrorMessages.HOST_ACTIVITY_INTERRUPTED);
-  }
-
-  @Test
-  public void updateAppTask_whenNoReleaseAvailable_throwsError() {
-    firebaseAppDistribution.setCachedNewRelease(null);
-    when(mockSignInStorage.getSignInStatus()).thenReturn(true);
-
-    UpdateTask updateTask = firebaseAppDistribution.updateApp();
-
-    assertTaskFailure(updateTask, UPDATE_NOT_AVAILABLE, NOT_FOUND_ERROR);
-  }
-
-  @Test
-  public void updateApp_withAabReleaseAvailable_returnsSameAabTask() {
-    AppDistributionReleaseInternal release = TEST_RELEASE_NEWER_AAB_INTERNAL.build();
-    firebaseAppDistribution.setCachedNewRelease(release);
-    UpdateTaskImpl updateTaskToReturn = new UpdateTaskImpl();
-    doReturn(updateTaskToReturn).when(mockAabUpdater).updateAab(release);
-    when(mockSignInStorage.getSignInStatus()).thenReturn(true);
-
-    UpdateTask updateTask = firebaseAppDistribution.updateApp();
-
-    assertEquals(updateTask, updateTaskToReturn);
-  }
-
-  @Test
-  public void updateApp_withApkReleaseAvailable_returnsSameApkTask() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(true);
-    AppDistributionReleaseInternal release = TEST_RELEASE_NEWER_APK_INTERNAL.build();
-    firebaseAppDistribution.setCachedNewRelease(release);
-    UpdateTaskImpl updateTaskToReturn = new UpdateTaskImpl();
-    doReturn(updateTaskToReturn).when(mockApkUpdater).updateApk(release, false);
-
-    UpdateTask updateTask = firebaseAppDistribution.updateApp();
-
-    assertEquals(updateTask, updateTaskToReturn);
-  }
-}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionTesterApiClientTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionTesterApiClientTest.java
deleted file mode 100644
index f18811a07a7..00000000000
--- a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/FirebaseAppDistributionTesterApiClientTest.java
+++ /dev/null
@@ -1,270 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import static androidx.test.InstrumentationRegistry.getContext;
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertThrows;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import androidx.test.core.app.ApplicationProvider;
-import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import javax.net.ssl.HttpsURLConnection;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class FirebaseAppDistributionTesterApiClientTest {
-
-  private static final String TEST_API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";
-  private static final String TEST_APP_ID_1 = "1:123456789:android:abcdef";
-  private static final String TEST_AUTH_TOKEN = "fad.auth.token";
-  private static final String TEST_FID_1 = "cccccccccccccccccccccc";
-  private static final String INVALID_RESPONSE = "InvalidResponse";
-  private static final String RELEASES_URL =
-      "https://firebaseapptesters.googleapis.com/v1alpha/devices/-/testerApps/1:123456789:android:abcdef/installations/cccccccccccccccccccccc/releases";
-
-  private FirebaseAppDistributionTesterApiClient firebaseAppDistributionTesterApiClient;
-  private Context applicationContext;
-  @Mock private HttpsURLConnection mockHttpsURLConnection;
-  @Mock private HttpsUrlConnectionFactory mockHttpsURLConnectionFactory;
-
-  @Before
-  public void setup() throws Exception {
-    MockitoAnnotations.initMocks(this);
-
-    applicationContext = ApplicationProvider.getApplicationContext();
-
-    when(mockHttpsURLConnectionFactory.openConnection(RELEASES_URL))
-        .thenReturn(mockHttpsURLConnection);
-
-    firebaseAppDistributionTesterApiClient =
-        new FirebaseAppDistributionTesterApiClient(mockHttpsURLConnectionFactory);
-  }
-
-  @Test
-  public void fetchNewRelease_whenResponseSuccessfulForApk_returnsRelease() throws Exception {
-    JSONObject releaseJson = getTestJSON("testApkReleaseResponse.json");
-    InputStream response =
-        new ByteArrayInputStream(releaseJson.toString().getBytes(StandardCharsets.UTF_8));
-    when(mockHttpsURLConnection.getResponseCode()).thenReturn(200);
-    when(mockHttpsURLConnection.getInputStream()).thenReturn(response);
-    AppDistributionReleaseInternal release =
-        firebaseAppDistributionTesterApiClient.fetchNewRelease(
-            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext);
-    AppDistributionReleaseInternal expectedRelease =
-        AppDistributionReleaseInternal.builder()
-            .setBinaryType(BinaryType.APK)
-            .setBuildVersion("3")
-            .setDisplayVersion("3.0")
-            .setReleaseNotes("This is a test release.")
-            .setDownloadUrl("http://test-url-apk")
-            .setCodeHash("code-hash-apk-1")
-            .setApkHash("apk-hash-1")
-            .setIasArtifactId("")
-            .build();
-    assertThat(release).isEqualTo(expectedRelease);
-    verify(mockHttpsURLConnection).disconnect();
-  }
-
-  @Test
-  public void fetchNewRelease_whenResponseSuccessfulForAab_returnsRelease() throws Exception {
-    JSONObject releaseJson = getTestJSON("testAabReleaseResponse.json");
-    InputStream response =
-        new ByteArrayInputStream(releaseJson.toString().getBytes(StandardCharsets.UTF_8));
-    when(mockHttpsURLConnection.getResponseCode()).thenReturn(200);
-    when(mockHttpsURLConnection.getInputStream()).thenReturn(response);
-    AppDistributionReleaseInternal release =
-        firebaseAppDistributionTesterApiClient.fetchNewRelease(
-            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext);
-    AppDistributionReleaseInternal expectedRelease =
-        AppDistributionReleaseInternal.builder()
-            .setBinaryType(BinaryType.AAB)
-            .setBuildVersion("3")
-            .setDisplayVersion("3.0")
-            .setReleaseNotes("This is a test release.")
-            .setDownloadUrl("http://test-url-aab")
-            .setCodeHash("")
-            .setApkHash("")
-            .setIasArtifactId("ias-artifact-id-1")
-            .build();
-    assertThat(release).isEqualTo(expectedRelease);
-    verify(mockHttpsURLConnection).disconnect();
-  }
-
-  @Test
-  public void fetchNewRelease_whenConnectionFails_throwsError() throws Exception {
-    IOException caughtException = new IOException("error");
-    when(mockHttpsURLConnectionFactory.openConnection(RELEASES_URL)).thenThrow(caughtException);
-
-    FirebaseAppDistributionException ex =
-        assertThrows(
-            FirebaseAppDistributionException.class,
-            () ->
-                firebaseAppDistributionTesterApiClient.fetchNewRelease(
-                    TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext));
-
-    assertThat(ex.getErrorCode()).isEqualTo(Status.NETWORK_FAILURE);
-    assertThat(ex.getMessage())
-        .contains(FirebaseAppDistributionException.ErrorMessages.NETWORK_ERROR);
-    assertThat(ex.getCause()).isEqualTo(caughtException);
-  }
-
-  @Test
-  public void fetchNewRelease_whenResponseFailsWith401_throwsError() throws Exception {
-    when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException());
-    when(mockHttpsURLConnection.getResponseCode()).thenReturn(401);
-
-    FirebaseAppDistributionException ex =
-        assertThrows(
-            FirebaseAppDistributionException.class,
-            () ->
-                firebaseAppDistributionTesterApiClient.fetchNewRelease(
-                    TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext));
-
-    assertThat(ex.getErrorCode()).isEqualTo(Status.AUTHENTICATION_FAILURE);
-    assertThat(ex.getMessage())
-        .isEqualTo(FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_ERROR);
-    verify(mockHttpsURLConnection).disconnect();
-  }
-
-  @Test
-  public void fetchNewRelease_whenResponseFailsWith403_throwsError() throws Exception {
-    when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException());
-    when(mockHttpsURLConnection.getResponseCode()).thenReturn(403);
-
-    FirebaseAppDistributionException ex =
-        assertThrows(
-            FirebaseAppDistributionException.class,
-            () ->
-                firebaseAppDistributionTesterApiClient.fetchNewRelease(
-                    TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext));
-
-    assertThat(ex.getErrorCode()).isEqualTo(Status.AUTHENTICATION_FAILURE);
-    assertThat(ex.getMessage())
-        .isEqualTo(FirebaseAppDistributionException.ErrorMessages.AUTHORIZATION_ERROR);
-    verify(mockHttpsURLConnection).disconnect();
-  }
-
-  @Test
-  public void fetchNewRelease_whenResponseFailsWith404_throwsError() throws Exception {
-    when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException());
-    when(mockHttpsURLConnection.getResponseCode()).thenReturn(404);
-
-    FirebaseAppDistributionException ex =
-        assertThrows(
-            FirebaseAppDistributionException.class,
-            () ->
-                firebaseAppDistributionTesterApiClient.fetchNewRelease(
-                    TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext));
-
-    assertThat(ex.getErrorCode()).isEqualTo(Status.AUTHENTICATION_FAILURE);
-    assertThat(ex.getMessage()).contains("App or tester not found");
-    verify(mockHttpsURLConnection).disconnect();
-  }
-
-  @Test
-  public void fetchNewRelease_whenResponseFailsWith504_throwsError() throws Exception {
-    when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException());
-    when(mockHttpsURLConnection.getResponseCode()).thenReturn(504);
-
-    FirebaseAppDistributionException ex =
-        assertThrows(
-            FirebaseAppDistributionException.class,
-            () ->
-                firebaseAppDistributionTesterApiClient.fetchNewRelease(
-                    TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext));
-
-    assertThat(ex.getErrorCode()).isEqualTo(Status.NETWORK_FAILURE);
-    assertThat(ex.getMessage())
-        .isEqualTo(FirebaseAppDistributionException.ErrorMessages.TIMEOUT_ERROR);
-    verify(mockHttpsURLConnection).disconnect();
-  }
-
-  @Test
-  public void fetchNewRelease_whenResponseFailsWithUnknownCode_throwsError() throws Exception {
-    when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException());
-    when(mockHttpsURLConnection.getResponseCode()).thenReturn(409);
-
-    FirebaseAppDistributionException ex =
-        assertThrows(
-            FirebaseAppDistributionException.class,
-            () ->
-                firebaseAppDistributionTesterApiClient.fetchNewRelease(
-                    TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext));
-
-    assertThat(ex.getErrorCode()).isEqualTo(Status.UNKNOWN);
-    assertThat(ex.getMessage()).contains("409");
-    verify(mockHttpsURLConnection).disconnect();
-  }
-
-  @Test
-  public void fetchNewRelease_whenInvalidJson_throwsError() throws Exception {
-    InputStream response =
-        new ByteArrayInputStream(INVALID_RESPONSE.getBytes(StandardCharsets.UTF_8));
-    when(mockHttpsURLConnection.getInputStream()).thenReturn(response);
-    when(mockHttpsURLConnection.getResponseCode()).thenReturn(200);
-    FirebaseAppDistributionException ex =
-        assertThrows(
-            FirebaseAppDistributionException.class,
-            () ->
-                firebaseAppDistributionTesterApiClient.fetchNewRelease(
-                    TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext));
-
-    assertThat(ex.getErrorCode()).isEqualTo(Status.UNKNOWN);
-    assertThat(ex.getMessage())
-        .isEqualTo(FirebaseAppDistributionException.ErrorMessages.JSON_PARSING_ERROR);
-    assertThat(ex.getCause()).isInstanceOf(JSONException.class);
-    verify(mockHttpsURLConnection).disconnect();
-  }
-
-  @Test
-  public void fetchNewRelease_whenNoReleases_returnsNull() throws Exception {
-    JSONObject releaseJson = getTestJSON("testNoReleasesResponse.json");
-    InputStream response =
-        new ByteArrayInputStream(releaseJson.toString().getBytes(StandardCharsets.UTF_8));
-    when(mockHttpsURLConnection.getInputStream()).thenReturn(response);
-    when(mockHttpsURLConnection.getResponseCode()).thenReturn(200);
-    AppDistributionReleaseInternal release =
-        firebaseAppDistributionTesterApiClient.fetchNewRelease(
-            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext);
-    assertThat(release).isNull();
-    verify(mockHttpsURLConnection).disconnect();
-  }
-
-  private JSONObject getTestJSON(String fileName) throws IOException, JSONException {
-    final InputStream jsonInputStream = getContext().getResources().getAssets().open(fileName);
-    final String testJsonString = streamToString(jsonInputStream);
-    final JSONObject testJson = new JSONObject(testJsonString);
-    return testJson;
-  }
-
-  private static String streamToString(InputStream is) {
-    final java.util.Scanner s = new java.util.Scanner(is).useDelimiter("\\A");
-    return s.hasNext() ? s.next() : "";
-  }
-}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/NewReleaseFetcherTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/NewReleaseFetcherTest.java
deleted file mode 100644
index d866cdb6302..00000000000
--- a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/NewReleaseFetcherTest.java
+++ /dev/null
@@ -1,405 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.firebase.appdistribution.BinaryType.APK;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mockStatic;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.os.Bundle;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.core.content.pm.ApplicationInfoBuilder;
-import androidx.test.core.content.pm.PackageInfoBuilder;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
-import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.inject.Provider;
-import com.google.firebase.installations.FirebaseInstallationsApi;
-import com.google.firebase.installations.InstallationTokenResult;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.shadows.ShadowPackageManager;
-
-@RunWith(RobolectricTestRunner.class)
-public class NewReleaseFetcherTest {
-  private static final String TEST_API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";
-  private static final String TEST_APP_ID_1 = "1:123456789:android:abcdef";
-  private static final String TEST_PROJECT_ID = "777777777777";
-  private static final String TEST_FID_1 = "cccccccccccccccccccccc";
-  private static final String TEST_AUTH_TOKEN = "fad.auth.token";
-  private static final String TEST_IAS_ARTIFACT_ID = "ias-artifact-id";
-  private static final String IAS_ARTIFACT_ID_KEY = "com.android.vending.internal.apk.id";
-  private static final String NEW_CODEHASH = "abcdef";
-  private static final String CURRENT_CODEHASH = "ghiklm";
-  private static final String NEW_APK_HASH = "newApkHash";
-  private static final String CURRENT_APK_HASH = "currentApkHash";
-  private static final long INSTALLED_VERSION_CODE = 1;
-  private static final long NEW_VERSION_CODE = 2;
-
-  private NewReleaseFetcher newReleaseFetcher;
-  private ShadowPackageManager shadowPackageManager;
-  private Context applicationContext;
-
-  @Mock private Provider<FirebaseInstallationsApi> mockFirebaseInstallationsProvider;
-  @Mock private FirebaseInstallationsApi mockFirebaseInstallations;
-  @Mock private FirebaseAppDistributionTesterApiClient mockFirebaseAppDistributionTesterApiClient;
-  @Mock private InstallationTokenResult mockInstallationTokenResult;
-
-  Executor testExecutor = Executors.newSingleThreadExecutor();
-
-  @Before
-  public void setup() throws FirebaseAppDistributionException {
-    MockitoAnnotations.initMocks(this);
-
-    FirebaseApp.clearInstancesForTest();
-
-    FirebaseApp firebaseApp =
-        FirebaseApp.initializeApp(
-            ApplicationProvider.getApplicationContext(),
-            new FirebaseOptions.Builder()
-                .setApplicationId(TEST_APP_ID_1)
-                .setProjectId(TEST_PROJECT_ID)
-                .setApiKey(TEST_API_KEY)
-                .build());
-
-    when(mockFirebaseInstallationsProvider.get()).thenReturn(mockFirebaseInstallations);
-    when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forResult(TEST_FID_1));
-    when(mockFirebaseInstallations.getToken(false))
-        .thenReturn(Tasks.forResult(mockInstallationTokenResult));
-
-    when(mockInstallationTokenResult.getToken()).thenReturn(TEST_AUTH_TOKEN);
-
-    shadowPackageManager =
-        shadowOf(ApplicationProvider.getApplicationContext().getPackageManager());
-    applicationContext = ApplicationProvider.getApplicationContext();
-
-    ApplicationInfo applicationInfo =
-        ApplicationInfoBuilder.newBuilder()
-            .setPackageName(ApplicationProvider.getApplicationContext().getPackageName())
-            .build();
-    applicationInfo.metaData = new Bundle();
-    applicationInfo.metaData.putString(IAS_ARTIFACT_ID_KEY, TEST_IAS_ARTIFACT_ID);
-    applicationInfo.sourceDir = "sourcedir/";
-    PackageInfo packageInfo =
-        PackageInfoBuilder.newBuilder()
-            .setPackageName(ApplicationProvider.getApplicationContext().getPackageName())
-            .setApplicationInfo(applicationInfo)
-            .build();
-    packageInfo.setLongVersionCode(INSTALLED_VERSION_CODE);
-    packageInfo.versionName = "1.0";
-    shadowPackageManager.installPackage(packageInfo);
-
-    newReleaseFetcher =
-        spy(
-            new NewReleaseFetcher(
-                firebaseApp,
-                mockFirebaseAppDistributionTesterApiClient,
-                mockFirebaseInstallationsProvider,
-                testExecutor));
-  }
-
-  @Test
-  public void checkForNewRelease_whenCalled_getsFidAndAuthToken() {
-    newReleaseFetcher.checkForNewRelease();
-    verify(mockFirebaseInstallations, times(1)).getId();
-    verify(mockFirebaseInstallations, times(1)).getToken(false);
-  }
-
-  @Test
-  public void checkForNewReleaseTask_whenCalledMultipleTimes_returnsTheSameTask() {
-    Task<AppDistributionReleaseInternal> checkForNewReleaseTask1 =
-        newReleaseFetcher.checkForNewRelease();
-    Task<AppDistributionReleaseInternal> checkForNewReleaseTask2 =
-        newReleaseFetcher.checkForNewRelease();
-
-    assertEquals(checkForNewReleaseTask1, checkForNewReleaseTask2);
-  }
-
-  @Test
-  public void checkForNewRelease_succeeds() throws Exception {
-    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease(
-            any(), any(), any(), any(), any()))
-        .thenReturn(getTestNewRelease().build());
-
-    TestOnCompleteListener<AppDistributionReleaseInternal> onCompleteListener =
-        new TestOnCompleteListener<>();
-    Task<AppDistributionReleaseInternal> task = newReleaseFetcher.checkForNewRelease();
-    task.addOnCompleteListener(testExecutor, onCompleteListener);
-
-    AppDistributionReleaseInternal appDistributionReleaseInternal = onCompleteListener.await();
-    assertEquals(getTestNewRelease().build(), appDistributionReleaseInternal);
-    verify(mockFirebaseInstallations, times(1)).getId();
-    verify(mockFirebaseInstallations, times(1)).getToken(false);
-  }
-
-  @Test
-  public void checkForNewRelease_fisFailure() throws Exception {
-    Exception expectedException = new Exception("test ex");
-    when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forException(expectedException));
-
-    TestOnCompleteListener<AppDistributionReleaseInternal> onCompleteListener =
-        new TestOnCompleteListener<>();
-    Task<AppDistributionReleaseInternal> task = newReleaseFetcher.checkForNewRelease();
-    task.addOnCompleteListener(testExecutor, onCompleteListener);
-
-    FirebaseAppDistributionException actualException =
-        assertThrows(FirebaseAppDistributionException.class, onCompleteListener::await);
-
-    assertThat(actualException)
-        .hasMessageThat()
-        .contains(FirebaseAppDistributionException.ErrorMessages.UNKNOWN_ERROR);
-    assertThat(actualException).hasMessageThat().contains("test ex");
-    assertThat(actualException.getErrorCode()).isEqualTo(Status.UNKNOWN);
-    assertThat(actualException).hasCauseThat().isEqualTo(expectedException);
-  }
-
-  @Test
-  public void checkForNewRelease_uncaughtExceptionFailure() throws Exception {
-    RuntimeException expectedException = new RuntimeException("test ex");
-    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease(
-            any(), any(), any(), any(), any()))
-        .thenThrow(expectedException);
-
-    TestOnCompleteListener<AppDistributionReleaseInternal> onCompleteListener =
-        new TestOnCompleteListener<>();
-    Task<AppDistributionReleaseInternal> task = newReleaseFetcher.checkForNewRelease();
-    task.addOnCompleteListener(testExecutor, onCompleteListener);
-
-    FirebaseAppDistributionException actualException =
-        assertThrows(FirebaseAppDistributionException.class, onCompleteListener::await);
-
-    assertThat(actualException)
-        .hasMessageThat()
-        .contains(FirebaseAppDistributionException.ErrorMessages.UNKNOWN_ERROR);
-    assertThat(actualException).hasMessageThat().contains("test ex");
-    assertThat(actualException.getErrorCode()).isEqualTo(Status.UNKNOWN);
-    assertThat(actualException).hasCauseThat().isEqualTo(expectedException);
-  }
-
-  @Test
-  public void checkForNewRelease_appDistroFailure() throws Exception {
-    FirebaseAppDistributionException expectedException =
-        new FirebaseAppDistributionException(
-            "test", FirebaseAppDistributionException.Status.UNKNOWN);
-    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease(
-            any(), any(), any(), any(), any()))
-        .thenThrow(expectedException);
-
-    TestOnCompleteListener<AppDistributionReleaseInternal> onCompleteListener =
-        new TestOnCompleteListener<>();
-    Task<AppDistributionReleaseInternal> task = newReleaseFetcher.checkForNewRelease();
-    task.addOnCompleteListener(testExecutor, onCompleteListener);
-
-    FirebaseAppDistributionException actualException =
-        assertThrows(FirebaseAppDistributionException.class, onCompleteListener::await);
-
-    assertEquals(expectedException, actualException);
-  }
-
-  @Test
-  public void getNewReleaseFromClient_whenNewReleaseIsNewerBuildThanInstalled_returnsRelease()
-      throws Exception {
-    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease(
-            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext))
-        .thenReturn(getTestNewRelease().build());
-
-    AppDistributionReleaseInternal release =
-        newReleaseFetcher.getNewReleaseFromClient(
-            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN);
-
-    assertNotNull(release);
-    assertEquals(Long.toString(NEW_VERSION_CODE), release.getBuildVersion());
-  }
-
-  @Test
-  public void getNewReleaseFromClient_whenNewReleaseIsSameRelease_returnsNull() throws Exception {
-    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease(
-            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext))
-        .thenReturn(getTestInstalledRelease().build());
-
-    doReturn(CURRENT_APK_HASH).when(newReleaseFetcher).extractApkHash(any());
-
-    AppDistributionReleaseInternal release =
-        newReleaseFetcher.getNewReleaseFromClient(
-            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN);
-
-    assertNull(release);
-  }
-
-  @Test
-  public void getNewReleaseFromClient_whenNewReleaseIsLowerVersionCode_returnsNull()
-      throws Exception {
-    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease(
-            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN, applicationContext))
-        .thenReturn(
-            getTestInstalledRelease()
-                .setBuildVersion(Long.toString(INSTALLED_VERSION_CODE - 1))
-                .build());
-
-    doReturn(CURRENT_APK_HASH).when(newReleaseFetcher).extractApkHash(any());
-
-    AppDistributionReleaseInternal release =
-        newReleaseFetcher.getNewReleaseFromClient(
-            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN);
-
-    assertNull(release);
-  }
-
-  @Test
-  public void handleNewReleaseFromClient_whenNewAabIsAvailable_returnsRelease() throws Exception {
-    AppDistributionReleaseInternal expectedRelease =
-        getTestNewRelease()
-            .setDownloadUrl("http://fake-download-url")
-            .setIasArtifactId("test-ias-artifact-id-2")
-            .setBinaryType(BinaryType.AAB)
-            .build();
-    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease(
-            any(), any(), any(), any(), any()))
-        .thenReturn(expectedRelease);
-
-    AppDistributionReleaseInternal result =
-        newReleaseFetcher.getNewReleaseFromClient(
-            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN);
-
-    assertEquals(expectedRelease, result);
-  }
-
-  @Test
-  public void
-      handleNewReleaseFromClient_whenNewReleaseHasDifferentVersionNameThanInstalled_returnsRelease()
-          throws Exception {
-    AppDistributionReleaseInternal expectedRelease =
-        getTestNewRelease()
-            .setDownloadUrl("http://fake-download-url")
-            .setIasArtifactId(TEST_IAS_ARTIFACT_ID)
-            .setBinaryType(BinaryType.AAB)
-            .setDisplayVersion("2.0")
-            .build();
-    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease(
-            any(), any(), any(), any(), any()))
-        .thenReturn(expectedRelease);
-
-    AppDistributionReleaseInternal result =
-        newReleaseFetcher.getNewReleaseFromClient(
-            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN);
-    assertEquals(expectedRelease, result);
-  }
-
-  @Test
-  public void handleNewReleaseFromClient_whenNewReleaseIsSameAsInstalledAab_returnsNull()
-      throws Exception {
-    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease(
-            any(), any(), any(), any(), any()))
-        .thenReturn(
-            getTestInstalledRelease()
-                .setDownloadUrl("http://fake-download-url")
-                .setIasArtifactId(TEST_IAS_ARTIFACT_ID)
-                .setBinaryType(BinaryType.AAB)
-                .build());
-
-    AppDistributionReleaseInternal result =
-        newReleaseFetcher.getNewReleaseFromClient(
-            TEST_FID_1, TEST_APP_ID_1, TEST_API_KEY, TEST_AUTH_TOKEN);
-    assertNull(result);
-  }
-
-  @Test
-  public void iisSameAsInstalledRelease_whenApkHashesEqual_returnsTrue()
-      throws FirebaseAppDistributionException {
-    doReturn(CURRENT_APK_HASH).when(newReleaseFetcher).extractApkHash(any());
-    assertTrue(newReleaseFetcher.isSameAsInstalledRelease(getTestInstalledRelease().build()));
-  }
-
-  @Test
-  public void isSameAsInstalledRelease_whenApkHashesNotEqual_returnsFalse()
-      throws FirebaseAppDistributionException {
-    doReturn(CURRENT_APK_HASH).when(newReleaseFetcher).extractApkHash(any());
-    assertFalse(newReleaseFetcher.isSameAsInstalledRelease(getTestNewRelease().build()));
-  }
-
-  @Test
-  public void isSameAsInstalledRelease_ifApkHashNotPresent_throwsError() {
-    doReturn(CURRENT_APK_HASH).when(newReleaseFetcher).extractApkHash(any());
-
-    assertThrows(
-        FirebaseAppDistributionException.class,
-        () ->
-            newReleaseFetcher.isSameAsInstalledRelease(getTestNewRelease().setApkHash("").build()));
-  }
-
-  @Test
-  public void extractApkHash_ifKeyInCachedApkHashes_doesNotRecalculateZipHash() {
-    try (MockedStatic<ReleaseIdentificationUtils> mockedReleaseIdentificationUtils =
-        mockStatic(ReleaseIdentificationUtils.class)) {
-      PackageInfo packageInfo =
-          shadowPackageManager.getInternalMutablePackageInfo(
-              ApplicationProvider.getApplicationContext().getPackageName());
-      mockedReleaseIdentificationUtils
-          .when(() -> ReleaseIdentificationUtils.calculateApkHash(any()))
-          .thenReturn(NEW_CODEHASH);
-
-      newReleaseFetcher.extractApkHash(packageInfo);
-      newReleaseFetcher.extractApkHash(packageInfo);
-      // check that calculateApkInternalCodeHash is only called once
-      mockedReleaseIdentificationUtils.verify(
-          () -> ReleaseIdentificationUtils.calculateApkHash(any()));
-    }
-  }
-
-  private AppDistributionReleaseInternal.Builder getTestNewRelease() {
-    return AppDistributionReleaseInternal.builder()
-        .setBuildVersion(Long.toString(NEW_VERSION_CODE))
-        .setDisplayVersion("2.0")
-        .setReleaseNotes("Newer version.")
-        .setCodeHash(NEW_CODEHASH)
-        .setBinaryType(APK)
-        .setApkHash(NEW_APK_HASH);
-  }
-
-  private AppDistributionReleaseInternal.Builder getTestInstalledRelease() {
-    return AppDistributionReleaseInternal.builder()
-        .setBuildVersion(Long.toString(INSTALLED_VERSION_CODE))
-        .setDisplayVersion("1.0")
-        .setReleaseNotes("Current version.")
-        .setCodeHash(CURRENT_CODEHASH)
-        .setBinaryType(APK)
-        .setApkHash(CURRENT_APK_HASH);
-  }
-}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/TestUtils.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/TestUtils.java
deleted file mode 100644
index 281532020b6..00000000000
--- a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/TestUtils.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.appdistribution;
-
-import static android.os.Looper.getMainLooper;
-import static com.google.common.truth.Truth.assertThat;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.app.Activity;
-import com.google.android.gms.tasks.SuccessContinuation;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.appdistribution.FirebaseAppDistributionLifecycleNotifier.ActivityConsumer;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import org.mockito.stubbing.Answer;
-
-final class TestUtils {
-  private TestUtils() {}
-
-  static FirebaseAppDistributionException assertTaskFailure(
-      Task task, Status status, String messageSubstring) {
-    assertThat(task.isSuccessful()).isFalse();
-    assertThat(task.getException()).isInstanceOf(FirebaseAppDistributionException.class);
-    FirebaseAppDistributionException e = (FirebaseAppDistributionException) task.getException();
-    assertThat(e.getErrorCode()).isEqualTo(status);
-    assertThat(e).hasMessageThat().contains(messageSubstring);
-    return e;
-  }
-
-  static void assertTaskFailure(
-      Task task, Status status, String messageSubstring, Throwable cause) {
-    assertTaskFailure(task, status, messageSubstring);
-    assertThat(task.getException()).hasCauseThat().isEqualTo(cause);
-  }
-
-  static void awaitAsyncOperations(ExecutorService executorService) throws InterruptedException {
-    // Await anything enqueued to the executor
-    executorService.awaitTermination(100, TimeUnit.MILLISECONDS);
-
-    // Idle the main looper, which is also running these tests, so any Task or lifecycle callbacks
-    // can be handled. See http://robolectric.org/blog/2019/06/04/paused-looper/ for more info.
-    shadowOf(getMainLooper()).idle();
-  }
-
-  static Answer<Task<Void>> applyToForegroundActivityAnswer(Activity activity) {
-    return invocationOnMock -> {
-      ActivityConsumer consumer = (ActivityConsumer) invocationOnMock.getArgument(0);
-      if (consumer == null) {
-        return Tasks.forException(new IllegalStateException("ActivityConsumer was null"));
-      }
-      consumer.consume(activity);
-      return Tasks.forResult(null);
-    };
-  }
-
-  static <T> Answer<Task<T>> applyToForegroundActivityTaskAnswer(Activity activity) {
-    return invocationOnMock -> {
-      SuccessContinuation<Activity, T> continuation =
-          (SuccessContinuation<Activity, T>) invocationOnMock.getArgument(0);
-      if (continuation == null) {
-        return Tasks.forException(new IllegalStateException("Success was null"));
-      }
-      return continuation.then(activity);
-    };
-  }
-}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/AabUpdaterTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/AabUpdaterTest.java
similarity index 56%
rename from firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/AabUpdaterTest.java
rename to firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/AabUpdaterTest.java
index 679e7cefe9f..a940cb215c9 100644
--- a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/AabUpdaterTest.java
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/AabUpdaterTest.java
@@ -11,14 +11,16 @@
 // WITHOUT 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 com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.firebase.appdistribution.TestUtils.applyToForegroundActivityAnswer;
-import static com.google.firebase.appdistribution.TestUtils.assertTaskFailure;
-import static com.google.firebase.appdistribution.TestUtils.awaitAsyncOperations;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitAsyncOperations;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitCondition;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTaskFailure;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 import static org.robolectric.annotation.LooperMode.Mode.PAUSED;
@@ -26,13 +28,23 @@
 import android.app.Activity;
 import android.net.Uri;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.BinaryType;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.appdistribution.UpdateProgress;
+import com.google.firebase.appdistribution.UpdateStatus;
+import com.google.firebase.appdistribution.UpdateTask;
+import com.google.firebase.concurrent.FirebaseExecutors;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import javax.net.ssl.HttpsURLConnection;
 import org.junit.Before;
 import org.junit.Test;
@@ -50,7 +62,6 @@
 public class AabUpdaterTest {
   private static final String TEST_URL = "https://test-url";
   private static final String REDIRECT_TO_PLAY = "https://redirect-to-play-url";
-  private static final ExecutorService testExecutor = Executors.newSingleThreadExecutor();
 
   private static final AppDistributionReleaseInternal TEST_RELEASE_NEWER_AAB_INTERNAL =
       AppDistributionReleaseInternal.builder()
@@ -61,6 +72,9 @@ public class AabUpdaterTest {
           .setDownloadUrl("https://test-url")
           .build();
 
+  @Blocking private final ExecutorService blockingExecutor = TestOnlyExecutors.blocking();
+  @Lightweight private final ExecutorService lightweightExecutor = TestOnlyExecutors.lite();
+
   private AabUpdater aabUpdater;
   private ShadowActivity shadowActivity;
   @Mock private HttpsURLConnection mockHttpsUrlConnection;
@@ -87,70 +101,74 @@ public void setup() throws IOException, FirebaseAppDistributionException {
 
     aabUpdater =
         Mockito.spy(
-            new AabUpdater(mockLifecycleNotifier, mockHttpsUrlConnectionFactory, testExecutor));
+            new AabUpdater(
+                mockLifecycleNotifier,
+                mockHttpsUrlConnectionFactory,
+                blockingExecutor,
+                lightweightExecutor));
 
-    when(mockLifecycleNotifier.applyToForegroundActivity(any()))
-        .thenAnswer(applyToForegroundActivityAnswer(activity));
+    TestUtils.mockForegroundActivity(mockLifecycleNotifier, activity);
   }
 
   @Test
-  public void updateAppTask_whenOpenConnectionFails_setsNetworkFailure()
-      throws IOException, InterruptedException {
+  public void updateAppTask_whenOpenConnectionFails_setsNetworkFailure() throws IOException {
     IOException caughtException = new IOException("error");
     when(mockHttpsUrlConnectionFactory.openConnection(TEST_URL)).thenThrow(caughtException);
 
     UpdateTask updateTask = aabUpdater.updateAab(TEST_RELEASE_NEWER_AAB_INTERNAL);
-    awaitAsyncOperations(testExecutor);
 
-    assertTaskFailure(
+    awaitTaskFailure(
         updateTask, Status.NETWORK_FAILURE, "Failed to open connection", caughtException);
   }
 
   @Test
-  public void updateAppTask_isNotRedirectResponse_setsDownloadFailure()
-      throws IOException, InterruptedException {
+  public void updateAppTask_isNotRedirectResponse_setsDownloadFailure() throws IOException {
     when(mockHttpsUrlConnection.getResponseCode()).thenReturn(200);
 
     UpdateTask updateTask = aabUpdater.updateAab(TEST_RELEASE_NEWER_AAB_INTERNAL);
-    awaitAsyncOperations(testExecutor);
 
-    assertTaskFailure(updateTask, Status.DOWNLOAD_FAILURE, "Expected redirect");
+    awaitTaskFailure(updateTask, Status.DOWNLOAD_FAILURE, "Expected redirect");
   }
 
   @Test
-  public void updateAppTask_missingLocationHeader_setsDownloadFailure()
-      throws InterruptedException {
+  public void updateAppTask_missingLocationHeader_setsDownloadFailure() {
     when(mockHttpsUrlConnection.getHeaderField("Location")).thenReturn(null);
 
     UpdateTask updateTask = aabUpdater.updateAab(TEST_RELEASE_NEWER_AAB_INTERNAL);
-    awaitAsyncOperations(testExecutor);
 
-    assertTaskFailure(updateTask, Status.DOWNLOAD_FAILURE, "No Location header");
+    awaitTaskFailure(updateTask, Status.DOWNLOAD_FAILURE, "No Location header");
   }
 
   @Test
-  public void updateAppTask_emptyLocationHeader_setsDownloadFailure() throws InterruptedException {
+  public void updateAppTask_emptyLocationHeader_setsDownloadFailure() {
     when(mockHttpsUrlConnection.getHeaderField("Location")).thenReturn("");
 
     UpdateTask updateTask = aabUpdater.updateAab(TEST_RELEASE_NEWER_AAB_INTERNAL);
-    awaitAsyncOperations(testExecutor);
 
-    assertTaskFailure(updateTask, Status.DOWNLOAD_FAILURE, "Empty Location header");
+    awaitTaskFailure(updateTask, Status.DOWNLOAD_FAILURE, "Empty Location header");
   }
 
   @Test
   public void updateAppTask_whenAabReleaseAvailable_redirectsToPlay() throws Exception {
-    List<UpdateProgress> progressEvents = new ArrayList<>();
+    // Block thread actually making the request on a latch, which gives us time to add listeners to
+    // the returned UpdateTask in time to get all the progress updates
+    CountDownLatch countDownLatch = mockOpenConnectionWithLatch();
 
+    // Start update
     UpdateTask updateTask = aabUpdater.updateAab(TEST_RELEASE_NEWER_AAB_INTERNAL);
-    updateTask.addOnProgressListener(testExecutor, progressEvents::add);
-    awaitAsyncOperations(testExecutor);
 
+    // Listen for progress events
+    List<UpdateProgress> progressEvents = new ArrayList<>();
+    updateTask.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents::add);
+    countDownLatch.countDown();
+    awaitCondition(() -> progressEvents.size() == 1);
+
+    // Task is not completed in this case, because app is expected to terminate during update
     assertThat(shadowActivity.getNextStartedActivity().getData())
         .isEqualTo(Uri.parse(REDIRECT_TO_PLAY));
     assertEquals(1, progressEvents.size());
     assertEquals(
-        UpdateProgress.builder()
+        UpdateProgressImpl.builder()
             .setApkBytesDownloaded(-1)
             .setApkFileTotalBytes(-1)
             .setUpdateStatus(UpdateStatus.REDIRECTED_TO_PLAY)
@@ -161,24 +179,53 @@ public void updateAppTask_whenAabReleaseAvailable_redirectsToPlay() throws Excep
   @Test
   public void updateAppTask_onAppResume_setsUpdateCancelled() throws InterruptedException {
     UpdateTask updateTask = aabUpdater.updateAab(TEST_RELEASE_NEWER_AAB_INTERNAL);
-    awaitAsyncOperations(testExecutor);
+    awaitAsyncOperations(blockingExecutor);
+    awaitAsyncOperations(lightweightExecutor);
     aabUpdater.onActivityStarted(activity);
 
     FirebaseAppDistributionException exception =
-        assertTaskFailure(
-            updateTask,
-            Status.INSTALLATION_CANCELED,
-            FirebaseAppDistributionException.ErrorMessages.UPDATE_CANCELED);
+        awaitTaskFailure(updateTask, Status.INSTALLATION_CANCELED, ErrorMessages.UPDATE_CANCELED);
     assertEquals(
         ReleaseUtils.convertToAppDistributionRelease(TEST_RELEASE_NEWER_AAB_INTERNAL),
         exception.getRelease());
   }
 
   @Test
-  public void updateApp_whenCalledMultipleTimesWithAAB_returnsSameUpdateTask() {
+  public void updateApp_whenCalledMultipleTimesWithAAB_onlyMakesOneRequest()
+      throws IOException, FirebaseAppDistributionException, ExecutionException,
+          InterruptedException {
+    // Block thread actually making the request on a latch, which gives us time to add listeners to
+    // the returned UpdateTask in time to get all the progress updates
+    CountDownLatch countDownLatch = mockOpenConnectionWithLatch();
+
+    // Start update twice
     UpdateTask updateTask1 = aabUpdater.updateAab(TEST_RELEASE_NEWER_AAB_INTERNAL);
     UpdateTask updateTask2 = aabUpdater.updateAab(TEST_RELEASE_NEWER_AAB_INTERNAL);
 
-    assertEquals(updateTask1, updateTask2);
+    // Listen for progress events
+    List<UpdateProgress> progressEvents1 = new ArrayList<>();
+    updateTask1.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents1::add);
+    List<UpdateProgress> progressEvents2 = new ArrayList<>();
+    updateTask2.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents2::add);
+    countDownLatch.countDown();
+    awaitCondition(() -> progressEvents1.size() == 1);
+    awaitCondition(() -> progressEvents2.size() == 1);
+
+    verify(mockHttpsUrlConnectionFactory, times(1)).openConnection(anyString());
+  }
+
+  private CountDownLatch mockOpenConnectionWithLatch() throws IOException {
+    CountDownLatch countDownLatch = new CountDownLatch(1);
+    when(mockHttpsUrlConnectionFactory.openConnection(TEST_URL))
+        .thenAnswer(
+            invocation -> {
+              try {
+                countDownLatch.await();
+              } catch (InterruptedException e) {
+                throw new AssertionError("Interrupted while waiting in mock");
+              }
+              return mockHttpsUrlConnection;
+            });
+    return countDownLatch;
   }
 }
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/ApkInstallerTests.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ApkInstallerTests.java
similarity index 55%
rename from firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/ApkInstallerTests.java
rename to firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ApkInstallerTests.java
index 647195e5200..3c13ec2dbf9 100644
--- a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/ApkInstallerTests.java
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ApkInstallerTests.java
@@ -12,16 +12,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.INSTALLATION_FAILURE;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitAsyncOperations;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTaskFailure;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.robolectric.Shadows.shadowOf;
 
+import android.app.Activity;
 import android.content.Intent;
 import com.google.android.gms.tasks.Task;
-import com.google.firebase.appdistribution.FirebaseAppDistributionTest.TestActivity;
-import com.google.firebase.appdistribution.internal.InstallActivity;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.impl.FirebaseAppDistributionServiceImplTest.TestActivity;
+import com.google.firebase.concurrent.TestOnlyExecutors;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,6 +50,7 @@ public class ApkInstallerTests {
   private ShadowActivity shadowActivity;
   private ApkInstaller apkInstaller;
   @Mock private FirebaseAppDistributionLifecycleNotifier mockLifecycleNotifier;
+  @Lightweight private ExecutorService lightweightExecutor;
 
   @Before
   public void setUp() {
@@ -44,34 +58,21 @@ public void setUp() {
 
     activity = Robolectric.buildActivity(TestActivity.class).create().get();
     shadowActivity = shadowOf(activity);
-    apkInstaller = new ApkInstaller(mockLifecycleNotifier);
+    lightweightExecutor = TestOnlyExecutors.lite();
+    apkInstaller = new ApkInstaller(mockLifecycleNotifier, lightweightExecutor);
   }
 
   @Test
-  public void installApk_currentActivityNotNull_InstallIntentOnCurrentActivity() {
+  public void installApk_currentActivityNotNull_InstallIntentOnCurrentActivity()
+      throws InterruptedException {
     String path = "path";
     Task<Void> installTask = apkInstaller.installApk(path, activity);
+    awaitAsyncOperations(lightweightExecutor);
     Intent installIntent = shadowActivity.getNextStartedActivity();
 
     assertFalse(installTask.isComplete());
     assertEquals(
-        "com.google.firebase.appdistribution.internal.InstallActivity",
-        installIntent.getComponent().getShortClassName());
-    assertEquals(path, installIntent.getExtras().get("INSTALL_PATH"));
-  }
-
-  @Test
-  public void
-      setCurrentActivity_appInForegroundAfterAnInstallAttempt_installIntentOnCurrentActivity() {
-    apkInstaller.onActivityStarted(null);
-    String path = "path123";
-    Task<Void> installTask = apkInstaller.installApk(path, activity);
-    apkInstaller.onActivityStarted(activity);
-
-    Intent installIntent = shadowActivity.getNextStartedActivity();
-
-    assertEquals(
-        "com.google.firebase.appdistribution.internal.InstallActivity",
+        "com.google.firebase.appdistribution.impl.InstallActivity",
         installIntent.getComponent().getShortClassName());
     assertEquals(path, installIntent.getExtras().get("INSTALL_PATH"));
     assertFalse(installTask.isComplete());
@@ -81,14 +82,20 @@ public void installApk_currentActivityNotNull_InstallIntentOnCurrentActivity() {
   public void installActivityDestroyed_setsInstallError() {
     Task<Void> installTask = apkInstaller.installApk("path", activity);
     apkInstaller.onActivityDestroyed(new InstallActivity());
-    Exception ex = installTask.getException();
 
-    assert ex instanceof FirebaseAppDistributionException;
-    assertEquals(
-        FirebaseAppDistributionException.ErrorMessages.APK_INSTALLATION_FAILED,
-        ((FirebaseAppDistributionException) ex).getMessage());
-    assertEquals(
-        FirebaseAppDistributionException.Status.INSTALLATION_FAILURE,
-        ((FirebaseAppDistributionException) ex).getErrorCode());
+    awaitTaskFailure(installTask, INSTALLATION_FAILURE, ErrorMessages.APK_INSTALLATION_FAILED);
+  }
+
+  @Test
+  public void whenCalledMultipleTimes_onlyEmitsOneIntent()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    Activity mockActivity = mock(Activity.class);
+    doNothing().when(mockActivity).startActivity(any());
+
+    apkInstaller.installApk("path", mockActivity);
+    apkInstaller.installApk("path", mockActivity);
+    awaitAsyncOperations(lightweightExecutor);
+
+    verify(mockActivity, times(1)).startActivity(any());
   }
 }
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/ApkUpdaterTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ApkUpdaterTest.java
similarity index 58%
rename from firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/ApkUpdaterTest.java
rename to firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ApkUpdaterTest.java
index d8e5a6297d9..0b50b419cad 100644
--- a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/ApkUpdaterTest.java
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ApkUpdaterTest.java
@@ -12,31 +12,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.firebase.appdistribution.TestUtils.applyToForegroundActivityTaskAnswer;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitCondition;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTask;
 import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.Activity;
 import androidx.test.core.app.ApplicationProvider;
-import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.BinaryType;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.appdistribution.UpdateProgress;
+import com.google.firebase.appdistribution.UpdateStatus;
+import com.google.firebase.appdistribution.UpdateTask;
+import com.google.firebase.concurrent.FirebaseExecutors;
+import com.google.firebase.concurrent.TestOnlyExecutors;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 import javax.net.ssl.HttpsURLConnection;
 import org.junit.Before;
 import org.junit.Test;
@@ -55,6 +70,7 @@ public class ApkUpdaterTest {
   private static final String TEST_PROJECT_ID = "777777777777";
   private static final String TEST_URL = "https://test-url";
   private static final String TEST_CODE_HASH = "abcdefghijklmnopqrstuvwxyz";
+  private static final String TEST_FILE = "test_file";
   private static final long TEST_FILE_LENGTH = 1000;
   private TestActivity activity;
 
@@ -77,7 +93,8 @@ public class ApkUpdaterTest {
   @Mock private FirebaseAppDistributionNotificationsManager mockNotificationsManager;
   @Mock private FirebaseAppDistributionLifecycleNotifier mockLifecycleNotifier;
 
-  private final Executor testExecutor = Executors.newSingleThreadExecutor();
+  @Blocking private final ExecutorService blockingExecutor = TestOnlyExecutors.blocking();
+  @Lightweight private final ExecutorService lightweightExecutor = TestOnlyExecutors.lite();
 
   static class TestActivity extends Activity {}
 
@@ -102,19 +119,19 @@ public void setup() throws IOException, FirebaseAppDistributionException {
     when(mockFile.length()).thenReturn(TEST_FILE_LENGTH);
     when(mockHttpsUrlConnectionFactory.openConnection(TEST_URL)).thenReturn(mockHttpsUrlConnection);
     when(mockHttpsUrlConnection.getResponseCode()).thenReturn(200);
-    when(mockLifecycleNotifier.applyToForegroundActivityTask(any()))
-        .thenAnswer(applyToForegroundActivityTaskAnswer(activity));
+    TestUtils.mockForegroundActivity(mockLifecycleNotifier, activity);
     onCompleteListener = new TestOnCompleteListener<>();
 
     apkUpdater =
         Mockito.spy(
             new ApkUpdater(
-                testExecutor,
                 ApplicationProvider.getApplicationContext(),
                 mockApkInstaller,
                 mockNotificationsManager,
                 mockHttpsUrlConnectionFactory,
-                mockLifecycleNotifier));
+                mockLifecycleNotifier,
+                blockingExecutor,
+                lightweightExecutor));
   }
 
   @Test
@@ -122,8 +139,8 @@ public void updateApk_whenOpenConnectionFails_setsNetworkFailure() throws Except
     IOException caughtException = new IOException("error");
     when(mockHttpsUrlConnectionFactory.openConnection(TEST_URL)).thenThrow(caughtException);
 
-    UpdateTaskImpl updateTask = apkUpdater.updateApk(TEST_RELEASE, false);
-    updateTask.addOnCompleteListener(testExecutor, onCompleteListener);
+    UpdateTask updateTask = apkUpdater.updateApk(TEST_RELEASE, false);
+    updateTask.addOnCompleteListener(lightweightExecutor, onCompleteListener);
     FirebaseAppDistributionException e =
         assertThrows(FirebaseAppDistributionException.class, () -> onCompleteListener.await());
 
@@ -136,8 +153,8 @@ public void updateApk_whenOpenConnectionFails_setsNetworkFailure() throws Except
   public void updateApk_whenResponseStatusIsError_setsDownloadFailure() throws Exception {
     when(mockHttpsUrlConnection.getResponseCode()).thenReturn(400);
 
-    UpdateTaskImpl updateTask = apkUpdater.updateApk(TEST_RELEASE, false);
-    updateTask.addOnCompleteListener(testExecutor, onCompleteListener);
+    UpdateTask updateTask = apkUpdater.updateApk(TEST_RELEASE, false);
+    updateTask.addOnCompleteListener(lightweightExecutor, onCompleteListener);
     FirebaseAppDistributionException e =
         assertThrows(FirebaseAppDistributionException.class, () -> onCompleteListener.await());
 
@@ -150,24 +167,73 @@ public void updateApk_whenCannotReadInputStream_setsDownloadFailure() throws Exc
     IOException caughtException = new IOException("error");
     when(mockHttpsUrlConnection.getInputStream()).thenThrow(caughtException);
 
-    UpdateTaskImpl updateTask = apkUpdater.updateApk(TEST_RELEASE, false);
-    updateTask.addOnCompleteListener(testExecutor, onCompleteListener);
+    UpdateTask updateTask = apkUpdater.updateApk(TEST_RELEASE, true);
+    updateTask.addOnCompleteListener(lightweightExecutor, onCompleteListener);
     FirebaseAppDistributionException e =
         assertThrows(FirebaseAppDistributionException.class, () -> onCompleteListener.await());
 
     assertThat(e.getErrorCode()).isEqualTo(Status.DOWNLOAD_FAILURE);
     assertThat(e).hasMessageThat().contains("Failed to download APK");
     assertThat(e).hasCauseThat().isEqualTo(caughtException);
+    verify(mockNotificationsManager).showAppUpdateNotification(0, 0, R.string.download_failed);
   }
 
   @Test
-  public void updateApk_whenInstallSuccessful_setsResult() throws Exception {
-    doReturn(Tasks.forResult(mockFile)).when(apkUpdater).downloadApk(TEST_RELEASE, false);
+  public void updateApk_whenSuccessfullyUpdated_notificationsSetCorrectly()
+      throws FirebaseAppDistributionException, InterruptedException, IOException {
+    doReturn(new ByteArrayInputStream(TEST_FILE.getBytes()))
+        .when(mockHttpsUrlConnection)
+        .getInputStream();
+    // Block thread actually making the request on a latch, which gives us time to add listeners to
+    // the returned UpdateTask in time to get all the progress updates
+    CountDownLatch countDownLatch = new CountDownLatch(1);
+    when(mockHttpsUrlConnectionFactory.openConnection(TEST_URL))
+        .thenAnswer(
+            invocation -> {
+              try {
+                countDownLatch.await();
+              } catch (InterruptedException e) {
+                throw new AssertionError("Interrupted while waiting in mock");
+              }
+              return mockHttpsUrlConnection;
+            });
+    doNothing().when(apkUpdater).validateJarFile(any(), anyLong(), anyBoolean(), anyLong());
     when(mockApkInstaller.installApk(any(), any())).thenReturn(Tasks.forResult(null));
-    UpdateTaskImpl updateTask = apkUpdater.updateApk(TEST_RELEASE, false);
-    updateTask.addOnCompleteListener(testExecutor, onCompleteListener);
-    onCompleteListener.await();
-    assertThat(updateTask.isSuccessful()).isTrue();
+
+    // Start the update
+    UpdateTask updateTask = apkUpdater.updateApk(TEST_RELEASE, true);
+
+    // Listen for progress events
+    List<UpdateProgress> events = new ArrayList<>();
+    updateTask.addOnProgressListener(FirebaseExecutors.directExecutor(), events::add);
+    countDownLatch.countDown();
+    awaitCondition(() -> events.size() == 3);
+
+    assertThat(events.get(0).getUpdateStatus()).isEqualTo(UpdateStatus.PENDING);
+    assertThat(events.get(1).getUpdateStatus()).isEqualTo(UpdateStatus.DOWNLOADING);
+    assertThat(events.get(1).getApkBytesDownloaded()).isEqualTo(TEST_FILE.length());
+    assertThat(events.get(2).getUpdateStatus()).isEqualTo(UpdateStatus.DOWNLOADED);
+  }
+
+  @Test
+  public void updateApk_invalidJarFile_throwsException() throws IOException {
+    doReturn(new ByteArrayInputStream(TEST_FILE.getBytes()))
+        .when(mockHttpsUrlConnection)
+        .getInputStream();
+    when(mockApkInstaller.installApk(any(), any())).thenReturn(Tasks.forResult(null));
+
+    // If validateJarFile is not mocked it will be called with an invalid jar file.
+    UpdateTask updateTask = apkUpdater.updateApk(TEST_RELEASE, true);
+    updateTask.addOnCompleteListener(lightweightExecutor, onCompleteListener);
+    FirebaseAppDistributionException e =
+        assertThrows(FirebaseAppDistributionException.class, () -> onCompleteListener.await());
+
+    assertThat(e.getErrorCode()).isEqualTo(Status.DOWNLOAD_FAILURE);
+    assertThat(updateTask.isSuccessful()).isFalse();
+
+    // Verify that the notification in validateJarFile is set.
+    verify(mockNotificationsManager)
+        .showAppUpdateNotification(0, TEST_FILE.length(), R.string.download_failed);
   }
 
   @Test
@@ -180,23 +246,22 @@ public void updateApk_whenInstallFailed_setsError() {
     when(mockApkInstaller.installApk(any(), any()))
         .thenReturn(installTaskCompletionSource.getTask());
     UpdateTask updateTask = apkUpdater.updateApk(TEST_RELEASE, showNotification);
-    updateTask.addOnCompleteListener(testExecutor, onCompleteListener);
+    updateTask.addOnCompleteListener(lightweightExecutor, onCompleteListener);
     List<UpdateProgress> progressEvents = new ArrayList<>();
-    updateTask.addOnProgressListener(testExecutor, progressEvents::add);
+    updateTask.addOnProgressListener(lightweightExecutor, progressEvents::add);
 
     installTaskCompletionSource.setException(
         new FirebaseAppDistributionException(
-            FirebaseAppDistributionException.ErrorMessages.APK_INSTALLATION_FAILED,
+            ErrorMessages.APK_INSTALLATION_FAILED,
             FirebaseAppDistributionException.Status.INSTALLATION_FAILURE));
 
-    assertThat(updateTask.isComplete()).isFalse();
     FirebaseAppDistributionException e =
         assertThrows(FirebaseAppDistributionException.class, () -> onCompleteListener.await());
     assertThat(e.getErrorCode()).isEqualTo(Status.INSTALLATION_FAILURE);
     assertThat(progressEvents).hasSize(1);
     assertThat(progressEvents.get(0).getUpdateStatus()).isEqualTo(UpdateStatus.INSTALL_FAILED);
     assertThat(updateTask.isSuccessful()).isFalse();
-    verify(mockNotificationsManager).updateNotification(1000, 1000, UpdateStatus.INSTALL_FAILED);
+    verify(mockNotificationsManager).showAppUpdateNotification(1000, 1000, R.string.install_failed);
   }
 
   @Test
@@ -209,12 +274,11 @@ public void updateApk_showNotificationFalse_doesNotUpdateNotificationManager() {
     when(mockApkInstaller.installApk(any(), any()))
         .thenReturn(installTaskCompletionSource.getTask());
     UpdateTask updateTask = apkUpdater.updateApk(TEST_RELEASE, showNotification);
-    updateTask.addOnCompleteListener(testExecutor, onCompleteListener);
+    updateTask.addOnCompleteListener(lightweightExecutor, onCompleteListener);
 
     installTaskCompletionSource.setException(
         new FirebaseAppDistributionException(
-            FirebaseAppDistributionException.ErrorMessages.APK_INSTALLATION_FAILED,
-            Status.INSTALLATION_FAILURE));
+            ErrorMessages.APK_INSTALLATION_FAILED, Status.INSTALLATION_FAILURE));
 
     FirebaseAppDistributionException e =
         assertThrows(FirebaseAppDistributionException.class, () -> onCompleteListener.await());
@@ -223,19 +287,21 @@ public void updateApk_showNotificationFalse_doesNotUpdateNotificationManager() {
   }
 
   @Test
-  public void downloadApk_whenCalledMultipleTimes_returnsSameTask() {
-    Task<File> task1 = apkUpdater.downloadApk(TEST_RELEASE, false);
-    Task<File> task2 = apkUpdater.downloadApk(TEST_RELEASE, false);
-    assertThat(task1).isEqualTo(task2);
-  }
-
-  @Test
-  public void updateApp_whenCalledMultipleTimesWithApk_returnsSameUpdateTask() {
+  public void updateApp_whenCalledMultipleTimesWithApk_onlyDownloadsApkOnce()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
     doReturn(Tasks.forResult(mockFile)).when(apkUpdater).downloadApk(TEST_RELEASE, false);
+    TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
+    when(mockApkInstaller.installApk(any(), any())).thenReturn(taskCompletionSource.getTask());
 
     UpdateTask updateTask1 = apkUpdater.updateApk(TEST_RELEASE, false);
     UpdateTask updateTask2 = apkUpdater.updateApk(TEST_RELEASE, false);
 
-    assertThat(updateTask1).isEqualTo(updateTask2);
+    // Don't set the result until after calling twice, to make sure that the task from the first
+    // call is still ongoing.
+    taskCompletionSource.setResult(null);
+    awaitTask(updateTask1);
+    awaitTask(updateTask2);
+
+    verify(apkUpdater, times(1)).downloadApk(TEST_RELEASE, false);
   }
 }
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/AppIconSourceTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/AppIconSourceTest.java
similarity index 98%
rename from firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/AppIconSourceTest.java
rename to firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/AppIconSourceTest.java
index 63e867d544f..ef748897442 100644
--- a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/AppIconSourceTest.java
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/AppIconSourceTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FeedbackSenderTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FeedbackSenderTest.java
new file mode 100644
index 00000000000..d4366d3853f
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FeedbackSenderTest.java
@@ -0,0 +1,270 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.firebase.appdistribution.impl.FeedbackSender.CONTENT_TYPE_JPEG;
+import static com.google.firebase.appdistribution.impl.FeedbackSender.CONTENT_TYPE_PNG;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.concurrent.TestOnlyExecutors;
+import java.util.concurrent.Executor;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class FeedbackSenderTest {
+  private static final String TEST_RELEASE_NAME = "release-name";
+  private static final String TEST_FEEDBACK_NAME = "feedback-name";
+  private static final String TEST_FEEDBACK_TEXT = "Feedback text";
+  private static final String TEST_FILENAME_PNG = "test.png";
+  private static final Uri TEST_SCREENSHOT_URI_PNG = uriForFilename(TEST_FILENAME_PNG);
+
+  @Lightweight private final Executor lightweightExecutor = TestOnlyExecutors.lite();
+
+  @Mock private FirebaseAppDistributionTesterApiClient mockTesterApiClient;
+  @Mock private ContentResolver mockContentResolver;
+  @Mock private Cursor mockCursor;
+
+  private FeedbackSender feedbackSender;
+
+  @Before
+  public void setup() {
+    MockitoAnnotations.initMocks(this);
+    feedbackSender =
+        new FeedbackSender(mockContentResolver, mockTesterApiClient, lightweightExecutor);
+
+    when(mockTesterApiClient.createFeedback(TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT))
+        .thenReturn(Tasks.forResult(TEST_FEEDBACK_NAME));
+    when(mockTesterApiClient.attachScreenshot(eq(TEST_FEEDBACK_NAME), any(), any(), any()))
+        .thenReturn(Tasks.forResult(TEST_FEEDBACK_NAME));
+    when(mockTesterApiClient.commitFeedback(TEST_FEEDBACK_NAME, FeedbackTrigger.CUSTOM))
+        .thenReturn(Tasks.forResult(null));
+  }
+
+  @Test
+  public void sendFeedbackPng() throws Exception {
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, TEST_SCREENSHOT_URI_PNG, FeedbackTrigger.CUSTOM);
+    TestUtils.awaitTask(task);
+
+    verifyTesterApiCalls(TEST_SCREENSHOT_URI_PNG, TEST_FILENAME_PNG, CONTENT_TYPE_PNG);
+  }
+
+  @Test
+  public void sendFeedbackJpg() throws Exception {
+    String jpegFilename = "test.jpg"; // jpg, not jpeg
+    Uri jpegUri = uriForFilename(jpegFilename);
+
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, jpegUri, FeedbackTrigger.CUSTOM);
+    TestUtils.awaitTask(task);
+
+    verifyTesterApiCalls(jpegUri, jpegFilename, CONTENT_TYPE_JPEG);
+  }
+
+  @Test
+  public void sendFeedbackJpeg() throws Exception {
+    String jpegFilename = "test.jpeg"; // jpeg, not jpg
+    Uri jpegUri = uriForFilename(jpegFilename);
+
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, jpegUri, FeedbackTrigger.CUSTOM);
+    TestUtils.awaitTask(task);
+
+    verifyTesterApiCalls(jpegUri, jpegFilename, CONTENT_TYPE_JPEG);
+  }
+
+  @Test
+  public void sendFeedbackContentPng() throws Exception {
+    Uri contentUri = Uri.parse("content://some/path");
+    String filename = "test.png";
+    when(mockContentResolver.query(eq(contentUri), any(), any(), any(), any()))
+        .thenReturn(mockCursor);
+    when(mockContentResolver.getType(contentUri)).thenReturn(CONTENT_TYPE_PNG);
+    when(mockCursor.getString(anyInt())).thenReturn(filename);
+
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, contentUri, FeedbackTrigger.CUSTOM);
+    TestUtils.awaitTask(task);
+
+    verifyTesterApiCalls(contentUri, filename, CONTENT_TYPE_PNG);
+  }
+
+  @Test
+  public void sendFeedbackContentJpeg() throws Exception {
+    Uri contentUri = Uri.parse("content://some/path");
+    String filename = "test.jpeg";
+    when(mockContentResolver.query(eq(contentUri), any(), any(), any(), any()))
+        .thenReturn(mockCursor);
+    when(mockContentResolver.getType(contentUri)).thenReturn(CONTENT_TYPE_JPEG);
+    when(mockCursor.getString(anyInt())).thenReturn(filename);
+
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, contentUri, FeedbackTrigger.CUSTOM);
+    TestUtils.awaitTask(task);
+
+    verifyTesterApiCalls(contentUri, filename, CONTENT_TYPE_JPEG);
+  }
+
+  @Test
+  public void sendFeedbackContentPngNoFilename() throws Exception {
+    Uri contentUri = Uri.parse("content://some/path");
+    when(mockContentResolver.query(eq(contentUri), any(), any(), any(), any())).thenReturn(null);
+    when(mockContentResolver.getType(contentUri)).thenReturn(CONTENT_TYPE_PNG);
+
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, contentUri, FeedbackTrigger.CUSTOM);
+    TestUtils.awaitTask(task);
+
+    verifyTesterApiCalls(contentUri, "screenshot.png", CONTENT_TYPE_PNG);
+  }
+
+  @Test
+  public void sendFeedbackContentJpgNoFilename() throws Exception {
+    Uri contentUri = Uri.parse("content://some/path");
+    when(mockContentResolver.query(eq(contentUri), any(), any(), any(), any())).thenReturn(null);
+    when(mockContentResolver.getType(contentUri)).thenReturn(CONTENT_TYPE_JPEG);
+
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, contentUri, FeedbackTrigger.CUSTOM);
+    TestUtils.awaitTask(task);
+
+    verifyTesterApiCalls(contentUri, "screenshot.jpg", CONTENT_TYPE_JPEG);
+  }
+
+  @Test
+  public void sendFeedbackContentNullContentType_fallsBackToPng() throws Exception {
+    Uri contentUri = Uri.parse("content://some/path");
+    String filename = "test.foo";
+    when(mockContentResolver.query(eq(contentUri), any(), any(), any(), any()))
+        .thenReturn(mockCursor);
+    when(mockContentResolver.getType(contentUri)).thenReturn(null);
+    when(mockCursor.getString(anyInt())).thenReturn(filename);
+
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, contentUri, FeedbackTrigger.CUSTOM);
+    TestUtils.awaitTask(task);
+
+    verifyTesterApiCalls(contentUri, filename, CONTENT_TYPE_PNG);
+  }
+
+  @Test
+  public void sendFeedbackContentUnknown_fallsBackToPng() throws Exception {
+    Uri contentUri = Uri.parse("content://some/path");
+    String filename = "test.foo";
+    when(mockContentResolver.query(eq(contentUri), any(), any(), any(), any()))
+        .thenReturn(mockCursor);
+    when(mockContentResolver.getType(contentUri)).thenReturn(null);
+    when(mockCursor.getString(anyInt())).thenReturn(filename);
+
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, contentUri, FeedbackTrigger.CUSTOM);
+    TestUtils.awaitTask(task);
+
+    verifyTesterApiCalls(contentUri, filename, CONTENT_TYPE_PNG);
+  }
+
+  @Test
+  public void sendFeedback_withoutScreenshot_success() throws Exception {
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, /* screenshot= */ null, FeedbackTrigger.CUSTOM);
+    TestUtils.awaitTask(task);
+
+    verify(mockTesterApiClient).createFeedback(TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT);
+    verify(mockTesterApiClient).commitFeedback(TEST_FEEDBACK_NAME, FeedbackTrigger.CUSTOM);
+    verify(mockTesterApiClient, never()).attachScreenshot(any(), any(), any(), any());
+  }
+
+  @Test
+  public void sendFeedback_createFeedbackFails_failsTask() {
+    FirebaseAppDistributionException cause =
+        new FirebaseAppDistributionException("test ex", Status.AUTHENTICATION_FAILURE);
+    when(mockTesterApiClient.createFeedback(TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT))
+        .thenReturn(Tasks.forException(cause));
+
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, TEST_SCREENSHOT_URI_PNG, FeedbackTrigger.CUSTOM);
+
+    TestUtils.awaitTaskFailure(task, Status.AUTHENTICATION_FAILURE, "test ex");
+  }
+
+  @Test
+  public void sendFeedback_attachScreenshotFails_failsTask() {
+    FirebaseAppDistributionException cause =
+        new FirebaseAppDistributionException("test ex", Status.AUTHENTICATION_FAILURE);
+    when(mockTesterApiClient.attachScreenshot(
+            TEST_FEEDBACK_NAME, TEST_SCREENSHOT_URI_PNG, TEST_FILENAME_PNG, CONTENT_TYPE_PNG))
+        .thenReturn(Tasks.forException(cause));
+
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, TEST_SCREENSHOT_URI_PNG, FeedbackTrigger.CUSTOM);
+
+    TestUtils.awaitTaskFailure(task, Status.AUTHENTICATION_FAILURE, "test ex");
+  }
+
+  @Test
+  public void sendFeedback_commitFeedbackFails_failsTask() {
+    FirebaseAppDistributionException cause =
+        new FirebaseAppDistributionException("test ex", Status.AUTHENTICATION_FAILURE);
+    when(mockTesterApiClient.commitFeedback(TEST_FEEDBACK_NAME, FeedbackTrigger.CUSTOM))
+        .thenReturn(Tasks.forException(cause));
+
+    Task<Void> task =
+        feedbackSender.sendFeedback(
+            TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT, TEST_SCREENSHOT_URI_PNG, FeedbackTrigger.CUSTOM);
+
+    TestUtils.awaitTaskFailure(task, Status.AUTHENTICATION_FAILURE, "test ex");
+  }
+
+  private void verifyTesterApiCalls(Uri uri, String filename, String contentType) {
+    verify(mockTesterApiClient).createFeedback(TEST_RELEASE_NAME, TEST_FEEDBACK_TEXT);
+    verify(mockTesterApiClient).attachScreenshot(TEST_FEEDBACK_NAME, uri, filename, contentType);
+    verify(mockTesterApiClient).commitFeedback(TEST_FEEDBACK_NAME, FeedbackTrigger.CUSTOM);
+  }
+
+  private static Uri uriForFilename(String filename) {
+    return Uri.fromFile(ApplicationProvider.getApplicationContext().getFileStreamPath(filename));
+  }
+}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionLifecycleNotifierTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionLifecycleNotifierTest.java
new file mode 100644
index 00000000000..16870971f91
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionLifecycleNotifierTest.java
@@ -0,0 +1,310 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTaskFailure;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import com.google.android.gms.tasks.SuccessContinuation;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.appdistribution.impl.FirebaseAppDistributionLifecycleNotifier.ActivityConsumer;
+import com.google.firebase.appdistribution.impl.FirebaseAppDistributionLifecycleNotifier.ActivityFunction;
+import com.google.firebase.appdistribution.impl.FirebaseAppDistributionLifecycleNotifier.NullableActivityFunction;
+import com.google.firebase.concurrent.TestOnlyExecutors;
+import java.util.concurrent.Executor;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class FirebaseAppDistributionLifecycleNotifierTest {
+
+  static class TestActivity extends Activity {}
+
+  static class OtherTestActivity extends Activity {}
+
+  private final @UiThread Executor uiThreadExecutor = TestOnlyExecutors.ui();
+
+  @Captor private ArgumentCaptor<Activity> activityArgCaptor;
+  private TestActivity activity;
+  private OtherTestActivity otherActivity;
+  private FirebaseAppDistributionLifecycleNotifier lifecycleNotifier;
+
+  @Before
+  public void setup() {
+    MockitoAnnotations.initMocks(this);
+    activity = Robolectric.buildActivity(TestActivity.class).create().get();
+    otherActivity = Robolectric.buildActivity(OtherTestActivity.class).create().get();
+    lifecycleNotifier = new FirebaseAppDistributionLifecycleNotifier(uiThreadExecutor);
+  }
+
+  @Test
+  public void consumeForegroundActivity_noCurrentActivity_succeedsAndCallsConsumer() {
+    ActivityConsumer consumer = mock(ActivityConsumer.class);
+    Task<Void> task = lifecycleNotifier.consumeForegroundActivity(consumer);
+
+    // Simulate an activity resuming
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(activity);
+
+    assertThat(task.isComplete()).isTrue();
+    assertThat(task.isSuccessful()).isTrue();
+    assertThat(task.getResult()).isNull();
+    verify(consumer).consume(activity);
+  }
+
+  @Test
+  public void consumeForegroundActivity_withCurrentActivity_succeedsAndCallsConsumer() {
+    // Resume an activity so there is a current foreground activity already when
+    // consumeForegroundActivity is called
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(activity);
+
+    ActivityConsumer consumer = mock(ActivityConsumer.class);
+    Task<Void> task = lifecycleNotifier.consumeForegroundActivity(consumer);
+
+    assertThat(task.isComplete()).isTrue();
+    assertThat(task.isSuccessful()).isTrue();
+    assertThat(task.getResult()).isEqualTo(null);
+    verify(consumer).consume(activity);
+  }
+
+  @Test
+  public void consumeForegroundActivity_consumerThrows_fails() {
+    RuntimeException consumerException = new RuntimeException("exception in consumer");
+    ActivityConsumer consumer = mock(ActivityConsumer.class);
+    doThrow(consumerException).when(consumer).consume(activity);
+    Task<Void> task = lifecycleNotifier.consumeForegroundActivity(consumer);
+
+    // Simulate an activity resuming
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(activity);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "Unknown", consumerException);
+  }
+
+  @Test
+  public void applyToForegroundActivity_noCurrentActivity_succeedsAndReturnsValue()
+      throws FirebaseAppDistributionException {
+    ActivityFunction<String> function = mock(ActivityFunction.class);
+    when(function.apply(activity)).thenReturn("return-value");
+    Task<String> task = lifecycleNotifier.applyToForegroundActivity(function);
+
+    // Simulate an activity resuming
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(activity);
+
+    assertThat(task.isComplete()).isTrue();
+    assertThat(task.isSuccessful()).isTrue();
+    assertThat(task.getResult()).isEqualTo("return-value");
+  }
+
+  @Test
+  public void applyToForegroundActivity_withCurrentActivity_succeedsAndReturnsValue()
+      throws FirebaseAppDistributionException {
+    ActivityFunction<String> function = mock(ActivityFunction.class);
+    when(function.apply(activity)).thenReturn("return-value");
+    // Resume an activity so there is a current foreground activity already when
+    // applyToForegroundActivity is called
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(activity);
+
+    Task<String> task = lifecycleNotifier.applyToForegroundActivity(function);
+
+    assertThat(task.isComplete()).isTrue();
+    assertThat(task.isSuccessful()).isTrue();
+    assertThat(task.getResult()).isEqualTo("return-value");
+  }
+
+  @Test
+  public void applyToForegroundActivity_functionThrows_fails()
+      throws FirebaseAppDistributionException {
+    RuntimeException functionException = new RuntimeException("exception in function");
+    ActivityFunction<String> function = mock(ActivityFunction.class);
+    doThrow(functionException).when(function).apply(activity);
+    Task<String> task = lifecycleNotifier.applyToForegroundActivity(function);
+
+    // Simulate an activity resuming
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(activity);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "Unknown", functionException);
+  }
+
+  @Test
+  public void applyToForegroundActivityTask_withCurrentActivity_succeedsAndCallsConsumer()
+      throws Exception {
+    // Resume an activity so there is a current foreground activity already when
+    // applyToForegroundActivityTask is called
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(activity);
+
+    SuccessContinuation<Activity, String> continuation = mock(SuccessContinuation.class);
+    when(continuation.then(activity)).thenReturn(Tasks.forResult("result"));
+    Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
+
+    assertThat(task.isComplete()).isTrue();
+    assertThat(task.isSuccessful()).isTrue();
+    assertThat(task.getResult()).isEqualTo("result");
+  }
+
+  @Test
+  public void applyToForegroundActivityTask_noCurrentActivity_succeedsAndCallsConsumer()
+      throws Exception {
+    SuccessContinuation<Activity, String> continuation = mock(SuccessContinuation.class);
+    when(continuation.then(activity)).thenReturn(Tasks.forResult("result"));
+    Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
+
+    // Simulate an activity resuming
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(activity);
+
+    assertThat(task.isComplete()).isTrue();
+    assertThat(task.isSuccessful()).isTrue();
+    assertThat(task.getResult()).isEqualTo("result");
+  }
+
+  @Test
+  public void applyToForegroundActivityTask_continuationThrows_fails() throws Exception {
+    SuccessContinuation<Activity, String> continuation = mock(SuccessContinuation.class);
+    FirebaseAppDistributionException continuationException =
+        new FirebaseAppDistributionException(
+            "exception in continuation task", Status.AUTHENTICATION_CANCELED);
+    when(continuation.then(activity)).thenThrow(continuationException);
+    Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
+
+    // Simulate an activity resuming
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(activity);
+
+    awaitTaskFailure(task, Status.AUTHENTICATION_CANCELED, "exception in continuation task");
+  }
+
+  @Test
+  public void applyToForegroundActivityTask_continuationThrowsUnknownException_wrapsException()
+      throws Exception {
+    SuccessContinuation<Activity, String> continuation = mock(SuccessContinuation.class);
+    RuntimeException continuationException = new RuntimeException("exception in continuation");
+    when(continuation.then(activity)).thenThrow(continuationException);
+    Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
+
+    // Simulate an activity resuming
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(activity);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "Unknown", continuationException);
+  }
+
+  @Test
+  public void applyToForegroundActivityTask_continuationTaskFails_failsWithSameException()
+      throws Exception {
+    SuccessContinuation<Activity, String> continuation = mock(SuccessContinuation.class);
+    RuntimeException continuationException = new RuntimeException("exception in continuation");
+    when(continuation.then(activity)).thenReturn(Tasks.forException(continuationException));
+    Task<String> task = lifecycleNotifier.applyToForegroundActivityTask(continuation);
+
+    // Simulate an activity resuming
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(activity);
+
+    assertThat(task.isSuccessful()).isFalse();
+    assertThat(task.getException()).isInstanceOf(RuntimeException.class);
+    RuntimeException e = (RuntimeException) task.getException();
+    assertThat(e).hasMessageThat().isEqualTo("exception in continuation");
+  }
+
+  @Test
+  public void applyToNullableForegroundActivity_ignoringOtherActivity_completesWithCurrentActivity()
+      throws FirebaseAppDistributionException {
+    NullableActivityFunction<String> function = mock(NullableActivityFunction.class);
+    when(function.apply(any())).thenReturn("return-value");
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(
+        activity); // Current activity is a TestActivity
+
+    Task<String> task =
+        lifecycleNotifier.applyToNullableForegroundActivity(OtherTestActivity.class, function);
+
+    verify(function).apply(activityArgCaptor.capture());
+    assertThat(activityArgCaptor.getValue()).isEqualTo(activity);
+    assertThat(task.isComplete()).isTrue();
+    assertThat(task.isSuccessful()).isTrue();
+    assertThat(task.getResult()).isEqualTo("return-value");
+  }
+
+  @Test
+  public void applyToNullableForegroundActivity_ignoringCurrentActivity_returnsPreviousActivity()
+      throws FirebaseAppDistributionException {
+    NullableActivityFunction<String> function = mock(NullableActivityFunction.class);
+    when(function.apply(any())).thenReturn("return-value");
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(
+        activity); // First activity is a TestActivity
+    lifecycleNotifier.lifecycleCallbacks.onActivityPaused(activity);
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(
+        otherActivity); // Second activity is a OtherTestActivity
+
+    Task<String> task =
+        lifecycleNotifier.applyToNullableForegroundActivity(OtherTestActivity.class, function);
+
+    verify(function).apply(activityArgCaptor.capture());
+    assertThat(activityArgCaptor.getValue()).isEqualTo(activity);
+    assertThat(task.isComplete()).isTrue();
+    assertThat(task.isSuccessful()).isTrue();
+    assertThat(task.getResult()).isEqualTo("return-value");
+  }
+
+  @Test
+  public void applyToNullableForegroundActivity_previousActivityDestroyed_completesWithNull()
+      throws FirebaseAppDistributionException {
+    NullableActivityFunction<String> function = mock(NullableActivityFunction.class);
+    when(function.apply(any())).thenReturn("return-value");
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(
+        activity); // First activity is a TestActivity
+    lifecycleNotifier.lifecycleCallbacks.onActivityPaused(activity);
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(
+        otherActivity); // Second activity is a OtherTestActivity
+    lifecycleNotifier.lifecycleCallbacks.onActivityDestroyed(activity);
+
+    Task<String> task =
+        lifecycleNotifier.applyToNullableForegroundActivity(OtherTestActivity.class, function);
+
+    verify(function).apply(activityArgCaptor.capture());
+    assertThat(activityArgCaptor.getValue()).isNull();
+    assertThat(task.isComplete()).isTrue();
+    assertThat(task.isSuccessful()).isTrue();
+    assertThat(task.getResult()).isEqualTo("return-value");
+  }
+
+  @Test
+  public void applyToNullableForegroundActivity_noPreviousActivity_completesWithNull()
+      throws FirebaseAppDistributionException {
+    NullableActivityFunction<String> function = mock(NullableActivityFunction.class);
+    when(function.apply(any())).thenReturn("return-value");
+    lifecycleNotifier.lifecycleCallbacks.onActivityResumed(
+        activity); // Current activity is a TestActivity
+
+    Task<String> task =
+        lifecycleNotifier.applyToNullableForegroundActivity(TestActivity.class, function);
+
+    verify(function).apply(activityArgCaptor.capture());
+    assertThat(activityArgCaptor.getValue()).isNull();
+    assertThat(task.isComplete()).isTrue();
+    assertThat(task.isSuccessful()).isTrue();
+    assertThat(task.getResult()).isEqualTo("return-value");
+  }
+}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionNotificationsManagerTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionNotificationsManagerTest.java
new file mode 100644
index 00000000000..e402ed19eb9
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionNotificationsManagerTest.java
@@ -0,0 +1,247 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.content.Context.NOTIFICATION_SERVICE;
+import static android.os.Looper.getMainLooper;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.appdistribution.InterruptionLevel.DEFAULT;
+import static com.google.firebase.appdistribution.impl.FirebaseAppDistributionNotificationsManager.CHANNEL_GROUP_ID;
+import static com.google.firebase.appdistribution.impl.FirebaseAppDistributionNotificationsManager.NotificationType.APP_UPDATE;
+import static com.google.firebase.appdistribution.impl.FirebaseAppDistributionNotificationsManager.NotificationType.FEEDBACK;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Intent;
+import androidx.test.core.app.ApplicationProvider;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.appdistribution.InterruptionLevel;
+import com.google.firebase.concurrent.TestOnlyExecutors;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class FirebaseAppDistributionNotificationsManagerTest {
+
+  @UiThread private final Executor uiThreadExecutor = TestOnlyExecutors.ui();
+
+  private FirebaseAppDistributionNotificationsManager firebaseAppDistributionNotificationsManager;
+  private NotificationManager notificationManager;
+
+  @Mock private FirebaseAppDistributionLifecycleNotifier mockLifecycleNotifier;
+
+  @Lightweight @Mock private ScheduledExecutorService mockLightweightExecutorService;
+
+  @Mock ScheduledFuture<?> mockScheduledFuture;
+
+  @Before
+  public void setup() {
+    MockitoAnnotations.initMocks(this);
+    FirebaseApp.clearInstancesForTest();
+    notificationManager =
+        (NotificationManager)
+            ApplicationProvider.getApplicationContext().getSystemService(NOTIFICATION_SERVICE);
+    firebaseAppDistributionNotificationsManager =
+        new FirebaseAppDistributionNotificationsManager(
+            ApplicationProvider.getApplicationContext(),
+            new AppIconSource(),
+            mockLifecycleNotifier,
+            mockLightweightExecutorService,
+            uiThreadExecutor);
+  }
+
+  @Test
+  public void showAppUpdateNotification_createsGroupAndChannel() {
+    firebaseAppDistributionNotificationsManager.showAppUpdateNotification(
+        1000, 900, R.string.downloading_app_update);
+    assertThat(shadowOf(notificationManager).getNotificationChannelGroup(CHANNEL_GROUP_ID))
+        .isNotNull();
+    assertThat(shadowOf(notificationManager).getNotificationChannels()).hasSize(1);
+    NotificationChannel channel =
+        (NotificationChannel) shadowOf(notificationManager).getNotificationChannels().get(0);
+    assertThat(channel.getId()).isEqualTo(APP_UPDATE.channelId);
+  }
+
+  @Test
+  public void showAppUpdateNotification_withProgress() {
+    firebaseAppDistributionNotificationsManager.showAppUpdateNotification(
+        1000, 900, R.string.downloading_app_update);
+    assertThat(shadowOf(notificationManager).size()).isEqualTo(1);
+    Notification notification =
+        shadowOf(notificationManager).getNotification(APP_UPDATE.tag, APP_UPDATE.id);
+    assertThat(shadowOf(notification).getProgress()).isEqualTo(90);
+    assertThat(shadowOf(notification).getContentTitle().toString()).contains("Downloading");
+  }
+
+  @Test
+  public void showAppUpdateNotification_withError() {
+    firebaseAppDistributionNotificationsManager.showAppUpdateNotification(
+        1000, 1000, R.string.download_failed);
+    assertThat(shadowOf(notificationManager).size()).isEqualTo(1);
+    Notification notification =
+        shadowOf(notificationManager).getNotification(APP_UPDATE.tag, APP_UPDATE.id);
+    assertThat(shadowOf(notification).getProgress()).isEqualTo(100);
+    assertThat(shadowOf(notification).getContentTitle().toString()).contains("Download failed");
+  }
+
+  @Test
+  public void showAppUpdateNotification_withSuccess() {
+    firebaseAppDistributionNotificationsManager.showAppUpdateNotification(
+        1000, 1000, R.string.download_completed);
+    assertThat(shadowOf(notificationManager).size()).isEqualTo(1);
+    Notification notification =
+        shadowOf(notificationManager).getNotification(APP_UPDATE.tag, APP_UPDATE.id);
+    assertThat(shadowOf(notification).getProgress()).isEqualTo(100);
+    assertThat(shadowOf(notification).getContentTitle().toString()).contains("Download complete");
+  }
+
+  @Test
+  public void showAppUpdateNotification_withZeroTotalBytes_shows0Percent() {
+    firebaseAppDistributionNotificationsManager.showAppUpdateNotification(
+        0, 0, R.string.downloading_app_update);
+    assertThat(shadowOf(notificationManager).size()).isEqualTo(1);
+    Notification notification =
+        shadowOf(notificationManager).getNotification(APP_UPDATE.tag, APP_UPDATE.id);
+    assertThat(shadowOf(notification).getProgress()).isEqualTo(0);
+  }
+
+  @Test
+  public void showFeedbackNotification_createsGroupAndChannel() {
+    firebaseAppDistributionNotificationsManager.showFeedbackNotification(
+        "Terms and conditions", InterruptionLevel.HIGH);
+
+    shadowOf(getMainLooper()).idle(); // make sure main (UI) thread has finished executing
+    assertThat(shadowOf(notificationManager).getNotificationChannelGroup(CHANNEL_GROUP_ID))
+        .isNotNull();
+    assertThat(shadowOf(notificationManager).getNotificationChannels()).hasSize(1);
+    NotificationChannel channel =
+        (NotificationChannel) shadowOf(notificationManager).getNotificationChannels().get(0);
+    assertThat(channel.getImportance()).isEqualTo(IMPORTANCE_HIGH);
+    assertThat(channel.getId()).isEqualTo(FEEDBACK.channelId);
+  }
+
+  @Test
+  public void showFeedbackNotification_setsIntentToScreenshotActivity() {
+    firebaseAppDistributionNotificationsManager.showFeedbackNotification(
+        "Terms and conditions", InterruptionLevel.HIGH);
+
+    shadowOf(getMainLooper()).idle(); // make sure main (UI) thread has finished executing
+    assertThat(shadowOf(notificationManager).size()).isEqualTo(1);
+    Notification notification =
+        shadowOf(notificationManager).getNotification(FEEDBACK.tag, FEEDBACK.id);
+    Intent expectedIntent =
+        new Intent(
+            ApplicationProvider.getApplicationContext(),
+            TakeScreenshotAndStartFeedbackActivity.class);
+    Intent actualIntent = shadowOf(notification.contentIntent).getSavedIntent();
+    assertThat(actualIntent.getComponent()).isEqualTo(expectedIntent.getComponent());
+    assertThat(
+            actualIntent.getStringExtra(
+                TakeScreenshotAndStartFeedbackActivity.ADDITIONAL_FORM_TEXT_EXTRA_KEY))
+        .isEqualTo("Terms and conditions");
+  }
+
+  @Test
+  public void showFeedbackNotification_convertsImportanceToPriority() {
+    firebaseAppDistributionNotificationsManager.showFeedbackNotification(
+        "Terms and conditions", InterruptionLevel.HIGH);
+
+    shadowOf(getMainLooper()).idle(); // make sure main (UI) thread has finished executing
+    assertThat(shadowOf(notificationManager).size()).isEqualTo(1);
+    Notification notification =
+        shadowOf(notificationManager).getNotification(FEEDBACK.tag, FEEDBACK.id);
+    assertThat(notification.priority).isEqualTo(Notification.PRIORITY_HIGH);
+  }
+
+  @Test
+  public void onPaused_schedulesHideFeedbackNotification() {
+    when(mockLightweightExecutorService.schedule(any(Runnable.class), anyLong(), any()))
+        .thenAnswer(
+            invocation -> {
+              invocation.getArgument(0, Runnable.class).run(); // pretend enough time has passed
+              return mockScheduledFuture;
+            });
+    firebaseAppDistributionNotificationsManager.showFeedbackNotification("feed me back", DEFAULT);
+    shadowOf(getMainLooper()).idle(); // make sure main (UI) thread has finished executing
+
+    firebaseAppDistributionNotificationsManager.onPaused(null);
+
+    assertThat(shadowOf(notificationManager).size()).isEqualTo(0);
+    verifyNoInteractions(mockScheduledFuture); // cancel did not get called
+  }
+
+  @Test
+  public void onResumedBeforeTimeout_cancelsScheduledHideFeedbackNotification() {
+    doReturn(mockScheduledFuture) // do not run runnable, pretend not enough time has passed
+        .when(mockLightweightExecutorService)
+        .schedule(any(Runnable.class), anyLong(), any());
+    firebaseAppDistributionNotificationsManager.showFeedbackNotification("feed me back", DEFAULT);
+    shadowOf(getMainLooper()).idle(); // make sure main (UI) thread has finished executing
+
+    firebaseAppDistributionNotificationsManager.onPaused(null);
+    firebaseAppDistributionNotificationsManager.onResumed(null);
+
+    assertThat(shadowOf(notificationManager).size()).isEqualTo(1);
+    verify(mockScheduledFuture).cancel(anyBoolean());
+  }
+
+  @Test
+  public void onResumedAfterTimeout_showsFeedbackNotificationAgain() {
+    when(mockLightweightExecutorService.schedule(any(Runnable.class), anyLong(), any()))
+        .thenAnswer(
+            invocation -> {
+              invocation.getArgument(0, Runnable.class).run(); // pretend enough time has passed
+              return mockScheduledFuture;
+            });
+    firebaseAppDistributionNotificationsManager.showFeedbackNotification("feed me back", DEFAULT);
+    shadowOf(getMainLooper()).idle(); // make sure main (UI) thread has finished executing
+
+    firebaseAppDistributionNotificationsManager.onPaused(null);
+    firebaseAppDistributionNotificationsManager.onResumed(null);
+
+    assertThat(shadowOf(notificationManager).size()).isEqualTo(1);
+  }
+
+  @Test
+  public void onPausedWithoutFeedbackNotification_noOp() {
+    firebaseAppDistributionNotificationsManager.onPaused(null);
+  }
+
+  @Test
+  public void onResumedWithoutFeedbackNotification_noOp() {
+    firebaseAppDistributionNotificationsManager.onResumed(null);
+
+    assertThat(shadowOf(notificationManager).size()).isEqualTo(0);
+  }
+}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionServiceImplTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionServiceImplTest.java
new file mode 100644
index 00000000000..4ae7f3bd7b8
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionServiceImplTest.java
@@ -0,0 +1,910 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static android.content.Context.MODE_PRIVATE;
+import static android.os.Looper.getMainLooper;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_CANCELED;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.HOST_ACTIVITY_INTERRUPTED;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.INSTALLATION_CANCELED;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.UNKNOWN;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.UPDATE_NOT_AVAILABLE;
+import static com.google.firebase.appdistribution.impl.ErrorMessages.AUTHENTICATION_ERROR;
+import static com.google.firebase.appdistribution.impl.ErrorMessages.JSON_PARSING_ERROR;
+import static com.google.firebase.appdistribution.impl.ErrorMessages.NETWORK_ERROR;
+import static com.google.firebase.appdistribution.impl.ErrorMessages.RELEASE_NOT_FOUND_ERROR;
+import static com.google.firebase.appdistribution.impl.ErrorMessages.UPDATE_CANCELED;
+import static com.google.firebase.appdistribution.impl.FeedbackActivity.ADDITIONAL_FORM_TEXT_KEY;
+import static com.google.firebase.appdistribution.impl.FeedbackActivity.FEEDBACK_TRIGGER_KEY;
+import static com.google.firebase.appdistribution.impl.FeedbackActivity.RELEASE_NAME_KEY;
+import static com.google.firebase.appdistribution.impl.FeedbackActivity.SCREENSHOT_URI_KEY;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitAsyncOperations;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitCondition;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTask;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTaskFailure;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTermination;
+import static com.google.firebase.appdistribution.impl.TestUtils.mockForegroundActivity;
+import static java.util.stream.Collectors.toList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.core.content.pm.ApplicationInfoBuilder;
+import androidx.test.core.content.pm.PackageInfoBuilder;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.appdistribution.AppDistributionRelease;
+import com.google.firebase.appdistribution.BinaryType;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.appdistribution.UpdateProgress;
+import com.google.firebase.appdistribution.UpdateStatus;
+import com.google.firebase.appdistribution.UpdateTask;
+import com.google.firebase.concurrent.FirebaseExecutors;
+import com.google.firebase.concurrent.TestOnlyExecutors;
+import com.google.firebase.installations.InstallationTokenResult;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Predicate;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.android.controller.ActivityController;
+import org.robolectric.shadows.ShadowAlertDialog;
+import org.robolectric.shadows.ShadowLog;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(RobolectricTestRunner.class)
+public class FirebaseAppDistributionServiceImplTest {
+
+  private static final String TEST_API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";
+  private static final String TEST_APP_ID_1 = "1:123456789:android:abcdef";
+  private static final String TEST_PROJECT_ID = "777777777777";
+  private static final String TEST_AUTH_TOKEN = "fad.auth.token";
+  private static final String TEST_IAS_ARTIFACT_ID = "ias-artifact-id";
+  private static final String IAS_ARTIFACT_ID_KEY = "com.android.vending.internal.apk.id";
+  private static final String TEST_URL = "https://test-url";
+  private static final long INSTALLED_VERSION_CODE = 2;
+  private static final Uri TEST_SCREENSHOT_URI = Uri.parse("file:/path/to/screenshot.png");
+
+  private static final AppDistributionReleaseInternal TEST_RELEASE_NEWER_AAB_INTERNAL =
+      AppDistributionReleaseInternal.builder()
+          .setBuildVersion("3")
+          .setDisplayVersion("3.0")
+          .setReleaseNotes("Newer version.")
+          .setBinaryType(BinaryType.AAB)
+          .setDownloadUrl(TEST_URL)
+          .build();
+
+  private static final AppDistributionRelease TEST_RELEASE_NEWER_AAB =
+      AppDistributionReleaseImpl.builder()
+          .setVersionCode(3)
+          .setDisplayVersion("3.0")
+          .setReleaseNotes("Newer version.")
+          .setBinaryType(BinaryType.AAB)
+          .build();
+
+  private static final AppDistributionReleaseInternal TEST_RELEASE_NEWER_APK_INTERNAL =
+      AppDistributionReleaseInternal.builder()
+          .setBuildVersion("3")
+          .setDisplayVersion("3.0")
+          .setReleaseNotes("Newer version.")
+          .setBinaryType(BinaryType.APK)
+          .setDownloadUrl(TEST_URL)
+          .build();
+
+  @Background private final ExecutorService backgroundExecutor = TestOnlyExecutors.background();
+
+  @Lightweight
+  private final ScheduledExecutorService lightweightExecutor = TestOnlyExecutors.lite();
+
+  @UiThread private final Executor uiThreadExecutor = TestOnlyExecutors.ui();
+
+  private FirebaseAppDistributionImpl firebaseAppDistribution;
+  private ActivityController<TestActivity> activityController;
+  private TestActivity activity;
+
+  @Mock private InstallationTokenResult mockInstallationTokenResult;
+  @Mock private TesterSignInManager mockTesterSignInManager;
+  @Mock private NewReleaseFetcher mockNewReleaseFetcher;
+  @Mock private ApkUpdater mockApkUpdater;
+  @Mock private AabUpdater mockAabUpdater;
+  @Mock private SignInStorage signInStorage;
+  @Mock private FirebaseAppDistributionLifecycleNotifier mockLifecycleNotifier;
+  @Mock private ReleaseIdentifier mockReleaseIdentifier;
+  @Mock private ScreenshotTaker mockScreenshotTaker;
+  @Mock private DevModeDetector mockDevModeDetector;
+
+  static class TestActivity extends Activity {}
+
+  @Before
+  public void setup() throws FirebaseAppDistributionException {
+    MockitoAnnotations.initMocks(this);
+    FirebaseApp.clearInstancesForTest();
+
+    signInStorage =
+        spy(
+            new SignInStorage(
+                ApplicationProvider.getApplicationContext(),
+                mockDevModeDetector,
+                backgroundExecutor));
+
+    FirebaseApp firebaseApp =
+        FirebaseApp.initializeApp(
+            ApplicationProvider.getApplicationContext(),
+            new FirebaseOptions.Builder()
+                .setApplicationId(TEST_APP_ID_1)
+                .setProjectId(TEST_PROJECT_ID)
+                .setApiKey(TEST_API_KEY)
+                .build());
+
+    firebaseAppDistribution =
+        spy(
+            new FirebaseAppDistributionImpl(
+                firebaseApp.getApplicationContext(),
+                mockTesterSignInManager,
+                mockNewReleaseFetcher,
+                mockApkUpdater,
+                mockAabUpdater,
+                signInStorage,
+                mockLifecycleNotifier,
+                mockReleaseIdentifier,
+                mockScreenshotTaker,
+                new FirebaseAppDistributionNotificationsManager(
+                    firebaseApp.getApplicationContext(),
+                    new AppIconSource(),
+                    mockLifecycleNotifier,
+                    lightweightExecutor,
+                    uiThreadExecutor),
+                lightweightExecutor,
+                uiThreadExecutor));
+
+    when(mockTesterSignInManager.signInTester()).thenReturn(Tasks.forResult(null));
+    setSignInStatusSharedPreference(true);
+    when(mockInstallationTokenResult.getToken()).thenReturn(TEST_AUTH_TOKEN);
+    when(mockScreenshotTaker.takeScreenshot()).thenReturn(Tasks.forResult(TEST_SCREENSHOT_URI));
+    when(mockDevModeDetector.isDevModeEnabled()).thenReturn(false);
+
+    ShadowPackageManager shadowPackageManager =
+        shadowOf(ApplicationProvider.getApplicationContext().getPackageManager());
+
+    ApplicationInfo applicationInfo =
+        ApplicationInfoBuilder.newBuilder()
+            .setPackageName(ApplicationProvider.getApplicationContext().getPackageName())
+            .build();
+    applicationInfo.metaData = new Bundle();
+    applicationInfo.metaData.putString(IAS_ARTIFACT_ID_KEY, TEST_IAS_ARTIFACT_ID);
+    PackageInfo packageInfo =
+        PackageInfoBuilder.newBuilder()
+            .setPackageName(ApplicationProvider.getApplicationContext().getPackageName())
+            .setApplicationInfo(applicationInfo)
+            .build();
+    packageInfo.setLongVersionCode(INSTALLED_VERSION_CODE);
+    shadowPackageManager.installPackage(packageInfo);
+
+    activityController = Robolectric.buildActivity(TestActivity.class).setup();
+    activity = spy(activityController.get());
+    mockForegroundActivity(mockLifecycleNotifier, activity);
+  }
+
+  @After
+  public void tearDown() {
+    if (activityController != null) {
+      activityController.close();
+    }
+  }
+
+  @Test
+  public void checkForNewRelease_whenCheckForNewReleaseFails_throwsError() {
+    when(mockNewReleaseFetcher.checkForNewRelease())
+        .thenReturn(
+            Tasks.forException(
+                new FirebaseAppDistributionException(
+                    ErrorMessages.JSON_PARSING_ERROR, Status.NETWORK_FAILURE)));
+
+    Task<AppDistributionRelease> task = firebaseAppDistribution.checkForNewRelease();
+
+    awaitTaskFailure(task, NETWORK_FAILURE, JSON_PARSING_ERROR);
+  }
+
+  @Test
+  public void checkForNewRelease_testerIsNotSignedIn_taskFails() {
+    setSignInStatusSharedPreference(false);
+
+    Task<AppDistributionRelease> task = firebaseAppDistribution.checkForNewRelease();
+
+    awaitTaskFailure(task, AUTHENTICATION_FAILURE, "Tester is not signed in");
+  }
+
+  @Test
+  public void checkForNewRelease_whenCheckForNewReleaseSucceeds_returnsRelease()
+      throws InterruptedException, FirebaseAppDistributionException, ExecutionException {
+    AppDistributionReleaseInternal internalRelease = TEST_RELEASE_NEWER_AAB_INTERNAL;
+    when(mockNewReleaseFetcher.checkForNewRelease()).thenReturn(Tasks.forResult(internalRelease));
+
+    Task<AppDistributionRelease> task = firebaseAppDistribution.checkForNewRelease();
+    awaitTask(task);
+
+    assertEquals(TEST_RELEASE_NEWER_AAB, task.getResult());
+    AppDistributionReleaseInternal cachedNewRelease =
+        awaitTask(firebaseAppDistribution.getCachedNewRelease().get());
+    assertEquals(internalRelease, cachedNewRelease);
+  }
+
+  @Test
+  public void checkForNewRelease_authenticationFailure_signOutTester() throws InterruptedException {
+    when(mockNewReleaseFetcher.checkForNewRelease())
+        .thenReturn(
+            Tasks.forException(
+                new FirebaseAppDistributionException("Test", AUTHENTICATION_FAILURE)));
+
+    Task<AppDistributionRelease> task = firebaseAppDistribution.checkForNewRelease();
+
+    awaitTaskFailure(task, AUTHENTICATION_FAILURE, "Test");
+    awaitTermination(lightweightExecutor);
+    verify(signInStorage, times(1)).setSignInStatus(false);
+  }
+
+  @Test
+  public void updateApp_whenNotSignedIn_throwsError() {
+    setSignInStatusSharedPreference(false);
+
+    UpdateTask updateTask = firebaseAppDistribution.updateApp();
+
+    awaitTaskFailure(updateTask, AUTHENTICATION_FAILURE, "Tester is not signed in");
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenNewAabReleaseAvailable_showsUpdateDialog()
+      throws InterruptedException {
+    when(mockNewReleaseFetcher.checkForNewRelease())
+        .thenReturn(Tasks.forResult((TEST_RELEASE_NEWER_AAB_INTERNAL)));
+
+    firebaseAppDistribution.updateIfNewReleaseAvailable();
+    awaitAsyncOperations(lightweightExecutor);
+
+    AlertDialog dialog = assertAlertDialogShown();
+    assertEquals(
+        String.format(
+            "Version %s (%s) is available.\n\nRelease notes: %s",
+            TEST_RELEASE_NEWER_AAB.getDisplayVersion(),
+            TEST_RELEASE_NEWER_AAB.getVersionCode(),
+            TEST_RELEASE_NEWER_AAB.getReleaseNotes()),
+        shadowOf(dialog).getMessage().toString());
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_fromABackgroundThread_showsUpdateDialog()
+      throws InterruptedException {
+    when(mockNewReleaseFetcher.checkForNewRelease())
+        .thenReturn(Tasks.forResult((TEST_RELEASE_NEWER_AAB_INTERNAL)));
+
+    ExecutorService executorService = Executors.newSingleThreadExecutor();
+    executorService.submit(() -> firebaseAppDistribution.updateIfNewReleaseAvailable());
+    awaitAsyncOperations(executorService);
+    awaitAsyncOperations(lightweightExecutor);
+
+    assertAlertDialogShown();
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenReleaseNotesEmpty_doesNotShowReleaseNotes()
+      throws InterruptedException {
+    when(mockNewReleaseFetcher.checkForNewRelease())
+        .thenReturn(
+            Tasks.forResult(
+                (TEST_RELEASE_NEWER_AAB_INTERNAL.toBuilder().setReleaseNotes("").build())));
+
+    firebaseAppDistribution.updateIfNewReleaseAvailable();
+    awaitAsyncOperations(lightweightExecutor);
+
+    AlertDialog dialog = assertAlertDialogShown();
+    assertEquals(
+        String.format(
+            "Version %s (%s) is available.",
+            TEST_RELEASE_NEWER_AAB.getDisplayVersion(), TEST_RELEASE_NEWER_AAB.getVersionCode()),
+        shadowOf(dialog).getMessage().toString());
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenNoReleaseAvailable_updateDialogNotShown()
+      throws InterruptedException {
+    when(mockNewReleaseFetcher.checkForNewRelease()).thenReturn(Tasks.forResult(null));
+
+    UpdateTask task = firebaseAppDistribution.updateIfNewReleaseAvailable();
+
+    List<UpdateProgress> progressEvents = new ArrayList<>();
+    task.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents::add);
+    awaitTermination(lightweightExecutor);
+
+    assertEquals(1, progressEvents.size());
+    assertEquals(UpdateStatus.NEW_RELEASE_NOT_AVAILABLE, progressEvents.get(0).getUpdateStatus());
+    assertNull(ShadowAlertDialog.getLatestAlertDialog());
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenActivityBackgrounded_updateDialogNotShown()
+      throws InterruptedException {
+    // Block thread making the request on a latch, which gives us time to add listeners to the
+    // returned UpdateTask in time to get all the progress updates
+    CountDownLatch countDownLatch = new CountDownLatch(1);
+    when(mockNewReleaseFetcher.checkForNewRelease())
+        .thenAnswer(
+            invocation -> {
+              try {
+                countDownLatch.await();
+              } catch (InterruptedException e) {
+                throw new AssertionError("Interrupted while waiting in mock");
+              }
+              return Tasks.forResult(null);
+            });
+
+    // Start the update
+    UpdateTask task = firebaseAppDistribution.updateIfNewReleaseAvailable();
+
+    // Listen for progress events
+    List<UpdateProgress> progressEvents = new ArrayList<>();
+    task.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents::add);
+    countDownLatch.countDown();
+    awaitCondition(() -> progressEvents.size() == 1);
+
+    assertEquals(UpdateStatus.NEW_RELEASE_NOT_AVAILABLE, progressEvents.get(0).getUpdateStatus());
+    assertNull(ShadowAlertDialog.getLatestAlertDialog());
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenSignInCancelled_checkForUpdateNotCalled()
+      throws InterruptedException {
+    setSignInStatusSharedPreference(false);
+    when(mockTesterSignInManager.signInTester())
+        .thenReturn(
+            Tasks.forException(
+                new FirebaseAppDistributionException(
+                    ErrorMessages.AUTHENTICATION_CANCELED, AUTHENTICATION_CANCELED)));
+
+    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+    awaitAsyncOperations(lightweightExecutor);
+
+    AlertDialog signInDialog = assertAlertDialogShown();
+    signInDialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
+
+    awaitTaskFailure(updateTask, AUTHENTICATION_CANCELED, ErrorMessages.AUTHENTICATION_CANCELED);
+    verify(mockTesterSignInManager, times(1)).signInTester();
+    verify(mockNewReleaseFetcher, never()).checkForNewRelease();
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenSignInFailed_checkForUpdateNotCalled()
+      throws InterruptedException {
+    setSignInStatusSharedPreference(false);
+    when(mockTesterSignInManager.signInTester())
+        .thenReturn(
+            Tasks.forException(
+                new FirebaseAppDistributionException(
+                    ErrorMessages.AUTHENTICATION_ERROR, AUTHENTICATION_FAILURE)));
+
+    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+    awaitAsyncOperations(lightweightExecutor);
+
+    AlertDialog signInDialog = assertAlertDialogShown();
+    signInDialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
+
+    awaitTaskFailure(updateTask, AUTHENTICATION_FAILURE, AUTHENTICATION_ERROR);
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenDialogDismissed_taskFails()
+      throws InterruptedException {
+    when(mockNewReleaseFetcher.checkForNewRelease())
+        .thenReturn(Tasks.forResult(TEST_RELEASE_NEWER_AAB_INTERNAL));
+
+    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+    awaitAsyncOperations(lightweightExecutor);
+
+    AlertDialog updateDialog = assertAlertDialogShown();
+    updateDialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick(); // dismiss dialog
+
+    awaitTaskFailure(updateTask, INSTALLATION_CANCELED, UPDATE_CANCELED);
+    assertFalse(updateDialog.isShowing());
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenDialogCanceled_taskFails()
+      throws InterruptedException {
+    when(mockNewReleaseFetcher.checkForNewRelease())
+        .thenReturn(Tasks.forResult(TEST_RELEASE_NEWER_AAB_INTERNAL));
+
+    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+
+    // Task callbacks happen on the executor
+    awaitTermination(lightweightExecutor);
+
+    // Show update confirmation dialog happens on the UI thread
+    shadowOf(getMainLooper()).idle();
+
+    AlertDialog updateDialog = assertAlertDialogShown();
+    updateDialog.onBackPressed(); // cancels the dialog
+
+    awaitTaskFailure(updateTask, INSTALLATION_CANCELED, UPDATE_CANCELED);
+    assertFalse(updateDialog.isShowing());
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenCheckForUpdateFails_updateAppNotCalled() {
+    when(mockNewReleaseFetcher.checkForNewRelease())
+        .thenReturn(
+            Tasks.forException(
+                new FirebaseAppDistributionException(
+                    ErrorMessages.NETWORK_ERROR,
+                    FirebaseAppDistributionException.Status.NETWORK_FAILURE)));
+
+    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+    List<UpdateProgress> progressEvents = new ArrayList<>();
+    updateTask.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents::add);
+
+    awaitTaskFailure(updateTask, NETWORK_FAILURE, NETWORK_ERROR);
+    assertEquals(1, progressEvents.size());
+    assertEquals(UpdateStatus.NEW_RELEASE_CHECK_FAILED, progressEvents.get(0).getUpdateStatus());
+    verify(firebaseAppDistribution, never()).updateApp();
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenTesterIsSignedIn_doesNotOpenDialog()
+      throws InterruptedException, FirebaseAppDistributionException, ExecutionException {
+    when(mockNewReleaseFetcher.checkForNewRelease()).thenReturn(Tasks.forResult(null));
+
+    UpdateTask task = firebaseAppDistribution.updateIfNewReleaseAvailable();
+    awaitTask(task);
+
+    assertNull(ShadowAlertDialog.getLatestAlertDialog());
+  }
+
+  @Test
+  public void signInTester_whenDialogDismissed_taskFails() throws InterruptedException {
+    setSignInStatusSharedPreference(false);
+    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+    awaitAsyncOperations(lightweightExecutor);
+
+    AlertDialog dialog = assertAlertDialogShown();
+    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick(); // dismiss dialog
+
+    awaitTaskFailure(updateTask, AUTHENTICATION_CANCELED, ErrorMessages.AUTHENTICATION_CANCELED);
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenSignInDialogCanceled_taskFails()
+      throws InterruptedException {
+    setSignInStatusSharedPreference(false);
+    UpdateTask signInTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+    awaitAsyncOperations(lightweightExecutor);
+
+    AlertDialog dialog = assertAlertDialogShown();
+    dialog.onBackPressed(); // cancel dialog
+
+    awaitTaskFailure(signInTask, AUTHENTICATION_CANCELED, ErrorMessages.AUTHENTICATION_CANCELED);
+  }
+
+  private AlertDialog assertAlertDialogShown() {
+    assertTrue(ShadowAlertDialog.getLatestDialog() instanceof AlertDialog);
+    AlertDialog dialog = (AlertDialog) ShadowAlertDialog.getLatestDialog();
+    assertTrue(dialog.isShowing());
+
+    return dialog;
+  }
+
+  @Test
+  public void signOutTester_setsSignInStatusFalse() throws InterruptedException {
+    firebaseAppDistribution.signOutTester();
+    awaitAsyncOperations(backgroundExecutor);
+
+    assertThat(signInStorage.getSignInStatusBlocking()).isFalse();
+  }
+
+  @Test
+  public void signOutTester_unsetsCachedNewRelease()
+      throws InterruptedException, FirebaseAppDistributionException, ExecutionException {
+    Task<AppDistributionReleaseInternal> setCachedNewReleaseTask =
+        firebaseAppDistribution.getCachedNewRelease().set(TEST_RELEASE_NEWER_AAB_INTERNAL);
+    awaitTask(setCachedNewReleaseTask);
+
+    firebaseAppDistribution.signOutTester();
+
+    Task<AppDistributionReleaseInternal> cachedNewReleaseTask =
+        firebaseAppDistribution.getCachedNewRelease().get();
+    awaitTask(cachedNewReleaseTask);
+    assertThat(cachedNewReleaseTask.getResult()).isNull();
+  }
+
+  @Test
+  public void isTesterSignedIn_returnsTrueWhenSharePreferenceIsTrue() {
+    setSignInStatusSharedPreference(true);
+    assertThat(firebaseAppDistribution.isTesterSignedIn()).isTrue();
+  }
+
+  @Test
+  public void isTesterSignedIn_returnsFalseWhenSharePreferenceIsFalse() {
+    setSignInStatusSharedPreference(false);
+    assertThat(firebaseAppDistribution.isTesterSignedIn()).isFalse();
+  }
+
+  @Test
+  public void isTesterSignedIn_whenStorageWarmedUp_returnsCorrectStatusImmediately() {
+    // First check the sign in status, which has the side effect of warming up the SharedPreferences
+    // instance. This simulates a typical flow, where a developer would check the status before
+    // trying to sign out the tester.
+    firebaseAppDistribution.isTesterSignedIn();
+
+    firebaseAppDistribution.signOutTester();
+
+    assertThat(firebaseAppDistribution.isTesterSignedIn()).isFalse();
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_receiveProgressUpdateFromUpdateApp()
+      throws InterruptedException {
+    AppDistributionReleaseInternal newRelease = TEST_RELEASE_NEWER_AAB_INTERNAL;
+    when(mockNewReleaseFetcher.checkForNewRelease()).thenReturn(Tasks.forResult(newRelease));
+    UpdateTaskImpl updateTaskToReturn = new UpdateTaskImpl();
+    when(mockAabUpdater.updateAab(newRelease)).thenReturn(updateTaskToReturn);
+    updateTaskToReturn.updateProgress(
+        UpdateProgressImpl.builder()
+            .setApkFileTotalBytes(1)
+            .setApkBytesDownloaded(1)
+            .setUpdateStatus(UpdateStatus.DOWNLOADING)
+            .build());
+
+    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+
+    List<UpdateProgress> progressEvents = new ArrayList<>();
+    updateTask.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents::add);
+    awaitAsyncOperations(lightweightExecutor);
+
+    // Clicking the update button.
+    AlertDialog updateDialog = (AlertDialog) ShadowAlertDialog.getLatestDialog();
+    updateDialog.getButton(Dialog.BUTTON_POSITIVE).performClick();
+    awaitAsyncOperations(lightweightExecutor);
+
+    // Update flow
+    assertEquals(1, progressEvents.size());
+    assertEquals(UpdateStatus.DOWNLOADING, progressEvents.get(0).getUpdateStatus());
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_fromABackgroundThread_showsSignInDialog()
+      throws InterruptedException, ExecutionException {
+    setSignInStatusSharedPreference(false);
+
+    ExecutorService executorService = Executors.newSingleThreadExecutor();
+    Future<UpdateTask> future =
+        executorService.submit(() -> firebaseAppDistribution.updateIfNewReleaseAvailable());
+    awaitAsyncOperations(executorService);
+
+    assertAlertDialogShown();
+    assertFalse((future.get()).isComplete());
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenScreenRotates_signInConfirmationDialogReappears()
+      throws InterruptedException {
+    setSignInStatusSharedPreference(false);
+    when(activity.isChangingConfigurations()).thenReturn(true);
+
+    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+    awaitAsyncOperations(lightweightExecutor);
+
+    // Mimic activity recreation due to a configuration change
+    firebaseAppDistribution.onActivityDestroyed(activity);
+    firebaseAppDistribution.onActivityResumed(activity);
+    awaitAsyncOperations(lightweightExecutor);
+
+    assertAlertDialogShown();
+    assertFalse(updateTask.isComplete());
+  }
+
+  @Test
+  public void updateIfNewReleaseAvailable_whenScreenRotates_updateDialogReappears()
+      throws InterruptedException {
+    when(mockNewReleaseFetcher.checkForNewRelease())
+        .thenReturn(Tasks.forResult(TEST_RELEASE_NEWER_AAB_INTERNAL));
+    when(activity.isChangingConfigurations()).thenReturn(true);
+
+    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+    awaitAsyncOperations(lightweightExecutor);
+
+    // Mimic activity recreation due to a configuration change
+    firebaseAppDistribution.onActivityDestroyed(activity);
+    firebaseAppDistribution.onActivityResumed(activity);
+
+    assertAlertDialogShown();
+    assertFalse(updateTask.isComplete());
+  }
+
+  @Test
+  public void
+      updateIfNewReleaseAvailable_whenSignInDialogShowingAndNewActivityStarts_signInTaskCancelled()
+          throws InterruptedException {
+    TestActivity testActivity2 = new TestActivity();
+    setSignInStatusSharedPreference(false);
+
+    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+    awaitAsyncOperations(lightweightExecutor);
+
+    // Mimic different activity getting resumed
+    firebaseAppDistribution.onActivityPaused(activity);
+    firebaseAppDistribution.onActivityResumed(testActivity2);
+
+    awaitTaskFailure(
+        updateTask, HOST_ACTIVITY_INTERRUPTED, ErrorMessages.HOST_ACTIVITY_INTERRUPTED);
+  }
+
+  @Test
+  public void
+      updateIfNewReleaseAvailable_whenUpdateDialogShowingAndNewActivityStarts_updateTaskCancelled()
+          throws InterruptedException {
+    TestActivity testActivity2 = new TestActivity();
+    when(mockNewReleaseFetcher.checkForNewRelease())
+        .thenReturn(Tasks.forResult(TEST_RELEASE_NEWER_AAB_INTERNAL));
+
+    UpdateTask updateTask = firebaseAppDistribution.updateIfNewReleaseAvailable();
+    awaitAsyncOperations(lightweightExecutor);
+
+    // Mimic different activity getting resumed
+    firebaseAppDistribution.onActivityPaused(activity);
+    firebaseAppDistribution.onActivityResumed(testActivity2);
+
+    awaitTaskFailure(
+        updateTask, HOST_ACTIVITY_INTERRUPTED, ErrorMessages.HOST_ACTIVITY_INTERRUPTED);
+  }
+
+  @Test
+  public void updateAppTask_whenNoReleaseAvailable_throwsError() {
+    firebaseAppDistribution.getCachedNewRelease().set(null);
+
+    UpdateTask updateTask = firebaseAppDistribution.updateApp();
+
+    awaitTaskFailure(updateTask, UPDATE_NOT_AVAILABLE, RELEASE_NOT_FOUND_ERROR);
+  }
+
+  @Test
+  public void updateApp_withAabReleaseAvailable_returnsSameAabTask()
+      throws InterruptedException, FirebaseAppDistributionException, ExecutionException {
+    AppDistributionReleaseInternal release = TEST_RELEASE_NEWER_AAB_INTERNAL;
+    firebaseAppDistribution.getCachedNewRelease().set(release);
+    UpdateTaskImpl updateTaskToReturn = new UpdateTaskImpl();
+    doReturn(updateTaskToReturn).when(mockAabUpdater).updateAab(release);
+
+    UpdateTask updateTask = firebaseAppDistribution.updateApp();
+    assertFalse(updateTask.isComplete());
+
+    // Complete original task
+    updateTaskToReturn.setResult();
+    awaitTask(updateTask);
+
+    // Returned task is complete
+    assertTrue(updateTask.isSuccessful());
+  }
+
+  @Test
+  public void updateApp_withApkReleaseAvailable_returnsSameApkTask()
+      throws InterruptedException, FirebaseAppDistributionException, ExecutionException {
+    AppDistributionReleaseInternal release = TEST_RELEASE_NEWER_APK_INTERNAL;
+    firebaseAppDistribution.getCachedNewRelease().set(release);
+    UpdateTaskImpl updateTaskToReturn = new UpdateTaskImpl();
+    doReturn(updateTaskToReturn).when(mockApkUpdater).updateApk(release, false);
+
+    UpdateTask updateTask = firebaseAppDistribution.updateApp();
+    assertFalse(updateTask.isComplete());
+
+    // Complete original task
+    updateTaskToReturn.setResult();
+    awaitTask(updateTask);
+
+    // Returned task is complete
+    assertTrue(updateTask.isSuccessful());
+  }
+
+  @Test
+  public void startFeedback_signsInTesterAndStartsActivity() throws InterruptedException {
+    when(mockReleaseIdentifier.identifyRelease()).thenReturn(Tasks.forResult("release-name"));
+
+    firebaseAppDistribution.startFeedback("Some terms and conditions");
+    TestUtils.awaitAsyncOperations(lightweightExecutor);
+
+    verify(mockTesterSignInManager).signInTester();
+    Intent expectedIntent = new Intent(activity, FeedbackActivity.class);
+    Intent actualIntent = shadowOf(RuntimeEnvironment.getApplication()).getNextStartedActivity();
+    assertEquals(expectedIntent.getComponent(), actualIntent.getComponent());
+    assertThat(actualIntent.getStringExtra(RELEASE_NAME_KEY)).isEqualTo("release-name");
+    assertThat(actualIntent.getStringExtra(SCREENSHOT_URI_KEY))
+        .isEqualTo(TEST_SCREENSHOT_URI.toString());
+    assertThat(actualIntent.getStringExtra(ADDITIONAL_FORM_TEXT_KEY))
+        .isEqualTo("Some terms and conditions");
+    assertThat(actualIntent.getStringExtra(FEEDBACK_TRIGGER_KEY))
+        .isEqualTo(FeedbackTrigger.CUSTOM.toString());
+    assertThat(firebaseAppDistribution.isFeedbackInProgress()).isTrue();
+  }
+
+  @Test
+  public void startFeedback_withoutUri_onlyStartsOnce() throws InterruptedException {
+    when(mockReleaseIdentifier.identifyRelease()).thenReturn(Tasks.forResult("release-name"));
+
+    firebaseAppDistribution.startFeedback("Some terms and conditions");
+    firebaseAppDistribution.startFeedback("Some other terms and conditions");
+    TestUtils.awaitAsyncOperations(lightweightExecutor);
+
+    verify(activity, times(1)).startActivity(any());
+  }
+
+  @Test
+  public void startFeedback_withUri_doesNotTakeScreenshot() throws InterruptedException {
+    when(mockReleaseIdentifier.identifyRelease()).thenReturn(Tasks.forResult("release-name"));
+    Uri providedUri = Uri.parse("file:/provided/uri");
+    firebaseAppDistribution.startFeedback("Some terms and conditions", providedUri);
+    TestUtils.awaitAsyncOperations(lightweightExecutor);
+
+    verifyNoInteractions(mockScreenshotTaker);
+    verify(mockTesterSignInManager).signInTester();
+    Intent expectedIntent = new Intent(activity, FeedbackActivity.class);
+    Intent actualIntent = shadowOf(RuntimeEnvironment.getApplication()).getNextStartedActivity();
+    assertEquals(expectedIntent.getComponent(), actualIntent.getComponent());
+    assertThat(actualIntent.getStringExtra(RELEASE_NAME_KEY)).isEqualTo("release-name");
+    assertThat(actualIntent.getStringExtra(SCREENSHOT_URI_KEY)).isEqualTo(providedUri.toString());
+    assertThat(actualIntent.getStringExtra(ADDITIONAL_FORM_TEXT_KEY))
+        .isEqualTo("Some terms and conditions");
+    assertThat(actualIntent.getStringExtra(FEEDBACK_TRIGGER_KEY))
+        .isEqualTo(FeedbackTrigger.CUSTOM.toString());
+    assertThat(firebaseAppDistribution.isFeedbackInProgress()).isTrue();
+  }
+
+  @Test
+  public void startFeedback_withUri_onlyStartsOnce() throws InterruptedException {
+    when(mockReleaseIdentifier.identifyRelease()).thenReturn(Tasks.forResult("release-name"));
+
+    firebaseAppDistribution.startFeedback("Some terms and conditions", TEST_SCREENSHOT_URI);
+    firebaseAppDistribution.startFeedback("Some other terms and conditions", TEST_SCREENSHOT_URI);
+    TestUtils.awaitAsyncOperations(lightweightExecutor);
+
+    verify(activity, times(1)).startActivity(any());
+  }
+
+  @Test
+  public void startFeedback_closingActivity_setsInProgressToFalse() throws InterruptedException {
+    when(mockReleaseIdentifier.identifyRelease()).thenReturn(Tasks.forResult("release-name"));
+
+    firebaseAppDistribution.startFeedback("Some terms and conditions");
+    TestUtils.awaitAsyncOperations(lightweightExecutor);
+    // Simulate destroying the feedback activity
+    firebaseAppDistribution.onActivityDestroyed(
+        new FeedbackActivity() {
+          @Override
+          public boolean isFinishing() {
+            return true;
+          }
+        });
+
+    assertThat(firebaseAppDistribution.isFeedbackInProgress()).isFalse();
+  }
+
+  @Test
+  public void startFeedback_screenshotFails_startActivityWithNoScreenshot()
+      throws InterruptedException {
+    when(mockScreenshotTaker.takeScreenshot())
+        .thenReturn(Tasks.forException(new FirebaseAppDistributionException("Error", UNKNOWN)));
+    when(mockReleaseIdentifier.identifyRelease()).thenReturn(Tasks.forResult("release-name"));
+
+    firebaseAppDistribution.startFeedback("Some terms and conditions");
+    TestUtils.awaitAsyncOperations(lightweightExecutor);
+
+    verify(mockTesterSignInManager).signInTester();
+    Intent expectedIntent = new Intent(activity, FeedbackActivity.class);
+    Intent actualIntent = shadowOf(RuntimeEnvironment.getApplication()).getNextStartedActivity();
+    assertEquals(expectedIntent.getComponent(), actualIntent.getComponent());
+    assertThat(actualIntent.getStringExtra(RELEASE_NAME_KEY)).isEqualTo("release-name");
+    assertThat(actualIntent.getStringExtra(SCREENSHOT_URI_KEY)).isNull();
+    assertThat(actualIntent.getStringExtra(ADDITIONAL_FORM_TEXT_KEY))
+        .isEqualTo("Some terms and conditions");
+    assertThat(firebaseAppDistribution.isFeedbackInProgress()).isTrue();
+  }
+
+  @Test
+  public void startFeedback_signInTesterFails_logsAndSetsInProgressToFalse()
+      throws InterruptedException {
+    when(mockReleaseIdentifier.identifyRelease()).thenReturn(Tasks.forResult("release-name"));
+    FirebaseAppDistributionException exception =
+        new FirebaseAppDistributionException("Error", UNKNOWN);
+    when(mockTesterSignInManager.signInTester()).thenReturn(Tasks.forException(exception));
+
+    firebaseAppDistribution.startFeedback("Some terms and conditions");
+    TestUtils.awaitAsyncOperations(lightweightExecutor);
+
+    assertThat(firebaseAppDistribution.isFeedbackInProgress()).isFalse();
+    assertLoggedError("Failed to sign in tester", exception);
+  }
+
+  @Test
+  public void startFeedback_cantIdentifyRelease_logsAndSetsInProgressToFalse()
+      throws InterruptedException {
+    FirebaseAppDistributionException exception =
+        new FirebaseAppDistributionException("Error", UNKNOWN);
+    when(mockReleaseIdentifier.identifyRelease()).thenReturn(Tasks.forException(exception));
+
+    firebaseAppDistribution.startFeedback("Some terms and conditions");
+    TestUtils.awaitAsyncOperations(lightweightExecutor);
+
+    assertThat(firebaseAppDistribution.isFeedbackInProgress()).isFalse();
+    assertLoggedError("Failed to identify release", exception);
+  }
+
+  private static void assertLoggedError(String partialMessage, Throwable e) {
+    Predicate<ShadowLog.LogItem> predicate =
+        log ->
+            log.type == Log.ERROR
+                && log.msg.contains(partialMessage)
+                && (e == null || log.throwable == e);
+    List<ShadowLog.LogItem> matchingLogs =
+        ShadowLog.getLogs().stream().filter(predicate).collect(toList());
+    assertThat(matchingLogs).hasSize(1);
+  }
+
+  private void setSignInStatusSharedPreference(boolean testerSignedIn) {
+    SharedPreferences sharedPreferences =
+        ApplicationProvider.getApplicationContext()
+            .getSharedPreferences(SignInStorage.SIGNIN_PREFERENCES_NAME, MODE_PRIVATE);
+    sharedPreferences.edit().putBoolean(SignInStorage.SIGN_IN_KEY, testerSignedIn).commit();
+  }
+}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionTesterApiClientTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionTesterApiClientTest.java
new file mode 100644
index 00000000000..ce288f1899c
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionTesterApiClientTest.java
@@ -0,0 +1,487 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.appdistribution.impl.FeedbackSender.CONTENT_TYPE_PNG;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTask;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTaskFailure;
+import static com.google.firebase.appdistribution.impl.TestUtils.readTestJSON;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.appdistribution.BinaryType;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.inject.Provider;
+import com.google.firebase.installations.FirebaseInstallationsApi;
+import com.google.firebase.installations.InstallationTokenResult;
+import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class FirebaseAppDistributionTesterApiClientTest {
+
+  private static final String TEST_API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";
+  private static final String TEST_APP_ID_1 = "1:123456789:android:abcdef";
+  private static final String TEST_PROJECT_ID = "project-id";
+  private static final String TEST_PROJECT_NUMBER = "123456789";
+  private static final String TEST_AUTH_TOKEN = "fad.auth.token";
+  private static final String TEST_FID_1 = "cccccccccccccccccccccc";
+  private static final String RELEASE_NAME =
+      "projects/123456789/installations/cccccccccccccccccccccc/releases/release-id";
+  private static final String FEEDBACK_NAME =
+      "projects/123456789/installations/cccccccccccccccccccccc/releases/release-id/feedbackReports/feedback-id";
+  private static final String FEEDBACK_TEXT = "The feedback";
+  private static final String APK_HASH = "apk-hash";
+  private static final String IAS_ARTIFACT_ID = "ias-artifact-id";
+  private static final String RELEASES_PATH =
+      "v1alpha/devices/-/testerApps/1:123456789:android:abcdef/installations/cccccccccccccccccccccc/releases";
+  private static final String FIND_RELEASE_USING_APK_PATH =
+      "v1alpha/projects/123456789/installations/cccccccccccccccccccccc/releases:find?apkHash=apk-hash";
+  private static final String FIND_RELEASE_USING_IAS_PATH =
+      "v1alpha/projects/123456789/installations/cccccccccccccccccccccc/releases:find?iasArtifactId=ias-artifact-id";
+  private static final String CREATE_FEEDBACK_PATH =
+      "v1alpha/projects/123456789/installations/cccccccccccccccccccccc/releases/release-id/feedbackReports";
+  private static final String COMMIT_FEEDBACK_PATH =
+      "v1alpha/projects/123456789/installations/cccccccccccccccccccccc/releases/release-id/feedbackReports/feedback-id:commit";
+  private static final String ATTACH_SCREENSHOT_PATH =
+      "upload/v1alpha/projects/123456789/installations/cccccccccccccccccccccc/releases/release-id/feedbackReports/feedback-id:uploadArtifact?type=SCREENSHOT";
+  private static final String TEST_FILE_NAME = "test.png";
+
+  private FirebaseAppDistributionTesterApiClient firebaseAppDistributionTesterApiClient;
+  @Mock private Provider<FirebaseInstallationsApi> mockFirebaseInstallationsProvider;
+  @Mock private FirebaseInstallationsApi mockFirebaseInstallations;
+  @Mock private InstallationTokenResult mockInstallationTokenResult;
+  @Mock private TesterApiHttpClient mockTesterApiHttpClient;
+
+  @Before
+  public void setup() {
+    MockitoAnnotations.initMocks(this);
+    FirebaseApp.clearInstancesForTest();
+
+    FirebaseApp firebaseApp =
+        FirebaseApp.initializeApp(
+            ApplicationProvider.getApplicationContext(),
+            new FirebaseOptions.Builder()
+                .setApplicationId(TEST_APP_ID_1)
+                .setProjectId(TEST_PROJECT_ID)
+                .setGcmSenderId(TEST_PROJECT_NUMBER)
+                .setApiKey(TEST_API_KEY)
+                .build());
+
+    when(mockFirebaseInstallationsProvider.get()).thenReturn(mockFirebaseInstallations);
+    when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forResult(TEST_FID_1));
+    when(mockFirebaseInstallations.getToken(false))
+        .thenReturn(Tasks.forResult(mockInstallationTokenResult));
+    when(mockInstallationTokenResult.getToken()).thenReturn(TEST_AUTH_TOKEN);
+
+    firebaseAppDistributionTesterApiClient =
+        new FirebaseAppDistributionTesterApiClient(
+            firebaseApp.getOptions(),
+            mockFirebaseInstallationsProvider,
+            mockTesterApiHttpClient,
+            Executors.newSingleThreadExecutor());
+  }
+
+  @Test
+  public void fetchNewRelease_whenResponseSuccessfulForApk_returnsRelease() throws Exception {
+    JSONObject releaseJson = readTestJSON("testApkReleaseResponse.json");
+    when(mockTesterApiHttpClient.makeGetRequest(any(), eq(RELEASES_PATH), eq(TEST_AUTH_TOKEN)))
+        .thenReturn(releaseJson);
+
+    Task<AppDistributionReleaseInternal> releaseTask =
+        firebaseAppDistributionTesterApiClient.fetchNewRelease();
+    AppDistributionReleaseInternal result = awaitTask(releaseTask);
+
+    assertThat(result)
+        .isEqualTo(
+            AppDistributionReleaseInternal.builder()
+                .setBinaryType(BinaryType.APK)
+                .setBuildVersion("3")
+                .setDisplayVersion("3.0")
+                .setReleaseNotes("This is a test release.")
+                .setDownloadUrl("http://test-url-apk")
+                .setCodeHash("code-hash-apk-1")
+                .setApkHash("apk-hash-1")
+                .setIasArtifactId("")
+                .build());
+  }
+
+  @Test
+  public void fetchNewRelease_whenResponseSuccessfulForAab_returnsRelease() throws Exception {
+    JSONObject releaseJson = readTestJSON("testAabReleaseResponse.json");
+    when(mockTesterApiHttpClient.makeGetRequest(any(), eq(RELEASES_PATH), eq(TEST_AUTH_TOKEN)))
+        .thenReturn(releaseJson);
+
+    Task<AppDistributionReleaseInternal> releaseTask =
+        firebaseAppDistributionTesterApiClient.fetchNewRelease();
+    AppDistributionReleaseInternal result = awaitTask(releaseTask);
+
+    AppDistributionReleaseInternal expectedRelease =
+        AppDistributionReleaseInternal.builder()
+            .setBinaryType(BinaryType.AAB)
+            .setBuildVersion("3")
+            .setDisplayVersion("3.0")
+            .setReleaseNotes("This is a test release.")
+            .setDownloadUrl("http://test-url-aab")
+            .setCodeHash("")
+            .setApkHash("")
+            .setIasArtifactId("ias-artifact-id-1")
+            .build();
+    assertThat(result).isEqualTo(expectedRelease);
+  }
+
+  @Test
+  public void fetchNewRelease_getFidError_throwsError() {
+    Exception expectedException = new Exception("test ex");
+    when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forException(expectedException));
+
+    Task<AppDistributionReleaseInternal> releaseTask =
+        firebaseAppDistributionTesterApiClient.fetchNewRelease();
+
+    awaitTaskFailure(releaseTask, Status.UNKNOWN, "test ex", expectedException);
+  }
+
+  @Test
+  public void fetchNewRelease_getFisAuthTokenError_throwsError() {
+    Exception expectedException = new Exception("test ex");
+    when(mockFirebaseInstallations.getToken(false))
+        .thenReturn(Tasks.forException(expectedException));
+
+    Task<AppDistributionReleaseInternal> releaseTask =
+        firebaseAppDistributionTesterApiClient.fetchNewRelease();
+
+    awaitTaskFailure(releaseTask, Status.UNKNOWN, "test ex", expectedException);
+  }
+
+  @Test
+  public void fetchNewRelease_whenClientThrowsException_failsTask() throws Exception {
+    when(mockTesterApiHttpClient.makeGetRequest(any(), eq(RELEASES_PATH), eq(TEST_AUTH_TOKEN)))
+        .thenThrow(new FirebaseAppDistributionException("test ex", Status.UNKNOWN));
+
+    Task<AppDistributionReleaseInternal> releaseTask =
+        firebaseAppDistributionTesterApiClient.fetchNewRelease();
+
+    awaitTaskFailure(releaseTask, Status.UNKNOWN, "test ex");
+  }
+
+  @Test
+  public void fetchNewRelease_whenNoReleases_returnsNull() throws Exception {
+    JSONObject releaseJson = readTestJSON("testNoReleasesResponse.json");
+    when(mockTesterApiHttpClient.makeGetRequest(any(), eq(RELEASES_PATH), eq(TEST_AUTH_TOKEN)))
+        .thenReturn(releaseJson);
+
+    Task<AppDistributionReleaseInternal> releaseTask =
+        firebaseAppDistributionTesterApiClient.fetchNewRelease();
+    AppDistributionReleaseInternal result = awaitTask(releaseTask);
+
+    assertThat(result).isNull();
+  }
+
+  @Test
+  public void findReleaseUsingApkHash_whenResponseSuccessful_returnsReleaseName() throws Exception {
+    JSONObject releaseJson = new JSONObject(String.format("{\"release\":\"%s\"}", RELEASE_NAME));
+    when(mockTesterApiHttpClient.makeGetRequest(
+            any(), eq(FIND_RELEASE_USING_APK_PATH), eq(TEST_AUTH_TOKEN)))
+        .thenReturn(releaseJson);
+
+    Task<String> task = firebaseAppDistributionTesterApiClient.findReleaseUsingApkHash(APK_HASH);
+    String result = awaitTask(task);
+
+    assertThat(result).isEqualTo(RELEASE_NAME);
+  }
+
+  @Test
+  public void findReleaseUsingApkHash_getFidError_throwsError() {
+    Exception expectedException = new Exception("test ex");
+    when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forException(expectedException));
+
+    Task<String> task = firebaseAppDistributionTesterApiClient.findReleaseUsingApkHash(APK_HASH);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex", expectedException);
+  }
+
+  @Test
+  public void findReleaseUsingApkHash_getFisAuthTokenError_throwsError() {
+    Exception expectedException = new Exception("test ex");
+    when(mockFirebaseInstallations.getToken(false))
+        .thenReturn(Tasks.forException(expectedException));
+
+    Task<String> task = firebaseAppDistributionTesterApiClient.findReleaseUsingApkHash(APK_HASH);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex", expectedException);
+  }
+
+  @Test
+  public void findReleaseUsingApkHash_whenClientThrowsException_failsTask() throws Exception {
+    when(mockTesterApiHttpClient.makeGetRequest(
+            any(), eq(FIND_RELEASE_USING_APK_PATH), eq(TEST_AUTH_TOKEN)))
+        .thenThrow(new FirebaseAppDistributionException("test ex", Status.UNKNOWN));
+
+    Task<String> task = firebaseAppDistributionTesterApiClient.findReleaseUsingApkHash(APK_HASH);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex");
+  }
+
+  @Test
+  public void findReleaseUsingIasArtifactId_whenResponseSuccessful_returnsReleaseName()
+      throws Exception {
+    JSONObject releaseJson = new JSONObject(String.format("{\"release\":\"%s\"}", RELEASE_NAME));
+    when(mockTesterApiHttpClient.makeGetRequest(
+            any(), eq(FIND_RELEASE_USING_IAS_PATH), eq(TEST_AUTH_TOKEN)))
+        .thenReturn(releaseJson);
+
+    Task<String> task =
+        firebaseAppDistributionTesterApiClient.findReleaseUsingIasArtifactId(IAS_ARTIFACT_ID);
+    String result = awaitTask(task);
+
+    assertThat(result).isEqualTo(RELEASE_NAME);
+  }
+
+  @Test
+  public void findReleaseUsingIasArtifactId_getFidError_throwsError() {
+    Exception expectedException = new Exception("test ex");
+    when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forException(expectedException));
+
+    Task<String> task =
+        firebaseAppDistributionTesterApiClient.findReleaseUsingIasArtifactId(IAS_ARTIFACT_ID);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex", expectedException);
+  }
+
+  @Test
+  public void findReleaseUsingIasArtifactId_getFisAuthTokenError_throwsError() {
+    Exception expectedException = new Exception("test ex");
+    when(mockFirebaseInstallations.getToken(false))
+        .thenReturn(Tasks.forException(expectedException));
+
+    Task<String> task =
+        firebaseAppDistributionTesterApiClient.findReleaseUsingIasArtifactId(IAS_ARTIFACT_ID);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex", expectedException);
+  }
+
+  @Test
+  public void findReleaseUsingIasArtifactId_whenClientThrowsException_failsTask() throws Exception {
+    when(mockTesterApiHttpClient.makeGetRequest(
+            any(), eq(FIND_RELEASE_USING_IAS_PATH), eq(TEST_AUTH_TOKEN)))
+        .thenThrow(new FirebaseAppDistributionException("test ex", Status.UNKNOWN));
+
+    Task<String> task =
+        firebaseAppDistributionTesterApiClient.findReleaseUsingIasArtifactId(IAS_ARTIFACT_ID);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex");
+  }
+
+  @Test
+  public void createFeedback_whenResponseSuccessful_returnsFeedbackName() throws Exception {
+    String postBody = String.format("{\"text\":\"%s\"}", FEEDBACK_TEXT);
+    when(mockTesterApiHttpClient.makeJsonPostRequest(
+            any(), eq(CREATE_FEEDBACK_PATH), eq(TEST_AUTH_TOKEN), eq(postBody)))
+        .thenReturn(buildFeedbackJson());
+
+    Task<String> task =
+        firebaseAppDistributionTesterApiClient.createFeedback(RELEASE_NAME, FEEDBACK_TEXT);
+    String result = awaitTask(task);
+
+    assertThat(result).isEqualTo(FEEDBACK_NAME);
+  }
+
+  @Test
+  public void createFeedback_getFidError_throwsError() {
+    Exception expectedException = new Exception("test ex");
+    when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forException(expectedException));
+
+    Task<String> task =
+        firebaseAppDistributionTesterApiClient.createFeedback(RELEASE_NAME, FEEDBACK_TEXT);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex", expectedException);
+  }
+
+  @Test
+  public void createFeedback_getFisAuthTokenError_throwsError() {
+    Exception expectedException = new Exception("test ex");
+    when(mockFirebaseInstallations.getToken(false))
+        .thenReturn(Tasks.forException(expectedException));
+
+    Task<String> task =
+        firebaseAppDistributionTesterApiClient.createFeedback(RELEASE_NAME, FEEDBACK_TEXT);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex", expectedException);
+  }
+
+  @Test
+  public void createFeedback_whenClientThrowsException_failsTask() throws Exception {
+    String postBody = String.format("{\"text\":\"%s\"}", FEEDBACK_TEXT);
+
+    when(mockTesterApiHttpClient.makeJsonPostRequest(
+            any(), eq(CREATE_FEEDBACK_PATH), eq(TEST_AUTH_TOKEN), eq(postBody)))
+        .thenThrow(new FirebaseAppDistributionException("test ex", Status.UNKNOWN));
+
+    Task<String> task =
+        firebaseAppDistributionTesterApiClient.createFeedback(RELEASE_NAME, FEEDBACK_TEXT);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex");
+  }
+
+  @Test
+  public void commitFeedback_whenResponseSuccessful_makesPostRequest() throws Exception {
+    Task<Void> task =
+        firebaseAppDistributionTesterApiClient.commitFeedback(
+            FEEDBACK_NAME, FeedbackTrigger.CUSTOM);
+    awaitTask(task);
+
+    Map<String, String> extraHeaders = new HashMap<>();
+    extraHeaders.put("X-APP-DISTRO-FEEDBACK-TRIGGER", "custom");
+    verify(mockTesterApiHttpClient)
+        .makeJsonPostRequest(
+            any(), eq(COMMIT_FEEDBACK_PATH), eq(TEST_AUTH_TOKEN), eq(""), eq(extraHeaders));
+  }
+
+  @Test
+  public void commitFeedback_getFidError_throwsError() {
+    Exception expectedException = new Exception("test ex");
+    when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forException(expectedException));
+
+    Task<Void> task =
+        firebaseAppDistributionTesterApiClient.commitFeedback(
+            FEEDBACK_NAME, FeedbackTrigger.CUSTOM);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex", expectedException);
+  }
+
+  @Test
+  public void commitFeedback_getFisAuthTokenError_throwsError() {
+    Exception expectedException = new Exception("test ex");
+    when(mockFirebaseInstallations.getToken(false))
+        .thenReturn(Tasks.forException(expectedException));
+
+    Task<Void> task =
+        firebaseAppDistributionTesterApiClient.commitFeedback(
+            FEEDBACK_NAME, FeedbackTrigger.CUSTOM);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex", expectedException);
+  }
+
+  @Test
+  public void commitFeedback_whenClientThrowsException_failsTask() throws Exception {
+    Map<String, String> extraHeaders = new HashMap<>();
+    extraHeaders.put("X-APP-DISTRO-FEEDBACK-TRIGGER", "custom");
+    when(mockTesterApiHttpClient.makeJsonPostRequest(
+            any(), eq(COMMIT_FEEDBACK_PATH), eq(TEST_AUTH_TOKEN), eq(""), eq(extraHeaders)))
+        .thenThrow(new FirebaseAppDistributionException("test ex", Status.UNKNOWN));
+
+    Task<Void> task =
+        firebaseAppDistributionTesterApiClient.commitFeedback(
+            FEEDBACK_NAME, FeedbackTrigger.CUSTOM);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex");
+  }
+
+  @Test
+  public void attachScreenshot_whenResponseSuccessful_makesPostRequestAndReturnsFeedbackName()
+      throws Exception {
+    Uri uri =
+        Uri.fromFile(ApplicationProvider.getApplicationContext().getFileStreamPath(TEST_FILE_NAME));
+
+    Task<String> task =
+        firebaseAppDistributionTesterApiClient.attachScreenshot(
+            FEEDBACK_NAME, uri, TEST_FILE_NAME, CONTENT_TYPE_PNG);
+    String result = awaitTask(task);
+
+    assertThat(result).isEqualTo(FEEDBACK_NAME);
+    verify(mockTesterApiHttpClient)
+        .makeUploadRequest(
+            any(),
+            eq(ATTACH_SCREENSHOT_PATH),
+            eq(TEST_AUTH_TOKEN),
+            eq(TEST_FILE_NAME),
+            eq(CONTENT_TYPE_PNG),
+            eq(uri));
+  }
+
+  @Test
+  public void attachScreenshot_getFidError_throwsError() throws FileNotFoundException {
+    Exception expectedException = new Exception("test ex");
+    when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forException(expectedException));
+    Uri uri =
+        Uri.fromFile(ApplicationProvider.getApplicationContext().getFileStreamPath(TEST_FILE_NAME));
+
+    Task<String> task =
+        firebaseAppDistributionTesterApiClient.attachScreenshot(
+            FEEDBACK_NAME, uri, TEST_FILE_NAME, CONTENT_TYPE_PNG);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex", expectedException);
+  }
+
+  @Test
+  public void attachScreenshot_getFisAuthTokenError_throwsError() throws FileNotFoundException {
+    Exception expectedException = new Exception("test ex");
+    when(mockFirebaseInstallations.getToken(false))
+        .thenReturn(Tasks.forException(expectedException));
+    Uri uri =
+        Uri.fromFile(ApplicationProvider.getApplicationContext().getFileStreamPath(TEST_FILE_NAME));
+
+    Task<String> task =
+        firebaseAppDistributionTesterApiClient.attachScreenshot(
+            FEEDBACK_NAME, uri, TEST_FILE_NAME, CONTENT_TYPE_PNG);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex", expectedException);
+  }
+
+  @Test
+  public void attachScreenshot_whenClientThrowsException_failsTask() throws Exception {
+    when(mockTesterApiHttpClient.makeUploadRequest(
+            any(),
+            eq(ATTACH_SCREENSHOT_PATH),
+            eq(TEST_AUTH_TOKEN),
+            eq(TEST_FILE_NAME),
+            eq(CONTENT_TYPE_PNG),
+            any()))
+        .thenThrow(new FirebaseAppDistributionException("test ex", Status.UNKNOWN));
+    Uri uri =
+        Uri.fromFile(ApplicationProvider.getApplicationContext().getFileStreamPath(TEST_FILE_NAME));
+
+    Task<String> task =
+        firebaseAppDistributionTesterApiClient.attachScreenshot(
+            FEEDBACK_NAME, uri, TEST_FILE_NAME, CONTENT_TYPE_PNG);
+
+    awaitTaskFailure(task, Status.UNKNOWN, "test ex");
+  }
+
+  private JSONObject buildFeedbackJson() throws JSONException {
+    return new JSONObject(
+        String.format("{\"name\":\"%s\",\"text\":\"%s\"}", FEEDBACK_NAME, FEEDBACK_TEXT));
+  }
+}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ImageUtilsTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ImageUtilsTest.java
new file mode 100644
index 00000000000..b49ec736ced
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ImageUtilsTest.java
@@ -0,0 +1,183 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.content.ContentResolver;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.CompressFormat;
+import android.graphics.Bitmap.Config;
+import android.net.Uri;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowBitmapFactory;
+import org.robolectric.shadows.ShadowContentResolver;
+
+@RunWith(RobolectricTestRunner.class)
+public class ImageUtilsTest {
+  private static final int TEST_SCREENSHOT_WIDTH = 1080;
+  private static final int TEST_SCREENSHOT_HEIGHT = 2280;
+  private static final Bitmap TEST_SCREENSHOT =
+      Bitmap.createBitmap(TEST_SCREENSHOT_WIDTH, TEST_SCREENSHOT_HEIGHT, Config.RGB_565);
+  private static final Uri TEST_SCREENSHOT_URI = Uri.parse("file:///path/to/screenshot.png");
+
+  private ContentResolver contentResolver;
+  private ShadowContentResolver shadowContentResolver;
+
+  @Before
+  public void setUp() throws IOException {
+    // Makes the shadow behave like the real BitmapFactory, for example returning null for
+    // nonexistent files
+    ShadowBitmapFactory.setAllowInvalidImageData(false);
+    contentResolver = RuntimeEnvironment.getApplication().getContentResolver();
+    shadowContentResolver = shadowOf(contentResolver);
+    shadowContentResolver.registerInputStream(
+        TEST_SCREENSHOT_URI, new ByteArrayInputStream(writeBitmapToByteArray()));
+  }
+
+  @Test
+  public void readScaledImage_targetIsLessThanHalf_scalesDown() throws IOException {
+    Bitmap result =
+        ImageUtils.readScaledImage(
+            contentResolver,
+            TEST_SCREENSHOT_URI,
+            TEST_SCREENSHOT_WIDTH / 2 - 100,
+            TEST_SCREENSHOT_HEIGHT / 2 - 100);
+
+    assertThat(result.getWidth()).isEqualTo(TEST_SCREENSHOT_WIDTH / 2);
+    assertThat(result.getHeight()).isEqualTo(TEST_SCREENSHOT_HEIGHT / 2);
+  }
+
+  @Test
+  public void readScaledImage_targetExactlyPowerOfTwoSmaller_scalesDown() throws IOException {
+    Bitmap result =
+        ImageUtils.readScaledImage(
+            contentResolver,
+            TEST_SCREENSHOT_URI,
+            TEST_SCREENSHOT_WIDTH / 4,
+            TEST_SCREENSHOT_HEIGHT / 4);
+
+    assertThat(result.getWidth()).isEqualTo(TEST_SCREENSHOT_WIDTH / 4);
+    assertThat(result.getHeight()).isEqualTo(TEST_SCREENSHOT_HEIGHT / 4);
+  }
+
+  @Test
+  public void readScaledImage_targetWidthIsSmaller_scalesDownToFitHeight() throws IOException {
+    Bitmap result =
+        ImageUtils.readScaledImage(
+            contentResolver,
+            TEST_SCREENSHOT_URI,
+            TEST_SCREENSHOT_WIDTH / 4 - 100,
+            TEST_SCREENSHOT_HEIGHT / 2 - 100);
+
+    assertThat(result.getWidth()).isEqualTo(TEST_SCREENSHOT_WIDTH / 2);
+    assertThat(result.getHeight()).isEqualTo(TEST_SCREENSHOT_HEIGHT / 2);
+  }
+
+  @Test
+  public void readScaledImage_targetHeightIsSmaller_scalesDownToFitWidth() throws IOException {
+    Bitmap result =
+        ImageUtils.readScaledImage(
+            contentResolver,
+            TEST_SCREENSHOT_URI,
+            TEST_SCREENSHOT_WIDTH / 2 - 100,
+            TEST_SCREENSHOT_HEIGHT / 4 - 100);
+
+    assertThat(result.getWidth()).isEqualTo(TEST_SCREENSHOT_WIDTH / 2);
+    assertThat(result.getHeight()).isEqualTo(TEST_SCREENSHOT_HEIGHT / 2);
+  }
+
+  @Test
+  public void readScaledImage_targetIsGreaterThanHalf_returnsOriginal() throws IOException {
+    Bitmap result =
+        ImageUtils.readScaledImage(
+            contentResolver,
+            TEST_SCREENSHOT_URI,
+            TEST_SCREENSHOT_WIDTH - 100,
+            TEST_SCREENSHOT_HEIGHT - 100);
+
+    assertThat(result.getWidth()).isEqualTo(TEST_SCREENSHOT_WIDTH);
+    assertThat(result.getHeight()).isEqualTo(TEST_SCREENSHOT_HEIGHT);
+  }
+
+  @Test
+  public void readScaledImage_targetIsGreater_returnsOriginal() throws IOException {
+    Bitmap result =
+        ImageUtils.readScaledImage(
+            contentResolver,
+            TEST_SCREENSHOT_URI,
+            TEST_SCREENSHOT_WIDTH * 2,
+            TEST_SCREENSHOT_HEIGHT * 2);
+
+    assertThat(result.getWidth()).isEqualTo(TEST_SCREENSHOT_WIDTH);
+    assertThat(result.getHeight()).isEqualTo(TEST_SCREENSHOT_HEIGHT);
+  }
+
+  @Test
+  public void readScaledImage_negativeHeight_scalesProportionally() throws IOException {
+    Bitmap result =
+        ImageUtils.readScaledImage(
+            contentResolver, TEST_SCREENSHOT_URI, TEST_SCREENSHOT_WIDTH / 4, -1);
+
+    assertThat(result.getWidth()).isEqualTo(TEST_SCREENSHOT_WIDTH / 4);
+    assertThat(result.getHeight()).isEqualTo(TEST_SCREENSHOT_HEIGHT / 4);
+  }
+
+  @Test
+  public void readScaledImage_negativeWidth_scalesProportionally() throws IOException {
+    Bitmap result =
+        ImageUtils.readScaledImage(
+            contentResolver, TEST_SCREENSHOT_URI, -1, TEST_SCREENSHOT_HEIGHT / 4);
+
+    assertThat(result.getWidth()).isEqualTo(TEST_SCREENSHOT_WIDTH / 4);
+    assertThat(result.getHeight()).isEqualTo(TEST_SCREENSHOT_HEIGHT / 4);
+  }
+
+  @Test
+  public void readScaledImage_negativeDimensions_throws() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> ImageUtils.readScaledImage(contentResolver, TEST_SCREENSHOT_URI, -1, -1));
+  }
+
+  @Test
+  public void readScaledImage_doesntExist_throws() throws IOException {
+    assertThrows(
+        IOException.class,
+        () ->
+            ImageUtils.readScaledImage(
+                contentResolver,
+                Uri.fromFile(new File("nonexistent.png")),
+                TEST_SCREENSHOT_WIDTH / 4,
+                TEST_SCREENSHOT_HEIGHT / 4));
+  }
+
+  private static byte[] writeBitmapToByteArray() throws IOException {
+    try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+      TEST_SCREENSHOT.compress(CompressFormat.PNG, 100, outputStream);
+      return outputStream.toByteArray();
+    }
+  }
+}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/NewReleaseFetcherTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/NewReleaseFetcherTest.java
new file mode 100644
index 00000000000..84e67c747eb
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/NewReleaseFetcherTest.java
@@ -0,0 +1,264 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static android.os.Looper.getMainLooper;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.appdistribution.BinaryType.APK;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitAsyncOperations;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTask;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTaskFailure;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.content.pm.PackageInfo;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.core.content.pm.PackageInfoBuilder;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.BinaryType;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.concurrent.TestOnlyExecutors;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(RobolectricTestRunner.class)
+public class NewReleaseFetcherTest {
+
+  private static final String TEST_IAS_ARTIFACT_ID = "ias-artifact-id";
+  private static final String NEW_CODEHASH = "abcdef";
+  private static final String CURRENT_CODEHASH = "ghiklm";
+  private static final String NEW_APK_HASH = "newApkHash";
+  private static final String CURRENT_APK_HASH = "currentApkHash";
+  private static final long INSTALLED_VERSION_CODE = 1;
+  private static final long NEW_VERSION_CODE = 2;
+
+  private NewReleaseFetcher newReleaseFetcher;
+  private ShadowPackageManager shadowPackageManager;
+
+  @Mock private FirebaseAppDistributionTesterApiClient mockFirebaseAppDistributionTesterApiClient;
+  @Mock private ReleaseIdentifier mockReleaseIdentifier;
+  @Mock private DevModeDetector mockDevModeDetector;
+
+  @Lightweight ExecutorService lightweightExecutor = TestOnlyExecutors.lite();
+
+  @Before
+  public void setup() throws FirebaseAppDistributionException {
+    MockitoAnnotations.initMocks(this);
+
+    shadowPackageManager =
+        shadowOf(ApplicationProvider.getApplicationContext().getPackageManager());
+
+    PackageInfo packageInfo =
+        PackageInfoBuilder.newBuilder()
+            .setPackageName(ApplicationProvider.getApplicationContext().getPackageName())
+            .build();
+    packageInfo.setLongVersionCode(INSTALLED_VERSION_CODE);
+    packageInfo.versionName = "1.0";
+    shadowPackageManager.installPackage(packageInfo);
+
+    when(mockReleaseIdentifier.extractApkHash()).thenReturn(Tasks.forResult(CURRENT_APK_HASH));
+    when(mockReleaseIdentifier.extractInternalAppSharingArtifactId())
+        .thenReturn(TEST_IAS_ARTIFACT_ID);
+    when(mockDevModeDetector.isDevModeEnabled()).thenReturn(false);
+
+    newReleaseFetcher =
+        spy(
+            new NewReleaseFetcher(
+                ApplicationProvider.getApplicationContext(),
+                mockFirebaseAppDistributionTesterApiClient,
+                mockReleaseIdentifier,
+                mockDevModeDetector,
+                lightweightExecutor));
+  }
+
+  @Test
+  public void checkForNewRelease_whenCalledMultipleTimes_onlyFetchesReleasesOnce()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    // Start a new task completion source and do not complete it, to mimic an in progress task
+    TaskCompletionSource<AppDistributionReleaseInternal> task = new TaskCompletionSource<>();
+    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease()).thenReturn(task.getTask());
+
+    Task<AppDistributionReleaseInternal> checkForNewReleaseTask1 =
+        newReleaseFetcher.checkForNewRelease();
+    Task<AppDistributionReleaseInternal> checkForNewReleaseTask2 =
+        newReleaseFetcher.checkForNewRelease();
+
+    // Don't set the result until after calling twice, to make sure that the task from the first
+    // call is still ongoing.
+    task.setResult(null);
+    awaitTask(checkForNewReleaseTask1);
+    awaitTask(checkForNewReleaseTask2);
+
+    verify(mockFirebaseAppDistributionTesterApiClient, times(1)).fetchNewRelease();
+  }
+
+  @Test
+  public void checkForNewRelease_newApkReleaseIsAvailable_returnsRelease() throws Exception {
+    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease())
+        .thenReturn(Tasks.forResult(getTestNewRelease().build()));
+
+    AppDistributionReleaseInternal release = awaitTask(newReleaseFetcher.checkForNewRelease());
+
+    assertThat(release).isEqualTo(getTestNewRelease().build());
+  }
+
+  @Test
+  public void checkForNewRelease_devModeEnabled_returnsNull() throws Exception {
+    when(mockDevModeDetector.isDevModeEnabled()).thenReturn(true);
+
+    AppDistributionReleaseInternal release = awaitTask(newReleaseFetcher.checkForNewRelease());
+
+    assertThat(release).isNull();
+    verifyNoInteractions(mockFirebaseAppDistributionTesterApiClient);
+  }
+
+  @Test
+  public void checkForNewRelease_apiClientFailure() {
+    FirebaseAppDistributionException expectedException =
+        new FirebaseAppDistributionException(
+            "test", FirebaseAppDistributionException.Status.UNKNOWN);
+    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease())
+        .thenReturn(Tasks.forException(expectedException));
+
+    Task<AppDistributionReleaseInternal> task = newReleaseFetcher.checkForNewRelease();
+    shadowOf(getMainLooper()).idle();
+
+    awaitTaskFailure(task, FirebaseAppDistributionException.Status.UNKNOWN, "test");
+  }
+
+  @Test
+  public void checkForNewRelease_whenNewReleaseIsSameRelease_returnsNull()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease())
+        .thenReturn(Tasks.forResult(getTestInstalledRelease().build()));
+
+    Task<AppDistributionReleaseInternal> releaseTask = newReleaseFetcher.checkForNewRelease();
+    awaitAsyncOperations(lightweightExecutor);
+
+    assertThat(awaitTask(releaseTask)).isNull();
+  }
+
+  @Test
+  public void checkForNewRelease_whenNewReleaseIsLowerVersionCode_returnsNull()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease())
+        .thenReturn(
+            Tasks.forResult(
+                getTestInstalledRelease()
+                    .setBuildVersion(Long.toString(INSTALLED_VERSION_CODE - 1))
+                    .build()));
+
+    Task<AppDistributionReleaseInternal> releaseTask = newReleaseFetcher.checkForNewRelease();
+
+    assertThat(awaitTask(releaseTask)).isNull();
+  }
+
+  @Test
+  public void checkForNewRelease_whenNewAabIsAvailable_returnsRelease()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    AppDistributionReleaseInternal expectedRelease =
+        getTestNewRelease()
+            .setDownloadUrl("http://fake-download-url")
+            .setIasArtifactId("test-ias-artifact-id-2")
+            .setBinaryType(BinaryType.AAB)
+            .build();
+    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease())
+        .thenReturn(Tasks.forResult(expectedRelease));
+
+    Task<AppDistributionReleaseInternal> result = newReleaseFetcher.checkForNewRelease();
+
+    assertThat(awaitTask(result)).isEqualTo(expectedRelease);
+  }
+
+  @Test
+  public void checkForNewRelease_differentVersionNameThanInstalled_returnsRelease()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    AppDistributionReleaseInternal expectedRelease =
+        getTestNewRelease()
+            .setDownloadUrl("http://fake-download-url")
+            .setIasArtifactId(TEST_IAS_ARTIFACT_ID)
+            .setBinaryType(BinaryType.AAB)
+            .setDisplayVersion("2.0")
+            .build();
+    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease())
+        .thenReturn(Tasks.forResult(expectedRelease));
+
+    Task<AppDistributionReleaseInternal> result = newReleaseFetcher.checkForNewRelease();
+
+    assertThat(awaitTask(result)).isEqualTo(expectedRelease);
+  }
+
+  @Test
+  public void checkForNewRelease_whenNewReleaseIsSameAsInstalledAab_returnsNull()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease())
+        .thenReturn(
+            Tasks.forResult(
+                getTestInstalledRelease()
+                    .setDownloadUrl("http://fake-download-url")
+                    .setIasArtifactId(TEST_IAS_ARTIFACT_ID)
+                    .setBinaryType(BinaryType.AAB)
+                    .build()));
+
+    Task<AppDistributionReleaseInternal> result = newReleaseFetcher.checkForNewRelease();
+
+    assertThat(awaitTask(result)).isNull();
+  }
+
+  @Test
+  public void checkForNewRelease_onlyDifferenceIsMissingApkHash_throwsError() {
+    when(mockFirebaseAppDistributionTesterApiClient.fetchNewRelease())
+        .thenReturn(Tasks.forResult(getTestInstalledRelease().setApkHash("").build()));
+
+    Task<AppDistributionReleaseInternal> task = newReleaseFetcher.checkForNewRelease();
+
+    awaitTaskFailure(task, Status.UNKNOWN, "Missing APK hash");
+  }
+
+  private AppDistributionReleaseInternal.Builder getTestNewRelease() {
+    return AppDistributionReleaseInternal.builder()
+        .setBuildVersion(Long.toString(NEW_VERSION_CODE))
+        .setDisplayVersion("2.0")
+        .setReleaseNotes("Newer version.")
+        .setCodeHash(NEW_CODEHASH)
+        .setBinaryType(APK)
+        .setApkHash(NEW_APK_HASH);
+  }
+
+  private AppDistributionReleaseInternal.Builder getTestInstalledRelease() {
+    return AppDistributionReleaseInternal.builder()
+        .setBuildVersion(Long.toString(INSTALLED_VERSION_CODE))
+        .setDisplayVersion("1.0")
+        .setReleaseNotes("Current version.")
+        .setCodeHash(CURRENT_CODEHASH)
+        .setBinaryType(APK)
+        .setApkHash(CURRENT_APK_HASH);
+  }
+}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ReleaseIdentifierTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ReleaseIdentifierTest.java
new file mode 100644
index 00000000000..54dcde4f50c
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ReleaseIdentifierTest.java
@@ -0,0 +1,219 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTask;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.core.content.pm.ApplicationInfoBuilder;
+import androidx.test.core.content.pm.PackageInfoBuilder;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.concurrent.TestOnlyExecutors;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(RobolectricTestRunner.class)
+public class ReleaseIdentifierTest {
+  private static final String TEST_API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";
+  private static final String TEST_APP_ID_1 = "1:123456789:android:abcdef";
+  private static final String TEST_PROJECT_ID = "project-id";
+  private static final String TEST_PROJECT_NUMBER = "123456789";
+  private static final String TEST_RELEASE_NAME =
+      "projects/project-id/installations/installation-id/releases/release-id";
+  private static final String TEST_IAS_ARTIFACT_ID = "ias-artifact-id";
+  private static final String IAS_ARTIFACT_ID_KEY = "com.android.vending.internal.apk.id";
+  private static final String CURRENT_APK_HASH = "currentApkHash";
+  private static final long INSTALLED_VERSION_CODE = 1;
+
+  @Background private final Executor backgroundExecutor = TestOnlyExecutors.background();
+  @Lightweight private final Executor lightweightExecutor = TestOnlyExecutors.lite();
+
+  private FirebaseApp firebaseApp;
+  private ShadowPackageManager shadowPackageManager;
+  @Mock private FirebaseAppDistributionTesterApiClient mockTesterApiClient;
+  @Mock private DevModeDetector mockDevModeDetector;
+
+  private ReleaseIdentifier releaseIdentifier;
+
+  @Before
+  public void setup() {
+    MockitoAnnotations.initMocks(this);
+    FirebaseApp.clearInstancesForTest();
+
+    firebaseApp =
+        FirebaseApp.initializeApp(
+            ApplicationProvider.getApplicationContext(),
+            new FirebaseOptions.Builder()
+                .setApplicationId(TEST_APP_ID_1)
+                .setProjectId(TEST_PROJECT_ID)
+                .setGcmSenderId(TEST_PROJECT_NUMBER)
+                .setApiKey(TEST_API_KEY)
+                .build());
+
+    shadowPackageManager =
+        shadowOf(ApplicationProvider.getApplicationContext().getPackageManager());
+    releaseIdentifier =
+        Mockito.spy(
+            new ReleaseIdentifier(
+                firebaseApp.getApplicationContext(),
+                mockTesterApiClient,
+                mockDevModeDetector,
+                backgroundExecutor,
+                lightweightExecutor));
+
+    when(mockDevModeDetector.isDevModeEnabled()).thenReturn(false);
+  }
+
+  @Test
+  public void identifyRelease_apk_returnsReleaseName()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    installTestApk();
+    doReturn(CURRENT_APK_HASH).when(releaseIdentifier).calculateApkHash(any());
+    when(mockTesterApiClient.findReleaseUsingApkHash(CURRENT_APK_HASH))
+        .thenReturn(Tasks.forResult(TEST_RELEASE_NAME));
+
+    Task<String> task = releaseIdentifier.identifyRelease();
+
+    assertThat(awaitTask(task)).isEqualTo(TEST_RELEASE_NAME);
+  }
+
+  @Test
+  public void identifyRelease_aab_returnsReleaseName()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    installTestAab();
+    when(mockTesterApiClient.findReleaseUsingIasArtifactId(TEST_IAS_ARTIFACT_ID))
+        .thenReturn(Tasks.forResult(TEST_RELEASE_NAME));
+
+    Task<String> task = releaseIdentifier.identifyRelease();
+
+    assertThat(awaitTask(task)).isEqualTo(TEST_RELEASE_NAME);
+  }
+
+  @Test
+  public void extractApkHash_returnsAHash()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    Task<String> task = releaseIdentifier.extractApkHash();
+
+    assertThat(awaitTask(task).matches("^[0-9a-fA-F]+$")).isTrue();
+  }
+
+  @Test
+  public void extractApkHash_ifKeyInCachedApkHashes_doesNotRecalculateZipHash()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    Task<String> task1 = releaseIdentifier.extractApkHash();
+    awaitTask(task1);
+    Task<String> task2 = releaseIdentifier.extractApkHash();
+    awaitTask(task2);
+
+    // asserts that that calculateApkHash is only called once
+    verify(releaseIdentifier).calculateApkHash(any());
+  }
+
+  @Test
+  public void extractInternalAppSharingArtifactId_aabInstalled_returnsIasArtifactId()
+      throws FirebaseAppDistributionException {
+    installTestAab();
+
+    String iasArtifactId = releaseIdentifier.extractInternalAppSharingArtifactId();
+
+    assertThat(iasArtifactId).isEqualTo(TEST_IAS_ARTIFACT_ID);
+  }
+
+  @Test
+  public void extractInternalAppSharingArtifactId_apkInstalled_returnsNull()
+      throws FirebaseAppDistributionException {
+    installTestApk();
+
+    String iasArtifactId = releaseIdentifier.extractInternalAppSharingArtifactId();
+
+    assertThat(iasArtifactId).isNull();
+  }
+
+  @Test
+  public void extractInternalAppSharingArtifactId_cantGetAppMetadata_throwsError() {
+    installTestPackage(null);
+
+    FirebaseAppDistributionException e =
+        assertThrows(
+            FirebaseAppDistributionException.class,
+            () -> releaseIdentifier.extractInternalAppSharingArtifactId());
+
+    assertThat(e.getMessage()).contains("Missing package info");
+  }
+
+  @Test
+  public void identifyRelease_devModeEnabled_returnsNull()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    when(mockDevModeDetector.isDevModeEnabled()).thenReturn(true);
+
+    String releaseId = awaitTask(releaseIdentifier.identifyRelease());
+
+    assertThat(releaseId).isEqualTo(null);
+    verifyNoInteractions(mockTesterApiClient);
+  }
+
+  private void installTestApk() {
+    installTestPackage(new Bundle());
+  }
+
+  private void installTestAab() {
+    Bundle aabMetadata = new Bundle();
+    aabMetadata.putString(IAS_ARTIFACT_ID_KEY, TEST_IAS_ARTIFACT_ID);
+    installTestPackage(aabMetadata);
+  }
+
+  private void installTestPackage(@Nullable Bundle metadata) {
+    ApplicationInfo applicationInfo =
+        ApplicationInfoBuilder.newBuilder()
+            .setPackageName(ApplicationProvider.getApplicationContext().getPackageName())
+            .build();
+    applicationInfo.metaData = metadata;
+    applicationInfo.sourceDir = "sourcedir/";
+    PackageInfo packageInfo =
+        PackageInfoBuilder.newBuilder()
+            .setPackageName(ApplicationProvider.getApplicationContext().getPackageName())
+            .setApplicationInfo(applicationInfo)
+            .build();
+    packageInfo.setLongVersionCode(INSTALLED_VERSION_CODE);
+    packageInfo.versionName = "1.0";
+    shadowPackageManager.installPackage(packageInfo);
+  }
+}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ScreenshotTakerTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ScreenshotTakerTest.java
new file mode 100644
index 00000000000..60b4b6539b2
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ScreenshotTakerTest.java
@@ -0,0 +1,108 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static android.os.Looper.getMainLooper;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.appdistribution.impl.ScreenshotTaker.SCREENSHOT_FILE_NAME;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.concurrent.TestOnlyExecutors;
+import java.io.File;
+import java.util.concurrent.Executor;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class ScreenshotTakerTest {
+  private static final String TEST_API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";
+  private static final String TEST_APP_ID_1 = "1:123456789:android:abcdef";
+  private static final String TEST_PROJECT_ID = "project-id";
+  private static final String TEST_PROJECT_NUMBER = "123456789";
+  private static final Bitmap TEST_SCREENSHOT = Bitmap.createBitmap(400, 400, Config.RGB_565);
+
+  @Background private static final Executor backgroundExecutor = TestOnlyExecutors.background();
+
+  private FirebaseApp firebaseApp;
+  @Mock private FirebaseAppDistributionLifecycleNotifier mockLifecycleNotifier;
+  private ScreenshotTaker screenshotTaker;
+
+  @Before
+  public void setup() {
+    MockitoAnnotations.initMocks(this);
+    FirebaseApp.clearInstancesForTest();
+
+    firebaseApp =
+        FirebaseApp.initializeApp(
+            ApplicationProvider.getApplicationContext(),
+            new FirebaseOptions.Builder()
+                .setApplicationId(TEST_APP_ID_1)
+                .setProjectId(TEST_PROJECT_ID)
+                .setGcmSenderId(TEST_PROJECT_NUMBER)
+                .setApiKey(TEST_API_KEY)
+                .build());
+
+    screenshotTaker =
+        spy(
+            new ScreenshotTaker(
+                firebaseApp.getApplicationContext(), mockLifecycleNotifier, backgroundExecutor));
+
+    // Taking a screenshot of an actual activity would require an instrumentation test
+    doReturn(Tasks.forResult(TEST_SCREENSHOT)).when(screenshotTaker).captureScreenshot();
+  }
+
+  @After
+  public void tearDown() {
+    ApplicationProvider.getApplicationContext().deleteFile(SCREENSHOT_FILE_NAME);
+  }
+
+  @Test
+  public void takeAndDeleteScreenshot_success() throws Exception {
+    // Take a screenshot
+    Task<Uri> task = screenshotTaker.takeScreenshot();
+    shadowOf(getMainLooper()).idle();
+    Uri screenshotUri = TestUtils.awaitTask(task);
+
+    File expectedFile =
+        ApplicationProvider.getApplicationContext().getFileStreamPath(SCREENSHOT_FILE_NAME);
+    assertThat(screenshotUri).isEqualTo(Uri.fromFile(expectedFile));
+    assertThat(expectedFile.length()).isGreaterThan(0);
+
+    // Delete the screenshot
+    screenshotTaker.deleteScreenshot();
+
+    assertThat(
+            ApplicationProvider.getApplicationContext()
+                .getFileStreamPath(SCREENSHOT_FILE_NAME)
+                .exists())
+        .isFalse();
+  }
+}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/TestOnCompleteListener.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TestOnCompleteListener.java
similarity index 84%
rename from firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/TestOnCompleteListener.java
rename to firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TestOnCompleteListener.java
index 8f984184400..d9bec41104d 100644
--- a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/TestOnCompleteListener.java
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TestOnCompleteListener.java
@@ -12,11 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import androidx.annotation.NonNull;
+import com.google.android.gms.tasks.OnCanceledListener;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
@@ -30,7 +32,8 @@
  * <p>Note: Calling {@link #await()} from a Robolectric test does block the main thread, since those
  * tests are executed on the main thread.
  */
-public class TestOnCompleteListener<TResult> implements OnCompleteListener<TResult> {
+public class TestOnCompleteListener<TResult>
+    implements OnCompleteListener<TResult>, OnCanceledListener {
   private static final long TIMEOUT_MS = 5000;
   private final CountDownLatch latch = new CountDownLatch(1);
   private volatile TResult result;
@@ -48,6 +51,11 @@ public void onComplete(@NonNull Task<TResult> task) {
     latch.countDown();
   }
 
+  @Override
+  public void onCanceled() {
+    latch.countDown();
+  }
+
   /** Blocks until the {@link #onComplete} is called. */
   public TResult await()
       throws InterruptedException, ExecutionException, FirebaseAppDistributionException {
@@ -57,6 +65,9 @@ public TResult await()
     if (successful) {
       return result;
     } else {
+      if (exception == null) {
+        throw new IllegalStateException("task was canceled");
+      }
       if (exception instanceof InterruptedException) {
         throw (InterruptedException) exception;
       }
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TestUtils.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TestUtils.java
new file mode 100644
index 00000000000..213c1aa9b9d
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TestUtils.java
@@ -0,0 +1,183 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static android.os.Looper.getMainLooper;
+import static androidx.test.InstrumentationRegistry.getContext;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.Activity;
+import com.google.android.gms.tasks.SuccessContinuation;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import com.google.firebase.appdistribution.impl.FirebaseAppDistributionLifecycleNotifier.ActivityConsumer;
+import com.google.firebase.appdistribution.impl.FirebaseAppDistributionLifecycleNotifier.ActivityFunction;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BooleanSupplier;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.mockito.stubbing.Answer;
+
+final class TestUtils {
+
+  private static final int AWAIT_TERMINATION_TIMEOUT_MS = 100;
+  private static final int AWAIT_CONDITION_TIMEOUT_MS = 500;
+  private static final int SLEEP_MS = 50;
+
+  private TestUtils() {}
+
+  static FirebaseAppDistributionException awaitTaskFailure(
+      Task task, Status status, String messageSubstring) {
+    assertThrows(FirebaseAppDistributionException.class, () -> awaitTask(task));
+    return assertTaskFailure(task, status, messageSubstring);
+  }
+
+  static FirebaseAppDistributionException awaitTaskFailure(
+      Task task, Status status, String messageSubstring, Throwable cause) {
+    assertThrows(FirebaseAppDistributionException.class, () -> awaitTask(task));
+    FirebaseAppDistributionException exception = assertTaskFailure(task, status, messageSubstring);
+    assertThat(exception).hasCauseThat().isEqualTo(cause);
+    return exception;
+  }
+
+  private static FirebaseAppDistributionException assertTaskFailure(
+      Task task, Status status, String messageSubstring) {
+    assertThat(task.isComplete()).isTrue();
+    assertThat(task.isSuccessful()).isFalse();
+    assertThat(task.getException()).isInstanceOf(FirebaseAppDistributionException.class);
+    FirebaseAppDistributionException e = (FirebaseAppDistributionException) task.getException();
+    assertThat(e.getErrorCode()).isEqualTo(status);
+    assertThat(e).hasMessageThat().contains(messageSubstring);
+    return e;
+  }
+
+  static <T> T awaitTask(Task<T> task)
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    TestOnCompleteListener<T> onCompleteListener = new TestOnCompleteListener<>();
+    task.addOnCompleteListener(Executors.newSingleThreadExecutor(), onCompleteListener);
+
+    // Idle the main looper, which is also running these tests, so any Task or lifecycle callbacks
+    // can be handled. See http://robolectric.org/blog/2019/06/04/paused-looper/ for more info.
+    shadowOf(getMainLooper()).idle();
+
+    return onCompleteListener.await();
+  }
+
+  static void awaitTermination(ExecutorService executorService) throws InterruptedException {
+    executorService.awaitTermination(AWAIT_TERMINATION_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+  }
+
+  static void awaitAsyncOperations(ExecutorService executorService) throws InterruptedException {
+    // Await anything enqueued to the executor
+    awaitTermination(executorService);
+
+    // Idle the main looper, which is also running these tests, so any Task or lifecycle callbacks
+    // can be handled. See http://robolectric.org/blog/2019/06/04/paused-looper/ for more info.
+    shadowOf(getMainLooper()).idle();
+  }
+
+  static void awaitCondition(BooleanSupplier condition) throws InterruptedException {
+    long start = System.currentTimeMillis();
+    while (elapsedTime(start) < AWAIT_CONDITION_TIMEOUT_MS) {
+      if (condition.getAsBoolean()) {
+        return;
+      }
+      Thread.sleep(SLEEP_MS);
+    }
+    throw new AssertionError("Timed out waiting for condition");
+  }
+
+  private static long elapsedTime(long start) {
+    return System.currentTimeMillis() - start;
+  }
+
+  /**
+   * Mock out the given lifecycle notifier's applyToForegroundActivity(),
+   * consumeForegroundActivity(), and applyToForegroundActivityTask() methods, to immediately
+   * provide the given activity.
+   */
+  static void mockForegroundActivity(
+      FirebaseAppDistributionLifecycleNotifier mockLifeCycleNotifier, Activity activity) {
+    when(mockLifeCycleNotifier.applyToForegroundActivity(any()))
+        .thenAnswer(applyToForegroundActivityAnswer(activity));
+    when(mockLifeCycleNotifier.consumeForegroundActivity(any()))
+        .thenAnswer(consumeForegroundActivityAnswer(activity));
+    when(mockLifeCycleNotifier.applyToForegroundActivityTask(any()))
+        .thenAnswer(applyToForegroundActivityTaskAnswer(activity));
+  }
+
+  private static <T> Answer<Task<T>> applyToForegroundActivityAnswer(Activity activity) {
+    return invocationOnMock -> {
+      ActivityFunction<T> function = (ActivityFunction<T>) invocationOnMock.getArgument(0);
+      if (function == null) {
+        return Tasks.forException(new IllegalStateException("ActivityFunction was null"));
+      }
+      return Tasks.forResult(function.apply(activity));
+    };
+  }
+
+  private static Answer<Task<Void>> consumeForegroundActivityAnswer(Activity activity) {
+    return invocationOnMock -> {
+      ActivityConsumer consumer = (ActivityConsumer) invocationOnMock.getArgument(0);
+      if (consumer == null) {
+        return Tasks.forException(new IllegalStateException("ActivityConsumer was null"));
+      }
+      consumer.consume(activity);
+      return Tasks.forResult(null);
+    };
+  }
+
+  private static <T> Answer<Task<T>> applyToForegroundActivityTaskAnswer(Activity activity) {
+    return invocationOnMock -> {
+      SuccessContinuation<Activity, T> continuation =
+          (SuccessContinuation<Activity, T>) invocationOnMock.getArgument(0);
+      if (continuation == null) {
+        return Tasks.forException(new IllegalStateException("SuccessContinuation was null"));
+      }
+      return continuation.then(activity);
+    };
+  }
+
+  static InputStream getTestFileInputStream(String fileName) throws IOException {
+    return getContext().getResources().getAssets().open(fileName);
+  }
+
+  static String readTestFile(String fileName) throws IOException {
+    final InputStream jsonInputStream = getTestFileInputStream(fileName);
+    return streamToString(jsonInputStream);
+  }
+
+  static JSONObject readTestJSON(String fileName) throws IOException, JSONException {
+    final String testJsonString = readTestFile(fileName);
+    final JSONObject testJson = new JSONObject(testJsonString);
+    return testJson;
+  }
+
+  private static String streamToString(InputStream is) {
+    final java.util.Scanner s = new java.util.Scanner(is).useDelimiter("\\A");
+    return s.hasNext() ? s.next() : "";
+  }
+}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TesterApiDisabledErrorDetailsTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TesterApiDisabledErrorDetailsTest.java
new file mode 100644
index 00000000000..24fdac9f211
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TesterApiDisabledErrorDetailsTest.java
@@ -0,0 +1,76 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.firebase.appdistribution.impl.TesterApiDisabledErrorDetails.HelpLink;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class TesterApiDisabledErrorDetailsTest {
+
+  @Test
+  public void tryParse_success() throws IOException {
+    String responseBody = TestUtils.readTestFile("apiDisabledResponse.json");
+
+    TesterApiDisabledErrorDetails details = TesterApiDisabledErrorDetails.tryParse(responseBody);
+
+    assertThat(details.helpLinks())
+        .containsExactly(
+            HelpLink.create(
+                "Google developers console API activation",
+                "https://console.developers.google.com/apis/api/firebaseapptesters.googleapis.com/overview?project=123456789"));
+  }
+
+  @Test
+  public void tryParse_badResponseBody_returnsNull() {
+    String responseBody = "not json";
+
+    TesterApiDisabledErrorDetails details = TesterApiDisabledErrorDetails.tryParse(responseBody);
+
+    assertThat(details).isNull();
+  }
+
+  @Test
+  public void tryParse_errorParsingLinks_stillReturnsDetails() throws IOException {
+    String responseBody = TestUtils.readTestFile("apiDisabledBadLinkResponse.json");
+
+    TesterApiDisabledErrorDetails details = TesterApiDisabledErrorDetails.tryParse(responseBody);
+
+    assertThat(details.helpLinks())
+        .containsExactly(
+            HelpLink.create("One link", "http://google.com"),
+            HelpLink.create("Another link", "http://gmail.com"));
+  }
+
+  @Test
+  public void formatLinks_success() {
+    List<HelpLink> helpLinks = new ArrayList<>();
+    helpLinks.add(HelpLink.create("One link", "http://google.com"));
+    helpLinks.add(HelpLink.create("Another link", "http://gmail.com"));
+    TesterApiDisabledErrorDetails details = new AutoValue_TesterApiDisabledErrorDetails(helpLinks);
+
+    String formattedLinks = details.formatLinks();
+
+    assertThat(formattedLinks)
+        .isEqualTo("One link: http://google.com\nAnother link: http://gmail.com\n");
+  }
+}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TesterApiHttpClientTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TesterApiHttpClientTest.java
new file mode 100644
index 00000000000..dbc3b4bd554
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TesterApiHttpClientTest.java
@@ -0,0 +1,286 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.appdistribution.impl.TestUtils.getTestFileInputStream;
+import static com.google.firebase.appdistribution.impl.TestUtils.readTestFile;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.content.ContentResolver;
+import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
+import com.google.common.collect.Iterators;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import javax.net.ssl.HttpsURLConnection;
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowContentResolver;
+
+@RunWith(RobolectricTestRunner.class)
+public class TesterApiHttpClientTest {
+
+  private static final String TEST_API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";
+  private static final String TEST_APP_ID_1 = "1:123456789:android:abcdef";
+  private static final String TEST_PROJECT_ID = "project-id";
+  private static final String TEST_AUTH_TOKEN = "fad.auth.token";
+  private static final String INVALID_RESPONSE = "InvalidResponse";
+  private static final String TEST_PATH = "some/url/path";
+  private static final String TEST_URL =
+      String.format("https://firebaseapptesters.googleapis.com/%s", TEST_PATH);
+  private static final String TAG = "Test Tag";
+  private static final String TEST_POST_BODY = "Post body";
+
+  private TesterApiHttpClient testerApiHttpClient;
+  @Mock private HttpsURLConnection mockHttpsURLConnection;
+  @Mock private HttpsUrlConnectionFactory mockHttpsURLConnectionFactory;
+
+  @Before
+  public void setup() throws Exception {
+    MockitoAnnotations.initMocks(this);
+    FirebaseApp.clearInstancesForTest();
+
+    FirebaseApp firebaseApp =
+        FirebaseApp.initializeApp(
+            ApplicationProvider.getApplicationContext(),
+            new FirebaseOptions.Builder()
+                .setApplicationId(TEST_APP_ID_1)
+                .setProjectId(TEST_PROJECT_ID)
+                .setApiKey(TEST_API_KEY)
+                .build());
+
+    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenReturn(mockHttpsURLConnection);
+
+    testerApiHttpClient =
+        new TesterApiHttpClient(
+            firebaseApp.getApplicationContext(),
+            firebaseApp.getOptions(),
+            mockHttpsURLConnectionFactory);
+  }
+
+  @Test
+  public void makeGetRequest_whenResponseSuccessful_returnsJsonResponse() throws Exception {
+    String responseJson = readTestFile("testSimpleResponse.json");
+    InputStream responseInputStream = new ByteArrayInputStream(responseJson.getBytes(UTF_8));
+    when(mockHttpsURLConnection.getResponseCode()).thenReturn(200);
+    when(mockHttpsURLConnection.getInputStream()).thenReturn(responseInputStream);
+
+    JSONObject responseBody = testerApiHttpClient.makeGetRequest(TAG, TEST_PATH, TEST_AUTH_TOKEN);
+
+    assertThat(Iterators.getOnlyElement(responseBody.keys())).isEqualTo("fieldName");
+    assertThat(responseBody.getString("fieldName")).isEqualTo("fieldValue");
+    verify(mockHttpsURLConnection).disconnect();
+  }
+
+  @Test
+  public void makeGetRequest_whenConnectionFails_throwsError() throws Exception {
+    IOException caughtException = new IOException("error");
+    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenThrow(caughtException);
+
+    FirebaseAppDistributionException e =
+        assertThrows(
+            FirebaseAppDistributionException.class,
+            () -> testerApiHttpClient.makeGetRequest(TAG, TEST_PATH, TEST_AUTH_TOKEN));
+
+    assertThat(e.getErrorCode()).isEqualTo(Status.NETWORK_FAILURE);
+    assertThat(e.getMessage()).contains(TAG);
+    assertThat(e.getMessage()).contains(ErrorMessages.NETWORK_ERROR);
+  }
+
+  @Test
+  public void makeGetRequest_whenInvalidJson_throwsError() throws Exception {
+    InputStream response = new ByteArrayInputStream(INVALID_RESPONSE.getBytes(UTF_8));
+    when(mockHttpsURLConnection.getInputStream()).thenReturn(response);
+    when(mockHttpsURLConnection.getResponseCode()).thenReturn(200);
+
+    FirebaseAppDistributionException e =
+        assertThrows(
+            FirebaseAppDistributionException.class,
+            () -> testerApiHttpClient.makeGetRequest(TAG, TEST_PATH, TEST_AUTH_TOKEN));
+
+    assertThat(e.getErrorCode()).isEqualTo(Status.UNKNOWN);
+    assertThat(e.getMessage()).contains(TAG);
+    assertThat(e.getMessage()).contains(ErrorMessages.JSON_PARSING_ERROR);
+    verify(mockHttpsURLConnection).disconnect();
+  }
+
+  @Test
+  public void makeGetRequest_whenResponseFailsWith401_throwsError() throws Exception {
+    when(mockHttpsURLConnection.getResponseCode()).thenReturn(401);
+    when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException("error"));
+
+    FirebaseAppDistributionException e =
+        assertThrows(
+            FirebaseAppDistributionException.class,
+            () -> testerApiHttpClient.makeGetRequest(TAG, TEST_PATH, TEST_AUTH_TOKEN));
+
+    assertThat(e.getErrorCode()).isEqualTo(Status.AUTHENTICATION_FAILURE);
+    assertThat(e.getMessage()).contains(TAG);
+    assertThat(e.getMessage()).contains(ErrorMessages.AUTHENTICATION_ERROR);
+    verify(mockHttpsURLConnection).disconnect();
+  }
+
+  @Test
+  public void makeGetRequest_whenResponseFailsWith403_throwsError() throws Exception {
+    when(mockHttpsURLConnection.getResponseCode()).thenReturn(403);
+    when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException("error"));
+
+    FirebaseAppDistributionException e =
+        assertThrows(
+            FirebaseAppDistributionException.class,
+            () -> testerApiHttpClient.makeGetRequest(TAG, TEST_PATH, TEST_AUTH_TOKEN));
+
+    assertThat(e.getErrorCode()).isEqualTo(Status.AUTHENTICATION_FAILURE);
+    assertThat(e.getMessage()).contains(TAG);
+    assertThat(e.getMessage()).contains(ErrorMessages.AUTHORIZATION_ERROR);
+    verify(mockHttpsURLConnection).disconnect();
+  }
+
+  @Test
+  public void makeGetRequest_whenResponseFailsWithApiDisabled_throwsError() throws Exception {
+    InputStream response = getTestFileInputStream("apiDisabledResponse.json");
+    when(mockHttpsURLConnection.getErrorStream()).thenReturn(response);
+    when(mockHttpsURLConnection.getResponseCode()).thenReturn(403);
+
+    FirebaseAppDistributionException e =
+        assertThrows(
+            FirebaseAppDistributionException.class,
+            () -> testerApiHttpClient.makeGetRequest(TAG, TEST_PATH, TEST_AUTH_TOKEN));
+
+    assertThat(e.getErrorCode()).isEqualTo(Status.API_DISABLED);
+    assertThat(e.getMessage()).contains(TAG);
+    assertThat(e.getMessage()).contains(ErrorMessages.API_DISABLED);
+    assertThat(e.getMessage()).contains("Google developers console API activation");
+    assertThat(e.getMessage())
+        .contains(
+            "https://console.developers.google.com/apis/api/firebaseapptesters.googleapis.com/overview?project=123456789");
+    verify(mockHttpsURLConnection).disconnect();
+  }
+
+  @Test
+  public void makeGetRequest_whenResponseFailsWith404_throwsError() throws Exception {
+    when(mockHttpsURLConnection.getResponseCode()).thenReturn(404);
+    when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException("error"));
+
+    FirebaseAppDistributionException e =
+        assertThrows(
+            FirebaseAppDistributionException.class,
+            () -> testerApiHttpClient.makeGetRequest(TAG, TEST_PATH, TEST_AUTH_TOKEN));
+
+    assertThat(e.getErrorCode()).isEqualTo(Status.AUTHENTICATION_FAILURE);
+    assertThat(e.getMessage()).contains(TAG);
+    assertThat(e.getMessage()).contains(ErrorMessages.NOT_FOUND_ERROR);
+    verify(mockHttpsURLConnection).disconnect();
+  }
+
+  @Test
+  public void makeGetRequest_whenResponseFailsWithUnknownCode_throwsError() throws Exception {
+    when(mockHttpsURLConnection.getResponseCode()).thenReturn(409);
+    when(mockHttpsURLConnection.getInputStream()).thenThrow(new IOException("error"));
+
+    FirebaseAppDistributionException e =
+        assertThrows(
+            FirebaseAppDistributionException.class,
+            () -> testerApiHttpClient.makeGetRequest(TAG, TEST_PATH, TEST_AUTH_TOKEN));
+
+    assertThat(e.getErrorCode()).isEqualTo(Status.UNKNOWN);
+    assertThat(e.getMessage()).contains(TAG);
+    assertThat(e.getMessage()).contains("409");
+    verify(mockHttpsURLConnection).disconnect();
+  }
+
+  @Test
+  public void makePostRequest_writesRequestBodyAndSetsCorrectHeaders() throws Exception {
+    String responseJson = readTestFile("testSimpleResponse.json");
+    InputStream responseInputStream = new ByteArrayInputStream(responseJson.getBytes(UTF_8));
+    when(mockHttpsURLConnection.getResponseCode()).thenReturn(200);
+    when(mockHttpsURLConnection.getInputStream()).thenReturn(responseInputStream);
+    ByteArrayOutputStream requestBodyOutputStream = new ByteArrayOutputStream();
+    when(mockHttpsURLConnection.getOutputStream()).thenReturn(requestBodyOutputStream);
+
+    testerApiHttpClient.makeJsonPostRequest(TAG, TEST_PATH, TEST_AUTH_TOKEN, TEST_POST_BODY);
+
+    assertThat(new String(requestBodyOutputStream.toByteArray(), UTF_8)).isEqualTo(TEST_POST_BODY);
+    verify(mockHttpsURLConnection).setDoOutput(true);
+    verify(mockHttpsURLConnection).setRequestMethod("POST");
+    verify(mockHttpsURLConnection).addRequestProperty("Content-Type", "application/json");
+    verify(mockHttpsURLConnection).disconnect();
+  }
+
+  @Test
+  public void makePostRequest_whenConnectionFails_throwsError() throws Exception {
+    IOException caughtException = new IOException("error");
+    when(mockHttpsURLConnectionFactory.openConnection(TEST_URL)).thenThrow(caughtException);
+
+    FirebaseAppDistributionException e =
+        assertThrows(
+            FirebaseAppDistributionException.class,
+            () ->
+                testerApiHttpClient.makeJsonPostRequest(
+                    TAG, TEST_PATH, TEST_AUTH_TOKEN, TEST_POST_BODY));
+
+    assertThat(e.getErrorCode()).isEqualTo(Status.NETWORK_FAILURE);
+    assertThat(e.getMessage()).contains(TAG);
+    assertThat(e.getMessage()).contains(ErrorMessages.NETWORK_ERROR);
+  }
+
+  @Test
+  public void makeUploadRequest_writesRequestBodyAndSetsCorrectHeaders() throws Exception {
+    String responseJson = readTestFile("testSimpleResponse.json");
+
+    try (InputStream postBodyInputStream =
+            new ByteArrayInputStream("Test post body".getBytes(UTF_8));
+        ByteArrayOutputStream requestBodyOutputStream = new ByteArrayOutputStream();
+        InputStream responseInputStream = new ByteArrayInputStream(responseJson.getBytes(UTF_8))) {
+      when(mockHttpsURLConnection.getResponseCode()).thenReturn(200);
+      when(mockHttpsURLConnection.getInputStream()).thenReturn(responseInputStream);
+      when(mockHttpsURLConnection.getOutputStream()).thenReturn(requestBodyOutputStream);
+
+      ContentResolver contentResolver =
+          ApplicationProvider.getApplicationContext().getContentResolver();
+      ShadowContentResolver shadowContentResolver = shadowOf(contentResolver);
+      Uri uri = Uri.parse("file:///path/to/data");
+      shadowContentResolver.registerInputStream(uri, postBodyInputStream);
+
+      testerApiHttpClient.makeUploadRequest(
+          TAG, TEST_PATH, TEST_AUTH_TOKEN, "test.jpeg", "image/jpeg", uri);
+
+      assertThat(new String(requestBodyOutputStream.toByteArray(), UTF_8))
+          .isEqualTo("Test post body");
+      verify(mockHttpsURLConnection).setDoOutput(true);
+      verify(mockHttpsURLConnection).setRequestMethod("POST");
+      verify(mockHttpsURLConnection).addRequestProperty("Content-Type", "image/jpeg");
+      verify(mockHttpsURLConnection).addRequestProperty("X-Goog-Upload-Protocol", "raw");
+      verify(mockHttpsURLConnection).addRequestProperty("X-Goog-Upload-File-Name", "test.jpeg");
+      verify(mockHttpsURLConnection).disconnect();
+    }
+  }
+}
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/TesterSignInManagerTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TesterSignInManagerTest.java
similarity index 60%
rename from firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/TesterSignInManagerTest.java
rename to firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TesterSignInManagerTest.java
index ac3d40f9734..f1945c3d0f1 100644
--- a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/TesterSignInManagerTest.java
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/TesterSignInManagerTest.java
@@ -12,18 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.appdistribution;
+package com.google.firebase.appdistribution.impl;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_CANCELED;
-import static com.google.firebase.appdistribution.TestUtils.applyToForegroundActivityAnswer;
-import static com.google.firebase.appdistribution.TestUtils.assertTaskFailure;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.UNKNOWN;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitAsyncOperations;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTask;
+import static com.google.firebase.appdistribution.impl.TestUtils.awaitTaskFailure;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 
@@ -40,13 +44,17 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appdistribution.FirebaseAppDistributionException;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
-import com.google.firebase.appdistribution.FirebaseAppDistributionTest.TestActivity;
-import com.google.firebase.appdistribution.internal.SignInResultActivity;
-import com.google.firebase.appdistribution.internal.SignInStorage;
+import com.google.firebase.appdistribution.impl.FirebaseAppDistributionServiceImplTest.TestActivity;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.installations.InstallationTokenResult;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -71,21 +79,25 @@ public class TesterSignInManagerTest {
   public static final String TEST_URL =
       String.format(
           "https://appdistribution.firebase.google.com/pub/testerapps/%s/installations/%s/buildalerts"
-              + "?appName=com.google.firebase.appdistribution.test"
-              + "&packageName=com.google.firebase.appdistribution.test",
+              + "?appName=com.google.firebase.appdistribution.impl.test"
+              + "&packageName=com.google.firebase.appdistribution.impl.test"
+              + "&newRedirectScheme=true",
           TEST_APP_ID_1, TEST_FID_1);
 
   private TesterSignInManager testerSignInManager;
   private TestActivity activity;
   private ShadowActivity shadowActivity;
   private ShadowPackageManager shadowPackageManager;
+  @Lightweight private ExecutorService lightweightExecutor = TestOnlyExecutors.lite();
+  @Background private ExecutorService backgroundExecutor = TestOnlyExecutors.background();
+  private SignInStorage signInStorage;
 
   @Mock private Provider<FirebaseInstallationsApi> mockFirebaseInstallationsProvider;
   @Mock private FirebaseInstallationsApi mockFirebaseInstallations;
   @Mock private InstallationTokenResult mockInstallationTokenResult;
-  @Mock private SignInStorage mockSignInStorage;
   @Mock private FirebaseAppDistributionLifecycleNotifier mockLifecycleNotifier;
   @Mock private SignInResultActivity mockSignInResultActivity;
+  @Mock private DevModeDetector devModeDetector;
 
   @Before
   public void setUp() {
@@ -106,8 +118,13 @@ public void setUp() {
     when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forResult(TEST_FID_1));
     when(mockFirebaseInstallations.getToken(false))
         .thenReturn(Tasks.forResult(mockInstallationTokenResult));
-
     when(mockInstallationTokenResult.getToken()).thenReturn(TEST_AUTH_TOKEN);
+    when(devModeDetector.isDevModeEnabled()).thenReturn(false);
+
+    signInStorage =
+        spy(
+            new SignInStorage(
+                ApplicationProvider.getApplicationContext(), devModeDetector, backgroundExecutor));
 
     shadowPackageManager =
         shadowOf(ApplicationProvider.getApplicationContext().getPackageManager());
@@ -128,16 +145,30 @@ public void setUp() {
 
     activity = Robolectric.buildActivity(TestActivity.class).create().get();
     shadowActivity = shadowOf(activity);
-
-    when(mockLifecycleNotifier.applyToForegroundActivity(any()))
-        .thenAnswer(applyToForegroundActivityAnswer(activity));
+    TestUtils.mockForegroundActivity(mockLifecycleNotifier, activity);
 
     testerSignInManager =
         new TesterSignInManager(
-            firebaseApp,
+            firebaseApp.getApplicationContext(),
+            firebaseApp.getOptions(),
             mockFirebaseInstallationsProvider,
-            mockSignInStorage,
-            mockLifecycleNotifier);
+            signInStorage,
+            mockLifecycleNotifier,
+            devModeDetector,
+            lightweightExecutor);
+  }
+
+  @Test
+  public void signInTester_alreadySignedIn_doesNothing()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    TestUtils.awaitTask(signInStorage.setSignInStatus(true));
+
+    Task signInTask = testerSignInManager.signInTester();
+    awaitTask(signInTask);
+
+    assertThat(signInTask.isSuccessful()).isTrue();
+    verifyNoInteractions(mockFirebaseInstallationsProvider);
+    verifyNoInteractions(mockFirebaseInstallations);
   }
 
   @Test
@@ -147,25 +178,24 @@ public void signInTester_whenCantGetFid_failsWithAuthenticationFailure() {
 
     Task signInTask = testerSignInManager.signInTester();
 
-    assertTaskFailure(
+    awaitTaskFailure(
         signInTask, Status.AUTHENTICATION_FAILURE, "Failed to authenticate", fisException);
   }
 
   @Test
   public void signInTester_whenUnexpectedFailureInTask_failsWithUnknownError() {
     Exception unexpectedException = new Exception("unexpected exception");
-    // Raise an unexpected exception in our handler passed to applyToForegroundActivity
-    when(mockLifecycleNotifier.applyToForegroundActivity(any()))
+    // Raise an unexpected exception in our handler passed to consumeForegroundActivity
+    when(mockLifecycleNotifier.consumeForegroundActivity(any()))
         .thenAnswer(unused -> Tasks.forException(unexpectedException));
 
     Task signInTask = testerSignInManager.signInTester();
 
-    assertTaskFailure(signInTask, Status.UNKNOWN, "Unknown", unexpectedException);
+    awaitTaskFailure(signInTask, UNKNOWN, "Unknown", unexpectedException);
   }
 
   @Test
-  public void signInTester_whenChromeAvailable_opensCustomTab() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(false);
+  public void signInTester_whenChromeAvailable_opensCustomTab() throws InterruptedException {
     ResolveInfo resolveInfo = new ResolveInfo();
     resolveInfo.resolvePackageName = "garbage";
     Intent customTabIntent = new Intent("android.support.customtabs.action.CustomTabsService");
@@ -173,56 +203,93 @@ public void signInTester_whenChromeAvailable_opensCustomTab() {
     shadowPackageManager.addResolveInfoForIntent(customTabIntent, resolveInfo);
 
     testerSignInManager.signInTester();
+    awaitAsyncOperations(backgroundExecutor);
+    awaitAsyncOperations(lightweightExecutor);
 
     verify(mockFirebaseInstallations, times(1)).getId();
     assertThat(shadowActivity.getNextStartedActivity().getData()).isEqualTo(Uri.parse(TEST_URL));
   }
 
   @Test
-  public void signInTester_whenChromeNotAvailable_opensBrowserIntent() {
-    when(mockSignInStorage.getSignInStatus()).thenReturn(false);
+  public void signInTester_whenChromeNotAvailable_opensBrowserIntent() throws InterruptedException {
     ResolveInfo resolveInfo = new ResolveInfo();
     resolveInfo.resolvePackageName = "garbage";
     Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(TEST_URL));
     shadowPackageManager.addResolveInfoForIntent(browserIntent, resolveInfo);
 
     testerSignInManager.signInTester();
+    awaitAsyncOperations(backgroundExecutor);
+    awaitAsyncOperations(lightweightExecutor);
 
     verify(mockFirebaseInstallations, times(1)).getId();
     assertThat(shadowActivity.getNextStartedActivity().getData()).isEqualTo(Uri.parse(TEST_URL));
   }
 
   @Test
-  public void signInTester_whenSignInCalledMultipleTimes_returnsSameTask() {
-    Task<Void> signInTask1 = testerSignInManager.signInTester();
-    Task<Void> signInTask2 = testerSignInManager.signInTester();
+  public void signInTester_whenSignInCalledMultipleTimes_secondCallHasNoEffect()
+      throws InterruptedException {
+    testerSignInManager.signInTester();
+    testerSignInManager.signInTester();
+
+    awaitAsyncOperations(backgroundExecutor);
+    awaitAsyncOperations(lightweightExecutor);
 
-    assertEquals(signInTask1, signInTask2);
+    verify(mockFirebaseInstallationsProvider, times(1)).get();
   }
 
   @Test
-  public void signInTester_whenReturnFromSignIn_taskSucceeds() {
+  public void signInTester_whenReturnFromSignIn_taskSucceeds()
+      throws InterruptedException, FirebaseAppDistributionException, ExecutionException {
     Task signInTask = testerSignInManager.signInTester();
+    awaitAsyncOperations(backgroundExecutor);
+    awaitAsyncOperations(lightweightExecutor);
 
     // Simulate re-entering app after successful sign in, via SignInResultActivity
     testerSignInManager.onActivityCreated(mockSignInResultActivity);
+    awaitTask(signInTask);
 
     assertTrue(signInTask.isSuccessful());
-    verify(mockSignInStorage).setSignInStatus(true);
+    assertThat(signInStorage.getSignInStatusBlocking()).isTrue();
+  }
+
+  @Test
+  public void signInTester_whenStorageFailsToRecordSignInStatus_taskFails()
+      throws InterruptedException {
+    Exception expectedException = new RuntimeException("Error");
+    doReturn(Tasks.forException(expectedException))
+        .when(signInStorage)
+        .setSignInStatus(anyBoolean());
+    Task signInTask = testerSignInManager.signInTester();
+    awaitAsyncOperations(backgroundExecutor);
+    awaitAsyncOperations(lightweightExecutor);
+
+    // Simulate re-entering app after successful sign in, via SignInResultActivity
+    testerSignInManager.onActivityCreated(mockSignInResultActivity);
+
+    awaitTaskFailure(signInTask, UNKNOWN, "Error storing tester sign in state", expectedException);
   }
 
   @Test
-  public void signInTester_whenAppReenteredDuringSignIn_taskFails() {
+  public void signInTester_whenAppReenteredDuringSignIn_taskFails() throws InterruptedException {
     Task signInTask = testerSignInManager.signInTester();
+    awaitAsyncOperations(backgroundExecutor);
+    awaitAsyncOperations(lightweightExecutor);
 
     // Simulate re-entering app before completing sign in
-    testerSignInManager.onActivityStarted(activity);
-
-    assertFalse(signInTask.isSuccessful());
-    Exception e = signInTask.getException();
-    assertTrue(e instanceof FirebaseAppDistributionException);
-    assertEquals(AUTHENTICATION_CANCELED, ((FirebaseAppDistributionException) e).getErrorCode());
-    assertEquals(
-        FirebaseAppDistributionException.ErrorMessages.AUTHENTICATION_CANCELED, e.getMessage());
+    testerSignInManager.onActivityResumed(activity);
+
+    awaitTaskFailure(signInTask, AUTHENTICATION_CANCELED, ErrorMessages.AUTHENTICATION_CANCELED);
+  }
+
+  @Test
+  public void signInTester_devModeEnabled_immediatelySignsIn()
+      throws FirebaseAppDistributionException, ExecutionException, InterruptedException {
+    when(devModeDetector.isDevModeEnabled()).thenReturn(true);
+
+    awaitTask(testerSignInManager.signInTester());
+
+    assertThat(awaitTask(signInStorage.getSignInStatus())).isTrue();
+    verifyNoInteractions(mockFirebaseInstallationsProvider);
+    verifyNoInteractions(mockFirebaseInstallations);
   }
 }
diff --git a/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/UpdateTaskImplTest.java b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/UpdateTaskImplTest.java
new file mode 100644
index 00000000000..b641a3c600c
--- /dev/null
+++ b/firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/UpdateTaskImplTest.java
@@ -0,0 +1,144 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.appdistribution.impl;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.firebase.appdistribution.UpdateProgress;
+import com.google.firebase.appdistribution.UpdateStatus;
+import com.google.firebase.concurrent.FirebaseExecutors;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class UpdateTaskImplTest {
+
+  private static final UpdateProgress PROGRESS_DOWNLOADING =
+      UpdateProgressImpl.builder()
+          .setUpdateStatus(UpdateStatus.DOWNLOADING)
+          .setApkBytesDownloaded(100)
+          .setApkFileTotalBytes(123)
+          .build();
+
+  private static final UpdateProgress PROGRESS_DOWNLOADED =
+      UpdateProgressImpl.builder()
+          .setUpdateStatus(UpdateStatus.DOWNLOADED)
+          .setApkBytesDownloaded(123)
+          .setApkFileTotalBytes(123)
+          .build();
+
+  @Test
+  public void addOnProgressListener_supportsMultipleListeners() {
+    UpdateTaskImpl updateTaskImpl = new UpdateTaskImpl();
+    List<UpdateProgress> progressEvents1 = new ArrayList<>();
+    updateTaskImpl.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents1::add);
+    List<UpdateProgress> progressEvents2 = new ArrayList<>();
+    updateTaskImpl.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents2::add);
+
+    updateTaskImpl.updateProgress(PROGRESS_DOWNLOADING);
+
+    assertThat(progressEvents1).containsExactly(PROGRESS_DOWNLOADING);
+    assertThat(progressEvents2).containsExactly(PROGRESS_DOWNLOADING);
+  }
+
+  @Test
+  public void setException_clearsProgressListeners() {
+    UpdateTaskImpl updateTaskImpl = new UpdateTaskImpl();
+    List<UpdateProgress> progressEvents1 = new ArrayList<>();
+    updateTaskImpl.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents1::add);
+    List<UpdateProgress> progressEvents2 = new ArrayList<>();
+    updateTaskImpl.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents2::add);
+
+    // Set the result
+    updateTaskImpl.setException(new RuntimeException("Error"));
+
+    // Has no effect on the listeners after the exception is set
+    updateTaskImpl.updateProgress(PROGRESS_DOWNLOADING);
+
+    assertThat(progressEvents1).isEmpty();
+    assertThat(progressEvents2).isEmpty();
+  }
+
+  @Test
+  public void setResult_clearsProgressListeners() {
+    UpdateTaskImpl updateTaskImpl = new UpdateTaskImpl();
+    List<UpdateProgress> progressEvents1 = new ArrayList<>();
+    updateTaskImpl.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents1::add);
+    List<UpdateProgress> progressEvents2 = new ArrayList<>();
+    updateTaskImpl.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents2::add);
+
+    // Set the result
+    updateTaskImpl.setResult();
+
+    // Has no effect on the listeners after the result is set
+    updateTaskImpl.updateProgress(PROGRESS_DOWNLOADING);
+
+    assertThat(progressEvents1).isEmpty();
+    assertThat(progressEvents2).isEmpty();
+  }
+
+  @Test
+  public void shadow_completesWithShadowedException() {
+    UpdateTaskImpl taskToShadow = new UpdateTaskImpl();
+    UpdateTaskImpl updateTaskImpl = new UpdateTaskImpl();
+
+    // Shadow the task
+    updateTaskImpl.shadow(taskToShadow);
+
+    // Complete the shadowed task
+    RuntimeException expectedException = new RuntimeException("Error");
+    taskToShadow.setException(expectedException);
+
+    assertThat(updateTaskImpl.isComplete()).isEqualTo(true);
+    assertThat(updateTaskImpl.isSuccessful()).isEqualTo(false);
+    assertThat(updateTaskImpl.getException()).isEqualTo(expectedException);
+  }
+
+  @Test
+  public void shadow_completesWithShadowedResult() {
+    UpdateTaskImpl taskToShadow = new UpdateTaskImpl();
+    UpdateTaskImpl updateTaskImpl = new UpdateTaskImpl();
+
+    // Shadow the task
+    updateTaskImpl.shadow(taskToShadow);
+
+    // Complete the shadowed task
+    taskToShadow.setResult();
+
+    assertThat(updateTaskImpl.isComplete()).isEqualTo(true);
+    assertThat(updateTaskImpl.isSuccessful()).isEqualTo(true);
+  }
+
+  @Test
+  public void shadow_updatesWithShadowedProgress() {
+    UpdateTaskImpl taskToShadow = new UpdateTaskImpl();
+    UpdateTaskImpl updateTaskImpl = new UpdateTaskImpl();
+    List<UpdateProgress> progressEvents = new ArrayList<>();
+    updateTaskImpl.addOnProgressListener(FirebaseExecutors.directExecutor(), progressEvents::add);
+
+    // Shadow the task
+    updateTaskImpl.shadow(taskToShadow);
+
+    // Update the shadowed task
+    taskToShadow.updateProgress(PROGRESS_DOWNLOADING);
+    taskToShadow.updateProgress(PROGRESS_DOWNLOADED);
+
+    assertThat(updateTaskImpl.isComplete()).isEqualTo(false);
+    assertThat(progressEvents).containsExactly(PROGRESS_DOWNLOADING, PROGRESS_DOWNLOADED);
+  }
+}
diff --git a/firebase-appdistribution/test-app/README.md b/firebase-appdistribution/test-app/README.md
index 6c598bdec4f..8fa1e988b4b 100644
--- a/firebase-appdistribution/test-app/README.md
+++ b/firebase-appdistribution/test-app/README.md
@@ -17,6 +17,25 @@ the [applicationId](https://developer.android.com/studio/build/application-id.ht
 
 ## Build & Install
 
+### Enable the test-app as a subproject ###
+
+You'll need to do this on a fresh checkout, otherwise you will see the error `Project 'test-app' not found in project ':firebase-appdistribution'.` when running `./gradlew` tasks for the test app.
+
+By default, product-specific subprojects are disabled in the SDK because their `google-services.json` files aren't always available in CI and therefore they can't be reliably built.  To do local development with this test app, it needs to be manually enabled by uncommenting it out at the bottom of [subprojects.cfg](https://github.com/firebase/firebase-android-sdk/blob/master/subprojects.cfg) (*Don't check this in*)
+
+```
+# <near the bottom of the file>
+# Test Apps
+# If needed for development, uncomment but don't submit
+
+#
+#some-other-app:test-app
+#and-another:test-app
+#...
+firebase-appdistribution:test-app
+
+```
+
 ### Build with HEAD version of `firebase-appdistribution` SDK.
 
 ```
@@ -28,4 +47,30 @@ and install the apk:
 
 ```
 firebase-android-sdk$ adb install firebase-appdistribution/test-app/build/outputs/apk/release/test-app-release.apk
-```
\ No newline at end of file
+```
+
+## Test In-App Feedback Locally
+
+In-App Feedback is currently tricky to test locally because it relies on the
+fact that a release exists with the same hash of the running binary.
+
+To build the debug APK, upload it to App Distribution, and install it on the running emulator:
+1. In firebase-appdistribution/test-app/test-app.gradle, uncomment the line `// testers "your email here"` and replace "your email here" with the email you intend to use for testing.
+1. Start an emulator
+1. Run the following command from the repo's root directory:
+
+    ```
+    ./gradlew clean :firebase-appdistribution:test-app:build :firebase-appdistribution:test-app:appDistributionUploadBetaDebug && adb install firebase-appdistribution/test-app/build/outputs/apk/beta/debug/test-app-beta-debug.apk
+    ```
+   
+This will build the debug variant of the app (which has the full SDK), upload it to App Distribution, and install it on the running emulator. Run the app in the emulator to test. As an alternative you can always download it using App Distribution, but using `adb` is just faster.
+
+After that, if you want to avoid having to do this every time you want to test locally:
+
+1. Submit feedback in the locally running app, to generate some logs
+1. In the Logcat output, find the release name (i.e. `"projects/1095562444941/installations/fCmpB677QTybkwfKbViGI-/releases/3prs96fui9kb0"`)
+1. Modify the body of `ReleaseIdentifier.identifyRelease()` to be:
+
+    ```
+    return Tasks.forResult("<your release name>");
+    ```
diff --git a/firebase-appdistribution/test-app/src/main/AndroidManifest.xml b/firebase-appdistribution/test-app/src/main/AndroidManifest.xml
index f5ccd69f43d..97caebb7f27 100644
--- a/firebase-appdistribution/test-app/src/main/AndroidManifest.xml
+++ b/firebase-appdistribution/test-app/src/main/AndroidManifest.xml
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.googletest.firebase.appdistribution.testapp" >
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.AppDistributionTestAppSample" >
-        <activity android:name="com.googletest.firebase.appdistribution.testapp.MainActivity" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.googletest.firebase.appdistribution.testapp.SecondActivity" >
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file
+    package="com.googletest.firebase.appdistribution.testapp">
+  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+  <application
+      android:allowBackup="true"
+      android:icon="@mipmap/ic_launcher"
+      android:label="@string/appName"
+      android:roundIcon="@mipmap/ic_launcher_round"
+      android:supportsRtl="true"
+      android:theme="@style/Theme.AppDistributionTestAppSample"
+      android:localeConfig="@xml/locales_config"
+      android:name="com.googletest.firebase.appdistribution.testapp.AppDistroTestApplication">
+    <activity android:name="com.googletest.firebase.appdistribution.testapp.MainActivity" android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+    <activity android:name="com.googletest.firebase.appdistribution.testapp.SecondActivity" />
+    <activity android:name="com.googletest.firebase.appdistribution.testapp.ScreenshotDetectionActivity" />
+    <activity android:name="com.googletest.firebase.appdistribution.testapp.CustomNotificationActivity" />
+    <activity android:name="com.googletest.firebase.appdistribution.testapp.CustomNotificationTakeScreenshotActivity" />
+  </application>
+</manifest>
diff --git a/firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/MainActivity.kt b/firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/MainActivity.kt
deleted file mode 100644
index de6de65803c..00000000000
--- a/firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/MainActivity.kt
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.googletest.firebase.appdistribution.testapp
-
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import android.view.View
-import android.widget.ProgressBar
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.AppCompatButton
-import com.google.firebase.appdistribution.AppDistributionRelease
-import com.google.firebase.appdistribution.FirebaseAppDistribution
-import com.google.firebase.appdistribution.FirebaseAppDistributionException as FirebaseAppDistributionException1
-
-class MainActivity : AppCompatActivity() {
-    var firebaseAppDistribution: FirebaseAppDistribution = FirebaseAppDistribution.getInstance()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        findViewById<TextView>(R.id.app_name).text =
-            "Sample App v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
-        setupUI(isSignedIn = firebaseAppDistribution.isTesterSignedIn, isUpdateAvailable = false)
-
-        /** Basic Configuration */
-        findViewById<AppCompatButton>(R.id.sign_in_button).visibility = View.GONE
-        findViewById<AppCompatButton>(R.id.check_for_update).visibility = View.GONE
-        findViewById<AppCompatButton>(R.id.sign_out).visibility = View.GONE
-
-        firebaseAppDistribution.updateIfNewReleaseAvailable()
-            .addOnSuccessListener {
-                firebaseAppDistribution.updateIfNewReleaseAvailable().addOnFailureListener {
-                    val ex = it as FirebaseAppDistributionException1
-                    Log.d("FirebaseAppDistribution", "MAINACTIVITY:ERROR ERROR. CODE: " + it.errorCode)
-                }
-            }
-
-        // Start the second activity
-//        Handler().postDelayed(Runnable {
-//            startSecondActivity()
-//        }, 5000)
-
-        /** Advanced Configuration */
-//        val signInButton = findViewById<AppCompatButton>(R.id.sign_in_button)
-//        val checkForUpdateButton = findViewById<AppCompatButton>(R.id.check_for_update)
-//        val updateAppButton = findViewById<AppCompatButton>(R.id.update_app)
-//        val signOutButton = findViewById<AppCompatButton>(R.id.sign_out)
-//
-//        signOutButton.setOnClickListener {
-//            firebaseAppDistribution.signOutTester()
-//            setupUI(
-//                isSignedIn = firebaseAppDistribution.isTesterSignedIn,
-//                isUpdateAvailable = false
-//            )
-//        }
-//
-//        signInButton.setOnClickListener {
-//            firebaseAppDistribution.signInTester().addOnSuccessListener {
-//                setupUI(isSignedIn = true, isUpdateAvailable = false)
-//            }
-//        }
-//
-//        checkForUpdateButton.setOnClickListener {
-//            firebaseAppDistribution.checkForNewRelease().addOnSuccessListener {
-//                setupUI(isSignedIn = true, isUpdateAvailable = it != null, release = it)
-//            }
-//        }
-//
-//        updateAppButton.setOnClickListener {
-//            val progressBar = findViewById<ProgressBar>(R.id.progress_bar)
-//            val progressPercent = findViewById<TextView>(R.id.progress_percentage)
-//            progressBar.visibility = View.VISIBLE
-//            progressPercent.visibility = View.VISIBLE
-//            progressBar.isIndeterminate = false
-//            firebaseAppDistribution.updateApp().addOnProgressListener {
-//                progressBar.isIndeterminate = false
-//                val percentage = ((it.apkBytesDownloaded * 100) / it.apkFileTotalBytes).toInt()
-//               progressBar.setProgress(percentage, true)
-//                progressPercent.text = "$percentage %"
-//            }
-//        }
-    }
-
-    fun startSecondActivity() {
-        val intent = Intent(this, SecondActivity::class.java)
-        startActivity(intent)
-    }
-
-    private fun setupUI(
-        isSignedIn: Boolean,
-        isUpdateAvailable: Boolean,
-        release: AppDistributionRelease? = null
-    ) {
-        val signInStatus = findViewById<TextView>(R.id.sign_in_status)
-        val signInButton = findViewById<AppCompatButton>(R.id.sign_in_button)
-        val checkForUpdateButton = findViewById<AppCompatButton>(R.id.check_for_update)
-        val updateAppButton = findViewById<AppCompatButton>(R.id.update_app)
-        val progressBar = findViewById<ProgressBar>(R.id.progress_bar)
-        val progressPercentage = findViewById<TextView>(R.id.progress_percentage)
-
-        if (!isSignedIn) {
-            signInStatus.text = "Not Signed In"
-            signInButton.visibility = View.VISIBLE
-            checkForUpdateButton.visibility = View.GONE
-            updateAppButton.visibility = View.GONE
-            progressBar.visibility = View.GONE
-            progressPercentage.visibility = View.GONE
-            return
-        }
-
-        if (isSignedIn && !isUpdateAvailable) {
-            signInStatus.text = "Tester signed In!"
-            signInButton.visibility = View.GONE
-            checkForUpdateButton.visibility = View.VISIBLE
-            updateAppButton.visibility = View.GONE
-            progressBar.visibility = View.GONE
-            progressPercentage.visibility = View.GONE
-            return
-        }
-
-        signInStatus.text =
-            "Release available - ${release?.displayVersion} (${release?.versionCode})"
-        signInButton.visibility = View.GONE
-        checkForUpdateButton.visibility = View.GONE
-        updateAppButton.visibility = View.VISIBLE
-        progressBar.visibility = View.GONE
-        progressPercentage.visibility = View.GONE
-    }
-}
diff --git a/firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/SecondActivity.kt b/firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/SecondActivity.kt
deleted file mode 100644
index 7ebc5968e0e..00000000000
--- a/firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/SecondActivity.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.googletest.firebase.appdistribution.testapp
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.AppCompatButton
-
-class SecondActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_second)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        val mainActivityButton = findViewById<AppCompatButton>(R.id.main_activity_button)
-        mainActivityButton.setOnClickListener {
-            startMainActivity()
-        }
-    }
-
-    private fun startMainActivity() {
-        val intent = Intent(this, MainActivity::class.java)
-        startActivity(intent)
-    }
-}
diff --git a/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/AppDistroTestApplication.kt b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/AppDistroTestApplication.kt
new file mode 100644
index 00000000000..7c2e520f5de
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/AppDistroTestApplication.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.googletest.firebase.appdistribution.testapp
+
+import android.app.Application
+
+class AppDistroTestApplication : Application() {
+  override fun onCreate() {
+    super.onCreate()
+
+    // The shake detection feedback trigger can optionally be enabled application-wide here
+    //        ShakeDetectionFeedbackTrigger.enable(this)
+  }
+}
diff --git a/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationActivity.kt b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationActivity.kt
new file mode 100644
index 00000000000..4ca328aee49
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationActivity.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.googletest.firebase.appdistribution.testapp
+
+import android.Manifest.permission.POST_NOTIFICATIONS
+import android.app.AlertDialog
+import android.content.pm.PackageManager.PERMISSION_DENIED
+import android.os.Bundle
+import android.util.Log
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import java.util.*
+
+class CustomNotificationActivity : AppCompatActivity() {
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_custom_notification)
+
+    val launcher =
+      registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
+        if (isGranted) {
+          Log.i(TAG, "Permission granted, showing notification")
+          CustomNotificationFeedbackTrigger.showNotification(this)
+        } else {
+          Log.i(TAG, "Permission not granted")
+          AlertDialog.Builder(this)
+            .setMessage(
+              "Because the notification permission has been denied, the app will not show a " +
+                "notification that can be tapped to send feedback to the developer."
+            )
+            .setPositiveButton("OK") { _, _ -> }
+            .show()
+        }
+      }
+
+    if (ContextCompat.checkSelfPermission(this, POST_NOTIFICATIONS) == PERMISSION_DENIED) {
+      if (shouldShowRequestPermissionRationale(POST_NOTIFICATIONS)) {
+        Log.i(TAG, "Showing customer rationale for requesting permission.")
+        AlertDialog.Builder(this)
+          .setMessage(
+            "Using a notification to initiate feedback to the developer. " +
+              "To enable this feature, allow the app to post notifications."
+          )
+          .setPositiveButton("OK") { _, _ ->
+            Log.i(TAG, "Launching request for permission.")
+            launcher.launch(POST_NOTIFICATIONS)
+          }
+          .setNegativeButton("No thanks") { _, _ -> Log.i(TAG, "User denied permission request.") }
+          .show()
+      } else {
+        Log.i(TAG, "Launching request for permission without rationale.")
+        launcher.launch(POST_NOTIFICATIONS)
+      }
+    } else {
+      CustomNotificationFeedbackTrigger.showNotification(this)
+    }
+  }
+
+  override fun onDestroy() {
+    CustomNotificationFeedbackTrigger.cancelNotification()
+    super.onDestroy()
+  }
+
+  companion object {
+    private const val TAG = "CustomNotificationActivity"
+  }
+}
diff --git a/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationFeedbackTrigger.kt b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationFeedbackTrigger.kt
new file mode 100644
index 00000000000..f1a9f2004ad
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationFeedbackTrigger.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.googletest.firebase.appdistribution.testapp
+
+import android.Manifest.permission.POST_NOTIFICATIONS
+import android.annotation.SuppressLint
+import android.app.*
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager.PERMISSION_DENIED
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+import com.google.firebase.appdistribution.ktx.appDistribution
+import com.google.firebase.ktx.Firebase
+import java.io.IOException
+
+/**
+ * Shows an ongoing notification that the user can tap to take a screenshot and send feedback to the
+ * developer.
+ */
+@SuppressLint("StaticFieldLeak") // Reference to Activity is set to null in onActivityDestroyed
+object CustomNotificationFeedbackTrigger {
+  private const val TAG: String = "CustomNotificationFeedbackTrigger"
+  private const val FEEDBACK_NOTIFICATION_CHANNEL_ID = "CustomNotificationFeedbackTrigger"
+  private const val FEEDBACK_NOTIFICATION_ID = 1
+
+  var activityToScreenshot: Activity? = null
+
+  /**
+   * Show an ongoing notification that the user can tap to take a screenshot of the current activity
+   * and send feedback to the developer.
+   *
+   * The passed in activity must call [cancelNotification] in its [Activity.onDestroy].
+   *
+   * @param activity the current activity, which will be captured by the screenshot
+   */
+  fun showNotification(activity: Activity) {
+    if (ContextCompat.checkSelfPermission(activity, POST_NOTIFICATIONS) == PERMISSION_DENIED) {
+      Log.w(TAG, "Not showing notification because permission has not been granted.")
+      return
+    }
+
+    // Create the NotificationChannel, but only on API 26+ because
+    // the NotificationChannel class is new and not in the support library
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      val channel =
+        NotificationChannel(
+          FEEDBACK_NOTIFICATION_CHANNEL_ID,
+          activity.getString(R.string.feedbackTriggerNotificationChannelName),
+          NotificationManager.IMPORTANCE_HIGH
+        )
+      channel.description =
+        activity.getString(R.string.feedbackTriggerNotificationChannelDescription)
+      activity.getSystemService(NotificationManager::class.java).createNotificationChannel(channel)
+    }
+
+    val intent = Intent(activity, CustomNotificationTakeScreenshotActivity::class.java)
+    intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
+    val pendingIntent =
+      PendingIntent.getActivity(
+        activity,
+        /* requestCode = */ 0,
+        intent,
+        PendingIntent.FLAG_IMMUTABLE
+      )
+    val builder =
+      NotificationCompat.Builder(activity, FEEDBACK_NOTIFICATION_CHANNEL_ID)
+        .setSmallIcon(R.mipmap.ic_launcher)
+        .setContentTitle(activity.getText(R.string.feedbackTriggerNotificationTitle))
+        .setContentText(activity.getText(R.string.feedbackTriggerNotificationText))
+        .setPriority(NotificationCompat.PRIORITY_HIGH)
+        .setContentIntent(pendingIntent)
+        .setOngoing(true)
+    val notificationManager = NotificationManagerCompat.from(activity)
+    Log.i(TAG, "Showing notification")
+    notificationManager.notify(FEEDBACK_NOTIFICATION_ID, builder.build())
+    activityToScreenshot = activity
+  }
+
+  /**
+   * Hide the notification.
+   *
+   * This must be called from the [Activity.onDestroy] of the activity showing the notification.
+   */
+  fun cancelNotification() {
+    activityToScreenshot?.let {
+      Log.i(TAG, "Cancelling notification")
+      NotificationManagerCompat.from(it).cancel(FEEDBACK_NOTIFICATION_ID)
+    }
+  }
+}
+
+class CustomNotificationTakeScreenshotActivity : Activity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    val activity = CustomNotificationFeedbackTrigger.activityToScreenshot
+    if (activity == null) {
+      Log.e(TAG, "Can't take screenshot because activity is unknown")
+      return
+    }
+    takeScreenshot(activity)
+  }
+
+  override fun onResume() {
+    super.onResume()
+    val screenshotUri = Uri.fromFile(getFileStreamPath(SCREENSHOT_FILE_NAME))
+    Firebase.appDistribution.startFeedback(R.string.feedbackAdditionalFormText, screenshotUri)
+    finish()
+  }
+
+  private fun takeScreenshot(activity: Activity) {
+    val view = activity.window.decorView.rootView
+    val bitmap = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.RGB_565)
+    val canvas = Canvas(bitmap)
+    view.draw(canvas)
+    try {
+      activity.openFileOutput(SCREENSHOT_FILE_NAME, Context.MODE_PRIVATE).use { outputStream ->
+        bitmap.compress(Bitmap.CompressFormat.PNG, /* quality = */ 100, outputStream)
+      }
+      Log.i(TAG, "Wrote screenshot to $SCREENSHOT_FILE_NAME")
+    } catch (e: IOException) {
+      Log.e(TAG, "Can't write $SCREENSHOT_FILE_NAME", e)
+    }
+  }
+
+  companion object {
+    private const val TAG: String = "TakeScreenshotAndTriggerFeedbackActivity"
+    private const val SCREENSHOT_FILE_NAME =
+      "com.googletest.firebase.appdistribution.testapp.screenshot.png"
+  }
+}
diff --git a/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/MainActivity.kt b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/MainActivity.kt
new file mode 100644
index 00000000000..b89047687f6
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/MainActivity.kt
@@ -0,0 +1,382 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.googletest.firebase.appdistribution.testapp
+
+import android.Manifest.permission.POST_NOTIFICATIONS
+import android.app.AlertDialog
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.util.Log
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.widget.ArrayAdapter
+import android.widget.AutoCompleteTextView
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.AppCompatButton
+import androidx.core.content.ContextCompat
+import androidx.core.widget.doOnTextChanged
+import com.google.android.gms.tasks.Task
+import com.google.android.material.textfield.TextInputLayout
+import com.google.firebase.appdistribution.AppDistributionRelease
+import com.google.firebase.appdistribution.InterruptionLevel
+import com.google.firebase.appdistribution.UpdateProgress
+import com.google.firebase.appdistribution.ktx.appDistribution
+import com.google.firebase.ktx.Firebase
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+class MainActivity : AppCompatActivity() {
+
+  var firebaseAppDistribution = Firebase.appDistribution
+  var updateTask: Task<Void>? = null
+  val executorService: ExecutorService = Executors.newFixedThreadPool(1)
+
+  lateinit var signInButton: AppCompatButton
+  lateinit var signOutButton: AppCompatButton
+  lateinit var checkForUpdateButton: AppCompatButton
+  lateinit var updateAppButton: AppCompatButton
+  lateinit var updateIfNewReleaseAvailableButton: AppCompatButton
+  lateinit var updateIfNewReleaseAvailableButtonBackground: AppCompatButton
+  lateinit var signInButtonBackground: AppCompatButton
+  lateinit var signOutButtonBackground: AppCompatButton
+  lateinit var checkForUpdateButtonBackground: AppCompatButton
+  lateinit var updateAppButtonBackground: AppCompatButton
+  lateinit var secondActivityButton: AppCompatButton
+  lateinit var signInStatus: TextView
+  lateinit var progressPercent: TextView
+  lateinit var progressBar: ProgressBar
+  lateinit var feedbackTriggerMenu: TextInputLayout
+  lateinit var permissionRequestLauncher: ActivityResultLauncher<String>
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_main)
+    signInButton = findViewById(R.id.sign_in_button)
+    signOutButton = findViewById(R.id.sign_out)
+    checkForUpdateButton = findViewById(R.id.check_for_update)
+    updateAppButton = findViewById(R.id.update_app)
+    updateIfNewReleaseAvailableButton = findViewById(R.id.basic_config)
+    updateIfNewReleaseAvailableButtonBackground = findViewById(R.id.basic_config2)
+    signInButtonBackground = findViewById(R.id.sign_in_button2)
+    signOutButtonBackground = findViewById(R.id.sign_out2)
+    checkForUpdateButtonBackground = findViewById(R.id.check_for_update2)
+    updateAppButtonBackground = findViewById(R.id.update_app2)
+    secondActivityButton = findViewById(R.id.secondActivityButton)
+    progressPercent = findViewById(R.id.progress_percentage)
+    signInStatus = findViewById(R.id.sign_in_status)
+    progressBar = findViewById(R.id.progress_bar)
+
+    // Set up feedback trigger menu
+    feedbackTriggerMenu = findViewById(R.id.feedbackTriggerMenu)
+    val items =
+      listOf(
+        FeedbackTrigger.NONE.label,
+        FeedbackTrigger.CUSTOM_NOTIFICATION.label,
+        FeedbackTrigger.SHAKE.label,
+        FeedbackTrigger.SCREENSHOT.label,
+      )
+    val adapter = ArrayAdapter(this, R.layout.list_item, items)
+    val autoCompleteTextView = feedbackTriggerMenu.editText!! as AutoCompleteTextView
+    autoCompleteTextView.setAdapter(adapter)
+    // TODO: set it to the actual currently enabled trigger
+    autoCompleteTextView.setText(FeedbackTrigger.NONE.label, false)
+    autoCompleteTextView.doOnTextChanged { text, _, _, _ ->
+      when (text.toString()) {
+        FeedbackTrigger.NONE.label -> {
+          disableAllFeedbackTriggers()
+        }
+        FeedbackTrigger.CUSTOM_NOTIFICATION.label -> {
+          disableAllFeedbackTriggers()
+          startActivity(Intent(this, CustomNotificationActivity::class.java))
+        }
+        FeedbackTrigger.SHAKE.label -> {
+          disableAllFeedbackTriggers()
+          Log.i(TAG, "Enabling shake for feedback trigger")
+          ShakeDetectionFeedbackTrigger.enable(application, this)
+        }
+        FeedbackTrigger.SCREENSHOT.label -> {
+          disableAllFeedbackTriggers()
+          startActivity(Intent(this, ScreenshotDetectionActivity::class.java))
+        }
+      }
+    }
+
+    setupFeedbackNotification()
+  }
+
+  private fun setupFeedbackNotification() {
+    // Register the permissions callback, which handles the user's response to the
+    // system permissions dialog
+    permissionRequestLauncher =
+      registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
+        if (isGranted) {
+          showFeedbackNotification()
+        } else {
+          // Typically, here we should show the user a message explaining what behavior is
+          // unavailable because they have not enabled notifications. However in this case we are
+          // calling this method every time the activity is created, and we don't want to keep
+          // showing them such a message over and over if they've explicitly disabled notifications
+          // for the app.
+        }
+      }
+
+    // Check the permissions and behave accordingly
+    when {
+      ContextCompat.checkSelfPermission(this, POST_NOTIFICATIONS) ==
+        PackageManager.PERMISSION_GRANTED -> {
+        showFeedbackNotification()
+      }
+      shouldShowRequestPermissionRationale(POST_NOTIFICATIONS) -> {
+        Log.i(TAG, "Showing customer rationale for requesting permission.")
+        AlertDialog.Builder(this)
+          .setMessage(
+            "Using a notification to initiate feedback to the developer. " +
+              "To enable this feature, allow the app to post notifications."
+          )
+          .setPositiveButton("OK") { _, _ ->
+            Log.i(TAG, "Launching request for permission.")
+            permissionRequestLauncher.launch(POST_NOTIFICATIONS)
+          }
+          .setNegativeButton("No thanks") { _, _ -> Log.i(TAG, "User denied permission request.") }
+          .show()
+      }
+      else -> {
+        permissionRequestLauncher.launch(POST_NOTIFICATIONS)
+      }
+    }
+  }
+
+  private fun showFeedbackNotification() {
+    firebaseAppDistribution.showFeedbackNotification(
+      R.string.feedbackAdditionalFormText,
+      InterruptionLevel.HIGH
+    )
+  }
+
+  private fun disableAllFeedbackTriggers() {
+    Log.i(TAG, "Disabling all feedback triggers")
+    ShakeDetectionFeedbackTrigger.disable(application)
+  }
+
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
+    val inflater: MenuInflater = menuInflater
+    inflater.inflate(R.menu.action_menu, menu)
+    if (BuildConfig.FLAVOR == "beta") {
+      menu.findItem(R.id.startFeedbackMenuItem).isVisible = true
+    }
+    return true
+  }
+
+  override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    return when (item.itemId) {
+      R.id.startFeedbackMenuItem -> {
+        Firebase.appDistribution.startFeedback(R.string.feedbackAdditionalFormText)
+        true
+      }
+      else -> super.onOptionsItemSelected(item)
+    }
+  }
+
+  override fun onResume() {
+    super.onResume()
+
+    findViewById<TextView>(R.id.app_name).text =
+      "Sample App v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
+    setupUI(isSignedIn = firebaseAppDistribution.isTesterSignedIn, isUpdateAvailable = false)
+
+    /** Button Listeners */
+    updateIfNewReleaseAvailableButton.setOnClickListener {
+      if (updateTask == null || updateTask?.isComplete == true) {
+        updateTask =
+          firebaseAppDistribution.updateIfNewReleaseAvailable().addOnFailureListener() {
+            failureListener(it)
+          }
+      }
+    }
+
+    updateIfNewReleaseAvailableButtonBackground.setOnClickListener {
+      executorService.execute {
+        if (updateTask == null || updateTask?.isComplete == true) {
+          updateTask =
+            firebaseAppDistribution.updateIfNewReleaseAvailable().addOnFailureListener {
+              failureListener(it)
+            }
+        }
+      }
+    }
+
+    signInButton.setOnClickListener {
+      firebaseAppDistribution
+        .signInTester()
+        .addOnSuccessListener {
+          setupUI(isSignedIn = firebaseAppDistribution.isTesterSignedIn, isUpdateAvailable = false)
+        }
+        .addOnFailureListener { failureListener(it) }
+    }
+
+    signInButtonBackground.setOnClickListener {
+      executorService.execute {
+        firebaseAppDistribution
+          .signInTester()
+          .addOnSuccessListener {}
+          .addOnFailureListener { failureListener(it) }
+      }
+      setupUI(isSignedIn = firebaseAppDistribution.isTesterSignedIn, isUpdateAvailable = false)
+    }
+
+    checkForUpdateButton.setOnClickListener {
+      firebaseAppDistribution
+        .checkForNewRelease()
+        .addOnSuccessListener { release ->
+          setupUI(
+            isSignedIn = firebaseAppDistribution.isTesterSignedIn,
+            isUpdateAvailable = release != null,
+            release = release
+          )
+        }
+        .addOnFailureListener { failureListener(it) }
+    }
+
+    checkForUpdateButtonBackground.setOnClickListener {
+      executorService.execute {
+        firebaseAppDistribution
+          .checkForNewRelease()
+          .addOnSuccessListener { release ->
+            setupUI(
+              isSignedIn = firebaseAppDistribution.isTesterSignedIn,
+              isUpdateAvailable = release != null,
+              release = release
+            )
+          }
+          .addOnFailureListener { failureListener(it) }
+      }
+    }
+
+    signOutButton.setOnClickListener {
+      firebaseAppDistribution.signOutTester()
+      setupUI(isSignedIn = firebaseAppDistribution.isTesterSignedIn, isUpdateAvailable = false)
+    }
+
+    signOutButtonBackground.setOnClickListener {
+      executorService.execute { firebaseAppDistribution.signOutTester() }
+
+      setupUI(isSignedIn = firebaseAppDistribution.isTesterSignedIn, isUpdateAvailable = false)
+    }
+
+    updateAppButton.setOnClickListener {
+      setProgressBar()
+      firebaseAppDistribution
+        .updateApp()
+        .addOnProgressListener { progressListener(it) }
+        .addOnCanceledListener {
+          setupUI(isSignedIn = firebaseAppDistribution.isTesterSignedIn, isUpdateAvailable = false)
+        }
+    }
+
+    updateAppButtonBackground.setOnClickListener {
+      setProgressBar()
+      executorService.execute {
+        firebaseAppDistribution.updateApp().addOnProgressListener { progressListener(it) }
+      }
+    }
+
+    secondActivityButton.setOnClickListener { startSecondActivity() }
+  }
+
+  private fun startSecondActivity() {
+    val intent = Intent(this, SecondActivity::class.java)
+    startActivity(intent)
+  }
+
+  private fun setProgressBar() {
+    progressBar.visibility = View.VISIBLE
+    progressPercent.visibility = View.VISIBLE
+    progressBar.isIndeterminate = false
+  }
+
+  private fun failureListener(exception: Exception) {
+    val ex = exception as com.google.firebase.appdistribution.FirebaseAppDistributionException
+    Log.d("MainActivity", "Task failed with an error (${ex.errorCode}): ${ex.message}")
+    AlertDialog.Builder(this)
+      .setTitle("Task failed")
+      .setMessage("${ex.message}\n\nCode: ${ex.errorCode}")
+      .setNeutralButton("Okay") { dialog, _ -> dialog.dismiss() }
+      .show()
+  }
+
+  private fun progressListener(updateProgress: UpdateProgress) {
+    val percentage =
+      ((updateProgress.apkBytesDownloaded * 100) / updateProgress.apkFileTotalBytes).toInt()
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+      progressBar.setProgress(percentage, true)
+    }
+    progressPercent.text = "$percentage %"
+  }
+
+  private fun setupUI(
+    isSignedIn: Boolean,
+    isUpdateAvailable: Boolean,
+    release: AppDistributionRelease? = null
+  ) {
+    progressBar.visibility = View.GONE
+    progressPercent.visibility = View.GONE
+    if (isUpdateAvailable) {
+      signInStatus.text = "Release available - ${release?.displayVersion} (${release?.versionCode})"
+      signInButton.visibility = View.GONE
+      signInButtonBackground.visibility = View.GONE
+      checkForUpdateButton.visibility = View.GONE
+      checkForUpdateButtonBackground.visibility = View.GONE
+      updateAppButton.visibility = View.VISIBLE
+      updateAppButtonBackground.visibility = View.VISIBLE
+      signOutButton.visibility = View.VISIBLE
+      progressBar.visibility = View.GONE
+      signOutButtonBackground.visibility = View.VISIBLE
+      return
+    }
+
+    signInStatus.text = if (isSignedIn) "Tester signed In!" else "Not Signed In"
+    signInButton.visibility = if (isSignedIn) View.GONE else View.VISIBLE
+    signInButtonBackground.visibility = if (isSignedIn) View.GONE else View.VISIBLE
+    signOutButton.visibility = if (isSignedIn) View.VISIBLE else View.GONE
+    signOutButtonBackground.visibility = if (isSignedIn) View.VISIBLE else View.GONE
+    checkForUpdateButton.visibility = if (isSignedIn) View.VISIBLE else View.GONE
+    checkForUpdateButtonBackground.visibility = if (isSignedIn) View.VISIBLE else View.GONE
+    updateAppButton.visibility = if (isSignedIn) View.VISIBLE else View.GONE
+    updateAppButtonBackground.visibility = if (isSignedIn) View.VISIBLE else View.GONE
+    updateAppButton.visibility = View.GONE
+    updateAppButtonBackground.visibility = View.GONE
+  }
+
+  companion object {
+    const val TAG = "MainActivity"
+
+    enum class FeedbackTrigger(val label: String) {
+      NONE("None"),
+      SHAKE("Shake the device"),
+      SCREENSHOT("Take a screenshot"),
+      CUSTOM_NOTIFICATION("Tap a notification (custom)")
+    }
+  }
+}
diff --git a/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/ScreenshotDetectionActivity.kt b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/ScreenshotDetectionActivity.kt
new file mode 100644
index 00000000000..f509710bc52
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/ScreenshotDetectionActivity.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.googletest.firebase.appdistribution.testapp
+
+import android.app.AlertDialog
+import android.content.pm.PackageManager.PERMISSION_DENIED
+import android.os.Bundle
+import android.os.Handler
+import android.os.HandlerThread
+import android.util.Log
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import com.googletest.firebase.appdistribution.testapp.ScreenshotDetectionFeedbackTrigger.Companion.screenshotReadPermission
+import java.util.*
+
+class ScreenshotDetectionActivity : AppCompatActivity() {
+  private val handlerThread = HandlerThread("AppDistroFeedbackTrigger").also { it.start() }
+  private var screenshotDetectionFeedbackTrigger =
+    ScreenshotDetectionFeedbackTrigger(
+      this,
+      R.string.feedbackAdditionalFormText,
+      Handler(handlerThread.looper)
+    )
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_screenshot_detection)
+
+    val launcher =
+      registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
+        if (!isGranted) {
+          Log.i(TAG, "Permission not granted")
+          AlertDialog.Builder(this)
+            .setMessage(
+              "Because storage permission has been denied, screenshots taken will not trigger feedback to the developer."
+            )
+            .setPositiveButton("OK") { _, _ -> }
+            .show()
+        }
+      }
+
+    if (ContextCompat.checkSelfPermission(this, screenshotReadPermission) == PERMISSION_DENIED) {
+      if (shouldShowRequestPermissionRationale(screenshotReadPermission)) {
+        Log.i(TAG, "Showing customer rationale for requesting permission.")
+        AlertDialog.Builder(this)
+          .setMessage(
+            "Taking a screenshot of the app can initiate feedback to the developer. To enable this feature, allow the app access to device storage."
+          )
+          .setPositiveButton("OK") { _, _ ->
+            Log.i(TAG, "Launching request for permission.")
+            launcher.launch(screenshotReadPermission)
+          }
+          .setNegativeButton("No thanks") { _, _ -> Log.i(TAG, "User denied permission request.") }
+          .show()
+      } else {
+        Log.i(TAG, "Launching request for permission without rationale.")
+        launcher.launch(screenshotReadPermission)
+      }
+    }
+
+    screenshotDetectionFeedbackTrigger.listenForScreenshots()
+  }
+
+  override fun onDestroy() {
+    screenshotDetectionFeedbackTrigger.stopListeningForScreenshots()
+    super.onDestroy()
+  }
+
+  companion object {
+    private const val TAG = "ScreenshotDetectionActivity"
+  }
+}
diff --git a/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/ScreenshotDetectionFeedbackTrigger.kt b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/ScreenshotDetectionFeedbackTrigger.kt
new file mode 100644
index 00000000000..c904ed1e507
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/ScreenshotDetectionFeedbackTrigger.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.googletest.firebase.appdistribution.testapp
+
+import android.Manifest
+import android.app.Activity
+import android.content.pm.PackageManager
+import android.database.ContentObserver
+import android.database.Cursor
+import android.net.Uri
+import android.os.Build
+import android.os.Handler
+import android.provider.MediaStore
+import android.util.Log
+import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
+import com.google.firebase.appdistribution.ktx.appDistribution
+import com.google.firebase.ktx.Firebase
+import java.util.*
+
+class ScreenshotDetectionFeedbackTrigger(
+  private val activity: Activity,
+  private val additionalFormText: Int,
+  handler: Handler
+) : ContentObserver(handler) {
+  private val seenImages = HashSet<Uri>()
+
+  override fun onChange(selfChange: Boolean, uri: Uri?) {
+    if (uri == null || !isExternalContent(uri) || seenImages.contains(uri)) {
+      return
+    }
+    maybeStartFeedbackForScreenshot(uri)
+  }
+
+  private fun maybeStartFeedbackForScreenshot(uri: Uri) {
+    if (!isPermissionGranted()) {
+      Log.i(TAG, "Screenshot detection disabled because storage permission is denied")
+    }
+    try {
+      val cursor = activity.contentResolver.query(uri, contentProjection, null, null, null)
+      cursor?.use {
+        if (cursor.moveToFirst()) {
+          if (shouldCheckIfPending && isPending(cursor)) {
+            Log.i(TAG, "Ignoring pending image: $uri")
+            return
+          }
+          seenImages.add(uri)
+          val path = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA))
+          Log.i(TAG, "Path: $path")
+          if (path.lowercase(Locale.getDefault()).contains("screenshot")) {
+            Firebase.appDistribution.startFeedback(additionalFormText, uri)
+          }
+        }
+      }
+    } catch (e: Exception) {
+      Log.e(TAG, "Could not determine if media change was due to taking a screenshot", e)
+    }
+  }
+
+  fun listenForScreenshots() {
+    activity.contentResolver?.registerContentObserver(
+      MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+      /* notifyForDescendants= */ true,
+      this
+    )
+  }
+
+  fun stopListeningForScreenshots() {
+    activity.contentResolver?.unregisterContentObserver(this)
+  }
+
+  private fun isPermissionGranted() =
+    ContextCompat.checkSelfPermission(activity, screenshotReadPermission) ==
+      PackageManager.PERMISSION_GRANTED
+
+  companion object {
+    private const val TAG = "ScreenshotDetectionFeedbackTrigger"
+
+    val screenshotReadPermission =
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
+        Manifest.permission.READ_MEDIA_IMAGES
+      else Manifest.permission.READ_EXTERNAL_STORAGE
+
+    private val shouldCheckIfPending = Build.VERSION.SDK_INT >= 29
+    private val contentProjection =
+      if (shouldCheckIfPending)
+        arrayOf(MediaStore.Images.Media.DATA, MediaStore.MediaColumns.IS_PENDING)
+      else arrayOf(MediaStore.Images.Media.DATA)
+
+    @RequiresApi(Build.VERSION_CODES.Q)
+    private fun isPending(cursor: Cursor): Boolean {
+      val pendingColumn = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.IS_PENDING)
+      return cursor.getInt(pendingColumn) == 1
+    }
+
+    private fun isExternalContent(uri: Uri) =
+      uri.toString().matches("${MediaStore.Images.Media.EXTERNAL_CONTENT_URI}/\\d+".toRegex())
+  }
+}
diff --git a/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/SecondActivity.kt b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/SecondActivity.kt
new file mode 100644
index 00000000000..575c9f873a1
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/SecondActivity.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.googletest.firebase.appdistribution.testapp
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.AppCompatButton
+import com.google.firebase.appdistribution.ktx.appDistribution
+import com.google.firebase.ktx.Firebase
+
+class SecondActivity : AppCompatActivity() {
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_second)
+  }
+
+  override fun onResume() {
+    super.onResume()
+    val mainActivityButton = findViewById<AppCompatButton>(R.id.main_activity_button)
+    mainActivityButton.setOnClickListener { startMainActivity() }
+  }
+
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
+    val inflater: MenuInflater = menuInflater
+    inflater.inflate(R.menu.action_menu, menu)
+    return true
+  }
+
+  override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    return when (item.itemId) {
+      R.id.startFeedbackMenuItem -> {
+        Firebase.appDistribution.startFeedback(R.string.feedbackAdditionalFormText)
+        true
+      }
+      else -> super.onOptionsItemSelected(item)
+    }
+  }
+
+  private fun startMainActivity() {
+    val intent = Intent(this, MainActivity::class.java)
+    startActivity(intent)
+  }
+}
diff --git a/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/ShakeDetectionFeedbackTrigger.kt b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/ShakeDetectionFeedbackTrigger.kt
new file mode 100644
index 00000000000..051c390c78d
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/ShakeDetectionFeedbackTrigger.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.googletest.firebase.appdistribution.testapp
+
+import android.app.Activity
+import android.app.Application
+import android.hardware.SensorManager
+import android.os.Bundle
+import android.util.Log
+import com.google.firebase.appdistribution.ktx.appDistribution
+import com.google.firebase.ktx.Firebase
+import com.squareup.seismic.ShakeDetector
+
+/**
+ * Listens to the device accelerometer, and starts App Distribution in-app feedback when the user
+ * shakes their device.
+ */
+object ShakeDetectionFeedbackTrigger :
+  ShakeDetector.Listener, Application.ActivityLifecycleCallbacks {
+  private const val TAG: String = "ShakeDetectionFeedbackTrigger"
+
+  private val shakeDetector =
+    ShakeDetector(this).also { it.setSensitivity(ShakeDetector.SENSITIVITY_LIGHT) }
+  private var isEnabled = false
+
+  /** Start listening for device shakes. */
+  fun enable(application: Application, currentActivity: Activity? = null) {
+    synchronized(this) {
+      if (!isEnabled) {
+        application.registerActivityLifecycleCallbacks(this)
+        Log.i(TAG, "Shake detector registered")
+        if (currentActivity != null) {
+          listenForShakes(currentActivity)
+        }
+        isEnabled = true
+      }
+    }
+  }
+
+  /** Stop listening for device shakes. */
+  fun disable(application: Application) {
+    synchronized(this) {
+      if (isEnabled) {
+        stopListeningForShakes()
+        application.unregisterActivityLifecycleCallbacks(this)
+        Log.i(TAG, "Shake detector unregistered")
+        isEnabled = false
+      }
+    }
+  }
+
+  private fun listenForShakes(activity: Activity) {
+    val sensorManager = activity.getSystemService(Activity.SENSOR_SERVICE) as SensorManager
+    shakeDetector.start(sensorManager, SensorManager.SENSOR_DELAY_NORMAL)
+  }
+
+  private fun stopListeningForShakes() {
+    shakeDetector.stop()
+  }
+
+  override fun hearShake() {
+    Log.i(TAG, "Shake detected")
+    Firebase.appDistribution.startFeedback(R.string.feedbackAdditionalFormText)
+  }
+
+  override fun onActivityResumed(activity: Activity) {
+    Log.i(TAG, "Shake detection started")
+    listenForShakes(activity)
+  }
+
+  override fun onActivityPaused(activity: Activity) {
+    Log.i(TAG, "Shake detection stopped")
+    stopListeningForShakes()
+  }
+
+  // Other lifecycle methods
+  override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
+  override fun onActivityStarted(activity: Activity) {}
+  override fun onActivityStopped(activity: Activity) {}
+  override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
+  override fun onActivityDestroyed(activity: Activity) {}
+}
diff --git a/firebase-appdistribution/test-app/src/main/res/layout/activity_custom_notification.xml b/firebase-appdistribution/test-app/src/main/res/layout/activity_custom_notification.xml
new file mode 100644
index 00000000000..50128c0c5a7
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/res/layout/activity_custom_notification.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.googletest.firebase.appdistribution.testapp.CustomNotificationActivity">
+
+    <TextView
+        android:id="@+id/activity_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Tap the notification to submit feedback"
+        android:textSize="20dp"
+        android:padding="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/firebase-appdistribution/test-app/src/main/res/layout/activity_main.xml b/firebase-appdistribution/test-app/src/main/res/layout/activity_main.xml
index e09e123b777..81b395b0361 100644
--- a/firebase-appdistribution/test-app/src/main/res/layout/activity_main.xml
+++ b/firebase-appdistribution/test-app/src/main/res/layout/activity_main.xml
@@ -7,19 +7,98 @@
     android:layout_height="match_parent"
     tools:context="com.googletest.firebase.appdistribution.testapp.MainActivity">
 
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/sign_out2"
+        android:layout_width="156dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:background="@color/purple_500"
+        android:text="Sign Out Background"
+        android:textColor="@color/white"
+        app:layout_constraintHorizontal_bias="0.94"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/progress_percentage" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/update_app2"
+        android:layout_width="156dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="16dp"
+        android:background="@color/purple_500"
+        android:text="Update App Background"
+        android:textColor="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.94"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/check_for_update2" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/check_for_update2"
+        android:layout_width="156dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:background="@color/purple_500"
+        android:text="Check For Update Background"
+        android:textColor="@color/white"
+        app:layout_constraintHorizontal_bias="0.94"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sign_in_button2" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/basic_config2"
+        android:layout_width="156dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:background="@color/purple_500"
+        android:text="Basic Config Background"
+        android:textColor="@color/white"
+        app:layout_constraintHorizontal_bias="0.94"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sign_in_status" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/basic_config"
+        android:layout_width="156dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:background="@color/purple_500"
+        android:text="Basic Config"
+        android:textColor="@color/white"
+        app:layout_constraintHorizontal_bias="0.235"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sign_in_status" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/sign_in_button2"
+        android:layout_width="156dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:background="@color/purple_500"
+        android:text="Sign In Background"
+        android:textColor="@color/white"
+        app:layout_constraintHorizontal_bias="0.94"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/basic_config2" />
+
     <TextView
         android:id="@+id/app_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Sample App!"
-        android:textColor="@color/design_default_color_on_secondary"
-        android:textSize="32dp"
+        android:textSize="32sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.14" />
+        app:layout_constraintVertical_bias="0.10" />
 
     <TextView
         android:id="@+id/sign_in_status"
@@ -27,51 +106,49 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:text="Tester Signed In!"
-        android:textColor="@color/design_default_color_on_secondary"
-        android:textSize="20dp"
+        android:textSize="20sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/app_name" />
 
-
     <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/sign_in_button"
-        android:layout_width="128dp"
+        android:layout_width="156dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="88dp"
+        android:layout_marginTop="24dp"
         android:background="@color/purple_500"
         android:text="Sign In"
         android:textColor="@color/white"
-        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintHorizontal_bias="0.235"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/sign_in_status" />
+        app:layout_constraintTop_toBottomOf="@+id/basic_config" />
 
     <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/check_for_update"
         android:layout_width="156dp"
         android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginTop="24dp"
         android:background="@color/purple_500"
-        android:textColor="@color/white"
         android:text="Check For Update"
-        app:layout_constraintTop_toBottomOf="@id/sign_in_button"
-        android:layout_marginTop="40dp"
-        />
+        android:textColor="@color/white"
+        app:layout_constraintHorizontal_bias="0.235"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sign_in_button" />
 
     <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/update_app"
-        android:layout_width="128dp"
+        android:layout_width="156dp"
         android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginTop="24dp"
         android:background="@color/purple_500"
-        android:textColor="@color/white"
         android:text="Update App"
-        app:layout_constraintTop_toBottomOf="@id/check_for_update"
-        android:layout_marginTop="40dp"
-        />
+        android:textColor="@color/white"
+        app:layout_constraintHorizontal_bias="0.235"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/check_for_update" />
 
     <ProgressBar
         android:id="@+id/progress_bar"
@@ -81,7 +158,7 @@
         app:layout_constraintTop_toBottomOf="@id/update_app"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginTop="40dp"
+        android:layout_marginTop="24dp"
         />
 
     <TextView
@@ -89,8 +166,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Tester Signed In!"
-        android:textColor="@color/design_default_color_on_secondary"
-        android:textSize="20dp"
+        android:textSize="20sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/progress_bar"
@@ -100,13 +176,44 @@
         android:id="@+id/sign_out"
         android:layout_width="156dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:background="@color/purple_500"
+        android:text="Sign Out"
+        android:textColor="@color/white"
+        app:layout_constraintHorizontal_bias="0.235"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/progress_percentage" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/secondActivityButton"
+        android:layout_width="156dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
         android:background="@color/purple_500"
+        android:text="Start new activity"
         android:textColor="@color/white"
-        android:text="Sign Out"
-        app:layout_constraintTop_toBottomOf="@id/progress_percentage"
-        android:layout_marginTop="40dp"
-        />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.6"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sign_out2" />
 
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/feedbackTriggerMenu"
+        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
+        android:layout_width="match_parent"
+        android:layout_marginTop="24dp"
+        android:layout_marginHorizontal="60dp"
+        android:layout_height="wrap_content"
+        android:hint="@string/feedbackTriggerMenuLabel"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/secondActivityButton">
+        <AutoCompleteTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="none"
+            android:hint="@string/feedbackTriggerMenuLabel"
+        />
+    </com.google.android.material.textfield.TextInputLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/firebase-appdistribution/test-app/src/main/res/layout/activity_screenshot_detection.xml b/firebase-appdistribution/test-app/src/main/res/layout/activity_screenshot_detection.xml
new file mode 100644
index 00000000000..ac5abf0c4f0
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/res/layout/activity_screenshot_detection.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.googletest.firebase.appdistribution.testapp.ScreenshotDetectionActivity">
+
+    <TextView
+        android:id="@+id/activity_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Take a screenshot to submit feedback"
+        android:textSize="20dp"
+        android:padding="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/firebase-appdistribution/test-app/src/main/res/layout/list_item.xml b/firebase-appdistribution/test-app/src/main/res/layout/list_item.xml
new file mode 100644
index 00000000000..5e5488d5cf6
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/res/layout/list_item.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:ellipsize="end"
+    android:maxLines="1"
+    android:textAppearance="?attr/textAppearanceSubtitle1"
+    />
\ No newline at end of file
diff --git a/firebase-appdistribution/test-app/src/main/res/menu/action_menu.xml b/firebase-appdistribution/test-app/src/main/res/menu/action_menu.xml
new file mode 100644
index 00000000000..045c9f9854d
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/res/menu/action_menu.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/startFeedbackMenuItem"
+        android:title="@string/startFeedbackLabel"
+        android:visible="false"/>
+</menu>
\ No newline at end of file
diff --git a/firebase-appdistribution/test-app/src/main/res/values/strings.xml b/firebase-appdistribution/test-app/src/main/res/values/strings.xml
index 84c484d543e..20ba70884a5 100644
--- a/firebase-appdistribution/test-app/src/main/res/values/strings.xml
+++ b/firebase-appdistribution/test-app/src/main/res/values/strings.xml
@@ -1,3 +1,10 @@
 <resources>
-    <string name="app_name">App Distro Sample</string>
+    <string name="appName">App Distro Sample</string>
+    <string name="feedbackAdditionalFormText">This is a placeholder for text from the developer that is shown to the tester before they provide feedback. It can contain <a href="https://firebase.google.com/docs/app-distribution">links</a> to more information.</string>
+    <string name="feedbackTriggerMenuLabel">Choose a feedback trigger</string>
+    <string name="startFeedbackLabel">Start feedback</string>
+    <string name="feedbackTriggerNotificationTitle">We want your Feedback!</string>
+    <string name="feedbackTriggerNotificationText">This is a custom notification shown by the App Distro Sample App</string>
+    <string name="feedbackTriggerNotificationChannelName">Custom feedback notification</string>
+    <string name="feedbackTriggerNotificationChannelDescription">Used to trigger feedback</string>
 </resources>
\ No newline at end of file
diff --git a/firebase-appdistribution/test-app/src/main/res/xml/locales_config.xml b/firebase-appdistribution/test-app/src/main/res/xml/locales_config.xml
new file mode 100644
index 00000000000..48313d1c7b5
--- /dev/null
+++ b/firebase-appdistribution/test-app/src/main/res/xml/locales_config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+  <locale android:name="en"/>
+  <locale android:name="de"/>
+  <locale android:name="en-GB"/>
+  <locale android:name="es"/>
+  <locale android:name="es-419"/>
+  <locale android:name="fr"/>
+  <locale android:name="hi"/>
+  <locale android:name="in"/>
+  <locale android:name="it"/>
+  <locale android:name="iw"/>
+  <locale android:name="ja"/>
+  <locale android:name="ko"/>
+  <locale android:name="nl"/>
+  <locale android:name="pl"/>
+  <locale android:name="pt-BR"/>
+  <locale android:name="ru"/>
+  <locale android:name="th"/>
+  <locale android:name="tr"/>
+  <locale android:name="uk"/>
+  <locale android:name="vi"/>
+  <locale android:name="zh-CN"/>
+  <locale android:name="zh-TW"/>
+</locale-config>
diff --git a/firebase-appdistribution/test-app/test-app.gradle b/firebase-appdistribution/test-app/test-app.gradle
index f45109ee87e..1dc1319dd52 100644
--- a/firebase-appdistribution/test-app/test-app.gradle
+++ b/firebase-appdistribution/test-app/test-app.gradle
@@ -15,28 +15,50 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'com.google.gms.google-services'
+    id 'com.google.firebase.appdistribution'
+    id 'copy-google-services'
 }
 
 android {
-    compileSdkVersion 30
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.googletest.firebase.appdistribution.testapp"
-        minSdkVersion 19
-        targetSdkVersion 30
-        versionName "1.0"
-        versionCode 1
+        minSdkVersion 23
+        targetSdkVersion 33
+        versionName "3.2"
+        versionCode 7
 
-        testInstrumentationRunner "androidx.test.runnecr.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
-        // This is so we can build the "release" variant for the "dev-app" (and the SDK) without
-        // needing to have the app signed.
         release {
+            // This is so we can build the "release" variant for the "test-app" (and the SDK) without
+            // needing to have the app signed.
             initWith debug
         }
     }
+
+    flavorDimensions.add("environment")
+
+    productFlavors {
+        prod {
+            dimension "environment"
+            versionNameSuffix "-prod"
+        }
+
+        beta {
+            dimension "environment"
+            versionNameSuffix "-beta"
+
+            firebaseAppDistribution {
+                releaseNotes "Beta variant of Android SDK test app"
+                // testers "your email here"
+            }
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -49,21 +71,29 @@ android {
 dependencies {
     // TODO(rachelprince): Add flag to build with public version of SDK
     println("Building with HEAD version ':firebase-appdistribution' of SDK")
-    implementation project(':firebase-appdistribution')
 
-    implementation "com.google.android.gms:play-services-tasks:18.0.1"
+    version ':firebase-appdistribution'
 
+    // In this test project we also need to explicitly declare these dependencies
+    implementation project(':firebase-appdistribution-api')
+    // All variants use the API
+    implementation project(':firebase-appdistribution-api:ktx')
+    implementation "androidx.activity:activity-ktx:1.6.0"
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation "androidx.core:core:1.9.0"
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation "androidx.fragment:fragment-ktx:1.5.3"
+    implementation "com.google.android.gms:play-services-tasks:18.0.2"
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.firebase:firebase-common-ktx:21.0.0'
+    // Shake detection
+    implementation 'com.squareup:seismic:1.0.3'
+    // Other dependencies
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    implementation 'androidx.core:core-ktx:1.5.0'
-    implementation "androidx.core:core:1.6.0"
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
 
-// This allows the app to connect to Firebase on the CI.
-ext.packageName = "com.googletest.firebase.appdistribution.testapp"
-apply from: '../../gradle/googleServices.gradle'
+    // Beta flavor uses the full implementation
+    betaImplementation project(':firebase-appdistribution')
+
+    testImplementation 'junit:junit:4.13.2'
+}
diff --git a/firebase-common/CHANGELOG.md b/firebase-common/CHANGELOG.md
new file mode 100644
index 00000000000..8015035242a
--- /dev/null
+++ b/firebase-common/CHANGELOG.md
@@ -0,0 +1,25 @@
+# Unreleased
+* [fixed] Correctly declare dependency on firebase-components, issue #5732
+* [changed] Added extension method `Random.nextAlphanumericString()` (PR #5818)
+
+# 20.4.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-common-ktx`
+to `com.google.firebase:firebase-common` under the `com.google.firebase` package.
+For details, see the
+[FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+## Kotlin
+* [deprecated] All the APIs from `com.google.firebase:firebase-common-ktx` have been added to
+`com.google.firebase:firebase-common` under the `com.google.firebase package`, and all the
+Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-common-ktx` are now deprecated.
+As early as April 2024, we'll no longer release KTX modules. For details, see the
+FAQ about this initiative.
+[FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+# 20.3.3
+* [fixed] Addressed issue with C++ being absent in user agent.
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-common` library. The Kotlin extensions library has no additional
+updates
diff --git a/firebase-common/api.txt b/firebase-common/api.txt
index adbb4aa440e..841f5c4dda4 100644
--- a/firebase-common/api.txt
+++ b/firebase-common/api.txt
@@ -1,6 +1,10 @@
 // Signature format: 2.0
 package com.google.firebase {
 
+  public final class Firebase {
+    field @NonNull public static final com.google.firebase.Firebase INSTANCE;
+  }
+
   public class FirebaseApp {
     method @NonNull public android.content.Context getApplicationContext();
     method @NonNull public static java.util.List<com.google.firebase.FirebaseApp> getApps(@NonNull android.content.Context);
@@ -15,6 +19,15 @@ package com.google.firebase {
     field @NonNull public static final String DEFAULT_APP_NAME = "[DEFAULT]";
   }
 
+  public final class FirebaseKt {
+    method @NonNull public static com.google.firebase.FirebaseApp app(@NonNull com.google.firebase.Firebase, @NonNull String name);
+    method @NonNull public static com.google.firebase.FirebaseApp getApp(@NonNull com.google.firebase.Firebase);
+    method @NonNull public static com.google.firebase.FirebaseOptions getOptions(@NonNull com.google.firebase.Firebase);
+    method @Nullable public static com.google.firebase.FirebaseApp initialize(@NonNull com.google.firebase.Firebase, @NonNull android.content.Context context);
+    method @NonNull public static com.google.firebase.FirebaseApp initialize(@NonNull com.google.firebase.Firebase, @NonNull android.content.Context context, @NonNull com.google.firebase.FirebaseOptions options);
+    method @NonNull public static com.google.firebase.FirebaseApp initialize(@NonNull com.google.firebase.Firebase, @NonNull android.content.Context context, @NonNull com.google.firebase.FirebaseOptions options, @NonNull String name);
+  }
+
   public class FirebaseNetworkException extends com.google.firebase.FirebaseException {
     ctor public FirebaseNetworkException(@NonNull String);
   }
@@ -45,6 +58,45 @@ package com.google.firebase {
     ctor public FirebaseTooManyRequestsException(@NonNull String);
   }
 
+  public final class Timestamp implements java.lang.Comparable<com.google.firebase.Timestamp> android.os.Parcelable {
+    ctor public Timestamp(long seconds, int nanoseconds);
+    ctor public Timestamp(@NonNull java.util.Date date);
+    ctor @RequiresApi(android.os.Build.VERSION_CODES.O) public Timestamp(@NonNull java.time.Instant time);
+    method public int compareTo(@NonNull com.google.firebase.Timestamp other);
+    method public int describeContents();
+    method public int getNanoseconds();
+    method public long getSeconds();
+    method @NonNull public static com.google.firebase.Timestamp now();
+    method @NonNull public java.util.Date toDate();
+    method @NonNull @RequiresApi(android.os.Build.VERSION_CODES.O) public java.time.Instant toInstant();
+    method public void writeToParcel(@NonNull android.os.Parcel dest, int flags);
+    property public final int nanoseconds;
+    property public final long seconds;
+    field @NonNull public static final android.os.Parcelable.Creator<com.google.firebase.Timestamp> CREATOR;
+    field @NonNull public static final com.google.firebase.Timestamp.Companion Companion;
+  }
+
+  public static final class Timestamp.Companion {
+    method @NonNull public com.google.firebase.Timestamp now();
+  }
+
+}
+
+package com.google.firebase.ktx {
+
+  @Deprecated public final class Firebase {
+    field @Deprecated @NonNull public static final com.google.firebase.ktx.Firebase INSTANCE;
+  }
+
+  public final class FirebaseKt {
+    method @Deprecated @NonNull public static com.google.firebase.FirebaseApp app(@NonNull com.google.firebase.ktx.Firebase, @NonNull String name);
+    method @Deprecated @NonNull public static com.google.firebase.FirebaseApp getApp(@NonNull com.google.firebase.ktx.Firebase);
+    method @Deprecated @NonNull public static com.google.firebase.FirebaseOptions getOptions(@NonNull com.google.firebase.ktx.Firebase);
+    method @Deprecated @Nullable public static com.google.firebase.FirebaseApp initialize(@NonNull com.google.firebase.ktx.Firebase, @NonNull android.content.Context context);
+    method @Deprecated @NonNull public static com.google.firebase.FirebaseApp initialize(@NonNull com.google.firebase.ktx.Firebase, @NonNull android.content.Context context, @NonNull com.google.firebase.FirebaseOptions options);
+    method @Deprecated @NonNull public static com.google.firebase.FirebaseApp initialize(@NonNull com.google.firebase.ktx.Firebase, @NonNull android.content.Context context, @NonNull com.google.firebase.FirebaseOptions options, @NonNull String name);
+  }
+
 }
 
 package com.google.firebase.provider {
diff --git a/firebase-common/data-collection-tests/data-collection-tests.gradle b/firebase-common/data-collection-tests/data-collection-tests.gradle
deleted file mode 100644
index b690f166c85..00000000000
--- a/firebase-common/data-collection-tests/data-collection-tests.gradle
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-plugins {
-    id 'com.android.application'
-}
-
-android {
-    adbOptions {
-        timeOutInMs 60 * 1000
-    }
-
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-        minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
-        versionName version
-        multiDexEnabled true
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
-}
-
-dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    testImplementation 'androidx.test:runner:1.2.0'
-    testImplementation 'androidx.test.ext:junit:1.1.1'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'com.google.auto.value:auto-value-annotations:1.6.5'
-    testImplementation 'junit:junit:4.12'
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    implementation 'androidx.core:core:1.2.0'
-}
diff --git a/firebase-common/data-collection-tests/data-collection-tests.gradle.kts b/firebase-common/data-collection-tests/data-collection-tests.gradle.kts
new file mode 100644
index 00000000000..9e72328ad45
--- /dev/null
+++ b/firebase-common/data-collection-tests/data-collection-tests.gradle.kts
@@ -0,0 +1,50 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+    id("com.android.application")
+}
+
+android {
+  val compileSdkVersion : Int by rootProject
+  val targetSdkVersion : Int by rootProject
+  val minSdkVersion : Int by rootProject
+  compileSdk = compileSdkVersion
+  namespace = "com.google.firebase.datacollectiontests"
+  defaultConfig {
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+    multiDexEnabled = true
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+  }
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+  testOptions.unitTests.isIncludeAndroidResources = true
+}
+
+dependencies {
+    implementation("com.google.firebase:firebase-common:21.0.0")
+    implementation("com.google.firebase:firebase-components:18.0.0")
+
+    testImplementation(libs.androidx.core)
+    testImplementation(libs.androidx.test.junit)
+    testImplementation(libs.androidx.test.runner)
+    testImplementation(libs.autovalue.annotations)
+    testImplementation(libs.junit)
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.truth)
+}
diff --git a/firebase-common/data-collection-tests/src/main/AndroidManifest.xml b/firebase-common/data-collection-tests/src/main/AndroidManifest.xml
index 1cb551d3b27..1f48b25c87f 100644
--- a/firebase-common/data-collection-tests/src/main/AndroidManifest.xml
+++ b/firebase-common/data-collection-tests/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
 <!-- 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="com.google.firebase.datacollectiontests">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <meta-data android:name="firebase_data_collection_default_enabled"
             android:value="false" />
diff --git a/firebase-common/data-collection-tests/src/test/java/com/google/firebase/DataCollectionPostNDefaultDisabledTest.java b/firebase-common/data-collection-tests/src/test/java/com/google/firebase/DataCollectionPostNDefaultDisabledTest.java
index 72c091a5e2f..75b66ad6183 100644
--- a/firebase-common/data-collection-tests/src/test/java/com/google/firebase/DataCollectionPostNDefaultDisabledTest.java
+++ b/firebase-common/data-collection-tests/src/test/java/com/google/firebase/DataCollectionPostNDefaultDisabledTest.java
@@ -27,9 +27,11 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
 
 @RunWith(AndroidJUnit4.class)
 @Config(sdk = 25)
+@LooperMode(LooperMode.Mode.LEGACY)
 public class DataCollectionPostNDefaultDisabledTest {
 
   @Test
diff --git a/firebase-common/data-collection-tests/src/test/java/com/google/firebase/DataCollectionPreNDefaultDisabledTest.java b/firebase-common/data-collection-tests/src/test/java/com/google/firebase/DataCollectionPreNDefaultDisabledTest.java
index 75896f168fb..81c71400b7d 100644
--- a/firebase-common/data-collection-tests/src/test/java/com/google/firebase/DataCollectionPreNDefaultDisabledTest.java
+++ b/firebase-common/data-collection-tests/src/test/java/com/google/firebase/DataCollectionPreNDefaultDisabledTest.java
@@ -25,9 +25,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
 
 @RunWith(AndroidJUnit4.class)
-@Config(sdk = 19)
+@Config(sdk = 21)
 public class DataCollectionPreNDefaultDisabledTest {
 
   @Test
@@ -81,6 +82,7 @@ public void setDataCollectionDefaultEnabledTrue_shouldUpdateSharedPrefs() {
   }
 
   @Test
+  @LooperMode(LooperMode.Mode.LEGACY)
   public void setDataCollectionDefaultEnabledTrue_shouldEmitEvents() {
     withApp(
         app -> {
diff --git a/firebase-common/firebase-common.gradle b/firebase-common/firebase-common.gradle
deleted file mode 100644
index 0b160edf22b..00000000000
--- a/firebase-common/firebase-common.gradle
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-plugins {
-    id 'firebase-library'
-}
-
-firebaseLibrary {
-    testLab.enabled = true
-    publishSources = true
-}
-
-android {
-    adbOptions {
-        timeOutInMs 60 * 1000
-    }
-
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-      minSdkVersion project.minSdkVersion
-      targetSdkVersion project.targetSdkVersion
-      versionName version
-      multiDexEnabled true
-      testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-      consumerProguardFiles 'proguard.txt'
-    }
-    sourceSets {
-        androidTest {
-            java {
-                srcDir 'src/testUtil'
-            }
-        }
-        test {
-            java {
-                srcDir 'src/testUtil'
-            }
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
-    lintOptions {
-        baseline file("lint-baseline.xml")
-    }
-}
-
-dependencies {
-    // TODO(vkryachko): have sdks depend on components directly once components are released.
-    implementation project(':firebase-components')
-    implementation 'com.google.android.gms:play-services-basement:18.0.0'
-    implementation "com.google.android.gms:play-services-tasks:18.0.1"
-
-    // FirebaseApp references storage, so storage needs to be on classpath when dokka runs.
-    javadocClasspath project(path: ':firebase-storage')
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
-
-    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.6'
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
-
-    // needed for Kotlin detection to compile, but not necessarily present at runtime.
-    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-
-    testImplementation 'androidx.test:runner:1.2.0'
-    testImplementation 'androidx.test.ext:junit:1.1.1'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'org.json:json:20210307'
-
-    annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
-
-    androidTestImplementation project(':integ-testing')
-    androidTestImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.25.0'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.25.0'
-}
diff --git a/firebase-common/firebase-common.gradle.kts b/firebase-common/firebase-common.gradle.kts
new file mode 100644
index 00000000000..7edddf14d16
--- /dev/null
+++ b/firebase-common/firebase-common.gradle.kts
@@ -0,0 +1,99 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+    id("firebase-library")
+    id("kotlin-android")
+}
+
+firebaseLibrary {
+    libraryGroup("common")
+    testLab.enabled = true
+    publishSources = true
+}
+
+android {
+  val compileSdkVersion : Int by rootProject
+  val targetSdkVersion : Int by rootProject
+  val minSdkVersion : Int by rootProject
+
+  compileSdk = compileSdkVersion
+  namespace = "com.google.firebase"
+  defaultConfig {
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+    multiDexEnabled = true
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    consumerProguardFiles("proguard.txt")
+  }
+  sourceSets {
+    getByName("androidTest") {
+      java.srcDirs("src/testUtil")
+    }
+    getByName("test") {
+      java.srcDirs("src/testUtil")
+    }
+  }
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+  testOptions.unitTests.isIncludeAndroidResources = true
+}
+
+dependencies {
+    api(libs.kotlin.coroutines.tasks)
+
+    api("com.google.firebase:firebase-components:18.0.0")
+    api("com.google.firebase:firebase-annotations:16.2.0")
+    implementation(libs.androidx.annotation)
+    implementation(libs.androidx.futures)
+    implementation(libs.kotlin.stdlib)
+    implementation(libs.playservices.basement)
+    implementation(libs.playservices.tasks)
+
+    compileOnly(libs.autovalue.annotations)
+    compileOnly(libs.findbugs.jsr305)
+    compileOnly(libs.kotlin.stdlib)
+
+    annotationProcessor(libs.autovalue)
+
+    testImplementation("com.google.guava:guava-testlib:12.0-rc2")
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.androidx.test.junit)
+    testImplementation(libs.androidx.test.runner)
+    testImplementation(libs.junit)
+    testImplementation(libs.kotlin.coroutines.test)
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.org.json)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.truth)
+
+    androidTestImplementation(project(":integ-testing")) {
+        exclude("com.google.firebase","firebase-common")
+        exclude("com.google.firebase","firebase-common-ktx")
+    }
+
+    // TODO(Remove when FirbaseAppTest has been modernized to use LiveData)
+    androidTestImplementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0")
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.junit)
+    androidTestImplementation(libs.mockito.core)
+    androidTestImplementation(libs.mockito.dexmaker)
+    androidTestImplementation(libs.truth)
+}
diff --git a/firebase-common/gradle.properties b/firebase-common/gradle.properties
index a9977180ef7..bcbe3b92199 100644
--- a/firebase-common/gradle.properties
+++ b/firebase-common/gradle.properties
@@ -1,3 +1,3 @@
-version=20.0.1
-latestReleasedVersion=20.0.0
+version=21.0.0
+latestReleasedVersion=20.4.3
 android.enableUnitTestBinaryResources=true
diff --git a/firebase-common/ktx/api.txt b/firebase-common/ktx/api.txt
index a55220fdc87..13900ee70e6 100644
--- a/firebase-common/ktx/api.txt
+++ b/firebase-common/ktx/api.txt
@@ -1,18 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.ktx {
 
-  public final class Firebase {
-    field public static final com.google.firebase.ktx.Firebase INSTANCE;
-  }
-
-  public final class FirebaseKt {
-    ctor public FirebaseKt();
-    method @NonNull public static com.google.firebase.FirebaseApp app(@NonNull com.google.firebase.ktx.Firebase, @NonNull String name);
-    method @NonNull public static com.google.firebase.FirebaseApp getApp(@NonNull com.google.firebase.ktx.Firebase);
-    method @NonNull public static com.google.firebase.FirebaseOptions getOptions(@NonNull com.google.firebase.ktx.Firebase);
-    method @Nullable public static com.google.firebase.FirebaseApp initialize(@NonNull com.google.firebase.ktx.Firebase, @NonNull android.content.Context context);
-    method @NonNull public static com.google.firebase.FirebaseApp initialize(@NonNull com.google.firebase.ktx.Firebase, @NonNull android.content.Context context, @NonNull com.google.firebase.FirebaseOptions options);
-    method @NonNull public static com.google.firebase.FirebaseApp initialize(@NonNull com.google.firebase.ktx.Firebase, @NonNull android.content.Context context, @NonNull com.google.firebase.FirebaseOptions options, @NonNull String name);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-common/ktx/ktx.gradle b/firebase-common/ktx/ktx.gradle
deleted file mode 100644
index 37c8f915149..00000000000
--- a/firebase-common/ktx/ktx.gradle
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-plugins {
-    id 'firebase-library'
-    id 'kotlin-android'
-}
-
-firebaseLibrary {
-    releaseWith project(':firebase-common')
-}
-
-android {
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-        minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
-        versionName version
-    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-        test.java.srcDirs += 'src/test/kotlin'
-    }
-    testOptions.unitTests.includeAndroidResources = true
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation 'androidx.annotation:annotation:1.1.0'
-
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
-}
diff --git a/firebase-common/ktx/ktx.gradle.kts b/firebase-common/ktx/ktx.gradle.kts
new file mode 100644
index 00000000000..67a8d1ab74e
--- /dev/null
+++ b/firebase-common/ktx/ktx.gradle.kts
@@ -0,0 +1,59 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+    id("firebase-library")
+    id("kotlin-android")
+}
+
+firebaseLibrary {
+    libraryGroup("common")
+    publishJavadoc = false
+    publishReleaseNotes = false
+}
+
+android {
+    val compileSdkVersion : Int by rootProject
+    val targetSdkVersion : Int by rootProject
+    val minSdkVersion : Int by rootProject
+    compileSdk = compileSdkVersion
+    namespace = "com.google.firebase.ktx"
+    defaultConfig {
+        minSdk = minSdkVersion
+        targetSdk = targetSdkVersion
+    }
+    sourceSets {
+        getByName("main") {
+            java.srcDirs("src/main/kotlin")
+        }
+        getByName("test") {
+            java.srcDirs("src/test/kotlin")
+        }
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    testOptions.unitTests.isIncludeAndroidResources = true
+}
+
+dependencies {
+    api(project(":firebase-common"))
+    implementation("com.google.firebase:firebase-components:18.0.0")
+    implementation("com.google.firebase:firebase-annotations:16.2.0")
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.junit)
+    testImplementation(libs.kotlin.coroutines.test)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.truth)
+}
diff --git a/firebase-common/ktx/src/main/AndroidManifest.xml b/firebase-common/ktx/src/main/AndroidManifest.xml
index 7a95620e51b..4e04e3fece4 100644
--- a/firebase-common/ktx/src/main/AndroidManifest.xml
+++ b/firebase-common/ktx/src/main/AndroidManifest.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar"
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
diff --git a/firebase-common/ktx/src/main/kotlin/com/google/firebase/ktx/Firebase.kt b/firebase-common/ktx/src/main/kotlin/com/google/firebase/ktx/Firebase.kt
deleted file mode 100644
index f939f218f0f..00000000000
--- a/firebase-common/ktx/src/main/kotlin/com/google/firebase/ktx/Firebase.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.ktx
-
-import android.content.Context
-import androidx.annotation.Keep
-import com.google.firebase.FirebaseApp
-import com.google.firebase.FirebaseOptions
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.platforminfo.LibraryVersionComponent
-
-/**
- * Single access point to all firebase SDKs from Kotlin.
- *
- * <p>Acts as a target for extension methods provided by sdks.
- */
-object Firebase
-
-/** Returns the default firebase app instance. */
-val Firebase.app: FirebaseApp
-    get() = FirebaseApp.getInstance()
-
-/** Returns a named firebase app instance. */
-fun Firebase.app(name: String): FirebaseApp = FirebaseApp.getInstance(name)
-
-/** Initializes and returns a FirebaseApp. */
-fun Firebase.initialize(context: Context): FirebaseApp? = FirebaseApp.initializeApp(context)
-
-/** Initializes and returns a FirebaseApp. */
-fun Firebase.initialize(context: Context, options: FirebaseOptions): FirebaseApp =
-        FirebaseApp.initializeApp(context, options)
-
-/** Initializes and returns a FirebaseApp. */
-fun Firebase.initialize(context: Context, options: FirebaseOptions, name: String): FirebaseApp =
-        FirebaseApp.initializeApp(context, options, name)
-
-/** Returns options of default FirebaseApp */
-val Firebase.options: FirebaseOptions
-    get() = Firebase.app.options
-
-internal const val LIBRARY_NAME: String = "fire-core-ktx"
-
-/** @suppress */
-@Keep
-class FirebaseCommonKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> {
-        return listOf(
-                LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-    }
-}
diff --git a/firebase-common/ktx/src/main/kotlin/com/google/firebase/ktx/Logging.kt b/firebase-common/ktx/src/main/kotlin/com/google/firebase/ktx/Logging.kt
new file mode 100644
index 00000000000..5ba2cf4d54c
--- /dev/null
+++ b/firebase-common/ktx/src/main/kotlin/com/google/firebase/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.BuildConfig
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-core-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseCommonLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-common/ktx/src/test/kotlin/com/google/firebase/ktx/Tests.kt b/firebase-common/ktx/src/test/kotlin/com/google/firebase/ktx/Tests.kt
index 62a2d757169..bc3eeb54cd5 100644
--- a/firebase-common/ktx/src/test/kotlin/com/google/firebase/ktx/Tests.kt
+++ b/firebase-common/ktx/src/test/kotlin/com/google/firebase/ktx/Tests.kt
@@ -1,103 +1,144 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.ktx
 
 import androidx.test.core.app.ApplicationProvider
+import com.google.android.gms.tasks.Tasks
 import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
 import com.google.firebase.FirebaseOptions
 import com.google.firebase.platforminfo.UserAgentPublisher
+import kotlinx.coroutines.tasks.await
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.fail
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 fun withApp(name: String, block: FirebaseApp.() -> Unit) {
-    val app = Firebase.initialize(ApplicationProvider.getApplicationContext(),
-            FirebaseOptions.Builder()
-                    .setApplicationId("appId")
-                    .build(),
-            name)
-    try {
-        block(app)
-    } finally {
-        app.delete()
-    }
+  val app =
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder().setApplicationId("appId").build(),
+      name
+    )
+  try {
+    block(app)
+  } finally {
+    app.delete()
+  }
 }
 
+class TestException(message: String) : Exception(message)
+
 @RunWith(RobolectricTestRunner::class)
 class VersionTests {
-    @Test
-    fun libraryVersions_shouldBeRegisteredWithRuntime() {
-        withApp("ktxTestApp") {
-            val uaPublisher = get(UserAgentPublisher::class.java)
-            assertThat(uaPublisher.userAgent).contains("kotlin")
-            assertThat(uaPublisher.userAgent).contains(LIBRARY_NAME)
-        }
+  @Test
+  fun libraryVersions_shouldBeRegisteredWithRuntime() {
+    withApp("ktxTestApp") {
+      val uaPublisher = get(UserAgentPublisher::class.java)
+      assertThat(uaPublisher.userAgent).contains("kotlin")
+      assertThat(uaPublisher.userAgent).contains(LIBRARY_NAME)
     }
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class KtxTests {
-    @Test
-    fun `Firebase#app should delegate to FirebaseApp#getInstance()`() {
-        withApp(FirebaseApp.DEFAULT_APP_NAME) {
-            assertThat(Firebase.app).isSameInstanceAs(FirebaseApp.getInstance())
-        }
+  @Test
+  fun `Firebase#app should delegate to FirebaseApp#getInstance()`() {
+    withApp(FirebaseApp.DEFAULT_APP_NAME) {
+      assertThat(Firebase.app).isSameInstanceAs(FirebaseApp.getInstance())
     }
+  }
 
-    @Test
-    fun `Firebase#app(String) should delegate to FirebaseApp#getInstance(String)`() {
-        val appName = "testApp"
-        withApp(appName) {
-            assertThat(Firebase.app(appName)).isSameInstanceAs(FirebaseApp.getInstance(appName))
-        }
+  @Test
+  fun `Firebase#app(String) should delegate to FirebaseApp#getInstance(String)`() {
+    val appName = "testApp"
+    withApp(appName) {
+      assertThat(Firebase.app(appName)).isSameInstanceAs(FirebaseApp.getInstance(appName))
     }
+  }
 
-    @Test
-    fun `Firebase#options should delegate to FirebaseApp#getInstance()#options`() {
-        withApp(FirebaseApp.DEFAULT_APP_NAME) {
-            assertThat(Firebase.options).isSameInstanceAs(FirebaseApp.getInstance().options)
-        }
+  @Test
+  fun `Firebase#options should delegate to FirebaseApp#getInstance()#options`() {
+    withApp(FirebaseApp.DEFAULT_APP_NAME) {
+      assertThat(Firebase.options).isSameInstanceAs(FirebaseApp.getInstance().options)
     }
+  }
 
-    @Test
-    fun `Firebase#initialize(Context, FirebaseOptions) should initialize the app correctly`() {
-        val options = FirebaseOptions.Builder().setApplicationId("appId").build()
-        val app = Firebase.initialize(ApplicationProvider.getApplicationContext(), options)
-        try {
-            assertThat(app).isNotNull()
-            assertThat(app.name).isEqualTo(FirebaseApp.DEFAULT_APP_NAME)
-            assertThat(app.options).isSameInstanceAs(options)
-            assertThat(app.applicationContext).isSameInstanceAs(ApplicationProvider.getApplicationContext())
-        } finally {
-            app.delete()
-        }
+  @Test
+  fun `Firebase#initialize(Context, FirebaseOptions) should initialize the app correctly`() {
+    val options = FirebaseOptions.Builder().setApplicationId("appId").build()
+    val app = Firebase.initialize(ApplicationProvider.getApplicationContext(), options)
+    try {
+      assertThat(app).isNotNull()
+      assertThat(app.name).isEqualTo(FirebaseApp.DEFAULT_APP_NAME)
+      assertThat(app.options).isSameInstanceAs(options)
+      assertThat(app.applicationContext)
+        .isSameInstanceAs(ApplicationProvider.getApplicationContext())
+    } finally {
+      app.delete()
     }
+  }
 
-    @Test
-    fun `Firebase#initialize(Context, FirebaseOptions, String) should initialize the app correctly`() {
-        val options = FirebaseOptions.Builder().setApplicationId("appId").build()
-        val name = "appName"
-        val app = Firebase.initialize(ApplicationProvider.getApplicationContext(), options, name)
-        try {
-            assertThat(app).isNotNull()
-            assertThat(app.name).isEqualTo(name)
-            assertThat(app.options).isSameInstanceAs(options)
-            assertThat(app.applicationContext).isSameInstanceAs(ApplicationProvider.getApplicationContext())
-        } finally {
-            app.delete()
-        }
+  @Test
+  fun `Firebase#initialize(Context, FirebaseOptions, String) should initialize the app correctly`() {
+    val options = FirebaseOptions.Builder().setApplicationId("appId").build()
+    val name = "appName"
+    val app = Firebase.initialize(ApplicationProvider.getApplicationContext(), options, name)
+    try {
+      assertThat(app).isNotNull()
+      assertThat(app.name).isEqualTo(name)
+      assertThat(app.options).isSameInstanceAs(options)
+      assertThat(app.applicationContext)
+        .isSameInstanceAs(ApplicationProvider.getApplicationContext())
+    } finally {
+      app.delete()
+    }
+  }
+}
+
+class CoroutinesPlayServicesTests {
+  // We are only interested in the await() function offered by kotlinx-coroutines-play-services
+  // So we're not testing the other functions provided by that library.
+
+  @Test
+  fun `Task#await() resolves to the same result as Task#getResult()`() = runTest {
+    val task = Tasks.forResult(21)
+
+    val expected = task.result
+    val actual = task.await()
+
+    assertThat(actual).isEqualTo(expected)
+    assertThat(task.isSuccessful).isTrue()
+    assertThat(task.exception).isNull()
+  }
+
+  @Test
+  fun `Task#await() throws an Exception for failing Tasks`() = runTest {
+    val task = Tasks.forException<TestException>(TestException("some error happened"))
+
+    try {
+      task.await()
+      fail("Task#await should throw an Exception")
+    } catch (e: Exception) {
+      assertThat(e).isInstanceOf(TestException::class.java)
+      assertThat(task.isSuccessful).isFalse()
     }
+  }
 }
diff --git a/firebase-common/lint-baseline.xml b/firebase-common/lint-baseline.xml
deleted file mode 100644
index ea62ca50d4b..00000000000
--- a/firebase-common/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.4.1" client="gradle" variant="all" version="3.4.1">
-
-</issues>
diff --git a/firebase-common/src/androidTest/AndroidManifest.xml b/firebase-common/src/androidTest/AndroidManifest.xml
index 6cfaea3f8f8..264d974634b 100644
--- a/firebase-common/src/androidTest/AndroidManifest.xml
+++ b/firebase-common/src/androidTest/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.firebase.test">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-sdk android:minSdkVersion="16" tools:overrideLibrary="com.google.firebase.auth"/>
+    <uses-sdk android:minSdkVersion="21" tools:overrideLibrary="com.google.firebase.auth"/>
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService"
             android:exported="false">
diff --git a/firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java b/firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java
index ac968fd4645..f24a56c74c5 100644
--- a/firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java
+++ b/firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java
@@ -143,7 +143,7 @@ public void testInitializeApp_shouldPublishVersionForFirebaseCommon() {
     // After sorting the user agents are expected to be {"fire-android/", "fire-auth/x.y.z",
     // "fire-core/x.y.z", "test-component/1.2.3"}
     assertThat(actualUserAgent[0]).contains("android-installer");
-    assertThat(actualUserAgent[1]).contains("android-min-sdk/14");
+    assertThat(actualUserAgent[1]).contains("android-min-sdk/21");
     assertThat(actualUserAgent[2]).contains("android-platform");
     assertThat(actualUserAgent[3]).contains("android-target-sdk");
     assertThat(actualUserAgent[4]).contains("device-brand");
@@ -398,7 +398,7 @@ public void testDirectBoot_shouldPreserveDataCollectionAfterUnlock() {
 
     isUserUnlocked.set(false);
     FirebaseApp firebaseApp = FirebaseApp.initializeApp(mockContext);
-    assert (firebaseApp != null);
+    assertThat(firebaseApp).isNotNull();
     firebaseApp.setDataCollectionDefaultEnabled(false);
     assertFalse(firebaseApp.isDataCollectionDefaultEnabled());
     // User unlocks the device.
diff --git a/firebase-common/src/main/AndroidManifest.xml b/firebase-common/src/main/AndroidManifest.xml
index cf06353f610..0aac7efbc4b 100644
--- a/firebase-common/src/main/AndroidManifest.xml
+++ b/firebase-common/src/main/AndroidManifest.xml
@@ -14,10 +14,9 @@
 <!-- limitations under the License. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.firebase">
+    xmlns:tools="http://schemas.android.com/tools">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
 
         <provider
@@ -30,6 +29,6 @@
             android:name="com.google.firebase.components.ComponentDiscoveryService"
             android:directBootAware="true"
             android:exported="false"
-            tools:targetApi="n" />
+            tools:targetApi="n" > <meta-data android:name="com.google.firebase.components:com.google.firebase.FirebaseCommonKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/> </service>
     </application>
 </manifest>
diff --git a/firebase-common/src/main/java/com/google/firebase/Firebase.kt b/firebase-common/src/main/java/com/google/firebase/Firebase.kt
new file mode 100644
index 00000000000..ae98601916a
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/Firebase.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase
+
+import android.content.Context
+import androidx.annotation.Keep
+import com.google.firebase.annotations.concurrent.Background
+import com.google.firebase.annotations.concurrent.Blocking
+import com.google.firebase.annotations.concurrent.Lightweight
+import com.google.firebase.annotations.concurrent.UiThread
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.components.Dependency
+import com.google.firebase.components.Qualified
+import java.util.concurrent.Executor
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.asCoroutineDispatcher
+
+/**
+ * Single access point to all firebase SDKs from Kotlin.
+ *
+ * <p>Acts as a target for extension methods provided by sdks.
+ */
+object Firebase
+
+/** Returns the default firebase app instance. */
+val Firebase.app: FirebaseApp
+  get() = FirebaseApp.getInstance()
+
+/** Returns a named firebase app instance. */
+fun Firebase.app(name: String): FirebaseApp = FirebaseApp.getInstance(name)
+
+/** Initializes and returns a FirebaseApp. */
+fun Firebase.initialize(context: Context): FirebaseApp? = FirebaseApp.initializeApp(context)
+
+/** Initializes and returns a FirebaseApp. */
+fun Firebase.initialize(context: Context, options: FirebaseOptions): FirebaseApp =
+  FirebaseApp.initializeApp(context, options)
+
+/** Initializes and returns a FirebaseApp. */
+fun Firebase.initialize(context: Context, options: FirebaseOptions, name: String): FirebaseApp =
+  FirebaseApp.initializeApp(context, options, name)
+
+/** Returns options of default FirebaseApp */
+val Firebase.options: FirebaseOptions
+  get() = Firebase.app.options
+
+/** @suppress */
+@Keep
+class FirebaseCommonKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(
+      coroutineDispatcher<Background>(),
+      coroutineDispatcher<Lightweight>(),
+      coroutineDispatcher<Blocking>(),
+      coroutineDispatcher<UiThread>()
+    )
+  }
+}
+
+private inline fun <reified T : Annotation> coroutineDispatcher(): Component<CoroutineDispatcher> =
+  Component.builder(Qualified.qualified(T::class.java, CoroutineDispatcher::class.java))
+    .add(Dependency.required(Qualified.qualified(T::class.java, Executor::class.java)))
+    .factory { c ->
+      c.get(Qualified.qualified(T::class.java, Executor::class.java)).asCoroutineDispatcher()
+    }
+    .build()
diff --git a/firebase-common/src/main/java/com/google/firebase/FirebaseApp.java b/firebase-common/src/main/java/com/google/firebase/FirebaseApp.java
index 47a87e8e838..75063296f19 100644
--- a/firebase-common/src/main/java/com/google/firebase/FirebaseApp.java
+++ b/firebase-common/src/main/java/com/google/firebase/FirebaseApp.java
@@ -23,10 +23,9 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
+import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
@@ -46,28 +45,30 @@
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.ComponentRuntime;
 import com.google.firebase.components.Lazy;
+import com.google.firebase.concurrent.ExecutorsRegistrar;
 import com.google.firebase.events.Publisher;
 import com.google.firebase.heartbeatinfo.DefaultHeartBeatController;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.internal.DataCollectionConfigStorage;
+import com.google.firebase.provider.FirebaseInitProvider;
+import com.google.firebase.tracing.ComponentMonitor;
+import com.google.firebase.tracing.FirebaseTrace;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.concurrent.GuardedBy;
 
 /**
  * The entry point of Firebase SDKs. It holds common configuration and state for Firebase APIs. Most
  * applications don't need to directly interact with FirebaseApp.
  *
- * <p>For a vast majority of apps, {@link com.google.firebase.provider.FirebaseInitProvider} will
- * handle the initialization of Firebase for the default project that it's configured to work with,
- * via the data contained in the app's <code>google-services.json</code> file. This <code>
+ * <p>For a vast majority of apps, {@link FirebaseInitProvider} will handle the initialization of
+ * Firebase for the default project that it's configured to work with, via the data contained in the
+ * app's <code>google-services.json</code> file. This <code>
  * ContentProvider</code> is merged into the app's manifest by default when building with Gradle,
  * and it runs automatically at app launch. <strong>No additional lines of code are needed in this
  * case.</strong>
@@ -79,8 +80,8 @@
  * returned by {@link FirebaseApp#getInstance(String)}, passing it the same name used with <code>
  * initializeApp</code>. This object must be passed to the static accessor of the feature that
  * provides the resource. For example, {@link
- * com.google.firebase.storage.FirebaseStorage#getInstance(FirebaseApp)} is used to access the
- * storage bucket provided by the additional project, whereas {@link
+ * com.google.firebase.storage.FirebaseStorage#getInstance(FirebaseApp)getInstance(FirebaseApp)} is
+ * used to access the storage bucket provided by the additional project, whereas {@link
  * com.google.firebase.storage.FirebaseStorage#getInstance()} is used to access the default project.
  *
  * <p>Any <code>FirebaseApp</code> initialization must occur only in the main process of the app.
@@ -95,16 +96,10 @@ public class FirebaseApp {
 
   private static final Object LOCK = new Object();
 
-  private static final Executor UI_EXECUTOR = new UiExecutor();
-
   /** A map of (name, FirebaseApp) instances. */
   @GuardedBy("LOCK")
   static final Map<String, FirebaseApp> INSTANCES = new ArrayMap<>();
 
-  private static final String FIREBASE_ANDROID = "fire-android";
-  private static final String FIREBASE_COMMON = "fire-core";
-  private static final String KOTLIN = "kotlin";
-
   private final Context applicationContext;
   private final String name;
   private final FirebaseOptions options;
@@ -185,6 +180,7 @@ public static FirebaseApp getInstance() {
                 + ". Make sure to call "
                 + "FirebaseApp.initializeApp(Context) first.");
       }
+      defaultApp.defaultHeartBeatController.get().registerHeartBeat();
       return defaultApp;
     }
   }
@@ -224,9 +220,8 @@ public static FirebaseApp getInstance(@NonNull String name) {
    * Initializes the default FirebaseApp instance using string resource values - populated from
    * google-services.json. It also initializes Firebase Analytics for the current process.
    *
-   * <p>This method is called at app startup time by {@link
-   * com.google.firebase.provider.FirebaseInitProvider}. Call this method before any Firebase APIs
-   * in components outside the main process.
+   * <p>This method is called at app startup time by {@link FirebaseInitProvider}. Call this method
+   * before any Firebase APIs in components outside the main process.
    *
    * <p>The {@link FirebaseOptions} values used by the default app instance are read from string
    * resources.
@@ -260,8 +255,8 @@ public static FirebaseApp initializeApp(@NonNull Context context) {
    * FirebaseOptions, String)}, but it uses {@link #DEFAULT_APP_NAME} as name.
    *
    * <p>It's only required to call this to initialize Firebase if it's <strong>not possible</strong>
-   * to do so automatically in {@link com.google.firebase.provider.FirebaseInitProvider}. Automatic
-   * initialization that way is the expected situation.
+   * to do so automatically in {@link FirebaseInitProvider}. Automatic initialization that way is
+   * the expected situation.
    */
   @NonNull
   public static FirebaseApp initializeApp(
@@ -414,19 +409,35 @@ protected FirebaseApp(Context applicationContext, String name, FirebaseOptions o
     this.applicationContext = Preconditions.checkNotNull(applicationContext);
     this.name = Preconditions.checkNotEmpty(name);
     this.options = Preconditions.checkNotNull(options);
+    StartupTime startupTime = FirebaseInitProvider.getStartupTime();
 
+    FirebaseTrace.pushTrace("Firebase");
+
+    FirebaseTrace.pushTrace("ComponentDiscovery");
     List<Provider<ComponentRegistrar>> registrars =
         ComponentDiscovery.forContext(applicationContext, ComponentDiscoveryService.class)
             .discoverLazy();
+    FirebaseTrace.popTrace(); // ComponentDiscovery
 
-    componentRuntime =
-        ComponentRuntime.builder(UI_EXECUTOR)
+    FirebaseTrace.pushTrace("Runtime");
+    ComponentRuntime.Builder builder =
+        ComponentRuntime.builder(com.google.firebase.concurrent.UiExecutor.INSTANCE)
             .addLazyComponentRegistrars(registrars)
             .addComponentRegistrar(new FirebaseCommonRegistrar())
+            .addComponentRegistrar(new ExecutorsRegistrar())
             .addComponent(Component.of(applicationContext, Context.class))
             .addComponent(Component.of(this, FirebaseApp.class))
             .addComponent(Component.of(options, FirebaseOptions.class))
-            .build();
+            .setProcessor(new ComponentMonitor());
+
+    // Don't provide StartupTime in direct boot mode or if Firebase was manually started
+    if (UserManagerCompat.isUserUnlocked(applicationContext)
+        && FirebaseInitProvider.isCurrentlyInitializing()) {
+      builder.addComponent(Component.of(startupTime, StartupTime.class));
+    }
+
+    componentRuntime = builder.build();
+    FirebaseTrace.popTrace(); // Runtime
 
     dataCollectionConfigStorage =
         new Lazy<>(
@@ -443,6 +454,8 @@ protected FirebaseApp(Context applicationContext, String name, FirebaseOptions o
             defaultHeartBeatController.get().registerHeartBeat();
           }
         });
+
+    FirebaseTrace.popTrace(); // Firebase
   }
 
   private void checkNotDeleted() {
@@ -701,14 +714,4 @@ public void onBackgroundStateChanged(boolean background) {
       }
     }
   }
-
-  private static class UiExecutor implements Executor {
-
-    private static final Handler HANDLER = new Handler(Looper.getMainLooper());
-
-    @Override
-    public void execute(@NonNull Runnable command) {
-      HANDLER.post(command);
-    }
-  }
 }
diff --git a/firebase-common/src/main/java/com/google/firebase/FirebaseOptions.java b/firebase-common/src/main/java/com/google/firebase/FirebaseOptions.java
index 3d35bbce356..2091670cfff 100644
--- a/firebase-common/src/main/java/com/google/firebase/FirebaseOptions.java
+++ b/firebase-common/src/main/java/com/google/firebase/FirebaseOptions.java
@@ -147,7 +147,7 @@ private FirebaseOptions(
   }
 
   /**
-   * Creates a new {@link FirebaseOptions} instance that is populated from string resouces.
+   * Creates a new {@link FirebaseOptions} instance that is populated from string resources.
    *
    * @return The populated options or null if applicationId is missing from resources.
    */
diff --git a/firebase-common/src/main/java/com/google/firebase/StartupTime.java b/firebase-common/src/main/java/com/google/firebase/StartupTime.java
new file mode 100644
index 00000000000..972b0ed3c2c
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/StartupTime.java
@@ -0,0 +1,56 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase;
+
+import android.os.SystemClock;
+import androidx.annotation.NonNull;
+import com.google.auto.value.AutoValue;
+
+/**
+ * Represents Firebase's startup time in several timing methods. Represented in unix time/epoch
+ * milliseconds milliseconds since boot, and uptime milliseconds. The absence of a StartupTime
+ * indicates an unreliable or misleading time, such as a launch in direct boot mode. Because of
+ * this, StartupTime cannot be guaranteed to be present, and instead should be optionally depended
+ * on, and its absence handled.
+ *
+ * @hide
+ */
+@AutoValue
+public abstract class StartupTime {
+
+  /** @return The epoch time that Firebase began initializing, in milliseconds */
+  public abstract long getEpochMillis();
+
+  /** @return The number of milliseconds from boot to when Firebase began initializing */
+  public abstract long getElapsedRealtime();
+
+  /** @return The number of milliseconds of uptime measured by SystemClock.uptimeMillis() */
+  public abstract long getUptimeMillis();
+
+  /**
+   * @param epochMillis Time in milliseconds since epoch
+   * @param elapsedRealtime Time in milliseconds since boot
+   */
+  public static @NonNull StartupTime create(
+      long epochMillis, long elapsedRealtime, long uptimeMillis) {
+    return new AutoValue_StartupTime(epochMillis, elapsedRealtime, uptimeMillis);
+  }
+
+  /** @return A StartupTime represented by the current epoch time and JVM nano time */
+  public static @NonNull StartupTime now() {
+    return create(
+        System.currentTimeMillis(), SystemClock.elapsedRealtime(), SystemClock.uptimeMillis());
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/Timestamp.kt b/firebase-common/src/main/java/com/google/firebase/Timestamp.kt
new file mode 100644
index 00000000000..d4b974c4855
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/Timestamp.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase
+
+import android.os.Build
+import android.os.Parcel
+import android.os.Parcelable
+import androidx.annotation.RequiresApi
+import java.time.Instant
+import java.util.Date
+
+/**
+ * A Timestamp represents a point in time independent of any time zone or calendar.
+ *
+ * Represented as seconds and fractions of seconds at nanosecond resolution in UTC Epoch time. It is
+ * encoded using the Proleptic Gregorian Calendar which extends the Gregorian calendar backwards to
+ * year one. Furthermore,It is encoded assuming all minutes are 60 seconds long, specifically leap
+ * seconds are "smeared" so that no leap second table is needed for interpretation. Range is from
+ * 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By restricting to that range, we ensure
+ * that we can convert to and from RFC 3339 date strings.
+ *
+ * @see <a href="https://git.page.link/timestamp-proto">Timestamp</a>The ref timestamp definition
+ */
+class Timestamp : Comparable<Timestamp>, Parcelable {
+  val seconds: Long
+  val nanoseconds: Int
+
+  /**
+   * Creates a new [Timestamp].
+   *
+   * @param seconds represents seconds of UTC time since Unix epoch 1970-01-01T00:00:00Z. Must be
+   * from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive.
+   * @param nanoseconds represents non-negative fractions of a second at nanosecond resolution.
+   * Negative second values with fractions must still have non-negative nanoseconds values that
+   * count forward in time. Must be from 0 to 999,999,999 inclusive.
+   */
+  constructor(seconds: Long, nanoseconds: Int) {
+    validateRange(seconds, nanoseconds)
+
+    this.seconds = seconds
+    this.nanoseconds = nanoseconds
+  }
+
+  constructor(date: Date) {
+    val (seconds, nanoseconds) = date.toPreciseTime()
+
+    validateRange(seconds, nanoseconds)
+
+    this.seconds = seconds
+    this.nanoseconds = nanoseconds
+  }
+
+  @RequiresApi(Build.VERSION_CODES.O) constructor(time: Instant) : this(time.epochSecond, time.nano)
+
+  /**
+   * Returns a new [Date] corresponding to this timestamp.
+   *
+   * This may lose precision.
+   */
+  fun toDate(): Date = Date(seconds * 1_000 + (nanoseconds / 1_000_000))
+
+  /** Returns a new [Instant] that matches the time defined by this timestamp. */
+  @RequiresApi(Build.VERSION_CODES.O)
+  fun toInstant(): Instant = Instant.ofEpochSecond(seconds, nanoseconds.toLong())
+
+  override fun compareTo(other: Timestamp): Int =
+    compareValuesBy(this, other, Timestamp::seconds, Timestamp::nanoseconds)
+
+  override fun equals(other: Any?): Boolean =
+    other === this || other is Timestamp && compareTo(other) == 0
+
+  override fun hashCode(): Int {
+    val prime = 37
+    val initialHash = prime * seconds.toInt()
+    val withHighOrderBits = prime * initialHash + seconds.shr(32).toInt()
+
+    return prime * withHighOrderBits + nanoseconds
+  }
+
+  override fun toString(): String = "Timestamp(seconds=$seconds, nanoseconds=$nanoseconds)"
+
+  override fun describeContents(): Int = 0
+
+  override fun writeToParcel(dest: Parcel, flags: Int) {
+    dest.writeLong(seconds)
+    dest.writeInt(nanoseconds)
+  }
+
+  companion object {
+    @JvmField
+    val CREATOR =
+      object : Parcelable.Creator<Timestamp> {
+        override fun createFromParcel(source: Parcel): Timestamp =
+          Timestamp(source.readLong(), source.readInt())
+        override fun newArray(size: Int): Array<Timestamp?> = arrayOfNulls(size)
+      }
+
+    @JvmStatic fun now() = Timestamp(Date())
+
+    private fun Date.toPreciseTime(): Pair<Long, Int> {
+      val seconds = time / 1_000
+      val nanoseconds = ((time % 1_000) * 1_000_000).toInt()
+
+      if (nanoseconds < 0) return (seconds - 1) to (nanoseconds + 1_000_000_000)
+
+      return seconds to nanoseconds
+    }
+
+    /**
+     * Ensures that the date and time are within what we consider valid ranges.
+     *
+     * More specifically, the nanoseconds need to be less than 1 billion- otherwise it would trip
+     * over into seconds, and need to be greater than zero.
+     *
+     * The seconds need to be after the date `1/1/1` and before the date `1/1/10000`.
+     *
+     * @throws IllegalArgumentException if the date and time are considered invalid
+     */
+    private fun validateRange(seconds: Long, nanoseconds: Int) {
+      require(nanoseconds in 0 until 1_000_000_000) {
+        "Timestamp nanoseconds out of range: $nanoseconds"
+      }
+
+      require(seconds in -62_135_596_800 until 253_402_300_800) {
+        "Timestamp seconds out of range: $seconds"
+      }
+    }
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/CustomThreadFactory.java b/firebase-common/src/main/java/com/google/firebase/concurrent/CustomThreadFactory.java
new file mode 100644
index 00000000000..417435c2abf
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/CustomThreadFactory.java
@@ -0,0 +1,53 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import android.os.Process;
+import android.os.StrictMode;
+import java.util.Locale;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicLong;
+import javax.annotation.Nullable;
+
+class CustomThreadFactory implements ThreadFactory {
+  private static final ThreadFactory DEFAULT = Executors.defaultThreadFactory();
+  private final AtomicLong threadCount = new AtomicLong();
+  private final String namePrefix;
+  private final int priority;
+  private final StrictMode.ThreadPolicy policy;
+
+  CustomThreadFactory(String namePrefix, int priority, @Nullable StrictMode.ThreadPolicy policy) {
+    this.namePrefix = namePrefix;
+    this.priority = priority;
+    this.policy = policy;
+  }
+
+  @Override
+  public Thread newThread(Runnable r) {
+    Thread thread =
+        DEFAULT.newThread(
+            () -> {
+              Process.setThreadPriority(priority);
+              if (policy != null) {
+                StrictMode.setThreadPolicy(policy);
+              }
+              r.run();
+            });
+    thread.setName(
+        String.format(Locale.ROOT, "%s Thread #%d", namePrefix, threadCount.getAndIncrement()));
+    return thread;
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/DelegatingScheduledExecutorService.java b/firebase-common/src/main/java/com/google/firebase/concurrent/DelegatingScheduledExecutorService.java
new file mode 100644
index 00000000000..62d461551c5
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/DelegatingScheduledExecutorService.java
@@ -0,0 +1,186 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+class DelegatingScheduledExecutorService implements ScheduledExecutorService {
+  private final ExecutorService delegate;
+  private final ScheduledExecutorService scheduler;
+
+  DelegatingScheduledExecutorService(ExecutorService delegate, ScheduledExecutorService scheduler) {
+    this.delegate = delegate;
+    this.scheduler = scheduler;
+  }
+
+  @Override
+  public void shutdown() {
+    throw new UnsupportedOperationException("Shutting down is not allowed.");
+  }
+
+  @Override
+  public List<Runnable> shutdownNow() {
+    throw new UnsupportedOperationException("Shutting down is not allowed.");
+  }
+
+  @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> Future<T> submit(Callable<T> task) {
+    return delegate.submit(task);
+  }
+
+  @Override
+  public <T> Future<T> submit(Runnable task, T result) {
+    return delegate.submit(task, result);
+  }
+
+  @Override
+  public Future<?> submit(Runnable task) {
+    return delegate.submit(task);
+  }
+
+  @Override
+  public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
+      throws InterruptedException {
+    return delegate.invokeAll(tasks);
+  }
+
+  @Override
+  public <T> List<Future<T>> invokeAll(
+      Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+      throws InterruptedException {
+    return delegate.invokeAll(tasks, timeout, unit);
+  }
+
+  @Override
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
+      throws ExecutionException, InterruptedException {
+    return delegate.invokeAny(tasks);
+  }
+
+  @Override
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+      throws ExecutionException, InterruptedException, TimeoutException {
+    return delegate.invokeAny(tasks, timeout, unit);
+  }
+
+  @Override
+  public void execute(Runnable command) {
+    delegate.execute(command);
+  }
+
+  @Override
+  public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) {
+    return new DelegatingScheduledFuture<Void>(
+        completer ->
+            scheduler.schedule(
+                () ->
+                    delegate.execute(
+                        () -> {
+                          try {
+                            command.run();
+                            completer.set(null);
+                          } catch (Exception ex) {
+                            completer.setException(ex);
+                          }
+                        }),
+                delay,
+                unit));
+  }
+
+  @Override
+  @SuppressWarnings("FutureReturnValueIgnored")
+  public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) {
+    return new DelegatingScheduledFuture<>(
+        completer ->
+            scheduler.schedule(
+                () ->
+                    delegate.submit(
+                        () -> {
+                          try {
+                            V result = callable.call();
+                            completer.set(result);
+                          } catch (Exception ex) {
+                            completer.setException(ex);
+                          }
+                        }),
+                delay,
+                unit));
+  }
+
+  @Override
+  public ScheduledFuture<?> scheduleAtFixedRate(
+      Runnable command, long initialDelay, long period, TimeUnit unit) {
+    return new DelegatingScheduledFuture<>(
+        completer ->
+            scheduler.scheduleAtFixedRate(
+                () ->
+                    delegate.execute(
+                        () -> {
+                          try {
+                            command.run();
+                          } catch (Exception ex) {
+                            completer.setException(ex);
+                            throw ex;
+                          }
+                        }),
+                initialDelay,
+                period,
+                unit));
+  }
+
+  @Override
+  public ScheduledFuture<?> scheduleWithFixedDelay(
+      Runnable command, long initialDelay, long delay, TimeUnit unit) {
+    return new DelegatingScheduledFuture<>(
+        completer ->
+            scheduler.scheduleWithFixedDelay(
+                () ->
+                    delegate.execute(
+                        () -> {
+                          try {
+                            command.run();
+                          } catch (Exception ex) {
+                            completer.setException(ex);
+                          }
+                        }),
+                initialDelay,
+                delay,
+                unit));
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/DelegatingScheduledFuture.java b/firebase-common/src/main/java/com/google/firebase/concurrent/DelegatingScheduledFuture.java
new file mode 100644
index 00000000000..fa99cad8af8
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/DelegatingScheduledFuture.java
@@ -0,0 +1,73 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import android.annotation.SuppressLint;
+import androidx.concurrent.futures.AbstractResolvableFuture;
+import java.util.concurrent.Delayed;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+// While direct use of AbstractResolvableFuture is not encouraged, it's stable for use and is not
+// going to be removed. In this case it's required since we need to implement a ScheduledFuture so
+// we can't use CallbackToFutureAdapter.
+@SuppressLint("RestrictedApi")
+@SuppressWarnings("RestrictTo")
+class DelegatingScheduledFuture<V> extends AbstractResolvableFuture<V>
+    implements ScheduledFuture<V> {
+
+  interface Completer<T> {
+    void set(T value);
+
+    void setException(Throwable ex);
+  }
+
+  interface Resolver<T> {
+    ScheduledFuture<?> addCompleter(Completer<T> completer);
+  }
+
+  DelegatingScheduledFuture(Resolver<V> resolver) {
+    upstreamFuture =
+        resolver.addCompleter(
+            new Completer<V>() {
+              @Override
+              public void set(V value) {
+                DelegatingScheduledFuture.this.set(value);
+              }
+
+              @Override
+              public void setException(Throwable ex) {
+                DelegatingScheduledFuture.this.setException(ex);
+              }
+            });
+  }
+
+  private final ScheduledFuture<?> upstreamFuture;
+
+  @Override
+  protected void afterDone() {
+    upstreamFuture.cancel(wasInterrupted());
+  }
+
+  @Override
+  public long getDelay(TimeUnit unit) {
+    return upstreamFuture.getDelay(unit);
+  }
+
+  @Override
+  public int compareTo(Delayed o) {
+    return upstreamFuture.compareTo(o);
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/ExecutorsRegistrar.java b/firebase-common/src/main/java/com/google/firebase/concurrent/ExecutorsRegistrar.java
new file mode 100644
index 00000000000..45f22916f13
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/ExecutorsRegistrar.java
@@ -0,0 +1,133 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import android.annotation.SuppressLint;
+import android.os.Build;
+import android.os.Process;
+import android.os.StrictMode;
+import com.google.firebase.BuildConfig;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.components.Component;
+import com.google.firebase.components.ComponentRegistrar;
+import com.google.firebase.components.Lazy;
+import com.google.firebase.components.Qualified;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+
+@SuppressLint("ThreadPoolCreation")
+public class ExecutorsRegistrar implements ComponentRegistrar {
+  static final Lazy<ScheduledExecutorService> BG_EXECUTOR =
+      new Lazy<>(
+          () ->
+              scheduled(
+                  Executors.newFixedThreadPool(
+                      4,
+                      factory(
+                          "Firebase Background", Process.THREAD_PRIORITY_BACKGROUND, bgPolicy()))));
+
+  static final Lazy<ScheduledExecutorService> LITE_EXECUTOR =
+      new Lazy<>(
+          () ->
+              scheduled(
+                  Executors.newFixedThreadPool(
+                      Math.max(2, Runtime.getRuntime().availableProcessors()),
+                      factory("Firebase Lite", Process.THREAD_PRIORITY_DEFAULT, litePolicy()))));
+
+  static final Lazy<ScheduledExecutorService> BLOCKING_EXECUTOR =
+      new Lazy<>(
+          () ->
+              scheduled(
+                  Executors.newCachedThreadPool(
+                      factory(
+                          "Firebase Blocking",
+                          Process.THREAD_PRIORITY_BACKGROUND
+                              + Process.THREAD_PRIORITY_LESS_FAVORABLE))));
+
+  static final Lazy<ScheduledExecutorService> SCHEDULER =
+      new Lazy<>(
+          () ->
+              Executors.newSingleThreadScheduledExecutor(
+                  factory("Firebase Scheduler", Process.THREAD_PRIORITY_DEFAULT)));
+
+  @Override
+  public List<Component<?>> getComponents() {
+    return Arrays.asList(
+        Component.builder(
+                Qualified.qualified(Background.class, ScheduledExecutorService.class),
+                Qualified.qualified(Background.class, ExecutorService.class),
+                Qualified.qualified(Background.class, Executor.class))
+            .factory(c -> BG_EXECUTOR.get())
+            .build(),
+        Component.builder(
+                Qualified.qualified(Blocking.class, ScheduledExecutorService.class),
+                Qualified.qualified(Blocking.class, ExecutorService.class),
+                Qualified.qualified(Blocking.class, Executor.class))
+            .factory(c -> BLOCKING_EXECUTOR.get())
+            .build(),
+        Component.builder(
+                Qualified.qualified(Lightweight.class, ScheduledExecutorService.class),
+                Qualified.qualified(Lightweight.class, ExecutorService.class),
+                Qualified.qualified(Lightweight.class, Executor.class))
+            .factory(c -> LITE_EXECUTOR.get())
+            .build(),
+        Component.builder(Qualified.qualified(UiThread.class, Executor.class))
+            .factory(c -> UiExecutor.INSTANCE)
+            .build());
+  }
+
+  private static ScheduledExecutorService scheduled(ExecutorService delegate) {
+    return new DelegatingScheduledExecutorService(delegate, SCHEDULER.get());
+  }
+
+  private static ThreadFactory factory(String threadPrefix, int priority) {
+    return new CustomThreadFactory(threadPrefix, priority, null);
+  }
+
+  private static ThreadFactory factory(
+      String threadPrefix, int priority, StrictMode.ThreadPolicy policy) {
+    return new CustomThreadFactory(threadPrefix, priority, policy);
+  }
+
+  private static StrictMode.ThreadPolicy bgPolicy() {
+    StrictMode.ThreadPolicy.Builder builder = new StrictMode.ThreadPolicy.Builder().detectNetwork();
+    if (Build.VERSION.SDK_INT >= 23) {
+      builder.detectResourceMismatches();
+      if (Build.VERSION.SDK_INT >= 26) {
+        builder.detectUnbufferedIo();
+      }
+    }
+    if (BuildConfig.DEBUG) {
+      builder.penaltyDeath();
+    }
+    return builder.penaltyLog().build();
+  }
+
+  private static StrictMode.ThreadPolicy litePolicy() {
+    StrictMode.ThreadPolicy.Builder builder = new StrictMode.ThreadPolicy.Builder().detectAll();
+    if (BuildConfig.DEBUG) {
+      builder.penaltyDeath();
+    }
+    return builder.penaltyLog().build();
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/FirebaseExecutors.java b/firebase-common/src/main/java/com/google/firebase/concurrent/FirebaseExecutors.java
new file mode 100644
index 00000000000..7624cb03c4a
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/FirebaseExecutors.java
@@ -0,0 +1,139 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+
+/** Provides commonly useful executors. */
+public class FirebaseExecutors {
+  private FirebaseExecutors() {}
+
+  /**
+   * Creates a sequential executor.
+   *
+   * <p>Executes tasks sequentially and provides memory synchronization guarantees for any mutations
+   * of shared state.
+   *
+   * <p>For details see:
+   * https://guava.dev/releases/31.1-jre/api/docs/com/google/common/util/concurrent/MoreExecutors.html#newSequentialExecutor(java.util.concurrent.Executor)
+   */
+  public static Executor newSequentialExecutor(Executor delegate) {
+    return new SequentialExecutor(delegate);
+  }
+
+  /**
+   * Returns an {@link Executor} that limits the number of running tasks at a given time.
+   *
+   * <p>The executor uses the {@code delegate} in order to {@link Executor#execute(Runnable)
+   * execute} each task, and does not create any threads of its own.
+   *
+   * @param delegate {@link Executor} used to execute tasks
+   * @param concurrency max number of tasks executing concurrently
+   */
+  public static Executor newLimitedConcurrencyExecutor(Executor delegate, int concurrency) {
+    return new LimitedConcurrencyExecutor(delegate, concurrency);
+  }
+
+  /**
+   * Returns a {@link ExecutorService} that limits the number of running tasks at a given time.
+   *
+   * <p>The executor uses delegate in order to {@link Executor#execute(Runnable) execute} each task,
+   * and does not create any threads of its own.
+   *
+   * @param delegate {@link ExecutorService} used to execute tasks
+   * @param concurrency max number of tasks executing concurrently
+   */
+  public static ExecutorService newLimitedConcurrencyExecutorService(
+      ExecutorService delegate, int concurrency) {
+    return new LimitedConcurrencyExecutorService(delegate, concurrency);
+  }
+
+  /**
+   * Returns a {@link ScheduledExecutorService} that limits the number of running tasks at a given
+   * time.
+   *
+   * <p>The executor uses delegate in order to {@link Executor#execute(Runnable) execute} each task,
+   * and does not create any threads of its own.
+   *
+   * @param delegate {@link ExecutorService} used to execute tasks
+   * @param concurrency max number of tasks executing concurrently
+   */
+  public static ScheduledExecutorService newLimitedConcurrencyScheduledExecutorService(
+      ExecutorService delegate, int concurrency) {
+    return new DelegatingScheduledExecutorService(
+        newLimitedConcurrencyExecutorService(delegate, concurrency),
+        ExecutorsRegistrar.SCHEDULER.get());
+  }
+
+  /**
+   * Returns a {@link PausableExecutor }.
+   *
+   * <p>The executor does not create any threads of its own and instead delegates to the {@code
+   * delegate} executor.
+   *
+   * <p>While {@link PausableExecutor#pause() paused}, the executor queues tasks which are executed
+   * when the executor is {@link PausableExecutor#resume() resumed}, tasks that are already being
+   * executed will not be paused and will run to completion.
+   */
+  public static PausableExecutor newPausableExecutor(Executor delegate) {
+    return new PausableExecutorImpl(false, delegate);
+  }
+
+  /**
+   * Returns a {@link PausableExecutorService }.
+   *
+   * <p>The executor does not create any threads of its own and instead delegates to the {@code
+   * delegate} executor.
+   *
+   * <p>While {@link PausableExecutor#pause() paused}, the executor queues tasks which are executed
+   * when the executor is {@link PausableExecutor#resume() resumed}, tasks that are already being
+   * executed will not be paused and will run to completion.
+   */
+  public static PausableExecutorService newPausableExecutorService(ExecutorService delegate) {
+    return new PausableExecutorServiceImpl(false, delegate);
+  }
+
+  /**
+   * Returns a {@link PausableScheduledExecutorService }.
+   *
+   * <p>The executor does not create any threads of its own and instead delegates to the {@code
+   * delegate} executor.
+   *
+   * <p>While {@link PausableExecutor#pause() paused}, the executor queues tasks which are executed
+   * when the executor is {@link PausableExecutor#resume() resumed}, tasks that are already being
+   * executed will not be paused and will run to completion.
+   */
+  public static PausableScheduledExecutorService newPausableScheduledExecutorService(
+      ScheduledExecutorService delegate) {
+    return new PausableScheduledExecutorServiceImpl(
+        newPausableExecutorService(delegate), ExecutorsRegistrar.SCHEDULER.get());
+  }
+
+  /** Returns a direct executor. */
+  public static Executor directExecutor() {
+    return DirectExecutor.INSTANCE;
+  }
+
+  private enum DirectExecutor implements Executor {
+    INSTANCE;
+
+    @Override
+    public void execute(Runnable command) {
+      command.run();
+    }
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/LimitedConcurrencyExecutor.java b/firebase-common/src/main/java/com/google/firebase/concurrent/LimitedConcurrencyExecutor.java
new file mode 100644
index 00000000000..8b08178d425
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/LimitedConcurrencyExecutor.java
@@ -0,0 +1,72 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import com.google.firebase.components.Preconditions;
+import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.Semaphore;
+
+/**
+ * An {@link Executor}that limits the number of concurrent tasks executing at a given time.
+ *
+ * <p>Delegates actual execution to the {@code delegate} executor and does not create threads of it
+ * own.
+ *
+ * <p>The executor is fair: has FIFO semantics for submitted tasks.
+ */
+class LimitedConcurrencyExecutor implements Executor {
+
+  private final Executor delegate;
+
+  private final Semaphore semaphore;
+
+  private final LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
+
+  LimitedConcurrencyExecutor(Executor delegate, int concurrency) {
+    Preconditions.checkArgument(concurrency > 0, "concurrency must be positive.");
+    this.delegate = delegate;
+    semaphore = new Semaphore(concurrency, true);
+  }
+
+  @Override
+  public void execute(Runnable command) {
+    queue.offer(command);
+    maybeEnqueueNext();
+  }
+
+  private void maybeEnqueueNext() {
+    while (semaphore.tryAcquire()) {
+      Runnable next = queue.poll();
+      if (next != null) {
+        delegate.execute(decorate(next));
+      } else {
+        semaphore.release();
+        break;
+      }
+    }
+  }
+
+  private Runnable decorate(Runnable command) {
+    return () -> {
+      try {
+        command.run();
+      } finally {
+        semaphore.release();
+        maybeEnqueueNext();
+      }
+    };
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/LimitedConcurrencyExecutorService.java b/firebase-common/src/main/java/com/google/firebase/concurrent/LimitedConcurrencyExecutorService.java
new file mode 100644
index 00000000000..579e692f77b
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/LimitedConcurrencyExecutorService.java
@@ -0,0 +1,110 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+final class LimitedConcurrencyExecutorService extends LimitedConcurrencyExecutor
+    implements ExecutorService {
+  private final ExecutorService delegate;
+
+  LimitedConcurrencyExecutorService(ExecutorService delegate, int concurrency) {
+    super(delegate, concurrency);
+    this.delegate = delegate;
+  }
+
+  @Override
+  public void shutdown() {
+    throw new UnsupportedOperationException("Shutting down is not allowed.");
+  }
+
+  @Override
+  public List<Runnable> shutdownNow() {
+    throw new UnsupportedOperationException("Shutting down is not allowed.");
+  }
+
+  @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> Future<T> submit(Callable<T> task) {
+    FutureTask<T> ft = new FutureTask<>(task);
+    execute(ft);
+    return ft;
+  }
+
+  @Override
+  public <T> Future<T> submit(Runnable task, T result) {
+    return submit(
+        () -> {
+          task.run();
+          return result;
+        });
+  }
+
+  @Override
+  public Future<?> submit(Runnable task) {
+    return submit(
+        () -> {
+          task.run();
+          return null;
+        });
+  }
+
+  @Override
+  public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
+      throws InterruptedException {
+    return delegate.invokeAll(tasks);
+  }
+
+  @Override
+  public <T> List<Future<T>> invokeAll(
+      Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+      throws InterruptedException {
+    return delegate.invokeAll(tasks, timeout, unit);
+  }
+
+  @Override
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
+      throws ExecutionException, InterruptedException {
+    return delegate.invokeAny(tasks);
+  }
+
+  @Override
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+      throws ExecutionException, InterruptedException, TimeoutException {
+    return delegate.invokeAny(tasks, timeout, unit);
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/PausableExecutor.java b/firebase-common/src/main/java/com/google/firebase/concurrent/PausableExecutor.java
new file mode 100644
index 00000000000..9d5071c31f1
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/PausableExecutor.java
@@ -0,0 +1,32 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import java.util.concurrent.Executor;
+
+/**
+ * An {@link Executor} that can be paused/resumed.
+ *
+ * <p>When the executor is {@link #pause() paused}, tasks get queued and execute when {@link
+ * #resume()} is called.
+ */
+public interface PausableExecutor extends Executor {
+
+  void pause();
+
+  void resume();
+
+  boolean isPaused();
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/PausableExecutorImpl.java b/firebase-common/src/main/java/com/google/firebase/concurrent/PausableExecutorImpl.java
new file mode 100644
index 00000000000..4a457145936
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/PausableExecutorImpl.java
@@ -0,0 +1,68 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import androidx.annotation.VisibleForTesting;
+import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingQueue;
+
+final class PausableExecutorImpl implements PausableExecutor {
+  private volatile boolean paused;
+  private final Executor delegate;
+
+  @VisibleForTesting final LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
+
+  PausableExecutorImpl(boolean paused, Executor delegate) {
+    this.paused = paused;
+    this.delegate = delegate;
+  }
+
+  @Override
+  public void execute(Runnable command) {
+    queue.offer(command);
+    maybeEnqueueNext();
+  }
+
+  private void maybeEnqueueNext() {
+    if (paused) {
+      return;
+    }
+    Runnable next = queue.poll();
+    while (next != null) {
+      delegate.execute(next);
+      if (!paused) {
+        next = queue.poll();
+      } else {
+        next = null;
+      }
+    }
+  }
+
+  @Override
+  public void pause() {
+    paused = true;
+  }
+
+  @Override
+  public void resume() {
+    paused = false;
+    maybeEnqueueNext();
+  }
+
+  @Override
+  public boolean isPaused() {
+    return paused;
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/PausableExecutorService.java b/firebase-common/src/main/java/com/google/firebase/concurrent/PausableExecutorService.java
new file mode 100644
index 00000000000..8cae7924979
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/PausableExecutorService.java
@@ -0,0 +1,25 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import java.util.concurrent.ExecutorService;
+
+/**
+ * An {@link ExecutorService} that can be paused/resumed.
+ *
+ * <p>When the executor is {@link PausableExecutor#pause() paused}, tasks get queued and execute
+ * when {@link PausableExecutor#resume()} is called.
+ */
+public interface PausableExecutorService extends ExecutorService, PausableExecutor {}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/PausableExecutorServiceImpl.java b/firebase-common/src/main/java/com/google/firebase/concurrent/PausableExecutorServiceImpl.java
new file mode 100644
index 00000000000..b614dc28eb8
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/PausableExecutorServiceImpl.java
@@ -0,0 +1,131 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+final class PausableExecutorServiceImpl implements PausableExecutorService {
+
+  private final ExecutorService delegateService;
+  private final PausableExecutor pausableDelegate;
+
+  PausableExecutorServiceImpl(boolean paused, ExecutorService delegate) {
+    delegateService = delegate;
+    pausableDelegate = new PausableExecutorImpl(paused, delegate);
+  }
+
+  @Override
+  public void execute(Runnable command) {
+    pausableDelegate.execute(command);
+  }
+
+  @Override
+  public void pause() {
+    pausableDelegate.pause();
+  }
+
+  @Override
+  public void resume() {
+    pausableDelegate.resume();
+  }
+
+  @Override
+  public boolean isPaused() {
+    return pausableDelegate.isPaused();
+  }
+
+  @Override
+  public void shutdown() {
+    throw new UnsupportedOperationException("Shutting down is not allowed.");
+  }
+
+  @Override
+  public List<Runnable> shutdownNow() {
+    throw new UnsupportedOperationException("Shutting down is not allowed.");
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return delegateService.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return delegateService.isTerminated();
+  }
+
+  @Override
+  public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
+    return delegateService.awaitTermination(timeout, unit);
+  }
+
+  @Override
+  public <T> Future<T> submit(Callable<T> task) {
+    FutureTask<T> ft = new FutureTask<>(task);
+    execute(ft);
+    return ft;
+  }
+
+  @Override
+  public <T> Future<T> submit(Runnable task, T result) {
+    return submit(
+        () -> {
+          task.run();
+          return result;
+        });
+  }
+
+  @Override
+  public Future<?> submit(Runnable task) {
+    return submit(
+        () -> {
+          task.run();
+          return null;
+        });
+  }
+
+  @Override
+  public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
+      throws InterruptedException {
+    return delegateService.invokeAll(tasks);
+  }
+
+  @Override
+  public <T> List<Future<T>> invokeAll(
+      Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+      throws InterruptedException {
+    return delegateService.invokeAll(tasks, timeout, unit);
+  }
+
+  @Override
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
+      throws ExecutionException, InterruptedException {
+    return delegateService.invokeAny(tasks);
+  }
+
+  @Override
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+      throws ExecutionException, InterruptedException, TimeoutException {
+    return delegateService.invokeAny(tasks, timeout, unit);
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/PausableScheduledExecutorService.java b/firebase-common/src/main/java/com/google/firebase/concurrent/PausableScheduledExecutorService.java
new file mode 100644
index 00000000000..c3b5f6f773f
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/PausableScheduledExecutorService.java
@@ -0,0 +1,26 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import java.util.concurrent.ScheduledExecutorService;
+
+/**
+ * A {@link ScheduledExecutorService} that can be paused/resumed.
+ *
+ * <p>When the executor is {@link PausableExecutor#pause() paused}, tasks get queued and execute
+ * when {@link PausableExecutor#resume()} is called.
+ */
+public interface PausableScheduledExecutorService
+    extends ScheduledExecutorService, PausableExecutorService {}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/PausableScheduledExecutorServiceImpl.java b/firebase-common/src/main/java/com/google/firebase/concurrent/PausableScheduledExecutorServiceImpl.java
new file mode 100644
index 00000000000..536ee2022b3
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/PausableScheduledExecutorServiceImpl.java
@@ -0,0 +1,61 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+final class PausableScheduledExecutorServiceImpl extends DelegatingScheduledExecutorService
+    implements PausableScheduledExecutorService {
+  private final PausableExecutorService delegate;
+
+  PausableScheduledExecutorServiceImpl(
+      PausableExecutorService delegate, ScheduledExecutorService scheduler) {
+    super(delegate, scheduler);
+    this.delegate = delegate;
+  }
+
+  @Override
+  public void pause() {
+    delegate.pause();
+  }
+
+  @Override
+  public void resume() {
+    delegate.resume();
+  }
+
+  @Override
+  public boolean isPaused() {
+    return delegate.isPaused();
+  }
+
+  @Override
+  public ScheduledFuture<?> scheduleAtFixedRate(
+      Runnable command, long initialDelay, long period, TimeUnit unit) {
+    // TODO(vkryachko): There is currently no use case for it in our codebase and the pausing
+    // implementation is fairly involved. Revisit if/when needed.
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public ScheduledFuture<?> scheduleWithFixedDelay(
+      Runnable command, long initialDelay, long delay, TimeUnit unit) {
+    // TODO(vkryachko): There is currently no use case for it in our codebase and the pausing
+    // implementation is fairly involved. Revisit if/when needed.
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/concurrent/SequentialExecutor.java b/firebase-common/src/main/java/com/google/firebase/concurrent/SequentialExecutor.java
new file mode 100644
index 00000000000..db5f4f3a374
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/SequentialExecutor.java
@@ -0,0 +1,261 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import static com.google.android.gms.common.internal.Preconditions.checkNotNull;
+import static com.google.firebase.concurrent.SequentialExecutor.WorkerRunningState.IDLE;
+import static com.google.firebase.concurrent.SequentialExecutor.WorkerRunningState.QUEUED;
+import static com.google.firebase.concurrent.SequentialExecutor.WorkerRunningState.QUEUING;
+import static com.google.firebase.concurrent.SequentialExecutor.WorkerRunningState.RUNNING;
+import static java.lang.System.identityHashCode;
+
+import androidx.annotation.GuardedBy;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.CheckForNull;
+
+/**
+ * Executor ensuring that all Runnables submitted are executed in order, using the provided
+ * Executor, and sequentially such that no two will ever be running at the same time.
+ *
+ * <p>Tasks submitted to {@link #execute(Runnable)} are executed in FIFO order.
+ *
+ * <p>The execution of tasks is done by one thread as long as there are tasks left in the queue.
+ * When a task is {@linkplain Thread#interrupt interrupted}, execution of subsequent tasks
+ * continues. See {@link QueueWorker#workOnQueue} for details.
+ *
+ * <p>{@code RuntimeException}s thrown by tasks are simply logged and the executor keeps trucking.
+ * If an {@code Error} is thrown, the error will propagate and execution will stop until it is
+ * restarted by a call to {@link #execute}.
+ */
+final class SequentialExecutor implements Executor {
+  private static final Logger log = Logger.getLogger(SequentialExecutor.class.getName());
+
+  enum WorkerRunningState {
+    /** Runnable is not running and not queued for execution */
+    IDLE,
+    /** Runnable is not running, but is being queued for execution */
+    QUEUING,
+    /** runnable has been submitted but has not yet begun execution */
+    QUEUED,
+    RUNNING,
+  }
+
+  /** Underlying executor that all submitted Runnable objects are run on. */
+  private final Executor executor;
+
+  @GuardedBy("queue")
+  private final Deque<Runnable> queue = new ArrayDeque<>();
+
+  /** see {@link WorkerRunningState} */
+  @GuardedBy("queue")
+  private WorkerRunningState workerRunningState = IDLE;
+
+  /**
+   * This counter prevents an ABA issue where a thread may successfully schedule the worker, the
+   * worker runs and exhausts the queue, another thread enqueues a task and fails to schedule the
+   * worker, and then the first thread's call to delegate.execute() returns. Without this counter,
+   * it would observe the QUEUING state and set it to QUEUED, and the worker would never be
+   * scheduled again for future submissions.
+   */
+  @GuardedBy("queue")
+  private long workerRunCount = 0;
+
+  private final QueueWorker worker = new QueueWorker();
+
+  SequentialExecutor(Executor executor) {
+    this.executor = checkNotNull(executor);
+  }
+
+  /**
+   * Adds a task to the queue and makes sure a worker thread is running.
+   *
+   * <p>If this method throws, e.g. a {@code RejectedExecutionException} from the delegate executor,
+   * execution of tasks will stop until a call to this method is made.
+   */
+  @Override
+  public void execute(Runnable task) {
+    checkNotNull(task);
+    Runnable submittedTask;
+    long oldRunCount;
+    synchronized (queue) {
+      // If the worker is already running (or execute() on the delegate returned successfully, and
+      // the worker has yet to start) then we don't need to start the worker.
+      if (workerRunningState == RUNNING || workerRunningState == QUEUED) {
+        queue.add(task);
+        return;
+      }
+
+      oldRunCount = workerRunCount;
+
+      // If the worker is not yet running, the delegate Executor might reject our attempt to start
+      // it. To preserve FIFO order and failure atomicity of rejected execution when the same
+      // Runnable is executed more than once, allocate a wrapper that we know is safe to remove by
+      // object identity.
+      // A data structure that returned a removal handle from add() would allow eliminating this
+      // allocation.
+      submittedTask =
+          new Runnable() {
+            @Override
+            public void run() {
+              task.run();
+            }
+
+            @Override
+            public String toString() {
+              return task.toString();
+            }
+          };
+      queue.add(submittedTask);
+      workerRunningState = QUEUING;
+    }
+
+    try {
+      executor.execute(worker);
+    } catch (RuntimeException | Error t) {
+      synchronized (queue) {
+        boolean removed =
+            (workerRunningState == IDLE || workerRunningState == QUEUING)
+                && queue.removeLastOccurrence(submittedTask);
+        // If the delegate is directExecutor(), the submitted runnable could have thrown a REE. But
+        // that's handled by the log check that catches RuntimeExceptions in the queue worker.
+        if (!(t instanceof RejectedExecutionException) || removed) {
+          throw t;
+        }
+      }
+      return;
+    }
+
+    /*
+     * This is an unsynchronized read! After the read, the function returns immediately or acquires
+     * the lock to check again. Since an IDLE state was observed inside the preceding synchronized
+     * block, and reference field assignment is atomic, this may save reacquiring the lock when
+     * another thread or the worker task has cleared the count and set the state.
+     *
+     * <p>When {@link #executor} is a directExecutor(), the value written to
+     * {@code workerRunningState} will be available synchronously, and behaviour will be
+     * deterministic.
+     */
+    @SuppressWarnings("GuardedBy")
+    boolean alreadyMarkedQueued = workerRunningState != QUEUING;
+    if (alreadyMarkedQueued) {
+      return;
+    }
+    synchronized (queue) {
+      if (workerRunCount == oldRunCount && workerRunningState == QUEUING) {
+        workerRunningState = QUEUED;
+      }
+    }
+  }
+
+  /** Worker that runs tasks from {@link #queue} until it is empty. */
+  private final class QueueWorker implements Runnable {
+    @CheckForNull Runnable task;
+
+    @Override
+    public void run() {
+      try {
+        workOnQueue();
+      } catch (Error e) {
+        synchronized (queue) {
+          workerRunningState = IDLE;
+        }
+        throw e;
+        // The execution of a task has ended abnormally.
+        // We could have tasks left in the queue, so should perhaps try to restart a worker,
+        // but then the Error will get delayed if we are using a direct (same thread) executor.
+      }
+    }
+
+    /**
+     * Continues executing tasks from {@link #queue} until it is empty.
+     *
+     * <p>The thread's interrupt bit is cleared before execution of each task.
+     *
+     * <p>If the Thread in use is interrupted before or during execution of the tasks in {@link
+     * #queue}, the Executor will complete its tasks, and then restore the interruption. This means
+     * that once the Thread returns to the Executor that this Executor composes, the interruption
+     * will still be present. If the composed Executor is an ExecutorService, it can respond to
+     * shutdown() by returning tasks queued on that Thread after {@link #worker} drains the queue.
+     */
+    private void workOnQueue() {
+      boolean interruptedDuringTask = false;
+      boolean hasSetRunning = false;
+      try {
+        while (true) {
+          synchronized (queue) {
+            // Choose whether this thread will run or not after acquiring the lock on the first
+            // iteration
+            if (!hasSetRunning) {
+              if (workerRunningState == RUNNING) {
+                // Don't want to have two workers pulling from the queue.
+                return;
+              } else {
+                // Increment the run counter to avoid the ABA problem of a submitter marking the
+                // thread as QUEUED after it already ran and exhausted the queue before returning
+                // from execute().
+                workerRunCount++;
+                workerRunningState = RUNNING;
+                hasSetRunning = true;
+              }
+            }
+            task = queue.poll();
+            if (task == null) {
+              workerRunningState = IDLE;
+              return;
+            }
+          }
+          // Remove the interrupt bit before each task. The interrupt is for the "current task" when
+          // it is sent, so subsequent tasks in the queue should not be caused to be interrupted
+          // by a previous one in the queue being interrupted.
+          interruptedDuringTask |= Thread.interrupted();
+          try {
+            task.run();
+          } catch (RuntimeException e) {
+            log.log(Level.SEVERE, "Exception while executing runnable " + task, e);
+          } finally {
+            task = null;
+          }
+        }
+      } finally {
+        // Ensure that if the thread was interrupted at all while processing the task queue, it
+        // is returned to the delegate Executor interrupted so that it may handle the
+        // interruption if it likes.
+        if (interruptedDuringTask) {
+          Thread.currentThread().interrupt();
+        }
+      }
+    }
+
+    @SuppressWarnings("GuardedBy")
+    @Override
+    public String toString() {
+      Runnable currentlyRunning = task;
+      if (currentlyRunning != null) {
+        return "SequentialExecutorWorker{running=" + currentlyRunning + "}";
+      }
+      return "SequentialExecutorWorker{state=" + workerRunningState + "}";
+    }
+  }
+
+  @Override
+  public String toString() {
+    return "SequentialExecutor@" + identityHashCode(this) + "{" + executor + "}";
+  }
+}
diff --git a/firebase-components/src/main/java/com/google/firebase/components/AbstractComponentContainer.java b/firebase-common/src/main/java/com/google/firebase/concurrent/UiExecutor.java
similarity index 52%
rename from firebase-components/src/main/java/com/google/firebase/components/AbstractComponentContainer.java
rename to firebase-common/src/main/java/com/google/firebase/concurrent/UiExecutor.java
index 143adf0acc7..5352e1f1f8a 100644
--- a/firebase-components/src/main/java/com/google/firebase/components/AbstractComponentContainer.java
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/UiExecutor.java
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,23 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.components;
+package com.google.firebase.concurrent;
 
-import com.google.firebase.inject.Provider;
-import java.util.Set;
+import android.annotation.SuppressLint;
+import android.os.Handler;
+import android.os.Looper;
+import java.util.concurrent.Executor;
 
-abstract class AbstractComponentContainer implements ComponentContainer {
-  @Override
-  public <T> T get(Class<T> anInterface) {
-    Provider<T> provider = getProvider(anInterface);
-    if (provider == null) {
-      return null;
-    }
-    return provider.get();
-  }
+/** @hide */
+public enum UiExecutor implements Executor {
+  INSTANCE;
+
+  // This is the only UI handler that is allowed in Firebase SDK.
+  @SuppressLint("ThreadPoolCreation")
+  private static final Handler HANDLER = new Handler(Looper.getMainLooper());
 
   @Override
-  public <T> Set<T> setOf(Class<T> anInterface) {
-    return setOfProvider(anInterface).get();
+  public void execute(Runnable command) {
+    HANDLER.post(command);
   }
 }
diff --git a/buildSrc/settings.gradle b/firebase-common/src/main/java/com/google/firebase/concurrent/package-info.java
similarity index 90%
rename from buildSrc/settings.gradle
rename to firebase-common/src/main/java/com/google/firebase/concurrent/package-info.java
index 5eee890b635..9452eb485fd 100644
--- a/buildSrc/settings.gradle
+++ b/firebase-common/src/main/java/com/google/firebase/concurrent/package-info.java
@@ -12,4 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-apply from: new File(settingsDir, '../gradle/buildCache.gradle')
+/** @hide */
+package com.google.firebase.concurrent;
diff --git a/firebase-common/src/main/java/com/google/firebase/heartbeatinfo/DefaultHeartBeatController.java b/firebase-common/src/main/java/com/google/firebase/heartbeatinfo/DefaultHeartBeatController.java
index cb7722c37bd..ff9ba5123fc 100644
--- a/firebase-common/src/main/java/com/google/firebase/heartbeatinfo/DefaultHeartBeatController.java
+++ b/firebase-common/src/main/java/com/google/firebase/heartbeatinfo/DefaultHeartBeatController.java
@@ -23,18 +23,16 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Background;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.platforminfo.UserAgentPublisher;
 import java.io.ByteArrayOutputStream;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Executor;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 import java.util.zip.GZIPOutputStream;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -52,9 +50,6 @@ public class DefaultHeartBeatController implements HeartBeatController, HeartBea
 
   private final Executor backgroundExecutor;
 
-  private static final ThreadFactory THREAD_FACTORY =
-      r -> new Thread(r, "heartbeat-information-executor");
-
   public Task<Void> registerHeartBeat() {
     if (consumers.size() <= 0) {
       return Tasks.forResult(null);
@@ -118,12 +113,12 @@ private DefaultHeartBeatController(
       Context context,
       String persistenceKey,
       Set<HeartBeatConsumer> consumers,
-      Provider<UserAgentPublisher> userAgentProvider) {
+      Provider<UserAgentPublisher> userAgentProvider,
+      Executor backgroundExecutor) {
     this(
         () -> new HeartBeatInfoStorage(context, persistenceKey),
         consumers,
-        new ThreadPoolExecutor(
-            0, 1, 30, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), THREAD_FACTORY),
+        backgroundExecutor,
         userAgentProvider,
         context);
   }
@@ -143,19 +138,22 @@ private DefaultHeartBeatController(
   }
 
   public static @NonNull Component<DefaultHeartBeatController> component() {
+    Qualified<Executor> backgroundExecutor = Qualified.qualified(Background.class, Executor.class);
     return Component.builder(
             DefaultHeartBeatController.class, HeartBeatController.class, HeartBeatInfo.class)
         .add(Dependency.required(Context.class))
         .add(Dependency.required(FirebaseApp.class))
         .add(Dependency.setOf(HeartBeatConsumer.class))
         .add(Dependency.requiredProvider(UserAgentPublisher.class))
+        .add(Dependency.required(backgroundExecutor))
         .factory(
             c ->
                 new DefaultHeartBeatController(
                     c.get(Context.class),
                     c.get(FirebaseApp.class).getPersistenceKey(),
                     c.setOf(HeartBeatConsumer.class),
-                    c.getProvider(UserAgentPublisher.class)))
+                    c.getProvider(UserAgentPublisher.class),
+                    c.get(backgroundExecutor)))
         .build();
   }
 
diff --git a/firebase-common/src/main/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorage.java b/firebase-common/src/main/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorage.java
index 88deb18a36c..a8a9fee5104 100644
--- a/firebase-common/src/main/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorage.java
+++ b/firebase-common/src/main/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorage.java
@@ -75,12 +75,29 @@ int getHeartBeatCount() {
 
   synchronized void deleteAllHeartBeats() {
     SharedPreferences.Editor editor = firebaseSharedPreferences.edit();
+    int counter = 0;
     for (Map.Entry<String, ?> entry : this.firebaseSharedPreferences.getAll().entrySet()) {
       if (entry.getValue() instanceof Set) {
-        editor.remove(entry.getKey());
+        // All other heartbeats other than the heartbeats stored today will be deleted.
+        Set<String> dates = (Set<String>) entry.getValue();
+        String today = getFormattedDate(System.currentTimeMillis());
+        String key = entry.getKey();
+        if (dates.contains(today)) {
+          Set<String> userAgentDateSet = new HashSet<>();
+          userAgentDateSet.add(today);
+          counter += 1;
+          editor.putStringSet(key, userAgentDateSet);
+        } else {
+          editor.remove(key);
+        }
       }
     }
-    editor.remove(HEART_BEAT_COUNT_TAG);
+    if (counter == 0) {
+      editor.remove(HEART_BEAT_COUNT_TAG);
+    } else {
+      editor.putLong(HEART_BEAT_COUNT_TAG, counter);
+    }
+
     editor.commit();
   }
 
@@ -88,9 +105,13 @@ synchronized List<HeartBeatResult> getAllHeartBeats() {
     ArrayList<HeartBeatResult> heartBeatResults = new ArrayList<>();
     for (Map.Entry<String, ?> entry : this.firebaseSharedPreferences.getAll().entrySet()) {
       if (entry.getValue() instanceof Set) {
-        heartBeatResults.add(
-            HeartBeatResult.create(
-                entry.getKey(), new ArrayList<String>((Set<String>) entry.getValue())));
+        Set<String> dates = new HashSet<>((Set<String>) entry.getValue());
+        String today = getFormattedDate(System.currentTimeMillis());
+        dates.remove(today);
+        if (!dates.isEmpty()) {
+          heartBeatResults.add(
+              HeartBeatResult.create(entry.getKey(), new ArrayList<String>(dates)));
+        }
       }
     }
     updateGlobalHeartBeat(System.currentTimeMillis());
@@ -111,6 +132,15 @@ private synchronized String getStoredUserAgentString(String dateString) {
     return null;
   }
 
+  private synchronized void updateStoredUserAgent(String userAgent, String dateString) {
+    removeStoredDate(dateString);
+    Set<String> userAgentDateSet =
+        new HashSet<String>(
+            firebaseSharedPreferences.getStringSet(userAgent, new HashSet<String>()));
+    userAgentDateSet.add(dateString);
+    firebaseSharedPreferences.edit().putStringSet(userAgent, userAgentDateSet).commit();
+  }
+
   private synchronized void removeStoredDate(String dateString) {
     // Find stored heartbeat and clear it.
     String userAgentString = getStoredUserAgentString(dateString);
@@ -148,7 +178,18 @@ synchronized void storeHeartBeat(long millis, String userAgentString) {
     String dateString = getFormattedDate(millis);
     String lastDateString = firebaseSharedPreferences.getString(LAST_STORED_DATE, "");
     if (lastDateString.equals(dateString)) {
-      return;
+      String storedUserAgentString = getStoredUserAgentString(dateString);
+      if (storedUserAgentString == null) {
+        // Heartbeat already sent for today.
+        return;
+      }
+      if (storedUserAgentString.equals(userAgentString)) {
+        // UserAgent not updated.
+        return;
+      } else {
+        updateStoredUserAgent(userAgentString, dateString);
+        return;
+      }
     }
     long heartBeatCount = firebaseSharedPreferences.getLong(HEART_BEAT_COUNT_TAG, 0);
     if (heartBeatCount + 1 == HEART_BEAT_COUNT_LIMIT) {
diff --git a/firebase-common/src/main/java/com/google/firebase/ktx/Firebase.kt b/firebase-common/src/main/java/com/google/firebase/ktx/Firebase.kt
new file mode 100644
index 00000000000..c126b285c99
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/ktx/Firebase.kt
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.ktx
+
+import android.content.Context
+import androidx.annotation.Keep
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.annotations.concurrent.Background
+import com.google.firebase.annotations.concurrent.Blocking
+import com.google.firebase.annotations.concurrent.Lightweight
+import com.google.firebase.annotations.concurrent.UiThread
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.components.Dependency
+import com.google.firebase.components.Qualified
+import java.util.concurrent.Executor
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.asCoroutineDispatcher
+
+/**
+ * All fields in this object are deprecated; Use `com.google.firebase.Firebase` instead.
+ *
+ * Single access point to all firebase SDKs from Kotlin. Acts as a target for extension methods
+ * provided by sdks.
+ *
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-common-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+object Firebase
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the migration guide:
+ * https://firebase.google.com/docs/android/kotlin-migration.
+ *
+ * Returns the default firebase app instance.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-common-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration).
+ */
+val Firebase.app: FirebaseApp
+  get() = FirebaseApp.getInstance()
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the migration guide:
+ * https://firebase.google.com/docs/android/kotlin-migration.
+ *
+ * Returns a named firebase app instance.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-common-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration).
+ */
+fun Firebase.app(name: String): FirebaseApp = FirebaseApp.getInstance(name)
+
+/**
+ * Initializes and returns a FirebaseApp.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-common-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun Firebase.initialize(context: Context): FirebaseApp? = FirebaseApp.initializeApp(context)
+
+/**
+ * Initializes and returns a FirebaseApp.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-common-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun Firebase.initialize(context: Context, options: FirebaseOptions): FirebaseApp =
+  FirebaseApp.initializeApp(context, options)
+
+/**
+ * Initializes and returns a FirebaseApp.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-common-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun Firebase.initialize(context: Context, options: FirebaseOptions, name: String): FirebaseApp =
+  FirebaseApp.initializeApp(context, options, name)
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the migration guide:
+ * https://firebase.google.com/docs/android/kotlin-migration.
+ *
+ * Returns options of default FirebaseApp
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-common-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.options: FirebaseOptions
+  get() = Firebase.app.options
+
+/** @suppress */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+@Keep
+class FirebaseCommonKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(
+      coroutineDispatcher<Background>(),
+      coroutineDispatcher<Lightweight>(),
+      coroutineDispatcher<Blocking>(),
+      coroutineDispatcher<UiThread>()
+    )
+  }
+}
+
+private inline fun <reified T : Annotation> coroutineDispatcher(): Component<CoroutineDispatcher> =
+  Component.builder(Qualified.qualified(T::class.java, CoroutineDispatcher::class.java))
+    .add(Dependency.required(Qualified.qualified(T::class.java, Executor::class.java)))
+    .factory { c ->
+      c.get(Qualified.qualified(T::class.java, Executor::class.java)).asCoroutineDispatcher()
+    }
+    .build()
diff --git a/firebase-common/src/main/java/com/google/firebase/logger/Logger.kt b/firebase-common/src/main/java/com/google/firebase/logger/Logger.kt
new file mode 100644
index 00000000000..c0520e6a630
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/logger/Logger.kt
@@ -0,0 +1,195 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.logger
+
+import android.util.Log
+import androidx.annotation.VisibleForTesting
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * Common logger interface that handles Android logcat logging for Firebase SDKs.
+ *
+ * @hide
+ */
+abstract class Logger
+private constructor(
+  val tag: String,
+  var enabled: Boolean,
+  var minLevel: Level,
+) {
+  @JvmOverloads
+  fun verbose(format: String, vararg args: Any?, throwable: Throwable? = null): Int =
+    logIfAble(Level.VERBOSE, format, args, throwable = throwable)
+
+  @JvmOverloads
+  fun verbose(msg: String, throwable: Throwable? = null): Int =
+    logIfAble(Level.VERBOSE, msg, throwable = throwable)
+
+  @JvmOverloads
+  fun debug(format: String, vararg args: Any?, throwable: Throwable? = null): Int =
+    logIfAble(Level.DEBUG, format, args, throwable = throwable)
+
+  @JvmOverloads
+  fun debug(msg: String, throwable: Throwable? = null): Int =
+    logIfAble(Level.DEBUG, msg, throwable = throwable)
+
+  @JvmOverloads
+  fun info(format: String, vararg args: Any?, throwable: Throwable? = null): Int =
+    logIfAble(Level.INFO, format, args, throwable = throwable)
+
+  @JvmOverloads
+  fun info(msg: String, throwable: Throwable? = null): Int =
+    logIfAble(Level.INFO, msg, throwable = throwable)
+
+  @JvmOverloads
+  fun warn(format: String, vararg args: Any?, throwable: Throwable? = null): Int =
+    logIfAble(Level.WARN, format, args, throwable = throwable)
+
+  @JvmOverloads
+  fun warn(msg: String, throwable: Throwable? = null): Int =
+    logIfAble(Level.WARN, msg, throwable = throwable)
+
+  @JvmOverloads
+  fun error(format: String, vararg args: Any?, throwable: Throwable? = null): Int =
+    logIfAble(Level.ERROR, format, args, throwable = throwable)
+
+  @JvmOverloads
+  fun error(msg: String, throwable: Throwable? = null): Int =
+    logIfAble(Level.ERROR, msg, throwable = throwable)
+
+  /** Log if [enabled] is set and the given level is loggable. */
+  private fun logIfAble(
+    level: Level,
+    format: String,
+    args: Array<out Any?> = emptyArray(),
+    throwable: Throwable?,
+  ): Int =
+    if (enabled && (minLevel.priority <= level.priority || Log.isLoggable(tag, level.priority))) {
+      log(level, format, args, throwable = throwable)
+    } else {
+      0
+    }
+
+  abstract fun log(
+    level: Level,
+    format: String,
+    args: Array<out Any?>,
+    throwable: Throwable?,
+  ): Int
+
+  /** Simple wrapper around [Log]. */
+  private class AndroidLogger(
+    tag: String,
+    enabled: Boolean,
+    minLevel: Level,
+  ) : Logger(tag, enabled, minLevel) {
+    override fun log(
+      level: Level,
+      format: String,
+      args: Array<out Any?>,
+      throwable: Throwable?,
+    ): Int {
+      val msg = if (args.isEmpty()) format else String.format(format, *args)
+      return when (level) {
+        Level.VERBOSE -> throwable?.let { Log.v(tag, msg, throwable) } ?: Log.v(tag, msg)
+        Level.DEBUG -> throwable?.let { Log.d(tag, msg, throwable) } ?: Log.d(tag, msg)
+        Level.INFO -> throwable?.let { Log.i(tag, msg, throwable) } ?: Log.i(tag, msg)
+        Level.WARN -> throwable?.let { Log.w(tag, msg, throwable) } ?: Log.w(tag, msg)
+        Level.ERROR -> throwable?.let { Log.e(tag, msg, throwable) } ?: Log.e(tag, msg)
+      }
+    }
+  }
+
+  /** Fake implementation that allows recording and asserting on log messages. */
+  @VisibleForTesting
+  class FakeLogger
+  internal constructor(
+    tag: String,
+    enabled: Boolean,
+    minLevel: Level,
+  ) : Logger(tag, enabled, minLevel) {
+    private val record: MutableList<String> = ArrayList()
+
+    override fun log(
+      level: Level,
+      format: String,
+      args: Array<out Any?>,
+      throwable: Throwable?,
+    ): Int {
+      val logMessage = toLogMessage(level, format, args, throwable = throwable)
+      println("Log: $logMessage")
+      record.add(logMessage)
+      return logMessage.length
+    }
+
+    /** Clear the recorded log messages. */
+    @VisibleForTesting fun clearLogMessages(): Unit = record.clear()
+
+    /** Returns if the record has any message that contains the given [message] as a substring. */
+    @VisibleForTesting
+    fun hasLogMessage(message: String): Boolean = record.any { it.contains(message) }
+
+    /** Returns if the record has any message that matches the given [predicate]. */
+    @VisibleForTesting
+    fun hasLogMessageThat(predicate: (String) -> Boolean): Boolean = record.any(predicate)
+
+    /** Builds a log message from all the log params. */
+    private fun toLogMessage(
+      level: Level,
+      format: String,
+      args: Array<out Any?>,
+      throwable: Throwable?,
+    ): String {
+      val msg = if (args.isEmpty()) format else String.format(format, *args)
+      return throwable?.let { "$level $msg ${Log.getStackTraceString(throwable)}" } ?: "$level $msg"
+    }
+  }
+
+  /** Log levels with each [priority] that matches [Log]. */
+  enum class Level(internal val priority: Int) {
+    VERBOSE(Log.VERBOSE),
+    DEBUG(Log.DEBUG),
+    INFO(Log.INFO),
+    WARN(Log.WARN),
+    ERROR(Log.ERROR),
+  }
+
+  companion object {
+    private val loggers = ConcurrentHashMap<String, Logger>()
+
+    /** Gets (or creates) the single instance of [Logger] with the given [tag]. */
+    @JvmStatic
+    fun getLogger(
+      tag: String,
+      enabled: Boolean = true,
+      minLevel: Level = Level.INFO,
+    ): Logger = loggers.getOrPut(tag) { AndroidLogger(tag, enabled, minLevel) }
+
+    /** Sets (or replaces) the instance of [Logger] with the given [tag] for testing purposes. */
+    @VisibleForTesting
+    @JvmStatic
+    fun setupFakeLogger(
+      tag: String,
+      enabled: Boolean = true,
+      minLevel: Level = Level.DEBUG,
+    ): FakeLogger {
+      val fakeLogger = FakeLogger(tag, enabled, minLevel)
+      loggers[tag] = fakeLogger
+      return fakeLogger
+    }
+  }
+}
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/provider/package-info.java b/firebase-common/src/main/java/com/google/firebase/logger/package-info.java
similarity index 88%
rename from firebase-perf/src/main/java/com/google/firebase/perf/provider/package-info.java
rename to firebase-common/src/main/java/com/google/firebase/logger/package-info.java
index d3aff47a348..94235ba8de6 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/provider/package-info.java
+++ b/firebase-common/src/main/java/com/google/firebase/logger/package-info.java
@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
-//
 // You may obtain a copy of the License at
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
@@ -13,4 +13,4 @@
 // limitations under the License.
 
 /** @hide */
-package com.google.firebase.perf.provider;
+package com.google.firebase.logger;
diff --git a/firebase-common/src/main/java/com/google/firebase/provider/FirebaseInitProvider.java b/firebase-common/src/main/java/com/google/firebase/provider/FirebaseInitProvider.java
index e4db850fa63..20ecd68b823 100644
--- a/firebase-common/src/main/java/com/google/firebase/provider/FirebaseInitProvider.java
+++ b/firebase-common/src/main/java/com/google/firebase/provider/FirebaseInitProvider.java
@@ -27,12 +27,28 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.common.internal.Preconditions;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.StartupTime;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /** Initializes Firebase APIs at app startup time. */
 public class FirebaseInitProvider extends ContentProvider {
-
   private static final String TAG = "FirebaseInitProvider";
 
+  /** @hide */
+  @Nullable private static StartupTime startupTime = StartupTime.now();
+
+  @NonNull private static AtomicBoolean currentlyInitializing = new AtomicBoolean(false);
+
+  /** @hide */
+  public static @Nullable StartupTime getStartupTime() {
+    return startupTime;
+  }
+
+  /** @hide */
+  public static boolean isCurrentlyInitializing() {
+    return currentlyInitializing.get();
+  }
+
   /** Should match the {@link FirebaseInitProvider} authority if $androidId is empty. */
   @VisibleForTesting
   static final String EMPTY_APPLICATION_ID_PROVIDER_AUTHORITY =
@@ -48,12 +64,17 @@ public void attachInfo(@NonNull Context context, @NonNull ProviderInfo info) {
   /** Called before {@link Application#onCreate()}. */
   @Override
   public boolean onCreate() {
-    if (FirebaseApp.initializeApp(getContext()) == null) {
-      Log.i(TAG, "FirebaseApp initialization unsuccessful");
-    } else {
-      Log.i(TAG, "FirebaseApp initialization successful");
+    try {
+      currentlyInitializing.set(true);
+      if (FirebaseApp.initializeApp(getContext()) == null) {
+        Log.i(TAG, "FirebaseApp initialization unsuccessful");
+      } else {
+        Log.i(TAG, "FirebaseApp initialization successful");
+      }
+      return false;
+    } finally {
+      currentlyInitializing.set(false);
     }
-    return false;
   }
 
   /**
diff --git a/firebase-common/src/main/java/com/google/firebase/tracing/ComponentMonitor.java b/firebase-common/src/main/java/com/google/firebase/tracing/ComponentMonitor.java
new file mode 100644
index 00000000000..df16dd5ff4d
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/tracing/ComponentMonitor.java
@@ -0,0 +1,48 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.tracing;
+
+import com.google.firebase.components.Component;
+import com.google.firebase.components.ComponentRegistrar;
+import com.google.firebase.components.ComponentRegistrarProcessor;
+import java.util.ArrayList;
+import java.util.List;
+
+/** Wraps components to trace their initialization time. */
+public class ComponentMonitor implements ComponentRegistrarProcessor {
+  @Override
+  public List<Component<?>> processRegistrar(ComponentRegistrar registrar) {
+    List<Component<?>> components = new ArrayList<>();
+    for (Component comp : registrar.getComponents()) {
+      String name = comp.getName();
+      if (name != null) {
+        @SuppressWarnings("unchecked")
+        Component<Object> old = (Component<Object>) comp;
+        comp =
+            old.withFactory(
+                c -> {
+                  try {
+                    FirebaseTrace.pushTrace(name);
+                    return old.getFactory().create(c);
+                  } finally {
+                    FirebaseTrace.popTrace();
+                  }
+                });
+      }
+      components.add(comp);
+    }
+    return components;
+  }
+}
diff --git a/firebase-common/src/main/java/com/google/firebase/tracing/FirebaseTrace.java b/firebase-common/src/main/java/com/google/firebase/tracing/FirebaseTrace.java
new file mode 100644
index 00000000000..d45375c9de3
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/tracing/FirebaseTrace.java
@@ -0,0 +1,36 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.tracing;
+
+import android.os.Build;
+import android.os.Trace;
+
+/** Utility to consistently wrap trace calls with version checking. */
+public final class FirebaseTrace {
+
+  private FirebaseTrace() {}
+
+  public static void pushTrace(String name) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      Trace.beginSection(name);
+    }
+  }
+
+  public static void popTrace() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      Trace.endSection();
+    }
+  }
+}
diff --git a/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/threads/package-info.java b/firebase-common/src/main/java/com/google/firebase/tracing/package-info.java
similarity index 91%
rename from firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/threads/package-info.java
rename to firebase-common/src/main/java/com/google/firebase/tracing/package-info.java
index 23e006c76d4..4356683e4ac 100644
--- a/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/threads/package-info.java
+++ b/firebase-common/src/main/java/com/google/firebase/tracing/package-info.java
@@ -13,4 +13,4 @@
 // limitations under the License.
 
 /** @hide */
-package com.google.firebase.messaging.directboot.threads;
+package com.google.firebase.tracing;
diff --git a/firebase-common/src/main/java/com/google/firebase/util/RandomUtil.kt b/firebase-common/src/main/java/com/google/firebase/util/RandomUtil.kt
new file mode 100644
index 00000000000..a8e2580c0b9
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/util/RandomUtil.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.util
+
+import kotlin.random.Random
+
+/**
+ * Generates and returns a string containing random alphanumeric characters.
+ *
+ * The characters returned are taken from the set of characters comprising of the 10 numeric digits
+ * and the 26 lowercase English characters.
+ *
+ * @param length the number of random characters to generate and include in the returned string;
+ * must be greater than or equal to zero.
+ * @return a string containing the given number of random alphanumeric characters.
+ *
+ * @hide
+ */
+fun Random.nextAlphanumericString(length: Int): String {
+  require(length >= 0) { "invalid length: $length" }
+  return (0 until length).map { ALPHANUMERIC_ALPHABET.random(this) }.joinToString(separator = "")
+}
+
+// The set of characters comprising of the 10 numeric digits and the 26 lowercase letters of the
+// English alphabet with some characters removed that can look similar in different fonts, like
+// '1', 'l', and 'i'.
+@Suppress("SpellCheckingInspection")
+private const val ALPHANUMERIC_ALPHABET = "23456789abcdefghjkmnpqrstvwxyz"
diff --git a/firebase-common/src/main/java/com/google/firebase/util/package-info.java b/firebase-common/src/main/java/com/google/firebase/util/package-info.java
new file mode 100644
index 00000000000..38a2f81bdcf
--- /dev/null
+++ b/firebase-common/src/main/java/com/google/firebase/util/package-info.java
@@ -0,0 +1,16 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 */
+package com.google.firebase.util;
diff --git a/firebase-common/src/main/res/raw/firebase_common_keep.xml b/firebase-common/src/main/res/raw/firebase_common_keep.xml
new file mode 100644
index 00000000000..f44a10deaab
--- /dev/null
+++ b/firebase-common/src/main/res/raw/firebase_common_keep.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@string/google_app_id,@string/gcm_defaultSenderId,@string/google_api_key,@string/firebase_database_url,@string/ga_trackingId,@string/google_storage_bucket,@string/project_id" />
\ No newline at end of file
diff --git a/firebase-common/src/test/AndroidManifest.xml b/firebase-common/src/test/AndroidManifest.xml
new file mode 100644
index 00000000000..496d08c3da7
--- /dev/null
+++ b/firebase-common/src/test/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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">
+    <application>
+
+        <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
+            <meta-data
+                android:name="com.google.firebase.components:com.google.firebase.concurrent.ExecutorTestsRegistrar"
+                android:value="com.google.firebase.components.ComponentRegistrar" />
+        </service>
+    </application>
+</manifest>
diff --git a/firebase-common/src/test/java/com/google/firebase/DataCollectionPreNDefaultEnabledTest.java b/firebase-common/src/test/java/com/google/firebase/DataCollectionPreNDefaultEnabledTest.java
index 15c3282aea2..6fa54fd6366 100644
--- a/firebase-common/src/test/java/com/google/firebase/DataCollectionPreNDefaultEnabledTest.java
+++ b/firebase-common/src/test/java/com/google/firebase/DataCollectionPreNDefaultEnabledTest.java
@@ -27,7 +27,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(AndroidJUnit4.class)
-@Config(sdk = 19)
+@Config(sdk = 21)
 public class DataCollectionPreNDefaultEnabledTest {
 
   @Test
diff --git a/firebase-common/src/test/java/com/google/firebase/Tests.kt b/firebase-common/src/test/java/com/google/firebase/Tests.kt
new file mode 100644
index 00000000000..efa3ef18817
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/Tests.kt
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.android.gms.tasks.Tasks
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.platforminfo.UserAgentPublisher
+import kotlinx.coroutines.tasks.await
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.fail
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+fun withApp(name: String, block: FirebaseApp.() -> Unit) {
+  val app =
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder().setApplicationId("appId").build(),
+      name
+    )
+  try {
+    block(app)
+  } finally {
+    app.delete()
+  }
+}
+
+class TestException(message: String) : Exception(message)
+
+@RunWith(RobolectricTestRunner::class)
+class VersionTests {
+  @Test
+  fun libraryVersions_shouldBeRegisteredWithRuntime() {
+    withApp("ktxTestApp") {
+      val uaPublisher = get(UserAgentPublisher::class.java)
+      assertThat(uaPublisher.userAgent).contains("kotlin")
+    }
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class KtxTests {
+  @Test
+  fun `Firebase#app should delegate to FirebaseApp#getInstance()`() {
+    withApp(FirebaseApp.DEFAULT_APP_NAME) {
+      assertThat(Firebase.app).isSameInstanceAs(FirebaseApp.getInstance())
+    }
+  }
+
+  @Test
+  fun `Firebase#app(String) should delegate to FirebaseApp#getInstance(String)`() {
+    val appName = "testApp"
+    withApp(appName) {
+      assertThat(Firebase.app(appName)).isSameInstanceAs(FirebaseApp.getInstance(appName))
+    }
+  }
+
+  @Test
+  fun `Firebase#options should delegate to FirebaseApp#getInstance()#options`() {
+    withApp(FirebaseApp.DEFAULT_APP_NAME) {
+      assertThat(Firebase.options).isSameInstanceAs(FirebaseApp.getInstance().options)
+    }
+  }
+
+  @Test
+  fun `Firebase#initialize(Context, FirebaseOptions) should initialize the app correctly`() {
+    val options = FirebaseOptions.Builder().setApplicationId("appId").build()
+    val app = Firebase.initialize(ApplicationProvider.getApplicationContext(), options)
+    try {
+      assertThat(app).isNotNull()
+      assertThat(app.name).isEqualTo(FirebaseApp.DEFAULT_APP_NAME)
+      assertThat(app.options).isSameInstanceAs(options)
+      assertThat(app.applicationContext)
+        .isSameInstanceAs(ApplicationProvider.getApplicationContext())
+    } finally {
+      app.delete()
+    }
+  }
+
+  @Test
+  fun `Firebase#initialize(Context, FirebaseOptions, String) should initialize the app correctly`() {
+    val options = FirebaseOptions.Builder().setApplicationId("appId").build()
+    val name = "appName"
+    val app = Firebase.initialize(ApplicationProvider.getApplicationContext(), options, name)
+    try {
+      assertThat(app).isNotNull()
+      assertThat(app.name).isEqualTo(name)
+      assertThat(app.options).isSameInstanceAs(options)
+      assertThat(app.applicationContext)
+        .isSameInstanceAs(ApplicationProvider.getApplicationContext())
+    } finally {
+      app.delete()
+    }
+  }
+}
+
+class CoroutinesPlayServicesTests {
+  // We are only interested in the await() function offered by kotlinx-coroutines-play-services
+  // So we're not testing the other functions provided by that library.
+
+  @Test
+  fun `Task#await() resolves to the same result as Task#getResult()`() = runTest {
+    val task = Tasks.forResult(21)
+
+    val expected = task.result
+    val actual = task.await()
+
+    assertThat(actual).isEqualTo(expected)
+    assertThat(task.isSuccessful).isTrue()
+    assertThat(task.exception).isNull()
+  }
+
+  @Test
+  fun `Task#await() throws an Exception for failing Tasks`() = runTest {
+    val task = Tasks.forException<TestException>(TestException("some error happened"))
+
+    try {
+      task.await()
+      fail("Task#await should throw an Exception")
+    } catch (e: Exception) {
+      assertThat(e).isInstanceOf(TestException::class.java)
+      assertThat(task.isSuccessful).isFalse()
+    }
+  }
+}
diff --git a/firebase-firestore/src/test/java/com/google/firebase/TimestampTest.java b/firebase-common/src/test/java/com/google/firebase/TimestampTest.java
similarity index 83%
rename from firebase-firestore/src/test/java/com/google/firebase/TimestampTest.java
rename to firebase-common/src/test/java/com/google/firebase/TimestampTest.java
index 0e56938f0a9..5dabf612382 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/TimestampTest.java
+++ b/firebase-common/src/test/java/com/google/firebase/TimestampTest.java
@@ -15,9 +15,10 @@
 package com.google.firebase;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.firebase.firestore.testutil.Assert.assertThrows;
+import static com.google.firebase.common.testutil.Assert.assertThrows;
 
 import android.os.Parcel;
+import java.time.Instant;
 import java.util.Date;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -46,6 +47,19 @@ public void testFromDate() {
     assertThat(actual).isEqualTo(expected);
   }
 
+  @Test
+  public void testFromInstant() {
+    Instant input1 = Instant.now();
+    Timestamp output1 = new Timestamp(input1);
+    assertThat(output1.getSeconds()).isEqualTo(input1.getEpochSecond());
+    assertThat(output1.getNanoseconds()).isEqualTo(input1.getNano());
+
+    Timestamp input2 = new Timestamp(12345, 1);
+    Instant output2 = input2.toInstant();
+    assertThat(input2.getSeconds()).isEqualTo(output2.getEpochSecond());
+    assertThat(input2.getNanoseconds()).isEqualTo(output2.getNano());
+  }
+
   @Test
   public void testCompare() {
     Timestamp[] timestamps = {
diff --git a/firebase-common/src/test/java/com/google/firebase/concurrent/DelegatingScheduledExecutorServiceTest.java b/firebase-common/src/test/java/com/google/firebase/concurrent/DelegatingScheduledExecutorServiceTest.java
new file mode 100644
index 00000000000..0717ddf4ee8
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/concurrent/DelegatingScheduledExecutorServiceTest.java
@@ -0,0 +1,82 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DelegatingScheduledExecutorServiceTest {
+  private final DelegatingScheduledExecutorService service =
+      new DelegatingScheduledExecutorService(
+          Executors.newCachedThreadPool(), Executors.newSingleThreadScheduledExecutor());
+
+  @Test
+  public void schedule_whenCancelled_shouldCancelUnderlyingFuture() {
+    CountDownLatch latch = new CountDownLatch(1);
+    AtomicBoolean ran = new AtomicBoolean();
+    ScheduledFuture<Object> future =
+        service.schedule(
+            () -> {
+              latch.await();
+              ran.set(true);
+              return null;
+            },
+            10,
+            TimeUnit.SECONDS);
+    future.cancel(true);
+    latch.countDown();
+    assertThat(ran.get()).isFalse();
+  }
+
+  @Test
+  public void scheduleAtFixedRate_whenRunnableThrows_shouldCancelSchedule()
+      throws InterruptedException {
+    Semaphore semaphore = new Semaphore(0);
+    AtomicLong ran = new AtomicLong();
+
+    ScheduledFuture<?> future =
+        service.scheduleAtFixedRate(
+            () -> {
+              ran.incrementAndGet();
+              throw new RuntimeException("fail");
+            },
+            1,
+            1,
+            TimeUnit.SECONDS);
+
+    semaphore.release();
+    try {
+      future.get();
+      fail("Expected exception not thrown");
+    } catch (ExecutionException ex) {
+      assertThat(ex.getCause()).isInstanceOf(RuntimeException.class);
+      assertThat(ex.getCause().getMessage()).isEqualTo("fail");
+    }
+    assertThat(ran.get()).isEqualTo(1);
+  }
+}
diff --git a/firebase-common/src/test/java/com/google/firebase/concurrent/ExecutorComponent.java b/firebase-common/src/test/java/com/google/firebase/concurrent/ExecutorComponent.java
new file mode 100644
index 00000000000..0da8650a80f
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/concurrent/ExecutorComponent.java
@@ -0,0 +1,58 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+
+class ExecutorComponent {
+  final ScheduledExecutorService bgScheduledService;
+  final ExecutorService bgService;
+  final Executor bgExecutor;
+
+  final ScheduledExecutorService liteScheduledService;
+  final ExecutorService liteService;
+  final Executor liteExecutor;
+
+  final ScheduledExecutorService blockingScheduledService;
+  final ExecutorService blockingService;
+  final Executor blockingExecutor;
+
+  final Executor uiExecutor;
+
+  public ExecutorComponent(
+      ScheduledExecutorService bgScheduledService,
+      ExecutorService bgService,
+      Executor bgExecutor,
+      ScheduledExecutorService liteScheduledService,
+      ExecutorService liteService,
+      Executor liteExecutor,
+      ScheduledExecutorService blockingScheduledService,
+      ExecutorService blockingService,
+      Executor blockingExecutor,
+      Executor uiExecutor) {
+    this.bgScheduledService = bgScheduledService;
+    this.bgService = bgService;
+    this.bgExecutor = bgExecutor;
+    this.liteScheduledService = liteScheduledService;
+    this.liteService = liteService;
+    this.liteExecutor = liteExecutor;
+    this.blockingScheduledService = blockingScheduledService;
+    this.blockingService = blockingService;
+    this.blockingExecutor = blockingExecutor;
+    this.uiExecutor = uiExecutor;
+  }
+}
diff --git a/firebase-common/src/test/java/com/google/firebase/concurrent/ExecutorComponentTest.java b/firebase-common/src/test/java/com/google/firebase/concurrent/ExecutorComponentTest.java
new file mode 100644
index 00000000000..bf560c88e95
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/concurrent/ExecutorComponentTest.java
@@ -0,0 +1,46 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.FirebaseAppTestUtil.withApp;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.FirebaseOptions;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ExecutorComponentTest {
+  private static final FirebaseOptions OPTIONS =
+      new FirebaseOptions.Builder()
+          .setApiKey("myKey")
+          .setApplicationId("123")
+          .setProjectId("456")
+          .build();
+
+  @Test
+  public void testThatAllExecutorsAreRegisteredByCommon() {
+    withApp(
+        "test",
+        OPTIONS,
+        app -> {
+          ExecutorComponent executorComponent = app.get(ExecutorComponent.class);
+          // If the component is not null, it means it was able to get all of its required
+          // dependencies, otherwise get() would throw.
+          assertThat(executorComponent).isNotNull();
+        });
+  }
+}
diff --git a/firebase-common/src/test/java/com/google/firebase/concurrent/ExecutorTestsRegistrar.java b/firebase-common/src/test/java/com/google/firebase/concurrent/ExecutorTestsRegistrar.java
new file mode 100644
index 00000000000..9fdcf7d428f
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/concurrent/ExecutorTestsRegistrar.java
@@ -0,0 +1,81 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.components.Component;
+import com.google.firebase.components.ComponentRegistrar;
+import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+
+public class ExecutorTestsRegistrar implements ComponentRegistrar {
+  @Override
+  public List<Component<?>> getComponents() {
+    Qualified<ScheduledExecutorService> bgScheduledService =
+        Qualified.qualified(Background.class, ScheduledExecutorService.class);
+    Qualified<ExecutorService> bgService =
+        Qualified.qualified(Background.class, ExecutorService.class);
+    Qualified<Executor> bgExecutor = Qualified.qualified(Background.class, Executor.class);
+
+    Qualified<ScheduledExecutorService> liteScheduledService =
+        Qualified.qualified(Lightweight.class, ScheduledExecutorService.class);
+    Qualified<ExecutorService> liteService =
+        Qualified.qualified(Lightweight.class, ExecutorService.class);
+    Qualified<Executor> liteExecutor = Qualified.qualified(Lightweight.class, Executor.class);
+
+    Qualified<ScheduledExecutorService> blockingScheduledService =
+        Qualified.qualified(Blocking.class, ScheduledExecutorService.class);
+    Qualified<ExecutorService> blockingService =
+        Qualified.qualified(Blocking.class, ExecutorService.class);
+    Qualified<Executor> blockingExecutor = Qualified.qualified(Blocking.class, Executor.class);
+
+    Qualified<Executor> uiExecutor = Qualified.qualified(UiThread.class, Executor.class);
+
+    return Collections.singletonList(
+        Component.builder(ExecutorComponent.class)
+            .add(Dependency.required(bgScheduledService))
+            .add(Dependency.required(bgService))
+            .add(Dependency.required(bgExecutor))
+            .add(Dependency.required(liteScheduledService))
+            .add(Dependency.required(liteService))
+            .add(Dependency.required(liteExecutor))
+            .add(Dependency.required(blockingScheduledService))
+            .add(Dependency.required(blockingService))
+            .add(Dependency.required(blockingExecutor))
+            .add(Dependency.required(uiExecutor))
+            .factory(
+                c ->
+                    new ExecutorComponent(
+                        c.get(bgScheduledService),
+                        c.get(bgService),
+                        c.get(bgExecutor),
+                        c.get(liteScheduledService),
+                        c.get(liteService),
+                        c.get(liteExecutor),
+                        c.get(blockingScheduledService),
+                        c.get(blockingService),
+                        c.get(blockingExecutor),
+                        c.get(uiExecutor)))
+            .build());
+  }
+}
diff --git a/firebase-common/src/test/java/com/google/firebase/concurrent/LimitedConcurrencyExecutorTests.java b/firebase-common/src/test/java/com/google/firebase/concurrent/LimitedConcurrencyExecutorTests.java
new file mode 100644
index 00000000000..6f47a230867
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/concurrent/LimitedConcurrencyExecutorTests.java
@@ -0,0 +1,57 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class LimitedConcurrencyExecutorTests {
+  private final TestExecutor testExecutor = new TestExecutor();
+
+  private final LimitedConcurrencyExecutor executor =
+      new LimitedConcurrencyExecutor(testExecutor, 2);
+
+  @Test
+  public void execute_doesNotExecuteTasks_withConcurrencyMoreThanSpecified() {
+    Runnable runnable1 = mock(Runnable.class);
+    Runnable runnable2 = mock(Runnable.class);
+    Runnable runnable3 = mock(Runnable.class);
+
+    executor.execute(runnable1);
+    executor.execute(runnable2);
+    executor.execute(runnable3);
+
+    assertThat(testExecutor.queue).hasSize(2);
+    testExecutor.step();
+    verify(runnable1, times(1)).run();
+    verify(runnable2, never()).run();
+    verify(runnable3, never()).run();
+
+    assertThat(testExecutor.queue).hasSize(2);
+
+    testExecutor.step();
+    testExecutor.step();
+    verify(runnable2, times(1)).run();
+    verify(runnable3, times(1)).run();
+  }
+}
diff --git a/firebase-common/src/test/java/com/google/firebase/concurrent/PausableExecutorImplTests.java b/firebase-common/src/test/java/com/google/firebase/concurrent/PausableExecutorImplTests.java
new file mode 100644
index 00000000000..c30b70141d6
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/concurrent/PausableExecutorImplTests.java
@@ -0,0 +1,52 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class PausableExecutorImplTests {
+  private final TestExecutor testExecutor = new TestExecutor();
+
+  private final PausableExecutorImpl executor = new PausableExecutorImpl(false, testExecutor);
+
+  @Test
+  public void execute_whenPaused_enqueuesTaskToExecuteWhenResumed() {
+    Runnable runnable1 = mock(Runnable.class);
+    Runnable runnable2 = mock(Runnable.class);
+    Runnable runnable3 = mock(Runnable.class);
+
+    executor.execute(runnable1);
+    executor.execute(runnable2);
+    executor.pause();
+    executor.execute(runnable3);
+    testExecutor.stepAll();
+
+    verify(runnable1, times(1)).run();
+    verify(runnable2, times(1)).run();
+    verify(runnable3, never()).run();
+
+    executor.resume();
+    testExecutor.stepAll();
+    verify(runnable3, times(1)).run();
+  }
+}
diff --git a/firebase-common/src/test/java/com/google/firebase/concurrent/TestExecutor.java b/firebase-common/src/test/java/com/google/firebase/concurrent/TestExecutor.java
new file mode 100644
index 00000000000..870af3de5f5
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/concurrent/TestExecutor.java
@@ -0,0 +1,44 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import androidx.annotation.VisibleForTesting;
+import java.util.Queue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingQueue;
+
+class TestExecutor implements Executor {
+  @VisibleForTesting final Queue<Runnable> queue = new LinkedBlockingQueue<>();
+
+  @Override
+  public void execute(Runnable command) {
+    queue.add(command);
+  }
+
+  void step() {
+    Runnable next = queue.poll();
+    if (next != null) {
+      next.run();
+    }
+  }
+
+  void stepAll() {
+    Runnable next = queue.poll();
+    while (next != null) {
+      next.run();
+      next = queue.poll();
+    }
+  }
+}
diff --git a/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/DefaultHeartBeatControllerTest.java b/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/DefaultHeartBeatControllerTest.java
index 63a61a749ad..fe564ca242e 100644
--- a/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/DefaultHeartBeatControllerTest.java
+++ b/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/DefaultHeartBeatControllerTest.java
@@ -15,6 +15,7 @@
 package com.google.firebase.heartbeatinfo;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.heartbeatinfo.TaskWaiter.await;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -26,7 +27,8 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import androidx.test.core.app.ApplicationProvider;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.common.collect.ImmutableSet;
 import com.google.firebase.platforminfo.UserAgentPublisher;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -35,13 +37,10 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeoutException;
 import java.util.zip.GZIPOutputStream;
-import org.json.JSONException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,39 +48,29 @@
 
 @RunWith(AndroidJUnit4.class)
 public class DefaultHeartBeatControllerTest {
-  private ExecutorService executor;
-  private TestOnCompleteListener<Void> storeOnCompleteListener;
-  private TestOnCompleteListener<String> getOnCompleteListener;
-  private final String DEFAULT_USER_AGENT = "agent1";
-  private HeartBeatInfoStorage storage = mock(HeartBeatInfoStorage.class);
-  private UserAgentPublisher publisher = mock(UserAgentPublisher.class);
-  private static Context applicationContext = ApplicationProvider.getApplicationContext();
-  private final Set<HeartBeatConsumer> logSources =
-      new HashSet<HeartBeatConsumer>() {
-        {
-          add(new HeartBeatConsumer() {});
-        }
-      };
+  private static final String DEFAULT_USER_AGENT = "agent1";
+  private final Executor executor = Executors.newSingleThreadExecutor();
+
+  private final HeartBeatInfoStorage storage = mock(HeartBeatInfoStorage.class);
+  private final UserAgentPublisher publisher = mock(UserAgentPublisher.class);
+  private final Context applicationContext = ApplicationProvider.getApplicationContext();
+  private final Set<HeartBeatConsumer> logSources = ImmutableSet.of(new HeartBeatConsumer() {});
   private DefaultHeartBeatController heartBeatController;
 
   @Before
   public void setUp() {
-    executor = new ThreadPoolExecutor(0, 1, 30L, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
     when(publisher.getUserAgent()).thenReturn(DEFAULT_USER_AGENT);
-    storeOnCompleteListener = new TestOnCompleteListener<>();
-    getOnCompleteListener = new TestOnCompleteListener<>();
     heartBeatController =
         new DefaultHeartBeatController(
             () -> storage, logSources, executor, () -> publisher, applicationContext);
   }
 
   @Test
-  public void whenNoSource_dontStoreHeartBeat() throws ExecutionException, InterruptedException {
+  public void whenNoSource_dontStoreHeartBeat() throws InterruptedException, TimeoutException {
     DefaultHeartBeatController controller =
         new DefaultHeartBeatController(
             () -> storage, new HashSet<>(), executor, () -> publisher, applicationContext);
-    controller.registerHeartBeat().addOnCompleteListener(executor, storeOnCompleteListener);
-    storeOnCompleteListener.await();
+    await(controller.registerHeartBeat());
     verify(storage, times(0)).storeHeartBeat(anyLong(), anyString());
   }
 
@@ -99,31 +88,24 @@ public void getHeartBeatCode_noHeartBeat() {
 
   @Config(sdk = 29)
   @Test
-  public void generateHeartBeat_oneHeartBeat()
-      throws ExecutionException, InterruptedException, JSONException, IOException {
+  public void generateHeartBeat_oneHeartBeat() throws InterruptedException, TimeoutException {
     ArrayList<HeartBeatResult> returnResults = new ArrayList<>();
     returnResults.add(
-        HeartBeatResult.create(
-            "test-agent", new ArrayList<String>(Collections.singleton("2015-02-03"))));
+        HeartBeatResult.create("test-agent", Collections.singletonList("2015-02-03")));
     when(storage.getAllHeartBeats()).thenReturn(returnResults);
-    heartBeatController
-        .registerHeartBeat()
-        .addOnCompleteListener(executor, storeOnCompleteListener);
-    storeOnCompleteListener.await();
+    await(heartBeatController.registerHeartBeat());
     verify(storage, times(1)).storeHeartBeat(anyLong(), anyString());
-    heartBeatController
-        .getHeartBeatsHeader()
-        .addOnCompleteListener(executor, getOnCompleteListener);
     String str =
         "{\"heartbeats\":[{\"agent\":\"test-agent\",\"dates\":[\"2015-02-03\"]}],\"version\":\"2\"}";
     String expected = compress(str);
-    assertThat(getOnCompleteListener.await().replace("\n", "")).isEqualTo(expected);
+    assertThat(await(heartBeatController.getHeartBeatsHeader()).replace("\n", ""))
+        .isEqualTo(expected);
   }
 
   @Config(sdk = 29)
   @Test
   public void firstNewThenOld_synchronizedCorrectly()
-      throws ExecutionException, InterruptedException {
+      throws InterruptedException, TimeoutException {
     Context context = ApplicationProvider.getApplicationContext();
     SharedPreferences heartBeatSharedPreferences =
         context.getSharedPreferences("testHeartBeat", Context.MODE_PRIVATE);
@@ -136,10 +118,8 @@ public void firstNewThenOld_synchronizedCorrectly()
         Base64.getUrlEncoder()
             .withoutPadding()
             .encodeToString("{\"heartbeats\":[],\"version\":\"2\"}".getBytes());
-    controller.registerHeartBeat().addOnCompleteListener(executor, storeOnCompleteListener);
-    storeOnCompleteListener.await();
-    controller.getHeartBeatsHeader().addOnCompleteListener(executor, getOnCompleteListener);
-    String output = getOnCompleteListener.await();
+    await(controller.registerHeartBeat());
+    String output = await(controller.getHeartBeatsHeader());
     assertThat(output.replace("\n", "")).isNotEqualTo(emptyString);
     int heartBeatCode = controller.getHeartBeatCode("test").getCode();
     assertThat(heartBeatCode).isEqualTo(0);
@@ -148,7 +128,7 @@ public void firstNewThenOld_synchronizedCorrectly()
   @Config(sdk = 29)
   @Test
   public void firstOldThenNew_synchronizedCorrectly()
-      throws ExecutionException, InterruptedException, IOException {
+      throws InterruptedException, TimeoutException {
     Context context = ApplicationProvider.getApplicationContext();
     SharedPreferences heartBeatSharedPreferences =
         context.getSharedPreferences("testHeartBeat", Context.MODE_PRIVATE);
@@ -158,46 +138,36 @@ public void firstOldThenNew_synchronizedCorrectly()
         new DefaultHeartBeatController(
             () -> heartBeatInfoStorage, logSources, executor, () -> publisher, context);
     String emptyString = compress("{\"heartbeats\":[],\"version\":\"2\"}");
-    controller.registerHeartBeat().addOnCompleteListener(executor, storeOnCompleteListener);
-    storeOnCompleteListener.await();
+    await(controller.registerHeartBeat());
     int heartBeatCode = controller.getHeartBeatCode("test").getCode();
     assertThat(heartBeatCode).isEqualTo(2);
-    controller.getHeartBeatsHeader().addOnCompleteListener(executor, getOnCompleteListener);
-    String output = getOnCompleteListener.await();
+    String output = await(controller.getHeartBeatsHeader());
     assertThat(output.replace("\n", "")).isEqualTo(emptyString);
-    controller.registerHeartBeat().addOnCompleteListener(executor, storeOnCompleteListener);
-    storeOnCompleteListener.await();
-    controller.getHeartBeatsHeader().addOnCompleteListener(executor, getOnCompleteListener);
-    output = getOnCompleteListener.await();
+
+    await(controller.registerHeartBeat());
+    await(controller.getHeartBeatsHeader());
     assertThat(output.replace("\n", "")).isEqualTo(emptyString);
   }
 
   @Config(sdk = 29)
   @Test
   public void generateHeartBeat_twoHeartBeatsSameUserAgent()
-      throws ExecutionException, InterruptedException, JSONException, IOException {
+      throws InterruptedException, TimeoutException {
     ArrayList<HeartBeatResult> returnResults = new ArrayList<>();
     ArrayList<String> dateList = new ArrayList<>();
     dateList.add("2015-03-02");
     dateList.add("2015-03-01");
     returnResults.add(HeartBeatResult.create("test-agent", dateList));
     when(storage.getAllHeartBeats()).thenReturn(returnResults);
-    heartBeatController
-        .registerHeartBeat()
-        .addOnCompleteListener(executor, storeOnCompleteListener);
-    storeOnCompleteListener.await();
-    heartBeatController
-        .registerHeartBeat()
-        .addOnCompleteListener(executor, storeOnCompleteListener);
-    storeOnCompleteListener.await();
+    await(heartBeatController.registerHeartBeat());
+    await(heartBeatController.registerHeartBeat());
     verify(storage, times(2)).storeHeartBeat(anyLong(), anyString());
-    heartBeatController
-        .getHeartBeatsHeader()
-        .addOnCompleteListener(executor, getOnCompleteListener);
+
     String str =
         "{\"heartbeats\":[{\"agent\":\"test-agent\",\"dates\":[\"2015-03-02\",\"2015-03-01\"]}],\"version\":\"2\"}";
     String expected = compress(str);
-    assertThat(getOnCompleteListener.await().replace("\n", "")).isEqualTo(expected);
+    assertThat(await(heartBeatController.getHeartBeatsHeader()).replace("\n", ""))
+        .isEqualTo(expected);
   }
 
   private static String base64Encode(byte[] input) {
@@ -218,38 +188,28 @@ private static byte[] gzip(String input) {
     }
   }
 
-  private String compress(String str) throws IOException {
+  private String compress(String str) {
     return base64Encode(gzip(str));
   }
 
   @Config(sdk = 29)
   @Test
   public void generateHeartBeat_twoHeartBeatstwoUserAgents()
-      throws ExecutionException, InterruptedException, JSONException, IOException {
+      throws InterruptedException, TimeoutException {
     ArrayList<HeartBeatResult> returnResults = new ArrayList<>();
     returnResults.add(
-        HeartBeatResult.create(
-            "test-agent", new ArrayList<String>(Collections.singleton("2015-03-02"))));
+        HeartBeatResult.create("test-agent", Collections.singletonList("2015-03-02")));
     returnResults.add(
-        HeartBeatResult.create(
-            "test-agent-1", new ArrayList<String>(Collections.singleton("2015-03-03"))));
+        HeartBeatResult.create("test-agent-1", Collections.singletonList("2015-03-03")));
     when(storage.getAllHeartBeats()).thenReturn(returnResults);
-    heartBeatController
-        .registerHeartBeat()
-        .addOnCompleteListener(executor, storeOnCompleteListener);
-    storeOnCompleteListener.await();
-    heartBeatController
-        .registerHeartBeat()
-        .addOnCompleteListener(executor, storeOnCompleteListener);
-    storeOnCompleteListener.await();
-    Thread.sleep(1000);
+    await(heartBeatController.registerHeartBeat());
+    await(heartBeatController.registerHeartBeat());
+
     verify(storage, times(2)).storeHeartBeat(anyLong(), anyString());
-    heartBeatController
-        .getHeartBeatsHeader()
-        .addOnCompleteListener(executor, getOnCompleteListener);
     String str =
         "{\"heartbeats\":[{\"agent\":\"test-agent\",\"dates\":[\"2015-03-02\"]},{\"agent\":\"test-agent-1\",\"dates\":[\"2015-03-03\"]}],\"version\":\"2\"}";
     String expected = compress(str);
-    assertThat(getOnCompleteListener.await().replace("\n", "")).isEqualTo(expected);
+    assertThat(await(heartBeatController.getHeartBeatsHeader()).replace("\n", ""))
+        .isEqualTo(expected);
   }
 }
diff --git a/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorageTest.java b/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorageTest.java
index 8e06cfda5a5..81b191f117d 100644
--- a/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorageTest.java
+++ b/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorageTest.java
@@ -22,6 +22,7 @@
 import androidx.test.runner.AndroidJUnit4;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -75,6 +76,28 @@ public void storeOneHeartbeat_storesProperly() {
     assertThat(results.size()).isEqualTo(0);
   }
 
+  @Config(sdk = 29)
+  @Test
+  public void storeOneHeartbeat_updatesProperly() {
+    assertThat(heartBeatInfoStorage.getHeartBeatCount()).isEqualTo(0);
+    heartBeatInfoStorage.storeHeartBeat(0, "test-agent");
+    assertThat(heartBeatInfoStorage.getHeartBeatCount()).isEqualTo(1);
+    heartBeatInfoStorage.storeHeartBeat(10, "test-agent-1");
+    ArrayList<HeartBeatResult> results =
+        (ArrayList<HeartBeatResult>) heartBeatInfoStorage.getAllHeartBeats();
+    assertThat(results.size()).isEqualTo(1);
+    assertThat(results.get(0).getUserAgent()).isEqualTo("test-agent-1");
+    assertThat(results.get(0).getUsedDates())
+        .isEqualTo(new ArrayList<String>(Collections.singleton("1970-01-01")));
+    heartBeatInfoStorage.deleteAllHeartBeats();
+    heartBeatInfoStorage.storeHeartBeat(100, "test-agent-2");
+    heartBeatInfoStorage.storeHeartBeat(1000, "test-agent-1");
+    // Since the heartbeat is already sent for today no new heartbeats should be sent.
+    assertThat(heartBeatInfoStorage.getHeartBeatCount()).isEqualTo(0);
+    results = (ArrayList<HeartBeatResult>) heartBeatInfoStorage.getAllHeartBeats();
+    assertThat(results.size()).isEqualTo(0);
+  }
+
   @Config(sdk = 29)
   @Test
   public void storeTwoHeartbeat_storesProperly() {
@@ -157,6 +180,22 @@ public void shouldSendGlobalHeartBeat_answerIsNo() {
     assertThat(heartBeatInfoStorage.shouldSendGlobalHeartBeat(1)).isFalse();
   }
 
+  @Test
+  public void currentDayHeartbeatNotSent_updatesCorrectly() {
+    long millis = System.currentTimeMillis();
+    assertThat(heartBeatInfoStorage.getHeartBeatCount()).isEqualTo(0);
+    heartBeatInfoStorage.storeHeartBeat(millis, "test-agent");
+    assertThat(heartBeatInfoStorage.getHeartBeatCount()).isEqualTo(1);
+    assertThat(heartBeatInfoStorage.getAllHeartBeats().size()).isEqualTo(0);
+    heartBeatInfoStorage.deleteAllHeartBeats();
+    assertThat(heartBeatInfoStorage.getHeartBeatCount()).isEqualTo(1);
+    assertThat(heartBeatSharedPreferences.getStringSet("test-agent", new HashSet<>())).isNotEmpty();
+    heartBeatInfoStorage.storeHeartBeat(millis, "test-agent-1");
+    assertThat(heartBeatSharedPreferences.getStringSet("test-agent", new HashSet<>())).isEmpty();
+    assertThat(heartBeatSharedPreferences.getStringSet("test-agent-1", new HashSet<>()))
+        .isNotEmpty();
+  }
+
   @Test
   public void postHeartBeatCleanUp_worksCorrectly() {
     long millis = System.currentTimeMillis();
@@ -164,7 +203,7 @@ public void postHeartBeatCleanUp_worksCorrectly() {
     heartBeatInfoStorage.storeHeartBeat(millis, "test-agent");
     // Get global heartbeat using old method
     assertThat(heartBeatInfoStorage.shouldSendGlobalHeartBeat(millis)).isTrue();
-    assertThat(heartBeatInfoStorage.getAllHeartBeats().size()).isEqualTo(1);
+    assertThat(heartBeatInfoStorage.getAllHeartBeats().size()).isEqualTo(0);
     heartBeatInfoStorage.postHeartBeatCleanUp();
     assertThat(heartBeatInfoStorage.getAllHeartBeats().size()).isEqualTo(0);
     // Try storing using new method again.
diff --git a/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/TaskWaiter.java b/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/TaskWaiter.java
new file mode 100644
index 00000000000..3de11613829
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/TaskWaiter.java
@@ -0,0 +1,56 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.heartbeatinfo;
+
+import androidx.annotation.NonNull;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Helper listener that works around a limitation of the Tasks API where await() cannot be called on
+ * the main thread.
+ */
+public class TaskWaiter<TResult> implements OnCompleteListener<TResult> {
+  private static final long TIMEOUT_MS = 500000;
+  private final CountDownLatch latch = new CountDownLatch(1);
+  private final Task<TResult> task;
+
+  private TaskWaiter(Task<TResult> task) {
+    this.task = task;
+    task.addOnCompleteListener(Runnable::run, this);
+  }
+
+  @Override
+  public void onComplete(@NonNull Task<TResult> task) {
+    latch.countDown();
+  }
+
+  public TResult await() throws InterruptedException, TimeoutException {
+    if (!task.isComplete() && !latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+      throw new TimeoutException("timed out waiting for result");
+    }
+    return task.getResult();
+  }
+
+  @CanIgnoreReturnValue
+  public static <TResult> TResult await(Task<TResult> task)
+      throws InterruptedException, TimeoutException {
+    return new TaskWaiter<>(task).await();
+  }
+}
diff --git a/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/TestOnCompleteListener.java b/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/TestOnCompleteListener.java
deleted file mode 100644
index 1f6d9078621..00000000000
--- a/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/TestOnCompleteListener.java
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.heartbeatinfo;
-
-import androidx.annotation.NonNull;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
-import java.io.IOException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Helper listener that works around a limitation of the Tasks API where await() cannot be called on
- * the main thread. This listener works around it by running itself on a different thread, thus
- * allowing the main thread to be woken up when the Tasks complete.
- */
-public class TestOnCompleteListener<TResult> implements OnCompleteListener<TResult> {
-  private static final long TIMEOUT_MS = 5000;
-  private final CountDownLatch latch = new CountDownLatch(1);
-  private Task<TResult> task;
-  private volatile TResult result;
-  private volatile Exception exception;
-  private volatile boolean successful;
-
-  @Override
-  public void onComplete(@NonNull Task<TResult> task) {
-    this.task = task;
-    successful = task.isSuccessful();
-    if (successful) {
-      result = task.getResult();
-    } else {
-      exception = task.getException();
-    }
-    latch.countDown();
-  }
-
-  /** Blocks until the {@link #onComplete} is called. */
-  public TResult await() throws InterruptedException, ExecutionException {
-    if (!latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
-      throw new InterruptedException("timed out waiting for result");
-    }
-    if (successful) {
-      return result;
-    } else {
-      if (exception instanceof InterruptedException) {
-        throw (InterruptedException) exception;
-      }
-      if (exception instanceof IOException) {
-        throw new ExecutionException(exception);
-      }
-      throw new IllegalStateException("got an unexpected exception type", exception);
-    }
-  }
-}
diff --git a/firebase-common/src/test/java/com/google/firebase/ktx/Tests.kt b/firebase-common/src/test/java/com/google/firebase/ktx/Tests.kt
new file mode 100644
index 00000000000..4adc1167dbc
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/ktx/Tests.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.android.gms.tasks.Tasks
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.platforminfo.UserAgentPublisher
+import kotlinx.coroutines.tasks.await
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.fail
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+fun withApp(name: String, block: FirebaseApp.() -> Unit) {
+  val app =
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder().setApplicationId("appId").build(),
+      name
+    )
+  try {
+    block(app)
+  } finally {
+    app.delete()
+  }
+}
+
+class TestException(message: String) : Exception(message)
+
+@RunWith(RobolectricTestRunner::class)
+class VersionTests {
+  @Test
+  fun libraryVersions_shouldBeRegisteredWithRuntime() {
+    withApp("ktxTestApp") {
+      val uaPublisher = get(UserAgentPublisher::class.java)
+      assertThat(uaPublisher.userAgent).contains("kotlin")
+    }
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class KtxTests {
+  @Test
+  fun `Firebase#app should delegate to FirebaseApp#getInstance()`() {
+    withApp(FirebaseApp.DEFAULT_APP_NAME) {
+      assertThat(Firebase.app).isSameInstanceAs(FirebaseApp.getInstance())
+    }
+  }
+
+  @Test
+  fun `Firebase#app(String) should delegate to FirebaseApp#getInstance(String)`() {
+    val appName = "testApp"
+    withApp(appName) {
+      assertThat(Firebase.app(appName)).isSameInstanceAs(FirebaseApp.getInstance(appName))
+    }
+  }
+
+  @Test
+  fun `Firebase#options should delegate to FirebaseApp#getInstance()#options`() {
+    withApp(FirebaseApp.DEFAULT_APP_NAME) {
+      assertThat(Firebase.options).isSameInstanceAs(FirebaseApp.getInstance().options)
+    }
+  }
+
+  @Test
+  fun `Firebase#initialize(Context, FirebaseOptions) should initialize the app correctly`() {
+    val options = FirebaseOptions.Builder().setApplicationId("appId").build()
+    val app = Firebase.initialize(ApplicationProvider.getApplicationContext(), options)
+    try {
+      assertThat(app).isNotNull()
+      assertThat(app.name).isEqualTo(FirebaseApp.DEFAULT_APP_NAME)
+      assertThat(app.options).isSameInstanceAs(options)
+      assertThat(app.applicationContext)
+        .isSameInstanceAs(ApplicationProvider.getApplicationContext())
+    } finally {
+      app.delete()
+    }
+  }
+
+  @Test
+  fun `Firebase#initialize(Context, FirebaseOptions, String) should initialize the app correctly`() {
+    val options = FirebaseOptions.Builder().setApplicationId("appId").build()
+    val name = "appName"
+    val app = Firebase.initialize(ApplicationProvider.getApplicationContext(), options, name)
+    try {
+      assertThat(app).isNotNull()
+      assertThat(app.name).isEqualTo(name)
+      assertThat(app.options).isSameInstanceAs(options)
+      assertThat(app.applicationContext)
+        .isSameInstanceAs(ApplicationProvider.getApplicationContext())
+    } finally {
+      app.delete()
+    }
+  }
+}
+
+class CoroutinesPlayServicesTests {
+  // We are only interested in the await() function offered by kotlinx-coroutines-play-services
+  // So we're not testing the other functions provided by that library.
+
+  @Test
+  fun `Task#await() resolves to the same result as Task#getResult()`() = runTest {
+    val task = Tasks.forResult(21)
+
+    val expected = task.result
+    val actual = task.await()
+
+    assertThat(actual).isEqualTo(expected)
+    assertThat(task.isSuccessful).isTrue()
+    assertThat(task.exception).isNull()
+  }
+
+  @Test
+  fun `Task#await() throws an Exception for failing Tasks`() = runTest {
+    val task = Tasks.forException<TestException>(TestException("some error happened"))
+
+    try {
+      task.await()
+      fail("Task#await should throw an Exception")
+    } catch (e: Exception) {
+      assertThat(e).isInstanceOf(TestException::class.java)
+      assertThat(task.isSuccessful).isFalse()
+    }
+  }
+}
diff --git a/firebase-common/src/test/java/com/google/firebase/platforminfo/FirebasePlatformLoggingTest.java b/firebase-common/src/test/java/com/google/firebase/platforminfo/FirebasePlatformLoggingTest.java
index 9421e28d087..86172a107ce 100644
--- a/firebase-common/src/test/java/com/google/firebase/platforminfo/FirebasePlatformLoggingTest.java
+++ b/firebase-common/src/test/java/com/google/firebase/platforminfo/FirebasePlatformLoggingTest.java
@@ -70,22 +70,6 @@ public void test_watch_atHighEnoughApiLevel() {
         });
   }
 
-  @Test
-  @Config(sdk = Build.VERSION_CODES.KITKAT)
-  public void test_watch_atNotHighEnoughApiLevel() {
-    ShadowPackageManager shadowPackageManager =
-        shadowOf(ApplicationProvider.getApplicationContext().getPackageManager());
-    shadowPackageManager.setSystemFeature(PackageManager.FEATURE_WATCH, true);
-    withApp(
-        "myApp",
-        OPTIONS,
-        app -> {
-          UserAgentPublisher ua = app.get(UserAgentPublisher.class);
-
-          assertThat(ua.getUserAgent()).containsMatch(Pattern.compile("android-platform/($|\\s)"));
-        });
-  }
-
   @Test
   @Config(sdk = Build.VERSION_CODES.O)
   public void test_auto_atHighEnoughApiLevel() {
diff --git a/firebase-common/src/test/java/com/google/firebase/tracing/ComponentMonitorTest.java b/firebase-common/src/test/java/com/google/firebase/tracing/ComponentMonitorTest.java
new file mode 100644
index 00000000000..e28f0d4e523
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/tracing/ComponentMonitorTest.java
@@ -0,0 +1,58 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.tracing;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.components.Component;
+import com.google.firebase.components.ComponentContainer;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ComponentMonitorTest {
+
+  @Test
+  public void testComponentMonitorTransformation() {
+    List<Component<?>> list = new ArrayList<Component<?>>();
+    list.add(
+        Component.builder(ComponentHolder.class)
+            .factory(ComponentHolder::new)
+            .name("test")
+            .build());
+    list.add(
+        Component.builder(ComponentHolder.class).factory(ComponentHolder::new).name("foo").build());
+    list.add(
+        Component.builder(ComponentHolder.class).factory(ComponentHolder::new).name("bar").build());
+    ComponentMonitor monitor = new ComponentMonitor();
+    List<Component<?>> transformed = monitor.processRegistrar(() -> list);
+    assertThat(list.size()).isEqualTo(transformed.size());
+    for (int i = 0; i < list.size(); i++) {
+      assertThat(list.get(i).getName()).isEqualTo(transformed.get(i).getName());
+      assertThat(transformed.get(i).getFactory().create(null)).isNotNull();
+    }
+  }
+
+  private static final class ComponentHolder {
+    private final ComponentContainer container;
+
+    public ComponentHolder(ComponentContainer container) {
+      this.container = container;
+    }
+  }
+}
diff --git a/firebase-common/src/test/java/com/google/firebase/util/RandomUtilTest.kt b/firebase-common/src/test/java/com/google/firebase/util/RandomUtilTest.kt
new file mode 100644
index 00000000000..8b2e881f425
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/util/RandomUtilTest.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.util
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.common.truth.Truth.assertWithMessage
+import kotlin.random.Random
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class RandomUtilTest {
+
+  @Test
+  fun `nextAlphanumericString() should return an empty string if the given 'length' is 0`() {
+    val generatedStringWithLengthOf0 = Random.nextAlphanumericString(0)
+
+    assertThat(generatedStringWithLengthOf0.length).isEqualTo(0)
+  }
+
+  @Test
+  fun `nextAlphanumericString() should return a string of length 1 if the given 'length' is 1`() {
+    val generatedStringWithLengthOf1 = Random.nextAlphanumericString(1)
+
+    assertThat(generatedStringWithLengthOf1.length).isEqualTo(1)
+  }
+
+  @Test
+  fun `nextAlphanumericString() should return a string of length 1000 if the given 'length' is 1000`() {
+    val generatedStringWithLengthOf1000 = Random.nextAlphanumericString(1000)
+
+    assertThat(generatedStringWithLengthOf1000.length).isEqualTo(1000)
+  }
+
+  @Test
+  fun `nextAlphanumericString() should throw if 'length' is less than zero`() {
+    val exception =
+      assertThrows(IllegalArgumentException::class.java) { Random.nextAlphanumericString(-1) }
+    assertThat(exception).hasMessageThat().containsMatch("(\\W|^)length(\\W|$)")
+    assertThat(exception).hasMessageThat().containsMatch("(\\W|^)-1(\\W|$)")
+  }
+
+  @Test
+  fun `nextAlphanumericString() should return a different string each time it is invoked`() {
+    val generatedStrings = buildList { repeat(100) { add(Random.nextAlphanumericString(10)) } }
+
+    assertThat(generatedStrings).containsNoDuplicates()
+  }
+
+  @Test
+  fun `nextAlphanumericString() should return a string containing only alphanumeric characters`() {
+    val generatedString = Random.nextAlphanumericString(10000)
+
+    val unexpectedCharacters =
+      generatedString.filter { !VALID_ALPHNUMERIC_CHARACTERS.contains(it) }.toSortedSet()
+    assertWithMessage("unexpectedCharacters").that(unexpectedCharacters).isEmpty()
+  }
+
+  private companion object {
+    @Suppress("SpellCheckingInspection")
+    const val VALID_ALPHNUMERIC_CHARACTERS = "01234567890abcdefghijklmnopqrstuvwxyz"
+  }
+}
diff --git a/firebase-components/CHANGELOG.md b/firebase-components/CHANGELOG.md
new file mode 100644
index 00000000000..33cae6e1ca5
--- /dev/null
+++ b/firebase-components/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+
+# 17.1.2
+* [changed] Internal changes to ensure only one interface is provided for
+  kotlinx.coroutines.CoroutineDispatcher interfaces when both firebase-common and
+  firebase-common-ktx provide them.
diff --git a/firebase-components/firebase-components.gradle b/firebase-components/firebase-components.gradle
deleted file mode 100644
index 8e5eb678fa7..00000000000
--- a/firebase-components/firebase-components.gradle
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-plugins {
-    id 'firebase-library'
-}
-
-firebaseLibrary {
-    publishSources = true
-}
-
-android {
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-      minSdkVersion project.minSdkVersion
-      targetSdkVersion project.targetSdkVersion
-      versionName version
-      testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-      consumerProguardFiles 'proguard.txt'
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
-}
-
-dependencies {
-    implementation project(':firebase-annotations')
-    implementation 'androidx.annotation:annotation:1.1.0'
-
-    testImplementation 'androidx.test:runner:1.2.0'
-    testImplementation 'androidx.test.ext:junit:1.1.1'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.13'
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-
-}
diff --git a/firebase-components/firebase-components.gradle.kts b/firebase-components/firebase-components.gradle.kts
new file mode 100644
index 00000000000..26563065d32
--- /dev/null
+++ b/firebase-components/firebase-components.gradle.kts
@@ -0,0 +1,56 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+    id("firebase-library")
+}
+
+firebaseLibrary {
+    publishSources = true
+    publishJavadoc = false
+    publishReleaseNotes = false
+}
+
+android {
+  val compileSdkVersion : Int by rootProject
+  val targetSdkVersion : Int by rootProject
+  val minSdkVersion : Int by rootProject
+  compileSdk = compileSdkVersion
+  namespace = "com.google.firebase.components"
+  defaultConfig {
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+    multiDexEnabled = true
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    consumerProguardFiles("proguard.txt")
+  }
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+  testOptions.unitTests.isIncludeAndroidResources = true
+}
+
+dependencies {
+  api("com.google.firebase:firebase-annotations:16.2.0")
+  implementation(libs.androidx.annotation)
+  implementation(libs.errorprone.annotations)
+
+  testImplementation(libs.androidx.test.junit)
+  testImplementation(libs.androidx.test.runner)
+  testImplementation(libs.junit)
+  testImplementation(libs.mockito.core)
+  testImplementation(libs.robolectric)
+  testImplementation(libs.truth)
+}
diff --git a/firebase-components/firebase-dynamic-module-support/CHANGELOG.md b/firebase-components/firebase-dynamic-module-support/CHANGELOG.md
new file mode 100644
index 00000000000..8f757dc93a9
--- /dev/null
+++ b/firebase-components/firebase-dynamic-module-support/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Unreleased
+
+
+# 16.0.0-beta03
+* [changed] Updated dependency of play-services-basement to its latest version (v18.1.0).
diff --git a/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle b/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle
deleted file mode 100644
index 2a3c50506b8..00000000000
--- a/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-plugins {
-    id 'firebase-library'
-}
-
-group = 'com.google.firebase'
-
-firebaseLibrary {
-    testLab.enabled = false
-    publishSources = true
-}
-
-android {
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-      minSdkVersion project.minSdkVersion
-      targetSdkVersion project.targetSdkVersion
-      versionName version
-      testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
-}
-
-dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation 'com.google.android.play:core:1.9.0'
-}
diff --git a/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts b/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts
new file mode 100644
index 00000000000..b1e5ee7fd40
--- /dev/null
+++ b/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts
@@ -0,0 +1,51 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+  id("firebase-library")
+}
+
+group = "com.google.firebase"
+
+firebaseLibrary {
+  testLab.enabled = false
+  publishSources = true
+  publishJavadoc = false
+}
+
+android {
+  val compileSdkVersion : Int by rootProject
+  val targetSdkVersion : Int by rootProject
+  val minSdkVersion : Int by rootProject
+  compileSdk = compileSdkVersion
+  namespace = "com.google.firebase.dynamicloading"
+  defaultConfig {
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+    multiDexEnabled = true
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+  }
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+  testOptions.unitTests.isIncludeAndroidResources = true
+}
+
+dependencies {
+  implementation("com.google.android.play:feature-delivery:2.0.0")
+  implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22")
+  api("com.google.firebase:firebase-common:21.0.0")
+  api("com.google.firebase:firebase-components:18.0.0")
+}
diff --git a/firebase-components/firebase-dynamic-module-support/gradle.properties b/firebase-components/firebase-dynamic-module-support/gradle.properties
index 9cffccf15d6..4b7021762ba 100644
--- a/firebase-components/firebase-dynamic-module-support/gradle.properties
+++ b/firebase-components/firebase-dynamic-module-support/gradle.properties
@@ -13,3 +13,4 @@
 # limitations under the License.
 
 version=16.0.1
+latestReleasedVersion=16.0.0-beta03
diff --git a/firebase-components/firebase-dynamic-module-support/src/main/AndroidManifest.xml b/firebase-components/firebase-dynamic-module-support/src/main/AndroidManifest.xml
index f2ead955d84..cd206b5e41f 100644
--- a/firebase-components/firebase-dynamic-module-support/src/main/AndroidManifest.xml
+++ b/firebase-components/firebase-dynamic-module-support/src/main/AndroidManifest.xml
@@ -14,10 +14,9 @@
 <!-- limitations under the License. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.firebase.dynamicloading">
+    xmlns:tools="http://schemas.android.com/tools">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 
   <application>
     <service
diff --git a/firebase-components/firebase-dynamic-module-support/src/main/java/com/google/firebase/dynamicloading/DynamicLoadingRegistrar.java b/firebase-components/firebase-dynamic-module-support/src/main/java/com/google/firebase/dynamicloading/DynamicLoadingRegistrar.java
index 2aad8b5ba7d..2eb941f7a93 100644
--- a/firebase-components/firebase-dynamic-module-support/src/main/java/com/google/firebase/dynamicloading/DynamicLoadingRegistrar.java
+++ b/firebase-components/firebase-dynamic-module-support/src/main/java/com/google/firebase/dynamicloading/DynamicLoadingRegistrar.java
@@ -23,11 +23,13 @@
 import java.util.List;
 
 public class DynamicLoadingRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-dyn-mod";
 
   @Override
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(DynamicLoadingSupport.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(Context.class))
             .add(Dependency.required(ComponentLoader.class))
             .alwaysEager()
@@ -36,6 +38,6 @@ public List<Component<?>> getComponents() {
                     new DynamicLoadingSupport(
                         container.get(Context.class), container.get(ComponentLoader.class)))
             .build(),
-        LibraryVersionComponent.create("fire-dyn-mod", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-components/gradle.properties b/firebase-components/gradle.properties
index 126899fd026..4aa70ed1d03 100644
--- a/firebase-components/gradle.properties
+++ b/firebase-components/gradle.properties
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=17.0.1
-latestReleasedVersion=17.0.0
+version=18.0.0
+latestReleasedVersion=17.1.5
diff --git a/firebase-components/src/main/AndroidManifest.xml b/firebase-components/src/main/AndroidManifest.xml
index 3194ff067b4..19f479e4fd1 100644
--- a/firebase-components/src/main/AndroidManifest.xml
+++ b/firebase-components/src/main/AndroidManifest.xml
@@ -13,8 +13,7 @@
 <!-- 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="com.google.firebase.components">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 </manifest>
diff --git a/firebase-components/src/main/java/com/google/firebase/components/Component.java b/firebase-components/src/main/java/com/google/firebase/components/Component.java
index 21ca68b7049..768baa48568 100644
--- a/firebase-components/src/main/java/com/google/firebase/components/Component.java
+++ b/firebase-components/src/main/java/com/google/firebase/components/Component.java
@@ -15,6 +15,9 @@
 package com.google.firebase.components;
 
 import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
@@ -76,7 +79,8 @@ public final class Component<T> {
     int SET = 1;
   }
 
-  private final Set<Class<? super T>> providedInterfaces;
+  private final String name;
+  private final Set<Qualified<? super T>> providedInterfaces;
   private final Set<Dependency> dependencies;
   private final @Instantiation int instantiation;
   private final @ComponentType int type;
@@ -84,12 +88,14 @@ public final class Component<T> {
   private final Set<Class<?>> publishedEvents;
 
   private Component(
-      Set<Class<? super T>> providedInterfaces,
+      @Nullable String name,
+      Set<Qualified<? super T>> providedInterfaces,
       Set<Dependency> dependencies,
       @Instantiation int instantiation,
       @ComponentType int type,
       ComponentFactory<T> factory,
       Set<Class<?>> publishedEvents) {
+    this.name = name;
     this.providedInterfaces = Collections.unmodifiableSet(providedInterfaces);
     this.dependencies = Collections.unmodifiableSet(dependencies);
     this.instantiation = instantiation;
@@ -98,12 +104,22 @@ private Component(
     this.publishedEvents = Collections.unmodifiableSet(publishedEvents);
   }
 
+  /**
+   * Optional name of the component.
+   *
+   * <p>Used for debug purposes only.
+   */
+  @Nullable
+  public String getName() {
+    return name;
+  }
+
   /**
    * Returns all interfaces this component provides.
    *
    * <p>Note: T conforms to all of these interfaces.
    */
-  public Set<Class<? super T>> getProvidedInterfaces() {
+  public Set<Qualified<? super T>> getProvidedInterfaces() {
     return providedInterfaces;
   }
 
@@ -153,6 +169,12 @@ public boolean isValue() {
     return type == ComponentType.VALUE;
   }
 
+  /** Creates a copy of the component with {@link ComponentFactory} replaced. */
+  public Component<T> withFactory(ComponentFactory<T> factory) {
+    return new Component<>(
+        name, providedInterfaces, dependencies, instantiation, type, factory, publishedEvents);
+  }
+
   @Override
   public String toString() {
     StringBuilder sb =
@@ -180,6 +202,18 @@ public static <T> Component.Builder<T> builder(
     return new Builder<>(anInterface, additionalInterfaces);
   }
 
+  /** Returns a Component<T> builder. */
+  public static <T> Component.Builder<T> builder(Qualified<T> anInterface) {
+    return new Builder<>(anInterface);
+  }
+
+  /** Returns a Component<T> builder. */
+  @SafeVarargs
+  public static <T> Component.Builder<T> builder(
+      Qualified<T> anInterface, Qualified<? super T>... additionalInterfaces) {
+    return new Builder<>(anInterface, additionalInterfaces);
+  }
+
   /**
    * Wraps a value in a {@link Component} with no dependencies.
    *
@@ -197,6 +231,13 @@ public static <T> Component<T> of(
     return builder(anInterface, additionalInterfaces).factory((args) -> value).build();
   }
 
+  /** Wraps a value in a {@link Component} with no dependencies. */
+  @SafeVarargs
+  public static <T> Component<T> of(
+      T value, Qualified<T> anInterface, Qualified<? super T>... additionalInterfaces) {
+    return builder(anInterface, additionalInterfaces).factory((args) -> value).build();
+  }
+
   /**
    * Provides a builder for a {@link Set}-multibinding {@link Component}.
    *
@@ -207,6 +248,16 @@ public static <T> Component.Builder<T> intoSetBuilder(Class<T> anInterface) {
     return builder(anInterface).intoSet();
   }
 
+  /**
+   * Provides a builder for a {@link Set}-multibinding {@link Component}.
+   *
+   * <p>Such components can be requested by dependents via {@link ComponentContainer#setOf(Class)} *
+   * or {@link ComponentContainer#setOfProvider(Class)}.
+   */
+  public static <T> Component.Builder<T> intoSetBuilder(Qualified<T> anInterface) {
+    return builder(anInterface).intoSet();
+  }
+
   /**
    * Wraps a value in a {@link Set}-multibinding {@link Component} with no dependencies. *
    *
@@ -217,26 +268,54 @@ public static <T> Component<T> intoSet(T value, Class<T> anInterface) {
     return intoSetBuilder(anInterface).factory(c -> value).build();
   }
 
+  /**
+   * Wraps a value in a {@link Set}-multibinding {@link Component} with no dependencies. *
+   *
+   * <p>Such components can be requested by dependents via {@link ComponentContainer#setOf(Class)} *
+   * or {@link ComponentContainer#setOfProvider(Class)}.
+   */
+  public static <T> Component<T> intoSet(T value, Qualified<T> anInterface) {
+    return intoSetBuilder(anInterface).factory(c -> value).build();
+  }
+
   /** FirebaseComponent builder. */
   public static class Builder<T> {
-    private final Set<Class<? super T>> providedInterfaces = new HashSet<>();
+    private String name = null;
+    private final Set<Qualified<? super T>> providedInterfaces = new HashSet<>();
     private final Set<Dependency> dependencies = new HashSet<>();
     private @Instantiation int instantiation = Instantiation.LAZY;
     private @ComponentType int type = ComponentType.VALUE;
     private ComponentFactory<T> factory;
-    private Set<Class<?>> publishedEvents = new HashSet<>();
+    private final Set<Class<?>> publishedEvents = new HashSet<>();
 
     @SafeVarargs
     private Builder(Class<T> anInterface, Class<? super T>... additionalInterfaces) {
       Preconditions.checkNotNull(anInterface, "Null interface");
-      providedInterfaces.add(anInterface);
+      providedInterfaces.add(Qualified.unqualified(anInterface));
       for (Class<? super T> iface : additionalInterfaces) {
         Preconditions.checkNotNull(iface, "Null interface");
+        providedInterfaces.add(Qualified.unqualified(iface));
+      }
+    }
+
+    @SafeVarargs
+    private Builder(Qualified<T> anInterface, Qualified<? super T>... additionalInterfaces) {
+      Preconditions.checkNotNull(anInterface, "Null interface");
+      providedInterfaces.add(anInterface);
+      for (Qualified<? super T> iface : additionalInterfaces) {
+        Preconditions.checkNotNull(iface, "Null interface");
       }
       Collections.addAll(providedInterfaces, additionalInterfaces);
     }
 
+    /** Set a name for the {@link Component} being built. */
+    public Builder<T> name(@NonNull String name) {
+      this.name = name;
+      return this;
+    }
+
     /** Add a {@link Dependency} to the {@link Component} being built. */
+    @CanIgnoreReturnValue
     public Builder<T> add(Dependency dependency) {
       Preconditions.checkNotNull(dependency, "Null dependency");
       validateInterface(dependency.getInterface());
@@ -245,21 +324,25 @@ public Builder<T> add(Dependency dependency) {
     }
 
     /** Make the {@link Component} initialize upon startup. */
+    @CanIgnoreReturnValue
     public Builder<T> alwaysEager() {
       return setInstantiation(Instantiation.ALWAYS_EAGER);
     }
 
     /** Make the component initialize upon startup in default app. */
+    @CanIgnoreReturnValue
     public Builder<T> eagerInDefaultApp() {
       return setInstantiation(Instantiation.EAGER_IN_DEFAULT_APP);
     }
 
     /** Make the {@link Component} eligible to publish events of provided eventType. */
+    @CanIgnoreReturnValue
     public Builder<T> publishes(Class<?> eventType) {
       publishedEvents.add(eventType);
       return this;
     }
 
+    @CanIgnoreReturnValue
     private Builder<T> setInstantiation(@Instantiation int instantiation) {
       Preconditions.checkState(
           this.instantiation == Instantiation.LAZY, "Instantiation type has already been set.");
@@ -267,18 +350,20 @@ private Builder<T> setInstantiation(@Instantiation int instantiation) {
       return this;
     }
 
-    private void validateInterface(Class<?> anInterface) {
+    private void validateInterface(Qualified<?> anInterface) {
       Preconditions.checkArgument(
           !providedInterfaces.contains(anInterface),
           "Components are not allowed to depend on interfaces they themselves provide.");
     }
 
     /** Set the factory that will be used to initialize the {@link Component}. */
+    @CanIgnoreReturnValue
     public Builder<T> factory(ComponentFactory<T> value) {
       factory = Preconditions.checkNotNull(value, "Null factory");
       return this;
     }
 
+    @CanIgnoreReturnValue
     private Builder<T> intoSet() {
       type = ComponentType.SET;
       return this;
@@ -288,6 +373,7 @@ private Builder<T> intoSet() {
     public Component<T> build() {
       Preconditions.checkState(factory != null, "Missing required property: factory.");
       return new Component<>(
+          name,
           new HashSet<>(providedInterfaces),
           new HashSet<>(dependencies),
           instantiation,
diff --git a/firebase-components/src/main/java/com/google/firebase/components/ComponentContainer.java b/firebase-components/src/main/java/com/google/firebase/components/ComponentContainer.java
index d5c349eea9c..0f301eb0e19 100644
--- a/firebase-components/src/main/java/com/google/firebase/components/ComponentContainer.java
+++ b/firebase-components/src/main/java/com/google/firebase/components/ComponentContainer.java
@@ -20,13 +20,41 @@
 
 /** Provides a means to retrieve instances of requested classes/interfaces. */
 public interface ComponentContainer {
-  <T> T get(Class<T> anInterface);
+  default <T> T get(Class<T> anInterface) {
+    return get(Qualified.unqualified(anInterface));
+  }
 
-  <T> Provider<T> getProvider(Class<T> anInterface);
+  default <T> Provider<T> getProvider(Class<T> anInterface) {
+    return getProvider(Qualified.unqualified(anInterface));
+  }
 
-  <T> Deferred<T> getDeferred(Class<T> anInterface);
+  default <T> Deferred<T> getDeferred(Class<T> anInterface) {
+    return getDeferred(Qualified.unqualified(anInterface));
+  }
 
-  <T> Set<T> setOf(Class<T> anInterface);
+  default <T> Set<T> setOf(Class<T> anInterface) {
+    return setOf(Qualified.unqualified(anInterface));
+  }
 
-  <T> Provider<Set<T>> setOfProvider(Class<T> anInterface);
+  default <T> Provider<Set<T>> setOfProvider(Class<T> anInterface) {
+    return setOfProvider(Qualified.unqualified(anInterface));
+  }
+
+  default <T> T get(Qualified<T> anInterface) {
+    Provider<T> provider = getProvider(anInterface);
+    if (provider == null) {
+      return null;
+    }
+    return provider.get();
+  }
+
+  <T> Provider<T> getProvider(Qualified<T> anInterface);
+
+  <T> Deferred<T> getDeferred(Qualified<T> anInterface);
+
+  default <T> Set<T> setOf(Qualified<T> anInterface) {
+    return setOfProvider(anInterface).get();
+  }
+
+  <T> Provider<Set<T>> setOfProvider(Qualified<T> anInterface);
 }
diff --git a/firebase-components/src/main/java/com/google/firebase/components/ComponentRegistrarProcessor.java b/firebase-components/src/main/java/com/google/firebase/components/ComponentRegistrarProcessor.java
new file mode 100644
index 00000000000..024f3f8c01d
--- /dev/null
+++ b/firebase-components/src/main/java/com/google/firebase/components/ComponentRegistrarProcessor.java
@@ -0,0 +1,32 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.components;
+
+import java.util.List;
+
+/**
+ * Provides the ability to customize/decorate components as they are requested by {@link
+ * ComponentRuntime}.
+ *
+ * <p>This makes it possible to do validation, change/add dependencies, or customize components'
+ * initialization logic by decorating their {@link ComponentFactory factories}.
+ */
+public interface ComponentRegistrarProcessor {
+
+  /** Default "noop" processor. */
+  ComponentRegistrarProcessor NOOP = ComponentRegistrar::getComponents;
+
+  List<Component<?>> processRegistrar(ComponentRegistrar registrar);
+}
diff --git a/firebase-components/src/main/java/com/google/firebase/components/ComponentRuntime.java b/firebase-components/src/main/java/com/google/firebase/components/ComponentRuntime.java
index 2bf1be2a452..84e4e389f46 100644
--- a/firebase-components/src/main/java/com/google/firebase/components/ComponentRuntime.java
+++ b/firebase-components/src/main/java/com/google/firebase/components/ComponentRuntime.java
@@ -18,6 +18,7 @@
 import androidx.annotation.RestrictTo;
 import androidx.annotation.RestrictTo.Scope;
 import androidx.annotation.VisibleForTesting;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.firebase.dynamicloading.ComponentLoader;
 import com.google.firebase.events.Publisher;
 import com.google.firebase.events.Subscriber;
@@ -42,14 +43,16 @@
  * <p>Does {@link Component} dependency resolution and provides access to resolved {@link
  * Component}s via {@link #get(Class)} method.
  */
-public class ComponentRuntime extends AbstractComponentContainer implements ComponentLoader {
+public class ComponentRuntime implements ComponentContainer, ComponentLoader {
   private static final Provider<Set<Object>> EMPTY_PROVIDER = Collections::emptySet;
   private final Map<Component<?>, Provider<?>> components = new HashMap<>();
-  private final Map<Class<?>, Provider<?>> lazyInstanceMap = new HashMap<>();
-  private final Map<Class<?>, LazySet<?>> lazySetMap = new HashMap<>();
+  private final Map<Qualified<?>, Provider<?>> lazyInstanceMap = new HashMap<>();
+  private final Map<Qualified<?>, LazySet<?>> lazySetMap = new HashMap<>();
   private final List<Provider<ComponentRegistrar>> unprocessedRegistrarProviders;
+  private Set<String> processedCoroutineDispatcherInterfaces = new HashSet<>();
   private final EventBus eventBus;
   private final AtomicReference<Boolean> eagerComponentsInitializedWith = new AtomicReference<>();
+  private final ComponentRegistrarProcessor componentRegistrarProcessor;
 
   /**
    * Creates an instance of {@link ComponentRuntime} for the provided {@link ComponentRegistrar}s
@@ -62,7 +65,11 @@ public ComponentRuntime(
       Executor defaultEventExecutor,
       Iterable<ComponentRegistrar> registrars,
       Component<?>... additionalComponents) {
-    this(defaultEventExecutor, toProviders(registrars), Arrays.asList(additionalComponents));
+    this(
+        defaultEventExecutor,
+        toProviders(registrars),
+        Arrays.asList(additionalComponents),
+        ComponentRegistrarProcessor.NOOP);
   }
 
   /** A builder for creating {@link ComponentRuntime} instances. */
@@ -73,8 +80,10 @@ public static Builder builder(Executor defaultEventExecutor) {
   private ComponentRuntime(
       Executor defaultEventExecutor,
       Iterable<Provider<ComponentRegistrar>> registrars,
-      Collection<Component<?>> additionalComponents) {
+      Collection<Component<?>> additionalComponents,
+      ComponentRegistrarProcessor componentRegistrarProcessor) {
     eventBus = new EventBus(defaultEventExecutor);
+    this.componentRegistrarProcessor = componentRegistrarProcessor;
 
     List<Component<?>> componentsToAdd = new ArrayList<>();
 
@@ -106,7 +115,7 @@ private void discoverComponents(List<Component<?>> componentsToAdd) {
         try {
           ComponentRegistrar registrar = provider.get();
           if (registrar != null) {
-            componentsToAdd.addAll(registrar.getComponents());
+            componentsToAdd.addAll(componentRegistrarProcessor.processRegistrar(registrar));
             iterator.remove();
           }
         } catch (InvalidRegistrarException ex) {
@@ -115,6 +124,25 @@ private void discoverComponents(List<Component<?>> componentsToAdd) {
         }
       }
 
+      // kotlinx.coroutines.CoroutineDispatcher interfaces could be provided by both new version of
+      // firebase-common and old version of firebase-common-ktx. In this scenario take the first
+      // interface which was provided.
+
+      Iterator<Component<?>> it = componentsToAdd.iterator();
+      while (it.hasNext()) {
+        Component component = it.next();
+        for (Object anInterface : component.getProvidedInterfaces().toArray()) {
+          if (anInterface.toString().contains("kotlinx.coroutines.CoroutineDispatcher")) {
+            if (processedCoroutineDispatcherInterfaces.contains(anInterface.toString())) {
+              it.remove();
+              break;
+            } else {
+              processedCoroutineDispatcherInterfaces.add(anInterface.toString());
+            }
+          }
+        }
+      }
+
       if (components.isEmpty()) {
         CycleDetector.detect(componentsToAdd);
       } else {
@@ -176,7 +204,7 @@ private List<Runnable> processInstanceComponents(List<Component<?>> componentsTo
       }
 
       Provider<?> provider = components.get(component);
-      for (Class<?> anInterface : component.getProvidedInterfaces()) {
+      for (Qualified<?> anInterface : component.getProvidedInterfaces()) {
         if (!lazyInstanceMap.containsKey(anInterface)) {
           lazyInstanceMap.put(anInterface, provider);
         } else {
@@ -195,7 +223,7 @@ private List<Runnable> processInstanceComponents(List<Component<?>> componentsTo
   /** Populates lazySetMap to make set components available for consumption via set dependencies. */
   private List<Runnable> processSetComponents() {
     ArrayList<Runnable> runnables = new ArrayList<>();
-    Map<Class<?>, Set<Provider<?>>> setIndex = new HashMap<>();
+    Map<Qualified<?>, Set<Provider<?>>> setIndex = new HashMap<>();
     for (Map.Entry<Component<?>, Provider<?>> entry : components.entrySet()) {
       Component<?> component = entry.getKey();
 
@@ -206,7 +234,7 @@ private List<Runnable> processSetComponents() {
 
       Provider<?> provider = entry.getValue();
 
-      for (Class<?> anInterface : component.getProvidedInterfaces()) {
+      for (Qualified<?> anInterface : component.getProvidedInterfaces()) {
         if (!setIndex.containsKey(anInterface)) {
           setIndex.put(anInterface, new HashSet<>());
         }
@@ -214,13 +242,16 @@ private List<Runnable> processSetComponents() {
       }
     }
 
-    for (Map.Entry<Class<?>, Set<Provider<?>>> entry : setIndex.entrySet()) {
+    for (Map.Entry<Qualified<?>, Set<Provider<?>>> entry : setIndex.entrySet()) {
       if (!lazySetMap.containsKey(entry.getKey())) {
         lazySetMap.put(entry.getKey(), LazySet.fromCollection(entry.getValue()));
       } else {
+        @SuppressWarnings("unchecked")
         LazySet<Object> existingSet = (LazySet<Object>) lazySetMap.get(entry.getKey());
         for (Provider<?> provider : entry.getValue()) {
-          runnables.add(() -> existingSet.add((Provider<Object>) provider));
+          @SuppressWarnings("unchecked")
+          Provider<Object> castedProvider = (Provider<Object>) provider;
+          runnables.add(() -> existingSet.add(castedProvider));
         }
       }
     }
@@ -229,13 +260,13 @@ private List<Runnable> processSetComponents() {
 
   @Override
   @SuppressWarnings("unchecked")
-  public synchronized <T> Provider<T> getProvider(Class<T> anInterface) {
+  public synchronized <T> Provider<T> getProvider(Qualified<T> anInterface) {
     Preconditions.checkNotNull(anInterface, "Null interface requested.");
     return (Provider<T>) lazyInstanceMap.get(anInterface);
   }
 
   @Override
-  public <T> Deferred<T> getDeferred(Class<T> anInterface) {
+  public <T> Deferred<T> getDeferred(Qualified<T> anInterface) {
     Provider<T> provider = getProvider(anInterface);
     if (provider == null) {
       return OptionalProvider.empty();
@@ -248,7 +279,7 @@ public <T> Deferred<T> getDeferred(Class<T> anInterface) {
 
   @Override
   @SuppressWarnings("unchecked")
-  public synchronized <T> Provider<Set<T>> setOfProvider(Class<T> anInterface) {
+  public synchronized <T> Provider<Set<T>> setOfProvider(Qualified<T> anInterface) {
     LazySet<?> provider = lazySetMap.get(anInterface);
     if (provider != null) {
       return (Provider<Set<T>>) (Provider<?>) provider;
@@ -332,32 +363,49 @@ private void processDependencies() {
     }
   }
 
+  @VisibleForTesting
+  Collection<Component<?>> getAllComponentsForTest() {
+    return components.keySet();
+  }
+
   public static final class Builder {
     private final Executor defaultExecutor;
     private final List<Provider<ComponentRegistrar>> lazyRegistrars = new ArrayList<>();
     private final List<Component<?>> additionalComponents = new ArrayList<>();
+    private ComponentRegistrarProcessor componentRegistrarProcessor =
+        ComponentRegistrarProcessor.NOOP;
 
     Builder(Executor defaultExecutor) {
       this.defaultExecutor = defaultExecutor;
     }
 
+    @CanIgnoreReturnValue
     public Builder addLazyComponentRegistrars(Collection<Provider<ComponentRegistrar>> registrars) {
       this.lazyRegistrars.addAll(registrars);
       return this;
     }
 
+    @CanIgnoreReturnValue
     public Builder addComponentRegistrar(ComponentRegistrar registrar) {
       this.lazyRegistrars.add(() -> registrar);
       return this;
     }
 
+    @CanIgnoreReturnValue
     public Builder addComponent(Component<?> component) {
       this.additionalComponents.add(component);
       return this;
     }
 
+    @CanIgnoreReturnValue
+    public Builder setProcessor(ComponentRegistrarProcessor processor) {
+      this.componentRegistrarProcessor = processor;
+      return this;
+    }
+
     public ComponentRuntime build() {
-      return new ComponentRuntime(defaultExecutor, lazyRegistrars, additionalComponents);
+      return new ComponentRuntime(
+          defaultExecutor, lazyRegistrars, additionalComponents, componentRegistrarProcessor);
     }
   }
 }
diff --git a/firebase-components/src/main/java/com/google/firebase/components/CycleDetector.java b/firebase-components/src/main/java/com/google/firebase/components/CycleDetector.java
index a435d6f3a8c..38d7124c11c 100644
--- a/firebase-components/src/main/java/com/google/firebase/components/CycleDetector.java
+++ b/firebase-components/src/main/java/com/google/firebase/components/CycleDetector.java
@@ -24,10 +24,10 @@
 /** Cycle detector for the {@link Component} dependency graph. */
 class CycleDetector {
   private static class Dep {
-    private final Class<?> anInterface;
+    private final Qualified<?> anInterface;
     private final boolean set;
 
-    private Dep(Class<?> anInterface, boolean set) {
+    private Dep(Qualified<?> anInterface, boolean set) {
       this.anInterface = anInterface;
       this.set = set;
     }
@@ -135,7 +135,7 @@ private static Set<ComponentNode> toGraph(List<Component<?>> components) {
     Map<Dep, Set<ComponentNode>> componentIndex = new HashMap<>(components.size());
     for (Component<?> component : components) {
       ComponentNode node = new ComponentNode(component);
-      for (Class<?> anInterface : component.getProvidedInterfaces()) {
+      for (Qualified<?> anInterface : component.getProvidedInterfaces()) {
         Dep cmp = new Dep(anInterface, !component.isValue());
         if (!componentIndex.containsKey(cmp)) {
           componentIndex.put(cmp, new HashSet<>());
diff --git a/firebase-components/src/main/java/com/google/firebase/components/Dependency.java b/firebase-components/src/main/java/com/google/firebase/components/Dependency.java
index ed8a3c3b66d..9c9ef676a75 100644
--- a/firebase-components/src/main/java/com/google/firebase/components/Dependency.java
+++ b/firebase-components/src/main/java/com/google/firebase/components/Dependency.java
@@ -37,11 +37,15 @@ public final class Dependency {
     int DEFERRED = 2;
   }
 
-  private final Class<?> anInterface;
-  private final @Type int type;
+  private final Qualified<?> anInterface;
+  @Type private final int type;
   private final @Injection int injection;
 
   private Dependency(Class<?> anInterface, @Type int type, @Injection int injection) {
+    this(Qualified.unqualified(anInterface), type, injection);
+  }
+
+  private Dependency(Qualified<?> anInterface, @Type int type, @Injection int injection) {
     this.anInterface = Preconditions.checkNotNull(anInterface, "Null dependency anInterface.");
     this.type = type;
     this.injection = injection;
@@ -71,6 +75,16 @@ public static Dependency deferred(Class<?> anInterface) {
     return new Dependency(anInterface, Type.OPTIONAL, Injection.DEFERRED);
   }
 
+  /**
+   * Declares a deferred dependency.
+   *
+   * <p>Such dependencies are optional and may not be present by default. But they can become
+   * available if a dynamic module that contains them is installed.
+   */
+  public static Dependency deferred(Qualified<?> anInterface) {
+    return new Dependency(anInterface, Type.OPTIONAL, Injection.DEFERRED);
+  }
+
   /**
    * Declares a required dependency.
    *
@@ -83,6 +97,18 @@ public static Dependency required(Class<?> anInterface) {
     return new Dependency(anInterface, Type.REQUIRED, Injection.DIRECT);
   }
 
+  /**
+   * Declares a required dependency.
+   *
+   * <p>Such dependencies must be present in order for the dependent component to function. Any
+   * component with a required dependency should also declare a Maven dependency on an SDK that
+   * provides it. Failing to do so will result in a {@link MissingDependencyException} to be thrown
+   * at runtime.
+   */
+  public static Dependency required(Qualified<?> anInterface) {
+    return new Dependency(anInterface, Type.REQUIRED, Injection.DIRECT);
+  }
+
   /**
    * Declares a Set multi-binding dependency.
    *
@@ -94,6 +120,17 @@ public static Dependency setOf(Class<?> anInterface) {
     return new Dependency(anInterface, Type.SET, Injection.DIRECT);
   }
 
+  /**
+   * Declares a Set multi-binding dependency.
+   *
+   * <p>Such dependencies provide access to a {@code Set<Foo>} to dependent components. Note that
+   * the set is only filled with components that explicitly declare the intent to be a "set"
+   * dependency via {@link Component#intoSet(Object, Class)}.
+   */
+  public static Dependency setOf(Qualified<?> anInterface) {
+    return new Dependency(anInterface, Type.SET, Injection.DIRECT);
+  }
+
   /**
    * Declares an optional dependency.
    *
@@ -104,6 +141,16 @@ public static Dependency optionalProvider(Class<?> anInterface) {
     return new Dependency(anInterface, Type.OPTIONAL, Injection.PROVIDER);
   }
 
+  /**
+   * Declares an optional dependency.
+   *
+   * <p>Optional dependencies can be missing at runtime(being {@code null}) and dependents must be
+   * ready to handle that.
+   */
+  public static Dependency optionalProvider(Qualified<?> anInterface) {
+    return new Dependency(anInterface, Type.OPTIONAL, Injection.PROVIDER);
+  }
+
   /**
    * Declares a required dependency.
    *
@@ -116,6 +163,18 @@ public static Dependency requiredProvider(Class<?> anInterface) {
     return new Dependency(anInterface, Type.REQUIRED, Injection.PROVIDER);
   }
 
+  /**
+   * Declares a required dependency.
+   *
+   * <p>Such dependencies must be present in order for the dependent component to function. Any
+   * component with a required dependency should also declare a Maven dependency on an SDK that
+   * provides it. Failing to do so will result in a {@link MissingDependencyException} to be thrown
+   * at runtime.
+   */
+  public static Dependency requiredProvider(Qualified<?> anInterface) {
+    return new Dependency(anInterface, Type.REQUIRED, Injection.PROVIDER);
+  }
+
   /**
    * Declares a Set multi-binding dependency.
    *
@@ -127,7 +186,18 @@ public static Dependency setOfProvider(Class<?> anInterface) {
     return new Dependency(anInterface, Type.SET, Injection.PROVIDER);
   }
 
-  public Class<?> getInterface() {
+  /**
+   * Declares a Set multi-binding dependency.
+   *
+   * <p>Such dependencies provide access to a {@code Set<Foo>} to dependent components. Note that
+   * the set is only filled with components that explicitly declare the intent to be a "set"
+   * dependency via {@link Component#intoSet(Object, Class)}.
+   */
+  public static Dependency setOfProvider(Qualified<?> anInterface) {
+    return new Dependency(anInterface, Type.SET, Injection.PROVIDER);
+  }
+
+  public Qualified<?> getInterface() {
     return anInterface;
   }
 
@@ -151,7 +221,9 @@ public boolean isDeferred() {
   public boolean equals(Object o) {
     if (o instanceof Dependency) {
       Dependency other = (Dependency) o;
-      return anInterface == other.anInterface && type == other.type && injection == other.injection;
+      return anInterface.equals(other.anInterface)
+          && type == other.type
+          && injection == other.injection;
     }
     return false;
   }
diff --git a/firebase-components/src/main/java/com/google/firebase/components/Preconditions.java b/firebase-components/src/main/java/com/google/firebase/components/Preconditions.java
index ac630e00359..ce405f22f2c 100644
--- a/firebase-components/src/main/java/com/google/firebase/components/Preconditions.java
+++ b/firebase-components/src/main/java/com/google/firebase/components/Preconditions.java
@@ -14,6 +14,8 @@
 
 package com.google.firebase.components;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+
 public final class Preconditions {
 
   public static void checkArgument(boolean expression, String errorMessage) {
@@ -22,6 +24,7 @@ public static void checkArgument(boolean expression, String errorMessage) {
     }
   }
 
+  @CanIgnoreReturnValue
   public static <T> T checkNotNull(T reference) {
     if (reference == null) {
       throw new NullPointerException();
@@ -29,6 +32,7 @@ public static <T> T checkNotNull(T reference) {
     return reference;
   }
 
+  @CanIgnoreReturnValue
   public static <T> T checkNotNull(T reference, String errorMessage) {
     if (reference == null) {
       throw new NullPointerException(errorMessage);
diff --git a/firebase-components/src/main/java/com/google/firebase/components/Qualified.java b/firebase-components/src/main/java/com/google/firebase/components/Qualified.java
new file mode 100644
index 00000000000..3319e048a86
--- /dev/null
+++ b/firebase-components/src/main/java/com/google/firebase/components/Qualified.java
@@ -0,0 +1,67 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.components;
+
+import androidx.annotation.NonNull;
+import java.lang.annotation.Annotation;
+
+/** Represents a qualified class object. */
+public final class Qualified<T> {
+  private @interface Unqualified {}
+
+  private final Class<? extends Annotation> qualifier;
+  private final Class<T> type;
+
+  public Qualified(Class<? extends Annotation> qualifier, Class<T> type) {
+    this.qualifier = qualifier;
+    this.type = type;
+  }
+
+  @NonNull
+  public static <T> Qualified<T> unqualified(Class<T> type) {
+    return new Qualified<>(Unqualified.class, type);
+  }
+
+  @NonNull
+  public static <T> Qualified<T> qualified(Class<? extends Annotation> qualifier, Class<T> type) {
+    return new Qualified<>(qualifier, type);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    Qualified<?> qualified = (Qualified<?>) o;
+
+    if (!type.equals(qualified.type)) return false;
+    return qualifier.equals(qualified.qualifier);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = type.hashCode();
+    result = 31 * result + qualifier.hashCode();
+    return result;
+  }
+
+  @Override
+  public String toString() {
+    if (qualifier == Unqualified.class) {
+      return type.getName();
+    }
+    return "@" + qualifier.getName() + " " + type.getName();
+  }
+}
diff --git a/firebase-components/src/main/java/com/google/firebase/components/RestrictedComponentContainer.java b/firebase-components/src/main/java/com/google/firebase/components/RestrictedComponentContainer.java
index 295dc3eb7cc..0c051e83a5b 100644
--- a/firebase-components/src/main/java/com/google/firebase/components/RestrictedComponentContainer.java
+++ b/firebase-components/src/main/java/com/google/firebase/components/RestrictedComponentContainer.java
@@ -26,21 +26,21 @@
  * An implementation of {@link ComponentContainer} that is backed by another delegate {@link
  * ComponentContainer} and restricts access to only declared {@link Dependency dependencies}.
  */
-final class RestrictedComponentContainer extends AbstractComponentContainer {
-  private final Set<Class<?>> allowedDirectInterfaces;
-  private final Set<Class<?>> allowedProviderInterfaces;
-  private final Set<Class<?>> allowedDeferredInterfaces;
-  private final Set<Class<?>> allowedSetDirectInterfaces;
-  private final Set<Class<?>> allowedSetProviderInterfaces;
+final class RestrictedComponentContainer implements ComponentContainer {
+  private final Set<Qualified<?>> allowedDirectInterfaces;
+  private final Set<Qualified<?>> allowedProviderInterfaces;
+  private final Set<Qualified<?>> allowedDeferredInterfaces;
+  private final Set<Qualified<?>> allowedSetDirectInterfaces;
+  private final Set<Qualified<?>> allowedSetProviderInterfaces;
   private final Set<Class<?>> allowedPublishedEvents;
   private final ComponentContainer delegateContainer;
 
   RestrictedComponentContainer(Component<?> component, ComponentContainer container) {
-    Set<Class<?>> directInterfaces = new HashSet<>();
-    Set<Class<?>> providerInterfaces = new HashSet<>();
-    Set<Class<?>> deferredInterfaces = new HashSet<>();
-    Set<Class<?>> setDirectInterfaces = new HashSet<>();
-    Set<Class<?>> setProviderInterfaces = new HashSet<>();
+    Set<Qualified<?>> directInterfaces = new HashSet<>();
+    Set<Qualified<?>> providerInterfaces = new HashSet<>();
+    Set<Qualified<?>> deferredInterfaces = new HashSet<>();
+    Set<Qualified<?>> setDirectInterfaces = new HashSet<>();
+    Set<Qualified<?>> setProviderInterfaces = new HashSet<>();
     for (Dependency dependency : component.getDependencies()) {
       if (dependency.isDirectInjection()) {
         if (dependency.isSet()) {
@@ -59,7 +59,7 @@ final class RestrictedComponentContainer extends AbstractComponentContainer {
       }
     }
     if (!component.getPublishedEvents().isEmpty()) {
-      directInterfaces.add(Publisher.class);
+      directInterfaces.add(Qualified.unqualified(Publisher.class));
     }
     allowedDirectInterfaces = Collections.unmodifiableSet(directInterfaces);
     allowedProviderInterfaces = Collections.unmodifiableSet(providerInterfaces);
@@ -77,7 +77,7 @@ final class RestrictedComponentContainer extends AbstractComponentContainer {
    */
   @Override
   public <T> T get(Class<T> anInterface) {
-    if (!allowedDirectInterfaces.contains(anInterface)) {
+    if (!allowedDirectInterfaces.contains(Qualified.unqualified(anInterface))) {
       throw new DependencyException(
           String.format("Attempting to request an undeclared dependency %s.", anInterface));
     }
@@ -96,6 +96,15 @@ public <T> T get(Class<T> anInterface) {
     return publisher;
   }
 
+  @Override
+  public <T> T get(Qualified<T> anInterface) {
+    if (!allowedDirectInterfaces.contains(anInterface)) {
+      throw new DependencyException(
+          String.format("Attempting to request an undeclared dependency %s.", anInterface));
+    }
+    return delegateContainer.get(anInterface);
+  }
+
   /**
    * Returns an instance of the provider for the requested class if it is allowed.
    *
@@ -103,6 +112,26 @@ public <T> T get(Class<T> anInterface) {
    */
   @Override
   public <T> Provider<T> getProvider(Class<T> anInterface) {
+    return getProvider(Qualified.unqualified(anInterface));
+  }
+
+  @Override
+  public <T> Deferred<T> getDeferred(Class<T> anInterface) {
+    return getDeferred(Qualified.unqualified(anInterface));
+  }
+
+  /**
+   * Returns an instance of the provider for the set of requested classes if it is allowed.
+   *
+   * @throws DependencyException otherwise.
+   */
+  @Override
+  public <T> Provider<Set<T>> setOfProvider(Class<T> anInterface) {
+    return setOfProvider(Qualified.unqualified(anInterface));
+  }
+
+  @Override
+  public <T> Provider<T> getProvider(Qualified<T> anInterface) {
     if (!allowedProviderInterfaces.contains(anInterface)) {
       throw new DependencyException(
           String.format(
@@ -112,7 +141,7 @@ public <T> Provider<T> getProvider(Class<T> anInterface) {
   }
 
   @Override
-  public <T> Deferred<T> getDeferred(Class<T> anInterface) {
+  public <T> Deferred<T> getDeferred(Qualified<T> anInterface) {
     if (!allowedDeferredInterfaces.contains(anInterface)) {
       throw new DependencyException(
           String.format(
@@ -121,13 +150,8 @@ public <T> Deferred<T> getDeferred(Class<T> anInterface) {
     return delegateContainer.getDeferred(anInterface);
   }
 
-  /**
-   * Returns an instance of the provider for the set of requested classes if it is allowed.
-   *
-   * @throws DependencyException otherwise.
-   */
   @Override
-  public <T> Provider<Set<T>> setOfProvider(Class<T> anInterface) {
+  public <T> Provider<Set<T>> setOfProvider(Qualified<T> anInterface) {
     if (!allowedSetProviderInterfaces.contains(anInterface)) {
       throw new DependencyException(
           String.format(
@@ -142,7 +166,7 @@ public <T> Provider<Set<T>> setOfProvider(Class<T> anInterface) {
    * @throws DependencyException otherwise.
    */
   @Override
-  public <T> Set<T> setOf(Class<T> anInterface) {
+  public <T> Set<T> setOf(Qualified<T> anInterface) {
     if (!allowedSetDirectInterfaces.contains(anInterface)) {
       throw new DependencyException(
           String.format("Attempting to request an undeclared dependency Set<%s>.", anInterface));
diff --git a/firebase-components/src/test/java/com/google/firebase/components/ComponentRuntimeTest.java b/firebase-components/src/test/java/com/google/firebase/components/ComponentRuntimeTest.java
index 9375667aa23..8e445aee84a 100644
--- a/firebase-components/src/test/java/com/google/firebase/components/ComponentRuntimeTest.java
+++ b/firebase-components/src/test/java/com/google/firebase/components/ComponentRuntimeTest.java
@@ -15,6 +15,8 @@
 package com.google.firebase.components;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.components.Qualified.qualified;
+import static com.google.firebase.components.Qualified.unqualified;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 
@@ -26,12 +28,17 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Executor;
+import java.util.stream.Collectors;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
 public final class ComponentRuntimeTest {
+  private @interface Qualifier1 {}
+
+  private @interface Qualifier2 {}
+
   private static final Executor EXECUTOR = Runnable::run;
 
   interface ComponentOne {
@@ -209,6 +216,21 @@ public void container_withMultipleComponentsRegisteredForSameInterface_shouldThr
     }
   }
 
+  @Test
+  public void
+      container_withMultipleComponentsRegisteredForSameInterfaceButQualified_shouldNotThrow() {
+    ComponentRuntime runtime =
+        ComponentRuntime.builder(EXECUTOR)
+            .addComponent(Component.of(1, Integer.class))
+            .addComponent(Component.of(2, qualified(Qualifier1.class, Integer.class)))
+            .addComponent(Component.of(3, qualified(Qualifier2.class, Integer.class)))
+            .build();
+
+    assertThat(runtime.get(Integer.class)).isEqualTo(1);
+    assertThat(runtime.get(qualified(Qualifier1.class, Integer.class))).isEqualTo(2);
+    assertThat(runtime.get(qualified(Qualifier2.class, Integer.class))).isEqualTo(3);
+  }
+
   @Test
   public void container_withMissingDependencies_shouldThrow() {
     try {
@@ -264,7 +286,7 @@ public void container_withCyclicProviderDependency_shouldProperlyInitialize() {
   public void get_withNullInterface_shouldThrow() {
     ComponentRuntime runtime = ComponentRuntime.builder(EXECUTOR).build();
     try {
-      runtime.get(null);
+      runtime.get((Qualified<?>) null);
       fail("Expected exception not thrown.");
     } catch (NullPointerException ex) {
       // success.
@@ -349,6 +371,25 @@ public void setComponents_shouldNotPreventValueComponentsFromBeingRegistered() {
     assertThat(runtime.get(Double.class)).isEqualTo(4d);
   }
 
+  @Test
+  public void setComponents_withQualifiers_shouldContributeToAppropriateSets() {
+    ComponentRuntime runtime =
+        ComponentRuntime.builder(EXECUTOR)
+            .addComponent(Component.of(5, Integer.class))
+            .addComponent(Component.intoSet(1, Integer.class))
+            .addComponent(Component.intoSet(3, Integer.class))
+            .addComponent(Component.intoSet(1, qualified(Qualifier1.class, Integer.class)))
+            .addComponent(Component.intoSet(2, qualified(Qualifier1.class, Integer.class)))
+            .addComponent(Component.intoSet(3, qualified(Qualifier2.class, Integer.class)))
+            .addComponent(Component.intoSet(4, qualified(Qualifier2.class, Integer.class)))
+            .build();
+
+    assertThat(runtime.get(Integer.class)).isEqualTo(5);
+    assertThat(runtime.setOf(Integer.class)).containsExactly(1, 3);
+    assertThat(runtime.setOf(qualified(Qualifier1.class, Integer.class))).containsExactly(1, 2);
+    assertThat(runtime.setOf(qualified(Qualifier2.class, Integer.class))).containsExactly(3, 4);
+  }
+
   private static class DependsOnString {
 
     private final Provider<String> dep;
@@ -583,4 +624,32 @@ public void newlyDiscoveredComponent_shouldBecomeAvailableThroughItsDeferred() {
     componentLoader.discoverComponents();
     assertThat(dependsOnDeferredString.value).isEqualTo("hello");
   }
+
+  @Test
+  public void container_withComponentProcessor_shouldDelegateToItForEachComponentRegistrar() {
+    InitTracker initTracker = new InitTracker();
+
+    ComponentFactory<Object> replacedFactory = c -> null;
+    ComponentRegistrarProcessor processor =
+        r ->
+            r.getComponents().stream()
+                .map(c -> ((Component<Object>) c).withFactory(replacedFactory))
+                .collect(Collectors.toList());
+
+    ComponentRuntime runtime =
+        ComponentRuntime.builder(EXECUTOR)
+            .addComponentRegistrar(new ComponentRegistrarImpl(Eagerness.ALWAYS))
+            .addComponent(Component.of(initTracker, InitTracker.class))
+            .setProcessor(processor)
+            .build();
+
+    assertThat(
+            runtime.getAllComponentsForTest().stream()
+                .filter(
+                    c ->
+                        (c.getProvidedInterfaces().contains(unqualified(ComponentOne.class))
+                            || c.getProvidedInterfaces().contains(unqualified(ComponentTwo.class))))
+                .allMatch(c -> c.getFactory() == replacedFactory))
+        .isTrue();
+  }
 }
diff --git a/firebase-components/src/test/java/com/google/firebase/components/ComponentTest.java b/firebase-components/src/test/java/com/google/firebase/components/ComponentTest.java
index a9f34cd79c2..13549495ef8 100644
--- a/firebase-components/src/test/java/com/google/firebase/components/ComponentTest.java
+++ b/firebase-components/src/test/java/com/google/firebase/components/ComponentTest.java
@@ -15,6 +15,8 @@
 package com.google.firebase.components;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.components.Qualified.qualified;
+import static com.google.firebase.components.Qualified.unqualified;
 import static org.junit.Assert.fail;
 
 import java.math.BigDecimal;
@@ -25,6 +27,8 @@
 
 @RunWith(JUnit4.class)
 public class ComponentTest {
+  @interface TestQualifier {}
+
   interface TestInterface {}
 
   private static class TestClass implements TestInterface {}
@@ -36,7 +40,7 @@ public void of_withMultipleInterfaces_shouldSetCorrectDefaults() {
     TestClass testClass = new TestClass();
     Component<TestClass> component = Component.of(testClass, TestClass.class, TestInterface.class);
     assertThat(component.getProvidedInterfaces())
-        .containsExactly(TestClass.class, TestInterface.class);
+        .containsExactly(unqualified(TestClass.class), unqualified(TestInterface.class));
     assertThat(component.isLazy()).isTrue();
     assertThat(component.isValue()).isTrue();
     assertThat(component.isAlwaysEager()).isFalse();
@@ -49,7 +53,22 @@ public void of_withMultipleInterfaces_shouldSetCorrectDefaults() {
   public void builder_shouldSetCorrectDefaults() {
     Component<TestClass> component =
         Component.builder(TestClass.class).factory(nullFactory).build();
-    assertThat(component.getProvidedInterfaces()).containsExactly(TestClass.class);
+    assertThat(component.getProvidedInterfaces()).containsExactly(unqualified(TestClass.class));
+    assertThat(component.isLazy()).isTrue();
+    assertThat(component.isValue()).isTrue();
+    assertThat(component.isAlwaysEager()).isFalse();
+    assertThat(component.isEagerInDefaultApp()).isFalse();
+    assertThat(component.getDependencies()).isEmpty();
+  }
+
+  @Test
+  public void qualifiedBuilder_shouldSetCorrectDefaults() {
+    Component<TestClass> component =
+        Component.builder(qualified(TestQualifier.class, TestClass.class))
+            .factory(nullFactory)
+            .build();
+    assertThat(component.getProvidedInterfaces())
+        .containsExactly(qualified(TestQualifier.class, TestClass.class));
     assertThat(component.isLazy()).isTrue();
     assertThat(component.isValue()).isTrue();
     assertThat(component.isAlwaysEager()).isFalse();
@@ -61,7 +80,7 @@ public void builder_shouldSetCorrectDefaults() {
   public void intoSetBuilder_shouldSetCorrectDefaults() {
     Component<TestClass> component =
         Component.intoSetBuilder(TestClass.class).factory(nullFactory).build();
-    assertThat(component.getProvidedInterfaces()).containsExactly(TestClass.class);
+    assertThat(component.getProvidedInterfaces()).containsExactly(unqualified(TestClass.class));
     assertThat(component.isLazy()).isTrue();
     assertThat(component.isValue()).isFalse();
     assertThat(component.isAlwaysEager()).isFalse();
@@ -73,7 +92,7 @@ public void intoSetBuilder_shouldSetCorrectDefaults() {
   public void intoSet_shouldSetCorrectDefaults() {
     TestClass testClass = new TestClass();
     Component<TestClass> component = Component.intoSet(testClass, TestClass.class);
-    assertThat(component.getProvidedInterfaces()).containsExactly(TestClass.class);
+    assertThat(component.getProvidedInterfaces()).containsExactly(unqualified(TestClass.class));
     assertThat(component.isLazy()).isTrue();
     assertThat(component.isValue()).isFalse();
     assertThat(component.isAlwaysEager()).isFalse();
@@ -174,7 +193,21 @@ public void builder_withMultipleInterfaces_shouldProperlySetInterfaces() {
     Component<TestClass> component =
         Component.builder(TestClass.class, TestInterface.class).factory(nullFactory).build();
     assertThat(component.getProvidedInterfaces())
-        .containsExactly(TestClass.class, TestInterface.class);
+        .containsExactly(unqualified(TestClass.class), unqualified(TestInterface.class));
+  }
+
+  @Test
+  public void builder_withMultipleQualifiedInterfaces_shouldProperlySetInterfaces() {
+    Component<TestClass> component =
+        Component.builder(
+                qualified(TestQualifier.class, TestClass.class),
+                qualified(TestQualifier.class, TestInterface.class))
+            .factory(nullFactory)
+            .build();
+    assertThat(component.getProvidedInterfaces())
+        .containsExactly(
+            qualified(TestQualifier.class, TestClass.class),
+            qualified(TestQualifier.class, TestInterface.class));
   }
 
   @Test
@@ -195,4 +228,30 @@ public void getFactory_shouldReturnFactorySetInBuilder() {
         Component.builder(TestClass.class).factory(nullFactory).build();
     assertThat(component.getFactory()).isSameInstanceAs(nullFactory);
   }
+
+  @Test
+  public void withFactory_shouldReplaceTheFactorySetInBuilder() {
+    Component<TestClass> component =
+        Component.builder(TestClass.class).factory(nullFactory).build();
+
+    ComponentFactory<TestClass> newFactory = c -> null;
+    assertThat(component.withFactory(newFactory).getFactory()).isSameInstanceAs(newFactory);
+  }
+
+  @Test
+  public void name_shouldDefaultToNull() {
+    Component<TestClass> component =
+        Component.builder(TestClass.class).factory(nullFactory).build();
+
+    assertThat(component.getName()).isNull();
+  }
+
+  @Test
+  public void name_shouldReturnNameSetInBuilder() {
+    String name = "myName";
+    Component<TestClass> component =
+        Component.builder(TestClass.class).name(name).factory(nullFactory).build();
+
+    assertThat(component.getName()).isEqualTo(name);
+  }
 }
diff --git a/firebase-components/src/test/java/com/google/firebase/components/CycleDetectorTest.java b/firebase-components/src/test/java/com/google/firebase/components/CycleDetectorTest.java
index 091b7be8b08..8fc904741fe 100644
--- a/firebase-components/src/test/java/com/google/firebase/components/CycleDetectorTest.java
+++ b/firebase-components/src/test/java/com/google/firebase/components/CycleDetectorTest.java
@@ -15,11 +15,13 @@
 package com.google.firebase.components;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.components.Qualified.qualified;
 import static junit.framework.Assert.fail;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import javax.inject.Qualifier;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -246,7 +248,7 @@ public void detect_withProviderDependencyCycle_shouldNotThrow() {
   }
 
   @Test
-  public void detect_withMultipleComponentsImplementingSameIface_shouldThrow() {
+  public void detect_withMultipleComponentsImplementingSameInterface_shouldThrow() {
     List<Component<?>> components =
         Arrays.asList(
             Component.builder(TestInterface1.class).factory(nullFactory()).build(),
@@ -260,6 +262,45 @@ public void detect_withMultipleComponentsImplementingSameIface_shouldThrow() {
     }
   }
 
+  @Qualifier
+  @interface Qualifier1 {}
+
+  @Qualifier
+  @interface Qualifier2 {}
+
+  @Test
+  public void detect_withMultipleComponentsImplementingSameQualifiedInterface_shouldNotThrow() {
+    List<Component<?>> components =
+        Arrays.asList(
+            Component.builder(TestInterface1.class).factory(nullFactory()).build(),
+            Component.builder(qualified(Qualifier1.class, TestInterface1.class))
+                .factory(nullFactory())
+                .build(),
+            Component.builder(qualified(Qualifier2.class, TestInterface1.class))
+                .factory(nullFactory())
+                .build());
+
+    CycleDetector.detect(components);
+  }
+
+  @Test
+  public void
+      detect_withMultipleComponentsImplementingSameQualifiedInterfaceAndNoDepCycle_shouldNotThrow() {
+    List<Component<?>> components =
+        Arrays.asList(
+            Component.builder(TestInterface1.class).factory(nullFactory()).build(),
+            Component.builder(qualified(Qualifier1.class, TestInterface1.class))
+                .add(Dependency.required(TestInterface1.class))
+                .factory(nullFactory())
+                .build(),
+            Component.builder(qualified(Qualifier2.class, TestInterface1.class))
+                .add(Dependency.required(qualified(Qualifier1.class, TestInterface1.class)))
+                .factory(nullFactory())
+                .build());
+
+    CycleDetector.detect(components);
+  }
+
   private static void detect(List<Component<?>> components) {
     Collections.shuffle(components);
     try {
diff --git a/firebase-components/src/test/java/com/google/firebase/components/DependencyTest.java b/firebase-components/src/test/java/com/google/firebase/components/DependencyTest.java
index 0c3fdaca99c..9c13a0a9fd8 100644
--- a/firebase-components/src/test/java/com/google/firebase/components/DependencyTest.java
+++ b/firebase-components/src/test/java/com/google/firebase/components/DependencyTest.java
@@ -15,11 +15,17 @@
 package com.google.firebase.components;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.components.Qualified.qualified;
+import static com.google.firebase.components.Qualified.unqualified;
 
+import javax.inject.Qualifier;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+@Qualifier
+@interface TestQualifier {}
+
 @RunWith(JUnit4.class)
 public class DependencyTest {
   @Test
@@ -29,7 +35,7 @@ public void optional_shouldHaveExpectedInvariants() {
     assertThat(dependency.isRequired()).isFalse();
     assertThat(dependency.isSet()).isFalse();
     assertThat(dependency.isDirectInjection()).isTrue();
-    assertThat(dependency.getInterface()).isEqualTo(String.class);
+    assertThat(dependency.getInterface()).isEqualTo(unqualified(String.class));
   }
 
   @Test
@@ -39,7 +45,17 @@ public void required_shouldHaveExpectedInvariants() {
     assertThat(dependency.isRequired()).isTrue();
     assertThat(dependency.isSet()).isFalse();
     assertThat(dependency.isDirectInjection()).isTrue();
-    assertThat(dependency.getInterface()).isEqualTo(String.class);
+    assertThat(dependency.getInterface()).isEqualTo(unqualified(String.class));
+  }
+
+  @Test
+  public void requiredQualified_shouldHaveExpectedInvariants() {
+    Dependency dependency = Dependency.required(qualified(TestQualifier.class, String.class));
+
+    assertThat(dependency.isRequired()).isTrue();
+    assertThat(dependency.isSet()).isFalse();
+    assertThat(dependency.isDirectInjection()).isTrue();
+    assertThat(dependency.getInterface()).isEqualTo(qualified(TestQualifier.class, String.class));
   }
 
   @Test
@@ -49,7 +65,17 @@ public void setOf_shouldHaveExpectedInvariants() {
     assertThat(dependency.isRequired()).isFalse();
     assertThat(dependency.isSet()).isTrue();
     assertThat(dependency.isDirectInjection()).isTrue();
-    assertThat(dependency.getInterface()).isEqualTo(String.class);
+    assertThat(dependency.getInterface()).isEqualTo(unqualified(String.class));
+  }
+
+  @Test
+  public void setOfQualified_shouldHaveExpectedInvariants() {
+    Dependency dependency = Dependency.setOf(qualified(TestQualifier.class, String.class));
+
+    assertThat(dependency.isRequired()).isFalse();
+    assertThat(dependency.isSet()).isTrue();
+    assertThat(dependency.isDirectInjection()).isTrue();
+    assertThat(dependency.getInterface()).isEqualTo(qualified(TestQualifier.class, String.class));
   }
 
   @Test
@@ -59,7 +85,18 @@ public void optionalProvider_shouldHaveExpectedInvariants() {
     assertThat(dependency.isRequired()).isFalse();
     assertThat(dependency.isSet()).isFalse();
     assertThat(dependency.isDirectInjection()).isFalse();
-    assertThat(dependency.getInterface()).isEqualTo(String.class);
+    assertThat(dependency.getInterface()).isEqualTo(unqualified(String.class));
+  }
+
+  @Test
+  public void optionalProviderQualified_shouldHaveExpectedInvariants() {
+    Dependency dependency =
+        Dependency.optionalProvider(qualified(TestQualifier.class, String.class));
+
+    assertThat(dependency.isRequired()).isFalse();
+    assertThat(dependency.isSet()).isFalse();
+    assertThat(dependency.isDirectInjection()).isFalse();
+    assertThat(dependency.getInterface()).isEqualTo(qualified(TestQualifier.class, String.class));
   }
 
   @Test
@@ -69,7 +106,18 @@ public void requiredProvider_shouldHaveExpectedInvariants() {
     assertThat(dependency.isRequired()).isTrue();
     assertThat(dependency.isSet()).isFalse();
     assertThat(dependency.isDirectInjection()).isFalse();
-    assertThat(dependency.getInterface()).isEqualTo(String.class);
+    assertThat(dependency.getInterface()).isEqualTo(unqualified(String.class));
+  }
+
+  @Test
+  public void requiredProviderQualified_shouldHaveExpectedInvariants() {
+    Dependency dependency =
+        Dependency.requiredProvider(qualified(TestQualifier.class, String.class));
+
+    assertThat(dependency.isRequired()).isTrue();
+    assertThat(dependency.isSet()).isFalse();
+    assertThat(dependency.isDirectInjection()).isFalse();
+    assertThat(dependency.getInterface()).isEqualTo(qualified(TestQualifier.class, String.class));
   }
 
   @Test
@@ -79,6 +127,16 @@ public void setOfProvider_shouldHaveExpectedInvariants() {
     assertThat(dependency.isRequired()).isFalse();
     assertThat(dependency.isSet()).isTrue();
     assertThat(dependency.isDirectInjection()).isFalse();
-    assertThat(dependency.getInterface()).isEqualTo(String.class);
+    assertThat(dependency.getInterface()).isEqualTo(unqualified(String.class));
+  }
+
+  @Test
+  public void setOfProviderQualified_shouldHaveExpectedInvariants() {
+    Dependency dependency = Dependency.setOfProvider(qualified(TestQualifier.class, String.class));
+
+    assertThat(dependency.isRequired()).isFalse();
+    assertThat(dependency.isSet()).isTrue();
+    assertThat(dependency.isDirectInjection()).isFalse();
+    assertThat(dependency.getInterface()).isEqualTo(qualified(TestQualifier.class, String.class));
   }
 }
diff --git a/firebase-components/src/test/java/com/google/firebase/components/EventBusTest.java b/firebase-components/src/test/java/com/google/firebase/components/EventBusTest.java
index 1bde260cbce..469802bded7 100644
--- a/firebase-components/src/test/java/com/google/firebase/components/EventBusTest.java
+++ b/firebase-components/src/test/java/com/google/firebase/components/EventBusTest.java
@@ -15,7 +15,7 @@
 package com.google.firebase.components;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
diff --git a/firebase-components/src/test/java/com/google/firebase/components/RestrictedComponentContainerTest.java b/firebase-components/src/test/java/com/google/firebase/components/RestrictedComponentContainerTest.java
index bda8a135cd5..8367780f302 100644
--- a/firebase-components/src/test/java/com/google/firebase/components/RestrictedComponentContainerTest.java
+++ b/firebase-components/src/test/java/com/google/firebase/components/RestrictedComponentContainerTest.java
@@ -15,9 +15,11 @@
 package com.google.firebase.components;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.components.Qualified.unqualified;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -96,10 +98,10 @@ public void get_withPublisher_shouldThrow() {
   @Test
   public void getProvider_withAllowedClass_shouldReturnAnInstanceOfThatClass() {
     Double value = 3.0d;
-    when(delegate.getProvider(Double.class)).thenReturn(new Lazy<>(value));
+    when(delegate.getProvider(unqualified(Double.class))).thenReturn(new Lazy<>(value));
 
     assertThat(container.getProvider(Double.class).get()).isSameInstanceAs(value);
-    verify(delegate).getProvider(Double.class);
+    verify(delegate).getProvider(unqualified(Double.class));
   }
 
   @Test
@@ -125,12 +127,16 @@ public void getProvider_withDirectClass_shouldThrow() {
   @Test
   public void getDeferred_withAllowedClass_shouldReturnAnInstanceOfThatClass() {
     Integer value = 3;
-    when(delegate.getDeferred(Integer.class)).thenReturn(OptionalProvider.of(() -> value));
+    when(delegate.getDeferred(unqualified(Integer.class)))
+        .thenReturn(OptionalProvider.of(() -> value));
 
     AtomicReference<Integer> returned = new AtomicReference<>();
     container.getDeferred(Integer.class).whenAvailable(d -> returned.set(d.get()));
     assertThat(returned.get()).isSameInstanceAs(value);
-    verify(delegate).getDeferred(Integer.class);
+
+    container.getDeferred(unqualified(Integer.class)).whenAvailable(d -> returned.set(d.get()));
+    assertThat(returned.get()).isSameInstanceAs(value);
+    verify(delegate, times(2)).getDeferred(unqualified(Integer.class));
   }
 
   @Test
@@ -166,10 +172,11 @@ public void getDeferred_withProviderClass_shouldThrow() {
   @Test
   public void setOf_withAllowedClass_shouldReturnExpectedSet() {
     Set<Long> set = Collections.emptySet();
-    when(delegate.setOf(Long.class)).thenReturn(set);
+    when(delegate.setOf(unqualified(Long.class))).thenReturn(set);
 
     assertThat(container.setOf(Long.class)).isSameInstanceAs(set);
-    verify(delegate).setOf(Long.class);
+    assertThat(container.setOf(unqualified(Long.class))).isSameInstanceAs(set);
+    verify(delegate, times(2)).setOf(unqualified(Long.class));
   }
 
   @Test
@@ -185,10 +192,11 @@ public void setOf_withNotAllowedClass_shouldThrow() {
   @Test
   public void setOfProvider_withAllowedClass_shouldReturnExpectedSet() {
     Set<Boolean> set = Collections.emptySet();
-    when(delegate.setOfProvider(Boolean.class)).thenReturn(new Lazy<>(set));
+    when(delegate.setOfProvider(unqualified(Boolean.class))).thenReturn(new Lazy<>(set));
 
     assertThat(container.setOfProvider(Boolean.class).get()).isSameInstanceAs(set);
-    verify(delegate).setOfProvider(Boolean.class);
+    assertThat(container.setOfProvider(unqualified(Boolean.class)).get()).isSameInstanceAs(set);
+    verify(delegate, times(2)).setOfProvider(unqualified(Boolean.class));
   }
 
   @Test
diff --git a/firebase-config-interop/.gitignore b/firebase-config-interop/.gitignore
new file mode 100644
index 00000000000..796b96d1c40
--- /dev/null
+++ b/firebase-config-interop/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/firebase-config-interop/CHANGELOG.md b/firebase-config-interop/CHANGELOG.md
new file mode 100644
index 00000000000..225bbc02245
--- /dev/null
+++ b/firebase-config-interop/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Unreleased
+* [unchanged] Updated to keep [config] SDK versions aligned.
+
+# 16.0.0
+* [feature] Initial release.
diff --git a/firebase-config-interop/api.txt b/firebase-config-interop/api.txt
new file mode 100644
index 00000000000..f332dd309d1
--- /dev/null
+++ b/firebase-config-interop/api.txt
@@ -0,0 +1,46 @@
+// Signature format: 2.0
+package com.google.firebase.remoteconfig.interop {
+
+  public interface FirebaseRemoteConfigInterop {
+    method public void registerRolloutsStateSubscriber(@NonNull String, @NonNull com.google.firebase.remoteconfig.interop.rollouts.RolloutsStateSubscriber);
+  }
+
+}
+
+package com.google.firebase.remoteconfig.interop.rollouts {
+
+  @com.google.auto.value.AutoValue @com.google.firebase.encoders.annotations.Encodable public abstract class RolloutAssignment {
+    ctor public RolloutAssignment();
+    method @NonNull public static com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.Builder builder();
+    method @NonNull public static com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment create(@NonNull org.json.JSONObject) throws org.json.JSONException;
+    method @NonNull public static com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment create(@NonNull String) throws org.json.JSONException;
+    method @NonNull public abstract String getParameterKey();
+    method @NonNull public abstract String getParameterValue();
+    method @NonNull public abstract String getRolloutId();
+    method public abstract long getTemplateVersion();
+    method @NonNull public abstract String getVariantId();
+    field public static final com.google.firebase.encoders.DataEncoder ROLLOUT_ASSIGNMENT_JSON_ENCODER;
+  }
+
+  @com.google.auto.value.AutoValue.Builder public abstract static class RolloutAssignment.Builder {
+    ctor public RolloutAssignment.Builder();
+    method @NonNull public abstract com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment build();
+    method @NonNull public abstract com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.Builder setParameterKey(@NonNull String);
+    method @NonNull public abstract com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.Builder setParameterValue(@NonNull String);
+    method @NonNull public abstract com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.Builder setRolloutId(@NonNull String);
+    method @NonNull public abstract com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.Builder setTemplateVersion(long);
+    method @NonNull public abstract com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.Builder setVariantId(@NonNull String);
+  }
+
+  @com.google.auto.value.AutoValue public abstract class RolloutsState {
+    ctor public RolloutsState();
+    method @NonNull public static com.google.firebase.remoteconfig.interop.rollouts.RolloutsState create(@NonNull java.util.Set<com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment>);
+    method @NonNull public abstract java.util.Set<com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment> getRolloutAssignments();
+  }
+
+  public interface RolloutsStateSubscriber {
+    method public void onRolloutsStateChanged(@NonNull com.google.firebase.remoteconfig.interop.rollouts.RolloutsState);
+  }
+
+}
+
diff --git a/firebase-config-interop/firebase-config-interop.gradle.kts b/firebase-config-interop/firebase-config-interop.gradle.kts
new file mode 100644
index 00000000000..e2ac74b8b2c
--- /dev/null
+++ b/firebase-config-interop/firebase-config-interop.gradle.kts
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("firebase-library")
+}
+
+firebaseLibrary {
+    publishSources = true
+    publishJavadoc = false
+    publishReleaseNotes = false
+}
+
+android {
+    val compileSdkVersion : Int by rootProject
+    val targetSdkVersion: Int by rootProject
+    val minSdkVersion : Int by rootProject
+
+    namespace = "com.google.firebase.remoteconfiginterop"
+    compileSdk = compileSdkVersion
+
+    defaultConfig {
+        minSdk = minSdkVersion
+        targetSdk = targetSdkVersion
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    api("com.google.firebase:firebase-encoders-json:18.0.1")
+    api("com.google.firebase:firebase-encoders:17.0.0")
+
+    compileOnly("com.google.auto.value:auto-value-annotations:1.10.1")
+
+    annotationProcessor("com.google.auto.value:auto-value:1.10.1")
+    annotationProcessor(project(":encoders:firebase-encoders-processor"))
+
+    testImplementation(libs.junit)
+    testImplementation(libs.truth)
+    testImplementation(libs.robolectric)
+
+    androidTestImplementation(libs.androidx.test.junit)
+}
diff --git a/firebase-config-interop/gradle.properties b/firebase-config-interop/gradle.properties
new file mode 100644
index 00000000000..ccaf8e1e141
--- /dev/null
+++ b/firebase-config-interop/gradle.properties
@@ -0,0 +1,2 @@
+version=17.0.0
+latestReleasedVersion=16.0.1
diff --git a/firebase-config-interop/src/main/AndroidManifest.xml b/firebase-config-interop/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..638d68e5b48
--- /dev/null
+++ b/firebase-config-interop/src/main/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2023 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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">
+
+</manifest>
\ No newline at end of file
diff --git a/firebase-config-interop/src/main/java/com/google/firebase/remoteconfig/interop/FirebaseRemoteConfigInterop.java b/firebase-config-interop/src/main/java/com/google/firebase/remoteconfig/interop/FirebaseRemoteConfigInterop.java
new file mode 100644
index 00000000000..1ff18c4c401
--- /dev/null
+++ b/firebase-config-interop/src/main/java/com/google/firebase/remoteconfig/interop/FirebaseRemoteConfigInterop.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.interop;
+
+import androidx.annotation.NonNull;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutsStateSubscriber;
+
+public interface FirebaseRemoteConfigInterop {
+  /**
+   * Register a {@link RolloutsStateSubscriber} {@code subscriber} whose callback {@code
+   * onRolloutsStateChanged} is invoked when the set of assigned rollouts changes for the given
+   * Remote Config {@code namespace}.
+   *
+   * @param namespace The Remote Config namespace for which {@code subscriber} should be registered.
+   *     A Firebase project can have multiple Remote Configs, each belonging to a unique namespace,
+   *     ex. "firebase" for the default configuration.
+   * @param subscriber An implementation of {@link RolloutsStateSubscriber}.
+   */
+  void registerRolloutsStateSubscriber(
+      @NonNull String namespace, @NonNull RolloutsStateSubscriber subscriber);
+}
diff --git a/firebase-config-interop/src/main/java/com/google/firebase/remoteconfig/interop/rollouts/RolloutAssignment.java b/firebase-config-interop/src/main/java/com/google/firebase/remoteconfig/interop/rollouts/RolloutAssignment.java
new file mode 100644
index 00000000000..c9b3d2b3010
--- /dev/null
+++ b/firebase-config-interop/src/main/java/com/google/firebase/remoteconfig/interop/rollouts/RolloutAssignment.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.interop.rollouts;
+
+import androidx.annotation.NonNull;
+import com.google.auto.value.AutoValue;
+import com.google.firebase.encoders.DataEncoder;
+import com.google.firebase.encoders.annotations.Encodable;
+import com.google.firebase.encoders.json.JsonDataEncoderBuilder;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/** Model representing a single rollout assigned to an app instance at a point in time. */
+@Encodable
+@AutoValue
+public abstract class RolloutAssignment {
+  private static final String ROLLOUT_ID = "rolloutId";
+  private static final String VARIANT_ID = "variantId";
+  private static final String PARAMETER_KEY = "parameterKey";
+  private static final String PARAMETER_VALUE = "parameterValue";
+  private static final String TEMPLATE_VERSION = "templateVersion";
+
+  /** An ID representing the rollout. The ID is unique within a Remote Config template. */
+  @NonNull
+  public abstract String getRolloutId();
+
+  /** The variant of the rollout assigned to the app instance. */
+  @NonNull
+  public abstract String getVariantId();
+
+  /** The Remote Config parameter key affected by the rollout. */
+  @NonNull
+  public abstract String getParameterKey();
+
+  /** The value of the affected parameter key. */
+  @NonNull
+  public abstract String getParameterValue();
+
+  /** The Remote Config template version containing this rollout. */
+  public abstract long getTemplateVersion();
+
+  // TODO(Dana): Maybe the encoder should live in the Crashlytics SDK?
+  public static final DataEncoder ROLLOUT_ASSIGNMENT_JSON_ENCODER =
+      new JsonDataEncoderBuilder().configureWith(AutoRolloutAssignmentEncoder.CONFIG).build();
+
+  /** Create a {@code RolloutAssignment} from its JSON representation. */
+  @NonNull
+  public static RolloutAssignment create(@NonNull JSONObject json) throws JSONException {
+    return RolloutAssignment.builder()
+        .setRolloutId(json.getString(ROLLOUT_ID))
+        .setVariantId(json.getString(VARIANT_ID))
+        .setParameterKey(json.getString(PARAMETER_KEY))
+        .setParameterValue(json.getString(PARAMETER_VALUE))
+        .setTemplateVersion(json.getLong(TEMPLATE_VERSION))
+        .build();
+  }
+
+  /** Create a {@code RolloutAssignment} from its JSON-encoded representation. */
+  @NonNull
+  public static RolloutAssignment create(@NonNull String jsonString) throws JSONException {
+    return create(new JSONObject(jsonString));
+  }
+
+  @NonNull
+  public static Builder builder() {
+    return new AutoValue_RolloutAssignment.Builder();
+  }
+
+  @AutoValue.Builder
+  public abstract static class Builder {
+    @NonNull
+    public abstract Builder setRolloutId(@NonNull String rolloutId);
+
+    @NonNull
+    public abstract Builder setVariantId(@NonNull String variantId);
+
+    @NonNull
+    public abstract Builder setParameterKey(@NonNull String parameterKey);
+
+    @NonNull
+    public abstract Builder setParameterValue(@NonNull String parameterValue);
+
+    @NonNull
+    public abstract Builder setTemplateVersion(long templateVersion);
+
+    @NonNull
+    public abstract RolloutAssignment build();
+  }
+}
diff --git a/firebase-config-interop/src/main/java/com/google/firebase/remoteconfig/interop/rollouts/RolloutsState.java b/firebase-config-interop/src/main/java/com/google/firebase/remoteconfig/interop/rollouts/RolloutsState.java
new file mode 100644
index 00000000000..22a5baeb042
--- /dev/null
+++ b/firebase-config-interop/src/main/java/com/google/firebase/remoteconfig/interop/rollouts/RolloutsState.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.interop.rollouts;
+
+import androidx.annotation.NonNull;
+import com.google.auto.value.AutoValue;
+import java.util.Set;
+
+/** Model representing the state of all rollouts assigned to an app instance at a point in time. */
+@AutoValue
+public abstract class RolloutsState {
+  /** Rollouts assigned at this point in time. May include zero or more assignments. */
+  @NonNull
+  public abstract Set<RolloutAssignment> getRolloutAssignments();
+
+  @NonNull
+  public static RolloutsState create(@NonNull Set<RolloutAssignment> rolloutAssignments) {
+    return new AutoValue_RolloutsState(rolloutAssignments);
+  }
+}
diff --git a/firebase-config-interop/src/main/java/com/google/firebase/remoteconfig/interop/rollouts/RolloutsStateSubscriber.java b/firebase-config-interop/src/main/java/com/google/firebase/remoteconfig/interop/rollouts/RolloutsStateSubscriber.java
new file mode 100644
index 00000000000..fd46a9454d1
--- /dev/null
+++ b/firebase-config-interop/src/main/java/com/google/firebase/remoteconfig/interop/rollouts/RolloutsStateSubscriber.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.interop.rollouts;
+
+import androidx.annotation.NonNull;
+
+public interface RolloutsStateSubscriber {
+  void onRolloutsStateChanged(@NonNull RolloutsState rolloutsState);
+}
diff --git a/firebase-config-interop/src/test/java/com/google/firebase/remoteconfig/interop/rollouts/RolloutAssignmentTest.java b/firebase-config-interop/src/test/java/com/google/firebase/remoteconfig/interop/rollouts/RolloutAssignmentTest.java
new file mode 100644
index 00000000000..8046fa9686d
--- /dev/null
+++ b/firebase-config-interop/src/test/java/com/google/firebase/remoteconfig/interop/rollouts/RolloutAssignmentTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.interop.rollouts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.json.JSONException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class RolloutAssignmentTest {
+  private static final String ROLLOUT_ASSIGNMENT_JSON_1 =
+      "{"
+          + "\"rolloutId\":\"rollout_1\","
+          + "\"variantId\":\"control\","
+          + "\"parameterKey\":\"my_feature\","
+          + "\"parameterValue\":\"false\","
+          + "\"templateVersion\":1"
+          + "}";
+
+  private static final RolloutAssignment ROLLOUT_ASSIGNMENT_1 =
+      RolloutAssignment.builder()
+          .setRolloutId("rollout_1")
+          .setVariantId("control")
+          .setParameterKey("my_feature")
+          .setParameterValue("false")
+          .setTemplateVersion(1L)
+          .build();
+
+  @Test
+  public void create_fromJsonString_parsesValidJson() throws JSONException {
+    RolloutAssignment actual = RolloutAssignment.create(ROLLOUT_ASSIGNMENT_JSON_1);
+
+    assertThat(actual).isEqualTo(ROLLOUT_ASSIGNMENT_1);
+  }
+
+  @Test
+  public void encoder_encodesRolloutAssignment_toJson() throws JSONException {
+    String actual = RolloutAssignment.ROLLOUT_ASSIGNMENT_JSON_ENCODER.encode(ROLLOUT_ASSIGNMENT_1);
+
+    assertThat(actual).isEqualTo(ROLLOUT_ASSIGNMENT_JSON_1);
+  }
+}
diff --git a/firebase-config/CHANGELOG.md b/firebase-config/CHANGELOG.md
new file mode 100644
index 00000000000..110b313c112
--- /dev/null
+++ b/firebase-config/CHANGELOG.md
@@ -0,0 +1,437 @@
+# Unreleased
+
+
+# 22.0.0
+* [changed] Bump internal dependencies
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.6.3
+* [fixed] Fixed a bug that could cause a crash if the app was backgrounded
+  while it was listening for real-time Remote Config updates. For more information, see #5751
+
+# 21.6.2
+* [fixed] Fixed an issue that could cause [remote_config] personalizations to be logged early in
+  specific cases.
+* [fixed] Fixed an issue where the connection to the real-time Remote Config backend could remain
+  open in the background.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.6.1
+* [changed] Bump internal dependencies.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.6.0
+* [changed] Added support for other Firebase products to integrate with [remote_config].
+
+# 21.5.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-config-ktx`
+  to `com.google.firebase:firebase-config` under the `com.google.firebase.remoteconfig` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-config-ktx` have been added to
+  `com.google.firebase:firebase-config` under the `com.google.firebase.remoteconfig` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-config-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.4.1
+* [changed] Internal improvements to support Remote Config real-time updates.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.4.0
+* [unchanged] Updated to accommodate the release of the updated
+  [remote_config] Kotlin extensions library.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has the following
+additional updates.
+
+* [feature] Added the
+  [`FirebaseRemoteConfig.configUpdates`](/docs/reference/kotlin/com/google/firebase/remoteconfig/ktx/package-summary#(com.google.firebase.remoteconfig.FirebaseRemoteConfig).configUpdates())
+  Kotlin Flow to listen for real-time config updates.
+
+# 21.3.0
+* [feature] Added support for real-time config updates. To learn more, see
+  [Get started with [firebase_remote_config]](/docs/remote-config/get-started?platform=android#add-real-time-listener).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.2.1
+* [changed] Migrated [remote_config] to use standard Firebase executors.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.2.0
+* [unchanged] Updated to accommodate the release of the updated
+  [remote_config] Kotlin extensions library.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+  `firebase-config` library. The Kotlin extensions library has the following
+  additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-config-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+
+# 21.1.2
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.1.1
+* [fixed] Fixed a bug that caused HTTP errors in some locales. For more
+  information, see
+  <a href="https://github.com/firebase/firebase-android-sdk/issues/3757"
+     class="external">GitHub Issue #3757</a>
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.1.0
+<aside class="caution">This version contains a bug that causes HTTP errors in
+  some locales. We recommend updating to the latest version (v21.1.1+) which
+  contains a fix.
+  For more information, see
+  <a href="https://github.com/firebase/firebase-android-sdk/issues/3757"
+     class="external">GitHub Issue #3757</a>
+</aside>
+
+* [changed] Added first-open time to [remote_config] server requests.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.0.2
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.0.1
+* [fixed] Fixed a bug in the initialization of [remote_config] with a
+  non-primary Firebase app.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.0.0
+* [changed] Internal infrastructure improvements.
+* [changed] Internal changes to support dynamic feature modules.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.4
+* [changed] Improved condition targeting signals.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.3
+* [changed] Standardize support for other Firebase products that integrate
+  with [remote_config].
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.2
+* [fixed] Fixed an issue that was causing [remote_config] to return the
+  static default value even if a remote value was defined. (#2186)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.1
+* [changed] Added support for other Firebase products to integrate with
+  [remote_config].
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.0
+* [removed] Removed the protocol buffer dependency. Also, removed support for
+  configs saved on device using the legacy protocol buffer format (the SDK
+  stopped using this legacy format starting with [remote_config] v16.3.0).
+* [removed] Removed the deprecated synchronous method
+  `FirebaseRemoteConfig.activateFetched()`. Use the asynchronous
+  [`FirebaseRemoteConfig.activate()`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#activate())
+  instead.
+* [removed] Removed the deprecated synchronous methods
+  `FirebaseRemoteConfig.setDefaults(int)` and
+  `FirebaseRemoteConfig.setDefaults(Map<String,Object>)`. Use the asynchronous
+  [`FirebaseRemoteConfig.setDefaultsAsync(int)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setDefaultsAsync(int))
+  and [`FirebaseRemoteConfig.setDefaultsAsync(Map<String,Object>)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setDefaultsAsync(Map<String,Object>))
+  instead.
+* [removed] Removed the deprecated synchronous method
+  `FirebaseRemoteConfig.setConfigSettings(FirebaseRemoteConfigSettings)`.
+  Use the asynchronous
+  [`FirebaseRemoteConfig.setConfigSettingsAsync(FirebaseRemoteConfigSettings)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setConfigSettingsAsync(FirebaseRemoteConfigSettings))
+  instead.
+* [removed] Removed the deprecated method
+  `FirebaseRemoteConfig.getByteArray(String)`. Use
+  [`FirebaseRemoteConfig.getString(String)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#getString(String))
+  instead.
+* [removed] Removed the deprecated methods
+  `FirebaseRemoteConfigSettings.isDeveloperModeEnabled()` and
+  `FirebaseRemoteConfigSettings.Builder.setDeveloperModeEnabled(boolean)`. Use
+  [`FirebaseRemoteConfigSettings#getMinimumFetchIntervalInSeconds()`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfigSettings#getMinimumFetchIntervalInSeconds())
+  and [`FirebaseRemoteConfigSettings.Builder#setMinimumFetchIntervalInSeconds(long)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfigSettings.Builder#setMinimumFetchIntervalInSeconds(long))
+  instead.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.2.0
+* [changed] Migrated to use the [firebase_installations] service _directly_
+  instead of using an indirect dependency via the Firebase Instance ID SDK.
+
+  {% include "docs/reference/android/client/_includes/_iid-indirect-dependency-solutions.html" %}
+* [changed] Updated the protocol buffer dependency to the newer
+  `protobuf-javalite` artifact. The new artifact is incompatible with the old
+  one, so this library needed to be upgraded to avoid conflicts. No developer
+  action is necessary.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.1.4
+* [changed] Updated dependency on the Firebase Instance ID library to v20.1.5,
+  which is a step towards a direct dependency on the Firebase installations
+  service in a future release.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.1.3
+* [fixed] Fixed an issue where [`FirebaseRemoteConfig.fetch()`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig.html#fetch())
+would sometimes report a misformatted language tag.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.1.2
+* [fixed] Resolved known issue where
+  [`FirebaseRemoteConfigSettings.Builder.setFetchTimeoutInSeconds()`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfigSettings.Builder)
+  was not always honored.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.1.1
+* [changed] Updated [`FirebaseRemoteConfig.fetch()`](docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig.html#fetch())
+implementation to use [`FirebaseInstanceId.getInstanceId()`](/docs/reference/android/com/google/firebase/iid/FirebaseInstanceId.html#getInstanceId())
+in favor of the deprecated [`FirebaseInstanceId.getToken()`](/docs/reference/android/com/google/firebase/iid/FirebaseInstanceId.html#getToken()).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.1.0
+* [changed] Added getters to the fields of the
+  [`FirebaseRemoteConfigSettings.Builder`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfigSettings.Builder)
+  object to provide better Kotlin patterns.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.0.4
+* [fixed] Resolved
+  [known issue](//github.com/firebase/firebase-android-sdk/issues/973) where
+  network calls may fail on devices using API 19 and earlier.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.0.3
+* [fixed] Resolved
+  [known issue](https://github.com/firebase/firebase-android-sdk/issues/787)
+  where the [firebase_remote_config] SDK threw an error when Android
+  [StrictMode](https://developer.android.com/reference/android/os/StrictMode)
+  was turned on.
+* [fixed] Resolved issue where setting Byte Arrays via
+  [`FirebaseRemoteConfig.setDefaultsAsync(int)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setDefaultsAsync(int)),
+  [`FirebaseRemoteConfig.setDefaultsAsync(Map<String,Object>)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setDefaultsAsync(Map<String,Object>))
+  and their synchronous counterparts would cause `getByteArray` to return an
+  object reference instead of the Byte Array. Byte Arrays set via the
+  Firebase console were unaffected by this bug.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-config` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.0.2
+* [unchanged] Updated to accommodate the release of the [remote_config]
+  Kotlin extensions library.
+
+
+## Kotlin
+* [feature] The beta release of a [remote_config] Android library with
+  Kotlin extensions is now available. The Kotlin extensions library transitively
+  includes the base `firebase-config` library. To learn more,  visit the
+  [[remote_config] KTX documentation](/docs/reference/kotlin/com/google/firebase/remoteconfig/ktx/package-summary).
+
+# 19.0.1
+* [fixed] Resolved known issue where certain unicode characters were not
+  encoded correctly. The issue was introduced in v19.0.0.
+
+# 19.0.0
+* [changed] Versioned to add nullability annotations to improve the Kotlin
+  developer experience. No other changes.
+
+# 17.0.0
+* [feature] Added an asynchronous way to set config settings: [`FirebaseRemoteConfig.setConfigSettingsAsync(FirebaseRemoteConfigSettings)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setConfigSettingsAsync(FirebaseRemoteConfigSettings)).
+* [feature] Added [`FirebaseRemoteConfigServerException`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfigServerException) and [`FirebaseRemoteConfigClientException`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientException) to provide more nuanced error reporting.
+* [changed] Updated all "cache expiration" references to "minimum fetch interval" and "cache" references to "local storage".
+* [deprecated] Deprecated developer mode. Use [`FirebaseRemoteConfigSettings.Builder.setMinimumFetchIntervalInSeconds(0L)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfigSettings.Builder#setMinimumFetchIntervalInSeconds(long)) instead.
+* [deprecated] Deprecated the synchronous [`FirebaseRemoteConfig.setConfigSettings(FirebaseRemoteConfigSettings)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setConfigSettings(FirebaseRemoteConfigSettings)). Use the asynchronous  [`FirebaseRemoteConfig.setConfigSettingsAsync(FirebaseRemoteConfigSettings)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setConfigSettingsAsync(FirebaseRemoteConfigSettings)) instead.
+* [deprecated] Deprecated [`FirebaseRemoteConfigFetchException`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfigFetchException). Use the more granular [`FirebaseRemoteConfigServerException`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfigServerException) and [`FirebaseRemoteConfigClientException`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientException) instead.
+* [removed] Removed all namespace methods.
+* [removed] Removed all default constructors for Exception classes.
+* [changed] Updated minSdkVersion to API level 16.
+
+# 16.5.0
+* [feature] Enabled multi-App support. Use [`FirebaseRemoteConfig.getInstance(FirebaseApp)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#getInstance(FirebaseApp)) to retrieve a singleton instance of [`FirebaseRemoteConfig`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig) for the given [`FirebaseApp`](/docs/reference/android/com/google/firebase/FirebaseApp).
+* [feature] Added a method that fetches configs and activates them: [`FirebaseRemoteConfig.fetchAndActivate()`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#fetchAndActivate()).
+* [feature] Network connection timeout for fetch requests is now customizable. To set the network timeout, use [`FirebaseRemoteConfigSettings.Builder.setFetchTimeoutInSeconds(long)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfigSettings.Builder#setFetchTimeoutInSeconds(long)).
+* [feature] The default minimum fetch interval is now customizable. To set the default minimum fetch interval, use [`FirebaseRemoteConfigSettings.Builder.setMinimumFetchIntervalInSeconds(long)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfigSettings.Builder#setMinimumFetchIntervalInSeconds(long)).
+* [feature] Added a way to get all activated configs as a Java `Map`: [`FirebaseRemoteConfig.getAll()`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#getAll()).
+* [feature] Added the ability to reset a Firebase Remote Config instance: [`FirebaseRemoteConfig.reset()`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#reset()).
+* [feature] Added a way to determine if the Firebase Remote Config instance has finished initializing. To get a task that will complete when the Firebase Remote Config instance is finished initializing, use [`FirebaseRemoteConfig.ensureInitialized()`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#ensureInitialized()).
+* [feature] Added an asynchronous way to activate configs: [`FirebaseRemoteConfig.activate()`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#activate()).
+* [feature] Added an asynchronous way to set defaults: [`FirebaseRemoteConfig.setDefaultsAsync(int)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setDefaultsAsync(int)) and [`FirebaseRemoteConfig.setDefaultsAsync(Map<String,Object>)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setDefaultsAsync(Map<String,Object>)).
+* [deprecated] Deprecated the synchronous [`FirebaseRemoteConfig.activateFetched()`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#activateFetched()). Use the asynchronous [`FirebaseRemoteConfig.activate()`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#activate()) instead.
+* [deprecated] Deprecated the synchronous [`FirebaseRemoteConfig.setDefaults(int)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setDefaults(int)) and [`FirebaseRemoteConfig.setDefaults(Map<String,Object>)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setDefalts(Map<String,Object>)). Use the asynchronous  [`FirebaseRemoteConfig.setDefaultsAsync(int)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setDefaultsAsync(int)) and [`FirebaseRemoteConfig.setDefaultsAsync(Map<String,Object>)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#setDefaultsAsync(Map<String,Object>)) instead.
+* [deprecated] Deprecated [`FirebaseRemoteConfig.getByteArray(String)`](/docs/reference/android/com/google/firebase/remoteconfig/FirebaseRemoteConfig#getByteArray(String)).
+* [deprecated] Deprecated all methods with a namespace parameter.
+
+# 16.4.1
+* [changed] The SDK now enforces Android API Key restrictions.
+* [fixed] Resolved known issue where the local cache was not honored even if
+  it had not expired. The issue was introduced in version 16.3.0.
+
+# 16.4.0
+* [changed] Internal changes to ensure functionality alignment with other SDK releases.
+
+# 16.3.0
+* [changed] The [firebase_remote_config] SDK requires the
+  [firebase_remote_config] REST API. For Firebase projects created before
+  March 7, 2018, you must manually enable the REST API. For more information,
+  see our
+  [[remote_config] REST API user guide](https://firebase.google.com/docs/remote-config/use-config-rest#before_you_begin_enable_the_rest_api).
+* [changed] Refactored the implementation of [remote_config] to improve SDK
+  stability and speed, and to remove the Google Play Services dependency.
+* [changed] Improved error logs and exception messages.
+* [changed] Updated the Android documentation to reflect that
+  [remote_config] uses `Locale` to retrieve location information, similar to
+  iOS's use of `countryCode`.
+
+# 16.1.3
+* [fixed] Fixed an issue where [remote_config] experiments were not
+  collecting results.
+
+# 16.1.0
+* [fixed] Bug fixes and internal improvements to support Firebase Performance Monitoring features.
+
diff --git a/firebase-config/api.txt b/firebase-config/api.txt
index 96b53fa05a4..61528ec5d11 100644
--- a/firebase-config/api.txt
+++ b/firebase-config/api.txt
@@ -1,8 +1,24 @@
 // Signature format: 2.0
 package com.google.firebase.remoteconfig {
 
+  @com.google.auto.value.AutoValue public abstract class ConfigUpdate {
+    ctor public ConfigUpdate();
+    method @NonNull public static com.google.firebase.remoteconfig.ConfigUpdate create(@NonNull java.util.Set<java.lang.String>);
+    method @NonNull public abstract java.util.Set<java.lang.String> getUpdatedKeys();
+  }
+
+  public interface ConfigUpdateListener {
+    method public void onError(@NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException);
+    method public void onUpdate(@NonNull com.google.firebase.remoteconfig.ConfigUpdate);
+  }
+
+  public interface ConfigUpdateListenerRegistration {
+    method public void remove();
+  }
+
   public class FirebaseRemoteConfig {
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Boolean> activate();
+    method @NonNull public com.google.firebase.remoteconfig.ConfigUpdateListenerRegistration addOnConfigUpdateListener(@NonNull com.google.firebase.remoteconfig.ConfigUpdateListener);
     method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo> ensureInitialized();
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> fetch();
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> fetch(long);
@@ -38,11 +54,25 @@ package com.google.firebase.remoteconfig {
   public class FirebaseRemoteConfigClientException extends com.google.firebase.remoteconfig.FirebaseRemoteConfigException {
     ctor public FirebaseRemoteConfigClientException(@NonNull String);
     ctor public FirebaseRemoteConfigClientException(@NonNull String, @Nullable Throwable);
+    ctor public FirebaseRemoteConfigClientException(@NonNull String, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigClientException(@NonNull String, @Nullable Throwable, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
   }
 
   public class FirebaseRemoteConfigException extends com.google.firebase.FirebaseException {
     ctor public FirebaseRemoteConfigException(@NonNull String);
     ctor public FirebaseRemoteConfigException(@NonNull String, @Nullable Throwable);
+    ctor public FirebaseRemoteConfigException(@NonNull String, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigException(@NonNull String, @Nullable Throwable, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code getCode();
+  }
+
+  public enum FirebaseRemoteConfigException.Code {
+    method public int value();
+    enum_constant public static final com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code CONFIG_UPDATE_MESSAGE_INVALID;
+    enum_constant public static final com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code CONFIG_UPDATE_NOT_FETCHED;
+    enum_constant public static final com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code CONFIG_UPDATE_STREAM_ERROR;
+    enum_constant public static final com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code CONFIG_UPDATE_UNAVAILABLE;
+    enum_constant public static final com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code UNKNOWN;
   }
 
   public class FirebaseRemoteConfigFetchThrottledException extends com.google.firebase.remoteconfig.FirebaseRemoteConfigException {
@@ -59,6 +89,10 @@ package com.google.firebase.remoteconfig {
   public class FirebaseRemoteConfigServerException extends com.google.firebase.remoteconfig.FirebaseRemoteConfigException {
     ctor public FirebaseRemoteConfigServerException(int, @NonNull String);
     ctor public FirebaseRemoteConfigServerException(int, @NonNull String, @Nullable Throwable);
+    ctor public FirebaseRemoteConfigServerException(@NonNull String, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigServerException(int, @NonNull String, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigServerException(@NonNull String, @Nullable Throwable, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigServerException(int, @NonNull String, @Nullable Throwable, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
     method public int getHttpStatusCode();
   }
 
@@ -86,5 +120,25 @@ package com.google.firebase.remoteconfig {
     method public int getSource();
   }
 
+  public final class RemoteConfigKt {
+    method @NonNull public static operator com.google.firebase.remoteconfig.FirebaseRemoteConfigValue get(@NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfig, @NonNull String key);
+    method @NonNull public static kotlinx.coroutines.flow.Flow<com.google.firebase.remoteconfig.ConfigUpdate> getConfigUpdates(@NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfig);
+    method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getRemoteConfig(@NonNull com.google.firebase.Firebase);
+    method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig remoteConfig(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings remoteConfigSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder,kotlin.Unit> init);
+  }
+
+}
+
+package com.google.firebase.remoteconfig.ktx {
+
+  public final class RemoteConfigKt {
+    method @Deprecated @NonNull public static operator com.google.firebase.remoteconfig.FirebaseRemoteConfigValue get(@NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfig, @NonNull String key);
+    method @Deprecated @NonNull public static kotlinx.coroutines.flow.Flow<com.google.firebase.remoteconfig.ConfigUpdate> getConfigUpdates(@NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfig);
+    method @Deprecated @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getRemoteConfig(@NonNull com.google.firebase.ktx.Firebase);
+    method @Deprecated @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig remoteConfig(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings remoteConfigSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder,kotlin.Unit> init);
+  }
+
 }
 
diff --git a/firebase-config/bandwagoner/bandwagoner.gradle b/firebase-config/bandwagoner/bandwagoner.gradle
index 0784e8c2d71..a1c18f5b098 100644
--- a/firebase-config/bandwagoner/bandwagoner.gradle
+++ b/firebase-config/bandwagoner/bandwagoner.gradle
@@ -16,9 +16,15 @@
 
 apply plugin: 'com.android.application'
 apply plugin: com.google.firebase.gradle.plugins.ci.device.FirebaseTestLabPlugin
+apply plugin: 'org.jetbrains.kotlin.android'
+apply plugin: 'copy-google-services'
+
+// Uncomment this line after adding a google-services.json file to the project.
+// apply plugin: 'com.google.gms.google-services'
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.googletest.firebase.remoteconfig.bandwagoner"
+    compileSdkVersion project.compileSdkVersion
     lintOptions {
         abortOnError false
     }
@@ -26,7 +32,7 @@ android {
 
     defaultConfig {
         applicationId "com.googletest.firebase.remoteconfig.bandwagoner"
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         versionCode 1
         versionName "1.0"
@@ -52,43 +58,58 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 firebaseTestLab {
-    device 'model=Pixel2,version=28,locale=en,orientation=portrait'
+    device 'model=panther,version=33,locale=en,orientation=portrait'
 }
 
 dependencies {
-    implementation project(":firebase-config")
-    // This is required since a project dependency on frc does not expose the Apis of its "implementation" dependencies.
-    // The alternative would be to make common an "api" dep of remote-config.
-    // It should not matter for released artifacts.
-    implementation project(":firebase-common")
-    implementation project(":firebase-components")
-
-    implementation project(":firebase-installations-interop")
-    runtimeOnly project(":firebase-installations")
+    api 'com.google.auto.value:auto-value-annotations:1.6.5'
 
-    implementation 'com.google.android.gms:play-services-basement:18.0.0'
+    // Depend on development artifacts for Remote Config.
+    implementation(project(":firebase-config")) {
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    implementation(project(":firebase-config:ktx")) {
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    implementation(project(":firebase-installations")) {
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.core:core:1.0.2'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.test.espresso:espresso-idling-resource:3.2.0'
+    implementation 'com.google.android.gms:play-services-basement:18.1.0'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-
+    implementation 'com.google.android.material:material:1.0.0'
+    // This is required since a `project` dependency on frc does not expose the APIs of its
+    // "implementation" dependencies. The alternative would be to make common an "api" dep of remote-config.
+    // Released artifacts don't need these dependencies since they don't use `project` to refer
+    // to Remote Config.
+    implementation("com.google.firebase:firebase-common:21.0.0")
+    implementation("com.google.firebase:firebase-common-ktx:21.0.0")
+    implementation("com.google.firebase:firebase-components:18.0.0")
+    implementation("com.google.firebase:firebase-installations-interop:17.1.1") {
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
     // Support Libraries
     implementation 'com.google.guava:guava:28.1-android'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4"
 
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'androidx.core:core:1.0.2'
-    implementation 'com.google.android.material:material:1.0.0'
-    api 'com.google.auto.value:auto-value-annotations:1.6.5'
     annotationProcessor 'com.google.auto.value:auto-value:1.6.2'
-    implementation 'androidx.test.espresso:espresso-idling-resource:3.2.0'
 
-    androidTestImplementation 'androidx.test.espresso:espresso-idling-resource:3.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-idling-resource:3.2.0'
 }
-
-ext.packageName = "com.googletest.firebase.remoteconfig.bandwagoner"
-apply from: '../../gradle/googleServices.gradle'
diff --git a/firebase-config/bandwagoner/src/androidTest/AndroidManifest.xml b/firebase-config/bandwagoner/src/androidTest/AndroidManifest.xml
index 8e37b4c31ab..99d22add7b7 100644
--- a/firebase-config/bandwagoner/src/androidTest/AndroidManifest.xml
+++ b/firebase-config/bandwagoner/src/androidTest/AndroidManifest.xml
@@ -21,8 +21,8 @@
     android:versionName="1.0" >
 
   <uses-sdk
-      android:minSdkVersion="16"
-      android:targetSdkVersion="26" />
+      android:minSdkVersion="21"
+      android:targetSdkVersion="33" />
 
   <application>
     <uses-library android:name="android.test.runner" />
diff --git a/firebase-config/bandwagoner/src/main/java/com/googletest/firebase/remoteconfig/bandwagoner/MainActivity.java b/firebase-config/bandwagoner/src/main/java/com/googletest/firebase/remoteconfig/bandwagoner/MainActivity.java
index 3fee1b21350..751c40a5437 100644
--- a/firebase-config/bandwagoner/src/main/java/com/googletest/firebase/remoteconfig/bandwagoner/MainActivity.java
+++ b/firebase-config/bandwagoner/src/main/java/com/googletest/firebase/remoteconfig/bandwagoner/MainActivity.java
@@ -27,16 +27,12 @@
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 
-/**
- * A tabbed activity that has a primary tab with a {@link ApiFragment} for testing the Firebase
- * Remote Config (FRC) SDK API.
- *
- * @author Miraziz Yusupov
- */
+/** A tabbed activity for testing the Firebase Remote Config SDK. */
 public class MainActivity extends AppCompatActivity {
 
   private static final ImmutableList<Tab> TABS =
-      ImmutableList.of(Tab.create("Api", new ApiFragment()));
+      ImmutableList.of(
+          Tab.create("Fetch", new ApiFragment()), Tab.create("Realtime", new RealtimeFragment()));
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
diff --git a/firebase-config/bandwagoner/src/main/java/com/googletest/firebase/remoteconfig/bandwagoner/RealtimeFragment.java b/firebase-config/bandwagoner/src/main/java/com/googletest/firebase/remoteconfig/bandwagoner/RealtimeFragment.java
new file mode 100644
index 00000000000..2b08a7607c1
--- /dev/null
+++ b/firebase-config/bandwagoner/src/main/java/com/googletest/firebase/remoteconfig/bandwagoner/RealtimeFragment.java
@@ -0,0 +1,130 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.googletest.firebase.remoteconfig.bandwagoner;
+
+import static com.googletest.firebase.remoteconfig.bandwagoner.Constants.TAG;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.ToggleButton;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.remoteconfig.ConfigUpdate;
+import com.google.firebase.remoteconfig.ConfigUpdateListener;
+import com.google.firebase.remoteconfig.ConfigUpdateListenerRegistration;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigException;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigValue;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class RealtimeFragment extends Fragment {
+  private View rootView;
+  private TextView updatedParamsText;
+  private TextView activeParamsText;
+  private TextView realtimeExceptionText;
+  private ToggleButton realtimeToggleButton;
+  private Button activateButton;
+
+  private FirebaseRemoteConfig frc;
+  private ConfigUpdateListenerRegistration realtimeRegistration;
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+  }
+
+  @Override
+  public View onCreateView(
+      LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    super.onCreateView(inflater, container, savedInstanceState);
+
+    rootView = inflater.inflate(R.layout.realtime_fragment, container, false);
+
+    updatedParamsText = rootView.findViewById(R.id.updated_params_text);
+    activeParamsText = rootView.findViewById(R.id.active_params_text);
+    realtimeExceptionText = rootView.findViewById(R.id.realtime_exception_text);
+
+    realtimeToggleButton = rootView.findViewById(R.id.realtime_toggle_button);
+    realtimeToggleButton.setOnCheckedChangeListener(this::toggleRealtime);
+
+    activateButton = rootView.findViewById(R.id.realtime_activate_button);
+    activateButton.setOnClickListener(this::activateConfig);
+
+    return rootView;
+  }
+
+  private void toggleRealtime(View view, Boolean isChecked) {
+    frc = FirebaseRemoteConfig.getInstance();
+
+    Log.d(TAG, "Toggle realtime: " + isChecked);
+    if (isChecked && realtimeRegistration != null) {
+      Log.w(TAG, "Tried to toggle realtime on, but it's already on! Doing nothing.");
+      return;
+    }
+
+    // Toggle off case
+    if (!isChecked && realtimeRegistration != null) {
+      realtimeRegistration.remove();
+      realtimeRegistration = null;
+      return;
+    }
+
+    realtimeRegistration =
+        frc.addOnConfigUpdateListener(
+            new ConfigUpdateListener() {
+              @Override
+              public void onUpdate(ConfigUpdate configUpdate) {
+                Log.d(TAG, String.join(", ", configUpdate.getUpdatedKeys()));
+                updatedParamsText.setText(String.join(", ", configUpdate.getUpdatedKeys()));
+              }
+
+              @Override
+              public void onError(@NonNull FirebaseRemoteConfigException error) {
+                Log.w(TAG, "Realtime threw an exception!", error);
+                realtimeExceptionText.setText(
+                    String.format(
+                        "Message: %s, Code: %s", error.getLocalizedMessage(), error.getCode()));
+              }
+            });
+  }
+
+  private void activateConfig(View view) {
+    frc = FirebaseRemoteConfig.getInstance();
+
+    frc.activate()
+        .addOnCompleteListener(
+            new OnCompleteListener<Boolean>() {
+              @Override
+              public void onComplete(@NonNull Task<Boolean> task) {
+                List<String> keyValueStrings = new ArrayList<>();
+                Map<String, FirebaseRemoteConfigValue> allParams = frc.getAll();
+                for (String key : allParams.keySet()) {
+                  keyValueStrings.add(String.format("%s: %s", key, allParams.get(key).asString()));
+                }
+
+                activeParamsText.setText(String.join(", ", keyValueStrings));
+              }
+            });
+  }
+}
diff --git a/firebase-config/bandwagoner/src/main/java/com/googletest/firebase/remoteconfig/bandwagoner/RealtimeKtListener.kt b/firebase-config/bandwagoner/src/main/java/com/googletest/firebase/remoteconfig/bandwagoner/RealtimeKtListener.kt
new file mode 100644
index 00000000000..5e77119b443
--- /dev/null
+++ b/firebase-config/bandwagoner/src/main/java/com/googletest/firebase/remoteconfig/bandwagoner/RealtimeKtListener.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.googletest.firebase.remoteconfig.bandwagoner
+
+import android.util.Log
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.remoteconfig.ktx.configUpdates
+import com.google.firebase.remoteconfig.ktx.remoteConfig
+import java.util.concurrent.CompletableFuture
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.future.future
+
+class RealtimeKtListener {
+  companion object {
+    private val TAG = "RealtimeListener"
+
+    fun listenForUpdatesAsync(): CompletableFuture<Unit> = GlobalScope.future { listenForUpdates() }
+
+    private suspend fun listenForUpdates() {
+      Firebase.remoteConfig.configUpdates
+        .catch { exception -> Log.w(TAG, "Error listening for updates!", exception) }
+        .collect { configUpdate ->
+          if (configUpdate.updatedKeys.contains("welcome_message")) {
+            Firebase.remoteConfig.activate()
+          }
+        }
+    }
+  }
+}
diff --git a/firebase-config/bandwagoner/src/main/res/layout/realtime_fragment.xml b/firebase-config/bandwagoner/src/main/res/layout/realtime_fragment.xml
new file mode 100644
index 00000000000..28f0fe8aa16
--- /dev/null
+++ b/firebase-config/bandwagoner/src/main/res/layout/realtime_fragment.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/updated_params_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="3dp"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            android:text="Last Updated Params"
+            />
+
+        <TextView
+            android:id="@+id/updated_params_text"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:padding="3dp"
+            android:text="Updated Params Text" />
+
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginBottom="5dp"
+            android:background="@android:color/darker_gray"/>
+
+        <TextView
+            android:id="@+id/active_params_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="3dp"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            android:text="Activated Params"
+            />
+
+        <TextView
+            android:id="@+id/active_params_text"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:padding="3dp"
+            android:text="Active Params Text" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginBottom="5dp"
+            android:background="@android:color/darker_gray"/>
+
+        <TextView
+            android:id="@+id/exception_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="3dp"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            android:text="Realtime Exception"
+            />
+
+        <TextView
+            android:id="@+id/realtime_exception_text"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:padding="3dp"
+            android:text="Realtime Exception Text" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_weight="0"
+        android:layout_gravity="bottom"
+        android:paddingVertical="5dp">
+
+        <ToggleButton
+            android:id="@+id/realtime_toggle_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textOff="Realtime Off"
+            android:textOn="Realtime On" />
+
+        <Button
+            android:id="@+id/realtime_activate_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Activate" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/firebase-config/firebase-config.gradle b/firebase-config/firebase-config.gradle
deleted file mode 100644
index 0be9fe26725..00000000000
--- a/firebase-config/firebase-config.gradle
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- * You may obtain a copy of the License at
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    id 'firebase-library'
-}
-
-firebaseLibrary {
-    testLab.enabled = true
-    publishSources = true
-}
-
-android {
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-      minSdkVersion 16
-      targetSdkVersion project.targetSdkVersion
-      multiDexEnabled true
-      versionName version
-      testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    sourceSets {
-        androidTest.resources.srcDirs += ['src/androidTest/res']
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
-}
-
-dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-abt')
-    implementation project(':firebase-components')
-    implementation project(':firebase-installations-interop')
-    runtimeOnly project(':firebase-installations')
-
-    implementation 'com.google.firebase:firebase-measurement-connector:18.0.0'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
-
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
-
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'com.google.truth:truth:0.44'
-    testImplementation 'androidx.test.ext:truth:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation "org.skyscreamer:jsonassert:1.5.0"
-    testImplementation 'androidx.test:core:1.2.0'
-
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
-    androidTestImplementation 'com.google.truth:truth:0.44'
-
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.25.0'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.25.0'
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation "org.skyscreamer:jsonassert:1.5.0"
-}
diff --git a/firebase-config/firebase-config.gradle.kts b/firebase-config/firebase-config.gradle.kts
new file mode 100644
index 00000000000..def7dc173e6
--- /dev/null
+++ b/firebase-config/firebase-config.gradle.kts
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("firebase-library")
+    id("kotlin-android")
+}
+
+firebaseLibrary {
+    libraryGroup("config")
+    testLab.enabled = true
+    publishSources = true
+
+}
+
+android {
+    val compileSdkVersion : Int by rootProject
+    val targetSdkVersion: Int by rootProject
+    val minSdkVersion : Int by rootProject
+
+    namespace = "com.google.firebase.remoteconfig"
+    compileSdk = targetSdkVersion
+
+    defaultConfig {
+      minSdk = 21
+      targetSdk = targetSdkVersion
+      multiDexEnabled = true
+      testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    sourceSets {
+        getByName("androidTest").java.srcDir("src/androidTest/res")
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    testOptions.unitTests.isIncludeAndroidResources = true
+}
+
+dependencies {
+    // Firebase
+    api("com.google.firebase:firebase-config-interop:16.0.1")
+    api("com.google.firebase:firebase-annotations:16.2.0")
+    api("com.google.firebase:firebase-installations-interop:17.1.0")
+    api("com.google.firebase:firebase-abt:21.1.1") {
+         exclude(group = "com.google.firebase", module = "firebase-common")
+         exclude(group = "com.google.firebase", module = "firebase-components")
+     }
+    api("com.google.firebase:firebase-measurement-connector:18.0.0") {
+         exclude(group = "com.google.firebase", module = "firebase-common")
+         exclude(group = "com.google.firebase", module = "firebase-components")
+     }
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
+    api("com.google.firebase:firebase-installations:17.2.0")
+
+    // Kotlin & Android
+    implementation(libs.kotlin.stdlib)
+    implementation("androidx.annotation:annotation:1.1.0")
+    api("com.google.android.gms:play-services-tasks:18.0.1")
+
+    // Annotations and static analysis
+    annotationProcessor("com.google.auto.value:auto-value:1.6.6")
+    javadocClasspath("com.google.auto.value:auto-value-annotations:1.6.6")
+    compileOnly("com.google.auto.value:auto-value-annotations:1.6.6")
+    compileOnly("com.google.code.findbugs:jsr305:3.0.2")
+
+    // Testing
+    testImplementation(libs.junit)
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.androidx.test.runner)
+    testImplementation(libs.androidx.test.truth)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.truth)
+    testImplementation("org.skyscreamer:jsonassert:1.5.0")
+
+    androidTestImplementation(libs.truth)
+    androidTestImplementation(libs.junit)
+    androidTestImplementation(libs.mockito.core)
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation("org.skyscreamer:jsonassert:1.5.0")
+    androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.1")
+    androidTestImplementation("com.linkedin.dexmaker:dexmaker:2.28.1")
+}
diff --git a/firebase-config/gradle.properties b/firebase-config/gradle.properties
index 2186c3de134..86c742a105c 100644
--- a/firebase-config/gradle.properties
+++ b/firebase-config/gradle.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version=21.0.2
-latestReleasedVersion=21.0.1
+version=22.0.1
+latestReleasedVersion=22.0.0
 android.enableUnitTestBinaryResources=true
 
diff --git a/firebase-config/ktx/api.txt b/firebase-config/ktx/api.txt
index c5063771eb2..071387283db 100644
--- a/firebase-config/ktx/api.txt
+++ b/firebase-config/ktx/api.txt
@@ -1,12 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.remoteconfig.ktx {
 
-  public final class RemoteConfigKt {
-    ctor public RemoteConfigKt();
-    method @NonNull public static operator com.google.firebase.remoteconfig.FirebaseRemoteConfigValue get(@NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfig, @NonNull String key);
-    method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getRemoteConfig(@NonNull com.google.firebase.ktx.Firebase);
-    method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig remoteConfig(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
-    method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings remoteConfigSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder,kotlin.Unit> init);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-config/ktx/ktx.gradle b/firebase-config/ktx/ktx.gradle
index 03128e0fd55..420d1077c78 100644
--- a/firebase-config/ktx/ktx.gradle
+++ b/firebase-config/ktx/ktx.gradle
@@ -14,19 +14,21 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-config')
-    publishJavadoc = true
+    libraryGroup "config"
+    publishJavadoc = false
+    publishReleaseNotes = false
     publishSources = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.remoteconfig.ktx"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
@@ -38,25 +40,28 @@ android {
             srcDir 'src/test/kotlin'
         }
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-config')
-    implementation project(':firebase-abt')
-    implementation project(':firebase-installations-interop')
-    runtimeOnly project(':firebase-installations')
+    api(project(":firebase-config"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-installations:17.2.0")
 
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation('com.google.firebase:firebase-abt:21.1.1') {
+         exclude group: 'com.google.firebase', module: 'firebase-common'
+         exclude group: 'com.google.firebase', module: 'firebase-components'
+     }
+    implementation("com.google.firebase:firebase-components:18.0.0")
+    implementation 'com.google.firebase:firebase-installations-interop:17.1.0'
 
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
diff --git a/firebase-config/ktx/src/main/AndroidManifest.xml b/firebase-config/ktx/src/main/AndroidManifest.xml
index 25aa4dfdb91..9df18d6857b 100644
--- a/firebase-config/ktx/src/main/AndroidManifest.xml
+++ b/firebase-config/ktx/src/main/AndroidManifest.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.remoteconfig.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.remoteconfig.ktx.FirebaseRemoteConfigKtxRegistrar"
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.remoteconfig.ktx.FirebaseConfigLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
diff --git a/firebase-config/ktx/src/main/kotlin/com/google/firebase/remoteconfig/ktx/Logging.kt b/firebase-config/ktx/src/main/kotlin/com/google/firebase/remoteconfig/ktx/Logging.kt
new file mode 100644
index 00000000000..b13c960807c
--- /dev/null
+++ b/firebase-config/ktx/src/main/kotlin/com/google/firebase/remoteconfig/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.platforminfo.LibraryVersionComponent
+import com.google.firebase.remoteconfig.BuildConfig
+
+internal const val LIBRARY_NAME: String = "fire-cfg-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseConfigLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-config/ktx/src/main/kotlin/com/google/firebase/remoteconfig/ktx/RemoteConfig.kt b/firebase-config/ktx/src/main/kotlin/com/google/firebase/remoteconfig/ktx/RemoteConfig.kt
deleted file mode 100644
index 5df64733d43..00000000000
--- a/firebase-config/ktx/src/main/kotlin/com/google/firebase/remoteconfig/ktx/RemoteConfig.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.remoteconfig.ktx
-
-import androidx.annotation.Keep
-import com.google.firebase.FirebaseApp
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.platforminfo.LibraryVersionComponent
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
-import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
-import com.google.firebase.remoteconfig.FirebaseRemoteConfigValue
-
-/** Returns the [FirebaseRemoteConfig] instance of the default [FirebaseApp]. */
-val Firebase.remoteConfig: FirebaseRemoteConfig
-    get() = FirebaseRemoteConfig.getInstance()
-
-/** Returns the [FirebaseRemoteConfig] instance of a given [FirebaseApp]. */
-fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig = FirebaseRemoteConfig.getInstance(app)
-
-/** See [FirebaseRemoteConfig#getValue] */
-operator fun FirebaseRemoteConfig.get(key: String): FirebaseRemoteConfigValue {
-    return this.getValue(key)
-}
-
-fun remoteConfigSettings(init: FirebaseRemoteConfigSettings.Builder.() -> Unit): FirebaseRemoteConfigSettings {
-    val builder = FirebaseRemoteConfigSettings.Builder()
-    builder.init()
-    return builder.build()
-}
-
-internal const val LIBRARY_NAME: String = "fire-cfg-ktx"
-
-/** @suppress */
-@Keep
-class FirebaseRemoteConfigKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-config/ktx/src/test/kotlin/com/google/firebase/remoteconfig/TestConstructorUtil.kt b/firebase-config/ktx/src/test/kotlin/com/google/firebase/remoteconfig/TestConstructorUtil.kt
index 01ec2c8f86b..e6167b5ab09 100644
--- a/firebase-config/ktx/src/test/kotlin/com/google/firebase/remoteconfig/TestConstructorUtil.kt
+++ b/firebase-config/ktx/src/test/kotlin/com/google/firebase/remoteconfig/TestConstructorUtil.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig
 
@@ -22,34 +24,40 @@ import com.google.firebase.remoteconfig.internal.ConfigCacheClient
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler
 import com.google.firebase.remoteconfig.internal.ConfigMetadataClient
+import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler
+import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
 import java.util.concurrent.Executor
 
 // This method is a workaround for testing. It enable us to create a FirebaseRemoteConfig object
 // with mocks using the package-private constructor.
 fun createRemoteConfig(
-    context: Context?,
-    firebaseApp: FirebaseApp,
-    firebaseInstallations: FirebaseInstallationsApi,
-    firebaseAbt: FirebaseABTesting?,
-    executor: Executor,
-    fetchedConfigsCache: ConfigCacheClient,
-    activatedConfigsCache: ConfigCacheClient,
-    defaultConfigsCache: ConfigCacheClient,
-    fetchHandler: ConfigFetchHandler,
-    getHandler: ConfigGetParameterHandler,
-    frcMetadata: ConfigMetadataClient
+  context: Context?,
+  firebaseApp: FirebaseApp,
+  firebaseInstallations: FirebaseInstallationsApi,
+  firebaseAbt: FirebaseABTesting?,
+  executor: Executor,
+  fetchedConfigsCache: ConfigCacheClient,
+  activatedConfigsCache: ConfigCacheClient,
+  defaultConfigsCache: ConfigCacheClient,
+  fetchHandler: ConfigFetchHandler,
+  getHandler: ConfigGetParameterHandler,
+  frcMetadata: ConfigMetadataClient,
+  realtimeHandler: ConfigRealtimeHandler,
+  rolloutsStateSubscriptionsHandler: RolloutsStateSubscriptionsHandler
 ): FirebaseRemoteConfig {
-        return FirebaseRemoteConfig(
-            context,
-            firebaseApp,
-            firebaseInstallations,
-            firebaseAbt,
-            executor,
-            fetchedConfigsCache,
-            activatedConfigsCache,
-            defaultConfigsCache,
-            fetchHandler,
-            getHandler,
-            frcMetadata
-    )
+  return FirebaseRemoteConfig(
+    context,
+    firebaseApp,
+    firebaseInstallations,
+    firebaseAbt,
+    executor,
+    fetchedConfigsCache,
+    activatedConfigsCache,
+    defaultConfigsCache,
+    fetchHandler,
+    getHandler,
+    frcMetadata,
+    realtimeHandler,
+    rolloutsStateSubscriptionsHandler
+  )
 }
diff --git a/firebase-config/ktx/src/test/kotlin/com/google/firebase/remoteconfig/ktx/RemoteConfigTests.kt b/firebase-config/ktx/src/test/kotlin/com/google/firebase/remoteconfig/ktx/RemoteConfigTests.kt
index 4f67dd13294..bb525cf4090 100644
--- a/firebase-config/ktx/src/test/kotlin/com/google/firebase/remoteconfig/ktx/RemoteConfigTests.kt
+++ b/firebase-config/ktx/src/test/kotlin/com/google/firebase/remoteconfig/ktx/RemoteConfigTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.ktx
 
@@ -31,12 +33,14 @@ import com.google.firebase.remoteconfig.internal.ConfigCacheClient
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler
 import com.google.firebase.remoteconfig.internal.ConfigMetadataClient
+import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler
+import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mockito.`when`
 import org.mockito.Mockito.mock
+import org.mockito.Mockito.`when`
 import org.robolectric.RobolectricTestRunner
 
 const val APP_ID = "1:14368190084:android:09cb977358c6f241"
@@ -45,110 +49,114 @@ const val API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567"
 const val EXISTING_APP = "existing"
 
 open class DefaultFirebaseRemoteConfigValue : FirebaseRemoteConfigValue {
-    override fun asLong(): Long = TODO("Unimplementend")
-    override fun asDouble(): Double = TODO("Unimplementend")
-    override fun asString(): String = TODO("Unimplementend")
-    override fun asByteArray(): ByteArray = TODO("Unimplementend")
-    override fun asBoolean(): Boolean = TODO("Unimplementend")
-    override fun getSource(): Int = TODO("Unimplementend")
+  override fun asLong(): Long = TODO("Unimplementend")
+  override fun asDouble(): Double = TODO("Unimplementend")
+  override fun asString(): String = TODO("Unimplementend")
+  override fun asByteArray(): ByteArray = TODO("Unimplementend")
+  override fun asBoolean(): Boolean = TODO("Unimplementend")
+  override fun getSource(): Int = TODO("Unimplementend")
 }
 
 class StringRemoteConfigValue(val value: String) : DefaultFirebaseRemoteConfigValue() {
-    override fun asString() = value
+  override fun asString() = value
 }
 
 abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
-
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build(),
-                EXISTING_APP
-        )
-    }
-
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class ConfigTests : BaseTestCase() {
 
-    @Test
-    fun `Firebase#remoteConfig should delegate to FirebaseRemoteConfig#getInstance()`() {
-        assertThat(Firebase.remoteConfig).isSameInstanceAs(FirebaseRemoteConfig.getInstance())
-    }
-
-    @Test
-    fun `Firebase#remoteConfig should delegate to FirebaseRemoteConfig#getInstance(FirebaseApp, region)`() {
-        val app = Firebase.app(EXISTING_APP)
-        assertThat(Firebase.remoteConfig(app)).isSameInstanceAs(FirebaseRemoteConfig.getInstance(app))
-    }
-
-    @Test
-    fun `Overloaded get() operator returns default value when key doesn't exist`() {
-        val remoteConfig = Firebase.remoteConfig
-        assertThat(remoteConfig["non_existing_key"].asString())
-                .isEqualTo(FirebaseRemoteConfig.DEFAULT_VALUE_FOR_STRING)
-        assertThat(remoteConfig["another_non_exisiting_key"].asDouble())
-                .isEqualTo(FirebaseRemoteConfig.DEFAULT_VALUE_FOR_DOUBLE)
-    }
-
-    @Test
-    fun `FirebaseRemoteConfigSettings builder works`() {
-        val minFetchInterval = 3600L
-        val fetchTimeout = 60L
-        val configSettings = remoteConfigSettings {
-            minimumFetchIntervalInSeconds = minFetchInterval
-            fetchTimeoutInSeconds = fetchTimeout
-        }
-        assertThat(configSettings.minimumFetchIntervalInSeconds).isEqualTo(minFetchInterval)
-        assertThat(configSettings.fetchTimeoutInSeconds).isEqualTo(fetchTimeout)
-    }
-
-    @Test
-    fun `Overloaded get() operator returns value when key exists`() {
-        val mockGetHandler = mock(ConfigGetParameterHandler::class.java)
-        val directExecutor = MoreExecutors.directExecutor()
-
-        val remoteConfig = createRemoteConfig(
-            context = null,
-            firebaseApp = Firebase.app(EXISTING_APP),
-            firebaseInstallations = mock(FirebaseInstallationsApi::class.java),
-            firebaseAbt = null,
-            executor = directExecutor,
-            fetchedConfigsCache = mock(ConfigCacheClient::class.java),
-            activatedConfigsCache = mock(ConfigCacheClient::class.java),
-            defaultConfigsCache = mock(ConfigCacheClient::class.java),
-            fetchHandler = mock(ConfigFetchHandler::class.java),
-            getHandler = mockGetHandler,
-            frcMetadata = mock(ConfigMetadataClient::class.java))
-
-        `when`(mockGetHandler.getValue("KEY")).thenReturn(StringRemoteConfigValue("non default value"))
-        assertThat(remoteConfig["KEY"].asString()).isEqualTo("non default value")
+  @Test
+  fun `Firebase#remoteConfig should delegate to FirebaseRemoteConfig#getInstance()`() {
+    assertThat(Firebase.remoteConfig).isSameInstanceAs(FirebaseRemoteConfig.getInstance())
+  }
+
+  @Test
+  fun `Firebase#remoteConfig should delegate to FirebaseRemoteConfig#getInstance(FirebaseApp, region)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.remoteConfig(app)).isSameInstanceAs(FirebaseRemoteConfig.getInstance(app))
+  }
+
+  @Test
+  fun `Overloaded get() operator returns default value when key doesn't exist`() {
+    val remoteConfig = Firebase.remoteConfig
+    assertThat(remoteConfig["non_existing_key"].asString())
+      .isEqualTo(FirebaseRemoteConfig.DEFAULT_VALUE_FOR_STRING)
+    assertThat(remoteConfig["another_non_exisiting_key"].asDouble())
+      .isEqualTo(FirebaseRemoteConfig.DEFAULT_VALUE_FOR_DOUBLE)
+  }
+
+  @Test
+  fun `FirebaseRemoteConfigSettings builder works`() {
+    val minFetchInterval = 3600L
+    val fetchTimeout = 60L
+    val configSettings = remoteConfigSettings {
+      minimumFetchIntervalInSeconds = minFetchInterval
+      fetchTimeoutInSeconds = fetchTimeout
     }
+    assertThat(configSettings.minimumFetchIntervalInSeconds).isEqualTo(minFetchInterval)
+    assertThat(configSettings.fetchTimeoutInSeconds).isEqualTo(fetchTimeout)
+  }
+
+  @Test
+  fun `Overloaded get() operator returns value when key exists`() {
+    val mockGetHandler = mock(ConfigGetParameterHandler::class.java)
+    val directExecutor = MoreExecutors.directExecutor()
+
+    val remoteConfig =
+      createRemoteConfig(
+        context = null,
+        firebaseApp = Firebase.app(EXISTING_APP),
+        firebaseInstallations = mock(FirebaseInstallationsApi::class.java),
+        firebaseAbt = null,
+        executor = directExecutor,
+        fetchedConfigsCache = mock(ConfigCacheClient::class.java),
+        activatedConfigsCache = mock(ConfigCacheClient::class.java),
+        defaultConfigsCache = mock(ConfigCacheClient::class.java),
+        fetchHandler = mock(ConfigFetchHandler::class.java),
+        getHandler = mockGetHandler,
+        frcMetadata = mock(ConfigMetadataClient::class.java),
+        realtimeHandler = mock(ConfigRealtimeHandler::class.java),
+        rolloutsStateSubscriptionsHandler = mock(RolloutsStateSubscriptionsHandler::class.java)
+      )
+
+    `when`(mockGetHandler.getValue("KEY")).thenReturn(StringRemoteConfigValue("non default value"))
+    assertThat(remoteConfig["KEY"].asString()).isEqualTo("non default value")
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun `library version should be registered with runtime`() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
 }
diff --git a/firebase-config/src/androidTest/AndroidManifest.xml b/firebase-config/src/androidTest/AndroidManifest.xml
index 8dfe46a3881..178f8475e0a 100644
--- a/firebase-config/src/androidTest/AndroidManifest.xml
+++ b/firebase-config/src/androidTest/AndroidManifest.xml
@@ -14,8 +14,7 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.inappmessaging">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-sdk
         android:targetSdkVersion="23"/>
diff --git a/firebase-config/src/androidTest/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigIntegrationTest.java b/firebase-config/src/androidTest/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigIntegrationTest.java
index 2a3817bd91d..19900986b6f 100644
--- a/firebase-config/src/androidTest/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigIntegrationTest.java
+++ b/firebase-config/src/androidTest/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigIntegrationTest.java
@@ -36,6 +36,8 @@
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler;
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
 import com.google.firebase.remoteconfig.internal.ConfigMetadataClient;
+import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler;
+import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -59,6 +61,8 @@ public class FirebaseRemoteConfigIntegrationTest {
   @Mock private ConfigFetchHandler mockFetchHandler;
   @Mock private ConfigGetParameterHandler mockGetHandler;
   @Mock private ConfigMetadataClient metadataClient;
+  @Mock private ConfigRealtimeHandler mockConfigRealtimeHandler;
+  @Mock private RolloutsStateSubscriptionsHandler mockRolloutsStateSubscriptionHandler;
 
   @Mock private ConfigCacheClient mockFireperfFetchedCache;
   @Mock private ConfigCacheClient mockFireperfActivatedCache;
@@ -108,7 +112,9 @@ public void setUp() {
             mockDefaultsCache,
             mockFetchHandler,
             mockGetHandler,
-            metadataClient);
+            metadataClient,
+            mockConfigRealtimeHandler,
+            mockRolloutsStateSubscriptionHandler);
   }
 
   @Test
diff --git a/firebase-config/src/main/AndroidManifest.xml b/firebase-config/src/main/AndroidManifest.xml
index bd731ed658e..95a39c9dd90 100644
--- a/firebase-config/src/main/AndroidManifest.xml
+++ b/firebase-config/src/main/AndroidManifest.xml
@@ -14,18 +14,17 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.remoteconfig">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <!--<uses-sdk android:minSdkVersion="16" />-->
+    <!--<uses-sdk android:minSdkVersion="21" />-->
 
     <application>
         <service
             android:name="com.google.firebase.components.ComponentDiscoveryService"
-            android:exported="false">
+            android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.remoteconfig.FirebaseRemoteConfigKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data
                 android:name="com.google.firebase.components:com.google.firebase.remoteconfig.RemoteConfigRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/ConfigUpdate.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/ConfigUpdate.java
new file mode 100644
index 00000000000..e51391067d4
--- /dev/null
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/ConfigUpdate.java
@@ -0,0 +1,36 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.remoteconfig;
+
+import androidx.annotation.NonNull;
+import com.google.auto.value.AutoValue;
+import java.util.Set;
+
+/** Information about the updated config passed to {@link ConfigUpdateListener#onUpdate}. */
+@AutoValue
+public abstract class ConfigUpdate {
+  @NonNull
+  /** @hide */
+  public static ConfigUpdate create(@NonNull Set<String> updatedKeys) {
+    return new AutoValue_ConfigUpdate(updatedKeys);
+  }
+
+  /**
+   * Parameter keys whose values have been updated from the currently activated values. Includes
+   * keys that are added, deleted, and whose value, value source, or metadata has changed.
+   */
+  @NonNull
+  public abstract Set<String> getUpdatedKeys();
+}
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/ConfigUpdateListener.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/ConfigUpdateListener.java
new file mode 100644
index 00000000000..9300963a1d6
--- /dev/null
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/ConfigUpdateListener.java
@@ -0,0 +1,42 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.remoteconfig;
+
+import androidx.annotation.NonNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Event listener interface for real-time Remote Config updates. Implement {@code
+ * ConfigUpdateListener} to call {@link
+ * com.google.firebase.remoteconfig.FirebaseRemoteConfig#addOnConfigUpdateListener}.
+ */
+public interface ConfigUpdateListener {
+  /**
+   * Callback for when a new config version has been automatically fetched from the backend and has
+   * changed from the activated config.
+   *
+   * @param configUpdate A {@link ConfigUpdate} with information about the updated config version,
+   *     including the set of updated parameters.
+   */
+  void onUpdate(@NonNull ConfigUpdate configUpdate);
+
+  /**
+   * Callback for when an error occurs while listening for updates or fetching the latest version of
+   * the config.
+   *
+   * @param error A {@link FirebaseRemoteConfigException} with information about the error.
+   */
+  void onError(@Nonnull FirebaseRemoteConfigException error);
+}
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/ConfigUpdateListenerRegistration.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/ConfigUpdateListenerRegistration.java
new file mode 100644
index 00000000000..1c3fc9ad52e
--- /dev/null
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/ConfigUpdateListenerRegistration.java
@@ -0,0 +1,34 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.remoteconfig;
+
+/**
+ * Listener registration returned by {@link
+ * com.google.firebase.remoteconfig.FirebaseRemoteConfig#addOnConfigUpdateListener}.
+ *
+ * <p>Calling {@link ConfigUpdateListenerRegistration#remove()} stops the listener from receiving
+ * config updates and unregisters itself. If remove is called and no other listener registrations
+ * remain, the connection to the Remote Config backend is closed. Subsequently calling {@link
+ * com.google.firebase.remoteconfig.FirebaseRemoteConfig#addOnConfigUpdateListener} will re-open the
+ * connection.
+ */
+public interface ConfigUpdateListenerRegistration {
+
+  /**
+   * Removes the listener being tracked by this {@code ConfigUpdateListenerRegistration}. After the
+   * initial call, subsequent calls to {@code remove()} have no effect.
+   */
+  public void remove();
+}
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfig.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfig.java
index 71f6d4461ed..178aaf4d0e8 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfig.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfig.java
@@ -25,6 +25,7 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.abt.AbtException;
 import com.google.firebase.abt.FirebaseABTesting;
+import com.google.firebase.concurrent.FirebaseExecutors;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.installations.InstallationTokenResult;
 import com.google.firebase.remoteconfig.internal.ConfigCacheClient;
@@ -33,7 +34,9 @@
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler.FetchResponse;
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
 import com.google.firebase.remoteconfig.internal.ConfigMetadataClient;
+import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler;
 import com.google.firebase.remoteconfig.internal.DefaultsXmlParser;
+import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -46,14 +49,12 @@
 import org.json.JSONObject;
 
 /**
- * Entry point for the Firebase Remote Config (FRC) API.
+ * Entry point for the Firebase Remote Config API.
  *
  * <p>Callers should first get the singleton object using {@link #getInstance()}, and then call
- * operations on that singleton object. The singleton contains the complete set of FRC parameter
- * values available to your app. The singleton also stores values fetched from the FRC Server until
- * they are made available for use with a call to {@link #activate()}.
- *
- * @author Miraziz Yusupov
+ * operations on that singleton object. The singleton contains the complete set of Remote Config
+ * parameter values available to your app. The singleton also stores values fetched from the Remote
+ * Config server until they are made available for use with a call to {@link #activate()}.
  */
 public class FirebaseRemoteConfig {
   // -------------------------------------------------------------------------------
@@ -62,8 +63,8 @@ public class FirebaseRemoteConfig {
   /**
    * Returns a singleton instance of Firebase Remote Config.
    *
-   * <p>{@link FirebaseRemoteConfig} uses the default {@link FirebaseApp}, so if no {@link
-   * FirebaseApp} has been initialized yet, this method throws an {@link IllegalStateException}.
+   * <p>{@link FirebaseRemoteConfig} uses the default {@link FirebaseApp}, throwing an <br>
+   * {@link IllegalStateException} if one has not been initialized yet.
    *
    * <p>Note: Also initializes the Firebase installations SDK that creates installation IDs to
    * identify Firebase installations and periodically sends data to Firebase servers. Remote Config
@@ -72,8 +73,8 @@ public class FirebaseRemoteConfig {
    * after deletion will create a new installation ID for this Firebase installation and resume the
    * periodic sync.
    *
-   * @return A singleton instance of {@link FirebaseRemoteConfig} for the default {@link
-   *     FirebaseApp}.
+   * @return A singleton instance of {@link FirebaseRemoteConfig} for the default {@link FirebaseApp
+   *     }.
    */
   @NonNull
   public static FirebaseRemoteConfig getInstance() {
@@ -104,27 +105,27 @@ public static FirebaseRemoteConfig getInstance(@NonNull FirebaseApp app) {
   public static final int VALUE_SOURCE_STATIC = 0;
   /** Indicates that the value returned was retrieved from the defaults set by the client. */
   public static final int VALUE_SOURCE_DEFAULT = 1;
-  /** Indicates that the value returned was retrieved from the Firebase Remote Config Server. */
+  /** Indicates that the value returned was retrieved from the Firebase Remote Config server. */
   public static final int VALUE_SOURCE_REMOTE = 2;
 
   /**
-   * Indicates that the most recent fetch of parameter values from the Firebase Remote Config Server
+   * Indicates that the most recent fetch of parameter values from the Firebase Remote Config server
    * was completed successfully.
    */
   public static final int LAST_FETCH_STATUS_SUCCESS = -1;
   /**
    * Indicates that the FirebaseRemoteConfig singleton object has not yet attempted to fetch
-   * parameter values from the Firebase Remote Config Server.
+   * parameter values from the Firebase Remote Config server.
    */
   public static final int LAST_FETCH_STATUS_NO_FETCH_YET = 0;
   /**
    * Indicates that the most recent attempt to fetch parameter values from the Firebase Remote
-   * Config Server has failed.
+   * Config server has failed.
    */
   public static final int LAST_FETCH_STATUS_FAILURE = 1;
   /**
    * Indicates that the most recent attempt to fetch parameter values from the Firebase Remote
-   * Config Server was throttled.
+   * Config server was throttled.
    */
   public static final int LAST_FETCH_STATUS_THROTTLED = 2;
 
@@ -151,6 +152,8 @@ public static FirebaseRemoteConfig getInstance(@NonNull FirebaseApp app) {
   private final ConfigGetParameterHandler getHandler;
   private final ConfigMetadataClient frcMetadata;
   private final FirebaseInstallationsApi firebaseInstallations;
+  private final ConfigRealtimeHandler configRealtimeHandler;
+  private final RolloutsStateSubscriptionsHandler rolloutsStateSubscriptionsHandler;
 
   /**
    * Firebase Remote Config constructor.
@@ -168,7 +171,9 @@ public static FirebaseRemoteConfig getInstance(@NonNull FirebaseApp app) {
       ConfigCacheClient defaultConfigsCache,
       ConfigFetchHandler fetchHandler,
       ConfigGetParameterHandler getHandler,
-      ConfigMetadataClient frcMetadata) {
+      ConfigMetadataClient frcMetadata,
+      ConfigRealtimeHandler configRealtimeHandler,
+      RolloutsStateSubscriptionsHandler rolloutsStateSubscriptionsHandler) {
     this.context = context;
     this.firebaseApp = firebaseApp;
     this.firebaseInstallations = firebaseInstallations;
@@ -180,6 +185,8 @@ public static FirebaseRemoteConfig getInstance(@NonNull FirebaseApp app) {
     this.fetchHandler = fetchHandler;
     this.getHandler = getHandler;
     this.frcMetadata = frcMetadata;
+    this.configRealtimeHandler = configRealtimeHandler;
+    this.rolloutsStateSubscriptionsHandler = rolloutsStateSubscriptionsHandler;
   }
 
   /**
@@ -228,8 +235,8 @@ public Task<Boolean> fetchAndActivate() {
    * take effect.
    *
    * @return {@link Task} with a {@code true} result if the current call activated the fetched
-   *     configs; if the fetched configs were already activated by a previous call, returns a {@link
-   *     Task} with a {@code false} result.
+   *     configs; if the fetched configs were already activated by a previous call, it instead
+   *     returns a {@link Task} with a {@code false} result.
    */
   @NonNull
   public Task<Boolean> activate() {
@@ -284,7 +291,8 @@ public Task<Void> fetch() {
     Task<FetchResponse> fetchTask = fetchHandler.fetch();
 
     // Convert Task type to Void.
-    return fetchTask.onSuccessTask((unusedFetchResponse) -> Tasks.forResult(null));
+    return fetchTask.onSuccessTask(
+        FirebaseExecutors.directExecutor(), (unusedFetchResponse) -> Tasks.forResult(null));
   }
 
   /**
@@ -311,7 +319,8 @@ public Task<Void> fetch(long minimumFetchIntervalInSeconds) {
     Task<FetchResponse> fetchTask = fetchHandler.fetch(minimumFetchIntervalInSeconds);
 
     // Convert Task type to Void.
-    return fetchTask.onSuccessTask((unusedFetchResponse) -> Tasks.forResult(null));
+    return fetchTask.onSuccessTask(
+        FirebaseExecutors.directExecutor(), (unusedFetchResponse) -> Tasks.forResult(null));
   }
 
   /**
@@ -451,8 +460,8 @@ public Map<String, FirebaseRemoteConfigValue> getAll() {
   }
 
   /**
-   * Returns the state of this {@link FirebaseRemoteConfig} instance as a {@link
-   * FirebaseRemoteConfigInfo}.
+   * Returns the state of this {@link FirebaseRemoteConfig} instance as a <br>
+   * {@link FirebaseRemoteConfigInfo}.
    */
   @NonNull
   public FirebaseRemoteConfigInfo getInfo() {
@@ -541,6 +550,29 @@ public Task<Void> reset() {
         });
   }
 
+  /**
+   * Starts listening for real-time config updates from the Remote Config backend and automatically
+   * fetches updates from the RC backend when they are available.
+   *
+   * <p>If a connection to the Remote Config backend is not already open, calling this method will
+   * open it. Multiple listeners can be added by calling this method again, but subsequent calls
+   * re-use the same connection to the backend.
+   *
+   * <p>Note: Real-time Remote Config requires the Firebase Remote Config Realtime API. See the <a
+   * href="https://firebase.google.com/docs/remote-config/get-started?platform=android#add-real-time-listener">Remote
+   * Config Get Started</a> guide to enable the API.
+   *
+   * @param configUpdateListener A {@link ConfigUpdateListener} that can be used to respond to
+   *     config updates when they're fetched.
+   * @return A {@link ConfigUpdateListenerRegistration} that allows you to remove the added {@code
+   *     configUpdateListener} and close the connection when there are no more listeners.
+   */
+  @NonNull
+  public ConfigUpdateListenerRegistration addOnConfigUpdateListener(
+      @NonNull ConfigUpdateListener configUpdateListener) {
+    return configRealtimeHandler.addRealtimeConfigUpdateListener(configUpdateListener);
+  }
+
   /**
    * Loads all the configs from disk by calling {@link ConfigCacheClient#get} on each cache client.
    *
@@ -552,6 +584,15 @@ void startLoadingConfigsFromDisk() {
     fetchedConfigsCache.get();
   }
 
+  /**
+   * Execute a runnable in Remote Config's background thread pool.
+   *
+   * @hide
+   */
+  public void schedule(Runnable runnable) {
+    executor.execute(runnable);
+  }
+
   /**
    * Processes the result of the put task that persists activated configs. If the task is
    * successful, clears the fetched cache and updates the ABT SDK with the current experiments.
@@ -567,8 +608,10 @@ private boolean processActivatePutTask(Task<ConfigContainer> putTask) {
       // An activate call should only be made if there are fetched values to activate, which are
       // then put into the activated cache. So, if the put is called and succeeds, then the returned
       // values from the put task must be non-null.
-      if (putTask.getResult() != null) {
-        updateAbtWithActivatedExperiments(putTask.getResult().getAbtExperiments());
+      ConfigContainer activatedConfigs = putTask.getResult();
+      if (activatedConfigs != null) {
+        updateAbtWithActivatedExperiments(activatedConfigs.getAbtExperiments());
+        rolloutsStateSubscriptionsHandler.publishActiveRolloutsState(activatedConfigs);
       } else {
         // Should never happen.
         Log.e(TAG, "Activated configs written to disk are null.");
@@ -595,7 +638,8 @@ private Task<Void> setDefaultsWithStringsMapAsync(Map<String, String> defaultsSt
 
     Task<ConfigContainer> putTask = defaultConfigsCache.put(defaultConfigs);
     // Convert Task type to Void.
-    return putTask.onSuccessTask((unusedContainer) -> Tasks.forResult(null));
+    return putTask.onSuccessTask(
+        FirebaseExecutors.directExecutor(), (unusedContainer) -> Tasks.forResult(null));
   }
 
   /**
@@ -626,6 +670,16 @@ void updateAbtWithActivatedExperiments(@NonNull JSONArray abtExperiments) {
     }
   }
 
+  /**
+   * Changes background state of the real-time handler depending on if the app is in the foreground
+   * or not.
+   *
+   * @hide
+   */
+  void setConfigUpdateBackgroundState(boolean backgroundState) {
+    configRealtimeHandler.setBackgroundState(backgroundState);
+  }
+
   /**
    * Converts a JSON array of Firebase A/B Testing experiments into a Java list of String maps.
    *
@@ -656,6 +710,10 @@ static List<Map<String, String>> toExperimentInfoMaps(JSONArray abtExperimentsJs
     return experimentInfoMaps;
   }
 
+  RolloutsStateSubscriptionsHandler getRolloutsStateSubscriptionsHandler() {
+    return rolloutsStateSubscriptionsHandler;
+  }
+
   /** Returns true if the fetched configs are fresher than the activated configs. */
   private static boolean isFetchedFresh(
       ConfigContainer fetched, @Nullable ConfigContainer activated) {
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientException.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientException.java
index 2693730259a..cbe82308c45 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientException.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigClientException.java
@@ -20,8 +20,6 @@
 /**
  * A Firebase Remote Config internal issue that isn't caused by an interaction with the Firebase
  * Remote Config server.
- *
- * @author Miraziz Yusupov
  */
 public class FirebaseRemoteConfigClientException extends FirebaseRemoteConfigException {
   /** Creates a Firebase Remote Config client exception with the given message. */
@@ -34,4 +32,21 @@ public FirebaseRemoteConfigClientException(
       @NonNull String detailMessage, @Nullable Throwable cause) {
     super(detailMessage, cause);
   }
+
+  /**
+   * Creates a Firebase Remote Config client exception with the given message and {@code
+   * FirebaseRemoteConfigException} code.
+   */
+  public FirebaseRemoteConfigClientException(@NonNull String detailMessage, @NonNull Code code) {
+    super(detailMessage, code);
+  }
+
+  /**
+   * Creates a Firebase Remote Config client exception with the given message, exception cause, and
+   * {@code FirebaseRemoteConfigException} code.
+   */
+  public FirebaseRemoteConfigClientException(
+      @NonNull String detailMessage, @Nullable Throwable cause, @NonNull Code code) {
+    super(detailMessage, cause, code);
+  }
 }
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigException.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigException.java
index edba0cb9463..f3be92e23cc 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigException.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigException.java
@@ -20,13 +20,68 @@
 
 /** Base class for {@link FirebaseRemoteConfig} exceptions. */
 public class FirebaseRemoteConfigException extends FirebaseException {
+  /** Code that specifies the type of exception. */
+  private final Code code;
+
   /** Creates a Firebase Remote Config exception with the given message. */
   public FirebaseRemoteConfigException(@NonNull String detailMessage) {
     super(detailMessage);
+    this.code = Code.UNKNOWN;
   }
 
   /** Creates a Firebase Remote Config exception with the given message and cause. */
   public FirebaseRemoteConfigException(@NonNull String detailMessage, @Nullable Throwable cause) {
     super(detailMessage, cause);
+    this.code = Code.UNKNOWN;
+  }
+
+  /** Creates a Firebase Remote Config exception with the given message and Code. */
+  public FirebaseRemoteConfigException(@NonNull String detailMessage, @NonNull Code code) {
+    super(detailMessage);
+    this.code = code;
+  }
+
+  /** Creates a Firebase Remote Config exception with the given message, cause, and Code. */
+  public FirebaseRemoteConfigException(
+      @NonNull String detailMessage, @Nullable Throwable cause, @NonNull Code code) {
+    super(detailMessage, cause);
+    this.code = code;
+  }
+
+  public enum Code {
+    /** Unknown code value. */
+    UNKNOWN(0),
+
+    /** Unable to make a connection to the real-time RC backend. */
+    CONFIG_UPDATE_STREAM_ERROR(1),
+
+    /** A config update stream message from the real-time RC backend is unparsable. */
+    CONFIG_UPDATE_MESSAGE_INVALID(2),
+
+    /** Unable to fetch the latest config. */
+    CONFIG_UPDATE_NOT_FETCHED(3),
+
+    /** The real-time RC backend is unavailable. */
+    CONFIG_UPDATE_UNAVAILABLE(4);
+
+    private final int value;
+
+    Code(int value) {
+      this.value = value;
+    }
+
+    public int value() {
+      return value;
+    }
+  }
+
+  /**
+   * Gets the {@link Code} representing the type of exception.
+   *
+   * @return A {@link Code} representing the type of exception.
+   */
+  @NonNull
+  public Code getCode() {
+    return code;
   }
 }
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigInfo.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigInfo.java
index 00b32bf29cf..a757ac2f42b 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigInfo.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigInfo.java
@@ -16,7 +16,7 @@
 
 import androidx.annotation.NonNull;
 
-/** Wraps the current state of the FirebaseRemoteConfig singleton object. */
+/** Wraps the current state of the {@link FirebaseRemoteConfig} singleton object. */
 public interface FirebaseRemoteConfigInfo {
   /**
    * Gets the timestamp (milliseconds since epoch) of the last successful fetch, regardless of
@@ -38,7 +38,7 @@ public interface FirebaseRemoteConfigInfo {
   int getLastFetchStatus();
 
   /**
-   * Gets the current settings of the FirebaseRemoteConfig singleton object.
+   * Gets the current settings of the {@link FirebaseRemoteConfig} singleton object.
    *
    * @return A {@link FirebaseRemoteConfigSettings} object indicating the current settings.
    */
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigServerException.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigServerException.java
index 723ddd6a53b..c2e559358b6 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigServerException.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigServerException.java
@@ -16,12 +16,11 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 /**
  * A Firebase Remote Config internal issue caused by an interaction with the Firebase Remote Config
  * server.
- *
- * @author Miraziz Yusupov
  */
 public class FirebaseRemoteConfigServerException extends FirebaseRemoteConfigException {
   private final int httpStatusCode;
@@ -43,6 +42,48 @@ public FirebaseRemoteConfigServerException(
     this.httpStatusCode = httpStatusCode;
   }
 
+  /**
+   * Creates a Firebase Remote Config server exception with the given message and {@code
+   * FirebaseRemoteConfigException} code.
+   */
+  public FirebaseRemoteConfigServerException(@NonNull String detailMessage, @Nonnull Code code) {
+    super(detailMessage, code);
+    this.httpStatusCode = -1;
+  }
+
+  /**
+   * Creates a Firebase Remote Config server exception with the HTTP status code, given message, and
+   * {@code FirebaseRemoteConfigException} code.
+   */
+  public FirebaseRemoteConfigServerException(
+      int httpStatusCode, @NonNull String detailMessage, @Nonnull Code code) {
+    super(detailMessage, code);
+    this.httpStatusCode = httpStatusCode;
+  }
+
+  /**
+   * Creates a Firebase Remote Config server exception with the given message, exception cause, and
+   * {@code FirebaseRemoteConfigException} code.
+   */
+  public FirebaseRemoteConfigServerException(
+      @NonNull String detailMessage, @Nullable Throwable cause, @NonNull Code code) {
+    super(detailMessage, cause, code);
+    this.httpStatusCode = -1;
+  }
+
+  /**
+   * Creates a Firebase Remote Config server exception with the HTTP status code, given message,
+   * exception cause, and {@code FirebaseRemoteConfigException} code.
+   */
+  public FirebaseRemoteConfigServerException(
+      int httpStatusCode,
+      @NonNull String detailMessage,
+      @Nullable Throwable cause,
+      @NonNull Code code) {
+    super(detailMessage, cause, code);
+    this.httpStatusCode = httpStatusCode;
+  }
+
   /** Gets the HTTP status code of the failed Firebase Remote Config server operation. */
   public int getHttpStatusCode() {
     return httpStatusCode;
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigSettings.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigSettings.java
index 1bc028308b6..b518c22f512 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigSettings.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigSettings.java
@@ -19,11 +19,7 @@
 
 import androidx.annotation.NonNull;
 
-/**
- * Wraps the settings for {@link FirebaseRemoteConfig} operations.
- *
- * @author Lucas Png
- */
+/** Wraps the settings for {@link FirebaseRemoteConfig} operations. */
 public class FirebaseRemoteConfigSettings {
   private final long fetchTimeoutInSeconds;
   private final long minimumFetchInterval;
@@ -37,7 +33,7 @@ private FirebaseRemoteConfigSettings(Builder builder) {
    * Returns the fetch timeout in seconds.
    *
    * <p>The timeout specifies how long the client should wait for a connection to the Firebase
-   * Remote Config servers.
+   * Remote Config server.
    */
   public long getFetchTimeoutInSeconds() {
     return fetchTimeoutInSeconds;
@@ -48,7 +44,7 @@ public long getMinimumFetchIntervalInSeconds() {
     return minimumFetchInterval;
   }
 
-  /** Constructs a builder initialized with the current FirebaseRemoteConfigSettings. */
+  /** Constructs a builder initialized with the current {@link FirebaseRemoteConfigSettings}. */
   @NonNull
   public FirebaseRemoteConfigSettings.Builder toBuilder() {
     FirebaseRemoteConfigSettings.Builder frcBuilder = new FirebaseRemoteConfigSettings.Builder();
@@ -68,7 +64,7 @@ public static class Builder {
      * servers in seconds.
      *
      * <p>A fetch call will fail if it takes longer than the specified timeout to connect to or read
-     * from the Remote Config servers.
+     * from the Remote Config server.
      *
      * @param duration Timeout duration in seconds. Should be a non-negative number.
      */
@@ -109,7 +105,7 @@ public Builder setMinimumFetchIntervalInSeconds(long duration) {
      * Returns the fetch timeout in seconds.
      *
      * <p>The timeout specifies how long the client should wait for a connection to the Firebase
-     * Remote Config servers.
+     * Remote Config server.
      */
     public long getFetchTimeoutInSeconds() {
       return fetchTimeoutInSeconds;
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfig.kt b/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfig.kt
new file mode 100644
index 00000000000..a944a7e8857
--- /dev/null
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfig.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig
+
+import androidx.annotation.Keep
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.trySendBlocking
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+
+/** Returns the [FirebaseRemoteConfig] instance of the default [FirebaseApp]. */
+val Firebase.remoteConfig: FirebaseRemoteConfig
+  get() = FirebaseRemoteConfig.getInstance()
+
+/** Returns the [FirebaseRemoteConfig] instance of a given [FirebaseApp]. */
+fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig =
+  FirebaseRemoteConfig.getInstance(app)
+
+/** See [FirebaseRemoteConfig#getValue] */
+operator fun FirebaseRemoteConfig.get(key: String): FirebaseRemoteConfigValue {
+  return this.getValue(key)
+}
+
+fun remoteConfigSettings(
+  init: FirebaseRemoteConfigSettings.Builder.() -> Unit
+): FirebaseRemoteConfigSettings {
+  val builder = FirebaseRemoteConfigSettings.Builder()
+  builder.init()
+  return builder.build()
+}
+
+/**
+ * Starts listening for config updates from the Remote Config backend and emits [ConfigUpdate]s via
+ * a [Flow]. See [FirebaseRemoteConfig.addOnConfigUpdateListener] for more information.
+ *
+ * - When the returned flow starts being collected, an [ConfigUpdateListener] will be attached.
+ * - When the flow completes, the listener will be removed. If there are no attached listeners, the
+ * connection to the Remote Config backend will be closed.
+ */
+val FirebaseRemoteConfig.configUpdates
+  get() = callbackFlow {
+    val registration =
+      addOnConfigUpdateListener(
+        object : ConfigUpdateListener {
+          override fun onUpdate(configUpdate: ConfigUpdate) {
+            schedule { trySendBlocking(configUpdate) }
+          }
+
+          override fun onError(error: FirebaseRemoteConfigException) {
+            cancel(message = "Error listening for config updates.", cause = error)
+          }
+        }
+      )
+    awaitClose { registration.remove() }
+  }
+
+/** @suppress */
+@Keep
+class FirebaseRemoteConfigKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigComponent.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigComponent.java
index 83b867a65f2..c47d15f33f4 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigComponent.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigComponent.java
@@ -14,18 +14,22 @@
 
 package com.google.firebase.remoteconfig;
 
+import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.common.annotation.KeepForSdk;
+import com.google.android.gms.common.api.internal.BackgroundDetector;
 import com.google.android.gms.common.util.Clock;
 import com.google.android.gms.common.util.DefaultClock;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.abt.FirebaseABTesting;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.remoteconfig.internal.ConfigCacheClient;
@@ -33,14 +37,19 @@
 import com.google.firebase.remoteconfig.internal.ConfigFetchHttpClient;
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
 import com.google.firebase.remoteconfig.internal.ConfigMetadataClient;
+import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler;
 import com.google.firebase.remoteconfig.internal.ConfigStorageClient;
 import com.google.firebase.remoteconfig.internal.Personalization;
+import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateFactory;
+import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
+import com.google.firebase.remoteconfig.interop.FirebaseRemoteConfigInterop;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutsStateSubscriber;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Component for providing multiple Firebase Remote Config (FRC) instances. Firebase Android
@@ -49,11 +58,10 @@
  * <p>A unique FRC instance is returned for each {{@link FirebaseApp}, {@code namespace}}
  * combination.
  *
- * @author Miraziz Yusupov
  * @hide
  */
 @KeepForSdk
-public class RemoteConfigComponent {
+public class RemoteConfigComponent implements FirebaseRemoteConfigInterop {
   /** Name of the file where activated configs are stored. */
   public static final String ACTIVATE_FILE_NAME = "activate";
   /** Name of the file where fetched configs are stored. */
@@ -74,8 +82,11 @@ public class RemoteConfigComponent {
   @GuardedBy("this")
   private final Map<String, FirebaseRemoteConfig> frcNamespaceInstances = new HashMap<>();
 
+  private static final Map<String, FirebaseRemoteConfig> frcNamespaceInstancesStatic =
+      new HashMap<>();
+
   private final Context context;
-  private final ExecutorService executorService;
+  private final ScheduledExecutorService executor;
   private final FirebaseApp firebaseApp;
   private final FirebaseInstallationsApi firebaseInstallations;
   private final FirebaseABTesting firebaseAbt;
@@ -89,13 +100,14 @@ public class RemoteConfigComponent {
   /** Firebase Remote Config Component constructor. */
   RemoteConfigComponent(
       Context context,
+      @Blocking ScheduledExecutorService executor,
       FirebaseApp firebaseApp,
       FirebaseInstallationsApi firebaseInstallations,
       FirebaseABTesting firebaseAbt,
       Provider<AnalyticsConnector> analyticsConnector) {
     this(
         context,
-        Executors.newCachedThreadPool(),
+        executor,
         firebaseApp,
         firebaseInstallations,
         firebaseAbt,
@@ -107,27 +119,28 @@ public class RemoteConfigComponent {
   @VisibleForTesting
   protected RemoteConfigComponent(
       Context context,
-      ExecutorService executorService,
+      ScheduledExecutorService executor,
       FirebaseApp firebaseApp,
       FirebaseInstallationsApi firebaseInstallations,
       FirebaseABTesting firebaseAbt,
       Provider<AnalyticsConnector> analyticsConnector,
       boolean loadGetDefault) {
     this.context = context;
-    this.executorService = executorService;
+    this.executor = executor;
     this.firebaseApp = firebaseApp;
     this.firebaseInstallations = firebaseInstallations;
     this.firebaseAbt = firebaseAbt;
     this.analyticsConnector = analyticsConnector;
 
     this.appId = firebaseApp.getOptions().getApplicationId();
+    GlobalBackgroundListener.ensureBackgroundListenerIsRegistered(context);
 
     // When the component is first loaded, it will use a cached executor.
     // The getDefault call creates race conditions in tests, where the getDefault might be executing
     // while another test has already cleared the component but hasn't gotten a new one yet.
     if (loadGetDefault) {
       // Loads the default namespace's configs from disk on App startup.
-      Tasks.call(executorService, this::getDefault);
+      Tasks.call(executor, this::getDefault);
     }
   }
 
@@ -159,20 +172,25 @@ public synchronized FirebaseRemoteConfig get(String namespace) {
       getHandler.addListener(personalization::logArmActive);
     }
 
+    RolloutsStateSubscriptionsHandler rolloutsStateSubscriptionsHandler =
+        getRolloutsStateSubscriptionsHandler(activatedCacheClient, defaultsCacheClient);
+
     return get(
         firebaseApp,
         namespace,
         firebaseInstallations,
         firebaseAbt,
-        executorService,
+        executor,
         fetchedCacheClient,
         activatedCacheClient,
         defaultsCacheClient,
         getFetchHandler(namespace, fetchedCacheClient, metadataClient),
         getHandler,
-        metadataClient);
+        metadataClient,
+        rolloutsStateSubscriptionsHandler);
   }
 
+  // TODO: Pass ConfigRealtimeHandler so it's mock-able in tests.
   @VisibleForTesting
   synchronized FirebaseRemoteConfig get(
       FirebaseApp firebaseApp,
@@ -185,7 +203,8 @@ synchronized FirebaseRemoteConfig get(
       ConfigCacheClient defaultsClient,
       ConfigFetchHandler fetchHandler,
       ConfigGetParameterHandler getHandler,
-      ConfigMetadataClient metadataClient) {
+      ConfigMetadataClient metadataClient,
+      RolloutsStateSubscriptionsHandler rolloutsStateSubscriptionsHandler) {
     if (!frcNamespaceInstances.containsKey(namespace)) {
       FirebaseRemoteConfig in =
           new FirebaseRemoteConfig(
@@ -199,9 +218,19 @@ synchronized FirebaseRemoteConfig get(
               defaultsClient,
               fetchHandler,
               getHandler,
-              metadataClient);
+              metadataClient,
+              getRealtime(
+                  firebaseApp,
+                  firebaseInstallations,
+                  fetchHandler,
+                  activatedClient,
+                  context,
+                  namespace,
+                  metadataClient),
+              rolloutsStateSubscriptionsHandler);
       in.startLoadingConfigsFromDisk();
       frcNamespaceInstances.put(namespace, in);
+      frcNamespaceInstancesStatic.put(namespace, in);
     }
     return frcNamespaceInstances.get(namespace);
   }
@@ -217,7 +246,7 @@ private ConfigCacheClient getCacheClient(String namespace, String configStoreTyp
             "%s_%s_%s_%s.json",
             FIREBASE_REMOTE_CONFIG_FILE_NAME_PREFIX, appId, namespace, configStoreType);
     return ConfigCacheClient.getInstance(
-        Executors.newCachedThreadPool(), ConfigStorageClient.getInstance(context, fileName));
+        executor, ConfigStorageClient.getInstance(context, fileName));
   }
 
   @VisibleForTesting
@@ -239,7 +268,7 @@ synchronized ConfigFetchHandler getFetchHandler(
     return new ConfigFetchHandler(
         firebaseInstallations,
         isPrimaryApp(firebaseApp) ? analyticsConnector : () -> null,
-        executorService,
+        executor,
         DEFAULT_CLOCK,
         DEFAULT_RANDOM,
         fetchedCacheClient,
@@ -248,10 +277,28 @@ synchronized ConfigFetchHandler getFetchHandler(
         this.customHeaders);
   }
 
+  synchronized ConfigRealtimeHandler getRealtime(
+      FirebaseApp firebaseApp,
+      FirebaseInstallationsApi firebaseInstallations,
+      ConfigFetchHandler configFetchHandler,
+      ConfigCacheClient activatedCacheClient,
+      Context context,
+      String namespace,
+      ConfigMetadataClient metadataClient) {
+    return new ConfigRealtimeHandler(
+        firebaseApp,
+        firebaseInstallations,
+        configFetchHandler,
+        activatedCacheClient,
+        context,
+        namespace,
+        metadataClient,
+        executor);
+  }
+
   private ConfigGetParameterHandler getGetHandler(
       ConfigCacheClient activatedCacheClient, ConfigCacheClient defaultsCacheClient) {
-    return new ConfigGetParameterHandler(
-        executorService, activatedCacheClient, defaultsCacheClient);
+    return new ConfigGetParameterHandler(executor, activatedCacheClient, defaultsCacheClient);
   }
 
   @VisibleForTesting
@@ -273,6 +320,15 @@ private static Personalization getPersonalization(
     return null;
   }
 
+  private RolloutsStateSubscriptionsHandler getRolloutsStateSubscriptionsHandler(
+      ConfigCacheClient activatedConfigsCache, ConfigCacheClient defaultConfigsCache) {
+    RolloutsStateFactory rolloutsStateFactory =
+        RolloutsStateFactory.create(activatedConfigsCache, defaultConfigsCache);
+
+    return new RolloutsStateSubscriptionsHandler(
+        activatedConfigsCache, rolloutsStateFactory, executor);
+  }
+
   /**
    * Checks if ABT can be used in the given {@code firebaseApp} and {@code namespace}.
    *
@@ -299,4 +355,48 @@ private static boolean isAbtSupported(FirebaseApp firebaseApp, String namespace)
   private static boolean isPrimaryApp(FirebaseApp firebaseApp) {
     return firebaseApp.getName().equals(FirebaseApp.DEFAULT_APP_NAME);
   }
+
+  private static synchronized void notifyRCInstances(boolean isInBackground) {
+    for (FirebaseRemoteConfig frc : frcNamespaceInstancesStatic.values()) {
+      frc.setConfigUpdateBackgroundState(isInBackground);
+    }
+  }
+
+  /**
+   * Register a {@link RolloutsStateSubscriber} {@code subscriber} in for the given Remote Config
+   * {@code namespace}.
+   *
+   * <p>This implements {@link FirebaseRemoteConfigInterop} for use by other Firebase SDKs. See
+   * {@link FirebaseRemoteConfigInterop#registerRolloutsStateSubscriber(String,
+   * RolloutsStateSubscriber)} for more details.
+   */
+  @Override
+  public void registerRolloutsStateSubscriber(
+      @NonNull String namespace, @NonNull RolloutsStateSubscriber subscriber) {
+    get(namespace)
+        .getRolloutsStateSubscriptionsHandler()
+        .registerRolloutsStateSubscriber(subscriber);
+  }
+
+  private static class GlobalBackgroundListener
+      implements BackgroundDetector.BackgroundStateChangeListener {
+    private static final AtomicReference<GlobalBackgroundListener> INSTANCE =
+        new AtomicReference<>();
+
+    private static void ensureBackgroundListenerIsRegistered(Context context) {
+      Application application = (Application) context.getApplicationContext();
+      if (INSTANCE.get() == null) {
+        GlobalBackgroundListener globalBackgroundListener = new GlobalBackgroundListener();
+        if (INSTANCE.compareAndSet(null, globalBackgroundListener)) {
+          BackgroundDetector.initialize(application);
+          BackgroundDetector.getInstance().addListener(globalBackgroundListener);
+        }
+      }
+    }
+
+    @Override
+    public void onBackgroundStateChanged(boolean isInBackground) {
+      notifyRCInstances(isInBackground);
+    }
+  }
 }
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigConstants.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigConstants.java
index 29e05574b70..9c1a352dd0a 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigConstants.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigConstants.java
@@ -27,6 +27,8 @@
 public final class RemoteConfigConstants {
   public static final String FETCH_REGEX_URL =
       "https://firebaseremoteconfig.googleapis.com/v1/projects/%s/namespaces/%s:fetch";
+  public static final String REALTIME_REGEX_URL =
+      "https://firebaseremoteconfigrealtime.googleapis.com/v1/projects/%s/namespaces/%s:streamFetchInvalidations";
 
   /**
    * Keys of fields in the Fetch request body that the client sends to the Firebase Remote Config
@@ -48,7 +50,8 @@ public final class RemoteConfigConstants {
     RequestFieldKey.APP_VERSION,
     RequestFieldKey.PACKAGE_NAME,
     RequestFieldKey.SDK_VERSION,
-    RequestFieldKey.ANALYTICS_USER_PROPERTIES
+    RequestFieldKey.ANALYTICS_USER_PROPERTIES,
+    RequestFieldKey.FIRST_OPEN_TIME
   })
   @Retention(RetentionPolicy.SOURCE)
   public @interface RequestFieldKey {
@@ -64,6 +67,7 @@ public final class RemoteConfigConstants {
     String PACKAGE_NAME = "packageName";
     String SDK_VERSION = "sdkVersion";
     String ANALYTICS_USER_PROPERTIES = "analyticsUserProperties";
+    String FIRST_OPEN_TIME = "firstOpenTime";
   }
 
   /** Keys of fields in the Fetch response body from the Firebase Remote Config server. */
@@ -71,7 +75,9 @@ public final class RemoteConfigConstants {
     ResponseFieldKey.ENTRIES,
     ResponseFieldKey.EXPERIMENT_DESCRIPTIONS,
     ResponseFieldKey.PERSONALIZATION_METADATA,
-    ResponseFieldKey.STATE
+    ResponseFieldKey.STATE,
+    ResponseFieldKey.TEMPLATE_VERSION_NUMBER,
+    ResponseFieldKey.ROLLOUT_METADATA
   })
   @Retention(RetentionPolicy.SOURCE)
   public @interface ResponseFieldKey {
@@ -79,6 +85,8 @@ public final class RemoteConfigConstants {
     String EXPERIMENT_DESCRIPTIONS = "experimentDescriptions";
     String PERSONALIZATION_METADATA = "personalizationMetadata";
     String STATE = "state";
+    String TEMPLATE_VERSION_NUMBER = "templateVersion";
+    String ROLLOUT_METADATA = "rolloutMetadata";
   }
 
   /**
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigRegistrar.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigRegistrar.java
index 3051c4a9c27..291a07b8a59 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigRegistrar.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigRegistrar.java
@@ -20,13 +20,17 @@
 import com.google.firebase.abt.FirebaseABTesting.OriginService;
 import com.google.firebase.abt.component.AbtComponent;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
+import com.google.firebase.remoteconfig.interop.FirebaseRemoteConfigInterop;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
 
 /**
  * Registrar for setting up Firebase Remote Config's dependency injections in Firebase Android
@@ -37,11 +41,17 @@
  */
 @Keep
 public class RemoteConfigRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-rc";
+
   @Override
   public List<Component<?>> getComponents() {
+    Qualified<ScheduledExecutorService> blockingExecutor =
+        Qualified.qualified(Blocking.class, ScheduledExecutorService.class);
     return Arrays.asList(
-        Component.builder(RemoteConfigComponent.class)
+        Component.builder(RemoteConfigComponent.class, FirebaseRemoteConfigInterop.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(Context.class))
+            .add(Dependency.required(blockingExecutor))
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(FirebaseInstallationsApi.class))
             .add(Dependency.required(AbtComponent.class))
@@ -50,12 +60,13 @@ public List<Component<?>> getComponents() {
                 container ->
                     new RemoteConfigComponent(
                         container.get(Context.class),
+                        container.get(blockingExecutor),
                         container.get(FirebaseApp.class),
                         container.get(FirebaseInstallationsApi.class),
                         container.get(AbtComponent.class).get(OriginService.REMOTE_CONFIG),
                         container.getProvider(AnalyticsConnector.class)))
             .eagerInDefaultApp()
             .build(),
-        LibraryVersionComponent.create("fire-rc", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigAutoFetch.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigAutoFetch.java
new file mode 100644
index 00000000000..81016602532
--- /dev/null
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigAutoFetch.java
@@ -0,0 +1,289 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.remoteconfig.internal;
+
+import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.TAG;
+
+import android.util.Log;
+import androidx.annotation.GuardedBy;
+import androidx.annotation.VisibleForTesting;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.remoteconfig.ConfigUpdate;
+import com.google.firebase.remoteconfig.ConfigUpdateListener;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigClientException;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigException;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigServerException;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class ConfigAutoFetch {
+
+  private static final int MAXIMUM_FETCH_ATTEMPTS = 3;
+  private static final String TEMPLATE_VERSION_KEY = "latestTemplateVersionNumber";
+  private static final String REALTIME_DISABLED_KEY = "featureDisabled";
+
+  @GuardedBy("this")
+  private final Set<ConfigUpdateListener> eventListeners;
+
+  private final HttpURLConnection httpURLConnection;
+
+  private final ConfigFetchHandler configFetchHandler;
+  private final ConfigCacheClient activatedCache;
+  private final ConfigUpdateListener retryCallback;
+  private final ScheduledExecutorService scheduledExecutorService;
+  private final Random random;
+
+  public ConfigAutoFetch(
+      HttpURLConnection httpURLConnection,
+      ConfigFetchHandler configFetchHandler,
+      ConfigCacheClient activatedCache,
+      Set<ConfigUpdateListener> eventListeners,
+      ConfigUpdateListener retryCallback,
+      ScheduledExecutorService scheduledExecutorService) {
+    this.httpURLConnection = httpURLConnection;
+    this.configFetchHandler = configFetchHandler;
+    this.activatedCache = activatedCache;
+    this.eventListeners = eventListeners;
+    this.retryCallback = retryCallback;
+    this.scheduledExecutorService = scheduledExecutorService;
+    this.random = new Random();
+  }
+
+  private synchronized void propagateErrors(FirebaseRemoteConfigException exception) {
+    for (ConfigUpdateListener listener : eventListeners) {
+      listener.onError(exception);
+    }
+  }
+
+  private synchronized void executeAllListenerCallbacks(ConfigUpdate configUpdate) {
+    for (ConfigUpdateListener listener : eventListeners) {
+      listener.onUpdate(configUpdate);
+    }
+  }
+
+  private synchronized boolean isEventListenersEmpty() {
+    return this.eventListeners.isEmpty();
+  }
+
+  private String parseAndValidateConfigUpdateMessage(String message) {
+    int left = message.indexOf('{');
+    int right = message.lastIndexOf('}');
+
+    if (left < 0 || right < 0) {
+      return "";
+    }
+
+    return left >= right ? "" : message.substring(left, right + 1);
+  }
+
+  // Check connection and establish InputStream
+  @VisibleForTesting
+  public void listenForNotifications() {
+    if (httpURLConnection == null) {
+      return;
+    }
+
+    try {
+      InputStream inputStream = httpURLConnection.getInputStream();
+      handleNotifications(inputStream);
+      inputStream.close();
+    } catch (IOException ex) {
+      // Stream was interrupted due to a transient issue and the system will retry the connection.
+      Log.d(TAG, "Stream was cancelled due to an exception. Retrying the connection...", ex);
+    } finally {
+      httpURLConnection.disconnect();
+    }
+  }
+
+  // Auto-fetch new config and execute callbacks on each new message
+  private void handleNotifications(InputStream inputStream) throws IOException {
+    BufferedReader reader = new BufferedReader((new InputStreamReader(inputStream, "utf-8")));
+    String partialConfigUpdateMessage;
+    String currentConfigUpdateMessage = "";
+
+    // Multiple config update messages can be sent through this loop. Each message comes in line by
+    // line as partialConfigUpdateMessage and are accumulated together into
+    // currentConfigUpdateMessage.
+    while ((partialConfigUpdateMessage = reader.readLine()) != null) {
+      // Accumulate all the partial parts of the message until we have a full message.
+      currentConfigUpdateMessage += partialConfigUpdateMessage;
+
+      // Closing bracket indicates a full message has just finished.
+      if (partialConfigUpdateMessage.contains("}")) {
+        // Strip beginning and ending of message. If there is not an open and closing bracket,
+        // parseMessage will return an empty message.
+        currentConfigUpdateMessage =
+            parseAndValidateConfigUpdateMessage(currentConfigUpdateMessage);
+        if (currentConfigUpdateMessage.isEmpty()) {
+          continue;
+        }
+
+        try {
+          JSONObject jsonObject = new JSONObject(currentConfigUpdateMessage);
+
+          if (jsonObject.has(REALTIME_DISABLED_KEY)
+              && jsonObject.getBoolean(REALTIME_DISABLED_KEY)) {
+            retryCallback.onError(
+                new FirebaseRemoteConfigServerException(
+                    "The server is temporarily unavailable. Try again in a few minutes.",
+                    FirebaseRemoteConfigException.Code.CONFIG_UPDATE_UNAVAILABLE));
+            break;
+          }
+
+          // If there's an invalidation message and no listeners, ignore the message and close the
+          // realtime stream connection. The next time the realtime connection is opened, the client
+          // will receive the same invalidation message and call any registered listeners.
+          //
+          // In effect, stop listening when the last listener is removed. This works around
+          // URLConnection.disconnect() being called by ConfigAutoFetch rather than
+          // ConfigRealtimeHttpClient.
+          if (this.isEventListenersEmpty()) {
+            break;
+          }
+
+          if (jsonObject.has(TEMPLATE_VERSION_KEY)) {
+            long oldTemplateVersion = configFetchHandler.getTemplateVersionNumber();
+            long targetTemplateVersion = jsonObject.getLong(TEMPLATE_VERSION_KEY);
+            if (targetTemplateVersion > oldTemplateVersion) {
+              autoFetch(MAXIMUM_FETCH_ATTEMPTS, targetTemplateVersion);
+            }
+          }
+        } catch (JSONException ex) {
+          // Message was mangled up and so it was unable to be parsed. User is notified of this
+          // because it there could be a new configuration that needs to be fetched.
+          propagateErrors(
+              new FirebaseRemoteConfigClientException(
+                  "Unable to parse config update message.",
+                  ex.getCause(),
+                  FirebaseRemoteConfigException.Code.CONFIG_UPDATE_MESSAGE_INVALID));
+          Log.e(TAG, "Unable to parse latest config update message.", ex);
+        }
+
+        currentConfigUpdateMessage = "";
+      }
+    }
+
+    reader.close();
+    inputStream.close();
+  }
+
+  private void autoFetch(int remainingAttempts, long targetVersion) {
+    if (remainingAttempts == 0) {
+      propagateErrors(
+          new FirebaseRemoteConfigServerException(
+              "Unable to fetch the latest version of the template.",
+              FirebaseRemoteConfigException.Code.CONFIG_UPDATE_NOT_FETCHED));
+      return;
+    }
+
+    // Randomize fetch to occur between 0 - 4 seconds.
+    int timeTillFetch = random.nextInt(4);
+    scheduledExecutorService.schedule(
+        new Runnable() {
+          @Override
+          public void run() {
+            fetchLatestConfig(remainingAttempts, targetVersion);
+          }
+        },
+        timeTillFetch,
+        TimeUnit.SECONDS);
+  }
+
+  @VisibleForTesting
+  public synchronized Task<Void> fetchLatestConfig(int remainingAttempts, long targetVersion) {
+    int remainingAttemptsAfterFetch = remainingAttempts - 1;
+    int currentAttemptNumber = MAXIMUM_FETCH_ATTEMPTS - remainingAttemptsAfterFetch;
+
+    Task<ConfigFetchHandler.FetchResponse> fetchTask =
+        configFetchHandler.fetchNowWithTypeAndAttemptNumber(
+            ConfigFetchHandler.FetchType.REALTIME, currentAttemptNumber);
+    Task<ConfigContainer> activatedConfigsTask = activatedCache.get();
+
+    return Tasks.whenAllComplete(fetchTask, activatedConfigsTask)
+        .continueWithTask(
+            scheduledExecutorService,
+            (listOfUnusedCompletedTasks) -> {
+              if (!fetchTask.isSuccessful()) {
+                return Tasks.forException(
+                    new FirebaseRemoteConfigClientException(
+                        "Failed to auto-fetch config update.", fetchTask.getException()));
+              }
+
+              if (!activatedConfigsTask.isSuccessful()) {
+                return Tasks.forException(
+                    new FirebaseRemoteConfigClientException(
+                        "Failed to get activated config for auto-fetch",
+                        activatedConfigsTask.getException()));
+              }
+
+              ConfigFetchHandler.FetchResponse fetchResponse = fetchTask.getResult();
+              ConfigContainer activatedConfigs = activatedConfigsTask.getResult();
+
+              if (!fetchResponseIsUpToDate(fetchResponse, targetVersion)) {
+                Log.d(
+                    TAG,
+                    "Fetched template version is the same as SDK's current version."
+                        + " Retrying fetch.");
+                // Continue fetching until template version number is greater than current.
+                autoFetch(remainingAttemptsAfterFetch, targetVersion);
+                return Tasks.forResult(null);
+              }
+
+              if (fetchResponse.getFetchedConfigs() == null) {
+                Log.d(TAG, "The fetch succeeded, but the backend had no updates.");
+                return Tasks.forResult(null);
+              }
+
+              // Activate hasn't been called yet, so use an empty container for comparison.
+              // See ConfigCacheClient#get() for details on the async operation.
+              if (activatedConfigs == null) {
+                activatedConfigs = ConfigContainer.newBuilder().build();
+              }
+
+              Set<String> updatedKeys =
+                  activatedConfigs.getChangedParams(fetchResponse.getFetchedConfigs());
+              if (updatedKeys.isEmpty()) {
+                Log.d(TAG, "Config was fetched, but no params changed.");
+                return Tasks.forResult(null);
+              }
+
+              ConfigUpdate configUpdate = ConfigUpdate.create(updatedKeys);
+              executeAllListenerCallbacks(configUpdate);
+              return Tasks.forResult(null);
+            });
+  }
+
+  private static Boolean fetchResponseIsUpToDate(
+      ConfigFetchHandler.FetchResponse response, long lastKnownVersion) {
+    // If there's a config, make sure its version is >= the last known version.
+    if (response.getFetchedConfigs() != null) {
+      return response.getFetchedConfigs().getTemplateVersionNumber() >= lastKnownVersion;
+    }
+
+    // If there isn't a config, return true if the backend had no update.
+    // Else, it returned an out of date config.
+    return response.getStatus() == ConfigFetchHandler.FetchResponse.Status.BACKEND_HAS_NO_UPDATES;
+  }
+}
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigCacheClient.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigCacheClient.java
index 3cb18e36a4c..ea504a85f46 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigCacheClient.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigCacheClient.java
@@ -32,7 +32,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
@@ -56,7 +55,7 @@ public class ConfigCacheClient {
   @GuardedBy("ConfigCacheClient.class")
   private static final Map<String, ConfigCacheClient> clientInstances = new HashMap<>();
 
-  private final ExecutorService executorService;
+  private final Executor executor;
   private final ConfigStorageClient storageClient;
 
   /**
@@ -71,8 +70,8 @@ public class ConfigCacheClient {
    * Creates a new cache client that executes async calls through {@code executorService} and is
    * backed by {@code storageClient}.
    */
-  private ConfigCacheClient(ExecutorService executorService, ConfigStorageClient storageClient) {
-    this.executorService = executorService;
+  private ConfigCacheClient(Executor executor, ConfigStorageClient storageClient) {
+    this.executor = executor;
     this.storageClient = storageClient;
 
     cachedContainerTask = null;
@@ -126,9 +125,9 @@ public Task<ConfigContainer> put(ConfigContainer configContainer) {
    */
   public Task<ConfigContainer> put(
       ConfigContainer configContainer, boolean shouldUpdateInMemoryContainer) {
-    return Tasks.call(executorService, () -> storageClient.write(configContainer))
+    return Tasks.call(executor, () -> storageClient.write(configContainer))
         .onSuccessTask(
-            executorService,
+            executor,
             (unusedVoid) -> {
               if (shouldUpdateInMemoryContainer) {
                 updateInMemoryConfigContainer(configContainer);
@@ -165,7 +164,7 @@ public synchronized Task<ConfigContainer> get() {
      */
     if (cachedContainerTask == null
         || (cachedContainerTask.isComplete() && !cachedContainerTask.isSuccessful())) {
-      cachedContainerTask = Tasks.call(executorService, storageClient::read);
+      cachedContainerTask = Tasks.call(executor, storageClient::read);
     }
     return cachedContainerTask;
   }
@@ -200,10 +199,10 @@ synchronized Task<ConfigContainer> getCachedContainerTask() {
    * underlying file name.
    */
   public static synchronized ConfigCacheClient getInstance(
-      ExecutorService executorService, ConfigStorageClient storageClient) {
+      Executor executor, ConfigStorageClient storageClient) {
     String fileName = storageClient.getFileName();
     if (!clientInstances.containsKey(fileName)) {
-      clientInstances.put(fileName, new ConfigCacheClient(executorService, storageClient));
+      clientInstances.put(fileName, new ConfigCacheClient(executor, storageClient));
     }
     return clientInstances.get(fileName);
   }
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigContainer.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigContainer.java
index d7d7d690844..c188ae8d330 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigContainer.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigContainer.java
@@ -15,7 +15,11 @@
 package com.google.firebase.remoteconfig.internal;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -31,6 +35,11 @@ public class ConfigContainer {
   static final String FETCH_TIME_KEY = "fetch_time_key";
   static final String ABT_EXPERIMENTS_KEY = "abt_experiments_key";
   static final String PERSONALIZATION_METADATA_KEY = "personalization_metadata_key";
+  static final String TEMPLATE_VERSION_NUMBER_KEY = "template_version_number_key";
+  static final String ROLLOUT_METADATA_KEY = "rollout_metadata_key";
+  public static final String ROLLOUT_METADATA_AFFECTED_KEYS = "affectedParameterKeys";
+  public static final String ROLLOUT_METADATA_ID = "rolloutId";
+  public static final String ROLLOUT_METADATA_VARIANT_ID = "variantId";
 
   private static final Date DEFAULTS_FETCH_TIME = new Date(0L);
 
@@ -55,6 +64,10 @@ public class ConfigContainer {
 
   private JSONObject personalizationMetadata;
 
+  private long templateVersionNumber;
+
+  private JSONArray rolloutMetadata;
+
   /**
    * Creates a new container with the specified configs and fetch time.
    *
@@ -64,18 +77,24 @@ private ConfigContainer(
       JSONObject configsJson,
       Date fetchTime,
       JSONArray abtExperiments,
-      JSONObject personalizationMetadata)
+      JSONObject personalizationMetadata,
+      long templateVersionNumber,
+      JSONArray rolloutMetadata)
       throws JSONException {
     JSONObject containerJson = new JSONObject();
     containerJson.put(CONFIGS_KEY, configsJson);
     containerJson.put(FETCH_TIME_KEY, fetchTime.getTime());
     containerJson.put(ABT_EXPERIMENTS_KEY, abtExperiments);
     containerJson.put(PERSONALIZATION_METADATA_KEY, personalizationMetadata);
+    containerJson.put(TEMPLATE_VERSION_NUMBER_KEY, templateVersionNumber);
+    containerJson.put(ROLLOUT_METADATA_KEY, rolloutMetadata);
 
     this.configsJson = configsJson;
     this.fetchTime = fetchTime;
     this.abtExperiments = abtExperiments;
     this.personalizationMetadata = personalizationMetadata;
+    this.templateVersionNumber = templateVersionNumber;
+    this.rolloutMetadata = rolloutMetadata;
 
     this.containerJson = containerJson;
   }
@@ -83,7 +102,7 @@ private ConfigContainer(
   /**
    * Returns a {@link ConfigContainer} that wraps the {@code containerJson}.
    *
-   * <p>The {@code containerJson} must not be modified.
+   * <p>This is a shallow copy so {@code containerJson} must not be modified.
    */
   static ConfigContainer copyOf(JSONObject containerJson) throws JSONException {
     // Personalization metadata may not have been written yet.
@@ -93,11 +112,30 @@ static ConfigContainer copyOf(JSONObject containerJson) throws JSONException {
       personalizationMetadataJSON = new JSONObject();
     }
 
+    // Default to empty JSONArray if Rollout metadata does not exist.
+    JSONArray rolloutMetadataJSON = containerJson.optJSONArray(ROLLOUT_METADATA_KEY);
+    if (rolloutMetadataJSON == null) {
+      rolloutMetadataJSON = new JSONArray();
+    }
+
     return new ConfigContainer(
         containerJson.getJSONObject(CONFIGS_KEY),
         new Date(containerJson.getLong(FETCH_TIME_KEY)),
         containerJson.getJSONArray(ABT_EXPERIMENTS_KEY),
-        personalizationMetadataJSON);
+        personalizationMetadataJSON,
+        // Default to 0 if template_version_number_key has not been cached yet.
+        containerJson.optLong(TEMPLATE_VERSION_NUMBER_KEY),
+        rolloutMetadataJSON);
+  }
+
+  /**
+   * Returns a new {@link ConfigContainer} containing a deep copy of {@code containerJson}.
+   *
+   * <p>This is a deep copy so it may be modified without affecting the original.
+   */
+  private static ConfigContainer deepCopyOf(JSONObject containerJson) throws JSONException {
+    JSONObject deepCopyJson = new JSONObject(containerJson.toString());
+    return ConfigContainer.copyOf(deepCopyJson);
   }
 
   /**
@@ -125,6 +163,14 @@ public JSONObject getPersonalizationMetadata() {
     return personalizationMetadata;
   }
 
+  public long getTemplateVersionNumber() {
+    return templateVersionNumber;
+  }
+
+  public JSONArray getRolloutMetadata() {
+    return rolloutMetadata;
+  }
+
   @Override
   public String toString() {
     return containerJson.toString();
@@ -143,6 +189,112 @@ public boolean equals(Object o) {
     return containerJson.toString().equals(that.toString());
   }
 
+  // Create a map of maps of parameter key to `rolloutId`/`variantId`.
+  private Map<String, Map<String, String>> createRolloutParameterKeyMap() throws JSONException {
+    // Create a map where the key is the parameter key and the value is a maps of
+    // rolloutId`/`variantId`.
+    Map<String, Map<String, String>> rolloutMetadataMap = new HashMap<>();
+    for (int i = 0; i < this.getRolloutMetadata().length(); i++) {
+      JSONObject rolloutMetadata = this.getRolloutMetadata().getJSONObject(i);
+      String rolloutId = rolloutMetadata.getString(ROLLOUT_METADATA_ID);
+      String variantId = rolloutMetadata.getString(ROLLOUT_METADATA_VARIANT_ID);
+      JSONArray parameterKeys = rolloutMetadata.getJSONArray(ROLLOUT_METADATA_AFFECTED_KEYS);
+
+      // Iterate through `affectedParameterKeys` and put `rolloutId`/`variantId` into the key's map.
+      for (int j = 0; j < parameterKeys.length(); j++) {
+        String parameterKey = parameterKeys.getString(j);
+        if (!rolloutMetadataMap.containsKey(parameterKey)) {
+          rolloutMetadataMap.put(parameterKey, new HashMap<>());
+        }
+
+        // Place `rolloutId`/`variantId` into parameterKey's map.
+        Map<String, String> parameterKeyRolloutMetadata = rolloutMetadataMap.get(parameterKey);
+        if (parameterKeyRolloutMetadata != null) {
+          parameterKeyRolloutMetadata.put(rolloutId, variantId);
+        }
+      }
+    }
+
+    return rolloutMetadataMap;
+  }
+
+  /**
+   * @param other The other {@link ConfigContainer} against which to compute the diff
+   * @return The set of config keys that have changed between the this config and {@code other}
+   * @throws JSONException
+   */
+  public Set<String> getChangedParams(ConfigContainer other) throws JSONException {
+    // Make a deep copy of the other config before modifying it
+    JSONObject otherConfig = ConfigContainer.deepCopyOf(other.containerJson).getConfigs();
+
+    // Config key to `rolloutMetadata` map.
+    Map<String, Map<String, String>> rolloutMetadataMap = this.createRolloutParameterKeyMap();
+    Map<String, Map<String, String>> otherRolloutMetadataMap = other.createRolloutParameterKeyMap();
+
+    Set<String> changed = new HashSet<>();
+    Iterator<String> keys = this.getConfigs().keys();
+    while (keys.hasNext()) {
+      String key = keys.next();
+
+      // If the other config doesn't have the key
+      if (!other.getConfigs().has(key)) {
+        changed.add(key);
+        continue;
+      }
+
+      // If the other config has a different value for the key
+      if (!this.getConfigs().get(key).equals(other.getConfigs().get(key))) {
+        changed.add(key);
+        continue;
+      }
+
+      // If only one of the configs has PersonalizationMetadata for the key
+      if (this.getPersonalizationMetadata().has(key) && !other.getPersonalizationMetadata().has(key)
+          || !this.getPersonalizationMetadata().has(key)
+              && other.getPersonalizationMetadata().has(key)) {
+        changed.add(key);
+        continue;
+      }
+
+      // If the both configs have PersonalizationMetadata for the key, but the metadata has changed
+      if (this.getPersonalizationMetadata().has(key)
+          && other.getPersonalizationMetadata().has(key)
+          && !this.getPersonalizationMetadata()
+              .getJSONObject(key)
+              .toString()
+              .equals(other.getPersonalizationMetadata().getJSONObject(key).toString())) {
+        changed.add(key);
+        continue;
+      }
+
+      // If only one of the configs has `rolloutMetadata` for the given key.
+      if (rolloutMetadataMap.containsKey(key) != otherRolloutMetadataMap.containsKey(key)) {
+        changed.add(key);
+        continue;
+      }
+
+      // If both of the configs have `rolloutMetadata` for the given key but the metadata has
+      // changed.
+      if (rolloutMetadataMap.containsKey(key)
+          && otherRolloutMetadataMap.containsKey(key)
+          && !rolloutMetadataMap.get(key).equals(otherRolloutMetadataMap.get(key))) {
+        changed.add(key);
+        continue;
+      }
+
+      // Since the key is the same in both configs, remove it from otherConfig
+      otherConfig.remove(key);
+    }
+
+    // Add all the keys from other that are different
+    Iterator<String> remainingOtherKeys = otherConfig.keys();
+    while (remainingOtherKeys.hasNext()) {
+      changed.add(remainingOtherKeys.next());
+    }
+
+    return changed;
+  }
+
   @Override
   public int hashCode() {
     return containerJson.hashCode();
@@ -154,12 +306,16 @@ public static class Builder {
     private Date builderFetchTime;
     private JSONArray builderAbtExperiments;
     private JSONObject builderPersonalizationMetadata;
+    private long builderTemplateVersionNumber;
+    private JSONArray builderRolloutMetadata;
 
     private Builder() {
       builderConfigsJson = new JSONObject();
       builderFetchTime = DEFAULTS_FETCH_TIME;
       builderAbtExperiments = new JSONArray();
       builderPersonalizationMetadata = new JSONObject();
+      builderTemplateVersionNumber = 0L;
+      builderRolloutMetadata = new JSONArray();
     }
 
     public Builder(ConfigContainer otherContainer) {
@@ -167,6 +323,8 @@ public Builder(ConfigContainer otherContainer) {
       this.builderFetchTime = otherContainer.getFetchTime();
       this.builderAbtExperiments = otherContainer.getAbtExperiments();
       this.builderPersonalizationMetadata = otherContainer.getPersonalizationMetadata();
+      this.builderTemplateVersionNumber = otherContainer.getTemplateVersionNumber();
+      this.builderRolloutMetadata = otherContainer.getRolloutMetadata();
     }
 
     public Builder replaceConfigsWith(Map<String, String> configsMap) {
@@ -215,13 +373,32 @@ public Builder withPersonalizationMetadata(JSONObject personalizationMetadata) {
       return this;
     }
 
+    public Builder withTemplateVersionNumber(long templateVersionNumber) {
+      this.builderTemplateVersionNumber = templateVersionNumber;
+      return this;
+    }
+
+    public Builder withRolloutMetadata(JSONArray rolloutMetadata) {
+      try {
+        this.builderRolloutMetadata = new JSONArray(rolloutMetadata.toString());
+      } catch (JSONException e) {
+        // We serialize and deserialize the JSONArray to guarantee that it cannot be mutated after
+        // being set in the builder.
+        // A JSONException should never occur because the JSON that is being deserialized is
+        // guaranteed to be valid.
+      }
+      return this;
+    }
+
     /** If a fetch time is not provided, the defaults container fetch time is used. */
     public ConfigContainer build() throws JSONException {
       return new ConfigContainer(
           builderConfigsJson,
           builderFetchTime,
           builderAbtExperiments,
-          builderPersonalizationMetadata);
+          builderPersonalizationMetadata,
+          builderTemplateVersionNumber,
+          builderRolloutMetadata);
     }
   }
 
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandler.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandler.java
index 26a768d3ab4..74348aedc16 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandler.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandler.java
@@ -79,6 +79,15 @@ public class ConfigFetchHandler {
    */
   @VisibleForTesting static final int HTTP_TOO_MANY_REQUESTS = 429;
 
+  /**
+   * First-open time key name in GA user-properties. First-open time is a predefined user-dimension
+   * automatically collected by GA.
+   */
+  @VisibleForTesting static final String FIRST_OPEN_TIME_KEY = "_fot";
+
+  /** Custom Http header key to identify the fetch type. */
+  private static final String X_FIREBASE_RC_FETCH_TYPE = "X-Firebase-RC-Fetch-Type";
+
   private final FirebaseInstallationsApi firebaseInstallations;
   private final Provider<AnalyticsConnector> analyticsConnector;
 
@@ -110,7 +119,6 @@ public ConfigFetchHandler(
     this.fetchedConfigsCache = fetchedConfigsCache;
     this.frcBackendApiClient = frcBackendApiClient;
     this.frcMetadata = frcMetadata;
-
     this.customHttpHeaders = customHttpHeaders;
   }
 
@@ -151,13 +159,68 @@ public Task<FetchResponse> fetch() {
    *     updates, the {@link FetchResponse}'s configs will be {@code null}.
    */
   public Task<FetchResponse> fetch(long minimumFetchIntervalInSeconds) {
+
+    // Make a copy to prevent any concurrency issues between Fetches.
+    Map<String, String> copyOfCustomHttpHeaders = new HashMap<>(customHttpHeaders);
+    copyOfCustomHttpHeaders.put(X_FIREBASE_RC_FETCH_TYPE, FetchType.BASE.getValue() + "/" + 1);
+
     return fetchedConfigsCache
         .get()
         .continueWithTask(
             executor,
             (cachedFetchConfigsTask) ->
                 fetchIfCacheExpiredAndNotThrottled(
-                    cachedFetchConfigsTask, minimumFetchIntervalInSeconds));
+                    cachedFetchConfigsTask,
+                    minimumFetchIntervalInSeconds,
+                    copyOfCustomHttpHeaders));
+  }
+
+  /**
+   * Starts fetching configs from the Firebase Remote Config server.
+   *
+   * <p>Guarantees consistency between memory and disk; fetched configs are saved to memory only
+   * after they have been written to disk.
+   *
+   * <p>Fetches even if the read of the fetch cache fails (assumes there are no cached fetched
+   * configs in that case).
+   *
+   * <p>If the fetch request could not be created or there was error connecting to the server, the
+   * returned Task throws a {@link FirebaseRemoteConfigClientException}.
+   *
+   * <p>If the server responds with an error, the returned Task throws a {@link
+   * FirebaseRemoteConfigServerException}.
+   *
+   * <p>If any of the following is true, then the returned Task throws a {@link
+   * FirebaseRemoteConfigFetchThrottledException}:
+   *
+   * <ul>
+   *   <li>The backoff duration from a previous throttled exception has not expired,
+   *   <li>The backend responded with a throttled error, or
+   *   <li>The backend responded with unavailable errors for the last two fetch requests.
+   * </ul>
+   *
+   * @param {@link FetchType} and fetchAttemptNumber help detail what started the fetch call.
+   * @return A {@link Task} representing an immediate fetch call that returns a {@link
+   *     FetchResponse} with the configs fetched from the backend. If the backend was not called or
+   *     the backend had no updates, the {@link FetchResponse}'s configs will be {@code null}.
+   */
+  public Task<FetchResponse> fetchNowWithTypeAndAttemptNumber(
+      FetchType fetchType, int fetchAttemptNumber) {
+
+    // Make a copy to prevent any concurrency issues between Fetches.
+    Map<String, String> copyOfCustomHttpHeaders = new HashMap<>(customHttpHeaders);
+    copyOfCustomHttpHeaders.put(
+        X_FIREBASE_RC_FETCH_TYPE, fetchType.getValue() + "/" + fetchAttemptNumber);
+
+    return fetchedConfigsCache
+        .get()
+        .continueWithTask(
+            executor,
+            (cachedFetchConfigsTask) ->
+                fetchIfCacheExpiredAndNotThrottled(
+                    cachedFetchConfigsTask,
+                    /*minimumFetchIntervalInSeconds= */ 0,
+                    copyOfCustomHttpHeaders));
   }
 
   /**
@@ -168,7 +231,9 @@ public Task<FetchResponse> fetch(long minimumFetchIntervalInSeconds) {
    * fetch time and {@link BackoffMetadata} in {@link ConfigMetadataClient}.
    */
   private Task<FetchResponse> fetchIfCacheExpiredAndNotThrottled(
-      Task<ConfigContainer> cachedFetchConfigsTask, long minimumFetchIntervalInSeconds) {
+      Task<ConfigContainer> cachedFetchConfigsTask,
+      long minimumFetchIntervalInSeconds,
+      Map<String, String> customFetchHeaders) {
     Date currentTime = new Date(clock.currentTimeMillis());
     if (cachedFetchConfigsTask.isSuccessful()
         && areCachedFetchConfigsValid(minimumFetchIntervalInSeconds, currentTime)) {
@@ -213,7 +278,7 @@ && areCachedFetchConfigsValid(minimumFetchIntervalInSeconds, currentTime)) {
                     String installationId = installationIdTask.getResult();
                     String installationToken = installationAuthTokenTask.getResult().getToken();
                     return fetchFromBackendAndCacheResponse(
-                        installationId, installationToken, currentTime);
+                        installationId, installationToken, currentTime, customFetchHeaders);
                   });
     }
 
@@ -273,9 +338,13 @@ private String createThrottledMessage(long throttledDurationInMillis) {
    * {@code fetchedConfigsCache}.
    */
   private Task<FetchResponse> fetchFromBackendAndCacheResponse(
-      String installationId, String installationToken, Date fetchTime) {
+      String installationId,
+      String installationToken,
+      Date fetchTime,
+      Map<String, String> customFetchHeaders) {
     try {
-      FetchResponse fetchResponse = fetchFromBackend(installationId, installationToken, fetchTime);
+      FetchResponse fetchResponse =
+          fetchFromBackend(installationId, installationToken, fetchTime, customFetchHeaders);
       if (fetchResponse.getStatus() != Status.BACKEND_UPDATES_FETCHED) {
         return Tasks.forResult(fetchResponse);
       }
@@ -298,7 +367,10 @@ private Task<FetchResponse> fetchFromBackendAndCacheResponse(
    */
   @WorkerThread
   private FetchResponse fetchFromBackend(
-      String installationId, String installationToken, Date currentTime)
+      String installationId,
+      String installationToken,
+      Date currentTime,
+      Map<String, String> customFetchHeaders)
       throws FirebaseRemoteConfigException {
     try {
       HttpURLConnection urlConnection = frcBackendApiClient.createHttpURLConnection();
@@ -310,9 +382,14 @@ private FetchResponse fetchFromBackend(
               installationToken,
               getUserProperties(),
               frcMetadata.getLastFetchETag(),
-              customHttpHeaders,
+              customFetchHeaders,
+              getFirstOpenTime(),
               currentTime);
 
+      if (response.getFetchedConfigs() != null) {
+        // Set template version in metadata to be saved on disk.
+        frcMetadata.setLastTemplateVersion(response.getFetchedConfigs().getTemplateVersionNumber());
+      }
       if (response.getLastFetchETag() != null) {
         frcMetadata.setLastFetchETag(response.getLastFetchETag());
       }
@@ -492,8 +569,8 @@ private void updateLastFetchStatusAndTime(
   }
 
   /**
-   * Returns the list of user properties in Analytics. If the Analytics SDK is not available,
-   * returns an empty list.
+   * Returns the list of custom user properties in Analytics. If the Analytics SDK is not available,
+   * this method returns an empty list.
    */
   @WorkerThread
   private Map<String, String> getUserProperties() {
@@ -510,6 +587,24 @@ private Map<String, String> getUserProperties() {
     return userPropertiesMap;
   }
 
+  /**
+   * Returns first-open time from Analytics. If the Analytics SDK is not available, or if Analytics
+   * does not have first-open time for the app, this method returns null.
+   */
+  @WorkerThread
+  private Long getFirstOpenTime() {
+    AnalyticsConnector connector = this.analyticsConnector.get();
+    if (connector == null) {
+      return null;
+    }
+
+    return (Long) connector.getUserProperties(/*includeInternal=*/ true).get(FIRST_OPEN_TIME_KEY);
+  }
+
+  public long getTemplateVersionNumber() {
+    return frcMetadata.getLastTemplateVersion();
+  }
+
   /** Used to verify that the fetch handler is getting Analytics as expected. */
   @VisibleForTesting
   public Provider<AnalyticsConnector> getAnalyticsConnector() {
@@ -547,11 +642,14 @@ public static FetchResponse forBackendUpdatesFetched(
           lastFetchETag);
     }
 
-    public static FetchResponse forBackendHasNoUpdates(Date fetchTime) {
+    // Passing in param fetchedConfigs because it contains templateVersion but no other active
+    // fields.
+    public static FetchResponse forBackendHasNoUpdates(
+        Date fetchTime, ConfigContainer fetchedConfigs) {
       return new FetchResponse(
           fetchTime,
           Status.BACKEND_HAS_NO_UPDATES,
-          /*fetchedConfigs=*/ null,
+          /*fetchedConfigs=*/ fetchedConfigs,
           /*lastFetchETag=*/ null);
     }
 
@@ -595,4 +693,19 @@ public ConfigContainer getFetchedConfigs() {
       int LOCAL_STORAGE_USED = 2;
     }
   }
+
+  public enum FetchType {
+    BASE("BASE"),
+    REALTIME("REALTIME");
+
+    private final String value;
+
+    FetchType(String value) {
+      this.value = value;
+    }
+
+    String getValue() {
+      return value;
+    }
+  }
 }
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHttpClient.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHttpClient.java
index 196ea131283..b1867347580 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHttpClient.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHttpClient.java
@@ -21,6 +21,7 @@
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.APP_ID;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.APP_VERSION;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.COUNTRY_CODE;
+import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.FIRST_OPEN_TIME;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.INSTANCE_ID;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.INSTANCE_ID_TOKEN;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.LANGUAGE_CODE;
@@ -31,7 +32,9 @@
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.ENTRIES;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.EXPERIMENT_DESCRIPTIONS;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.PERSONALIZATION_METADATA;
+import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.ROLLOUT_METADATA;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.STATE;
+import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.TEMPLATE_VERSION_NUMBER;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import android.content.Context;
@@ -58,6 +61,7 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Locale;
@@ -92,6 +96,9 @@ public class ConfigFetchHttpClient {
   private final long connectTimeoutInSeconds;
   private final long readTimeoutInSeconds;
 
+  /** ISO-8601 UTC timestamp format. */
+  private static final String ISO_DATE_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+
   /** Creates a client for {@link #fetch}ing data from the Firebase Remote Config server. */
   public ConfigFetchHttpClient(
       Context context,
@@ -163,6 +170,7 @@ HttpURLConnection createHttpURLConnection() throws FirebaseRemoteConfigException
    *     server uses this ETag to determine if there has been a change in the response body since
    *     the last fetch.
    * @param customHeaders custom HTTP headers that will be sent to the FRC server.
+   * @param firstOpenTime first time the app was opened. This value comes from Google Analytics.
    * @param currentTime the current time on the device that is performing the fetch.
    */
   // TODO(issues/263): Set custom headers in ConfigFetchHttpClient's constructor.
@@ -174,6 +182,7 @@ FetchResponse fetch(
       Map<String, String> analyticsUserProperties,
       String lastFetchETag,
       Map<String, String> customHeaders,
+      Long firstOpenTime,
       Date currentTime)
       throws FirebaseRemoteConfigException {
     setUpUrlConnection(urlConnection, lastFetchETag, installationAuthToken, customHeaders);
@@ -182,7 +191,8 @@ FetchResponse fetch(
     JSONObject fetchResponse;
     try {
       byte[] requestBody =
-          createFetchRequestBody(installationId, installationAuthToken, analyticsUserProperties)
+          createFetchRequestBody(
+                  installationId, installationAuthToken, analyticsUserProperties, firstOpenTime)
               .toString()
               .getBytes("utf-8");
       setFetchRequestBody(urlConnection, requestBody);
@@ -207,12 +217,12 @@ FetchResponse fetch(
       } catch (IOException e) {
       }
     }
+    ConfigContainer fetchedConfigs = extractConfigs(fetchResponse, currentTime);
 
     if (!backendHasUpdates(fetchResponse)) {
-      return FetchResponse.forBackendHasNoUpdates(currentTime);
+      return FetchResponse.forBackendHasNoUpdates(currentTime, fetchedConfigs);
     }
 
-    ConfigContainer fetchedConfigs = extractConfigs(fetchResponse, currentTime);
     return FetchResponse.forBackendUpdatesFetched(fetchedConfigs, fetchResponseETag);
   }
 
@@ -292,7 +302,8 @@ private String getFingerprintHashForPackage() {
   private JSONObject createFetchRequestBody(
       String installationId,
       String installationAuthToken,
-      Map<String, String> analyticsUserProperties)
+      Map<String, String> analyticsUserProperties,
+      Long firstOpenTime)
       throws FirebaseRemoteConfigClientException {
     Map<String, Object> requestBodyMap = new HashMap<>();
 
@@ -315,7 +326,7 @@ private JSONObject createFetchRequestBody(
             : locale.toString();
     requestBodyMap.put(LANGUAGE_CODE, languageCode);
 
-    requestBodyMap.put(PLATFORM_VERSION, Integer.toString(android.os.Build.VERSION.SDK_INT));
+    requestBodyMap.put(PLATFORM_VERSION, Integer.toString(Build.VERSION.SDK_INT));
 
     requestBodyMap.put(TIME_ZONE, TimeZone.getDefault().getID());
 
@@ -336,9 +347,21 @@ private JSONObject createFetchRequestBody(
 
     requestBodyMap.put(ANALYTICS_USER_PROPERTIES, new JSONObject(analyticsUserProperties));
 
+    if (firstOpenTime != null) {
+      requestBodyMap.put(FIRST_OPEN_TIME, convertToISOString(firstOpenTime));
+    }
+
     return new JSONObject(requestBodyMap);
   }
 
+  private String convertToISOString(long millisFromEpoch) {
+    // ISO-8601 Timestamp expects Western Arabic numerals. Locale.US ensures that the english
+    // numerals are not converted to the local language numerals.
+    SimpleDateFormat isoDateFormat = new SimpleDateFormat(ISO_DATE_PATTERN, Locale.US);
+    isoDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+    return isoDateFormat.format(millisFromEpoch);
+  }
+
   private void setFetchRequestBody(HttpURLConnection urlConnection, byte[] requestBody)
       throws IOException {
     urlConnection.setFixedLengthStreamingMode(requestBody.length);
@@ -392,7 +415,7 @@ private static ConfigContainer extractConfigs(JSONObject fetchResponse, Date fet
         // Do nothing if entries do not exist.
       }
       if (entries != null) {
-        containerBuilder.replaceConfigsWith(entries);
+        containerBuilder = containerBuilder.replaceConfigsWith(entries);
       }
 
       JSONArray experimentDescriptions = null;
@@ -402,7 +425,7 @@ private static ConfigContainer extractConfigs(JSONObject fetchResponse, Date fet
         // Do nothing if entries do not exist.
       }
       if (experimentDescriptions != null) {
-        containerBuilder.withAbtExperiments(experimentDescriptions);
+        containerBuilder = containerBuilder.withAbtExperiments(experimentDescriptions);
       }
 
       JSONObject personalizationMetadata = null;
@@ -412,7 +435,26 @@ private static ConfigContainer extractConfigs(JSONObject fetchResponse, Date fet
         // Do nothing if personalizationMetadata does not exist.
       }
       if (personalizationMetadata != null) {
-        containerBuilder.withPersonalizationMetadata(personalizationMetadata);
+        containerBuilder = containerBuilder.withPersonalizationMetadata(personalizationMetadata);
+      }
+
+      String templateVersionNumber = null;
+      if (fetchResponse.has(TEMPLATE_VERSION_NUMBER)) {
+        templateVersionNumber = fetchResponse.getString(TEMPLATE_VERSION_NUMBER);
+      }
+
+      if (templateVersionNumber != null) {
+        containerBuilder.withTemplateVersionNumber(Long.parseLong(templateVersionNumber));
+      }
+
+      JSONArray rolloutMetadata = null;
+      try {
+        rolloutMetadata = fetchResponse.getJSONArray(ROLLOUT_METADATA);
+      } catch (JSONException e) {
+        // Do nothing if rolloutMetadata does not exist.
+      }
+      if (rolloutMetadata != null) {
+        containerBuilder = containerBuilder.withRolloutMetadata(rolloutMetadata);
       }
 
       return containerBuilder.build();
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigMetadataClient.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigMetadataClient.java
index abde7cf2470..dddcb24bdb8 100644
--- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigMetadataClient.java
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigMetadataClient.java
@@ -53,6 +53,7 @@ public class ConfigMetadataClient {
 
   static final Date LAST_FETCH_TIME_NO_FETCH_YET = new Date(LAST_FETCH_TIME_IN_MILLIS_NO_FETCH_YET);
 
+  static final int NO_FAILED_REALTIME_STREAMS = 0;
   @VisibleForTesting static final int NO_FAILED_FETCHES = 0;
   private static final long NO_BACKOFF_TIME_IN_MILLIS = -1L;
   @VisibleForTesting static final Date NO_BACKOFF_TIME = new Date(NO_BACKOFF_TIME_IN_MILLIS);
@@ -66,16 +67,25 @@ public class ConfigMetadataClient {
   private static final String LAST_FETCH_ETAG_KEY = "last_fetch_etag";
   private static final String BACKOFF_END_TIME_IN_MILLIS_KEY = "backoff_end_time_in_millis";
   private static final String NUM_FAILED_FETCHES_KEY = "num_failed_fetches";
+  private static final String LAST_TEMPLATE_VERSION = "last_template_version";
+
+  /** Realtime backoff key names. */
+  private static final String NUM_FAILED_REALTIME_STREAMS_KEY = "num_failed_realtime_streams";
+
+  private static final String REALTIME_BACKOFF_END_TIME_IN_MILLIS_KEY =
+      "realtime_backoff_end_time_in_millis";
 
   private final SharedPreferences frcMetadata;
 
   private final Object frcInfoLock;
   private final Object backoffMetadataLock;
+  private final Object realtimeBackoffMetadataLock;
 
   public ConfigMetadataClient(SharedPreferences frcMetadata) {
     this.frcMetadata = frcMetadata;
     this.frcInfoLock = new Object();
     this.backoffMetadataLock = new Object();
+    this.realtimeBackoffMetadataLock = new Object();
   }
 
   public long getFetchTimeoutInSeconds() {
@@ -103,6 +113,10 @@ String getLastFetchETag() {
     return frcMetadata.getString(LAST_FETCH_ETAG_KEY, null);
   }
 
+  long getLastTemplateVersion() {
+    return frcMetadata.getLong(LAST_TEMPLATE_VERSION, 0);
+  }
+
   public FirebaseRemoteConfigInfo getInfo() {
     // A lock is used here to prevent the setters in this class from changing the state of
     // frcMetadata during a getInfo call.
@@ -207,6 +221,12 @@ void setLastFetchETag(String eTag) {
     }
   }
 
+  void setLastTemplateVersion(long templateVersion) {
+    synchronized (frcInfoLock) {
+      frcMetadata.edit().putLong(LAST_TEMPLATE_VERSION, templateVersion).apply();
+    }
+  }
+
   // -----------------------------------------------------------------
   // Exponential backoff logic.
   // -----------------------------------------------------------------
@@ -257,4 +277,60 @@ Date getBackoffEndTime() {
       return backoffEndTime;
     }
   }
+
+  // -----------------------------------------------------------------
+  // Realtime exponential backoff logic.
+  // -----------------------------------------------------------------
+
+  @VisibleForTesting
+  public RealtimeBackoffMetadata getRealtimeBackoffMetadata() {
+    synchronized (realtimeBackoffMetadataLock) {
+      return new RealtimeBackoffMetadata(
+          frcMetadata.getInt(NUM_FAILED_REALTIME_STREAMS_KEY, NO_FAILED_REALTIME_STREAMS),
+          new Date(
+              frcMetadata.getLong(
+                  REALTIME_BACKOFF_END_TIME_IN_MILLIS_KEY, NO_BACKOFF_TIME_IN_MILLIS)));
+    }
+  }
+
+  void setRealtimeBackoffMetadata(int numFailedStreams, Date backoffEndTime) {
+    synchronized (realtimeBackoffMetadataLock) {
+      frcMetadata
+          .edit()
+          .putInt(NUM_FAILED_REALTIME_STREAMS_KEY, numFailedStreams)
+          .putLong(REALTIME_BACKOFF_END_TIME_IN_MILLIS_KEY, backoffEndTime.getTime())
+          .apply();
+    }
+  }
+
+  void resetRealtimeBackoff() {
+    setRealtimeBackoffMetadata(NO_FAILED_REALTIME_STREAMS, NO_BACKOFF_TIME);
+  }
+
+  /**
+   * Container for backoff metadata values such as the number of failed streams and the backoff end
+   * time.
+   *
+   * <p>The purpose of this class is to avoid race conditions when retrieving backoff metadata
+   * values separately.
+   */
+  @VisibleForTesting
+  public static class RealtimeBackoffMetadata {
+    private int numFailedStreams;
+    private Date backoffEndTime;
+
+    @VisibleForTesting
+    public RealtimeBackoffMetadata(int numFailedStreams, Date backoffEndTime) {
+      this.numFailedStreams = numFailedStreams;
+      this.backoffEndTime = backoffEndTime;
+    }
+
+    int getNumFailedStreams() {
+      return numFailedStreams;
+    }
+
+    Date getBackoffEndTime() {
+      return backoffEndTime;
+    }
+  }
 }
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigRealtimeHandler.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigRealtimeHandler.java
new file mode 100644
index 00000000000..53f89a71e8c
--- /dev/null
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigRealtimeHandler.java
@@ -0,0 +1,116 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.remoteconfig.internal;
+
+import android.content.Context;
+import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.installations.FirebaseInstallationsApi;
+import com.google.firebase.remoteconfig.ConfigUpdateListener;
+import com.google.firebase.remoteconfig.ConfigUpdateListenerRegistration;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.concurrent.ScheduledExecutorService;
+
+public class ConfigRealtimeHandler {
+
+  @GuardedBy("this")
+  private final Set<ConfigUpdateListener> listeners;
+
+  @GuardedBy("this")
+  private final ConfigRealtimeHttpClient configRealtimeHttpClient;
+
+  private final ConfigFetchHandler configFetchHandler;
+  private final FirebaseApp firebaseApp;
+  private final FirebaseInstallationsApi firebaseInstallations;
+  private final ConfigCacheClient activatedCacheClient;
+  private final Context context;
+  private final String namespace;
+  private final ConfigMetadataClient metadataClient;
+  private final ScheduledExecutorService scheduledExecutorService;
+
+  public ConfigRealtimeHandler(
+      FirebaseApp firebaseApp,
+      FirebaseInstallationsApi firebaseInstallations,
+      ConfigFetchHandler configFetchHandler,
+      ConfigCacheClient activatedCacheClient,
+      Context context,
+      String namespace,
+      ConfigMetadataClient metadataClient,
+      ScheduledExecutorService scheduledExecutorService) {
+
+    this.listeners = new LinkedHashSet<>();
+    this.configRealtimeHttpClient =
+        new ConfigRealtimeHttpClient(
+            firebaseApp,
+            firebaseInstallations,
+            configFetchHandler,
+            activatedCacheClient,
+            context,
+            namespace,
+            listeners,
+            metadataClient,
+            scheduledExecutorService);
+
+    this.firebaseApp = firebaseApp;
+    this.configFetchHandler = configFetchHandler;
+    this.firebaseInstallations = firebaseInstallations;
+    this.activatedCacheClient = activatedCacheClient;
+    this.context = context;
+    this.namespace = namespace;
+    this.metadataClient = metadataClient;
+    this.scheduledExecutorService = scheduledExecutorService;
+  }
+
+  // Kicks off Http stream listening and autofetch
+  private synchronized void beginRealtime() {
+    if (!listeners.isEmpty()) {
+      configRealtimeHttpClient.startHttpConnection();
+    }
+  }
+
+  @NonNull
+  public synchronized ConfigUpdateListenerRegistration addRealtimeConfigUpdateListener(
+      @NonNull ConfigUpdateListener configUpdateListener) {
+    listeners.add(configUpdateListener);
+    beginRealtime();
+    return new ConfigUpdateListenerRegistrationInternal(configUpdateListener);
+  }
+
+  public synchronized void setBackgroundState(boolean isInBackground) {
+    configRealtimeHttpClient.setRealtimeBackgroundState(isInBackground);
+    if (!isInBackground) {
+      beginRealtime();
+    }
+  }
+
+  private synchronized void removeRealtimeConfigUpdateListener(ConfigUpdateListener listener) {
+    listeners.remove(listener);
+  }
+
+  public class ConfigUpdateListenerRegistrationInternal
+      implements ConfigUpdateListenerRegistration {
+    private final ConfigUpdateListener listener;
+
+    public ConfigUpdateListenerRegistrationInternal(ConfigUpdateListener listener) {
+      this.listener = listener;
+    }
+
+    public void remove() {
+      removeRealtimeConfigUpdateListener(listener);
+    }
+  }
+}
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigRealtimeHttpClient.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigRealtimeHttpClient.java
new file mode 100644
index 00000000000..ef0ef2defc5
--- /dev/null
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigRealtimeHttpClient.java
@@ -0,0 +1,579 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.remoteconfig.internal;
+
+import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.TAG;
+import static com.google.firebase.remoteconfig.RemoteConfigConstants.REALTIME_REGEX_URL;
+import static com.google.firebase.remoteconfig.internal.ConfigFetchHandler.HTTP_TOO_MANY_REQUESTS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.util.Log;
+import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import com.google.android.gms.common.util.AndroidUtilsLight;
+import com.google.android.gms.common.util.Clock;
+import com.google.android.gms.common.util.DefaultClock;
+import com.google.android.gms.common.util.Hex;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.installations.FirebaseInstallationsApi;
+import com.google.firebase.installations.InstallationTokenResult;
+import com.google.firebase.remoteconfig.BuildConfig;
+import com.google.firebase.remoteconfig.ConfigUpdate;
+import com.google.firebase.remoteconfig.ConfigUpdateListener;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigClientException;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigException;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigServerException;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.json.JSONObject;
+
+public class ConfigRealtimeHttpClient {
+  /**
+   * The exponential backoff intervals, up to ~4 hours.
+   *
+   * <p>Every value must be even.
+   */
+  @VisibleForTesting
+  static final int[] BACKOFF_TIME_DURATIONS_IN_MINUTES = {2, 4, 8, 16, 32, 64, 128, 256};
+
+  /**
+   * A regular expression for the GMP App Id format. The first group (index 1) is the project
+   * number.
+   */
+  private static final Pattern GMP_APP_ID_PATTERN =
+      Pattern.compile("^[^:]+:([0-9]+):(android|ios|web):([0-9a-f]+)");
+
+  private static final String API_KEY_HEADER = "X-Goog-Api-Key";
+  private static final String X_ANDROID_PACKAGE_HEADER = "X-Android-Package";
+  private static final String X_ANDROID_CERT_HEADER = "X-Android-Cert";
+  private static final String X_GOOGLE_GFE_CAN_RETRY = "X-Google-GFE-Can-Retry";
+  private static final String INSTALLATIONS_AUTH_TOKEN_HEADER =
+      "X-Goog-Firebase-Installations-Auth";
+  private static final String X_ACCEPT_RESPONSE_STREAMING = "X-Accept-Response-Streaming";
+
+  @GuardedBy("this")
+  private final Set<ConfigUpdateListener> listeners;
+
+  @GuardedBy("this")
+  private boolean isHttpConnectionRunning;
+
+  @GuardedBy("this")
+  private int httpRetriesRemaining;
+
+  @GuardedBy("this")
+  private boolean isRealtimeDisabled;
+
+  /** Flag to indicate whether or not the app is in the background or not. */
+  private boolean isInBackground;
+
+  private final int ORIGINAL_RETRIES = 8;
+  private final ScheduledExecutorService scheduledExecutorService;
+  private final ConfigFetchHandler configFetchHandler;
+  private final FirebaseApp firebaseApp;
+  private final FirebaseInstallationsApi firebaseInstallations;
+  ConfigCacheClient activatedCache;
+  private final Context context;
+  private final String namespace;
+  private final Random random;
+  private final Clock clock;
+  private final ConfigMetadataClient metadataClient;
+
+  public ConfigRealtimeHttpClient(
+      FirebaseApp firebaseApp,
+      FirebaseInstallationsApi firebaseInstallations,
+      ConfigFetchHandler configFetchHandler,
+      ConfigCacheClient activatedCache,
+      Context context,
+      String namespace,
+      Set<ConfigUpdateListener> listeners,
+      ConfigMetadataClient metadataClient,
+      ScheduledExecutorService scheduledExecutorService) {
+
+    this.listeners = listeners;
+    this.isHttpConnectionRunning = false;
+    this.scheduledExecutorService = scheduledExecutorService;
+
+    // Retry parameters
+    this.random = new Random();
+    // Retrieve number of remaining retries from last session. The minimum retry count being one.
+    httpRetriesRemaining =
+        Math.max(
+            ORIGINAL_RETRIES - metadataClient.getRealtimeBackoffMetadata().getNumFailedStreams(),
+            1);
+    clock = DefaultClock.getInstance();
+
+    this.firebaseApp = firebaseApp;
+    this.configFetchHandler = configFetchHandler;
+    this.firebaseInstallations = firebaseInstallations;
+    this.activatedCache = activatedCache;
+    this.context = context;
+    this.namespace = namespace;
+    this.metadataClient = metadataClient;
+    this.isRealtimeDisabled = false;
+    this.isInBackground = false;
+  }
+
+  private static String extractProjectNumberFromAppId(String gmpAppId) {
+    Matcher matcher = GMP_APP_ID_PATTERN.matcher(gmpAppId);
+    return matcher.matches() ? matcher.group(1) : null;
+  }
+
+  /** Gets the Android package's SHA-1 fingerprint. */
+  private String getFingerprintHashForPackage() {
+    byte[] hash;
+
+    try {
+      hash =
+          AndroidUtilsLight.getPackageCertificateHashBytes(
+              this.context, this.context.getPackageName());
+      if (hash == null) {
+        Log.e(TAG, "Could not get fingerprint hash for package: " + this.context.getPackageName());
+        return null;
+      } else {
+        return Hex.bytesToStringUppercase(hash, /* zeroTerminated= */ false);
+      }
+    } catch (PackageManager.NameNotFoundException e) {
+      Log.i(TAG, "No such package: " + this.context.getPackageName());
+      return null;
+    }
+  }
+
+  private void setCommonRequestHeaders(HttpURLConnection httpURLConnection, String authToken) {
+    // Auth token
+    httpURLConnection.setRequestProperty(INSTALLATIONS_AUTH_TOKEN_HEADER, authToken);
+
+    // API Key
+    httpURLConnection.setRequestProperty(API_KEY_HEADER, this.firebaseApp.getOptions().getApiKey());
+
+    // Headers required for Android API Key Restrictions.
+    httpURLConnection.setRequestProperty(X_ANDROID_PACKAGE_HEADER, context.getPackageName());
+    httpURLConnection.setRequestProperty(X_ANDROID_CERT_HEADER, getFingerprintHashForPackage());
+
+    // Header to denote request is retryable on the server.
+    httpURLConnection.setRequestProperty(X_GOOGLE_GFE_CAN_RETRY, "yes");
+
+    // Header to tell server that client expects stream response
+    httpURLConnection.setRequestProperty(X_ACCEPT_RESPONSE_STREAMING, "true");
+
+    // Headers to denote that the request body is a JSONObject.
+    httpURLConnection.setRequestProperty("Content-Type", "application/json");
+    httpURLConnection.setRequestProperty("Accept", "application/json");
+  }
+
+  private JSONObject createRequestBody(String installationId) {
+    Map<String, String> body = new HashMap<>();
+    body.put(
+        "project", extractProjectNumberFromAppId(this.firebaseApp.getOptions().getApplicationId()));
+    body.put("namespace", this.namespace);
+    body.put(
+        "lastKnownVersionNumber", Long.toString(configFetchHandler.getTemplateVersionNumber()));
+    body.put("appId", firebaseApp.getOptions().getApplicationId());
+    body.put("sdkVersion", BuildConfig.VERSION_NAME);
+    body.put("appInstanceId", installationId);
+
+    return new JSONObject(body);
+  }
+
+  @SuppressLint("VisibleForTests")
+  public void setRequestParams(
+      HttpURLConnection httpURLConnection, String installationId, String authtoken)
+      throws IOException {
+    httpURLConnection.setRequestMethod("POST");
+    setCommonRequestHeaders(httpURLConnection, authtoken);
+    byte[] body = createRequestBody(installationId).toString().getBytes("utf-8");
+    OutputStream outputStream = new BufferedOutputStream(httpURLConnection.getOutputStream());
+    outputStream.write(body);
+    outputStream.flush();
+    outputStream.close();
+  }
+
+  private synchronized void propagateErrors(FirebaseRemoteConfigException exception) {
+    for (ConfigUpdateListener listener : listeners) {
+      listener.onError(exception);
+    }
+  }
+
+  // Used for Tests only.
+  @SuppressLint("VisibleForTests")
+  public int getNumberOfFailedStreams() {
+    return metadataClient.getRealtimeBackoffMetadata().getNumFailedStreams();
+  }
+
+  // Used for Tests only.
+  @SuppressLint("VisibleForTests")
+  public Date getBackoffEndTime() {
+    return metadataClient.getRealtimeBackoffMetadata().getBackoffEndTime();
+  }
+
+  // TODO(issues/265): Make this an atomic operation within the Metadata class to avoid possible
+  // concurrency issues.
+  /**
+   * Increment the number of failed stream attempts, increase the backoff duration, set the backoff
+   * end time to "backoff duration" after {@code lastFailedRealtimeStreamTime} and persist the new
+   * values to disk-backed metadata.
+   */
+  private void updateBackoffMetadataWithLastFailedStreamConnectionTime(
+      Date lastFailedRealtimeStreamTime) {
+    int numFailedStreams = metadataClient.getRealtimeBackoffMetadata().getNumFailedStreams();
+
+    numFailedStreams++;
+
+    long backoffDurationInMillis = getRandomizedBackoffDurationInMillis(numFailedStreams);
+    Date backoffEndTime =
+        new Date(lastFailedRealtimeStreamTime.getTime() + backoffDurationInMillis);
+
+    metadataClient.setRealtimeBackoffMetadata(numFailedStreams, backoffEndTime);
+  }
+
+  /**
+   * Returns a random backoff duration from the range {@code timeoutDuration} +/- 50% of {@code
+   * timeoutDuration}, where {@code timeoutDuration = }{@link
+   * #BACKOFF_TIME_DURATIONS_IN_MINUTES}{@code [numFailedStreams-1]}.
+   */
+  private long getRandomizedBackoffDurationInMillis(int numFailedStreams) {
+    int backoffIndex = BACKOFF_TIME_DURATIONS_IN_MINUTES.length;
+    if (numFailedStreams < backoffIndex) {
+      backoffIndex = numFailedStreams;
+    }
+
+    // The backoff duration length after numFailedStreams.
+    long timeOutDurationInMillis =
+        MINUTES.toMillis(BACKOFF_TIME_DURATIONS_IN_MINUTES[backoffIndex - 1]);
+
+    // A random duration that is in the range: timeOutDuration +/- 50% of timeOutDuration.
+    return timeOutDurationInMillis / 2 + random.nextInt((int) timeOutDurationInMillis);
+  }
+
+  private synchronized void enableBackoff() {
+    this.isRealtimeDisabled = true;
+  }
+
+  private synchronized boolean canMakeHttpStreamConnection() {
+    return !listeners.isEmpty()
+        && !isHttpConnectionRunning
+        && !isRealtimeDisabled
+        && !isInBackground;
+  }
+
+  private String getRealtimeURL(String namespace) {
+    return String.format(
+        REALTIME_REGEX_URL,
+        extractProjectNumberFromAppId(firebaseApp.getOptions().getApplicationId()),
+        namespace);
+  }
+
+  private URL getUrl() {
+    URL realtimeURL = null;
+    try {
+      realtimeURL = new URL(getRealtimeURL(namespace));
+    } catch (MalformedURLException ex) {
+      Log.e(TAG, "URL is malformed");
+    }
+
+    return realtimeURL;
+  }
+
+  /** Create HTTP connection and set headers. */
+  @SuppressLint("VisibleForTests")
+  public Task<HttpURLConnection> createRealtimeConnection() {
+    // Make async call to get auth token.
+    Task<InstallationTokenResult> installationAuthTokenTask = firebaseInstallations.getToken(false);
+    // Make async call to get FID.
+    Task<String> installationIdTask = firebaseInstallations.getId();
+    // When the auth token task has finished, set up HTTP connection with headers and params.
+    return Tasks.whenAllComplete(installationAuthTokenTask, installationIdTask)
+        .continueWithTask(
+            this.scheduledExecutorService,
+            (unusedCompletedInstallationTasks) -> {
+              if (!installationAuthTokenTask.isSuccessful()) {
+                return Tasks.forException(
+                    new FirebaseRemoteConfigClientException(
+                        "Firebase Installations failed to get installation auth token for config update listener connection.",
+                        installationAuthTokenTask.getException()));
+              }
+              if (!installationIdTask.isSuccessful()) {
+                return Tasks.forException(
+                    new FirebaseRemoteConfigClientException(
+                        "Firebase Installations failed to get installation ID for config update listener connection.",
+                        installationIdTask.getException()));
+              }
+
+              HttpURLConnection httpURLConnection;
+              try {
+                URL realtimeUrl = getUrl();
+                httpURLConnection = (HttpURLConnection) realtimeUrl.openConnection();
+
+                String installationAuthToken = installationAuthTokenTask.getResult().getToken();
+                String installationId = installationIdTask.getResult();
+                setRequestParams(httpURLConnection, installationId, installationAuthToken);
+              } catch (IOException ex) {
+                return Tasks.forException(
+                    new FirebaseRemoteConfigClientException(
+                        "Failed to open HTTP stream connection", ex));
+              }
+
+              return Tasks.forResult(httpURLConnection);
+            });
+  }
+
+  /** Initial Http stream attempt that makes call without waiting. */
+  public void startHttpConnection() {
+    makeRealtimeHttpConnection(/*retrySeconds*/ 0);
+  }
+
+  /** Retries HTTP stream connection asyncly in random time intervals. */
+  @SuppressLint("VisibleForTests")
+  public synchronized void retryHttpConnectionWhenBackoffEnds() {
+    Date currentTime = new Date(clock.currentTimeMillis());
+    long retrySeconds =
+        Math.max(
+            0,
+            metadataClient.getRealtimeBackoffMetadata().getBackoffEndTime().getTime()
+                - currentTime.getTime());
+    makeRealtimeHttpConnection(retrySeconds);
+  }
+
+  private synchronized void makeRealtimeHttpConnection(long retryMilliseconds) {
+    if (!canMakeHttpStreamConnection()) {
+      return;
+    }
+
+    if (httpRetriesRemaining > 0) {
+      httpRetriesRemaining--;
+      scheduledExecutorService.schedule(
+          new Runnable() {
+            @Override
+            public void run() {
+              beginRealtimeHttpStream();
+            }
+          },
+          retryMilliseconds,
+          TimeUnit.MILLISECONDS);
+    } else if (!isInBackground) {
+      propagateErrors(
+          new FirebaseRemoteConfigClientException(
+              "Unable to connect to the server. Check your connection and try again.",
+              FirebaseRemoteConfigException.Code.CONFIG_UPDATE_STREAM_ERROR));
+    }
+  }
+
+  void setRealtimeBackgroundState(boolean backgroundState) {
+    isInBackground = backgroundState;
+  }
+
+  private synchronized void resetRetryCount() {
+    httpRetriesRemaining = ORIGINAL_RETRIES;
+  }
+
+  private synchronized void setIsHttpConnectionRunning(boolean connectionRunning) {
+    isHttpConnectionRunning = connectionRunning;
+  }
+
+  /**
+   * Create Autofetch class that listens on HTTP stream for ConfigUpdate messages and calls Fetch
+   * accordingly.
+   */
+  @SuppressLint("VisibleForTests")
+  public synchronized ConfigAutoFetch startAutoFetch(HttpURLConnection httpURLConnection) {
+    ConfigUpdateListener retryCallback =
+        new ConfigUpdateListener() {
+          @Override
+          public void onUpdate(@NonNull ConfigUpdate configUpdate) {}
+
+          // This method will only be called when a realtimeDisabled message is sent down the
+          // stream.
+          @Override
+          public void onError(@NonNull FirebaseRemoteConfigException error) {
+            enableBackoff();
+            propagateErrors(error);
+          }
+        };
+
+    return new ConfigAutoFetch(
+        httpURLConnection,
+        configFetchHandler,
+        activatedCache,
+        listeners,
+        retryCallback,
+        scheduledExecutorService);
+  }
+
+  // HTTP status code that the Realtime client should retry on.
+  private boolean isStatusCodeRetryable(int statusCode) {
+    return statusCode == HttpURLConnection.HTTP_CLIENT_TIMEOUT
+        || statusCode == HTTP_TOO_MANY_REQUESTS
+        || statusCode == HttpURLConnection.HTTP_BAD_GATEWAY
+        || statusCode == HttpURLConnection.HTTP_UNAVAILABLE
+        || statusCode == HttpURLConnection.HTTP_GATEWAY_TIMEOUT;
+  }
+
+  private String parseForbiddenErrorResponseMessage(InputStream inputStream) {
+    StringBuilder response = new StringBuilder();
+
+    try {
+      BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+      String message = "";
+      while ((message = bufferedReader.readLine()) != null) {
+        response.append(message);
+      }
+    } catch (IOException ex) {
+      // Unable to parse error message.
+      if (response.length() == 0) {
+        return "Unable to connect to the server, access is forbidden. HTTP status code: 403";
+      }
+    }
+
+    return response.toString();
+  }
+
+  /**
+   * Open the real-time connection, begin listening for updates, and auto-fetch when an update is
+   * received.
+   *
+   * <p>If the connection is successful, this method will block on its thread while it reads the
+   * chunk-encoded HTTP body. When the connection closes, it attempts to reestablish the stream.
+   */
+  @SuppressLint({"VisibleForTests", "DefaultLocale"})
+  public void beginRealtimeHttpStream() {
+    if (!canMakeHttpStreamConnection()) {
+      return;
+    }
+
+    ConfigMetadataClient.RealtimeBackoffMetadata backoffMetadata =
+        metadataClient.getRealtimeBackoffMetadata();
+    Date currentTime = new Date(clock.currentTimeMillis());
+    if (currentTime.before(backoffMetadata.getBackoffEndTime())) {
+      retryHttpConnectionWhenBackoffEnds();
+      return;
+    }
+
+    // Make async call to create and setup HTTP connection.
+    Task<HttpURLConnection> httpURLConnectionTask = createRealtimeConnection();
+    // When the connection task has finished, begin real-time actions.
+    Tasks.whenAllComplete(httpURLConnectionTask)
+        .continueWith(
+            this.scheduledExecutorService,
+            (completedHttpUrlConnectionTask) -> {
+              Integer responseCode = null;
+              HttpURLConnection httpURLConnection = null;
+
+              try {
+                // If HTTP connection task failed throw exception to move to the catch block.
+                if (!httpURLConnectionTask.isSuccessful()) {
+                  throw new IOException(httpURLConnectionTask.getException());
+                }
+                setIsHttpConnectionRunning(true);
+
+                // Get HTTP connection and check response code.
+                httpURLConnection = httpURLConnectionTask.getResult();
+                responseCode = httpURLConnection.getResponseCode();
+
+                // If the connection returned a 200 response code, start listening for messages.
+                if (responseCode == HttpURLConnection.HTTP_OK) {
+                  // Reset the retries remaining if we opened the connection without an exception.
+                  resetRetryCount();
+                  metadataClient.resetRealtimeBackoff();
+
+                  // Start listening for realtime notifications.
+                  ConfigAutoFetch configAutoFetch = startAutoFetch(httpURLConnection);
+                  configAutoFetch.listenForNotifications();
+                }
+              } catch (IOException e) {
+                // Stream could not be open due to a transient issue and the system will retry the
+                // connection
+                // without user intervention.
+                Log.d(
+                    TAG,
+                    "Exception connecting to real-time RC backend. Retrying the connection...",
+                    e);
+              } finally {
+                closeRealtimeHttpStream(httpURLConnection);
+                setIsHttpConnectionRunning(false);
+
+                boolean connectionFailed =
+                    responseCode == null || isStatusCodeRetryable(responseCode);
+                if (connectionFailed) {
+                  updateBackoffMetadataWithLastFailedStreamConnectionTime(
+                      new Date(clock.currentTimeMillis()));
+                }
+
+                // If responseCode is null then no connection was made to server and the SDK should
+                // still
+                // retry.
+                if (connectionFailed || responseCode == HttpURLConnection.HTTP_OK) {
+                  retryHttpConnectionWhenBackoffEnds();
+                } else {
+                  String errorMessage =
+                      String.format(
+                          "Unable to connect to the server. Try again in a few minutes. HTTP status code: %d",
+                          responseCode);
+                  // Return server message for when the Firebase Remote Config Realtime API is
+                  // disabled and
+                  // the server returns a 403
+                  if (responseCode == 403) {
+                    errorMessage =
+                        parseForbiddenErrorResponseMessage(httpURLConnection.getErrorStream());
+                  }
+                  propagateErrors(
+                      new FirebaseRemoteConfigServerException(
+                          responseCode,
+                          errorMessage,
+                          FirebaseRemoteConfigException.Code.CONFIG_UPDATE_STREAM_ERROR));
+                }
+              }
+
+              return Tasks.forResult(null);
+            });
+  }
+
+  // Pauses Http stream listening
+  public void closeRealtimeHttpStream(HttpURLConnection httpURLConnection) {
+    if (httpURLConnection != null) {
+      httpURLConnection.disconnect();
+
+      // Explicitly close the input stream due to a bug in the Android okhttp implementation.
+      // See github.com/firebase/firebase-android-sdk/pull/808.
+      try {
+        httpURLConnection.getInputStream().close();
+        if (httpURLConnection.getErrorStream() != null) {
+          httpURLConnection.getErrorStream().close();
+        }
+      } catch (IOException e) {
+      }
+    }
+  }
+}
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/rollouts/RolloutsStateFactory.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/rollouts/RolloutsStateFactory.java
new file mode 100644
index 00000000000..820627f88dd
--- /dev/null
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/rollouts/RolloutsStateFactory.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.internal.rollouts;
+
+import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.DEFAULT_VALUE_FOR_STRING;
+import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.TAG;
+import static com.google.firebase.remoteconfig.internal.ConfigContainer.ROLLOUT_METADATA_AFFECTED_KEYS;
+import static com.google.firebase.remoteconfig.internal.ConfigContainer.ROLLOUT_METADATA_ID;
+import static com.google.firebase.remoteconfig.internal.ConfigContainer.ROLLOUT_METADATA_VARIANT_ID;
+
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigClientException;
+import com.google.firebase.remoteconfig.internal.ConfigCacheClient;
+import com.google.firebase.remoteconfig.internal.ConfigContainer;
+import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutsState;
+import java.util.HashSet;
+import java.util.Set;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class RolloutsStateFactory {
+  ConfigCacheClient activatedConfigsCache;
+  ConfigCacheClient defaultConfigsCache;
+
+  RolloutsStateFactory(
+      ConfigCacheClient activatedConfigsCache, ConfigCacheClient defaultConfigsCache) {
+    this.activatedConfigsCache = activatedConfigsCache;
+    this.defaultConfigsCache = defaultConfigsCache;
+  }
+
+  @NonNull
+  RolloutsState getActiveRolloutsState(@NonNull ConfigContainer configContainer)
+      throws FirebaseRemoteConfigClientException {
+    JSONArray rolloutMetadata = configContainer.getRolloutMetadata();
+    long templateVersion = configContainer.getTemplateVersionNumber();
+
+    Set<RolloutAssignment> rolloutAssignments = new HashSet<>();
+    for (int i = 0; i < rolloutMetadata.length(); i++) {
+      try {
+        JSONObject rollout = rolloutMetadata.getJSONObject(i);
+        String rolloutId = rollout.getString(ROLLOUT_METADATA_ID);
+        JSONArray affectedParameterKeys = rollout.getJSONArray(ROLLOUT_METADATA_AFFECTED_KEYS);
+
+        if (affectedParameterKeys.length() > 1) {
+          Log.w(
+              TAG,
+              String.format(
+                  "Rollout has multiple affected parameter keys."
+                      + "Only the first key will be included in RolloutsState. "
+                      + "rolloutId: %s, affectedParameterKeys: %s",
+                  rolloutId, affectedParameterKeys));
+        }
+
+        // Fallback to empty string if (for some reason) there's no affected parameter key.
+        String parameterKey = affectedParameterKeys.optString(0, "");
+        String parameterValue = getParameterValue(parameterKey);
+
+        rolloutAssignments.add(
+            RolloutAssignment.builder()
+                .setRolloutId(rolloutId)
+                .setVariantId(rollout.getString(ROLLOUT_METADATA_VARIANT_ID))
+                .setParameterKey(parameterKey)
+                .setParameterValue(parameterValue)
+                .setTemplateVersion(templateVersion)
+                .build());
+      } catch (JSONException e) {
+        throw new FirebaseRemoteConfigClientException(
+            "Exception parsing rollouts metadata to create RolloutsState.", e);
+      }
+    }
+
+    return RolloutsState.create(rolloutAssignments);
+  }
+
+  /**
+   * Returns the parameter value of the given parameter key as a {@link String}.
+   *
+   * <p>The logic in {@link ConfigGetParameterHandler#getString} is duplicated here without the side
+   * effect of calling listeners (ex. logging Personalizations in Google Analytics).
+   *
+   * @param key A Firebase Remote Config parameter key.
+   */
+  @NonNull
+  private String getParameterValue(@NonNull String key) {
+    String activatedString = getStringFromCache(activatedConfigsCache, key);
+    if (activatedString != null) {
+      return activatedString;
+    }
+
+    String defaultsString = getStringFromCache(defaultConfigsCache, key);
+    if (defaultsString != null) {
+      return defaultsString;
+    }
+
+    return DEFAULT_VALUE_FOR_STRING;
+  }
+
+  /**
+   * Returns the FRC parameter value for the given key in the given cache as a {@link String}, or
+   * {@code null} if the key does not exist in the cache.
+   *
+   * <p>This method is duplicated from {@link ConfigGetParameterHandler}. Future work might move the
+   * ConfigCacheClient helpers into {@link ConfigCacheClient}.
+   *
+   * @param cacheClient the cache client the parameter is stored in.
+   * @param key the FRC parameter key.
+   */
+  @Nullable
+  private static String getStringFromCache(
+      @NonNull ConfigCacheClient cacheClient, @NonNull String key) {
+    ConfigContainer cachedContainer = cacheClient.getBlocking();
+    if (cachedContainer == null) {
+      return null;
+    }
+
+    try {
+      return cachedContainer.getConfigs().getString(key);
+    } catch (JSONException ignored) {
+      return null;
+    }
+  }
+
+  @NonNull
+  public static RolloutsStateFactory create(
+      @NonNull ConfigCacheClient activatedConfigsCache,
+      @NonNull ConfigCacheClient defaultConfigsCache) {
+    return new RolloutsStateFactory(activatedConfigsCache, defaultConfigsCache);
+  }
+}
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/rollouts/RolloutsStateSubscriptionsHandler.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/rollouts/RolloutsStateSubscriptionsHandler.java
new file mode 100644
index 00000000000..4ee66f2d55a
--- /dev/null
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/rollouts/RolloutsStateSubscriptionsHandler.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.internal.rollouts;
+
+import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.TAG;
+
+import android.util.Log;
+import androidx.annotation.NonNull;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigException;
+import com.google.firebase.remoteconfig.internal.ConfigCacheClient;
+import com.google.firebase.remoteconfig.internal.ConfigContainer;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutsState;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutsStateSubscriber;
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+
+public class RolloutsStateSubscriptionsHandler {
+  private ConfigCacheClient activatedConfigsCache;
+  private RolloutsStateFactory rolloutsStateFactory;
+  private Executor executor;
+
+  // Thread-safe implementation for subscribers, using a ConcurrentHashMap as the underlying
+  // implementation with set-like accessors.
+  private Set<RolloutsStateSubscriber> subscribers =
+      Collections.newSetFromMap(new ConcurrentHashMap<>());
+
+  public RolloutsStateSubscriptionsHandler(
+      @NonNull ConfigCacheClient activatedConfigsCache,
+      @NonNull RolloutsStateFactory rolloutsStateFactory,
+      @NonNull Executor executor) {
+    this.activatedConfigsCache = activatedConfigsCache;
+    this.rolloutsStateFactory = rolloutsStateFactory;
+    this.executor = executor;
+  }
+
+  public void registerRolloutsStateSubscriber(@NonNull RolloutsStateSubscriber subscriber) {
+    subscribers.add(subscriber);
+
+    Task<ConfigContainer> activatedConfigsCacheTask = activatedConfigsCache.get();
+
+    activatedConfigsCacheTask.addOnSuccessListener(
+        executor,
+        unused -> {
+          try {
+            ConfigContainer activatedConfigsCache = activatedConfigsCacheTask.getResult();
+
+            // If we try to read the cache before the Remote Config component has started up,
+            // the cache will return null. We don't need to publish any rollouts since none are
+            // assigned yet.
+            if (activatedConfigsCache != null) {
+              RolloutsState rolloutsState =
+                  rolloutsStateFactory.getActiveRolloutsState(activatedConfigsCache);
+              executor.execute(() -> subscriber.onRolloutsStateChanged(rolloutsState));
+            }
+          } catch (FirebaseRemoteConfigException e) {
+            Log.w(
+                TAG,
+                "Exception publishing RolloutsState to subscriber. Continuing to listen for changes.",
+                e);
+          }
+        });
+  }
+
+  public void publishActiveRolloutsState(@NonNull ConfigContainer configContainer) {
+    try {
+      RolloutsState activeRolloutsState =
+          rolloutsStateFactory.getActiveRolloutsState(configContainer);
+
+      for (RolloutsStateSubscriber subscriber : subscribers) {
+        executor.execute(() -> subscriber.onRolloutsStateChanged(activeRolloutsState));
+      }
+    } catch (FirebaseRemoteConfigException e) {
+      Log.w(
+          TAG,
+          "Exception publishing RolloutsState to subscribers. Continuing to listen for changes.",
+          e);
+    }
+  }
+}
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/rollouts/package-info.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/rollouts/package-info.java
new file mode 100644
index 00000000000..09002349c1c
--- /dev/null
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/rollouts/package-info.java
@@ -0,0 +1,16 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 */
+package com.google.firebase.remoteconfig.internal.rollouts;
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/ktx/RemoteConfig.kt b/firebase-config/src/main/java/com/google/firebase/remoteconfig/ktx/RemoteConfig.kt
new file mode 100644
index 00000000000..899381a6515
--- /dev/null
+++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/ktx/RemoteConfig.kt
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.remoteconfig.ConfigUpdate
+import com.google.firebase.remoteconfig.ConfigUpdateListener
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigException
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigValue
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.trySendBlocking
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseRemoteConfig] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-config-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.remoteConfig: FirebaseRemoteConfig
+  get() = FirebaseRemoteConfig.getInstance()
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseRemoteConfig] instance of a given [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-config-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig =
+  FirebaseRemoteConfig.getInstance(app)
+
+/**
+ * See [FirebaseRemoteConfig#getValue]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-config-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun FirebaseRemoteConfig.get(key: String): FirebaseRemoteConfigValue {
+  return this.getValue(key)
+}
+
+fun remoteConfigSettings(
+  init: FirebaseRemoteConfigSettings.Builder.() -> Unit
+): FirebaseRemoteConfigSettings {
+  val builder = FirebaseRemoteConfigSettings.Builder()
+  builder.init()
+  return builder.build()
+}
+
+/**
+ * Starts listening for config updates from the Remote Config backend and emits [ConfigUpdate]s via
+ * a [Flow]. See [FirebaseRemoteConfig.addOnConfigUpdateListener] for more information.
+ *
+ * - When the returned flow starts being collected, an [ConfigUpdateListener] will be attached.
+ * - When the flow completes, the listener will be removed. If there are no attached listeners, the
+ * connection to the Remote Config backend will be closed.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-config-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+val FirebaseRemoteConfig.configUpdates
+  get() = callbackFlow {
+    val registration =
+      addOnConfigUpdateListener(
+        object : ConfigUpdateListener {
+          override fun onUpdate(configUpdate: ConfigUpdate) {
+            schedule { trySendBlocking(configUpdate) }
+          }
+
+          override fun onError(error: FirebaseRemoteConfigException) {
+            cancel(message = "Error listening for config updates.", cause = error)
+          }
+        }
+      )
+    awaitClose { registration.remove() }
+  }
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-config-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+@Keep
+class FirebaseRemoteConfigKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-config/src/test/AndroidManifest.xml b/firebase-config/src/test/AndroidManifest.xml
index c9e66890a4f..06ac42fd4d0 100644
--- a/firebase-config/src/test/AndroidManifest.xml
+++ b/firebase-config/src/test/AndroidManifest.xml
@@ -17,12 +17,11 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.firebase.remoteconfig"
     android:versionCode="1"
     android:versionName="1">
 
 
-  <!--<uses-sdk android:minSdkVersion="16"/>-->
+  <!--<uses-sdk android:minSdkVersion="21"/>-->
 
   <application android:label="FirebaseCommonTests" >
     <uses-library android:name="android.test.runner" />
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigTest.java b/firebase-config/src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigTest.java
index 52517a5438b..e4aa350bf1b 100644
--- a/firebase-config/src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigTest.java
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigTest.java
@@ -26,19 +26,28 @@
 import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.toExperimentInfoMaps;
 import static com.google.firebase.remoteconfig.internal.Personalization.EXTERNAL_ARM_VALUE_PARAM;
 import static com.google.firebase.remoteconfig.internal.Personalization.EXTERNAL_PERSONALIZATION_ID_PARAM;
+import static com.google.firebase.remoteconfig.testutil.Assert.assertFalse;
+import static com.google.firebase.remoteconfig.testutil.Assert.assertThrows;
+import static com.google.firebase.remoteconfig.testutil.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.android.gms.shadows.common.internal.ShadowPreconditions;
 import com.google.android.gms.tasks.Task;
@@ -47,6 +56,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
@@ -56,21 +66,35 @@
 import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.installations.InstallationTokenResult;
+import com.google.firebase.remoteconfig.internal.ConfigAutoFetch;
 import com.google.firebase.remoteconfig.internal.ConfigCacheClient;
 import com.google.firebase.remoteconfig.internal.ConfigContainer;
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler;
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler.FetchResponse;
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
 import com.google.firebase.remoteconfig.internal.ConfigMetadataClient;
+import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler;
+import com.google.firebase.remoteconfig.internal.ConfigRealtimeHttpClient;
+import com.google.firebase.remoteconfig.internal.FakeHttpURLConnection;
 import com.google.firebase.remoteconfig.internal.Personalization;
+import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -82,17 +106,15 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
 import org.skyscreamer.jsonassert.JSONAssert;
 
-/**
- * Unit tests for the Firebase Remote Config API.
- *
- * @author Miraziz Yusupov
- */
+/** Unit tests for the Firebase Remote Config API. */
 @RunWith(RobolectricTestRunner.class)
 @Config(
     manifest = Config.NONE,
     shadows = {ShadowPreconditions.class})
+@LooperMode(LooperMode.Mode.LEGACY)
 public final class FirebaseRemoteConfigTest {
   private static final String APP_ID = "1:14368190084:android:09cb977358c6f241";
   private static final String API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567";
@@ -109,6 +131,9 @@ public final class FirebaseRemoteConfigTest {
 
   private static final String ETAG = "ETag";
 
+  private static final String FORBIDDEN_ERROR_MESSAGE =
+      "[{  \"error\": {    \"code\": 403,    \"message\": \"Firebase Remote Config Realtime API has not been used in project 14368190084 before or it is disabled. Enable it by visiting https://console.developers.google.com/apis/api/firebaseremoteconfigrealtime.googleapis.com/overview?project=14368190084 then retry. If you enabled this API recently, wait a few minutes for the action to propagate to our systems and retry.\",    \"status\": \"PERMISSION_DENIED\",    \"details\": [      {        \"@type\": \"type.googleapis.com/google.rpc.Help\",        \"links\": [          {            \"description\": \"Google developers console API activation\",            \"url\": \"https://console.developers.google.com/apis/api/firebaseremoteconfigrealtime.googleapis.com/overview?project=14368190084\"          }        ]      },      {        \"@type\": \"type.googleapis.com/google.rpc.ErrorInfo\",        \"reason\": \"SERVICE_DISABLED\",        \"domain\": \"googleapis.com\",        \"metadata\": {          \"service\": \"firebaseremoteconfigrealtime.googleapis.com\",          \"consumer\": \"projects/14368190084\"        }      }    ]  }}";
+
   private static final String INSTALLATION_ID = "'fL71_VyL3uo9jNMWu1L60S";
   private static final String INSTALLATION_TOKEN =
       "eyJhbGciOiJF.eyJmaWQiOiJmaXMt.AB2LPV8wRQIhAPs4NvEgA3uhubH";
@@ -132,6 +157,18 @@ public final class FirebaseRemoteConfigTest {
   @Mock private ConfigGetParameterHandler mockGetHandler;
   @Mock private ConfigMetadataClient metadataClient;
 
+  @Mock private ConfigRealtimeHandler mockConfigRealtimeHandler;
+  @Mock private ConfigAutoFetch mockConfigAutoFetch;
+  @Mock private ConfigUpdateListenerRegistration mockRealtimeRegistration;
+  @Mock private HttpURLConnection mockHttpURLConnection;
+  @Mock private ConfigUpdateListener mockRetryListener;
+  @Mock private ConfigUpdateListener mockOnUpdateListener;
+  @Mock private ConfigUpdateListener mockStreamErrorEventListener;
+  @Mock private ConfigUpdateListener mockInvalidMessageEventListener;
+  @Mock private ConfigUpdateListener mockNotFetchedEventListener;
+  @Mock private ConfigUpdateListener mockUnavailableEventListener;
+  @Mock private ConfigUpdateListener mockForbiddenErrorEventListener;
+
   @Mock private ConfigCacheClient mockFireperfFetchedCache;
   @Mock private ConfigCacheClient mockFireperfActivatedCache;
   @Mock private ConfigCacheClient mockFireperfDefaultsCache;
@@ -144,14 +181,24 @@ public final class FirebaseRemoteConfigTest {
   @Mock private FirebaseInstallationsApi mockFirebaseInstallations;
   @Mock private Provider<AnalyticsConnector> mockAnalyticsConnectorProvider;
 
+  @Mock private RolloutsStateSubscriptionsHandler mockRolloutsStateSubscriptionsHandler;
+
   private FirebaseRemoteConfig frc;
   private FirebaseRemoteConfig fireperfFrc;
   private FirebaseRemoteConfig personalizationFrc;
   private ConfigContainer firstFetchedContainer;
   private ConfigContainer secondFetchedContainer;
+  private FetchResponse realtimeFetchedContainerResponse;
+  private ConfigContainer realtimeFetchedContainer;
+  private ConfigAutoFetch configAutoFetch;
+  private ConfigRealtimeHttpClient configRealtimeHttpClient;
+  private ConfigMetadataClient realtimeMetadataClient;
 
   private FetchResponse firstFetchedContainerResponse;
 
+  private final ScheduledExecutorService scheduledExecutorService =
+      Executors.newSingleThreadScheduledExecutor();
+
   @Before
   public void setUp() throws Exception {
     DEFAULTS_MAP.put("first_default_key", "first_default_value");
@@ -193,7 +240,9 @@ public void setUp() throws Exception {
             mockDefaultsCache,
             mockFetchHandler,
             mockGetHandler,
-            metadataClient);
+            metadataClient,
+            mockConfigRealtimeHandler,
+            mockRolloutsStateSubscriptionsHandler);
 
     // Set up an FRC instance for the Fireperf namespace that uses mocked clients.
     fireperfFrc =
@@ -210,7 +259,8 @@ public void setUp() throws Exception {
                 mockFireperfDefaultsCache,
                 mockFireperfFetchHandler,
                 mockFireperfGetHandler,
-                RemoteConfigComponent.getMetadataClient(context, APP_ID, FIREPERF_NAMESPACE));
+                RemoteConfigComponent.getMetadataClient(context, APP_ID, FIREPERF_NAMESPACE),
+                mockRolloutsStateSubscriptionsHandler);
 
     personalizationFrc =
         FirebaseApp.getInstance()
@@ -226,12 +276,13 @@ public void setUp() throws Exception {
                 mockDefaultsCache,
                 mockFetchHandler,
                 parameterHandler,
-                RemoteConfigComponent.getMetadataClient(
-                    context, APP_ID, PERSONALIZATION_NAMESPACE));
+                RemoteConfigComponent.getMetadataClient(context, APP_ID, PERSONALIZATION_NAMESPACE),
+                mockRolloutsStateSubscriptionsHandler);
 
     firstFetchedContainer =
         ConfigContainer.newBuilder()
             .replaceConfigsWith(ImmutableMap.of("long_param", "1L", "string_param", "string_value"))
+            .withTemplateVersionNumber(1L)
             .withFetchTime(new Date(1000L))
             .build();
 
@@ -239,11 +290,78 @@ public void setUp() throws Exception {
         ConfigContainer.newBuilder()
             .replaceConfigsWith(
                 ImmutableMap.of("string_param", "string_value", "double_param", "0.1"))
+            .withTemplateVersionNumber(1L)
             .withFetchTime(new Date(5000L))
             .build();
 
     firstFetchedContainerResponse =
         FetchResponse.forBackendUpdatesFetched(firstFetchedContainer, ETAG);
+
+    realtimeFetchedContainer =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(
+                ImmutableMap.of(
+                    "long_param",
+                    "1L",
+                    "string_param",
+                    "string_value",
+                    "realtime_param",
+                    "realtime_value"))
+            .withTemplateVersionNumber(1L)
+            .build();
+    realtimeFetchedContainerResponse =
+        FetchResponse.forBackendUpdatesFetched(realtimeFetchedContainer, ETAG);
+
+    HashSet<ConfigUpdateListener> listeners = new HashSet();
+    ConfigUpdateListener listener =
+        new ConfigUpdateListener() {
+          @Override
+          public void onUpdate(ConfigUpdate configUpdate) {
+            mockOnUpdateListener.onUpdate(configUpdate);
+          }
+
+          @Override
+          public void onError(@NonNull FirebaseRemoteConfigException error) {
+            if (error.getCode() == FirebaseRemoteConfigException.Code.CONFIG_UPDATE_STREAM_ERROR) {
+              if (error.getMessage().equals(FORBIDDEN_ERROR_MESSAGE)) {
+                mockForbiddenErrorEventListener.onError(error);
+              } else {
+                mockStreamErrorEventListener.onError(error);
+              }
+            } else if (error.getCode()
+                == FirebaseRemoteConfigException.Code.CONFIG_UPDATE_MESSAGE_INVALID) {
+              mockInvalidMessageEventListener.onError(error);
+            } else if (error.getCode()
+                == FirebaseRemoteConfigException.Code.CONFIG_UPDATE_NOT_FETCHED) {
+              mockNotFetchedEventListener.onError(error);
+            } else {
+              mockUnavailableEventListener.onError(error);
+            }
+          }
+        };
+
+    listeners.add(listener);
+    configAutoFetch =
+        new ConfigAutoFetch(
+            mockHttpURLConnection,
+            mockFetchHandler,
+            mockActivatedCache,
+            listeners,
+            mockRetryListener,
+            scheduledExecutorService);
+    realtimeMetadataClient =
+        new ConfigMetadataClient(context.getSharedPreferences("test_file", Context.MODE_PRIVATE));
+    configRealtimeHttpClient =
+        new ConfigRealtimeHttpClient(
+            firebaseApp,
+            mockFirebaseInstallations,
+            mockFetchHandler,
+            mockActivatedCache,
+            context,
+            "firebase",
+            listeners,
+            realtimeMetadataClient,
+            scheduledExecutorService);
   }
 
   @Test
@@ -641,6 +759,19 @@ public void activate_hasAbtExperiments_sendsExperimentsToAbt() throws Exception
     verify(mockFirebaseAbt).replaceAllExperiments(expectedExperimentInfoMaps);
   }
 
+  @Test
+  public void activate_publishesRolloutsStateToSubscribers() throws Exception {
+    ConfigContainer configContainer = ConfigContainer.newBuilder().build();
+
+    loadCacheWithConfig(mockFetchedCache, configContainer);
+    cachePutReturnsConfig(mockActivatedCache, configContainer);
+
+    Task<Boolean> activateTask = frc.activate();
+
+    assertThat(activateTask.getResult()).isTrue();
+    verify(mockRolloutsStateSubscriptionsHandler).publishActiveRolloutsState(configContainer);
+  }
+
   @Test
   public void activate2p_hasNoAbtExperiments_doesNotCallAbt() throws Exception {
     ConfigContainer containerWithNoAbtExperiments =
@@ -1039,6 +1170,494 @@ public void personalization_hasMetadata_successful_without_analytics() throws Ex
             });
   }
 
+  @Test
+  public void activate_configWithRolloutMetadata_storedInActivatedCacheSuccessfully()
+      throws Exception {
+    JSONArray affectedParameterKeys = new JSONArray();
+    affectedParameterKeys.put("key_1");
+    affectedParameterKeys.put("key_2");
+
+    JSONArray rolloutsMetadata = new JSONArray();
+    rolloutsMetadata.put(
+        new JSONObject()
+            .put("rolloutId", "1")
+            .put("variantId", "A")
+            .put("affectedParameterKeys", affectedParameterKeys));
+
+    ConfigContainer fetchedConfigContainer =
+        ConfigContainer.newBuilder(firstFetchedContainer)
+            .withRolloutMetadata(rolloutsMetadata)
+            .build();
+
+    loadCacheWithConfig(mockFetchedCache, fetchedConfigContainer);
+    loadCacheWithConfig(mockActivatedCache, null);
+    cachePutReturnsConfig(mockActivatedCache, fetchedConfigContainer);
+
+    frc.activate();
+
+    verify(mockActivatedCache).put(fetchedConfigContainer);
+    verify(mockFetchedCache).clear();
+  }
+
+  @Test
+  public void fetchAndActivate_configWithRolloutMetadata_storedInActivatedCacheSuccessfully()
+      throws Exception {
+    JSONArray affectedParameterKeys = new JSONArray();
+    affectedParameterKeys.put("key_1");
+    affectedParameterKeys.put("key_2");
+
+    JSONArray rolloutsMetadata = new JSONArray();
+    rolloutsMetadata.put(
+        new JSONObject()
+            .put("rolloutId", "1")
+            .put("variantId", "A")
+            .put("affectedParameterKeys", affectedParameterKeys));
+
+    ConfigContainer fetchedConfigContainer =
+        ConfigContainer.newBuilder(firstFetchedContainer)
+            .withRolloutMetadata(rolloutsMetadata)
+            .build();
+
+    loadFetchHandlerWithResponse(fetchedConfigContainer);
+    loadCacheWithConfig(mockFetchedCache, fetchedConfigContainer);
+    loadCacheWithConfig(mockActivatedCache, null);
+    cachePutReturnsConfig(mockActivatedCache, fetchedConfigContainer);
+
+    frc.fetchAndActivate();
+
+    verify(mockActivatedCache).put(fetchedConfigContainer);
+    verify(mockFetchedCache).clear();
+  }
+
+  @Test
+  public void realtime_frc_full_test() {
+    ConfigUpdateListener eventListener = generateEmptyRealtimeListener();
+    when(mockConfigRealtimeHandler.addRealtimeConfigUpdateListener(eventListener))
+        .thenReturn(mockRealtimeRegistration);
+
+    ConfigUpdateListenerRegistration registration = frc.addOnConfigUpdateListener(eventListener);
+    registration.remove();
+
+    verify(mockRealtimeRegistration).remove();
+    verify(mockConfigRealtimeHandler).addRealtimeConfigUpdateListener(eventListener);
+  }
+
+  @Test
+  public void realtime_client_addListener_success() {
+    ConfigUpdateListener eventListener = generateEmptyRealtimeListener();
+    when(mockConfigRealtimeHandler.addRealtimeConfigUpdateListener(eventListener))
+        .thenReturn(
+            new ConfigUpdateListenerRegistration() {
+              @Override
+              public void remove() {}
+            });
+    ConfigUpdateListenerRegistration registration =
+        mockConfigRealtimeHandler.addRealtimeConfigUpdateListener(eventListener);
+    verify(mockConfigRealtimeHandler).addRealtimeConfigUpdateListener(eventListener);
+    assertThat(registration).isNotNull();
+  }
+
+  @Test
+  public void realtime_client_removeListener_success() {
+    ConfigUpdateListener eventListener = generateEmptyRealtimeListener();
+    when(mockConfigRealtimeHandler.addRealtimeConfigUpdateListener(eventListener))
+        .thenReturn(mockRealtimeRegistration);
+
+    ConfigUpdateListenerRegistration registration =
+        mockConfigRealtimeHandler.addRealtimeConfigUpdateListener(eventListener);
+    registration.remove();
+
+    verify(mockRealtimeRegistration).remove();
+  }
+
+  @Test
+  public void realtime_stream_listen_and_end_connection() throws Exception {
+    when(mockHttpURLConnection.getInputStream())
+        .thenReturn(
+            new ByteArrayInputStream(
+                "{ \"latestTemplateVersionNumber\": 1 }".getBytes(StandardCharsets.UTF_8)));
+    when(mockFetchHandler.getTemplateVersionNumber()).thenReturn(1L);
+    when(mockFetchHandler.fetchNowWithTypeAndAttemptNumber(
+            ConfigFetchHandler.FetchType.REALTIME, 1))
+        .thenReturn(Tasks.forResult(realtimeFetchedContainerResponse));
+    configAutoFetch.listenForNotifications();
+
+    verify(mockHttpURLConnection).disconnect();
+  }
+
+  @Test
+  public void realtime_fetchesWithoutChangedParams_doesNotCallOnUpdate() throws Exception {
+    when(mockHttpURLConnection.getInputStream())
+        .thenReturn(
+            new ByteArrayInputStream(
+                "{ \"latestTemplateVersionNumber\": 1 }".getBytes(StandardCharsets.UTF_8)));
+    when(mockFetchHandler.getTemplateVersionNumber()).thenReturn(1L);
+    when(mockFetchHandler.fetch(0)).thenReturn(Tasks.forResult(firstFetchedContainerResponse));
+    configAutoFetch.listenForNotifications();
+
+    verifyNoInteractions(mockOnUpdateListener);
+  }
+
+  @Test
+  public void realtime_redirectStatusCode_noRetries() throws Exception {
+    ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
+    doReturn(Tasks.forResult(mockHttpURLConnection))
+        .when(configRealtimeHttpClientSpy)
+        .createRealtimeConnection();
+    doNothing()
+        .when(configRealtimeHttpClientSpy)
+        .closeRealtimeHttpStream(any(HttpURLConnection.class));
+    when(mockHttpURLConnection.getResponseCode()).thenReturn(301);
+
+    configRealtimeHttpClientSpy.beginRealtimeHttpStream();
+    flushScheduledTasks();
+
+    verify(configRealtimeHttpClientSpy, never()).startAutoFetch(any());
+    verify(configRealtimeHttpClientSpy, never()).retryHttpConnectionWhenBackoffEnds();
+    verify(mockStreamErrorEventListener).onError(any(FirebaseRemoteConfigServerException.class));
+  }
+
+  @Test
+  public void realtime_okStatusCode_startAutofetchAndRetries() throws Exception {
+    ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
+    doReturn(Tasks.forResult(mockHttpURLConnection))
+        .when(configRealtimeHttpClientSpy)
+        .createRealtimeConnection();
+    doReturn(mockConfigAutoFetch).when(configRealtimeHttpClientSpy).startAutoFetch(any());
+    doNothing().when(configRealtimeHttpClientSpy).retryHttpConnectionWhenBackoffEnds();
+    doNothing()
+        .when(configRealtimeHttpClientSpy)
+        .closeRealtimeHttpStream(any(HttpURLConnection.class));
+    when(mockHttpURLConnection.getResponseCode()).thenReturn(200);
+
+    configRealtimeHttpClientSpy.beginRealtimeHttpStream();
+    flushScheduledTasks();
+
+    verify(mockConfigAutoFetch).listenForNotifications();
+    verify(configRealtimeHttpClientSpy).retryHttpConnectionWhenBackoffEnds();
+  }
+
+  @Test
+  public void realtime_badGatewayStatusCode_noAutofetchButRetries() throws Exception {
+    ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
+    doReturn(Tasks.forResult(mockHttpURLConnection))
+        .when(configRealtimeHttpClientSpy)
+        .createRealtimeConnection();
+    doNothing().when(configRealtimeHttpClientSpy).retryHttpConnectionWhenBackoffEnds();
+    doNothing()
+        .when(configRealtimeHttpClientSpy)
+        .closeRealtimeHttpStream(any(HttpURLConnection.class));
+    when(mockHttpURLConnection.getResponseCode()).thenReturn(502);
+
+    configRealtimeHttpClientSpy.beginRealtimeHttpStream();
+    flushScheduledTasks();
+
+    verify(configRealtimeHttpClientSpy, never()).startAutoFetch(any());
+    verify(configRealtimeHttpClientSpy).retryHttpConnectionWhenBackoffEnds();
+  }
+
+  @Test
+  public void realtime_retryableStatusCode_increasesConfigMetadataFailedStreams() throws Exception {
+    ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
+    doReturn(Tasks.forResult(mockHttpURLConnection))
+        .when(configRealtimeHttpClientSpy)
+        .createRealtimeConnection();
+    doNothing().when(configRealtimeHttpClientSpy).retryHttpConnectionWhenBackoffEnds();
+    doNothing()
+        .when(configRealtimeHttpClientSpy)
+        .closeRealtimeHttpStream(any(HttpURLConnection.class));
+    when(mockHttpURLConnection.getResponseCode()).thenReturn(502);
+    int failedStreams = configRealtimeHttpClientSpy.getNumberOfFailedStreams();
+
+    configRealtimeHttpClientSpy.beginRealtimeHttpStream();
+    flushScheduledTasks();
+
+    assertThat(configRealtimeHttpClientSpy.getNumberOfFailedStreams()).isEqualTo(failedStreams + 1);
+  }
+
+  @Test
+  public void realtime_retryableStatusCode_increasesConfigMetadataBackoffDate() throws Exception {
+    ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
+    doReturn(Tasks.forResult(mockHttpURLConnection))
+        .when(configRealtimeHttpClientSpy)
+        .createRealtimeConnection();
+    doNothing().when(configRealtimeHttpClientSpy).retryHttpConnectionWhenBackoffEnds();
+    doNothing()
+        .when(configRealtimeHttpClientSpy)
+        .closeRealtimeHttpStream(any(HttpURLConnection.class));
+    when(mockHttpURLConnection.getResponseCode()).thenReturn(502);
+    Date backoffDate = configRealtimeHttpClientSpy.getBackoffEndTime();
+
+    configRealtimeHttpClientSpy.beginRealtimeHttpStream();
+    flushScheduledTasks();
+
+    assertTrue(configRealtimeHttpClientSpy.getBackoffEndTime().after(backoffDate));
+  }
+
+  @Test
+  public void realtime_successfulStatusCode_doesNotIncreaseConfigMetadataFailedStreams()
+      throws Exception {
+    ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
+    doReturn(Tasks.forResult(mockHttpURLConnection))
+        .when(configRealtimeHttpClientSpy)
+        .createRealtimeConnection();
+    doReturn(mockConfigAutoFetch).when(configRealtimeHttpClientSpy).startAutoFetch(any());
+    doNothing().when(configRealtimeHttpClientSpy).retryHttpConnectionWhenBackoffEnds();
+    doNothing()
+        .when(configRealtimeHttpClientSpy)
+        .closeRealtimeHttpStream(any(HttpURLConnection.class));
+    when(mockHttpURLConnection.getResponseCode()).thenReturn(200);
+    int failedStreams = configRealtimeHttpClientSpy.getNumberOfFailedStreams();
+
+    configRealtimeHttpClientSpy.beginRealtimeHttpStream();
+    flushScheduledTasks();
+
+    assertThat(configRealtimeHttpClientSpy.getNumberOfFailedStreams()).isEqualTo(failedStreams);
+  }
+
+  @Test
+  public void realtime_successfulStatusCode_doesNotIncreaseConfigMetadataBackoffDate()
+      throws Exception {
+    ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
+    doReturn(Tasks.forResult(mockHttpURLConnection))
+        .when(configRealtimeHttpClientSpy)
+        .createRealtimeConnection();
+    doReturn(mockConfigAutoFetch).when(configRealtimeHttpClientSpy).startAutoFetch(any());
+    doNothing().when(configRealtimeHttpClientSpy).retryHttpConnectionWhenBackoffEnds();
+    doNothing()
+        .when(configRealtimeHttpClientSpy)
+        .closeRealtimeHttpStream(any(HttpURLConnection.class));
+    when(mockHttpURLConnection.getResponseCode()).thenReturn(200);
+    Date backoffDate = configRealtimeHttpClientSpy.getBackoffEndTime();
+
+    configRealtimeHttpClientSpy.beginRealtimeHttpStream();
+    flushScheduledTasks();
+
+    assertFalse(configRealtimeHttpClientSpy.getBackoffEndTime().after(backoffDate));
+  }
+
+  @Test
+  public void realtime_forbiddenStatusCode_returnsStreamError() throws Exception {
+    ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
+    doReturn(Tasks.forResult(mockHttpURLConnection))
+        .when(configRealtimeHttpClientSpy)
+        .createRealtimeConnection();
+    doNothing()
+        .when(configRealtimeHttpClientSpy)
+        .closeRealtimeHttpStream(any(HttpURLConnection.class));
+    when(mockHttpURLConnection.getErrorStream())
+        .thenReturn(
+            new ByteArrayInputStream(FORBIDDEN_ERROR_MESSAGE.getBytes(StandardCharsets.UTF_8)));
+    when(mockHttpURLConnection.getResponseCode()).thenReturn(403);
+
+    configRealtimeHttpClientSpy.beginRealtimeHttpStream();
+    flushScheduledTasks();
+
+    verify(configRealtimeHttpClientSpy, never()).startAutoFetch(any());
+    verify(configRealtimeHttpClientSpy, never()).retryHttpConnectionWhenBackoffEnds();
+    verify(mockForbiddenErrorEventListener).onError(any(FirebaseRemoteConfigServerException.class));
+  }
+
+  @Test
+  public void realtime_exceptionThrown_noAutofetchButRetries() throws Exception {
+    ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
+    doReturn(Tasks.forException(new IOException()))
+        .when(configRealtimeHttpClientSpy)
+        .createRealtimeConnection();
+    doNothing().when(configRealtimeHttpClientSpy).retryHttpConnectionWhenBackoffEnds();
+    doNothing()
+        .when(configRealtimeHttpClientSpy)
+        .closeRealtimeHttpStream(any(HttpURLConnection.class));
+
+    configRealtimeHttpClientSpy.beginRealtimeHttpStream();
+    flushScheduledTasks();
+
+    verify(configRealtimeHttpClientSpy, never()).startAutoFetch(any());
+    verify(configRealtimeHttpClientSpy).retryHttpConnectionWhenBackoffEnds();
+  }
+
+  @Test
+  public void realtime_stream_listen_and_failsafe_enabled() throws Exception {
+    when(mockHttpURLConnection.getResponseCode()).thenReturn(200);
+    when(mockHttpURLConnection.getInputStream())
+        .thenReturn(
+            new ByteArrayInputStream(
+                "{ \"featureDisabled\": true }".getBytes(StandardCharsets.UTF_8)));
+    when(mockFetchHandler.getTemplateVersionNumber()).thenReturn(1L);
+    configAutoFetch.listenForNotifications();
+
+    verify(mockRetryListener).onError(any(FirebaseRemoteConfigServerException.class));
+    verify(mockFetchHandler, never()).fetch(0);
+  }
+
+  @Test
+  public void realtime_stream_listen_and_failsafe_disabled() throws Exception {
+    when(mockHttpURLConnection.getResponseCode()).thenReturn(200);
+    when(mockHttpURLConnection.getInputStream())
+        .thenReturn(
+            new ByteArrayInputStream(
+                "{ \"featureDisabled\": false,  \"latestTemplateVersionNumber\": 2 }"
+                    .getBytes(StandardCharsets.UTF_8)));
+    when(mockFetchHandler.getTemplateVersionNumber()).thenReturn(1L);
+    when(mockFetchHandler.fetchNowWithTypeAndAttemptNumber(
+            ConfigFetchHandler.FetchType.REALTIME, 1))
+        .thenReturn(Tasks.forResult(realtimeFetchedContainerResponse));
+    configAutoFetch.listenForNotifications();
+
+    verify(mockUnavailableEventListener, never())
+        .onError(any(FirebaseRemoteConfigServerException.class));
+    verify(mockFetchHandler).getTemplateVersionNumber();
+  }
+
+  @Test
+  public void realtimeStreamListen_andUnableToParseMessage() throws Exception {
+    when(mockHttpURLConnection.getResponseCode()).thenReturn(200);
+    when(mockHttpURLConnection.getInputStream())
+        .thenReturn(
+            new ByteArrayInputStream(
+                "{ \"featureDisabled\": false,  \"latestTemplateVersionNumber: 2 } }"
+                    .getBytes(StandardCharsets.UTF_8)));
+    when(mockFetchHandler.getTemplateVersionNumber()).thenReturn(1L);
+    when(mockFetchHandler.fetchNowWithTypeAndAttemptNumber(
+            ConfigFetchHandler.FetchType.REALTIME, 1))
+        .thenReturn(Tasks.forResult(realtimeFetchedContainerResponse));
+    configAutoFetch.listenForNotifications();
+
+    verify(mockInvalidMessageEventListener).onError(any(FirebaseRemoteConfigClientException.class));
+  }
+
+  @Test
+  public void realtime_stream_listen_get_inputstream_fail() throws Exception {
+    when(mockHttpURLConnection.getResponseCode()).thenReturn(200);
+    when(mockHttpURLConnection.getInputStream()).thenThrow(IOException.class);
+    when(mockFetchHandler.getTemplateVersionNumber()).thenReturn(1L);
+    when(mockFetchHandler.fetchNowWithTypeAndAttemptNumber(
+            ConfigFetchHandler.FetchType.REALTIME, 1))
+        .thenReturn(Tasks.forResult(realtimeFetchedContainerResponse));
+    configAutoFetch.listenForNotifications();
+
+    verify(mockHttpURLConnection).disconnect();
+  }
+
+  @Test
+  public void realtime_stream_autofetch_success() throws Exception {
+    // Setup activated configs with keys "string_param", "long_param"
+    loadCacheWithConfig(mockActivatedCache, firstFetchedContainer);
+    when(mockFetchHandler.getTemplateVersionNumber()).thenReturn(1L);
+    when(mockFetchHandler.fetchNowWithTypeAndAttemptNumber(
+            ConfigFetchHandler.FetchType.REALTIME, 1))
+        .thenReturn(Tasks.forResult(realtimeFetchedContainerResponse));
+    configAutoFetch.fetchLatestConfig(3, 1);
+
+    flushScheduledTasks();
+
+    Set<String> updatedKeys = Sets.newHashSet("realtime_param");
+    verify(mockOnUpdateListener)
+        .onUpdate(argThat(configUpdate -> configUpdate.getUpdatedKeys().equals(updatedKeys)));
+  }
+
+  @Test
+  public void realtime_autofetchBeforeActivate_callsOnUpdateWithAllFetchedParams()
+      throws Exception {
+    // The first call to get() returns null while the cache is loading.
+    loadCacheWithConfig(mockActivatedCache, null);
+    when(mockFetchHandler.getTemplateVersionNumber()).thenReturn(1L);
+    when(mockFetchHandler.fetchNowWithTypeAndAttemptNumber(
+            ConfigFetchHandler.FetchType.REALTIME, 3))
+        .thenReturn(Tasks.forResult(realtimeFetchedContainerResponse));
+
+    configAutoFetch.fetchLatestConfig(1, 1);
+    flushScheduledTasks();
+
+    Set<String> updatedKeys = Sets.newHashSet("string_param", "long_param", "realtime_param");
+    verify(mockOnUpdateListener)
+        .onUpdate(argThat(configUpdate -> configUpdate.getUpdatedKeys().equals(updatedKeys)));
+  }
+
+  @Test
+  public void realtime_stream_autofetch_failure() throws Exception {
+    loadCacheWithConfig(mockActivatedCache, firstFetchedContainer);
+    when(mockFetchHandler.getTemplateVersionNumber()).thenReturn(1L);
+    when(mockFetchHandler.fetchNowWithTypeAndAttemptNumber(
+            ConfigFetchHandler.FetchType.REALTIME, 3))
+        .thenReturn(Tasks.forResult(realtimeFetchedContainerResponse));
+
+    configAutoFetch.fetchLatestConfig(1, 1000);
+    flushScheduledTasks();
+
+    verify(mockNotFetchedEventListener).onError(any(FirebaseRemoteConfigServerException.class));
+  }
+
+  @Test
+  public void realtimeStream_getInstallationToken_tokenTaskThrowsException() throws Exception {
+    ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
+    when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forResult(INSTALLATION_ID));
+    when(mockFirebaseInstallations.getToken(false))
+        .thenReturn(Tasks.forException(new IOException("SERVICE_NOT_AVAILABLE")));
+
+    Task<HttpURLConnection> httpURLConnectionTask =
+        configRealtimeHttpClientSpy.createRealtimeConnection();
+    flushScheduledTasks();
+
+    FirebaseRemoteConfigClientException frcException =
+        assertThrows(
+            FirebaseRemoteConfigClientException.class,
+            () -> httpURLConnectionTask.getResult(FirebaseRemoteConfigClientException.class));
+    assertThat(frcException)
+        .hasMessageThat()
+        .contains(
+            "Firebase Installations failed to get installation auth token for config update listener connection.");
+  }
+
+  @Test
+  public void realtimeStream_getInstallationID_idTaskThrowsException() throws Exception {
+    ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
+    when(mockFirebaseInstallations.getId())
+        .thenReturn(Tasks.forException(new IOException("SERVICE_NOT_AVAILABLE")));
+    when(mockFirebaseInstallations.getToken(false))
+        .thenReturn(Tasks.forResult(INSTALLATION_TOKEN_RESULT));
+
+    Task<HttpURLConnection> httpURLConnectionTask =
+        configRealtimeHttpClientSpy.createRealtimeConnection();
+    flushScheduledTasks();
+
+    FirebaseRemoteConfigClientException frcException =
+        assertThrows(
+            FirebaseRemoteConfigClientException.class,
+            () -> httpURLConnectionTask.getResult(FirebaseRemoteConfigClientException.class));
+    assertThat(frcException)
+        .hasMessageThat()
+        .contains(
+            "Firebase Installations failed to get installation ID for config update listener connection.");
+  }
+
+  @Test
+  public void realtimeRequest_setRequestParams_succeedsWithCorrectParams() throws Exception {
+    ConfigRealtimeHttpClient configRealtimeHttpClientSpy = spy(configRealtimeHttpClient);
+    when(mockFetchHandler.getTemplateVersionNumber()).thenReturn(1L);
+    FakeHttpURLConnection fakeConnection =
+        new FakeHttpURLConnection(new URL("https://firebase.google.com"));
+
+    configRealtimeHttpClientSpy.setRequestParams(
+        fakeConnection, "fid-is-over-iid", INSTALLATION_TOKEN);
+    String expectedBody = fakeConnection.getOutputStream().toString();
+    Map<String, String> headerFields = fakeConnection.getRequestHeaders();
+
+    Map<String, String> body = new HashMap<>();
+    body.put("project", "14368190084");
+    body.put("namespace", "firebase");
+    body.put("lastKnownVersionNumber", "1");
+    body.put("appId", APP_ID);
+    body.put("sdkVersion", BuildConfig.VERSION_NAME);
+    body.put("appInstanceId", "fid-is-over-iid");
+
+    assertThat(new JSONObject(body).toString()).isEqualTo(expectedBody);
+    assertThat(headerFields.get("X-Goog-Firebase-Installations-Auth"))
+        .isEqualTo(INSTALLATION_TOKEN);
+    assertThat(headerFields.get("X-Goog-Api-Key")).isEqualTo(API_KEY);
+    assertThat(fakeConnection.getRequestMethod()).isEqualTo("POST");
+  }
+
   private static void loadCacheWithConfig(
       ConfigCacheClient cacheClient, ConfigContainer container) {
     when(cacheClient.getBlocking()).thenReturn(container);
@@ -1065,6 +1684,12 @@ private void loadFetchHandlerWithResponse() {
     when(mockFetchHandler.fetch()).thenReturn(Tasks.forResult(firstFetchedContainerResponse));
   }
 
+  private void loadFetchHandlerWithResponse(ConfigContainer configContainer) {
+    FetchResponse fetchResponse =
+        FetchResponse.forBackendUpdatesFetched(firstFetchedContainer, ETAG);
+    when(mockFetchHandler.fetch()).thenReturn(Tasks.forResult(fetchResponse));
+  }
+
   private void load2pFetchHandlerWithResponse() {
     when(mockFireperfFetchHandler.fetch())
         .thenReturn(Tasks.forResult(firstFetchedContainerResponse));
@@ -1115,4 +1740,27 @@ private static FirebaseApp initializeFirebaseApp(Context context) {
             .setProjectId(PROJECT_ID)
             .build());
   }
+
+  /**
+   * Flush tasks on the {@code scheduledExecutorService}'s thread.
+   *
+   * @throws InterruptedException if the thread is interrupted while waiting.
+   */
+  private void flushScheduledTasks() throws InterruptedException {
+    // Create a latch with a count of 1 and submit an execution request to countdown.
+    // When the existing tasks have been executed, the countdown will execute and release the latch.
+    CountDownLatch latch = new CountDownLatch(1);
+    scheduledExecutorService.execute(latch::countDown);
+    assertTrue("Task didn't finish.", latch.await(1000, TimeUnit.MILLISECONDS));
+  }
+
+  private ConfigUpdateListener generateEmptyRealtimeListener() {
+    return new ConfigUpdateListener() {
+      @Override
+      public void onUpdate(ConfigUpdate configUpdate) {}
+
+      @Override
+      public void onError(@NonNull FirebaseRemoteConfigException error) {}
+    };
+  }
 }
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/RemoteConfigComponentTest.java b/firebase-config/src/test/java/com/google/firebase/remoteconfig/RemoteConfigComponentTest.java
index 52b8c5300c9..ebb69b491b6 100644
--- a/firebase-config/src/test/java/com/google/firebase/remoteconfig/RemoteConfigComponentTest.java
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/RemoteConfigComponentTest.java
@@ -20,7 +20,7 @@
 import static com.google.firebase.remoteconfig.AbtExperimentHelper.createAbtExperiments;
 import static com.google.firebase.remoteconfig.RemoteConfigComponent.CONNECTION_TIMEOUT_IN_SECONDS;
 import static com.google.firebase.remoteconfig.RemoteConfigComponent.DEFAULT_NAMESPACE;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -40,7 +40,12 @@
 import com.google.firebase.remoteconfig.internal.ConfigFetchHttpClient;
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
 import com.google.firebase.remoteconfig.internal.ConfigMetadataClient;
+import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutsStateSubscriber;
+import java.util.Date;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,12 +53,9 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
 
-/**
- * Unit tests for the Firebase Remote Config Component.
- *
- * @author Miraziz Yusupov
- */
+/** Unit tests for the Firebase Remote Config Component. */
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class RemoteConfigComponentTest {
@@ -72,10 +74,15 @@ public class RemoteConfigComponentTest {
   @Mock private ConfigFetchHandler mockFetchHandler;
   @Mock private ConfigGetParameterHandler mockGetParameterHandler;
   @Mock private ConfigMetadataClient mockMetadataClient;
+  @Mock private RolloutsStateSubscriptionsHandler mockRolloutsStateSubscriptionsHandler;
+
+  @Mock private RolloutsStateSubscriber mockRolloutsStateSubscriber;
 
   private Context context;
   private ExecutorService directExecutor;
+  private ScheduledExecutorService scheduledExecutorService;
   private FirebaseApp defaultApp;
+  private ConfigMetadataClient metadataClient;
 
   @Before
   public void setUp() {
@@ -83,19 +90,24 @@ public void setUp() {
 
     context = ApplicationProvider.getApplicationContext();
     directExecutor = MoreExecutors.newDirectExecutorService();
+    scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
 
     defaultApp = initializeFirebaseApp(context);
 
+    metadataClient = RemoteConfigComponent.getMetadataClient(context, APP_ID, "personalization");
+
     when(mockFirebaseApp.getOptions())
         .thenReturn(new FirebaseOptions.Builder().setApplicationId(APP_ID).build());
     when(mockFirebaseApp.getName()).thenReturn(FirebaseApp.DEFAULT_APP_NAME);
   }
 
   @Test
+  @LooperMode(LooperMode.Mode.LEGACY)
   public void frc2p_doesNotCallAbt() throws Exception {
 
     FirebaseRemoteConfig fireperfFrc =
-        getFrcInstanceFromComponent(getNewFrcComponent(), /* namespace= */ "fireperf");
+        getFrcInstanceFromComponentWithMetadataClient(
+            getNewFrcComponent(), /* namespace= */ "fireperf");
     loadConfigsWithExperimentsForActivate();
 
     assertWithMessage("Fireperf fetch and activate failed!")
@@ -106,11 +118,13 @@ public void frc2p_doesNotCallAbt() throws Exception {
   }
 
   @Test
+  @LooperMode(LooperMode.Mode.LEGACY)
   public void frcNonMainFirebaseApp_doesNotCallAbt() throws Exception {
 
     when(mockFirebaseApp.getName()).thenReturn("secondary");
     FirebaseRemoteConfig frc =
-        getFrcInstanceFromComponent(getNewFrcComponentWithoutLoadingDefault(), DEFAULT_NAMESPACE);
+        getFrcInstanceFromComponentWithMetadataClient(
+            getNewFrcComponentWithoutLoadingDefault(), DEFAULT_NAMESPACE);
     loadConfigsWithExperimentsForActivate();
 
     assertWithMessage("Fetch and activate failed!").that(frc.activate().getResult()).isTrue();
@@ -165,10 +179,25 @@ public void getFetchHandler_nonMainFirebaseApp_doesNotUseAnalytics() {
     assertThat(actualReadTimeout).isEqualTo(customConnectionTimeoutInSeconds);
   }
 
+  @Test
+  public void registerRolloutsStateSubscriber_firebaseNamespace_callsSubscriptionHandler() {
+    // Mock metadata client response since Realtime handler can't be mocked here.
+    when(mockMetadataClient.getRealtimeBackoffMetadata())
+        .thenReturn(new ConfigMetadataClient.RealtimeBackoffMetadata(0, new Date()));
+
+    RemoteConfigComponent frcComponent = getNewFrcComponent();
+    FirebaseRemoteConfig instance = getFrcInstanceFromComponent(frcComponent, DEFAULT_NAMESPACE);
+
+    frcComponent.registerRolloutsStateSubscriber(DEFAULT_NAMESPACE, mockRolloutsStateSubscriber);
+
+    verify(instance.getRolloutsStateSubscriptionsHandler())
+        .registerRolloutsStateSubscriber(mockRolloutsStateSubscriber);
+  }
+
   private RemoteConfigComponent getNewFrcComponent() {
     return new RemoteConfigComponent(
         context,
-        directExecutor,
+        scheduledExecutorService,
         mockFirebaseApp,
         mockFirebaseInstallations,
         mockFirebaseAbt,
@@ -179,7 +208,7 @@ private RemoteConfigComponent getNewFrcComponent() {
   private RemoteConfigComponent getNewFrcComponentWithoutLoadingDefault() {
     return new RemoteConfigComponent(
         context,
-        directExecutor,
+        scheduledExecutorService,
         mockFirebaseApp,
         mockFirebaseInstallations,
         mockFirebaseAbt,
@@ -187,6 +216,23 @@ private RemoteConfigComponent getNewFrcComponentWithoutLoadingDefault() {
         /* loadGetDefault= */ false);
   }
 
+  private FirebaseRemoteConfig getFrcInstanceFromComponentWithMetadataClient(
+      RemoteConfigComponent frcComponent, String namespace) {
+    return frcComponent.get(
+        mockFirebaseApp,
+        namespace,
+        mockFirebaseInstallations,
+        mockFirebaseAbt,
+        directExecutor,
+        mockFetchedCache,
+        mockActivatedCache,
+        mockDefaultsCache,
+        mockFetchHandler,
+        mockGetParameterHandler,
+        metadataClient,
+        mockRolloutsStateSubscriptionsHandler);
+  }
+
   private FirebaseRemoteConfig getFrcInstanceFromComponent(
       RemoteConfigComponent frcComponent, String namespace) {
     return frcComponent.get(
@@ -200,7 +246,8 @@ private FirebaseRemoteConfig getFrcInstanceFromComponent(
         mockDefaultsCache,
         mockFetchHandler,
         mockGetParameterHandler,
-        mockMetadataClient);
+        mockMetadataClient,
+        mockRolloutsStateSubscriptionsHandler);
   }
 
   private void loadConfigsWithExperimentsForActivate() throws Exception {
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/RemoteConfigTests.kt b/firebase-config/src/test/java/com/google/firebase/remoteconfig/RemoteConfigTests.kt
new file mode 100644
index 00000000000..7624ee3827d
--- /dev/null
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/RemoteConfigTests.kt
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.common.util.concurrent.MoreExecutors
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import com.google.firebase.installations.FirebaseInstallationsApi
+import com.google.firebase.platforminfo.UserAgentPublisher
+import com.google.firebase.remoteconfig.internal.ConfigCacheClient
+import com.google.firebase.remoteconfig.internal.ConfigFetchHandler
+import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler
+import com.google.firebase.remoteconfig.internal.ConfigMetadataClient
+import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler
+import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.mock
+import org.mockito.Mockito.`when`
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "1:14368190084:android:09cb977358c6f241"
+const val API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567"
+
+const val EXISTING_APP = "existing"
+
+open class DefaultFirebaseRemoteConfigValue : FirebaseRemoteConfigValue {
+  override fun asLong(): Long = TODO("Unimplementend")
+  override fun asDouble(): Double = TODO("Unimplementend")
+  override fun asString(): String = TODO("Unimplementend")
+  override fun asByteArray(): ByteArray = TODO("Unimplementend")
+  override fun asBoolean(): Boolean = TODO("Unimplementend")
+  override fun getSource(): Int = TODO("Unimplementend")
+}
+
+class StringRemoteConfigValue(val value: String) : DefaultFirebaseRemoteConfigValue() {
+  override fun asString() = value
+}
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class ConfigTests : BaseTestCase() {
+
+  @Test
+  fun `Firebase#remoteConfig should delegate to FirebaseRemoteConfig#getInstance()`() {
+    assertThat(Firebase.remoteConfig).isSameInstanceAs(FirebaseRemoteConfig.getInstance())
+  }
+
+  @Test
+  fun `Firebase#remoteConfig should delegate to FirebaseRemoteConfig#getInstance(FirebaseApp, region)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.remoteConfig(app)).isSameInstanceAs(FirebaseRemoteConfig.getInstance(app))
+  }
+
+  @Test
+  fun `Overloaded get() operator returns default value when key doesn't exist`() {
+    val remoteConfig = Firebase.remoteConfig
+    assertThat(remoteConfig["non_existing_key"].asString())
+      .isEqualTo(FirebaseRemoteConfig.DEFAULT_VALUE_FOR_STRING)
+    assertThat(remoteConfig["another_non_exisiting_key"].asDouble())
+      .isEqualTo(FirebaseRemoteConfig.DEFAULT_VALUE_FOR_DOUBLE)
+  }
+
+  @Test
+  fun `FirebaseRemoteConfigSettings builder works`() {
+    val minFetchInterval = 3600L
+    val fetchTimeout = 60L
+    val configSettings = remoteConfigSettings {
+      minimumFetchIntervalInSeconds = minFetchInterval
+      fetchTimeoutInSeconds = fetchTimeout
+    }
+    assertThat(configSettings.minimumFetchIntervalInSeconds).isEqualTo(minFetchInterval)
+    assertThat(configSettings.fetchTimeoutInSeconds).isEqualTo(fetchTimeout)
+  }
+
+  @Test
+  fun `Overloaded get() operator returns value when key exists`() {
+    val mockGetHandler = mock(ConfigGetParameterHandler::class.java)
+    val directExecutor = MoreExecutors.directExecutor()
+
+    val remoteConfig =
+      createRemoteConfig(
+        context = null,
+        firebaseApp = Firebase.app(EXISTING_APP),
+        firebaseInstallations = mock(FirebaseInstallationsApi::class.java),
+        firebaseAbt = null,
+        executor = directExecutor,
+        fetchedConfigsCache = mock(ConfigCacheClient::class.java),
+        activatedConfigsCache = mock(ConfigCacheClient::class.java),
+        defaultConfigsCache = mock(ConfigCacheClient::class.java),
+        fetchHandler = mock(ConfigFetchHandler::class.java),
+        getHandler = mockGetHandler,
+        frcMetadata = mock(ConfigMetadataClient::class.java),
+        realtimeHandler = mock(ConfigRealtimeHandler::class.java),
+        rolloutsStateSubscriptionsHandler = mock(RolloutsStateSubscriptionsHandler::class.java)
+      )
+
+    `when`(mockGetHandler.getValue("KEY")).thenReturn(StringRemoteConfigValue("non default value"))
+    assertThat(remoteConfig["KEY"].asString()).isEqualTo("non default value")
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/TestConstructorUtil.kt b/firebase-config/src/test/java/com/google/firebase/remoteconfig/TestConstructorUtil.kt
new file mode 100644
index 00000000000..e6167b5ab09
--- /dev/null
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/TestConstructorUtil.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig
+
+import android.content.Context
+import com.google.firebase.FirebaseApp
+import com.google.firebase.abt.FirebaseABTesting
+import com.google.firebase.installations.FirebaseInstallationsApi
+import com.google.firebase.remoteconfig.internal.ConfigCacheClient
+import com.google.firebase.remoteconfig.internal.ConfigFetchHandler
+import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler
+import com.google.firebase.remoteconfig.internal.ConfigMetadataClient
+import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler
+import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
+import java.util.concurrent.Executor
+
+// This method is a workaround for testing. It enable us to create a FirebaseRemoteConfig object
+// with mocks using the package-private constructor.
+fun createRemoteConfig(
+  context: Context?,
+  firebaseApp: FirebaseApp,
+  firebaseInstallations: FirebaseInstallationsApi,
+  firebaseAbt: FirebaseABTesting?,
+  executor: Executor,
+  fetchedConfigsCache: ConfigCacheClient,
+  activatedConfigsCache: ConfigCacheClient,
+  defaultConfigsCache: ConfigCacheClient,
+  fetchHandler: ConfigFetchHandler,
+  getHandler: ConfigGetParameterHandler,
+  frcMetadata: ConfigMetadataClient,
+  realtimeHandler: ConfigRealtimeHandler,
+  rolloutsStateSubscriptionsHandler: RolloutsStateSubscriptionsHandler
+): FirebaseRemoteConfig {
+  return FirebaseRemoteConfig(
+    context,
+    firebaseApp,
+    firebaseInstallations,
+    firebaseAbt,
+    executor,
+    fetchedConfigsCache,
+    activatedConfigsCache,
+    defaultConfigsCache,
+    fetchHandler,
+    getHandler,
+    frcMetadata,
+    realtimeHandler,
+    rolloutsStateSubscriptionsHandler
+  )
+}
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigContainerTest.java b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigContainerTest.java
new file mode 100644
index 00000000000..0dd1e399c35
--- /dev/null
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigContainerTest.java
@@ -0,0 +1,481 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.remoteconfig.internal;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.remoteconfig.RemoteConfigConstants.ExperimentDescriptionFieldKey.EXPERIMENT_ID;
+import static com.google.firebase.remoteconfig.RemoteConfigConstants.ExperimentDescriptionFieldKey.VARIANT_ID;
+import static com.google.firebase.remoteconfig.internal.Personalization.ARM_INDEX;
+import static com.google.firebase.remoteconfig.internal.Personalization.CHOICE_ID;
+import static com.google.firebase.remoteconfig.internal.Personalization.GROUP;
+import static com.google.firebase.remoteconfig.internal.Personalization.PERSONALIZATION_ID;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.Set;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class ConfigContainerTest {
+  @Before
+  public void setup() throws Exception {}
+
+  @Test
+  public void getChangedParams_changedValue_returnsChangedParamKey() throws Exception {
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_2"))
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).containsExactly("string_param");
+  }
+
+  @Test
+  public void getChangedParams_addedParam_returnsAddedParamKey() throws Exception {
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(
+                ImmutableMap.of("string_param", "value_1", "long_param", "long_value"))
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).containsExactly("long_param");
+  }
+
+  @Test
+  public void getChangedParams_removedParam_returnsRemovedParamKey() throws Exception {
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder().replaceConfigsWith(ImmutableMap.of()).build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).containsExactly("string_param");
+  }
+
+  @Test
+  public void getChangedParams_changedP13nMetadata_returnsChangedParamKey() throws Exception {
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .withPersonalizationMetadata(
+                new JSONObject(
+                    ImmutableMap.of(
+                        "string_param", generateP13nMetadata("p13n-id-1", "0", "id1", "BASELINE"))))
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .withPersonalizationMetadata(
+                new JSONObject(
+                    ImmutableMap.of(
+                        "string_param", generateP13nMetadata("p13n-id-1", "1", "id1", "P13N"))))
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).containsExactly("string_param");
+  }
+
+  @Test
+  public void getChangedParams_sameP13nMetadata_returnsEmptySet() throws Exception {
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .withPersonalizationMetadata(
+                new JSONObject(
+                    ImmutableMap.of(
+                        "string_param", generateP13nMetadata("p13n-id-1", "1", "id1", "P13N"))))
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .withPersonalizationMetadata(
+                new JSONObject(
+                    ImmutableMap.of(
+                        "string_param", generateP13nMetadata("p13n-id-1", "1", "id1", "P13N"))))
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).isEmpty();
+  }
+
+  @Test
+  public void getChangedParams_changedExperimentsMetadata_returnsNoParamKeys() throws Exception {
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .withAbtExperiments(generateAbtExperiments(1))
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).isEmpty();
+  }
+
+  @Test
+  public void getChangedParams_noChanges_returnsEmptySet() throws Exception {
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).isEmpty();
+  }
+
+  @Test
+  public void getChangedParams_emptyConfig_returnsAllOtherParams() throws Exception {
+    ConfigContainer config = ConfigContainer.newBuilder().build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).containsExactly("string_param");
+  }
+
+  @Test
+  public void getChangedParams_multipleChanges_returnsMultipleParamKeys() throws Exception {
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(
+                ImmutableMap.of(
+                    "always_on",
+                    "true",
+                    "string_param",
+                    "value_1",
+                    "long_param",
+                    "1",
+                    "bool_param",
+                    "true"))
+            .withPersonalizationMetadata(
+                new JSONObject(
+                    ImmutableMap.of(
+                        "string_param", generateP13nMetadata("p13n-id-1", "0", "id1", "BASELINE"))))
+            .build();
+
+    // always_on has NOT changed
+    // string_param has changed P13n metadata
+    // long_param has a changed value
+    // bool_param has been removed
+    // feature_1 has been added
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(
+                ImmutableMap.of(
+                    "always_on",
+                    "true",
+                    "string_param",
+                    "value_1",
+                    "long_param",
+                    "2",
+                    "feature_1",
+                    "true"))
+            .withPersonalizationMetadata(
+                new JSONObject(
+                    ImmutableMap.of(
+                        "string_param", generateP13nMetadata("p13n-id-1", "1", "id1", "P13N"))))
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams)
+        .containsExactly("string_param", "long_param", "bool_param", "feature_1");
+  }
+
+  @Test
+  public void getChangedParams_configsUnmodified() throws Exception {
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .build();
+
+    // ConfigContainer#getChangedParams should not modify either comparison argument.
+    config.getChangedParams(other);
+
+    String configsString = new JSONObject("{string_param: value_1}").toString();
+    assertThat(config.getConfigs().toString()).isEqualTo(configsString);
+    assertThat(other.getConfigs().toString()).isEqualTo(configsString);
+  }
+
+  @Test
+  public void copyOf_missingTemplateVersionNumber_defaultsToZero() throws Exception {
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("string_param", "value_1"))
+            .withTemplateVersionNumber(2L)
+            .build();
+    JSONObject containerJson = new JSONObject(config.toString());
+    containerJson.remove(ConfigContainer.TEMPLATE_VERSION_NUMBER_KEY);
+
+    ConfigContainer configWithoutTemplateVersion = ConfigContainer.copyOf(containerJson);
+
+    assertThat(configWithoutTemplateVersion.getTemplateVersionNumber()).isEqualTo(0L);
+  }
+
+  @Test
+  public void copyOfConfigContainer_withoutRolloutsMetadata_defaultsToEmptyArray()
+      throws Exception {
+    JSONArray affectedParameterKeys = new JSONArray();
+    affectedParameterKeys.put("key_1");
+    affectedParameterKeys.put("key_2");
+
+    JSONArray rolloutsMetadata = new JSONArray();
+    rolloutsMetadata.put(
+        new JSONObject()
+            .put("rolloutId", "1")
+            .put("variantId", "A")
+            .put("affectedParameterKeys", affectedParameterKeys));
+    ConfigContainer configContainer =
+        ConfigContainer.newBuilder().withRolloutMetadata(rolloutsMetadata).build();
+    JSONObject configContainerJson = new JSONObject(configContainer.toString());
+    configContainerJson.remove(ConfigContainer.ROLLOUT_METADATA_KEY);
+
+    ConfigContainer otherConfigContainer = ConfigContainer.copyOf(configContainerJson);
+
+    assertThat(otherConfigContainer.getRolloutMetadata()).isNotNull();
+    assertThat(otherConfigContainer.getRolloutMetadata().length()).isEqualTo(0);
+  }
+
+  @Test
+  public void copyOfConfigContainer_withRolloutsMetadata_returnsSameRolloutsMetadata()
+      throws Exception {
+    JSONArray affectedParameterKeys = new JSONArray();
+    affectedParameterKeys.put("key_1");
+    affectedParameterKeys.put("key_2");
+
+    JSONArray rolloutsMetadata = new JSONArray();
+    rolloutsMetadata.put(
+        new JSONObject()
+            .put("rolloutId", "1")
+            .put("variantId", "A")
+            .put("affectedParameterKeys", affectedParameterKeys));
+    ConfigContainer configContainer =
+        ConfigContainer.newBuilder().withRolloutMetadata(rolloutsMetadata).build();
+    ConfigContainer otherConfigContainer =
+        ConfigContainer.copyOf(new JSONObject(configContainer.toString()));
+
+    assertThat(otherConfigContainer.getRolloutMetadata().toString())
+        .isEqualTo(rolloutsMetadata.toString());
+  }
+
+  @Test
+  public void configContainer_withRolloutsMetadata_returnsCorrectRolloutsMetadata()
+      throws Exception {
+    JSONArray affectedParameterKeys = new JSONArray();
+    affectedParameterKeys.put("key_1");
+    affectedParameterKeys.put("key_2");
+
+    JSONArray rolloutsMetadata = new JSONArray();
+    rolloutsMetadata.put(
+        new JSONObject()
+            .put("rolloutId", "1")
+            .put("variantId", "A")
+            .put("affectedParameterKeys", affectedParameterKeys));
+    ConfigContainer configContainer =
+        ConfigContainer.newBuilder().withRolloutMetadata(rolloutsMetadata).build();
+
+    assertThat(configContainer.getRolloutMetadata().toString())
+        .isEqualTo(rolloutsMetadata.toString());
+  }
+
+  @Test
+  public void getChangedParams_changedRolloutMetadata_returnsUpdatedKey() throws Exception {
+    JSONArray activeRolloutMetadata = generateNRolloutMetadataEntries(1);
+    JSONArray fetchedRolloutMetadata = generateNRolloutMetadataEntries(1);
+
+    fetchedRolloutMetadata.getJSONObject(0).put("variantId", "B");
+
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("key_1", "value_1"))
+            .withRolloutMetadata(activeRolloutMetadata)
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("key_1", "value_1"))
+            .withRolloutMetadata(fetchedRolloutMetadata)
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).containsExactly("key_1");
+  }
+
+  @Test
+  public void getChangedParams_addedRolloutMetadataToSameKey_returnsUpdatedKey() throws Exception {
+    JSONArray activeRolloutMetadata = generateNRolloutMetadataEntries(1);
+    JSONArray fetchedRolloutMetadata = generateNRolloutMetadataEntries(2);
+
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("key_1", "value_1"))
+            .withRolloutMetadata(activeRolloutMetadata)
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("key_1", "value_1"))
+            .withRolloutMetadata(fetchedRolloutMetadata)
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).containsExactly("key_1");
+  }
+
+  @Test
+  public void getChangedParams_deletedRolloutMetadata_returnsUpdatedKey() throws Exception {
+    JSONArray activeRolloutMetadata = generateNRolloutMetadataEntries(1);
+    JSONArray fetchedRolloutMetadata = new JSONArray();
+
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("key_1", "value_1"))
+            .withRolloutMetadata(activeRolloutMetadata)
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("key_1", "value_1"))
+            .withRolloutMetadata(fetchedRolloutMetadata)
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).containsExactly("key_1");
+  }
+
+  @Test
+  public void getChangedParams_addNewKeyWithRolloutMetadata_returnsUpdatedKey() throws Exception {
+    JSONArray activeRolloutMetadata = generateNRolloutMetadataEntries(1);
+    JSONArray fetchedRolloutMetadata = generateNRolloutMetadataEntries(2);
+
+    fetchedRolloutMetadata.getJSONObject(1).getJSONArray("affectedParameterKeys").put(0, "key_2");
+
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("key_1", "value_1"))
+            .withRolloutMetadata(activeRolloutMetadata)
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("key_1", "value_1", "key_2", "value_2"))
+            .withRolloutMetadata(fetchedRolloutMetadata)
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).containsExactly("key_2");
+  }
+
+  @Test
+  public void getChangedParams_unchangedRolloutMetadata_returnsNoKey() throws Exception {
+    JSONArray activeRolloutMetadata = generateNRolloutMetadataEntries(1);
+    JSONArray fetchedRolloutMetadata = generateNRolloutMetadataEntries(1);
+
+    ConfigContainer config =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("key_1", "value_1"))
+            .withRolloutMetadata(activeRolloutMetadata)
+            .build();
+
+    ConfigContainer other =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(ImmutableMap.of("key_1", "value_1"))
+            .withRolloutMetadata(fetchedRolloutMetadata)
+            .build();
+
+    Set<String> changedParams = config.getChangedParams(other);
+
+    assertThat(changedParams).isEmpty();
+  }
+
+  private static JSONArray generateAbtExperiments(int numExperiments) throws JSONException {
+    JSONArray experiments = new JSONArray();
+    for (int experimentNum = 1; experimentNum <= numExperiments; experimentNum++) {
+      experiments.put(
+          new JSONObject().put(EXPERIMENT_ID, "exp" + experimentNum).put(VARIANT_ID, "var1"));
+    }
+    return experiments;
+  }
+
+  private static ImmutableMap<String, String> generateP13nMetadata(
+      String p13nId, String armIndex, String choiceId, String group) {
+    return ImmutableMap.of(
+        PERSONALIZATION_ID, p13nId, ARM_INDEX, armIndex, CHOICE_ID, choiceId, GROUP, group);
+  }
+
+  private static JSONArray generateNRolloutMetadataEntries(int numberOfMetadata)
+      throws JSONException {
+    JSONArray rolloutMetadata = new JSONArray();
+    for (int i = 1; i <= numberOfMetadata; i++) {
+      rolloutMetadata.put(
+          new JSONObject()
+              .put("rolloutId", "rollout_" + i)
+              .put("variantId", "A")
+              .put("affectedParameterKeys", new JSONArray().put("key_1")));
+    }
+
+    return rolloutMetadata;
+  }
+}
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandlerTest.java b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandlerTest.java
index 5edc639a9fd..22c2f33da3a 100644
--- a/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandlerTest.java
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandlerTest.java
@@ -23,9 +23,11 @@
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.ExperimentDescriptionFieldKey.VARIANT_ID;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.ENTRIES;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.EXPERIMENT_DESCRIPTIONS;
+import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.ROLLOUT_METADATA;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.STATE;
 import static com.google.firebase.remoteconfig.internal.ConfigFetchHandler.BACKOFF_TIME_DURATIONS_IN_MINUTES;
 import static com.google.firebase.remoteconfig.internal.ConfigFetchHandler.DEFAULT_MINIMUM_FETCH_INTERVAL_IN_SECONDS;
+import static com.google.firebase.remoteconfig.internal.ConfigFetchHandler.FIRST_OPEN_TIME_KEY;
 import static com.google.firebase.remoteconfig.internal.ConfigFetchHandler.HTTP_TOO_MANY_REQUESTS;
 import static com.google.firebase.remoteconfig.internal.ConfigMetadataClient.LAST_FETCH_TIME_NO_FETCH_YET;
 import static com.google.firebase.remoteconfig.internal.ConfigMetadataClient.NO_BACKOFF_TIME;
@@ -42,6 +44,7 @@
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
@@ -88,6 +91,7 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 /**
@@ -97,6 +101,7 @@
  */
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
+@LooperMode(LooperMode.Mode.LEGACY)
 public class ConfigFetchHandlerTest {
   private static final String INSTALLATION_ID = "'fL71_VyL3uo9jNMWu1L60S";
   private static final String INSTALLATION_AUTH_TOKEN =
@@ -195,6 +200,7 @@ public void fetch_firstFetch_includesInstallationAuthToken() throws Exception {
             /* analyticsUserProperties= */ any(),
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
+            /* firstOpenTime= */ any(),
             /* currentTime= */ any());
   }
 
@@ -394,7 +400,7 @@ public void fetch_gettingFetchCacheFails_doesNotThrowException() throws Exceptio
 
   @Test
   public void fetch_fetchBackendCallFails_taskThrowsException() throws Exception {
-    when(mockBackendFetchApiClient.fetch(any(), any(), any(), any(), any(), any(), any()))
+    when(mockBackendFetchApiClient.fetch(any(), any(), any(), any(), any(), any(), any(), any()))
         .thenThrow(
             new FirebaseRemoteConfigClientException("Fetch failed due to an unexpected error."));
 
@@ -476,6 +482,31 @@ public void fetch_hasAbtExperiments_storesExperiments() throws Exception {
         containerWithExperiments.toString(), captor.getValue().toString(), false);
   }
 
+  @Test
+  public void fetch_hasRolloutMetadata_storesMetadata() throws Exception {
+    JSONArray affectedParameterKeys = new JSONArray();
+    affectedParameterKeys.put("key_1");
+    affectedParameterKeys.put("key_2");
+
+    JSONArray rolloutsMetadata = new JSONArray();
+    rolloutsMetadata.put(
+        new JSONObject()
+            .put("rolloutId", "1")
+            .put("variantId", "A")
+            .put("affectedParameterKeys", affectedParameterKeys));
+    ConfigContainer configContainer =
+        ConfigContainer.newBuilder(firstFetchedContainer)
+            .withRolloutMetadata(rolloutsMetadata)
+            .build();
+    ArgumentCaptor<ConfigContainer> captor = ArgumentCaptor.forClass(ConfigContainer.class);
+
+    fetchCallToHttpClientUpdatesClockAndReturnsConfig(configContainer);
+    fetchHandler.fetch();
+
+    verify(mockFetchedCache).put(captor.capture());
+    JSONAssert.assertEquals(configContainer.toString(), captor.getValue().toString(), false);
+  }
+
   @Test
   public void fetch_getsThrottledResponseFromServer_backsOffOnSecondCall() throws Exception {
     fetchCallToBackendThrowsException(HTTP_TOO_MANY_REQUESTS);
@@ -628,21 +659,45 @@ public void fetch_serverReturnsUnexpectedCode_throwsServerException() throws Exc
   }
 
   @Test
-  public void fetch_hasAnalyticsSdk_sendsUserProperties() throws Exception {
+  public void fetch_hasAnalyticsSdk_sendsUserPropertiesAndFirstOpenTime() throws Exception {
     // Provide the mock Analytics SDK.
     AnalyticsConnector mockAnalyticsConnector = mock(AnalyticsConnector.class);
     fetchHandler = getNewFetchHandler(mockAnalyticsConnector);
+    long firstOpenTime = 1636146000000L;
 
-    Map<String, String> userProperties =
+    Map<String, String> customUserProperties =
         ImmutableMap.of("up_key1", "up_val1", "up_key2", "up_val2");
+    Map<String, Object> allUserProperties =
+        ImmutableMap.of(
+            "up_key1", "up_val1", "up_key2", "up_val2", FIRST_OPEN_TIME_KEY, firstOpenTime);
     when(mockAnalyticsConnector.getUserProperties(/*includeInternal=*/ false))
+        .thenReturn(ImmutableMap.copyOf(customUserProperties));
+    when(mockAnalyticsConnector.getUserProperties(/*includeInternal=*/ true))
+        .thenReturn(ImmutableMap.copyOf(allUserProperties));
+
+    fetchCallToHttpClientUpdatesClockAndReturnsConfig(firstFetchedContainer);
+
+    assertWithMessage("Fetch() failed!").that(fetchHandler.fetch().isSuccessful()).isTrue();
+
+    verifyBackendIsCalled(customUserProperties, firstOpenTime);
+  }
+
+  @Test
+  public void fetch_hasAnalyticsSdk_sendsUserPropertiesNoFirstOpenTime() throws Exception {
+    // Provide the mock Analytics SDK.
+    AnalyticsConnector mockAnalyticsConnector = mock(AnalyticsConnector.class);
+    fetchHandler = getNewFetchHandler(mockAnalyticsConnector);
+
+    Map<String, String> userProperties =
+        ImmutableMap.of("up_key1", "up_val1", "up_key2", "up_val2");
+    when(mockAnalyticsConnector.getUserProperties(anyBoolean()))
         .thenReturn(ImmutableMap.copyOf(userProperties));
 
     fetchCallToHttpClientUpdatesClockAndReturnsConfig(firstFetchedContainer);
 
     assertWithMessage("Fetch() failed!").that(fetchHandler.fetch().isSuccessful()).isTrue();
 
-    verifyBackendIsCalled(userProperties);
+    verifyBackendIsCalled(userProperties, null);
   }
 
   @Test
@@ -735,12 +790,14 @@ private void setBackendResponseConfigsTo(ConfigContainer container) throws Excep
     }
 
     JSONArray experiments = container.getAbtExperiments();
+    JSONArray rolloutMetadata = container.getRolloutMetadata();
 
     doReturn(
             toFetchResponse(
                 "UPDATE",
                 new JSONObject(configEntries),
                 experiments,
+                rolloutMetadata,
                 responseETag,
                 container.getFetchTime()))
         .when(mockBackendFetchApiClient)
@@ -751,6 +808,7 @@ private void setBackendResponseConfigsTo(ConfigContainer container) throws Excep
             /* analyticsUserProperties= */ any(),
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
+            /* firstOpenTime= */ any(),
             /* currentTime= */ any());
   }
 
@@ -762,8 +820,9 @@ private void setBackendResponseToNoChange(Date date) throws Exception {
             /* analyticsUserProperties= */ any(),
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
+            /* firstOpenTime= */ any(),
             /* currentTime= */ any()))
-        .thenReturn(FetchResponse.forBackendHasNoUpdates(date));
+        .thenReturn(FetchResponse.forBackendHasNoUpdates(date, firstFetchedContainer));
   }
 
   private void fetchCallToBackendThrowsException(int httpErrorCode) throws Exception {
@@ -776,6 +835,7 @@ private void fetchCallToBackendThrowsException(int httpErrorCode) throws Excepti
             /* analyticsUserProperties= */ any(),
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
+            /* firstOpenTime= */ any(),
             /* currentTime= */ any());
   }
 
@@ -855,10 +915,12 @@ private void verifyBackendIsCalled() throws Exception {
             /* analyticsUserProperties= */ any(),
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
+            /* firstOpenTime= */ any(),
             /* currentTime= */ any());
   }
 
-  private void verifyBackendIsCalled(Map<String, String> userProperties) throws Exception {
+  private void verifyBackendIsCalled(Map<String, String> userProperties, Long firstOpenTime)
+      throws Exception {
     verify(mockBackendFetchApiClient)
         .fetch(
             any(HttpURLConnection.class),
@@ -867,6 +929,7 @@ private void verifyBackendIsCalled(Map<String, String> userProperties) throws Ex
             /* analyticsUserProperties= */ eq(userProperties),
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
+            /* firstOpenTime= */ eq(firstOpenTime),
             /* currentTime= */ any());
   }
 
@@ -879,6 +942,7 @@ private void verifyBackendIsNeverCalled() throws Exception {
             /* analyticsUserProperties= */ any(),
             /* lastFetchETag= */ any(),
             /* customHeaders= */ any(),
+            /* firstOpenTime= */ any(),
             /* currentTime= */ any());
   }
 
@@ -891,6 +955,7 @@ private void verifyETags(@Nullable String requestETag, String responseETag) thro
             /* analyticsUserProperties= */ any(),
             /* lastFetchETag= */ eq(requestETag),
             /* customHeaders= */ any(),
+            /* firstOpenTime= */ any(),
             /* currentTime= */ any());
     assertThat(metadataClient.getLastFetchETag()).isEqualTo(responseETag);
   }
@@ -982,12 +1047,18 @@ private static JSONArray generateAbtExperiments(int numExperiments) throws JSONE
   }
 
   private static FetchResponse toFetchResponse(
-      String status, JSONObject entries, JSONArray experiments, String eTag, Date currentTime)
+      String status,
+      JSONObject entries,
+      JSONArray experiments,
+      JSONArray rolloutMetadata,
+      String eTag,
+      Date currentTime)
       throws Exception {
     JSONObject fetchResponse = new JSONObject();
     fetchResponse.put(STATE, status);
     fetchResponse.put(ENTRIES, entries);
     fetchResponse.put(EXPERIMENT_DESCRIPTIONS, experiments);
+    fetchResponse.put(ROLLOUT_METADATA, rolloutMetadata);
     ConfigContainer fetchedConfigs = extractConfigs(fetchResponse, currentTime);
     return FetchResponse.forBackendUpdatesFetched(fetchedConfigs, eTag);
   }
@@ -998,10 +1069,13 @@ private static ConfigContainer extractConfigs(JSONObject fetchResponse, Date fet
         ConfigContainer.newBuilder().withFetchTime(fetchTime);
 
     JSONObject entries = fetchResponse.getJSONObject(ENTRIES);
-    containerBuilder.replaceConfigsWith(entries);
+    containerBuilder = containerBuilder.replaceConfigsWith(entries);
 
     JSONArray experimentDescriptions = fetchResponse.getJSONArray(EXPERIMENT_DESCRIPTIONS);
-    containerBuilder.withAbtExperiments(experimentDescriptions);
+    containerBuilder = containerBuilder.withAbtExperiments(experimentDescriptions);
+
+    JSONArray rolloutMetadata = fetchResponse.getJSONArray(ROLLOUT_METADATA);
+    containerBuilder = containerBuilder.withRolloutMetadata(rolloutMetadata);
 
     return containerBuilder.build();
   }
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHttpClientTest.java b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHttpClientTest.java
index 6cf1f525810..b1572b7ac52 100644
--- a/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHttpClientTest.java
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHttpClientTest.java
@@ -24,6 +24,7 @@
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.APP_ID;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.APP_VERSION;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.COUNTRY_CODE;
+import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.FIRST_OPEN_TIME;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.INSTANCE_ID;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.INSTANCE_ID_TOKEN;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.LANGUAGE_CODE;
@@ -33,7 +34,9 @@
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.RequestFieldKey.TIME_ZONE;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.ENTRIES;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.EXPERIMENT_DESCRIPTIONS;
+import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.ROLLOUT_METADATA;
 import static com.google.firebase.remoteconfig.RemoteConfigConstants.ResponseFieldKey.STATE;
+import static com.google.firebase.remoteconfig.testutil.Assert.assertFalse;
 import static com.google.firebase.remoteconfig.testutil.Assert.assertThrows;
 import static org.mockito.MockitoAnnotations.initMocks;
 
@@ -124,7 +127,17 @@ public void setUp() throws Exception {
                             .put("trigger_event", "event_trigger_1")
                             .put("experiment_start_time", "2017-10-30T21:46:40Z")
                             .put("trigger_timeout", "15552000s")
-                            .put("time_to_live", "7776000s")));
+                            .put("time_to_live", "7776000s")))
+            .put(
+                ROLLOUT_METADATA,
+                new JSONArray()
+                    .put(
+                        new JSONObject()
+                            .put("rolloutId", "1")
+                            .put("variantId", "A")
+                            .put(
+                                "affectedParameterKeys",
+                                new JSONArray().put("key_1").put("key_2"))));
     noChangeResponseBody = new JSONObject().put(STATE, "NO_CHANGE");
 
     fakeHttpURLConnection =
@@ -154,18 +167,22 @@ public void fetch_newValues_responseSet() throws Exception {
         .isEqualTo(hasChangeResponseBody.getJSONObject(ENTRIES).toString());
     assertThat(response.getFetchedConfigs().getAbtExperiments().toString())
         .isEqualTo(hasChangeResponseBody.getJSONArray(EXPERIMENT_DESCRIPTIONS).toString());
+    assertThat(response.getFetchedConfigs().getRolloutMetadata().toString())
+        .isEqualTo(hasChangeResponseBody.getJSONArray(ROLLOUT_METADATA).toString());
     assertThat(response.getFetchedConfigs().getFetchTime())
         .isEqualTo(new Date(mockClock.currentTimeMillis()));
   }
 
   @Test
-  public void fetch_noChange_responseNotSet() throws Exception {
+  public void fetch_noChange_responseOnlyContainsTemplateVersion() throws Exception {
     setServerResponseTo(noChangeResponseBody, SECOND_ETAG);
 
     FetchResponse response = fetch(SECOND_ETAG);
 
     assertThat(response.getLastFetchETag()).isNull();
-    assertThat(response.getFetchedConfigs()).isNull();
+    assertThat(response.getFetchedConfigs()).isNotNull();
+    assertThat(response.getFetchedConfigs().getTemplateVersionNumber()).isNotNull();
+    assertThat(response.getFetchedConfigs().getConfigs().length()).isEqualTo(0);
   }
 
   @Test
@@ -187,7 +204,7 @@ public void fetch_setsAllHeaders_sendsAllHeadersToServer() throws Exception {
     // Custom user-defined headers.
     expectedHeaders.putAll(customHeaders);
 
-    fetch(FIRST_ETAG, /* userProperties= */ ImmutableMap.of(), customHeaders);
+    fetch(FIRST_ETAG, customHeaders);
 
     assertThat(fakeHttpURLConnection.getRequestHeaders()).isEqualTo(expectedHeaders);
   }
@@ -195,9 +212,13 @@ public void fetch_setsAllHeaders_sendsAllHeadersToServer() throws Exception {
   @Test
   public void fetch_setsAllElementsOfRequestBody_sendsRequestBodyToServer() throws Exception {
     setServerResponseTo(noChangeResponseBody, SECOND_ETAG);
-    Map<String, String> userProperties = ImmutableMap.of("up1", "hello", "up2", "world");
+    Map<String, String> customUserProperties = ImmutableMap.of("up1", "hello", "up2", "world");
 
-    fetch(FIRST_ETAG, userProperties);
+    long firstOpenTimeEpochFromMillis = 1636146000000L;
+    // ISO-8601 value corresponding to 1636146000000 ms-from-epoch in UTC
+    String firstOpenTimeIsoString = "2021-11-05T21:00:00.000Z";
+
+    fetch(FIRST_ETAG, customUserProperties, firstOpenTimeEpochFromMillis);
 
     JSONObject requestBody = new JSONObject(fakeHttpURLConnection.getOutputStream().toString());
     assertThat(requestBody.get(INSTANCE_ID)).isEqualTo(INSTALLATION_ID_STRING);
@@ -215,38 +236,55 @@ public void fetch_setsAllElementsOfRequestBody_sendsRequestBodyToServer() throws
         .isEqualTo(Long.toString(packageInfo.getLongVersionCode()));
     assertThat(requestBody.get(PACKAGE_NAME)).isEqualTo(context.getPackageName());
     assertThat(requestBody.get(SDK_VERSION)).isEqualTo(BuildConfig.VERSION_NAME);
+    assertThat(requestBody.get(FIRST_OPEN_TIME)).isEqualTo(firstOpenTimeIsoString);
     assertThat(requestBody.getJSONObject(ANALYTICS_USER_PROPERTIES).toString())
-        .isEqualTo(new JSONObject(userProperties).toString());
+        .isEqualTo(new JSONObject(customUserProperties).toString());
   }
 
   @Test
-  public void fetch_requestEncodesLanguageSubtags() throws Exception {
-    String languageTag = "zh-Hant-TW"; // Taiwan Chinese in traditional script
-    context.getResources().getConfiguration().setLocale(Locale.forLanguageTag(languageTag));
+  public void fetch_nullFirstOpenTime_fieldNotPresentInRequestBody() throws Exception {
+    setServerResponseTo(noChangeResponseBody, SECOND_ETAG);
+    Map<String, String> customUserProperties = ImmutableMap.of("up1", "hello", "up2", "world");
+
+    fetch(FIRST_ETAG, customUserProperties, null);
+
+    JSONObject requestBody = new JSONObject(fakeHttpURLConnection.getOutputStream().toString());
+
+    assertThat(requestBody.getJSONObject(ANALYTICS_USER_PROPERTIES).toString())
+        .isEqualTo(new JSONObject(customUserProperties).toString());
+    assertFalse(requestBody.has(FIRST_OPEN_TIME));
+  }
+
+  @Test
+  public void fetch_firstOpenTimeFromNonEnglishLanguageLocale_digitsInEnglishInRequestBody()
+      throws Exception {
+    String languageTag = "ar-AE"; // Language Tag for UAE Arabic
+    Locale.setDefault(Locale.forLanguageTag(languageTag));
 
     setServerResponseTo(noChangeResponseBody, SECOND_ETAG);
 
-    Map<String, String> userProperties = ImmutableMap.of("up1", "hello", "up2", "world");
-    fetch(FIRST_ETAG, userProperties);
+    Map<String, String> customUserProperties = ImmutableMap.of("up1", "hello", "up2", "world");
+    long firstOpenTimeEpochFromMillis = 1636146000000L;
+    // ISO-8601 value corresponding to 1636146000000 ms-from-epoch in UTC
+    String firstOpenTimeIsoString = "2021-11-05T21:00:00.000Z";
+
+    fetch(FIRST_ETAG, customUserProperties, firstOpenTimeEpochFromMillis);
 
     JSONObject requestBody = new JSONObject(fakeHttpURLConnection.getOutputStream().toString());
-    assertThat(requestBody.get(LANGUAGE_CODE)).isEqualTo(languageTag);
+    assertThat(requestBody.get(FIRST_OPEN_TIME)).isEqualTo(firstOpenTimeIsoString);
   }
 
   @Test
-  @Config(sdk = Build.VERSION_CODES.KITKAT /* 19 */)
-  public void fetch_localeUsesToStringBelowLollipop() throws Exception {
+  public void fetch_requestEncodesLanguageSubtags() throws Exception {
     String languageTag = "zh-Hant-TW"; // Taiwan Chinese in traditional script
-    String languageString = "zh_TW_#Hant";
     context.getResources().getConfiguration().setLocale(Locale.forLanguageTag(languageTag));
 
     setServerResponseTo(noChangeResponseBody, SECOND_ETAG);
 
-    Map<String, String> userProperties = ImmutableMap.of("up1", "hello", "up2", "world");
-    fetch(FIRST_ETAG, userProperties);
+    fetch(FIRST_ETAG);
 
     JSONObject requestBody = new JSONObject(fakeHttpURLConnection.getOutputStream().toString());
-    assertThat(requestBody.get(LANGUAGE_CODE)).isEqualTo(languageString);
+    assertThat(requestBody.get(LANGUAGE_CODE)).isEqualTo(languageTag);
   }
 
   @Test
@@ -306,10 +344,12 @@ private FetchResponse fetch(String eTag) throws Exception {
         /* analyticsUserProperties= */ ImmutableMap.of(),
         eTag,
         /* customHeaders= */ ImmutableMap.of(),
+        /* firstOpenTime= */ null,
         /* currentTime= */ new Date(mockClock.currentTimeMillis()));
   }
 
-  private FetchResponse fetch(String eTag, Map<String, String> userProperties) throws Exception {
+  private FetchResponse fetch(String eTag, Map<String, String> userProperties, Long firstOpenTime)
+      throws Exception {
     return configFetchHttpClient.fetch(
         fakeHttpURLConnection,
         INSTALLATION_ID_STRING,
@@ -317,19 +357,19 @@ private FetchResponse fetch(String eTag, Map<String, String> userProperties) thr
         userProperties,
         eTag,
         /* customHeaders= */ ImmutableMap.of(),
+        firstOpenTime,
         new Date(mockClock.currentTimeMillis()));
   }
 
-  private FetchResponse fetch(
-      String eTag, Map<String, String> userProperties, Map<String, String> customHeaders)
-      throws Exception {
+  private FetchResponse fetch(String eTag, Map<String, String> customHeaders) throws Exception {
     return configFetchHttpClient.fetch(
         fakeHttpURLConnection,
         INSTALLATION_ID_STRING,
         INSTALLATION_AUTH_TOKEN_STRING,
-        userProperties,
+        /* analyticsUserProperties= */ ImmutableMap.of(),
         eTag,
         customHeaders,
+        /* firstOpenTime= */ null,
         new Date(mockClock.currentTimeMillis()));
   }
 
@@ -341,6 +381,7 @@ private FetchResponse fetchWithoutInstallationId() throws Exception {
         /* analyticsUserProperties= */ ImmutableMap.of(),
         /* lastFetchETag= */ "bogus-etag",
         /* customHeaders= */ ImmutableMap.of(),
+        /* firstOpenTime= */ null,
         new Date(mockClock.currentTimeMillis()));
   }
 
@@ -352,6 +393,7 @@ private FetchResponse fetchWithoutInstallationAuthToken() throws Exception {
         /* analyticsUserProperties= */ ImmutableMap.of(),
         /* lastFetchETag= */ "bogus-etag",
         /* customHeaders= */ ImmutableMap.of(),
+        /* firstOpenTime= */ null,
         new Date(mockClock.currentTimeMillis()));
   }
 
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigGetParameterHandlerTest.java b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigGetParameterHandlerTest.java
index 1bfd6d29e2d..e226c488cd4 100644
--- a/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigGetParameterHandlerTest.java
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigGetParameterHandlerTest.java
@@ -21,8 +21,12 @@
 import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.DEFAULT_VALUE_FOR_LONG;
 import static com.google.firebase.remoteconfig.FirebaseRemoteConfig.DEFAULT_VALUE_FOR_STRING;
 import static com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler.FRC_BYTE_ARRAY_ENCODING;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.google.android.gms.common.util.BiConsumer;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
 import com.google.common.collect.ImmutableMap;
@@ -77,6 +81,7 @@ public class ConfigGetParameterHandlerTest {
 
   @Mock private ConfigCacheClient mockActivatedCache;
   @Mock private ConfigCacheClient mockDefaultsCache;
+  @Mock private BiConsumer<String, ConfigContainer> mockListener;
 
   private ConfigGetParameterHandler getHandler;
 
@@ -172,6 +177,19 @@ public void getString_activatedStillLoadingFromDisk_blocksAndReturnsActivatedVal
     assertThat(stringValue).isEqualTo(ACTIVATED_STRING_VALUE);
   }
 
+  @Test
+  public void getString_activatedKeyExists_callsListeners() throws Exception {
+    loadActivatedCacheWithMap(ImmutableMap.of(STRING_KEY, ACTIVATED_STRING_VALUE));
+    loadCacheWithConfig(mockDefaultsCache, /*container=*/ null);
+
+    getHandler.addListener(this.mockListener);
+
+    String stringValue = getHandler.getString(STRING_KEY);
+
+    assertThat(stringValue).isEqualTo(ACTIVATED_STRING_VALUE);
+    verify(this.mockListener).accept(eq(STRING_KEY), any(ConfigContainer.class));
+  }
+
   @Test
   public void getBoolean_activatedAndDefaultsKeysExist_returnsActivatedValue() throws Exception {
     loadActivatedCacheWithMap(ImmutableMap.of(BOOLEAN_KEY, ACTIVATED_BOOLEAN_STRING_VALUE));
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigMetadataClientTest.java b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigMetadataClientTest.java
index f952346d734..6113da3ffb4 100644
--- a/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigMetadataClientTest.java
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigMetadataClientTest.java
@@ -142,6 +142,58 @@ public void getLastFetchETag_isSet_returnsETag() {
     assertThat(eTag).isEqualTo(expectedETag);
   }
 
+  @Test
+  public void getLastTemplateVersion_isNotSet_returnsDefault() {
+    assertThat(metadataClient.getLastTemplateVersion()).isEqualTo(0);
+  }
+
+  @Test
+  public void getLastTemplateVersion_isSet_returnsTemplateVersion() {
+    metadataClient.setLastTemplateVersion(1);
+    assertThat(metadataClient.getLastTemplateVersion()).isEqualTo(1);
+  }
+
+  @Test
+  public void getRealtimeBackoffMetadata_isNotSet_returnsNoFailedStreamsAndNotThrottled() {
+    ConfigMetadataClient.RealtimeBackoffMetadata defaultRealtimeBackoffMetadata =
+        metadataClient.getRealtimeBackoffMetadata();
+
+    assertThat(defaultRealtimeBackoffMetadata.getNumFailedStreams()).isEqualTo(NO_FAILED_FETCHES);
+    assertThat(defaultRealtimeBackoffMetadata.getBackoffEndTime()).isEqualTo(NO_BACKOFF_TIME);
+  }
+
+  @Test
+  public void getRealtimeBackoffMetadata_hasValues_returnsValues() {
+    int numFailedStreams = 5;
+    Date backoffEndTime = new Date(1000L);
+    metadataClient.setRealtimeBackoffMetadata(numFailedStreams, backoffEndTime);
+
+    ConfigMetadataClient.RealtimeBackoffMetadata backoffMetadata =
+        metadataClient.getRealtimeBackoffMetadata();
+
+    assertThat(backoffMetadata.getNumFailedStreams()).isEqualTo(numFailedStreams);
+    assertThat(backoffMetadata.getBackoffEndTime()).isEqualTo(backoffEndTime);
+  }
+
+  @Test
+  public void resetRealtimeBackoff_hasValues_clearsAllValues() {
+    metadataClient.setRealtimeBackoffMetadata(
+        /*numFailedStreams=*/ 5, /*backoffEndTime=*/ new Date(1000L));
+
+    ConfigMetadataClient.RealtimeBackoffMetadata realtimeBackoffMetadata =
+        metadataClient.getRealtimeBackoffMetadata();
+    Preconditions.checkArgument(realtimeBackoffMetadata.getNumFailedStreams() != NO_FAILED_FETCHES);
+    Preconditions.checkArgument(
+        !realtimeBackoffMetadata.getBackoffEndTime().equals(NO_BACKOFF_TIME));
+
+    metadataClient.resetRealtimeBackoff();
+
+    ConfigMetadataClient.RealtimeBackoffMetadata resetMetadata =
+        metadataClient.getRealtimeBackoffMetadata();
+    assertThat(resetMetadata.getNumFailedStreams()).isEqualTo(NO_FAILED_FETCHES);
+    assertThat(resetMetadata.getBackoffEndTime()).isEqualTo(NO_BACKOFF_TIME);
+  }
+
   @Test
   public void getBackoffMetadata_isNotSet_returnsNoFailedFetchesAndNotThrottled() {
     BackoffMetadata defaultBackoffMetadata = metadataClient.getBackoffMetadata();
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/rollouts/RolloutsStateFactoryTest.java b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/rollouts/RolloutsStateFactoryTest.java
new file mode 100644
index 00000000000..954993e3e4b
--- /dev/null
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/rollouts/RolloutsStateFactoryTest.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.internal.rollouts;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.remoteconfig.testutil.Assert.assertThrows;
+import static org.mockito.Mockito.when;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigClientException;
+import com.google.firebase.remoteconfig.internal.ConfigCacheClient;
+import com.google.firebase.remoteconfig.internal.ConfigContainer;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutsState;
+import java.util.HashMap;
+import java.util.Map;
+import org.json.JSONArray;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class RolloutsStateFactoryTest {
+  @Mock ConfigCacheClient activatedConfigsCache;
+
+  @Mock ConfigCacheClient defaultConfigsCache;
+
+  private static final String PARAMETER_KEY = "my_feature";
+  private static final String PARAMETER_VALUE = "true";
+
+  private static final RolloutAssignment rolloutAssignment =
+      RolloutAssignment.builder()
+          .setRolloutId("rollout_1")
+          .setVariantId("control")
+          .setParameterKey(PARAMETER_KEY)
+          .setParameterValue(PARAMETER_VALUE)
+          .setTemplateVersion(1L)
+          .build();
+  private static final RolloutsState rolloutsState =
+      RolloutsState.create(ImmutableSet.of(rolloutAssignment));
+  private static ConfigContainer configContainerWithRollout;
+  private static ConfigContainer configContainerWithoutRollout;
+
+  private RolloutsStateFactory factory;
+
+  @Before
+  public void setUp() throws Exception {
+    MockitoAnnotations.initMocks(this);
+
+    Map<String, String> configsMap = new HashMap<>();
+    configsMap.put(PARAMETER_KEY, PARAMETER_VALUE);
+
+    configContainerWithRollout =
+        ConfigContainer.newBuilder()
+            .replaceConfigsWith(configsMap)
+            .withRolloutMetadata(
+                new JSONArray(
+                    "["
+                        + "{"
+                        + "\"rolloutId\": \"rollout_1\","
+                        + "\"variantId\": \"control\","
+                        + "\"affectedParameterKeys\": [\""
+                        + PARAMETER_KEY
+                        + "\"]"
+                        + "}]"))
+            .withTemplateVersionNumber(1L)
+            .build();
+    configContainerWithoutRollout = ConfigContainer.newBuilder().build();
+
+    factory = new RolloutsStateFactory(activatedConfigsCache, defaultConfigsCache);
+  }
+
+  @Test
+  public void getActiveRolloutsState_noRollouts_returnsEmptyState() throws Exception {
+    RolloutsState actual = factory.getActiveRolloutsState(configContainerWithoutRollout);
+
+    assertThat(actual).isEqualTo(RolloutsState.create(ImmutableSet.of()));
+  }
+
+  @Test
+  public void getActiveRolloutsState_hasRolloutsMetadata_populatesRolloutsState() throws Exception {
+    when(activatedConfigsCache.getBlocking()).thenReturn(configContainerWithRollout);
+
+    RolloutsState actual = factory.getActiveRolloutsState(configContainerWithRollout);
+
+    assertThat(actual).isEqualTo(rolloutsState);
+  }
+
+  @Test
+  public void
+      getActiveRolloutsState_hasRolloutsMetadata_noActivatedCacheValue_populatesRolloutsStateFromDefault()
+          throws Exception {
+    when(activatedConfigsCache.getBlocking()).thenReturn(configContainerWithoutRollout);
+    when(defaultConfigsCache.getBlocking()).thenReturn(configContainerWithRollout);
+
+    RolloutsState actual = factory.getActiveRolloutsState(configContainerWithRollout);
+
+    assertThat(actual).isEqualTo(rolloutsState);
+  }
+
+  @Test
+  public void getActiveRolloutsState_rolloutsMetadataMultipleKeys_keepsFirstKey() throws Exception {
+    when(activatedConfigsCache.getBlocking()).thenReturn(configContainerWithRollout);
+
+    // Add a key to affectedParameterKeys in configContainerWithRollout
+    ConfigContainer configContainerWithRolloutWithMultipleKeys =
+        ConfigContainer.newBuilder()
+            .withRolloutMetadata(
+                new JSONArray(
+                    "["
+                        + "{"
+                        + "\"rolloutId\": \"rollout_1\","
+                        + "\"variantId\": \"control\","
+                        + "\"affectedParameterKeys\": [\""
+                        + PARAMETER_KEY
+                        + "\", \"second_key\""
+                        + "]"
+                        + "}]"))
+            .withTemplateVersionNumber(1L)
+            .build();
+
+    RolloutsState actual =
+        factory.getActiveRolloutsState(configContainerWithRolloutWithMultipleKeys);
+
+    assertThat(actual).isEqualTo(rolloutsState);
+  }
+
+  @Test
+  public void getActiveRolloutsState_jsonException_throwsRemoteConfigException() throws Exception {
+    when(activatedConfigsCache.getBlocking()).thenReturn(configContainerWithRollout);
+    JSONArray rolloutMetadataMissingVariantId =
+        new JSONArray(
+            "["
+                + "{"
+                + "\"rollout_id\": \"rollout_1\","
+                + "\"affected_parameter_keys\": [\""
+                + PARAMETER_KEY
+                + "\"]"
+                + "}]");
+
+    assertThrows(
+        FirebaseRemoteConfigClientException.class,
+        () ->
+            factory.getActiveRolloutsState(
+                ConfigContainer.newBuilder()
+                    .withRolloutMetadata(rolloutMetadataMissingVariantId)
+                    .build()));
+  }
+}
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/rollouts/RolloutsStateSubscriptionsHandlerTest.java b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/rollouts/RolloutsStateSubscriptionsHandlerTest.java
new file mode 100644
index 00000000000..f6ba08ef748
--- /dev/null
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/rollouts/RolloutsStateSubscriptionsHandlerTest.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.internal.rollouts;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import com.google.android.gms.tasks.Tasks;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigClientException;
+import com.google.firebase.remoteconfig.internal.ConfigCacheClient;
+import com.google.firebase.remoteconfig.internal.ConfigContainer;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutsState;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutsStateSubscriber;
+import java.util.concurrent.Executor;
+import org.json.JSONArray;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class RolloutsStateSubscriptionsHandlerTest {
+  @Mock ConfigCacheClient mockActivatedConfigsCache;
+  @Mock RolloutsStateFactory mockRolloutsStateFactory;
+  @Mock RolloutsStateSubscriber mockRolloutsStateSubscriber;
+
+  private Executor executor;
+  private RolloutsStateSubscriptionsHandler handler;
+
+  private static ConfigContainer configWithoutRollouts;
+  private static final RolloutsState rolloutsStateWithoutAssignments =
+      RolloutsState.create(ImmutableSet.of());
+
+  private static ConfigContainer configWithRollouts;
+  private static final RolloutAssignment rolloutAssignment =
+      RolloutAssignment.builder()
+          .setRolloutId("rollout_1")
+          .setVariantId("control")
+          .setParameterKey("my_feature")
+          .setParameterValue("true")
+          .setTemplateVersion(1L)
+          .build();
+  private static final RolloutsState rolloutsState =
+      RolloutsState.create(ImmutableSet.of(rolloutAssignment));
+
+  @Before
+  public void setUp() throws Exception {
+    MockitoAnnotations.initMocks(this);
+
+    executor = MoreExecutors.directExecutor();
+
+    configWithoutRollouts = ConfigContainer.newBuilder().build();
+
+    configWithRollouts =
+        ConfigContainer.newBuilder()
+            .withRolloutMetadata(
+                new JSONArray(
+                    "["
+                        + "{"
+                        + "\"rollout_id\": \"rollout_1\","
+                        + "\"variant_id\": \"control\","
+                        + "\"affected_parameter_keys\": [\"my_feature\"]"
+                        + "}]"))
+            .build();
+
+    handler =
+        new RolloutsStateSubscriptionsHandler(
+            mockActivatedConfigsCache, mockRolloutsStateFactory, executor);
+  }
+
+  @Test
+  public void registerRolloutsStateSubscriber_noActiveRolloutsState_callsSubscriber()
+      throws Exception {
+    when(mockActivatedConfigsCache.get()).thenReturn(Tasks.forResult(configWithoutRollouts));
+    when(mockRolloutsStateFactory.getActiveRolloutsState(any()))
+        .thenReturn(rolloutsStateWithoutAssignments);
+
+    handler.registerRolloutsStateSubscriber(mockRolloutsStateSubscriber);
+
+    verify(mockRolloutsStateSubscriber).onRolloutsStateChanged(rolloutsStateWithoutAssignments);
+  }
+
+  @Test
+  public void registerRolloutsStateSubscriber_activeRollouts_callsSubscriber() throws Exception {
+    when(mockActivatedConfigsCache.get()).thenReturn(Tasks.forResult(configWithRollouts));
+    when(mockRolloutsStateFactory.getActiveRolloutsState(any())).thenReturn(rolloutsState);
+
+    handler.registerRolloutsStateSubscriber(mockRolloutsStateSubscriber);
+
+    verify(mockRolloutsStateSubscriber).onRolloutsStateChanged(rolloutsState);
+  }
+
+  @Test
+  public void registerRolloutsStateSubscriber_exceptionGettingState_doesNotThrow()
+      throws Exception {
+    when(mockActivatedConfigsCache.get()).thenReturn(Tasks.forResult(configWithRollouts));
+    when(mockRolloutsStateFactory.getActiveRolloutsState(any()))
+        .thenThrow(new FirebaseRemoteConfigClientException("Exception getting rollouts state."));
+
+    handler.registerRolloutsStateSubscriber(mockRolloutsStateSubscriber);
+
+    // Exception isn't thrown, and the subscriber won't be called.
+    verifyNoInteractions(mockRolloutsStateSubscriber);
+  }
+
+  @Test
+  public void publishActiveRolloutsState_assignmentsAdded_callsSubscribersWithAssignments()
+      throws Exception {
+    when(mockActivatedConfigsCache.get()).thenReturn(Tasks.forResult(configWithoutRollouts));
+    when(mockRolloutsStateFactory.getActiveRolloutsState(any()))
+        .thenReturn(rolloutsStateWithoutAssignments)
+        .thenReturn(rolloutsState);
+
+    // When the subscriber is added, it should be called without rollout assignments.
+    handler.registerRolloutsStateSubscriber(mockRolloutsStateSubscriber);
+    verify(mockRolloutsStateSubscriber).onRolloutsStateChanged(rolloutsStateWithoutAssignments);
+
+    // Then some rollouts are assigned.
+    handler.publishActiveRolloutsState(configWithoutRollouts);
+    verify(mockRolloutsStateSubscriber).onRolloutsStateChanged(rolloutsState);
+  }
+
+  @Test
+  public void publishActiveRolloutsState_assignmentsRemoved_callsSubscribersWithoutAssignments()
+      throws Exception {
+    when(mockActivatedConfigsCache.get()).thenReturn(Tasks.forResult(configWithoutRollouts));
+    when(mockRolloutsStateFactory.getActiveRolloutsState(any()))
+        .thenReturn(rolloutsState)
+        .thenReturn(rolloutsStateWithoutAssignments);
+
+    // When the subscriber is added, it should be called with the assigned rollouts.
+    handler.registerRolloutsStateSubscriber(mockRolloutsStateSubscriber);
+    verify(mockRolloutsStateSubscriber).onRolloutsStateChanged(rolloutsState);
+
+    // Then assignments are removed.
+    handler.publishActiveRolloutsState(configWithoutRollouts);
+    verify(mockRolloutsStateSubscriber).onRolloutsStateChanged(rolloutsStateWithoutAssignments);
+  }
+
+  @Test
+  public void publishActiveRolloutsState_exceptionGettingState_doesNotThrow() throws Exception {
+    when(mockActivatedConfigsCache.get()).thenReturn(Tasks.forResult(configWithoutRollouts));
+    when(mockRolloutsStateFactory.getActiveRolloutsState(any()))
+        .thenReturn(rolloutsState)
+        .thenThrow(new FirebaseRemoteConfigClientException("Exception getting rollouts state."));
+
+    // When the subscriber is added, it should be called with the assigned rollouts.
+    handler.registerRolloutsStateSubscriber(mockRolloutsStateSubscriber);
+    verify(mockRolloutsStateSubscriber).onRolloutsStateChanged(rolloutsState);
+
+    // Then assignments are removed.
+    // Exception isn't thrown, and the subscriber won't be called.
+    handler.publishActiveRolloutsState(configWithoutRollouts);
+    verifyNoMoreInteractions(mockRolloutsStateSubscriber);
+  }
+}
diff --git a/firebase-config/src/test/java/com/google/firebase/remoteconfig/ktx/RemoteConfigTests.kt b/firebase-config/src/test/java/com/google/firebase/remoteconfig/ktx/RemoteConfigTests.kt
new file mode 100644
index 00000000000..c11ea869fbf
--- /dev/null
+++ b/firebase-config/src/test/java/com/google/firebase/remoteconfig/ktx/RemoteConfigTests.kt
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.remoteconfig.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.common.util.concurrent.MoreExecutors
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.installations.FirebaseInstallationsApi
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigValue
+import com.google.firebase.remoteconfig.createRemoteConfig
+import com.google.firebase.remoteconfig.internal.ConfigCacheClient
+import com.google.firebase.remoteconfig.internal.ConfigFetchHandler
+import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler
+import com.google.firebase.remoteconfig.internal.ConfigMetadataClient
+import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler
+import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.mock
+import org.mockito.Mockito.`when`
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "1:14368190084:android:09cb977358c6f241"
+const val API_KEY = "AIzaSyabcdefghijklmnopqrstuvwxyz1234567"
+
+const val EXISTING_APP = "existing"
+
+open class DefaultFirebaseRemoteConfigValue : FirebaseRemoteConfigValue {
+  override fun asLong(): Long = TODO("Unimplementend")
+  override fun asDouble(): Double = TODO("Unimplementend")
+  override fun asString(): String = TODO("Unimplementend")
+  override fun asByteArray(): ByteArray = TODO("Unimplementend")
+  override fun asBoolean(): Boolean = TODO("Unimplementend")
+  override fun getSource(): Int = TODO("Unimplementend")
+}
+
+class StringRemoteConfigValue(val value: String) : DefaultFirebaseRemoteConfigValue() {
+  override fun asString() = value
+}
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class ConfigTests : BaseTestCase() {
+
+  @Test
+  fun `Firebase#remoteConfig should delegate to FirebaseRemoteConfig#getInstance()`() {
+    assertThat(Firebase.remoteConfig).isSameInstanceAs(FirebaseRemoteConfig.getInstance())
+  }
+
+  @Test
+  fun `Firebase#remoteConfig should delegate to FirebaseRemoteConfig#getInstance(FirebaseApp, region)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.remoteConfig(app)).isSameInstanceAs(FirebaseRemoteConfig.getInstance(app))
+  }
+
+  @Test
+  fun `Overloaded get() operator returns default value when key doesn't exist`() {
+    val remoteConfig = Firebase.remoteConfig
+    assertThat(remoteConfig["non_existing_key"].asString())
+      .isEqualTo(FirebaseRemoteConfig.DEFAULT_VALUE_FOR_STRING)
+    assertThat(remoteConfig["another_non_exisiting_key"].asDouble())
+      .isEqualTo(FirebaseRemoteConfig.DEFAULT_VALUE_FOR_DOUBLE)
+  }
+
+  @Test
+  fun `FirebaseRemoteConfigSettings builder works`() {
+    val minFetchInterval = 3600L
+    val fetchTimeout = 60L
+    val configSettings = remoteConfigSettings {
+      minimumFetchIntervalInSeconds = minFetchInterval
+      fetchTimeoutInSeconds = fetchTimeout
+    }
+    assertThat(configSettings.minimumFetchIntervalInSeconds).isEqualTo(minFetchInterval)
+    assertThat(configSettings.fetchTimeoutInSeconds).isEqualTo(fetchTimeout)
+  }
+
+  @Test
+  fun `Overloaded get() operator returns value when key exists`() {
+    val mockGetHandler = mock(ConfigGetParameterHandler::class.java)
+    val directExecutor = MoreExecutors.directExecutor()
+
+    val remoteConfig =
+      createRemoteConfig(
+        context = null,
+        firebaseApp = Firebase.app(EXISTING_APP),
+        firebaseInstallations = mock(FirebaseInstallationsApi::class.java),
+        firebaseAbt = null,
+        executor = directExecutor,
+        fetchedConfigsCache = mock(ConfigCacheClient::class.java),
+        activatedConfigsCache = mock(ConfigCacheClient::class.java),
+        defaultConfigsCache = mock(ConfigCacheClient::class.java),
+        fetchHandler = mock(ConfigFetchHandler::class.java),
+        getHandler = mockGetHandler,
+        frcMetadata = mock(ConfigMetadataClient::class.java),
+        realtimeHandler = mock(ConfigRealtimeHandler::class.java),
+        rolloutsStateSubscriptionsHandler = mock(RolloutsStateSubscriptionsHandler::class.java)
+      )
+
+    `when`(mockGetHandler.getValue("KEY")).thenReturn(StringRemoteConfigValue("non default value"))
+    assertThat(remoteConfig["KEY"].asString()).isEqualTo("non default value")
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-config/test-app/.gitignore b/firebase-config/test-app/.gitignore
new file mode 100644
index 00000000000..ddd639d83fe
--- /dev/null
+++ b/firebase-config/test-app/.gitignore
@@ -0,0 +1 @@
+**/google-services.json
\ No newline at end of file
diff --git a/firebase-config/test-app/README.md b/firebase-config/test-app/README.md
new file mode 100644
index 00000000000..64149202d50
--- /dev/null
+++ b/firebase-config/test-app/README.md
@@ -0,0 +1,17 @@
+# Firebase Remote Config Test App
+
+## Setup
+
+Download the `google-services.json` file
+from [Firebase Console](https://console.firebase.google.com/) (for whatever Firebase project you
+have or want to integrate the `test-app`) and store it under the current directory.
+
+Note: The [Package name](https://firebase.google.com/docs/android/setup#register-app) for your app
+created on the Firebase Console (for which the `google-services.json` is downloaded) must match
+the [applicationId](https://developer.android.com/studio/build/application-id.html) declared in
+the `test-app/test-app.gradle.kts` for the app to link to Firebase.
+
+## Running
+
+Run the test app directly from Android Studio by selecting and running
+the `firebase-config.test-app` run configuration.
diff --git a/firebase-config/test-app/src/androidTest/kotlin/com/google/firebase/testing/config/FirebaseConfigTest.kt b/firebase-config/test-app/src/androidTest/kotlin/com/google/firebase/testing/config/FirebaseConfigTest.kt
new file mode 100644
index 00000000000..d8b05fac481
--- /dev/null
+++ b/firebase-config/test-app/src/androidTest/kotlin/com/google/firebase/testing/config/FirebaseConfigTest.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.testing.config
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.firebase.FirebaseApp
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.initialize
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class FirebaseConfigTest {
+  @Before
+  fun setUp() {
+    Firebase.initialize(ApplicationProvider.getApplicationContext())
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+
+  @Test
+  fun initializeConfig_generatesSessionEvent() {
+
+    // // Force the Firebase Config SDK to initialize.
+    // assertThat(FirebaseConfig.instance).isNotNull()
+
+    // // Add a fake dependency and register it, otherwise sessions will never send.
+    // val fakeSessionSubscriber = FakeSessionSubscriber()
+    // FirebaseConfig.instance.register(fakeSessionSubscriber)
+
+    // // Wait for the session start event to send.
+    // Thread.sleep(TIME_TO_LOG_SESSION)
+
+    // // Assert that some session was generated and sent to the subscriber.
+    // assertThat(fakeSessionSubscriber.sessionDetails).isNotNull()
+  }
+
+  companion object {
+    private const val TIME_TO_LOG_SESSION = 60_000L
+
+    // init {
+    //   FirebaseConfigDependencies.addDependency(SessionSubscriber.Name.MATT_SAYS_HI)
+    // }
+  }
+
+  // private class FakeSessionSubscriber(
+  //   override val isDataCollectionEnabled: Boolean = true,
+  //   override val sessionSubscriberName: SessionSubscriber.Name =
+  // SessionSubscriber.Name.MATT_SAYS_HI
+  // ) : SessionSubscriber {
+  //   var sessionDetails: SessionSubscriber.SessionDetails? = null
+  //     private set
+
+  //   override fun onSessionChanged(sessionDetails: SessionSubscriber.SessionDetails) {
+  //     this.sessionDetails = sessionDetails
+  //   }
+  // }
+}
diff --git a/firebase-config/test-app/src/main/AndroidManifest.xml b/firebase-config/test-app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..0faeaa90f87
--- /dev/null
+++ b/firebase-config/test-app/src/main/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <application
+    android:allowBackup="true"
+    android:icon="@drawable/sensor_window"
+    android:label="@string/app_name"
+    android:supportsRtl="true"
+    android:theme="@style/Theme.TestApp">
+    <activity
+      android:exported="true"
+      android:name=".MainActivity"
+      android:theme="@style/Theme.TestApp.NoActionBar">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+
+</manifest>
diff --git a/firebase-config/test-app/src/main/kotlin/com/google/firebase/crashlytics/OnDemandFatals.kt b/firebase-config/test-app/src/main/kotlin/com/google/firebase/crashlytics/OnDemandFatals.kt
new file mode 100644
index 00000000000..1b5dfb7b142
--- /dev/null
+++ b/firebase-config/test-app/src/main/kotlin/com/google/firebase/crashlytics/OnDemandFatals.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics
+
+import android.annotation.SuppressLint
+
+@SuppressLint("VisibleForTests")
+fun FirebaseCrashlytics.recordFatalException(ex: Throwable) = core.logFatalException(ex)
diff --git a/firebase-config/test-app/src/main/kotlin/com/google/firebase/testing/config/MainActivity.kt b/firebase-config/test-app/src/main/kotlin/com/google/firebase/testing/config/MainActivity.kt
new file mode 100644
index 00000000000..ba3dda2975e
--- /dev/null
+++ b/firebase-config/test-app/src/main/kotlin/com/google/firebase/testing/config/MainActivity.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.testing.config
+
+import android.os.Bundle
+import android.util.Log
+import android.widget.Button
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.gms.tasks.Task
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.firebase.crashlytics.recordFatalException
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+
+class MainActivity : AppCompatActivity() {
+
+  private lateinit var remoteConfig: FirebaseRemoteConfig
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_main)
+
+    findViewById<TextView>(R.id.greeting_text).text = getText(R.string.firebase_greetings)
+
+    findViewById<Button>(R.id.fetch_button).setOnClickListener {
+      remoteConfig = FirebaseRemoteConfig.getInstance()
+      remoteConfig.fetch(0).addOnCompleteListener {
+        Log.d("RolloutsTestApp", "Fetched config!")
+        remoteConfig.activate().addOnCompleteListener { didActivate: Task<Boolean> ->
+          Log.d("RolloutsTestApp", "Activate completed. Did activate? : " + didActivate.result)
+        }
+      }
+    }
+
+    findViewById<Button>(R.id.jvm_crash_button).setOnClickListener {
+      throw RuntimeException("JVM Crash")
+    }
+
+    findViewById<Button>(R.id.anr_button).setOnClickListener {
+      // Cause an ANR
+      while (true) {
+        Thread.sleep(1000)
+      }
+    }
+
+    findViewById<Button>(R.id.on_demand_fatal_button).setOnClickListener {
+      FirebaseCrashlytics.getInstance()
+        .recordFatalException(RuntimeException("This is an on demand fatal"))
+    }
+
+    findViewById<Button>(R.id.non_fatal_button).setOnClickListener {
+      FirebaseCrashlytics.getInstance().recordException(RuntimeException("This is an non-fatal"))
+    }
+  }
+}
diff --git a/firebase-config/test-app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/firebase-config/test-app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 00000000000..44a7ccb32c8
--- /dev/null
+++ b/firebase-config/test-app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,46 @@
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:aapt="http://schemas.android.com/aapt"
+  android:height="108dp"
+  android:viewportHeight="108"
+  android:viewportWidth="108"
+  android:width="108dp">
+  <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+        android:endX="85.84757"
+        android:endY="92.4963"
+        android:startX="42.9492"
+        android:startY="49.59793"
+        android:type="linear">
+        <item
+          android:color="#44000000"
+          android:offset="0.0" />
+        <item
+          android:color="#00000000"
+          android:offset="1.0" />
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+    android:fillColor="#FFFFFF"
+    android:fillType="nonZero"
+    android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+    android:strokeColor="#00000000"
+    android:strokeWidth="1" />
+</vector>
diff --git a/firebase-config/test-app/src/main/res/drawable/ic_launcher_background.xml b/firebase-config/test-app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 00000000000..3f723137ef3
--- /dev/null
+++ b/firebase-config/test-app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:height="108dp"
+  android:viewportHeight="108"
+  android:viewportWidth="108"
+  android:width="108dp">
+  <path
+    android:fillColor="#3DDC84"
+    android:pathData="M0,0h108v108h-108z" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M9,0L9,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,0L19,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M29,0L29,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M39,0L39,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M49,0L49,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M59,0L59,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M69,0L69,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M79,0L79,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M89,0L89,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M99,0L99,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,9L108,9"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,19L108,19"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,29L108,29"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,39L108,39"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,49L108,49"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,59L108,59"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,69L108,69"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,79L108,79"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,89L108,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,99L108,99"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,29L89,29"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,39L89,39"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,49L89,49"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,59L89,59"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,69L89,69"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,79L89,79"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M29,19L29,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M39,19L39,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M49,19L49,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M59,19L59,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M69,19L69,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M79,19L79,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+</vector>
diff --git a/firebase-config/test-app/src/main/res/drawable/sensor_window.xml b/firebase-config/test-app/src/main/res/drawable/sensor_window.xml
new file mode 100644
index 00000000000..8c9dd3f4731
--- /dev/null
+++ b/firebase-config/test-app/src/main/res/drawable/sensor_window.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:height="24dp"
+  android:tint="#BB86FC"
+  android:viewportHeight="24"
+  android:viewportWidth="24"
+  android:width="24dp">
+  <path
+    android:fillColor="#FFFFFF"
+    android:pathData="M18,4v16H6V4H18M18,2H6C4.9,2 4,2.9 4,4v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C20,2.9 19.1,2 18,2L18,2zM7,19h10v-6H7V19zM10,10h4v1h3V5H7v6h3V10z" />
+</vector>
diff --git a/firebase-config/test-app/src/main/res/layout/activity_main.xml b/firebase-config/test-app/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000000..f68c8ed8df1
--- /dev/null
+++ b/firebase-config/test-app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  tools:context=".MainActivity">
+
+  <TextView
+      android:id="@+id/greeting_text"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="32dp"
+      android:text="@string/app_name"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="100dp"
+      android:orientation="vertical"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent">
+
+    <Button
+        android:id="@+id/fetch_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_weight="1"
+        android:text="@string/fetch_config" />
+
+    <Button
+        android:id="@+id/jvm_crash_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_weight="1"
+        android:text="@string/jvm_crash" />
+
+    <Button
+        android:id="@+id/anr_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/anr" />
+
+    <Button
+        android:id="@+id/on_demand_fatal_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/on_demand_fatal" />
+
+    <Button
+        android:id="@+id/non_fatal_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/non_fatal" />
+  </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/firebase-config/test-app/src/main/res/values-night/themes.xml b/firebase-config/test-app/src/main/res/values-night/themes.xml
new file mode 100644
index 00000000000..87f8acf1a8f
--- /dev/null
+++ b/firebase-config/test-app/src/main/res/values-night/themes.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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 xmlns:tools="http://schemas.android.com/tools">
+  <!-- Base application theme. -->
+  <style name="Theme.TestApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <!-- Primary brand color. -->
+    <item name="colorPrimary">@color/purple_200</item>
+    <item name="colorPrimaryVariant">@color/purple_700</item>
+    <item name="colorOnPrimary">@color/black</item>
+    <!-- Secondary brand color. -->
+    <item name="colorSecondary">@color/teal_200</item>
+    <item name="colorSecondaryVariant">@color/teal_200</item>
+    <item name="colorOnSecondary">@color/black</item>
+    <!-- Status bar color. -->
+    <item name="android:statusBarColor" tools:targetApi="21">?attr/colorPrimaryVariant</item>
+    <!-- Customize your theme here. -->
+  </style>
+</resources>
diff --git a/firebase-config/test-app/src/main/res/values/colors.xml b/firebase-config/test-app/src/main/res/values/colors.xml
new file mode 100644
index 00000000000..4f3682e3c18
--- /dev/null
+++ b/firebase-config/test-app/src/main/res/values/colors.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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="purple_200">#FFBB86FC</color>
+  <color name="purple_500">#FF6200EE</color>
+  <color name="purple_700">#FF3700B3</color>
+  <color name="teal_200">#FF03DAC5</color>
+  <color name="teal_700">#FF018786</color>
+  <color name="black">#FF000000</color>
+  <color name="white">#FFFFFFFF</color>
+</resources>
diff --git a/firebase-config/test-app/src/main/res/values/strings.xml b/firebase-config/test-app/src/main/res/values/strings.xml
new file mode 100644
index 00000000000..3268d18157e
--- /dev/null
+++ b/firebase-config/test-app/src/main/res/values/strings.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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">Firebase Remote Config Test App</string>
+  <string name="firebase_greetings">Greetings from Firebase!</string>
+  <string name="fetch_config">Fetch Config</string>
+  <string name="jvm_crash">JVM Crash</string>
+  <string name="anr">ANR</string>
+  <string name="on_demand_fatal">On-demand Fatal</string>
+  <string name="non_fatal">Non Fatal</string>
+</resources>
diff --git a/firebase-config/test-app/src/main/res/values/themes.xml b/firebase-config/test-app/src/main/res/values/themes.xml
new file mode 100644
index 00000000000..4b3f08bc73b
--- /dev/null
+++ b/firebase-config/test-app/src/main/res/values/themes.xml
@@ -0,0 +1,41 @@
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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 xmlns:tools="http://schemas.android.com/tools">
+  <!-- Base application theme. -->
+  <style name="Theme.TestApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <!-- Primary brand color. -->
+    <item name="colorPrimary">@color/purple_500</item>
+    <item name="colorPrimaryVariant">@color/purple_700</item>
+    <item name="colorOnPrimary">@color/white</item>
+    <!-- Secondary brand color. -->
+    <item name="colorSecondary">@color/teal_200</item>
+    <item name="colorSecondaryVariant">@color/teal_700</item>
+    <item name="colorOnSecondary">@color/black</item>
+    <!-- Status bar color. -->
+    <item name="android:statusBarColor" tools:targetApi="21">?attr/colorPrimaryVariant</item>
+    <!-- Customize your theme here. -->
+  </style>
+
+  <style name="Theme.TestApp.NoActionBar">
+    <item name="windowActionBar">false</item>
+    <item name="windowNoTitle">true</item>
+  </style>
+
+  <style name="Theme.TestApp.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+  <style name="Theme.TestApp.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+</resources>
diff --git a/firebase-config/test-app/test-app.gradle.kts b/firebase-config/test-app/test-app.gradle.kts
new file mode 100644
index 00000000000..f29cfa7b2ff
--- /dev/null
+++ b/firebase-config/test-app/test-app.gradle.kts
@@ -0,0 +1,90 @@
+@file:Suppress("DEPRECATION") // App projects should still use FirebaseTestLabPlugin.
+
+import com.google.firebase.gradle.plugins.ci.device.FirebaseTestLabPlugin
+
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+  id("com.android.application")
+  id("org.jetbrains.kotlin.android")
+  id("com.google.gms.google-services")
+  id("com.google.firebase.crashlytics")
+  id("com.google.firebase.firebase-perf")
+  id("copy-google-services")
+}
+
+android {
+  val compileSdkVersion : Int by rootProject
+  val targetSdkVersion: Int by rootProject
+  val minSdkVersion : Int by rootProject
+
+  namespace = "com.google.firebase.testing.config"
+  compileSdk = compileSdkVersion
+  defaultConfig {
+    applicationId = "com.google.firebase.testing.config"
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+    versionCode = 1
+    versionName = "1.0"
+    multiDexEnabled = true
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+  }
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+  kotlinOptions {
+    jvmTarget = "1.8"
+  }
+}
+
+dependencies {
+  implementation(project(":firebase-crashlytics")) {
+    exclude(group = "com.google.firebase", module = "firebase-config-interop")
+  }
+  implementation(project(":firebase-config")) {
+    exclude(group = "com.google.firebase", module = "firebase-config-interop")
+  }
+  implementation(project(":firebase-config:ktx"))
+
+  // This is required since a `project` dependency on frc does not expose the APIs of its
+  // "implementation" dependencies. The alternative would be to make common an "api" dep of remote-config.
+  // Released artifacts don't need these dependencies since they don't use `project` to refer
+  // to Remote Config.
+  implementation("com.google.firebase:firebase-common:21.0.0")
+  implementation("com.google.firebase:firebase-common-ktx:21.0.0")
+  implementation("com.google.firebase:firebase-components:18.0.0")
+
+  implementation("com.google.firebase:firebase-installations-interop:17.1.0")
+  runtimeOnly("com.google.firebase:firebase-installations:17.1.4")
+
+  implementation("com.google.android.gms:play-services-basement:18.1.0")
+  implementation("com.google.android.gms:play-services-tasks:18.0.1")
+  // End RC `project` transitive dependencies
+
+  implementation("androidx.appcompat:appcompat:1.6.1")
+  implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+  implementation("androidx.core:core-ktx:1.9.0")
+  implementation("com.google.android.material:material:1.8.0")
+
+  androidTestImplementation("com.google.firebase:firebase-common-ktx:21.0.0")
+  androidTestImplementation(libs.androidx.test.junit)
+  androidTestImplementation(libs.androidx.test.runner)
+  androidTestImplementation(libs.truth)
+}
+
+apply<FirebaseTestLabPlugin>()
diff --git a/firebase-crashlytics-ndk/CHANGELOG.md b/firebase-crashlytics-ndk/CHANGELOG.md
index 99fdcf856fd..47bccb69bc5 100644
--- a/firebase-crashlytics-ndk/CHANGELOG.md
+++ b/firebase-crashlytics-ndk/CHANGELOG.md
@@ -1,57 +1,226 @@
-# 17.1.0
+# Unreleased
 
-- [changed] Updated `firebase-crashlytics` dependency to v17.1.0.
 
-# 17.0.1
+# 19.0.0
+* [changed] Bump internal dependencies
 
-- [changed] Updated `firebase-crashlytics` dependency to v17.0.1.
+# 18.6.3
+* [changed] Updated `firebase-crashlytics` dependency to v18.6.3
 
-# 17.0.0
+# 18.6.0
+* [changed] Updated `firebase-crashlytics` dependency to v18.6.0
 
-- [changed] The Firebase Crashlytics SDK for NDK is now generally
-  available.
+# 18.5.0
+* [changed] Updated `firebase-crashlytics` dependency to v18.5.0
 
-- [changed] Updated `firebase-crashlytics` dependency to v17.0.0.
+# 18.4.3
+* [changed] Updated `firebase-crashlytics` dependency to v18.4.3
 
-# 17.0.0-beta04
+# 18.4.2
+* [changed] Updated `firebase-crashlytics` dependency to v18.4.2
 
-- [changed] Updated `firebase-crashlytics` dependency to v17.0.0-beta-04.
+# 18.4.1
+* [changed] Updated `firebase-crashlytics` dependency to v18.4.1
 
-# 17.0.0-beta03
+# 18.4.0
+* [changed] Updated `firebase-crashlytics` dependency to v18.4.0
+
+# 18.3.7
+* [changed] Updated `firebase-crashlytics` dependency to v18.3.7
+
+# 18.3.6
+* [changed] Updated `firebase-crashlytics` dependency to v18.3.6.
+
+# 18.3.5
+* [fixed] Updated `firebase-common` to its latest version (v20.3.0) to fix an
+  issue that was causing a nondeterministic crash on startup.
+* [changed] Updated `firebase-crashlytics` dependency to v18.3.5.
+
+# 18.3.4
+<aside class="caution">This version of <code>firebase-crashlytics-ndk</code> can
+  cause a nondeterministic crash on startup. For more information, see
+  <a href="https://github.com/firebase/firebase-android-sdk/issues/4683"
+     class="external">GitHub Issue #4683</a>. We recommend updating to the
+  latest version (v18.3.5+) which contains a fix.
+</aside>
+
+* [changed] Updated `firebase-crashlytics` dependency to v18.3.4.
+
+# 18.3.3
+* [changed] Updated internal Crashpad version to commit `c902f6`.
+
+# 18.3.2
+* [fixed] Fixed an [issue](https://github.com/firebase/firebase-android-sdk/issues/4313){: .external}
+  preventing native crashes from being reported for Android API 29+.
+
+# 18.3.1
+Warning: We're aware of an
+[issue](https://github.com/firebase/firebase-android-sdk/issues/4313){: .external}
+in this version of the [crashlytics] SDK for NDK.<br>**We strongly
+recommend using the latest version of the SDK (v18.3.2+ or [bom] v31.0.3+).**
+
+* [changed] Updated `firebase-crashlytics` dependency to v18.3.1.
+
+# 18.3.0
+Warning: We're aware of an
+[issue](https://github.com/firebase/firebase-android-sdk/issues/4223){: .external}
+in the [crashlytics] Android SDK v18.3.0.<br>**We strongly recommend
+using the latest version of the SDK (v18.3.1+ or [bom] v31.0.1+).**
+
+* [changed] Updated `firebase-crashlytics` dependency to v18.3.0.
+
+# 18.2.13
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+# 18.2.12
+* [changed] Updated `firebase-crashlytics` dependency to v18.2.12.
+
+# 18.2.11
+* [changed] Updated `firebase-crashlytics` dependency to v18.2.11.
+
+# 18.2.10
+* [changed] Updated `firebase-crashlytics` dependency to v18.2.10.
+
+# 18.2.9
+* [changed] Updated `firebase-crashlytics` dependency to v18.2.9.
+
+# 18.2.8
+* [changed] Updated `firebase-crashlytics` dependency to v18.2.8.
 
-- [fixed] Updated package name in `AndroidManifest.xml` to reflect new
-  Firebase Crashlytics NDK package name.
+# 18.2.7
+* [changed] Updated `firebase-crashlytics` dependency to v18.2.7.
 
-- [changed] Improved debug logging.
+# 18.2.6
+* [changed] Updated internal Crashpad version to commit `281ba7`. With this
+  change, disabling tagged pointers is no longer required, so the following can
+  be removed from your manifest's `application` tag:
+  `android:allowNativeHeapPointerTagging=false`.
+* [changed] Updated `firebase-crashlytics` dependency to v18.2.6.
 
-- [changed] Released new `crashlytics.h` with updated C++ APIs.
+# 18.2.5
+* [changed] Internal improvements to [crashlytics] file management, to
+  ensure consistent creation and removal of intermediate [crashlytics] files.
+* [changed] Updated `firebase-crashlytics` dependency to v18.2.5.
 
-- [changed] Added ProGuard rules files to avoid obfuscating public APIs called
+# 18.2.4
+* [changed] Added an obfuscation exclusion for
+  `com.google.firebase.crashlytics.ndk.FirebaseCrashlyticsNdk` to the Proguard
+  configuration for this AAR, to avoid potential reflection errors when
+  obfuscating NDK-enabled apps.
+* [changed] Updated `firebase-crashlytics` dependency to v18.2.4.
+
+# 18.2.3
+* [changed] Internal changes to support upcoming Unity crash reporting
+  improvements.
+* [changed] Updated `firebase-crashlytics` dependency to v18.2.3.
+
+# 18.2.1
+* [fixed] Improved support for NDK crash reporting when using
+  [Play Feature Delivery](/docs/android/learn-more#dynamic-feature-modules).
+  Previously, `firebase-crashlytics-ndk` needed to be a dependency of the app
+  module to consistently report native crashes for all supported Android
+  versions. [crashlytics] will now report native crashes when used as a
+  dependency of a feature module.
+* [changed] Updated `firebase-crashlytics` dependency to v18.2.1.
+
+# 18.2.0
+* [changed] Updated `firebase-crashlytics` dependency to v18.2.0.
+
+# 18.1.0
+* [changed] Updated `firebase-crashlytics` dependency to v18.1.0.
+
+# 18.0.1
+* [changed] Updated `firebase-crashlytics` dependency to v18.0.1, which fixes
+  a bug that could cause excessive disk usage from NDK crash report files when
+  crash reporting is disabled.
+
+# 18.0.0
+* [changed] Internal changes to support dynamic feature modules.
+* [changed] Updated `firebase-crashlytics` dependency to v18.0.0.
+
+# 17.4.1
+* [changed] Updated `firebase-crashlytics` dependency to v17.4.1.
+
+# 17.4.0
+* [changed] Updated `firebase-crashlytics` dependency to v17.4.0.
+
+# 17.3.1
+* [changed] Updated `firebase-crashlytics` dependency to v17.3.1.
+
+# 17.3.0
+Note: To ensure proper symbolication of NDK crashes, you must use
+[[crashlytics] Gradle plugin v2.4.0+](#crashlytics_gradle_plugin_v2-4-0) when
+using this version of the [crashlytics] NDK SDK and above.
+
+* [fixed] Upgraded underlying native crash reporting library to
+  [Crashpad](//crashpad.chromium.org){: .external}. This addresses emerging issues
+  with capturing certain types of native crashes on Android 10+ using
+  [Breakpad](//chromium.googlesource.com/breakpad){: .external}.
+  ([Github Issue #1678](//github.com/firebase/firebase-android-sdk/issues/1678){: .external})
+
+# 17.2.2
+* [changed] Updated `firebase-crashlytics` dependency to v17.2.2.
+
+# 17.2.1
+* [fixed] Fixed signal handler to properly release storage on app exit.
+  ([Github Issue #1749](https://github.com/firebase/firebase-android-sdk/issues/1749))
+* [changed] Updated `firebase-crashlytics` dependency to v17.2.1.
+
+# 17.1.1
+* [changed] Updated `firebase-crashlytics` dependency to v17.1.1.
+
+# 17.1.0
+* [changed] Updated `firebase-crashlytics` dependency to v17.1.0.
+
+# 17.0.1
+* [changed] Updated `firebase-crashlytics` dependency to v17.0.1.
+
+# 17.0.0
+* [changed] The [firebase_crashlytics] SDK for NDK is now generally
+  available.
+* [changed] Updated `firebase-crashlytics` dependency to v17.0.0.
+
+# 17.0.0-beta04
+* [changed] Updated `firebase-crashlytics` dependency to v17.0.0-beta-04.
+
+# 17.0.0-beta03
+* [fixed] Updated package name in `AndroidManifest.xml` to reflect new
+  [firebase_crashlytics] NDK package name.
+* [changed] Improved debug logging.
+* [changed] Released new `crashlytics.h` with updated C++ APIs.
+* [changed] Added ProGuard rules files to avoid obfuscating public APIs called
   from C++.
 
 # 17.0.0-beta01
-
-This release includes the initial beta release of the Firebase Crashlytics
+This release includes the initial beta release of the [firebase_crashlytics]
 SDK for NDK crash reporting.
 
-The Firebase Crashlytics SDK for NDK is a new version of the Crashlytics
+The [firebase_crashlytics] SDK for NDK is a new version of the [crashlytics]
 SDK for NDK crash reporting built _without_ Fabric and instead built entirely on
 Firebase. This new SDK has new and improved APIs as well as an artifact name
 change. The following release notes describe changes in the new SDK.
 
- - If you're using Crashlytics for NDK crash reporting in your app for the
- first time, follow the [getting started instructions](https://firebase.google.com/docs/crashlytics/get-started-new-sdk?platform=android).
- - If you're upgrading from the legacy Fabric SDK to the
- Firebase Crashlytics SDK for NDK crash reporting, follow the
- [upgrade instructions](https://firebase.google.com/docs/crashlytics/upgrade-sdk?platform=android)
- to update your app with the following SDK changes.
-
-Note: The following changes are only relevant to Crashlytics NDK users who
-are upgrading from the legacy Fabric SDK.
-
- - [changed] Crashlytics NDK crash reporting will now start automatically
- when the Crashlytics NDK dependency is included in your app.
- - [changed] The Crashlytics Gradle plugin has new tasks to support
- uploading symbol files to Crashlytics servers. See the
- [Crashlytics Gradle plugin documentation](https://firebase.google.com/docs/crashlytics/ndk-reports-new-sdk)
+<aside class="note"><p>The changes in these release notes are only relevant to
+  [crashlytics] NDK users who are upgrading from the legacy Fabric SDK.</p>
+  <ul>
+    <li>If you're using [crashlytics] for NDK crash reporting in your app for
+      the first time, follow the
+      <a href="/docs/crashlytics/get-started-new-sdk?platform=android">getting
+        started instructions</a>.
+    </li>
+    <li>If you're upgrading from the legacy Fabric SDK to the
+      [firebase_crashlytics] SDK for NDK crash reporting, follow the
+      <a href="/docs/crashlytics/upgrade-sdk?platform=android">upgrade
+        instructions</a> to update your app with the following SDK changes.
+    </li>
+  </ul>
+</aside>
+
+ * [changed] [crashlytics] NDK crash reporting will now start automatically
+ when the [crashlytics] NDK dependency is included in your app.
+ * [changed] The [crashlytics] Gradle plugin has new tasks to support
+ uploading symbol files to [crashlytics] servers. See the
+ [[crashlytics] Gradle plugin documentation](/docs/crashlytics/ndk-reports-new-sdk)
  for more information.
+
diff --git a/firebase-crashlytics-ndk/README.md b/firebase-crashlytics-ndk/README.md
index b30f8acf25a..3c7538d8650 100644
--- a/firebase-crashlytics-ndk/README.md
+++ b/firebase-crashlytics-ndk/README.md
@@ -11,15 +11,10 @@ Initialize them by running the following commands:
 
 ## Building
 
-* `firebase-crashlytics-ndk` must be built with NDK 21. Use Android Studio's
-  SDK Manager to ensure you have the appropriate NDK version installed, and
-  edit `../local.properties` to specify which NDK version to use when building
-  this project. For example:
-  `ndk.dir=$USER_HOME/Library/Android/sdk/ndk/21.4.7075529`
 * All Gradle commands should be run from the root of this repository:
   `./gradlew :firebase-crashlytics-ndk:assemble`
 
 ## Running Tests
 
 Integration tests, requiring a running and connected device (emulator or real):
-`./gradlew :firebase-crashlytics-ndk:connectedAndroidTest`
\ No newline at end of file
+`./gradlew :firebase-crashlytics-ndk:connectedAndroidTest`
diff --git a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
index 3a14031ab20..abef3db66d5 100644
--- a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
+++ b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
@@ -18,6 +18,11 @@ plugins {
 }
 
 firebaseLibrary {
+    libraryGroup "crashlytics"
+    testLab {
+        enabled = true
+        device 'model=panther,version=33' // Pixel7
+    }
     testLab.enabled = true
     publishJavadoc = false
 }
@@ -26,10 +31,11 @@ android {
     adbOptions {
         timeOutInMs 60 * 1000
     }
-
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.crashlytics.ndk"
+    ndkVersion "25.1.8937393"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         versionName version
 
@@ -65,68 +71,56 @@ android {
         }
     }
 
+    // There is not any normal way to package native executables in an Android APK.
+    // It is normal to package native code as a loadable module but Android's APK
+    // installer will ignore files not named like a shared object, so give the
+    // handler executable an acceptable name
     libraryVariants.all { variant ->
-        variant.outputs.each { output ->
-            def func = fixTrampolineFilenames(variant.baseName)
-
-            tasks.findAll {
-                it.name.startsWith("bundleReleaseAar")
-            }.each {
-                it.dependsOn func
+        def fixTasks = ["x86", "x86_64", "armeabi-v7a", "arm64-v8a"].collect { arch ->
+            tasks.register("fixTrampolineFilenames${variant.baseName}${arch}", com.google.firebase.gradle.NdkBinaryFixTask) {
+                it.inputFile =
+                        file("${buildDir}/intermediates/ndkBuild/${variant.baseName}/obj/local/${arch}/crashlytics-trampoline")
             }
+        }
 
-            tasks.findAll {
-                it.name.startsWith("externalNativeBuild") && !it.name.contains("Clean")
-            }.each {
-                func.dependsOn it
+        tasks.withType(com.android.build.gradle.tasks.BundleAar) {
+            if (it.variantName != variant.baseName) return
+            fixTasks.each { fix ->
+                it.dependsOn fix
+                it.from(fix.map { it.outputFile }) {
+                    into fix.map { it.into }
+                }
             }
         }
-    }
-}
-
-
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
-
-// There is not any normal way to package native executables in an Android APK.
-// It is normal to package native code as a loadable module but Android's APK
-// installer will ignore files not named like a shared object, so give the
-// handler executable an acceptable name
-def fixTrampolineFilenames(variantBaseName) {
-    project.task("fixTrampolineFilenames${variantBaseName}").configure({
-    }).doFirst {
-        ["x86", "x86_64", "armeabi-v7a", "arm64-v8a"].each { arch ->
-            def initial = new File(
-                    "${buildDir}/intermediates/ndkBuild/${variantBaseName}/obj/local/${arch}/crashlytics-trampoline")
-            def renamed = new File(
-                    "${buildDir}/intermediates/ndkBuild/${variantBaseName}/obj/local/${arch}/libcrashlytics-trampoline.so")
-
-            // There is no need to delete the original file, it will not be
-            // packaged into the APK
-            Files.copy(initial.toPath(), renamed.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        tasks.findAll {
+            it.name.startsWith("externalNativeBuild") && !it.name.contains("Clean")
+        }.each { task ->
+            fixTasks.each { fix -> fix.configure { it.dependsOn task } }
         }
     }
 }
 
 thirdPartyLicenses {
-    add 'Crashpad', "file://${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Crashpad', "${rootDir}/third_party/licenses/apache-2.0.txt"
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-crashlytics')
-    implementation 'com.google.android.gms:play-services-basement:18.0.0'
+    api project(':firebase-crashlytics')
+    api "com.google.firebase:firebase-common:21.0.0"
+    api "com.google.firebase:firebase-common-ktx:21.0.0"
+    api "com.google.firebase:firebase-components:18.0.0"
+
+    implementation 'com.google.android.gms:play-services-basement:18.1.0'
 
     testImplementation 'androidx.test:runner:1.4.0'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.4.3'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
     androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test:core:1.4.0'
-    androidTestImplementation 'org.mockito:mockito-core:3.4.3'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.25.0'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.25.0'
     androidTestImplementation "com.google.protobuf:protobuf-javalite:$javaliteVersion"
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.1'
+    androidTestImplementation 'org.mockito:mockito-core:3.4.3'
 }
diff --git a/firebase-crashlytics-ndk/gradle.properties b/firebase-crashlytics-ndk/gradle.properties
index 28126fe0e93..fd3ef991ef3 100644
--- a/firebase-crashlytics-ndk/gradle.properties
+++ b/firebase-crashlytics-ndk/gradle.properties
@@ -1,2 +1,2 @@
-version=18.2.9
-latestReleasedVersion=18.2.8
+version=19.0.1
+latestReleasedVersion=19.0.0
diff --git a/firebase-crashlytics-ndk/src/main/AndroidManifest.xml b/firebase-crashlytics-ndk/src/main/AndroidManifest.xml
index 671dcb5b8ad..861799d4ef5 100644
--- a/firebase-crashlytics-ndk/src/main/AndroidManifest.xml
+++ b/firebase-crashlytics-ndk/src/main/AndroidManifest.xml
@@ -20,8 +20,7 @@
   ~
   ~
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.crashlytics.ndk" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
             <meta-data android:name="com.google.firebase.components:com.google.firebase.crashlytics.ndk.CrashlyticsNdkRegistrar"
diff --git a/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashlyticsNdkRegistrar.java b/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashlyticsNdkRegistrar.java
index 5d3f6eb5821..05a75f065f7 100644
--- a/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashlyticsNdkRegistrar.java
+++ b/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashlyticsNdkRegistrar.java
@@ -26,15 +26,18 @@
 import java.util.List;
 
 public class CrashlyticsNdkRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-cls-ndk";
+
   @Override
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(CrashlyticsNativeComponent.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(Context.class))
             .factory(this::buildCrashlyticsNdk)
             .eagerInDefaultApp()
             .build(),
-        LibraryVersionComponent.create("fire-cls-ndk", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 
   private CrashlyticsNativeComponent buildCrashlyticsNdk(ComponentContainer container) {
diff --git a/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashpadController.java b/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashpadController.java
index d389919fe19..22326f1ddfb 100644
--- a/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashpadController.java
+++ b/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashpadController.java
@@ -14,25 +14,39 @@
 
 package com.google.firebase.crashlytics.ndk;
 
+import android.app.ActivityManager;
+import android.app.ApplicationExitInfo;
 import android.content.Context;
+import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.VisibleForTesting;
 import com.google.firebase.crashlytics.internal.Logger;
 import com.google.firebase.crashlytics.internal.common.CommonUtils;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.model.StaticSessionData;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
 import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.zip.GZIPOutputStream;
 
 public class CrashpadController {
 
   @SuppressWarnings("CharsetObjectCanBeUsed") // StandardCharsets requires API level 19.
   private static final Charset UTF_8 = Charset.forName("UTF-8");
 
+  private static final String SESSION_START_TIMESTAMP_FILE_NAME = "start-time";
+
   private static final String SESSION_METADATA_FILE = "session.json";
   private static final String APP_METADATA_FILE = "app.json";
   private static final String DEVICE_METADATA_FILE = "device.json";
@@ -70,8 +84,8 @@ public boolean initialize(
   }
 
   public boolean hasCrashDataForSession(String sessionId) {
-    File crashFile = getFilesForSession(sessionId).minidump;
-    return crashFile != null && crashFile.exists();
+    SessionFiles files = getFilesForSession(sessionId);
+    return files.nativeCore != null && files.nativeCore.hasCore();
   }
 
   @NonNull
@@ -94,7 +108,7 @@ public SessionFiles getFilesForSession(String sessionId) {
         && sessionFileDirectory.exists()
         && sessionFileDirectoryForMinidump.exists()) {
       builder
-          .minidumpFile(getSingleFileWithExtension(sessionFileDirectoryForMinidump, ".dmp"))
+          .nativeCore(getNativeCore(sessionId, sessionFileDirectoryForMinidump))
           .metadataFile(getSingleFileWithExtension(sessionFileDirectory, ".device_info"))
           .sessionFile(new File(sessionFileDirectory, SESSION_METADATA_FILE))
           .appFile(new File(sessionFileDirectory, APP_METADATA_FILE))
@@ -104,6 +118,52 @@ public SessionFiles getFilesForSession(String sessionId) {
     return builder.build();
   }
 
+  private SessionFiles.NativeCore getNativeCore(
+      String sessionId, File sessionFileDirectoryForMinidump) {
+    File minidump = getSingleFileWithExtension(sessionFileDirectoryForMinidump, ".dmp");
+    CrashlyticsReport.ApplicationExitInfo applicationExitInfo = getApplicationExitInfo(sessionId);
+    return new SessionFiles.NativeCore(minidump, applicationExitInfo);
+  }
+
+  private CrashlyticsReport.ApplicationExitInfo getApplicationExitInfo(String sessionId) {
+    return android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+        ? getNativeCrashApplicationExitInfo(sessionId)
+        : null;
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.S)
+  private CrashlyticsReport.ApplicationExitInfo getNativeCrashApplicationExitInfo(
+      String sessionId) {
+    ActivityManager activityManager =
+        (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+    List<ApplicationExitInfo> applicationExitInfoList =
+        activityManager.getHistoricalProcessExitReasons(null, 0, 0);
+
+    File sessionStartFile = fileStore.getSessionFile(sessionId, SESSION_START_TIMESTAMP_FILE_NAME);
+    long sessionTime =
+        sessionStartFile == null ? System.currentTimeMillis() : sessionStartFile.lastModified();
+
+    return getRelevantApplicationExitInfo(sessionTime, applicationExitInfoList);
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.S)
+  private CrashlyticsReport.ApplicationExitInfo getRelevantApplicationExitInfo(
+      long sessionTime, List<ApplicationExitInfo> applicationExitInfoList) {
+    List<ApplicationExitInfo> filtered = new ArrayList<>();
+    for (ApplicationExitInfo applicationExitInfo : applicationExitInfoList) {
+      if (applicationExitInfo.getReason() != ApplicationExitInfo.REASON_CRASH_NATIVE
+          || applicationExitInfo.getTimestamp() < sessionTime) {
+        continue;
+      }
+
+      filtered.add(applicationExitInfo);
+    }
+
+    // For GWP-ASan and MTE, there can only be one tombstone, even in the case of non-crashy
+    // GWP-ASan.
+    return filtered.isEmpty() ? null : convertApplicationExitInfoToModel(filtered.get(0));
+  }
+
   public void writeBeginSession(String sessionId, String generator, long startedAtSeconds) {
     final String json =
         SessionMetadataJsonSerializer.serializeBeginSession(sessionId, generator, startedAtSeconds);
@@ -181,4 +241,59 @@ private static File getSingleFileWithExtension(File directory, String extension)
 
     return null;
   }
+
+  @RequiresApi(api = Build.VERSION_CODES.S)
+  private static CrashlyticsReport.ApplicationExitInfo convertApplicationExitInfoToModel(
+      ApplicationExitInfo applicationExitInfo) {
+    return CrashlyticsReport.ApplicationExitInfo.builder()
+        .setImportance(applicationExitInfo.getImportance())
+        .setProcessName(applicationExitInfo.getProcessName())
+        .setReasonCode(applicationExitInfo.getReason())
+        .setTimestamp(applicationExitInfo.getTimestamp())
+        .setPid(applicationExitInfo.getPid())
+        .setPss(applicationExitInfo.getPss())
+        .setRss(applicationExitInfo.getRss())
+        .setTraceFile(getTraceFileFromApplicationExitInfo(applicationExitInfo))
+        .build();
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.S)
+  private static String getTraceFileFromApplicationExitInfo(
+      ApplicationExitInfo applicationExitInfo) {
+    try {
+      return convertInputStreamToString(applicationExitInfo.getTraceInputStream());
+    } catch (IOException e) {
+      Logger.getLogger().w("Failed to get input stream from ApplicationExitInfo");
+    }
+
+    return null;
+  }
+
+  @VisibleForTesting
+  @RequiresApi(api = Build.VERSION_CODES.S)
+  public static String convertInputStreamToString(InputStream inputStream) throws IOException {
+    if (inputStream == null) {
+      return null;
+    }
+
+    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    byte[] bytes = new byte[8192];
+    int length;
+    while ((length = inputStream.read(bytes)) != -1) {
+      byteArrayOutputStream.write(bytes, 0, length);
+    }
+
+    return zipAndEncode(byteArrayOutputStream.toByteArray());
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.S)
+  private static String zipAndEncode(byte[] bytes) throws IOException {
+    try (ByteArrayOutputStream out = new ByteArrayOutputStream();
+        GZIPOutputStream gzip = new GZIPOutputStream(out)) {
+      gzip.write(bytes);
+      gzip.finish();
+
+      return Base64.getEncoder().encodeToString(out.toByteArray());
+    }
+  }
 }
diff --git a/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/SessionFiles.java b/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/SessionFiles.java
index d2eede8c8c1..6f9a40c6dc3 100644
--- a/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/SessionFiles.java
+++ b/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/SessionFiles.java
@@ -14,12 +14,38 @@
 
 package com.google.firebase.crashlytics.ndk;
 
+import androidx.annotation.Nullable;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import java.io.File;
 
 final class SessionFiles {
+  /**
+   * Starting with Android S, it is possible to collect the tombstone upon an application restart.
+   * In most cases, both, the tombstone and the minidump will be available.
+   */
+  static final class NativeCore {
+    @Nullable public final File minidump;
+
+    @Nullable public final CrashlyticsReport.ApplicationExitInfo applicationExitInfo;
+
+    NativeCore(
+        @Nullable File minidump,
+        @Nullable CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
+      this.minidump = minidump;
+      this.applicationExitInfo = applicationExitInfo;
+    }
+
+    boolean hasCore() {
+      // The classic case is that a crash occurred and a minidump was successfully captured. There
+      // are two new cases to handle, however. First, a crash occurred and a minidump was not
+      // captured - this is ok; check for a tombstone and use that instead. Second, a crash did not
+      // occur because of a non-crashy GWP-ASan tombstone - this ok; capture just the tombstone.
+      return (minidump != null && minidump.exists()) || applicationExitInfo != null;
+    }
+  }
 
   static final class Builder {
-    private File minidump;
+    private NativeCore nativeCore;
     private File binaryImages;
     private File metadata;
     private File session;
@@ -27,8 +53,8 @@ static final class Builder {
     private File device;
     private File os;
 
-    Builder minidumpFile(File minidump) {
-      this.minidump = minidump;
+    Builder nativeCore(NativeCore nativeCore) {
+      this.nativeCore = nativeCore;
       return this;
     }
 
@@ -67,7 +93,7 @@ SessionFiles build() {
     }
   }
 
-  public final File minidump;
+  public final NativeCore nativeCore;
   public final File binaryImages;
   public final File metadata;
   public final File session;
@@ -76,7 +102,7 @@ SessionFiles build() {
   public final File os;
 
   private SessionFiles(Builder builder) {
-    minidump = builder.minidump;
+    nativeCore = builder.nativeCore;
     binaryImages = builder.binaryImages;
     metadata = builder.metadata;
     session = builder.session;
diff --git a/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/SessionFilesProvider.java b/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/SessionFilesProvider.java
index 1000fb77738..7dd2585dae7 100644
--- a/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/SessionFilesProvider.java
+++ b/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/SessionFilesProvider.java
@@ -15,6 +15,7 @@
 package com.google.firebase.crashlytics.ndk;
 
 import com.google.firebase.crashlytics.internal.NativeSessionFileProvider;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import java.io.File;
 
 class SessionFilesProvider implements NativeSessionFileProvider {
@@ -27,7 +28,12 @@ class SessionFilesProvider implements NativeSessionFileProvider {
 
   @Override
   public File getMinidumpFile() {
-    return sessionFiles.minidump;
+    return sessionFiles.nativeCore.minidump;
+  }
+
+  @Override
+  public CrashlyticsReport.ApplicationExitInfo getApplicationExitInto() {
+    return sessionFiles.nativeCore != null ? sessionFiles.nativeCore.applicationExitInfo : null;
   }
 
   @Override
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_client/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_client/Android.mk
index a3c02e76d33..f08db85fed0 100644
--- a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_client/Android.mk
+++ b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_client/Android.mk
@@ -9,6 +9,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../libchrome/include \
     $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/.. \
     $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/crashpad \
+    $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/crashpad/compat/linux \
 
 LOCAL_CPPFLAGS := \
     -D_FILE_OFFSET_BITS=64 \
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_minidump/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_minidump/Android.mk
index afc767c01ce..3a717888749 100644
--- a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_minidump/Android.mk
+++ b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_minidump/Android.mk
@@ -34,6 +34,7 @@ LOCAL_SRC_FILES := \
     $(THIRD_PARTY_PATH)/crashpad/minidump/minidump_string_writer.cc \
     $(THIRD_PARTY_PATH)/crashpad/minidump/minidump_system_info_writer.cc \
     $(THIRD_PARTY_PATH)/crashpad/minidump/minidump_thread_id_map.cc \
+    $(THIRD_PARTY_PATH)/crashpad/minidump/minidump_thread_name_list_writer.cc \
     $(THIRD_PARTY_PATH)/crashpad/minidump/minidump_thread_writer.cc \
     $(THIRD_PARTY_PATH)/crashpad/minidump/minidump_unloaded_module_writer.cc \
     $(THIRD_PARTY_PATH)/crashpad/minidump/minidump_user_extension_stream_data_source.cc \
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/Android.mk
index 02a28e0ec40..56d1a65ea5b 100644
--- a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/Android.mk
+++ b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/Android.mk
@@ -4,6 +4,9 @@ THIRD_PARTY_PATH := ../../../../third_party
 
 include $(CLEAR_VARS)
 
+CPP_IMPLICIT_INCLUDES := \
+    -include $(LOCAL_PATH)/include/execvpe.h \
+
 LOCAL_MODULE := crashpad_util
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../libchrome/include \
@@ -20,6 +23,7 @@ LOCAL_CPPFLAGS := \
     -Os \
     -flto \
     -fvisibility=hidden \
+    $(CPP_IMPLICIT_INCLUDES) \
 
 LOCAL_SRC_FILES := \
     $(THIRD_PARTY_PATH)/crashpad/util/file/delimited_file_reader.cc \
@@ -74,7 +78,7 @@ LOCAL_SRC_FILES := \
     $(THIRD_PARTY_PATH)/crashpad/util/posix/close_multiple.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/posix/close_stdio.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/posix/drop_privileges.cc \
-    $(THIRD_PARTY_PATH)/crashpad/util/posix/double_fork_and_exec.cc \
+    $(THIRD_PARTY_PATH)/crashpad/util/posix/spawn_subprocess.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/posix/process_info_linux.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/posix/scoped_dir.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/posix/scoped_mmap.cc \
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/include/execvpe.h b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/include/execvpe.h
new file mode 100644
index 00000000000..9d13eda6d6c
--- /dev/null
+++ b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/include/execvpe.h
@@ -0,0 +1,10 @@
+#ifndef CRASHPAD_UTIL_EXECVPE_H
+#define CRASHPAD_UTIL_EXECVPE_H
+
+#if __ANDROID_API__ < 21
+extern "C" {
+int execvpe(const char *__file, char *const *__argv, char *const *__envp);
+}
+#endif /* __ANDROID_API__ < 21 */
+
+#endif //CRASHPAD_UTIL_EXECVPE_H
diff --git a/firebase-crashlytics-ndk/src/main/jni/libchrome/include/build/chromeos_buildflags.h b/firebase-crashlytics-ndk/src/main/jni/libchrome/include/build/chromeos_buildflags.h
index 9e36779398f..b2f1a1d7737 100644
--- a/firebase-crashlytics-ndk/src/main/jni/libchrome/include/build/chromeos_buildflags.h
+++ b/firebase-crashlytics-ndk/src/main/jni/libchrome/include/build/chromeos_buildflags.h
@@ -3,9 +3,8 @@
 
 #include "build/buildflag.h"
 
-#define BUILDFLAG_INTERNAL_IS_CHROMEOS_DEVICE() (0)
-#define BUILDFLAG_INTERNAL_IS_CHROMEOS_LACROS() (0)
-#define BUILDFLAG_INTERNAL_IS_CHROMEOS_ASH() (0)
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS_LACROS() (0)
+#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS_ASH() (0)
 
 #endif
 
diff --git a/firebase-crashlytics-ndk/src/third_party/crashpad b/firebase-crashlytics-ndk/src/third_party/crashpad
index e5e47bc2775..c902f6b1c9e 160000
--- a/firebase-crashlytics-ndk/src/third_party/crashpad
+++ b/firebase-crashlytics-ndk/src/third_party/crashpad
@@ -1 +1 @@
-Subproject commit e5e47bc277532ae109a444cbb3646977c93fc077
+Subproject commit c902f6b1c9e43224181969110b83e0053b2ddd3c
diff --git a/firebase-crashlytics-ndk/src/third_party/lss b/firebase-crashlytics-ndk/src/third_party/lss
index 29f7c7e018f..9719c1e1e67 160000
--- a/firebase-crashlytics-ndk/src/third_party/lss
+++ b/firebase-crashlytics-ndk/src/third_party/lss
@@ -1 +1 @@
-Subproject commit 29f7c7e018f4ce706a709f0b0afbf8bacf869480
+Subproject commit 9719c1e1e676814c456b55f5f070eabad6709d31
diff --git a/firebase-crashlytics-ndk/src/third_party/mini_chromium b/firebase-crashlytics-ndk/src/third_party/mini_chromium
index 0e22eed71ee..4332ddb6963 160000
--- a/firebase-crashlytics-ndk/src/third_party/mini_chromium
+++ b/firebase-crashlytics-ndk/src/third_party/mini_chromium
@@ -1 +1 @@
-Subproject commit 0e22eed71eec97dacbe80822a14c5cd0b580d793
+Subproject commit 4332ddb6963750e1106efdcece6d6e2de6dc6430
diff --git a/firebase-crashlytics/CHANGELOG.md b/firebase-crashlytics/CHANGELOG.md
index 9abf66f53e9..e954b6dc972 100644
--- a/firebase-crashlytics/CHANGELOG.md
+++ b/firebase-crashlytics/CHANGELOG.md
@@ -1,90 +1,577 @@
 # Unreleased
-- [added] Added a public API to allow bulk logging of custom keys and values.
 
-# 17.1.0
 
-- [fixed] Updated Crashlytics integration with Firebase Analytics to
-  include native crashes in crash-free users counts.
+# 19.0.0
+* [fixed] Force validation or rotation of FIDs.
+* [fixed] Added keep rule for shrinkage of Crashlytics build resources in strict mode.
 
-- [fixed] Removed a harmless, yet unexpected `FileNotFoundException` log
-  output that printed when an optional file is unavailable.
-  ([Github Issue #1559](//github.com/firebase/firebase-android-sdk/issues/1559#issuecomment-638387614))
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
 
-# 17.0.1
+# 18.6.3
+* [feature] Updated `firebase-sessions` dependency.
 
-- [fixed] Fixed an issue causing a `SQLiteException` when changing versions
-  of Crashlytics.
-  ([Github Issue #1531](https://github.com/firebase/firebase-android-sdk/issues/1531))
 
-- [fixed] Improved reliability of sending reports at crash time on Android API
-  level 28+.
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
 
-# 17.0.0
+# 18.6.2
+* [changed] Bump internal dependencies.
 
-- [changed] The Firebase Crashlytics SDK is now generally available.
 
-- [fixed] Fixed an issue that could cause apps to crash if a crash report
-  payload is too large (rare).
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
 
-- [changed] Updated dependency on the Firebase Instance ID library to v20.1.5,
-  which is a step towards a direct dependency on the Firebase Installations
-  service in a future release.
+# 18.6.1
+* [feature] Updated `firebase-sessions` dependency for internal improvements
 
-# 17.0.0-beta04
 
-- [changed] Imposed a limit on the maximum crash report payload size.
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
 
-- [fixed] Reduced crash report payload size.
+# 18.6.0
+* [changed] Include more details about app processes in reports.
+* [feature] Updated `firebase-sessions` dependency for more accurate sessions on multi-process apps.
+* [changed] Added support for [crashlytics] to report information from [remote_config].
 
-# 17.0.0-beta03
+# 18.5.1
+* [fixed] Internal improvement to fix compatibility with Flutter and Unity SDKs. Github
+  [#10759](https://github.com/firebase/flutterfire/issues/10759)
 
-- [fixed] Fixed internal bugs to improve crash analysis and grouping.
 
-- [changed] Improved compatibility with Google Analytics. For best
-  performance, make sure you're using the latest versions of the
-  Firebase Crashlytics SDK and the Firebase SDK for Google Analytics.
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.5.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-crashlytics-ktx`
+  to `com.google.firebase:firebase-crashlytics` under the `com.google.firebase.crashlytics` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-crashlytics-ktx` have been added to
+  `com.google.firebase:firebase-crashlytics` under the `com.google.firebase.crashlytics` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-crashlytics-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.4.3
+* [fixed] Disabled `GradleMetadataPublishing` to fix breakage of the Kotlin extensions
+  library. [#5337]
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.4.2
+* [feature] Expanded `firebase-sessions` library integration to work with NDK crashes and ANRs.
+* [changed] Improved reliability when reporting memory usage.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.4.1
+* [changed] Updated `firebase-sessions` dependency to v1.0.2
+
+# 18.4.0
+* [feature] Integrated with Firebase sessions library to enable upcoming features related to
+  session-based crash metrics.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.3.7
+* [feature] Added collection of version control information generated by the
+  Android Gradle plugin (AGP).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.3.6
+* [feature] Added support for upcoming [crashlytics] features to report
+  GWP-ASan crashes on supported API levels.
+  (GitHub [#4721](https://github.com/firebase/firebase-android-sdk/pull/4721){: .external})
+* [changed] Improved crash reporting reliability for crashes that occur early
+  in the app's lifecycle.
+  (GitHub [#4608](https://github.com/firebase/firebase-android-sdk/pull/4608){:
+  .external}, [#4786](https://github.com/firebase/firebase-android-sdk/pull/4786){: .external})
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.3.5
+* [fixed] Updated `firebase-common` to its latest version (v20.3.0) to fix an
+  issue that was causing a nondeterministic crash on startup.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.3.4
+<aside class="caution">This version of <code>firebase-crashlytics</code> and
+  <code>firebase-crashlytics-ktx</code> can cause a nondeterministic crash on
+  startup. For more information, see
+  <a href="https://github.com/firebase/firebase-android-sdk/issues/4683"
+     class="external">GitHub Issue #4683</a>. We recommend updating to the
+  latest version (v18.3.5+) which contains a fix.
+</aside>
+
+* [changed] Improved crash reporting reliability for crashes that occur early
+  in the app's lifecycle.
+* [changed] Added improved support for capturing `BuildId`s for native ANRs on
+  older Android versions.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.3.3
+* [unchanged] Updated to accommodate the release of the updated
+  `firebase-crashlytics-ndk` v18.3.3.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.3.2
+* [unchanged] Updated to accommodate the release of the updated
+  `firebase-crashlytics-ndk` v18.3.2.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.3.1
+* [fixed] Fixed an [issue](https://github.com/firebase/firebase-android-sdk/issues/4223){:
+  .external}
+  in v18.3.0 that caused a `NoClassDefFoundError` in specific cases.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.3.0
+Warning: We're aware of an
+[issue](https://github.com/firebase/firebase-android-sdk/issues/4223){: .external}
+in this version of the [crashlytics] Android SDK.<br>**We strongly recommend
+using the latest version of the SDK (v18.3.1+ or [bom] v31.0.1+).**
+
+* [changed] Improved reporting for crashes that occur early in the app's
+  lifecycle. After updating to this version, you might notice a sudden
+  _increase_ in the number of crashes that are reported for your app.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has the
+following additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){:
+  .external}
+  to `firebase-crashlytics-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+
+# 18.2.13
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.2.12
+* [changed] Internal changes to avoid accessing device-specific information.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.2.11
+* [changed] Improved crash reporting reliability for multi-process apps on
+  Android 28 and above.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.2.10
+* [fixed] Fixed a bug that could prevent unhandled exceptions from being
+  propogated to the default handler when the network is unavailable.
+* [changed] Internal changes to support on-demand fatal crash reporting for
+  Flutter apps.
+* [fixed] Fixed a bug that prevented [crashlytics] from initalizing on some
+  devices in some cases. (#3269)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.2.9
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.2.8
+* [changed] Updated to the latest version of the `firebase-datatransport`
+  library.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.2.7
+* [changed] Improved runtime efficiency of the
+  [`setCustomKey` functions](/docs/crashlytics/customize-crash-reports?platform=android#add-keys),
+  significantly reducing the number of `Task` objects and disk writes when keys
+  are updated frequently.
+  (#3254)
+* [fixed] Fixed a StrictMode `DiskReadViolation`.
+  (#3265)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
 
-- [changed] Updated remaining Crashlytics backend API calls to prepare
+# 18.2.6
+* [changed] Internal changes to support future improvements to Flutter crash
+  reporting.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.2.5
+* [fixed] Fixed a bug that prevented some [crashlytics] session files from
+  being removed after the session ended. All session-specific files are now
+  properly cleaned up.
+* [changed] Internal improvements to [crashlytics] file management, to
+  ensure consistent creation and removal of intermediate [crashlytics] files.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.2.4
+* [changed] Internal changes to support ANR collection and their upcoming
+  display in the console.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.2.3
+* [fixed] Fixed a race condition that prevented some launch-time crashes from
+  being reported to Crashlytics.
+* [changed] Internal changes to support upcoming Unity crash reporting
+  improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.2.1
+* [fixed] Fixed a `ConcurrentModificationException` that could be logged to
+  logcat when setting multiple custom key/values in rapid succession.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.2.0
+* [changed] Internal changes.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.1.0
+* [changed] Internal changes to support upcoming Unity features.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.0.1
+* [fixed] Fixed a bug that could prevent proper removal of [crashlytics] NDK
+  crash report files when crash reporting is disabled, resulting in excessive
+  disk use.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.0.0
+* [changed] Removed call to
+  [`FirebaseInstallations#getId()`](/docs/reference/android/com/google/firebase/installations/FirebaseInstallations#getId())
+  when [automatic data collection](/docs/crashlytics/customize-crash-reports?platform=android#enable-reporting)
+  is disabled for [crashlytics]. [crashlytics] no longer makes any network
+  calls when reporting is disabled.
+* [changed] Internal changes to support dynamic feature modules.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.4.1
+* [changed] Improved rooted device detection.
+  (#2515)
+* [fixed] Fix an uncaught IllegalStateExeception that could be thrown if
+  [crashlytics] is unable to register a receiver that collects battery state
+  information. If registration fails due to the app already having registered
+  too many receivers, [crashlytics] will report default values for the battery
+  state rather than crashing.
+  (#2504)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.4.0
+* [feature] Added the
+  [`setCustomKeys`](/docs/reference/android/com/google/firebase/crashlytics/CustomKeysAndValues)
+  API to allow bulk logging of custom keys and values.
+  ([Github PR #2443](//github.com/firebase/firebase-android-sdk/pull/2443){: .external})
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.3.1
+* [changed] Removed OkHttp dependency to eliminate conflicts with apps and
+  SDKs using incompatible versions.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.3.0
+* [changed] Clarified debug logs for crash reports enqueued to be sent via the
+  `firebase-datatransport` library.
+* [fixed] Addressed an issue which could cause a `RejectedExecutionException`
+  in rare cases.
+  ([Github Issue #2013](//github.com/firebase/firebase-android-sdk/issues/2013){: .external})
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.2.2
+* [fixed] Fixed crash that can occur when using a built-in resource as the app
+  launcher icon.
+  ([Github Issue #1935](//github.com/firebase/firebase-android-sdk/issues/1935){: .external})
+* [fixed] Fixed a bug preventing crash reports from being sent in some cases
+  when an app is using [crashlytics] on multiple processes.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.2.1
+* [fixed] Improved handling of asynchronous tasks that need to wait for
+  completion on the main thread.
+  ([Github PR #1739](//github.com/firebase/firebase-android-sdk/pull/1739){: .external})
+* [changed] Added an overload to the `setCrashlyticsCollectionEnabled` API to
+  allow for passing `null` to clear any previously set value.
+  ([Github PR #1434](//github.com/firebase/firebase-android-sdk/pull/1434){: .external})
+* [changed] Migrated to use the [firebase_installations] service _directly_
+  instead of using an indirect dependency via the Firebase Instance ID SDK.
+  ([Github PR #1760](//github.com/firebase/firebase-android-sdk/pull/1760){: .external})
+
+  {% include "docs/reference/android/client/_includes/_iid-indirect-dependency-solutions.html" %}
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.1.1
+* [changed] To improve the reliability of submitting crash uploads on poor
+  networks, changed the Transport SDK to retry connection errors
+  ([Github Issue #1705](//github.com/firebase/firebase-android-sdk/issues/1705){: .external})
+  and increased the number of retries before deleting events
+  ([Github Issue #1708](//github.com/firebase/firebase-android-sdk/issues/1708){: .external}).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.1.0
+* [fixed] Updated [crashlytics] integration with [firebase_analytics] to
+  include native crashes in crash-free users counts.
+* [fixed] Removed a harmless, yet unexpected `FileNotFoundException` log
+  output that printed when an optional file is unavailable.
+  ([Github Issue #1559](//github.com/firebase/firebase-android-sdk/issues/1559#issuecomment-638387614){:
+  .external})
+
+
+## Kotlin
+* [feature] The [firebase_crashlytics] Android library with Kotlin
+  extensions is now available. The Kotlin extensions library transitively
+  includes the base `firebase-crashlytics` library. To learn more, visit the
+  [[crashlytics] KTX documentation](/docs/reference/kotlin/com/google/firebase/crashlytics/ktx/package-summary).
+
+# 17.0.1
+* [fixed] Fixed an issue causing a `SQLiteException` when changing versions
+  of [crashlytics].
+  ([Github Issue #1531](https://github.com/firebase/firebase-android-sdk/issues/1531){: .external})
+* [fixed] Improved reliability of sending reports at crash time on Android API
+  level 28+.
+
+# 17.0.0
+* [changed] The [firebase_crashlytics] SDK is now generally available.
+* [fixed] Fixed an issue that could cause apps to crash if a crash report
+  payload is too large (rare).
+* [changed] Updated dependency on the Firebase Instance ID library to v20.1.5,
+  which is a step towards a direct dependency on the [firebase_installations]
+  service in a future release.
+
+# 17.0.0-beta04
+* [changed] Imposed a limit on the maximum crash report payload size.
+* [fixed] Reduced crash report payload size.
+
+# 17.0.0-beta03
+* [fixed] Fixed internal bugs to improve crash analysis and grouping.
+* [changed] Improved compatibility with Google Analytics. For best
+  performance, make sure you're using the latest versions of the
+  [firebase_crashlytics] SDK and the Firebase SDK for Google Analytics.
+* [changed] Updated remaining [crashlytics] backend API calls to prepare
   for Fabric sunset.
 
 # 17.0.0-beta02
-
-- [changed] Removed superfluous `D/FirebaseCrashlytics` prefix from logs.
+* [changed] Removed superfluous `D/FirebaseCrashlytics` prefix from logs.
   ([#1202](https://github.com/firebase/firebase-android-sdk/issues/1202))
-
-- [changed] Updated Crashlytics backend API calls in preparation for
+* [changed] Updated [crashlytics] backend API calls in preparation for
   Fabric sunset.
-
-- [changed] Upgraded Firebase Analytics integration to improve crash-free
+* [changed] Upgraded [firebase_analytics] integration to improve crash-free
   users accuracy. For improved performance, we recommend that you upgrade to the
-  latest version of the Firebase SDK for Firebase Analytics with this
-  version of Firebase Crashlytics.
+  latest version of the Firebase SDK for [firebase_analytics] with this
+  version of [firebase_crashlytics].
 
 # 17.0.0-beta01
+This release for [firebase_crashlytics] includes the initial beta release of
+the [firebase_crashlytics] SDK.
 
-This release for Firebase Crashlytics includes the initial beta release of
-the Firebase Crashlytics SDK.
-
-The Firebase Crashlytics SDK is a new version of the Crashlytics SDK
+The [firebase_crashlytics] SDK is a new version of the [crashlytics] SDK
 built _without_ Fabric and instead built entirely on Firebase. This new SDK has
 new and improved APIs as well as an artifact name change.
 The following release notes describe changes in the new SDK.
 
- - If you're using Crashlytics in your app for the first time, follow the
- [getting started instructions](https://firebase.google.com/docs/crashlytics/get-started-new-sdk?platform=android).
- - If you're upgrading from the legacy Fabric SDK to the
- Firebase Crashlytics SDK, follow the [upgrade instructions](https://firebase.google.com/docs/crashlytics/upgrade-sdk?platform=android)
- to update your app with the following SDK changes.
-
-Note: The following changes are only relevant to Crashlytics users who are
-upgrading from the legacy Fabric SDK.
-
- - [changed] Replaced static methods with new instance methods that are more
- consistent with other Firebase SDKs and more intuitive to use. The new APIs
- give your users more control over how you collect their data.
- - [removed] Removed the Fabric Crashlytics API key. Now, Crashlytics
- will always use the `google-services.json` file to associate your app with your
- Firebase project. If you linked your app from Fabric, remove the Fabric API key
- from your `AndroidManifest.xml` file.
- - [removed] The `fabric.properties` and `crashlytics.properties` files are no
- longer supported. Remove them from your app.
+<aside class="note"><p>The changes in these release notes are only relevant to
+  [crashlytics] users who are upgrading from the legacy Fabric SDK.</p>
+  <ul>
+    <li>If you're using [crashlytics] for NDK crash reporting in your app for
+      the first time, follow the
+      <a href="/docs/crashlytics/get-started-new-sdk?platform=android">getting
+        started instructions</a>.
+    </li>
+    <li>If you're upgrading from the legacy Fabric SDK to the
+      [firebase_crashlytics] SDK, follow the
+      <a href="/docs/crashlytics/upgrade-sdk?platform=android">upgrade
+        instructions</a> to update your app with the following SDK changes.
+    </li>
+  </ul>
+</aside>
+
+* [changed] Replaced static methods with new instance methods that are more
+  consistent with other Firebase SDKs and more intuitive to use. The new APIs
+  give your users more control over how you collect their data.
+* [removed] Removed the Fabric [crashlytics] API key. Now, [crashlytics]
+  will always use the `google-services.json` file to associate your app with your
+  Firebase project. If you linked your app from Fabric, remove the Fabric API key
+  from your `AndroidManifest.xml` file.
+* [removed] The `fabric.properties` and `crashlytics.properties` files are no
+  longer supported. Remove them from your app.
+
diff --git a/firebase-crashlytics/api.txt b/firebase-crashlytics/api.txt
index 526fffec6e2..47afa038648 100644
--- a/firebase-crashlytics/api.txt
+++ b/firebase-crashlytics/api.txt
@@ -35,5 +35,39 @@ package com.google.firebase.crashlytics {
     method public void setUserId(@NonNull String);
   }
 
+  public final class FirebaseCrashlyticsKt {
+    method @NonNull public static com.google.firebase.crashlytics.FirebaseCrashlytics getCrashlytics(@NonNull com.google.firebase.Firebase);
+    method public static void setCustomKeys(@NonNull com.google.firebase.crashlytics.FirebaseCrashlytics, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.crashlytics.KeyValueBuilder,kotlin.Unit> init);
+  }
+
+  public final class KeyValueBuilder {
+    ctor public KeyValueBuilder(@NonNull com.google.firebase.crashlytics.FirebaseCrashlytics crashlytics);
+    method public void key(@NonNull String key, boolean value);
+    method public void key(@NonNull String key, double value);
+    method public void key(@NonNull String key, float value);
+    method public void key(@NonNull String key, int value);
+    method public void key(@NonNull String key, long value);
+    method public void key(@NonNull String key, @NonNull String value);
+  }
+
+}
+
+package com.google.firebase.crashlytics.ktx {
+
+  public final class FirebaseCrashlyticsKt {
+    method @Deprecated @NonNull public static com.google.firebase.crashlytics.FirebaseCrashlytics getCrashlytics(@NonNull com.google.firebase.ktx.Firebase);
+    method @Deprecated public static void setCustomKeys(@NonNull com.google.firebase.crashlytics.FirebaseCrashlytics, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.crashlytics.ktx.KeyValueBuilder,kotlin.Unit> init);
+  }
+
+  @Deprecated public final class KeyValueBuilder {
+    ctor @Deprecated public KeyValueBuilder(@NonNull com.google.firebase.crashlytics.FirebaseCrashlytics crashlytics);
+    method @Deprecated public void key(@NonNull String key, boolean value);
+    method @Deprecated public void key(@NonNull String key, double value);
+    method @Deprecated public void key(@NonNull String key, float value);
+    method @Deprecated public void key(@NonNull String key, int value);
+    method @Deprecated public void key(@NonNull String key, long value);
+    method @Deprecated public void key(@NonNull String key, @NonNull String value);
+  }
+
 }
 
diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle
index 89c13e0d48b..c5c85baee96 100644
--- a/firebase-crashlytics/firebase-crashlytics.gradle
+++ b/firebase-crashlytics/firebase-crashlytics.gradle
@@ -14,13 +14,15 @@
 
 plugins {
     id 'firebase-library'
+    id("kotlin-android")
     id 'LicenseResolverPlugin'
 }
 
 firebaseLibrary {
+    libraryGroup "crashlytics"
     testLab {
         enabled = true
-        device 'model=redfin,version=30'
+        device 'model=panther,version=33'
     }
 }
 
@@ -28,12 +30,12 @@ android {
     adbOptions {
         timeOutInMs 60 * 1000
     }
-
-    compileSdkVersion 30
+    namespace "com.google.firebase.crashlytics"
+    compileSdkVersion project.compileSdkVersion
     testOptions.unitTests.includeAndroidResources = true
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 30
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
         versionName version
 
         multiDexEnabled true
@@ -50,47 +52,61 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 thirdPartyLicenses {
-    add 'Tape', "file://${projectDir}/third_party_licenses/tape/LICENSE"
+    add 'Tape', "${projectDir}/third_party_licenses/tape/LICENSE"
 }
 
 dependencies {
-    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
+    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
 
-    implementation project(':encoders:firebase-encoders')
-    implementation project(':encoders:firebase-encoders-json')
-    implementation project(':firebase-annotations')
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':transport:transport-api')
-    implementation project(':transport:transport-runtime')
-    implementation project(':transport:transport-backend-cct')
-    implementation project(':firebase-installations-interop')
-    runtimeOnly project(':firebase-installations')
-    implementation 'com.google.firebase:firebase-measurement-connector:18.0.2'
-    implementation "com.google.android.gms:play-services-tasks:18.0.1"
+    api(project(":firebase-sessions"))
+    api "com.google.android.gms:play-services-tasks:18.0.1"
+    api 'com.google.firebase:firebase-annotations:16.2.0'
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
+    api 'com.google.firebase:firebase-config-interop:16.0.0'
+    api 'com.google.firebase:firebase-encoders:17.0.0'
+    api 'com.google.firebase:firebase-encoders-json:18.0.0'
+    api("com.google.firebase:firebase-installations:17.2.0")
+    api 'com.google.firebase:firebase-installations-interop:17.1.0'
+    api('com.google.firebase:firebase-measurement-connector:18.0.2') {
+         exclude group: 'com.google.firebase', module: 'firebase-common'
+         exclude group: 'com.google.firebase', module: 'firebase-components'
+     }
 
-    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
+    implementation 'com.google.android.datatransport:transport-api:3.0.0'
+    implementation 'com.google.android.datatransport:transport-backend-cct:3.1.9'
+    implementation 'com.google.android.datatransport:transport-runtime:3.1.9'
+    implementation(libs.androidx.annotation)
+    compileOnly(libs.errorprone.annotations)
+
+    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
 
     annotationProcessor project(":encoders:firebase-encoders-processor")
     annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
 
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'androidx.test:runner:1.4.0'
-    testImplementation 'androidx.test:core:1.4.0'
-    testImplementation "org.robolectric:robolectric:4.5"
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.4.3'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 
-
-    androidTestImplementation project(':encoders:firebase-encoders-json')
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
     androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test:core:1.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'org.mockito:mockito-core:3.4.3'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
+    androidTestImplementation 'com.google.firebase:firebase-encoders-json:18.0.0'
+    androidTestImplementation 'com.google.protobuf:protobuf-java:3.21.9'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.25.0'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.25.0'
-    androidTestImplementation 'com.google.protobuf:protobuf-java:3.14.0'
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.1'
+    androidTestImplementation 'org.mockito:mockito-core:3.4.3'
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.truth)
 }
diff --git a/firebase-crashlytics/gradle.properties b/firebase-crashlytics/gradle.properties
index 28126fe0e93..fd3ef991ef3 100644
--- a/firebase-crashlytics/gradle.properties
+++ b/firebase-crashlytics/gradle.properties
@@ -1,2 +1,2 @@
-version=18.2.9
-latestReleasedVersion=18.2.8
+version=19.0.1
+latestReleasedVersion=19.0.0
diff --git a/firebase-crashlytics/ktx/api.txt b/firebase-crashlytics/ktx/api.txt
index 7ca178157f8..fdf9446609e 100644
--- a/firebase-crashlytics/ktx/api.txt
+++ b/firebase-crashlytics/ktx/api.txt
@@ -1,20 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.crashlytics.ktx {
 
-  public final class FirebaseCrashlyticsKt {
-    ctor public FirebaseCrashlyticsKt();
-    method @NonNull public static com.google.firebase.crashlytics.FirebaseCrashlytics getCrashlytics(@NonNull com.google.firebase.ktx.Firebase);
-    method public static void setCustomKeys(@NonNull com.google.firebase.crashlytics.FirebaseCrashlytics, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.crashlytics.ktx.KeyValueBuilder,kotlin.Unit> init);
-  }
-
-  public final class KeyValueBuilder {
-    ctor public KeyValueBuilder(@NonNull com.google.firebase.crashlytics.FirebaseCrashlytics crashlytics);
-    method public void key(@NonNull String key, boolean value);
-    method public void key(@NonNull String key, double value);
-    method public void key(@NonNull String key, float value);
-    method public void key(@NonNull String key, int value);
-    method public void key(@NonNull String key, long value);
-    method public void key(@NonNull String key, @NonNull String value);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-crashlytics/ktx/ktx.gradle b/firebase-crashlytics/ktx/ktx.gradle
index a449776855f..533da48e22a 100644
--- a/firebase-crashlytics/ktx/ktx.gradle
+++ b/firebase-crashlytics/ktx/ktx.gradle
@@ -13,60 +13,46 @@
 // limitations under the License.
 
 plugins {
-    id 'firebase-library'
-    id 'kotlin-android'
+  id "firebase-library"
+  id "kotlin-android"
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-crashlytics')
-    testLab.enabled = true
-    publishJavadoc = true
-    publishSources = true
+  libraryGroup "crashlytics"
+  testLab.enabled = true
+  publishJavadoc = false
+  publishReleaseNotes = false
+  publishSources = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-        minSdkVersion 16
-        multiDexEnabled true
-        targetSdkVersion project.targetSdkVersion
-        versionName version
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-        test.java {
-            srcDir 'src/test/kotlin'
-        }
-        androidTest.java.srcDirs += 'src/androidTest/kotlin'
-    }
-    testOptions.unitTests.includeAndroidResources = true
+  namespace "com.google.firebase.crashlytics.ktx"
+  compileSdk project.compileSdkVersion
+  defaultConfig {
+    minSdk project.minSdkVersion
+    multiDexEnabled true
+    targetSdk project.targetSdkVersion
+    versionName version
+    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+  }
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+  kotlinOptions {
+    jvmTarget = '1.8'
+  }
+  testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api(project(":firebase-crashlytics"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
 
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-crashlytics')
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation("com.google.firebase:firebase-components:18.0.0")
 
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:core:1.2.0'
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.truth)
 }
-
-// ==========================================================================
-// Copy from here down if you want to use the google-services plugin in your
-// androidTest integration tests.
-// ==========================================================================
-ext.packageName = "com.google.firebase.crashlytics.ktx"
-apply from: '../../gradle/googleServices.gradle'
-
diff --git a/firebase-crashlytics/ktx/src/androidTest/AndroidManifest.xml b/firebase-crashlytics/ktx/src/androidTest/AndroidManifest.xml
index 4a6be17cfd1..f6c54a6adb5 100644
--- a/firebase-crashlytics/ktx/src/androidTest/AndroidManifest.xml
+++ b/firebase-crashlytics/ktx/src/androidTest/AndroidManifest.xml
@@ -1,13 +1,26 @@
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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="com.google.firebase.crashlytics.ktx">
-  <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />-->
-  <uses-permission android:name="android.permission.INTERNET"/>
+  android:versionCode="1"
+  android:versionName="1.0.0">
+
   <application>
-    <uses-library android:name="android.test.runner" />
+
   </application>
 
-  <instrumentation
-    android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="com.google.firebase.crashlytics.ktx" />
+  <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
diff --git a/firebase-crashlytics/ktx/src/androidTest/kotlin/com/google/firebase/crashlytics/ktx/CrashlyticsTests.kt b/firebase-crashlytics/ktx/src/androidTest/kotlin/com/google/firebase/crashlytics/ktx/CrashlyticsTests.kt
index 383a785ed43..8015b7c3a91 100644
--- a/firebase-crashlytics/ktx/src/androidTest/kotlin/com/google/firebase/crashlytics/ktx/CrashlyticsTests.kt
+++ b/firebase-crashlytics/ktx/src/androidTest/kotlin/com/google/firebase/crashlytics/ktx/CrashlyticsTests.kt
@@ -1,75 +1,69 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics.ktx
 
-import androidx.test.InstrumentationRegistry
-import androidx.test.runner.AndroidJUnit4
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.ktx.app
 import com.google.firebase.ktx.initialize
 import com.google.firebase.platforminfo.UserAgentPublisher
-import org.junit.AfterClass
-import org.junit.BeforeClass
+import org.junit.After
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class CrashlyticsTests {
-    companion object {
-        lateinit var app: FirebaseApp
+  @Before
+  fun setUp() {
+    @Suppress("DEPRECATION")
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId(PROJECT_ID)
+        .build(),
+    )
+  }
 
-        @BeforeClass @JvmStatic fun setup() {
-            app = Firebase.initialize(InstrumentationRegistry.getContext())!!
-        }
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 
-        @AfterClass @JvmStatic fun cleanup() {
-            app.delete()
-        }
-    }
+  @Test
+  fun firebaseCrashlyticsDelegates() {
+    assertThat(Firebase.crashlytics).isSameInstanceAs(FirebaseCrashlytics.getInstance())
+  }
 
-    @Test
-    fun firebaseCrashlyticsDelegates() {
-        assertThat(Firebase.crashlytics).isSameInstanceAs(FirebaseCrashlytics.getInstance())
-    }
+  @Test
+  fun libraryRegistrationAtRuntime() {
+    Firebase.app.get(UserAgentPublisher::class.java)
+  }
 
-    @Test
-    fun testDataCall() {
-        assertThat("hola").isEqualTo("hola")
-    }
-}
-
-@RunWith(AndroidJUnit4::class)
-class LibraryVersionTest {
-    companion object {
-        lateinit var app: FirebaseApp
-
-        @BeforeClass @JvmStatic fun setup() {
-            app = Firebase.initialize(InstrumentationRegistry.getContext())!!
-        }
-
-        @AfterClass @JvmStatic fun cleanup() {
-            app.delete()
-        }
-    }
-
-    @Test
-    fun libraryRegistrationAtRuntime() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  companion object {
+    private const val APP_ID = "1:1:android:1a"
+    private const val API_KEY = "API-KEY-API-KEY-API-KEY-API-KEY-API-KEY"
+    private const val PROJECT_ID = "PROJECT-ID"
+  }
 }
diff --git a/firebase-crashlytics/ktx/src/main/AndroidManifest.xml b/firebase-crashlytics/ktx/src/main/AndroidManifest.xml
index da4dee15a29..9a3f53960e1 100644
--- a/firebase-crashlytics/ktx/src/main/AndroidManifest.xml
+++ b/firebase-crashlytics/ktx/src/main/AndroidManifest.xml
@@ -12,9 +12,8 @@
 <!-- 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="com.google.firebase.crashlytics.ktx">
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
diff --git a/firebase-crashlytics/ktx/src/main/kotlin/com/google/firebase/crashlytics/ktx/FirebaseCrashlytics.kt b/firebase-crashlytics/ktx/src/main/kotlin/com/google/firebase/crashlytics/ktx/FirebaseCrashlytics.kt
deleted file mode 100644
index b16ca8f569b..00000000000
--- a/firebase-crashlytics/ktx/src/main/kotlin/com/google/firebase/crashlytics/ktx/FirebaseCrashlytics.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.crashlytics.ktx
-
-import androidx.annotation.Keep
-import com.google.firebase.FirebaseApp
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.platforminfo.LibraryVersionComponent
-
-/** Returns the [FirebaseCrashlytics] instance of the default [FirebaseApp]. */
-val Firebase.crashlytics: FirebaseCrashlytics
-    get() = FirebaseCrashlytics.getInstance()
-
-/**
- * Associates all key-value parameters with the reports
- */
-fun FirebaseCrashlytics.setCustomKeys(init: KeyValueBuilder.() -> Unit) {
-    val builder = KeyValueBuilder(this)
-    builder.init()
-}
-
-internal const val LIBRARY_NAME: String = "fire-cls-ktx"
-
-/** @suppress */
-@Keep
-class FirebaseCrashlyticsKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-crashlytics/ktx/src/main/kotlin/com/google/firebase/crashlytics/ktx/KeyValueBuilder.kt b/firebase-crashlytics/ktx/src/main/kotlin/com/google/firebase/crashlytics/ktx/KeyValueBuilder.kt
deleted file mode 100644
index 05d504e9f4b..00000000000
--- a/firebase-crashlytics/ktx/src/main/kotlin/com/google/firebase/crashlytics/ktx/KeyValueBuilder.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.crashlytics.ktx
-
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-
-/** Helper class to enable fluent syntax in [setCustomKeys] */
-class KeyValueBuilder(
-    private val crashlytics: FirebaseCrashlytics
-) {
-
-    /** Sets a custom key and value that are associated with reports.  */
-    fun key(key: String, value: Boolean) = crashlytics.setCustomKey(key, value)
-
-    /** Sets a custom key and value that are associated with reports.  */
-    fun key(key: String, value: Double) = crashlytics.setCustomKey(key, value)
-
-    /** Sets a custom key and value that are associated with reports.  */
-    fun key(key: String, value: Float) = crashlytics.setCustomKey(key, value)
-
-    /** Sets a custom key and value that are associated with reports.  */
-    fun key(key: String, value: Int) = crashlytics.setCustomKey(key, value)
-
-    /** Sets a custom key and value that are associated with reports.  */
-    fun key(key: String, value: Long) = crashlytics.setCustomKey(key, value)
-
-    /** Sets a custom key and value that are associated with reports.  */
-    fun key(key: String, value: String) = crashlytics.setCustomKey(key, value)
-}
diff --git a/firebase-crashlytics/ktx/src/main/kotlin/com/google/firebase/crashlytics/ktx/Logging.kt b/firebase-crashlytics/ktx/src/main/kotlin/com/google/firebase/crashlytics/ktx/Logging.kt
new file mode 100644
index 00000000000..e45aed4b682
--- /dev/null
+++ b/firebase-crashlytics/ktx/src/main/kotlin/com/google/firebase/crashlytics/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.crashlytics.BuildConfig
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-cls-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseCrashlyticsLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-crashlytics/src/androidTest/AndroidManifest.xml b/firebase-crashlytics/src/androidTest/AndroidManifest.xml
index 19b23063229..52ab301800d 100644
--- a/firebase-crashlytics/src/androidTest/AndroidManifest.xml
+++ b/firebase-crashlytics/src/androidTest/AndroidManifest.xml
@@ -1,11 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.crashlytics.android.core">
-
-    <application>
-
-        <meta-data android:name="io.fabric.ApiKey"
-                   android:value="a000000000000000000000000000000000000000"/>
-
-    </application>
-
+  xmlns:tools="http://schemas.android.com/tools">
+
+  <application>
+    <service
+      android:enabled="false"
+      android:name="com.google.firebase.sessions.SessionLifecycleService"
+      tools:replace="android:enabled" />
+  </application>
 </manifest>
diff --git a/firebase-crashlytics/src/androidTest/assets/firebase_settings_collect_build_ids.json b/firebase-crashlytics/src/androidTest/assets/firebase_settings_collect_build_ids.json
new file mode 100644
index 00000000000..1d1b1c438ef
--- /dev/null
+++ b/firebase-crashlytics/src/androidTest/assets/firebase_settings_collect_build_ids.json
@@ -0,0 +1,20 @@
+{
+  "settings_version": 3,
+  "cache_duration": 7200,
+  "features": {
+    "collect_logged_exceptions": true,
+    "collect_reports": true,
+    "collect_anrs": true,
+    "collect_build_ids": true
+  },
+  "app": {
+    "status": "activated",
+    "update_required": true,
+    "report_upload_variant": 2,
+    "native_report_upload_variant": 2
+  },
+  "fabric": {
+    "org_id": "6001bf51c0329dc5da694f7f",
+    "bundle_id": "com.google.firebase.crashlytics.sdk.test"
+  }
+}
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/CrashlyticsTests.kt b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/CrashlyticsTests.kt
new file mode 100644
index 00000000000..58be1dbab25
--- /dev/null
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/CrashlyticsTests.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class CrashlyticsTests {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId(PROJECT_ID)
+        .build(),
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+
+  @Test
+  fun firebaseCrashlyticsDelegates() {
+    assertThat(Firebase.crashlytics).isSameInstanceAs(FirebaseCrashlytics.getInstance())
+  }
+
+  @Test
+  fun libraryRegistrationAtRuntime() {
+    Firebase.app.get(UserAgentPublisher::class.java)
+  }
+
+  companion object {
+    private const val APP_ID = "1:1:android:1a"
+    private const val API_KEY = "API-KEY-API-KEY-API-KEY-API-KEY-API-KEY"
+    private const val PROJECT_ID = "PROJECT-ID"
+  }
+}
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/CrashlyticsRemoteConfigListenerTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/CrashlyticsRemoteConfigListenerTest.java
new file mode 100644
index 00000000000..46904ee9b06
--- /dev/null
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/CrashlyticsRemoteConfigListenerTest.java
@@ -0,0 +1,134 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import com.google.firebase.crashlytics.internal.metadata.RolloutAssignment;
+import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutsState;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class CrashlyticsRemoteConfigListenerTest {
+  private static final String ROLLOUT_ASSIGNMENT_JSON_1 =
+      "{"
+          + "\"rolloutId\":\"rollout_1\","
+          + "\"variantId\":\"control\","
+          + "\"parameterKey\":\"my_feature\","
+          + "\"parameterValue\":\"false\","
+          + "\"templateVersion\":1"
+          + "}";
+
+  private static final String ROLLOUT_ASSIGNMENT_JSON_2 =
+      "{"
+          + "\"rolloutId\":\"rollout_2\","
+          + "\"variantId\":\"enabled\","
+          + "\"parameterKey\":\"my_another_feature\","
+          + "\"parameterValue\":\"false\","
+          + "\"templateVersion\":1"
+          + "}";
+
+  private static List<RolloutAssignment> CRASHLYTICS_ROLLOUT_ASSIGNMENT_SINGLE_ELEMENT_LIST;
+
+  static {
+    CRASHLYTICS_ROLLOUT_ASSIGNMENT_SINGLE_ELEMENT_LIST = new ArrayList<>();
+    CRASHLYTICS_ROLLOUT_ASSIGNMENT_SINGLE_ELEMENT_LIST.add(
+        RolloutAssignment.create("rollout_1", "my_feature", "false", "control", 1));
+  }
+
+  private static List<RolloutAssignment> CRASHLYTICS_ROLLOUT_ASSIGNMENT_MULTIPLE_ELEMENTS_LIST;
+
+  static {
+    CRASHLYTICS_ROLLOUT_ASSIGNMENT_MULTIPLE_ELEMENTS_LIST = new ArrayList<>();
+    CRASHLYTICS_ROLLOUT_ASSIGNMENT_MULTIPLE_ELEMENTS_LIST.add(
+        RolloutAssignment.create("rollout_1", "my_feature", "false", "control", 1));
+    CRASHLYTICS_ROLLOUT_ASSIGNMENT_MULTIPLE_ELEMENTS_LIST.add(
+        RolloutAssignment.create("rollout_2", "my_another_feature", "false", "enabled", 1));
+  }
+
+  @Mock private UserMetadata userMetadata;
+
+  @Captor private ArgumentCaptor<ArrayList<RolloutAssignment>> captor;
+
+  private CrashlyticsRemoteConfigListener listener;
+
+  @Before
+  public void setup() throws Exception {
+    MockitoAnnotations.openMocks(this);
+    listener = new CrashlyticsRemoteConfigListener(userMetadata);
+  }
+
+  @Test
+  public void testListener_onChangeUpdateRCInteropClassToCrashlyticsClass() throws Exception {
+    RolloutsState rolloutsState = createInteropRolloutsStateWithSingleElement();
+    listener.onRolloutsStateChanged(rolloutsState);
+
+    verify(userMetadata).updateRolloutsState(CRASHLYTICS_ROLLOUT_ASSIGNMENT_SINGLE_ELEMENT_LIST);
+  }
+
+  @Test
+  public void testListener_onChangeUpdateRCInteropClassToCrashlyticsClassMultipleTimes()
+      throws Exception {
+    RolloutsState rolloutsState = createInteropRolloutsStateWithSingleElement();
+    listener.onRolloutsStateChanged(rolloutsState);
+
+    RolloutsState newRolloutsState = createInteropRolloutsStateWithMultipleElements();
+    listener.onRolloutsStateChanged(newRolloutsState);
+
+    verify(userMetadata, times(2)).updateRolloutsState(captor.capture());
+    assertThat(captor.getAllValues().get(1).size()).isEqualTo(2);
+  }
+
+  private RolloutsState createInteropRolloutsStateWithSingleElement() throws Exception {
+    com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment assignment =
+        com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.create(
+            ROLLOUT_ASSIGNMENT_JSON_1);
+    Set<com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment> rolloutAssignmentsSet =
+        new HashSet<>();
+    rolloutAssignmentsSet.add(assignment);
+
+    RolloutsState rolloutsState = RolloutsState.create(rolloutAssignmentsSet);
+    return rolloutsState;
+  }
+
+  private RolloutsState createInteropRolloutsStateWithMultipleElements() throws Exception {
+    com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment assignment1 =
+        com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.create(
+            ROLLOUT_ASSIGNMENT_JSON_1);
+
+    com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment assignment2 =
+        com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment.create(
+            ROLLOUT_ASSIGNMENT_JSON_2);
+    Set<com.google.firebase.remoteconfig.interop.rollouts.RolloutAssignment> rolloutAssignmentsSet =
+        new HashSet<>();
+
+    rolloutAssignmentsSet.add(assignment1);
+    rolloutAssignmentsSet.add(assignment2);
+
+    RolloutsState rolloutsState = RolloutsState.create(rolloutAssignmentsSet);
+    return rolloutsState;
+  }
+}
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/DevelopmentPlatformProviderTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/DevelopmentPlatformProviderTest.java
index 4e1a3d69a3c..0fbb06d55a9 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/DevelopmentPlatformProviderTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/DevelopmentPlatformProviderTest.java
@@ -42,7 +42,7 @@ public void testDevelopmentPlatformInfo_withUnity_returnsPlatformAndVersion() th
   }
 
   public void testDevelopmentPlatformInfo_withFlutter_returnsPlatformAndNoVersion() {
-    Context context = getContext(); // has asset in DevelopmentPlatformProvider.FLUTTER_ASSETS_PATH
+    Context context = getContext(); // has asset DevelopmentPlatformProvider.FLUTTER_ASSET_FILE
 
     DevelopmentPlatformProvider provider = new DevelopmentPlatformProvider(context);
 
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/RemoteConfigDeferredProxyTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/RemoteConfigDeferredProxyTest.java
new file mode 100644
index 00000000000..d78214c2155
--- /dev/null
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/RemoteConfigDeferredProxyTest.java
@@ -0,0 +1,55 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal;
+
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+
+import androidx.annotation.NonNull;
+import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
+import com.google.firebase.inject.Deferred;
+import com.google.firebase.remoteconfig.interop.FirebaseRemoteConfigInterop;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class RemoteConfigDeferredProxyTest {
+
+  @Mock private FirebaseRemoteConfigInterop interop;
+
+  @Mock private UserMetadata userMetadata;
+
+  @Before
+  public void setUp() throws Exception {
+    MockitoAnnotations.openMocks(this);
+  }
+
+  @Test
+  public void testProviderProxyCallsThroughProvidedValue() {
+    RemoteConfigDeferredProxy proxy =
+        new RemoteConfigDeferredProxy(
+            new Deferred<FirebaseRemoteConfigInterop>() {
+              @Override
+              public void whenAvailable(
+                  @NonNull Deferred.DeferredHandler<FirebaseRemoteConfigInterop> handler) {
+                handler.handle(() -> interop);
+              }
+            });
+    proxy.setupListener(userMetadata);
+    verify(interop).registerRolloutsStateSubscriber(eq("firebase"), anyObject());
+  }
+}
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/analytics/BlockingAnalyticsEventLoggerTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/analytics/BlockingAnalyticsEventLoggerTest.java
index 50ca1247a83..c24635678e0 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/analytics/BlockingAnalyticsEventLoggerTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/analytics/BlockingAnalyticsEventLoggerTest.java
@@ -18,9 +18,13 @@
 import static org.junit.Assert.*;
 
 import android.os.Bundle;
+import androidx.test.core.app.ApplicationProvider;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -38,9 +42,21 @@ public class BlockingAnalyticsEventLoggerTest {
 
   @Before
   public void setUp() throws Exception {
+    FirebaseApp.initializeApp(
+        ApplicationProvider.getApplicationContext(),
+        new FirebaseOptions.Builder()
+            .setApplicationId("1:1:android:1")
+            .setApiKey("API-KEY-API-KEY-API-KEY-API-KEY-API-KEY")
+            .setProjectId("project-id")
+            .build());
     MockitoAnnotations.initMocks(this);
   }
 
+  @After
+  public void cleanUp() {
+    FirebaseApp.clearInstancesForTest();
+  }
+
   @Test
   public void testBlockingAnalyticsEventLoggerCompletesAfterTimeoutWhenNoEventReturned() {
     final String eventName = "event";
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CommonUtilsTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CommonUtilsTest.java
index 3d500755671..205cacbbe92 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CommonUtilsTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CommonUtilsTest.java
@@ -19,7 +19,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import android.app.ActivityManager.RunningAppProcessInfo;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -27,7 +26,10 @@
 import android.util.Log;
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
 import com.google.firebase.crashlytics.internal.Logger;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class CommonUtilsTest extends CrashlyticsTestCase {
@@ -46,24 +48,6 @@ protected void tearDown() throws Exception {
 
   private static final String ABC_EXPECTED_HASH = "a9993e364706816aba3e25717850c26c9cd0d89d";
 
-  public void testConvertMemInfoToBytesFromKb() {
-    assertEquals(
-        1055760384,
-        CommonUtils.convertMemInfoToBytes("1031016 KB", "KB", CommonUtils.BYTES_IN_A_KILOBYTE));
-  }
-
-  public void testConvertMemInfoToBytesFromMb() {
-    assertEquals(
-        1081081856,
-        CommonUtils.convertMemInfoToBytes("1031 MB", "MB", CommonUtils.BYTES_IN_A_MEGABYTE));
-  }
-
-  public void testConvertMemInfoToBytesFromGb() {
-    assertEquals(
-        10737418240L,
-        CommonUtils.convertMemInfoToBytes("10 GB", "GB", CommonUtils.BYTES_IN_A_GIGABYTE));
-  }
-
   public void testCreateInstanceIdFromNullInput() {
     assertNull(CommonUtils.createInstanceIdFrom(((String[]) null)));
   }
@@ -148,31 +132,17 @@ public void testGetCpuArchitecture() {
   }
 
   public void testGetTotalRamInBytes() {
-    final long bytes = CommonUtils.getTotalRamInBytes();
+    final long bytes = CommonUtils.calculateTotalRamInBytes(getContext());
     // can't check complete string because emulators & devices may be different.
     assertTrue(bytes > 0);
     Log.d(Logger.TAG, "testGetTotalRam: " + bytes);
   }
 
-  public void testGetAppProcessInfo() {
-    final Context context = getContext();
-    RunningAppProcessInfo info = CommonUtils.getAppProcessInfo(context.getPackageName(), context);
-    assertNotNull(info);
-    // It is not possible to test the state of info.importance because the value is not
-    // always the same under test as it is when the sdk is running in an app. In API 21, the
-    // importance under test started returning VISIBLE instead of FOREGROUND.
-
-    info = CommonUtils.getAppProcessInfo("nonexistant.package.name", context);
-    assertNull(info);
-  }
-
   public void testIsRooted() {
     // No good way to test the alternate case,
     // just want to ensure we can complete the call without an exception here.
-    final boolean isRooted = CommonUtils.isRooted(getContext());
-    Log.d(
-        Logger.TAG,
-        "isRooted: " + isRooted + " isEmulator: " + CommonUtils.isEmulator(getContext()));
+    final boolean isRooted = CommonUtils.isRooted();
+    Log.d(Logger.TAG, "isRooted: " + isRooted + " isEmulator: " + CommonUtils.isEmulator());
 
     // We don't care about the actual result of isRooted, just that we didn't cause an exception
     assertTrue(true);
@@ -192,10 +162,10 @@ private boolean isBitSet(int data, int mask) {
 
   public void testGetDeviceState() {
 
-    final int state = CommonUtils.getDeviceState(getContext());
+    final int state = CommonUtils.getDeviceState();
     Log.d(Logger.TAG, "testGetDeviceState: state=" + state);
 
-    if (CommonUtils.isEmulator(getContext())) {
+    if (CommonUtils.isEmulator()) {
       assertTrue(isBitSet(state, CommonUtils.DEVICE_STATE_ISSIMULATOR));
     } else {
       assertFalse(isBitSet(state, CommonUtils.DEVICE_STATE_ISSIMULATOR));
@@ -207,7 +177,7 @@ public void testGetDeviceState() {
       assertFalse(isBitSet(state, CommonUtils.DEVICE_STATE_DEBUGGERATTACHED));
     }
 
-    if (CommonUtils.isRooted(getContext())) {
+    if (CommonUtils.isRooted()) {
       assertTrue(isBitSet(state, CommonUtils.DEVICE_STATE_JAILBROKEN));
     } else {
       assertFalse(isBitSet(state, CommonUtils.DEVICE_STATE_JAILBROKEN));
@@ -280,6 +250,82 @@ public void testResolveBuildId_bothIds() throws Exception {
         });
   }
 
+  public void testResolveNativeBuildIds_missing_returnsEmptyList() {
+    assertNativeBuildIds(new ArrayList<BuildIdInfo>(), new HashMap<String, List<String>>());
+  }
+
+  public void testResolveNativeBuildIds_missingResourceArray_returnsEmptyList() {
+    assertNativeBuildIds(
+        new ArrayList<BuildIdInfo>(),
+        new HashMap<String, List<String>>() {
+          {
+            put(
+                CommonUtils.BUILD_IDS_LIB_NAMES_RESOURCE_NAME,
+                new ArrayList<String>(Arrays.asList("lib.so")));
+            put(
+                CommonUtils.BUILD_IDS_BUILD_ID_RESOURCE_NAME,
+                new ArrayList<String>(Arrays.asList("aabb")));
+          }
+        });
+  }
+
+  public void testResolveNativeBuildIds_returnsSingleLibrary() {
+    assertNativeBuildIds(
+        new ArrayList<BuildIdInfo>(Arrays.asList(new BuildIdInfo("lib.so", "x86", "aabb"))),
+        new HashMap<String, List<String>>() {
+          {
+            put(
+                CommonUtils.BUILD_IDS_LIB_NAMES_RESOURCE_NAME,
+                new ArrayList<String>(Arrays.asList("lib.so")));
+            put(
+                CommonUtils.BUILD_IDS_ARCH_RESOURCE_NAME,
+                new ArrayList<String>(Arrays.asList("x86")));
+            put(
+                CommonUtils.BUILD_IDS_BUILD_ID_RESOURCE_NAME,
+                new ArrayList<String>(Arrays.asList("aabb")));
+          }
+        });
+  }
+
+  public void testResolveNativeBuildIds_returnsMultipleLibrary() {
+    assertNativeBuildIds(
+        new ArrayList<BuildIdInfo>(
+            Arrays.asList(
+                new BuildIdInfo("lib.so", "x86", "aabb"),
+                new BuildIdInfo("lib.so", "x86_64", "bbaa"))),
+        new HashMap<String, List<String>>() {
+          {
+            put(
+                CommonUtils.BUILD_IDS_LIB_NAMES_RESOURCE_NAME,
+                new ArrayList<String>(Arrays.asList("lib.so", "lib.so")));
+            put(
+                CommonUtils.BUILD_IDS_ARCH_RESOURCE_NAME,
+                new ArrayList<String>(Arrays.asList("x86", "x86_64")));
+            put(
+                CommonUtils.BUILD_IDS_BUILD_ID_RESOURCE_NAME,
+                new ArrayList<String>(Arrays.asList("aabb", "bbaa")));
+          }
+        });
+  }
+
+  public void testResolveNativeBuildIds_mismatchedArray_returnsEmptyList() {
+    assertNativeBuildIds(
+        new ArrayList<BuildIdInfo>(),
+        new HashMap<String, List<String>>() {
+          {
+            put(
+                CommonUtils.BUILD_IDS_LIB_NAMES_RESOURCE_NAME,
+                new ArrayList<String>(Arrays.asList("lib.so", "lib.so")));
+            put(
+                CommonUtils.BUILD_IDS_ARCH_RESOURCE_NAME,
+                new ArrayList<String>(Arrays.asList("x86")));
+            put(
+                CommonUtils.BUILD_IDS_BUILD_ID_RESOURCE_NAME,
+                new ArrayList<String>(Arrays.asList("aabb", "baab")));
+          }
+        });
+  }
+
   private void assertBuildId(String expectedValue, Map<String, String> buildIds) {
     final Context mockContext = mock(Context.class);
     final Context mockAppContext = mock(Context.class);
@@ -305,6 +351,40 @@ private void assertBuildId(String expectedValue, Map<String, String> buildIds) {
     assertEquals(expectedValue, CommonUtils.getMappingFileId(mockContext));
   }
 
+  private void assertNativeBuildIds(
+      ArrayList<BuildIdInfo> expected, Map<String, List<String>> nativeBuildIds) {
+    final Context mockContext = mock(Context.class);
+    final Context mockAppContext = mock(Context.class);
+    final Resources mockResources = mock(Resources.class);
+
+    final String packageName = "package.name";
+    final ApplicationInfo info = new ApplicationInfo();
+    info.icon = 0;
+
+    when(mockContext.getResources()).thenReturn(mockResources);
+    when(mockContext.getApplicationContext()).thenReturn(mockAppContext);
+
+    when(mockAppContext.getApplicationInfo()).thenReturn(info);
+    when(mockContext.getPackageName()).thenReturn(packageName);
+
+    int id = -1;
+    when(mockResources.getIdentifier(anyString(), anyString(), anyString())).thenReturn(++id);
+    for (String buildIdKey : nativeBuildIds.keySet()) {
+      when(mockResources.getIdentifier(buildIdKey, "array", packageName)).thenReturn(++id);
+      when(mockResources.getStringArray(eq(id)))
+          .thenReturn(nativeBuildIds.get(buildIdKey).toArray(new String[] {}));
+    }
+    List<BuildIdInfo> output = CommonUtils.getBuildIdInfo(mockContext);
+    assertEquals(output.size(), expected.size());
+    for (int i = 0; i < expected.size(); i++) {
+      BuildIdInfo expectedBuildIdInfo = expected.get(i);
+      BuildIdInfo outputBuildIdInfo = output.get(i);
+      assertEquals(expectedBuildIdInfo.getLibraryName(), outputBuildIdInfo.getLibraryName());
+      assertEquals(expectedBuildIdInfo.getArch(), outputBuildIdInfo.getArch());
+      assertEquals(expectedBuildIdInfo.getBuildId(), outputBuildIdInfo.getBuildId());
+    }
+  }
+
   private Context mockPermissionContext(boolean isGranted) {
     Context mockContext = mock(Context.class);
     when(mockContext.checkCallingOrSelfPermission(anyString()))
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsAppQualitySessionsStoreTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsAppQualitySessionsStoreTest.java
new file mode 100644
index 00000000000..76849404cd2
--- /dev/null
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsAppQualitySessionsStoreTest.java
@@ -0,0 +1,264 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal.common;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.crashlytics.internal.common.CrashlyticsAppQualitySessionsStore.readAqsSessionIdFile;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
+import com.google.firebase.crashlytics.internal.persistence.FileStore;
+
+public final class CrashlyticsAppQualitySessionsStoreTest extends CrashlyticsTestCase {
+  private static final String CLOSED_SESSION = null;
+
+  private static final String SESSION_ID = "64e61da7023800012303a14eecd3f58d";
+  private static final String APP_QUALITY_SESSION_ID = "79fd5d2e08ef4ea9a4f378879e53af2e";
+  private static final String NEW_SESSION_ID = "64e61da0007500012284a14eecd3f58d";
+  private static final String NEW_APP_QUALITY_SESSION_ID = "f7196b60000a44a092b5cc9e624f551c";
+
+  private CrashlyticsAppQualitySessionsStore aqsStore;
+  private FileStore fileStore;
+
+  @Override
+  protected void setUp() throws Exception {
+    // The files created by each test case will get cleaned up in super.tearDown().
+    fileStore = spy(new FileStore(getContext()));
+    aqsStore = new CrashlyticsAppQualitySessionsStore(fileStore);
+
+    when(fileStore.getSessionFile(anyString(), anyString()))
+        .thenAnswer(
+            invocation -> {
+              // The AQS file store relies on file timestamps. This sleep ensures each new file
+              // has a unique timestamp, so the most recent file can be found deterministically.
+              Thread.sleep(1000L);
+              return invocation.callRealMethod();
+            });
+  }
+
+  public void testRotateAqsId_neverRotatedSessionId_doesNotPersist() {
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    // Does not create a file because there is no session to persist in.
+    assertThat(readAqsSessionIdFile(fileStore, SESSION_ID)).isNull();
+  }
+
+  public void testRotateSessionId_neverRotatedAqsId_doesNotPersist() {
+    aqsStore.rotateSessionId(SESSION_ID);
+
+    // Does not create a file because there was no aqs id to persist.
+    assertThat(readAqsSessionIdFile(fileStore, SESSION_ID)).isNull();
+  }
+
+  public void testRotateBothIds_persists() {
+    aqsStore.rotateSessionId(SESSION_ID);
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    assertThat(readAqsSessionIdFile(fileStore, SESSION_ID)).isEqualTo(APP_QUALITY_SESSION_ID);
+  }
+
+  public void testRotateBothIds_storesIds() {
+    aqsStore.rotateSessionId(SESSION_ID);
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    // Delete all session files to verify the getter is reading the locally stored ids.
+    fileStore.deleteSessionFiles(SESSION_ID);
+
+    assertThat(aqsStore.getAppQualitySessionId(SESSION_ID)).isEqualTo(APP_QUALITY_SESSION_ID);
+  }
+
+  public void testRotateBothIds_thenRotateAqsId_persists() {
+    aqsStore.rotateSessionId(SESSION_ID);
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    aqsStore.rotateAppQualitySessionId(NEW_APP_QUALITY_SESSION_ID);
+
+    assertThat(readAqsSessionIdFile(fileStore, SESSION_ID)).isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+  }
+
+  public void testRotateBothIds_thenRotateSessionId_persistsInNewSession() {
+    aqsStore.rotateSessionId(SESSION_ID);
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    aqsStore.rotateSessionId(NEW_SESSION_ID);
+
+    assertThat(readAqsSessionIdFile(fileStore, SESSION_ID)).isEqualTo(APP_QUALITY_SESSION_ID);
+    assertThat(readAqsSessionIdFile(fileStore, NEW_SESSION_ID)).isEqualTo(APP_QUALITY_SESSION_ID);
+  }
+
+  public void testRotateBothIds_thenSessionId_thenAqsId_persistsInNewSessionOnly() {
+    aqsStore.rotateSessionId(SESSION_ID);
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    aqsStore.rotateSessionId(NEW_SESSION_ID);
+
+    aqsStore.rotateAppQualitySessionId(NEW_APP_QUALITY_SESSION_ID);
+
+    // Old session still contains the old aqs id.
+    assertThat(readAqsSessionIdFile(fileStore, SESSION_ID)).isEqualTo(APP_QUALITY_SESSION_ID);
+
+    // New sessions contains the new aqs id.
+    assertThat(readAqsSessionIdFile(fileStore, NEW_SESSION_ID))
+        .isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+  }
+
+  public void testRotateBothIds_thenAqsId_thenSessionId_persistsInBothSessions() {
+    aqsStore.rotateSessionId(SESSION_ID);
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    aqsStore.rotateAppQualitySessionId(NEW_APP_QUALITY_SESSION_ID);
+
+    aqsStore.rotateSessionId(NEW_SESSION_ID);
+
+    assertThat(readAqsSessionIdFile(fileStore, SESSION_ID)).isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+    assertThat(readAqsSessionIdFile(fileStore, NEW_SESSION_ID))
+        .isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+  }
+
+  public void testRotateBothIds_thenReadInvalidSessionId_returnsNull() {
+    aqsStore.rotateSessionId(SESSION_ID);
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    assertThat(readAqsSessionIdFile(fileStore, "sessionDoesNotExist")).isNull();
+  }
+
+  public void testRotateAqsIdWhileSessionClosed_persistsAqsIdInNewSessionOnly() {
+    // Setup first session.
+    aqsStore.rotateSessionId(SESSION_ID);
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    // Close the first session.
+    aqsStore.rotateSessionId(CLOSED_SESSION);
+
+    // Rotate the aqs session id while Crashlytics session is closed.
+    aqsStore.rotateAppQualitySessionId(NEW_APP_QUALITY_SESSION_ID);
+
+    // Start a new Crashlytics session.
+    aqsStore.rotateSessionId(NEW_SESSION_ID);
+
+    // Verify the old session has the old aqs id
+    assertThat(readAqsSessionIdFile(fileStore, SESSION_ID)).isEqualTo(APP_QUALITY_SESSION_ID);
+
+    // Verify the new session has the updated aqs id.
+    assertThat(readAqsSessionIdFile(fileStore, NEW_SESSION_ID))
+        .isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+  }
+
+  public void testUpdateAqsIdWhileSessionFailedToClosed_persistsNewAqsIdInBothSessions() {
+    // Setup first session.
+    aqsStore.rotateSessionId(SESSION_ID);
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    // Simulate failing to close the first session by not closing it.
+
+    // Update the aqs session id while Crashlytics session failed to closed.
+    aqsStore.rotateAppQualitySessionId(NEW_APP_QUALITY_SESSION_ID);
+
+    // Start a new Crashlytics session.
+    aqsStore.rotateSessionId(NEW_SESSION_ID);
+
+    // Verify the old session has the new aqs id since it failed to close.
+    assertThat(readAqsSessionIdFile(fileStore, SESSION_ID)).isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+
+    // Verify the new session has the updated aqs id.
+    assertThat(readAqsSessionIdFile(fileStore, NEW_SESSION_ID))
+        .isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+  }
+
+  public void testGetAppQualitySessionId_manyAqsIdRotations_returnsLatestAqsIdPerSession() {
+    // Open the first Crashlytics session.
+    aqsStore.rotateSessionId(SESSION_ID);
+
+    // Rotate the aqs id several times.
+    aqsStore.rotateAppQualitySessionId("aqs id 1");
+    aqsStore.rotateAppQualitySessionId("aqs id 2");
+    aqsStore.rotateAppQualitySessionId("aqs id 3");
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    // Open a new Crashlytics session.
+    aqsStore.rotateSessionId(NEW_SESSION_ID);
+
+    // Rotate the aqs id several times.
+    aqsStore.rotateAppQualitySessionId("new aqs id 1");
+    aqsStore.rotateAppQualitySessionId("new aqs id 2");
+    aqsStore.rotateAppQualitySessionId("new aqs id 3");
+    aqsStore.rotateAppQualitySessionId(NEW_APP_QUALITY_SESSION_ID);
+
+    // Verify the latest aqs id per session is returned.
+    assertThat(aqsStore.getAppQualitySessionId(SESSION_ID)).isEqualTo(APP_QUALITY_SESSION_ID);
+    assertThat(aqsStore.getAppQualitySessionId(NEW_SESSION_ID))
+        .isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+  }
+
+  public void testGetAppQualitySessionId_manySessionIdRotations_returnsProperAqsIdForEachSession() {
+    // Rotate the aqs id with no Crashlytics session.
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    // Rotate the Crashlytics id several times.
+    aqsStore.rotateSessionId("session id 1");
+    aqsStore.rotateSessionId("session id 2");
+    aqsStore.rotateSessionId("session id 3");
+    aqsStore.rotateSessionId(SESSION_ID);
+
+    // Rotate the aqs session id.
+    aqsStore.rotateAppQualitySessionId(NEW_APP_QUALITY_SESSION_ID);
+
+    // Update the aqs id several times.
+    aqsStore.rotateSessionId("new session id 1");
+    aqsStore.rotateSessionId("new session id 2");
+    aqsStore.rotateSessionId("new session id 3");
+    aqsStore.rotateSessionId(NEW_SESSION_ID);
+
+    // Verify the correct aqs id for each session is returned.
+    assertThat(aqsStore.getAppQualitySessionId(SESSION_ID)).isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+    assertThat(aqsStore.getAppQualitySessionId(NEW_SESSION_ID))
+        .isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+  }
+
+  public void testGetAppQualitySessionId_afterRelaunch_returnsPersistedAqsId() {
+    // Setup first session.
+    aqsStore.rotateSessionId(SESSION_ID);
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    // Rotate the aqs id during the Crashlytics session
+    aqsStore.rotateAppQualitySessionId(NEW_APP_QUALITY_SESSION_ID);
+
+    // Simulate a native crash and relaunch by making a new aqs store instance.
+    CrashlyticsAppQualitySessionsStore newAqsStore =
+        new CrashlyticsAppQualitySessionsStore(new FileStore(getContext()));
+
+    assertThat(newAqsStore.getAppQualitySessionId(SESSION_ID))
+        .isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+  }
+
+  public void testGetAppQualitySessionId_afterRelaunch_afterRotate_returnsPersistedAqsId() {
+    // Setup first session.
+    aqsStore.rotateSessionId(SESSION_ID);
+    aqsStore.rotateAppQualitySessionId(APP_QUALITY_SESSION_ID);
+
+    // Simulate a native crash and relaunch by making a new aqs store instance.
+    CrashlyticsAppQualitySessionsStore newAqsStore =
+        new CrashlyticsAppQualitySessionsStore(new FileStore(getContext()));
+
+    // Rotate the ids in the new launch.
+    newAqsStore.rotateSessionId(NEW_SESSION_ID);
+    newAqsStore.rotateAppQualitySessionId(NEW_APP_QUALITY_SESSION_ID);
+
+    // Verify the old session still persisted the old aqs id.
+    assertThat(newAqsStore.getAppQualitySessionId(SESSION_ID)).isEqualTo(APP_QUALITY_SESSION_ID);
+  }
+}
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsAppQualitySessionsSubscriberTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsAppQualitySessionsSubscriberTest.java
new file mode 100644
index 00000000000..b3fe3e6a372
--- /dev/null
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsAppQualitySessionsSubscriberTest.java
@@ -0,0 +1,103 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal.common;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+
+import androidx.annotation.NonNull;
+import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
+import com.google.firebase.crashlytics.internal.persistence.FileStore;
+import com.google.firebase.sessions.api.SessionSubscriber.SessionDetails;
+
+public final class CrashlyticsAppQualitySessionsSubscriberTest extends CrashlyticsTestCase {
+  private static final String SESSION_ID = "64e61da7023800012303a14eecd3f58d";
+  private static final String APP_QUALITY_SESSION_ID = "79fd5d2e08ef4ea9a4f378879e53af2e";
+  private static final String NEW_SESSION_ID = "64e61da0007500012284a14eecd3f58d";
+  private static final String NEW_APP_QUALITY_SESSION_ID = "f7196b60000a44a092b5cc9e624f551c";
+
+  private CrashlyticsAppQualitySessionsSubscriber aqsSubscriber;
+
+  @Override
+  protected void setUp() throws Exception {
+    // The files created by each test case will get cleaned up in super.tearDown().
+    aqsSubscriber =
+        new CrashlyticsAppQualitySessionsSubscriber(
+            mock(DataCollectionArbiter.class), new FileStore(getContext()));
+  }
+
+  public void testGetAppQualitySessionId_returnsLatestAqsIdForSession() {
+    aqsSubscriber.setSessionId(SESSION_ID);
+
+    aqsSubscriber.onSessionChanged(createSessionDetails("aqs id 1"));
+    aqsSubscriber.onSessionChanged(createSessionDetails("aqs id 2"));
+    aqsSubscriber.onSessionChanged(createSessionDetails("aqs id 3"));
+    aqsSubscriber.onSessionChanged(createSessionDetails(APP_QUALITY_SESSION_ID));
+
+    assertThat(aqsSubscriber.getAppQualitySessionId(SESSION_ID)).isEqualTo(APP_QUALITY_SESSION_ID);
+  }
+
+  public void testGetAppQualitySessionId_returnsCorrectAqsIdForEachSession() {
+    String session_id_1 = "session id 1";
+    String session_id_2 = "session id 2";
+    String session_id_3 = "session id 3";
+    String new_session_id_1 = "new session id 1";
+    String new_session_id_2 = "new session id 2";
+    String new_session_id_3 = "new session id 3";
+
+    aqsSubscriber.onSessionChanged(createSessionDetails(APP_QUALITY_SESSION_ID));
+
+    // Rotate the session id multiple times for a single aqs id.
+    aqsSubscriber.setSessionId(session_id_1);
+    aqsSubscriber.setSessionId(session_id_2);
+    aqsSubscriber.setSessionId(session_id_3);
+    aqsSubscriber.setSessionId(SESSION_ID);
+
+    // Close the session.
+    aqsSubscriber.setSessionId(null);
+
+    // Rotate the aqs id.
+    aqsSubscriber.onSessionChanged(createSessionDetails(NEW_APP_QUALITY_SESSION_ID));
+
+    // Rotate the session id multiple times again for the rotated aqs id.
+    aqsSubscriber.setSessionId(new_session_id_1);
+    aqsSubscriber.setSessionId(new_session_id_2);
+    aqsSubscriber.setSessionId(new_session_id_3);
+    aqsSubscriber.setSessionId(NEW_SESSION_ID);
+
+    assertThat(aqsSubscriber.getAppQualitySessionId(session_id_1))
+        .isEqualTo(APP_QUALITY_SESSION_ID);
+    assertThat(aqsSubscriber.getAppQualitySessionId(session_id_2))
+        .isEqualTo(APP_QUALITY_SESSION_ID);
+    assertThat(aqsSubscriber.getAppQualitySessionId(session_id_3))
+        .isEqualTo(APP_QUALITY_SESSION_ID);
+
+    assertThat(aqsSubscriber.getAppQualitySessionId(SESSION_ID)).isEqualTo(APP_QUALITY_SESSION_ID);
+
+    assertThat(aqsSubscriber.getAppQualitySessionId(new_session_id_1))
+        .isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+    assertThat(aqsSubscriber.getAppQualitySessionId(new_session_id_2))
+        .isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+    assertThat(aqsSubscriber.getAppQualitySessionId(new_session_id_3))
+        .isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+
+    assertThat(aqsSubscriber.getAppQualitySessionId(NEW_SESSION_ID))
+        .isEqualTo(NEW_APP_QUALITY_SESSION_ID);
+  }
+
+  private static SessionDetails createSessionDetails(@NonNull String appQualitySessionId) {
+    return new SessionDetails(appQualitySessionId);
+  }
+}
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java
index dc9fa053a7c..a35bd5f443e 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.crashlytics.internal.common;
 
+import static org.mockito.AdditionalMatchers.not;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyLong;
 import static org.mockito.Mockito.anyString;
@@ -38,18 +39,22 @@
 import com.google.firebase.crashlytics.internal.NativeSessionFileProvider;
 import com.google.firebase.crashlytics.internal.analytics.AnalyticsEventLogger;
 import com.google.firebase.crashlytics.internal.metadata.LogFileManager;
+import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
-import com.google.firebase.crashlytics.internal.settings.SettingsDataProvider;
-import com.google.firebase.crashlytics.internal.settings.TestSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
+import com.google.firebase.crashlytics.internal.settings.Settings;
+import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
+import com.google.firebase.crashlytics.internal.settings.TestSettings;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.TreeSet;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
+import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
 public class CrashlyticsControllerTest extends CrashlyticsTestCase {
@@ -58,7 +63,7 @@ public class CrashlyticsControllerTest extends CrashlyticsTestCase {
 
   private Context testContext;
   private IdManager idManager;
-  private SettingsDataProvider testSettingsDataProvider;
+  private SettingsProvider testSettingsProvider;
   private FileStore testFileStore;
   private SessionReportingCoordinator mockSessionReportingCoordinator;
   private DataCollectionArbiter mockDataCollectionArbiter;
@@ -81,17 +86,16 @@ protected void setUp() throws Exception {
 
     testFileStore = new FileStore(testContext);
 
-    final SettingsData testSettingsData = new TestSettingsData(3);
+    Settings testSettings = new TestSettings(3);
 
     mockSessionReportingCoordinator = mock(SessionReportingCoordinator.class);
 
     mockDataCollectionArbiter = mock(DataCollectionArbiter.class);
     when(mockDataCollectionArbiter.isAutomaticDataCollectionEnabled()).thenReturn(true);
 
-    testSettingsDataProvider = mock(SettingsDataProvider.class);
-    when(testSettingsDataProvider.getSettings()).thenReturn(testSettingsData);
-    when(testSettingsDataProvider.getAppSettings())
-        .thenReturn(Tasks.forResult(testSettingsData.appData));
+    testSettingsProvider = mock(SettingsProvider.class);
+    when(testSettingsProvider.getSettingsSync()).thenReturn(testSettings);
+    when(testSettingsProvider.getSettingsAsync()).thenReturn(Tasks.forResult(testSettings));
   }
 
   /** A convenience class for building CrashlyticsController instances for testing. */
@@ -100,8 +104,12 @@ private class ControllerBuilder {
     private CrashlyticsNativeComponent nativeComponent = null;
     private AnalyticsEventLogger analyticsEventLogger;
     private SessionReportingCoordinator sessionReportingCoordinator;
+
+    private CrashlyticsBackgroundWorker backgroundWorker;
     private LogFileManager logFileManager = null;
 
+    private UserMetadata userMetadata = null;
+
     ControllerBuilder() {
       dataCollectionArbiter = mockDataCollectionArbiter;
       nativeComponent = mockNativeComponent;
@@ -109,6 +117,8 @@ private class ControllerBuilder {
       analyticsEventLogger = mock(AnalyticsEventLogger.class);
 
       sessionReportingCoordinator = mockSessionReportingCoordinator;
+
+      backgroundWorker = new CrashlyticsBackgroundWorker(new SameThreadExecutorService());
     }
 
     ControllerBuilder setDataCollectionArbiter(DataCollectionArbiter arbiter) {
@@ -116,6 +126,11 @@ ControllerBuilder setDataCollectionArbiter(DataCollectionArbiter arbiter) {
       return this;
     }
 
+    ControllerBuilder setUserMetadata(UserMetadata userMetadata) {
+      this.userMetadata = userMetadata;
+      return this;
+    }
+
     public ControllerBuilder setNativeComponent(CrashlyticsNativeComponent nativeComponent) {
       this.nativeComponent = nativeComponent;
       return this;
@@ -136,10 +151,13 @@ public CrashlyticsController build() {
       CrashlyticsFileMarker crashMarker =
           new CrashlyticsFileMarker(CrashlyticsCore.CRASH_MARKER_FILE_NAME, testFileStore);
 
+      List<BuildIdInfo> buildIdInfoList = new ArrayList<>();
+      buildIdInfoList.add(new BuildIdInfo("lib.so", "x86", "aabb"));
       AppData appData =
           new AppData(
               GOOGLE_APP_ID,
               "buildId",
+              buildIdInfoList,
               "installerPackageName",
               "packageName",
               "versionCode",
@@ -149,17 +167,18 @@ public CrashlyticsController build() {
       final CrashlyticsController controller =
           new CrashlyticsController(
               testContext.getApplicationContext(),
-              new CrashlyticsBackgroundWorker(new SameThreadExecutorService()),
+              backgroundWorker,
               idManager,
               dataCollectionArbiter,
               testFileStore,
               crashMarker,
               appData,
-              null,
+              userMetadata,
               logFileManager,
               sessionReportingCoordinator,
               nativeComponent,
-              analyticsEventLogger);
+              analyticsEventLogger,
+              mock(CrashlyticsAppQualitySessionsSubscriber.class));
       return controller;
     }
   }
@@ -185,7 +204,7 @@ public void testWriteNonFatal_callsSessionReportingCoordinatorPersistNonFatal()
         .thenReturn(new TreeSet<>(Collections.singleton(sessionId)));
 
     controller.writeNonFatalException(thread, nonFatal);
-    controller.doCloseSessions(testSettingsDataProvider);
+    controller.doCloseSessions(testSettingsProvider);
 
     verify(mockSessionReportingCoordinator)
         .persistNonFatalEvent(eq(nonFatal), eq(thread), eq(sessionId), anyLong());
@@ -200,12 +219,32 @@ public void testFatalException_callsSessionReportingCoordinatorPersistFatal() th
     when(mockSessionReportingCoordinator.listSortedOpenSessionIds())
         .thenReturn(new TreeSet<>(Collections.singleton(sessionId)));
 
-    controller.handleUncaughtException(testSettingsDataProvider, thread, fatal);
+    controller.handleUncaughtException(testSettingsProvider, thread, fatal);
 
     verify(mockSessionReportingCoordinator)
         .persistFatalEvent(eq(fatal), eq(thread), eq(sessionId), anyLong());
   }
 
+  @Test
+  public void testOnDemandFatal_callLogFatalException() {
+    Thread thread = Thread.currentThread();
+    Exception fatal = new RuntimeException("Fatal");
+    Thread.UncaughtExceptionHandler exceptionHandler = mock(Thread.UncaughtExceptionHandler.class);
+    UserMetadata mockUserMetadata = mock(UserMetadata.class);
+    when(mockSessionReportingCoordinator.listSortedOpenSessionIds())
+        .thenReturn(new TreeSet<>(Collections.singleton(SESSION_ID)).descendingSet());
+
+    final CrashlyticsController controller =
+        builder()
+            .setLogFileManager(new LogFileManager(testFileStore))
+            .setUserMetadata(mockUserMetadata)
+            .build();
+    controller.enableExceptionHandling(SESSION_ID, exceptionHandler, testSettingsProvider);
+    controller.logFatalException(thread, fatal);
+
+    verify(mockUserMetadata).setNewSession(not(eq(SESSION_ID)));
+  }
+
   public void testNativeCrashDataCausesNativeReport() throws Exception {
     final String sessionId = "sessionId_1_new";
     final String previousSessionId = "sessionId_0_previous";
@@ -236,6 +275,11 @@ public File getMinidumpFile() {
                 return minidump;
               }
 
+              @Override
+              public CrashlyticsReport.ApplicationExitInfo getApplicationExitInto() {
+                return null;
+              }
+
               @Override
               public File getBinaryImagesFile() {
                 return null;
@@ -274,16 +318,16 @@ public File getOsFile() {
     final CrashlyticsController controller =
         builder().setNativeComponent(mockNativeComponent).setLogFileManager(logFileManager).build();
 
-    controller.finalizeSessions(testSettingsDataProvider);
+    controller.finalizeSessions(testSettingsProvider);
     verify(mockSessionReportingCoordinator)
-        .finalizeSessionWithNativeEvent(eq(previousSessionId), any());
+        .finalizeSessionWithNativeEvent(eq(previousSessionId), any(), any());
     verify(mockSessionReportingCoordinator, never())
-        .finalizeSessionWithNativeEvent(eq(sessionId), any());
+        .finalizeSessionWithNativeEvent(eq(sessionId), any(), any());
   }
 
   public void testMissingNativeComponentCausesNoReports() {
     final CrashlyticsController controller = createController();
-    controller.finalizeSessions(testSettingsDataProvider);
+    controller.finalizeSessions(testSettingsProvider);
 
     List<String> sessions = testFileStore.getAllOpenSessionIds();
     for (String sessionId : sessions) {
@@ -300,7 +344,7 @@ public void testMissingNativeComponentCausesNoReports() {
   public void testLoggedExceptionsAfterCrashOk() {
     final CrashlyticsController controller = builder().build();
     controller.handleUncaughtException(
-        testSettingsDataProvider, Thread.currentThread(), new RuntimeException());
+        testSettingsProvider, Thread.currentThread(), new RuntimeException());
 
     // This should not throw.
     controller.writeNonFatalException(Thread.currentThread(), new RuntimeException());
@@ -314,7 +358,7 @@ public void testLoggedExceptionsAfterCrashOk() {
   public void testLogStringAfterCrashOk() {
     final CrashlyticsController controller = builder().build();
     controller.handleUncaughtException(
-        testSettingsDataProvider, Thread.currentThread(), new RuntimeException());
+        testSettingsProvider, Thread.currentThread(), new RuntimeException());
 
     // This should not throw.
     controller.writeToLog(System.currentTimeMillis(), "Hi");
@@ -328,10 +372,10 @@ public void testLogStringAfterCrashOk() {
   public void testFinalizeSessionAfterCrashOk() throws Exception {
     final CrashlyticsController controller = builder().build();
     controller.handleUncaughtException(
-        testSettingsDataProvider, Thread.currentThread(), new RuntimeException());
+        testSettingsProvider, Thread.currentThread(), new RuntimeException());
 
     // This should not throw.
-    controller.finalizeSessions(testSettingsDataProvider);
+    controller.finalizeSessions(testSettingsProvider);
   }
 
   public void testUploadWithNoReports() throws Exception {
@@ -339,7 +383,7 @@ public void testUploadWithNoReports() throws Exception {
 
     final CrashlyticsController controller = createController();
 
-    Task<Void> task = controller.submitAllReports(testSettingsDataProvider.getAppSettings());
+    Task<Void> task = controller.submitAllReports(testSettingsProvider.getSettingsAsync());
 
     await(task);
 
@@ -354,7 +398,7 @@ public void testUploadWithDataCollectionAlwaysEnabled() throws Exception {
 
     final CrashlyticsController controller = createController();
 
-    final Task<Void> task = controller.submitAllReports(testSettingsDataProvider.getAppSettings());
+    final Task<Void> task = controller.submitAllReports(testSettingsProvider.getSettingsAsync());
 
     await(task);
 
@@ -380,7 +424,7 @@ public void testUploadDisabledThenOptIn() throws Exception {
     builder.setDataCollectionArbiter(arbiter);
     final CrashlyticsController controller = builder.build();
 
-    final Task<Void> task = controller.submitAllReports(testSettingsDataProvider.getAppSettings());
+    final Task<Void> task = controller.submitAllReports(testSettingsProvider.getSettingsAsync());
 
     verify(arbiter).isAutomaticDataCollectionEnabled();
     verify(mockSessionReportingCoordinator).hasReportsToSend();
@@ -407,7 +451,7 @@ public void testUploadDisabledThenOptOut() throws Exception {
     builder.setDataCollectionArbiter(arbiter);
     final CrashlyticsController controller = builder.build();
 
-    final Task<Void> task = controller.submitAllReports(testSettingsDataProvider.getAppSettings());
+    final Task<Void> task = controller.submitAllReports(testSettingsProvider.getSettingsAsync());
 
     verify(arbiter).isAutomaticDataCollectionEnabled();
     verify(mockSessionReportingCoordinator).hasReportsToSend();
@@ -448,7 +492,7 @@ public void testUploadDisabledThenEnabled() throws Exception {
     builder.setDataCollectionArbiter(arbiter);
     final CrashlyticsController controller = builder.build();
 
-    final Task<Void> task = controller.submitAllReports(testSettingsDataProvider.getAppSettings());
+    final Task<Void> task = controller.submitAllReports(testSettingsProvider.getSettingsAsync());
 
     verify(mockSessionReportingCoordinator).hasReportsToSend();
     verify(mockSessionReportingCoordinator, never()).sendReports(any(Executor.class));
@@ -491,8 +535,8 @@ public void testFatalEvent_sendsAppExceptionEvent() {
 
     controller.openSession(SESSION_ID);
     controller.handleUncaughtException(
-        testSettingsDataProvider, Thread.currentThread(), new RuntimeException("Fatal"));
-    controller.finalizeSessions(testSettingsDataProvider);
+        testSettingsProvider, Thread.currentThread(), new RuntimeException("Fatal"));
+    controller.finalizeSessions(testSettingsProvider);
 
     assertFirebaseAnalyticsCrashEvent(mockFirebaseAnalyticsLogger);
   }
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreInitializationTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreInitializationTest.java
index ec2cf12330c..99a8f910877 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreInitializationTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreInitializationTest.java
@@ -31,16 +31,19 @@
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponentDeferredProxy;
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
 import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
+import com.google.firebase.crashlytics.internal.RemoteConfigDeferredProxy;
 import com.google.firebase.crashlytics.internal.analytics.UnavailableAnalyticsEventLogger;
 import com.google.firebase.crashlytics.internal.breadcrumbs.DisabledBreadcrumbSource;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
+import com.google.firebase.crashlytics.internal.settings.Settings;
 import com.google.firebase.crashlytics.internal.settings.SettingsController;
-import com.google.firebase.crashlytics.internal.settings.TestSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
+import com.google.firebase.crashlytics.internal.settings.TestSettings;
 import com.google.firebase.inject.Deferred;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 
 public class CrashlyticsCoreInitializationTest extends CrashlyticsTestCase {
@@ -71,9 +74,9 @@ protected void setUp() throws Exception {
     fileStore = new FileStore(getContext());
 
     mockSettingsController = mock(SettingsController.class);
-    final SettingsData settingsData = new TestSettingsData();
-    when(mockSettingsController.getSettings()).thenReturn(settingsData);
-    when(mockSettingsController.getAppSettings()).thenReturn(Tasks.forResult(settingsData.appData));
+    Settings settings = new TestSettings();
+    when(mockSettingsController.getSettingsSync()).thenReturn(settings);
+    when(mockSettingsController.getSettingsAsync()).thenReturn(Tasks.forResult(settings));
   }
 
   @Override
@@ -134,7 +137,9 @@ public CrashlyticsCore build() {
           new DisabledBreadcrumbSource(),
           new UnavailableAnalyticsEventLogger(),
           fileStore,
-          crashHandlerExecutor);
+          crashHandlerExecutor,
+          mock(CrashlyticsAppQualitySessionsSubscriber.class),
+          mock(RemoteConfigDeferredProxy.class));
     }
   }
 
@@ -256,10 +261,13 @@ private void setupBuildIdRequired(String booleanValue) {
   }
 
   private void setupAppData(String buildId) {
+    List<BuildIdInfo> buildIdInfoList = new ArrayList<>();
+    buildIdInfoList.add(new BuildIdInfo("lib.so", "x86", "aabb"));
     appData =
         new AppData(
             GOOGLE_APP_ID,
             buildId,
+            buildIdInfoList,
             "installerPackageName",
             "packageName",
             "versionCode",
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java
index a7475e8b89e..17064da9f37 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java
@@ -33,18 +33,21 @@
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponentDeferredProxy;
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
 import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
+import com.google.firebase.crashlytics.internal.RemoteConfigDeferredProxy;
 import com.google.firebase.crashlytics.internal.analytics.UnavailableAnalyticsEventLogger;
 import com.google.firebase.crashlytics.internal.breadcrumbs.BreadcrumbHandler;
 import com.google.firebase.crashlytics.internal.breadcrumbs.BreadcrumbSource;
 import com.google.firebase.crashlytics.internal.breadcrumbs.DisabledBreadcrumbSource;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
+import com.google.firebase.crashlytics.internal.settings.Settings;
 import com.google.firebase.crashlytics.internal.settings.SettingsController;
-import com.google.firebase.crashlytics.internal.settings.TestSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
+import com.google.firebase.crashlytics.internal.settings.TestSettings;
 import com.google.firebase.inject.Deferred;
 import com.google.firebase.installations.FirebaseInstallationsApi;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import org.mockito.Mockito;
@@ -339,14 +342,17 @@ private Task<CrashlyticsCore> startCoreAsync(CrashlyticsCore crashlyticsCore) {
     Thread.setDefaultUncaughtExceptionHandler(NOOP_HANDLER);
 
     SettingsController mockSettingsController = mock(SettingsController.class);
-    final SettingsData settings = new TestSettingsData(3);
-    when(mockSettingsController.getSettings()).thenReturn(settings);
-    when(mockSettingsController.getAppSettings()).thenReturn(Tasks.forResult(settings.appData));
+    final Settings settings = new TestSettings(3);
+    when(mockSettingsController.getSettingsSync()).thenReturn(settings);
+    when(mockSettingsController.getSettingsAsync()).thenReturn(Tasks.forResult(settings));
 
+    List<BuildIdInfo> buildIdInfoList = new ArrayList<>();
+    buildIdInfoList.add(new BuildIdInfo("lib.so", "x86", "aabb"));
     AppData appData =
         new AppData(
             GOOGLE_APP_ID,
             "buildId",
+            buildIdInfoList,
             "installerPackageName",
             "packageName",
             "versionCode",
@@ -421,7 +427,9 @@ CrashlyticsCore build(Context context) {
               breadcrumbSource,
               new UnavailableAnalyticsEventLogger(),
               new FileStore(context),
-              new SameThreadExecutorService());
+              new SameThreadExecutorService(),
+              mock(CrashlyticsAppQualitySessionsSubscriber.class),
+              mock(RemoteConfigDeferredProxy.class));
       return crashlyticsCore;
     }
   }
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsReportDataCaptureTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsReportDataCaptureTest.java
index bd743910644..80904908632 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsReportDataCaptureTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsReportDataCaptureTest.java
@@ -19,10 +19,12 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import android.app.ActivityManager;
@@ -39,8 +41,12 @@
 import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution;
+import com.google.firebase.crashlytics.internal.settings.Settings;
+import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
+import com.google.firebase.crashlytics.internal.settings.TestSettings;
 import com.google.firebase.crashlytics.internal.stacktrace.StackTraceTrimmingStrategy;
 import com.google.firebase.installations.FirebaseInstallationsApi;
+import java.util.ArrayList;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
@@ -59,6 +65,7 @@ public class CrashlyticsReportDataCaptureTest {
   private String eventType;
   private int eventThreadImportance;
   private int maxChainedExceptions;
+  private SettingsProvider testSettingsProvider;
 
   @Mock private DevelopmentPlatformProvider developmentPlatformProvider;
 
@@ -83,14 +90,23 @@ public void setUp() throws Exception {
     eventType = "crash";
     eventThreadImportance = 4;
     maxChainedExceptions = 8;
+
+    testSettingsProvider = mock(SettingsProvider.class);
     initDataCapture();
   }
 
   private void initDataCapture() throws Exception {
     AppData appData =
-        AppData.create(context, idManager, "googleAppId", "buildId", developmentPlatformProvider);
+        AppData.create(
+            context,
+            idManager,
+            "googleAppId",
+            "buildId",
+            new ArrayList<BuildIdInfo>(),
+            developmentPlatformProvider);
     dataCapture =
-        new CrashlyticsReportDataCapture(context, idManager, appData, stackTraceTrimmingStrategy);
+        new CrashlyticsReportDataCapture(
+            context, idManager, appData, stackTraceTrimmingStrategy, testSettingsProvider);
   }
 
   @Test
@@ -125,6 +141,9 @@ public void testCaptureReport_containsNoDeveloperPlatformFieldsWhenUnityIsMissin
 
   @Test
   public void testCaptureAnrEvent_foregroundAnr() {
+    Settings testSettings = new TestSettings(3, 0, 0, false);
+    when(testSettingsProvider.getSettingsSync()).thenReturn(testSettings);
+    when(testSettingsProvider.getSettingsAsync()).thenReturn(Tasks.forResult(testSettings));
     CrashlyticsReport.ApplicationExitInfo testApplicationExitInfo = makeAppExitInfo(false);
     final CrashlyticsReport.Session.Event event =
         dataCapture.captureAnrEventData(testApplicationExitInfo);
@@ -137,6 +156,9 @@ public void testCaptureAnrEvent_foregroundAnr() {
 
   @Test
   public void testCaptureAnrEvent_backgroundAnr() {
+    Settings testSettings = new TestSettings(3, 0, 0, false);
+    when(testSettingsProvider.getSettingsSync()).thenReturn(testSettings);
+    when(testSettingsProvider.getSettingsAsync()).thenReturn(Tasks.forResult(testSettings));
     CrashlyticsReport.ApplicationExitInfo testApplicationExitInfo = makeAppExitInfo(true);
     final CrashlyticsReport.Session.Event event =
         dataCapture.captureAnrEventData(testApplicationExitInfo);
@@ -147,6 +169,143 @@ public void testCaptureAnrEvent_backgroundAnr() {
     assertEquals(true, event.getApp().getBackground());
   }
 
+  @Test
+  public void testCaptureAnrEvent_collectBuildIds() throws Exception {
+    CrashlyticsReport.ApplicationExitInfo testApplicationExitInfo = makeAppExitInfo(false);
+    Settings testSettings = new TestSettings(3, 0, 0, true);
+    when(testSettingsProvider.getSettingsSync()).thenReturn(testSettings);
+    when(testSettingsProvider.getSettingsAsync()).thenReturn(Tasks.forResult(testSettings));
+    List<BuildIdInfo> buildIdInfoList = new ArrayList<>();
+    buildIdInfoList.add(new BuildIdInfo("lib.so", "x86", "aabb"));
+    AppData appData =
+        AppData.create(
+            context,
+            idManager,
+            "googleAppId",
+            "buildId",
+            buildIdInfoList,
+            developmentPlatformProvider);
+    dataCapture =
+        new CrashlyticsReportDataCapture(
+            context, idManager, appData, stackTraceTrimmingStrategy, testSettingsProvider);
+    final CrashlyticsReport.Session.Event event =
+        dataCapture.captureAnrEventData(testApplicationExitInfo);
+
+    assertEquals("anr", event.getType());
+    CrashlyticsReport.ApplicationExitInfo generatedAppExitInfo =
+        event.getApp().getExecution().getAppExitInfo();
+    assertNotEquals(testApplicationExitInfo, generatedAppExitInfo);
+    assertEquals(testApplicationExitInfo.getTimestamp(), event.getTimestamp());
+    assertEquals(generatedAppExitInfo.getBuildIdMappingForArch().size(), 1);
+    assertEquals(
+        generatedAppExitInfo.getBuildIdMappingForArch().get(0).getLibraryName(),
+        buildIdInfoList.get(0).getLibraryName());
+    assertEquals(
+        generatedAppExitInfo.getBuildIdMappingForArch().get(0).getArch(),
+        buildIdInfoList.get(0).getArch());
+    assertEquals(
+        generatedAppExitInfo.getBuildIdMappingForArch().get(0).getBuildId(),
+        buildIdInfoList.get(0).getBuildId());
+  }
+
+  @Test
+  public void testCaptureAnrEvent_collectMultipleBuildIds() throws Exception {
+    CrashlyticsReport.ApplicationExitInfo testApplicationExitInfo = makeAppExitInfo(false);
+    Settings testSettings = new TestSettings(3, 0, 0, true);
+    when(testSettingsProvider.getSettingsSync()).thenReturn(testSettings);
+    when(testSettingsProvider.getSettingsAsync()).thenReturn(Tasks.forResult(testSettings));
+    List<BuildIdInfo> buildIdInfoList = new ArrayList<>();
+    buildIdInfoList.add(new BuildIdInfo("lib.so", "x86", "aabb"));
+    buildIdInfoList.add(new BuildIdInfo("other.so", "arm", "bbaa"));
+    AppData appData =
+        AppData.create(
+            context,
+            idManager,
+            "googleAppId",
+            "buildId",
+            buildIdInfoList,
+            developmentPlatformProvider);
+    dataCapture =
+        new CrashlyticsReportDataCapture(
+            context, idManager, appData, stackTraceTrimmingStrategy, testSettingsProvider);
+    final CrashlyticsReport.Session.Event event =
+        dataCapture.captureAnrEventData(testApplicationExitInfo);
+
+    assertEquals("anr", event.getType());
+    CrashlyticsReport.ApplicationExitInfo generatedAppExitInfo =
+        event.getApp().getExecution().getAppExitInfo();
+    assertNotEquals(testApplicationExitInfo, generatedAppExitInfo);
+    assertEquals(testApplicationExitInfo.getTimestamp(), event.getTimestamp());
+    assertEquals(generatedAppExitInfo.getBuildIdMappingForArch().size(), 2);
+    for (int i = 0; i < buildIdInfoList.size(); i++) {
+      assertEquals(
+          generatedAppExitInfo.getBuildIdMappingForArch().get(i).getLibraryName(),
+          buildIdInfoList.get(i).getLibraryName());
+      assertEquals(
+          generatedAppExitInfo.getBuildIdMappingForArch().get(i).getArch(),
+          buildIdInfoList.get(i).getArch());
+      assertEquals(
+          generatedAppExitInfo.getBuildIdMappingForArch().get(i).getBuildId(),
+          buildIdInfoList.get(i).getBuildId());
+    }
+  }
+
+  @Test
+  public void testCaptureAnrEvent_settingsOff_buildIdsNull() throws Exception {
+    CrashlyticsReport.ApplicationExitInfo testApplicationExitInfo = makeAppExitInfo(false);
+    Settings testSettings = new TestSettings(3, 0, 0, false);
+    when(testSettingsProvider.getSettingsSync()).thenReturn(testSettings);
+    when(testSettingsProvider.getSettingsAsync()).thenReturn(Tasks.forResult(testSettings));
+    List<BuildIdInfo> buildIdInfoList = new ArrayList<>();
+    buildIdInfoList.add(new BuildIdInfo("lib.so", "x86", "aabb"));
+    AppData appData =
+        AppData.create(
+            context,
+            idManager,
+            "googleAppId",
+            "buildId",
+            buildIdInfoList,
+            developmentPlatformProvider);
+    dataCapture =
+        new CrashlyticsReportDataCapture(
+            context, idManager, appData, stackTraceTrimmingStrategy, testSettingsProvider);
+    final CrashlyticsReport.Session.Event event =
+        dataCapture.captureAnrEventData(testApplicationExitInfo);
+
+    assertEquals("anr", event.getType());
+    CrashlyticsReport.ApplicationExitInfo generatedAppExitInfo =
+        event.getApp().getExecution().getAppExitInfo();
+    assertEquals(testApplicationExitInfo, generatedAppExitInfo);
+    assertEquals(generatedAppExitInfo.getBuildIdMappingForArch(), null);
+  }
+
+  @Test
+  public void testCaptureAnrEvent_noBuildIdInAppData_buildIdsNull() throws Exception {
+    CrashlyticsReport.ApplicationExitInfo testApplicationExitInfo = makeAppExitInfo(false);
+    Settings testSettings = new TestSettings(3, 0, 0, true);
+    when(testSettingsProvider.getSettingsSync()).thenReturn(testSettings);
+    when(testSettingsProvider.getSettingsAsync()).thenReturn(Tasks.forResult(testSettings));
+    AppData appData =
+        AppData.create(
+            context,
+            idManager,
+            "googleAppId",
+            "buildId",
+            new ArrayList<>(),
+            developmentPlatformProvider);
+    dataCapture =
+        new CrashlyticsReportDataCapture(
+            context, idManager, appData, stackTraceTrimmingStrategy, testSettingsProvider);
+    final CrashlyticsReport.Session.Event event =
+        dataCapture.captureAnrEventData(testApplicationExitInfo);
+
+    assertEquals("anr", event.getType());
+    CrashlyticsReport.ApplicationExitInfo generatedAppExitInfo =
+        event.getApp().getExecution().getAppExitInfo();
+    assertEquals(testApplicationExitInfo, generatedAppExitInfo);
+    assertEquals(generatedAppExitInfo.getBuildIdMappingForArch(), null);
+  }
+
   @Test
   public void testCaptureReportSessionFields() {
     final String sessionId = "sessionId";
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/IdManagerTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/IdManagerTest.java
index 11cf382dc90..93a3e334fe3 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/IdManagerTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/IdManagerTest.java
@@ -69,7 +69,7 @@ private IdManager createIdManager(String instanceId, DataCollectionArbiter arbit
   public void testCreateUUID() {
     final String fid = "test_fid";
     final IdManager idManager = createIdManager(fid, MOCK_ARBITER_ENABLED);
-    final String installId = idManager.getCrashlyticsInstallId();
+    final String installId = idManager.getInstallIds().getCrashlyticsInstallId();
     assertNotNull(installId);
 
     assertEquals(installId, prefs.getString(IdManager.PREFKEY_INSTALLATION_UUID, null));
@@ -77,7 +77,7 @@ public void testCreateUUID() {
     assertEquals(fid, prefs.getString(IdManager.PREFKEY_FIREBASE_IID, null));
 
     // subsequent calls should return the same id
-    assertEquals(installId, idManager.getCrashlyticsInstallId());
+    assertEquals(installId, idManager.getInstallIds().getCrashlyticsInstallId());
   }
 
   public void testGetIdExceptionalCase_doesNotRotateInstallId() {
@@ -93,7 +93,7 @@ public void testGetIdExceptionalCase_doesNotRotateInstallId() {
 
     final IdManager idManager =
         new IdManager(getContext(), getContext().getPackageName(), fis, MOCK_ARBITER_ENABLED);
-    final String actualInstallId = idManager.getCrashlyticsInstallId();
+    final String actualInstallId = idManager.getInstallIds().getCrashlyticsInstallId();
     assertNotNull(actualInstallId);
     assertEquals(expectedInstallId, actualInstallId);
   }
@@ -111,7 +111,7 @@ public void testInstanceIdChanges_dataCollectionEnabled() {
     // Initialize the manager with a different FID.
     IdManager idManager = createIdManager(newFid, MOCK_ARBITER_ENABLED);
 
-    String installId = idManager.getCrashlyticsInstallId();
+    String installId = idManager.getInstallIds().getCrashlyticsInstallId();
     assertNotNull(installId);
     assertFalse(installId.equals(oldUuid));
 
@@ -119,7 +119,7 @@ public void testInstanceIdChanges_dataCollectionEnabled() {
     assertEquals(newFid, prefs.getString(IdManager.PREFKEY_FIREBASE_IID, null));
 
     // subsequent calls should return the same id
-    assertEquals(installId, idManager.getCrashlyticsInstallId());
+    assertEquals(installId, idManager.getInstallIds().getCrashlyticsInstallId());
   }
 
   void validateInstanceIdDoesntChange(boolean dataCollectionEnabled) {
@@ -136,7 +136,7 @@ void validateInstanceIdDoesntChange(boolean dataCollectionEnabled) {
     IdManager idManager =
         createIdManager(fid, dataCollectionEnabled ? MOCK_ARBITER_ENABLED : MOCK_ARBITER_DISABLED);
 
-    String installId = idManager.getCrashlyticsInstallId();
+    String installId = idManager.getInstallIds().getCrashlyticsInstallId();
     assertNotNull(installId);
 
     // Test that the UUID didn't change.
@@ -146,15 +146,15 @@ void validateInstanceIdDoesntChange(boolean dataCollectionEnabled) {
     assertEquals(fid, prefs.getString(IdManager.PREFKEY_FIREBASE_IID, null));
 
     // subsequent calls should return the same id
-    assertEquals(oldUuid, idManager.getCrashlyticsInstallId());
+    assertEquals(oldUuid, idManager.getInstallIds().getCrashlyticsInstallId());
   }
 
   public void testInstanceIdDoesntChange_dataCollectionEnabled() {
-    validateInstanceIdDoesntChange(/*dataCollectionEnabled=*/ true);
+    validateInstanceIdDoesntChange(/* dataCollectionEnabled= */ true);
   }
 
   public void testInstanceIdDoesntChange_dataCollectionDisabled() {
-    validateInstanceIdDoesntChange(/*dataCollectionEnabled=*/ false);
+    validateInstanceIdDoesntChange(/* dataCollectionEnabled= */ false);
   }
 
   public void testInstanceIdRotatesWithDataCollectionFlag() {
@@ -169,22 +169,26 @@ public void testInstanceIdRotatesWithDataCollectionFlag() {
 
     // Initialize the manager with the same FID.
     IdManager idManager = createIdManager(originalFid, MOCK_ARBITER_ENABLED);
-    String firstUuid = idManager.getCrashlyticsInstallId();
+    String firstUuid = idManager.getInstallIds().getCrashlyticsInstallId();
     assertNotNull(firstUuid);
     assertEquals(originalUuid, firstUuid);
 
     // subsequent calls should return the same id
-    assertEquals(firstUuid, idManager.getCrashlyticsInstallId());
+    assertEquals(firstUuid, idManager.getInstallIds().getCrashlyticsInstallId());
     assertEquals(
-        firstUuid, createIdManager(originalFid, MOCK_ARBITER_ENABLED).getCrashlyticsInstallId());
+        firstUuid,
+        createIdManager(originalFid, MOCK_ARBITER_ENABLED)
+            .getInstallIds()
+            .getCrashlyticsInstallId());
 
     // Disable data collection manager and confirm we get a different id
     idManager = createIdManager(originalFid, MOCK_ARBITER_DISABLED);
-    String secondUuid = idManager.getCrashlyticsInstallId();
+    String secondUuid = idManager.getInstallIds().getCrashlyticsInstallId();
     assertNotSame(secondUuid, firstUuid);
-    assertEquals(secondUuid, idManager.getCrashlyticsInstallId());
+    assertEquals(secondUuid, idManager.getInstallIds().getCrashlyticsInstallId());
     assertEquals(
-        secondUuid, createIdManager(null, MOCK_ARBITER_DISABLED).getCrashlyticsInstallId());
+        secondUuid,
+        createIdManager(null, MOCK_ARBITER_DISABLED).getInstallIds().getCrashlyticsInstallId());
     // Check that we cached an synthetic FID
     final SharedPreferences prefs = CommonUtils.getSharedPrefs(getContext());
     String cachedFid = prefs.getString(IdManager.PREFKEY_FIREBASE_IID, null);
@@ -192,12 +196,15 @@ public void testInstanceIdRotatesWithDataCollectionFlag() {
 
     // re-enable data collection
     idManager = createIdManager(originalFid, MOCK_ARBITER_ENABLED);
-    String thirdUuid = idManager.getCrashlyticsInstallId();
+    String thirdUuid = idManager.getInstallIds().getCrashlyticsInstallId();
     assertNotSame(thirdUuid, firstUuid);
     assertNotSame(thirdUuid, secondUuid);
-    assertEquals(thirdUuid, idManager.getCrashlyticsInstallId());
+    assertEquals(thirdUuid, idManager.getInstallIds().getCrashlyticsInstallId());
     assertEquals(
-        thirdUuid, createIdManager(originalFid, MOCK_ARBITER_ENABLED).getCrashlyticsInstallId());
+        thirdUuid,
+        createIdManager(originalFid, MOCK_ARBITER_ENABLED)
+            .getInstallIds()
+            .getCrashlyticsInstallId());
     // The cached ID should be back to the original
     cachedFid = prefs.getString(IdManager.PREFKEY_FIREBASE_IID, null);
     assertEquals(cachedFid, originalFid);
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/NativeSessionFileGzipperTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/NativeSessionFileGzipperTest.java
index a60c9510d8c..febdef69b8d 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/NativeSessionFileGzipperTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/NativeSessionFileGzipperTest.java
@@ -14,17 +14,19 @@
 
 package com.google.firebase.crashlytics.internal.common;
 
+import static java.util.Arrays.stream;
+
 import android.content.Context;
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.Test;
 import org.mockito.internal.util.collections.Sets;
 
+@SuppressWarnings("ResultOfMethodCallIgnored") // Convenient use of files.
 public class NativeSessionFileGzipperTest extends CrashlyticsTestCase {
   byte[] testContents = {0, 2, 20, 10};
   File testFile;
@@ -47,8 +49,17 @@ protected void setUp() throws Exception {
     gzipDir.mkdirs();
   }
 
+  @Override
+  protected void tearDown() throws Exception {
+    super.tearDown();
+    File[] gzipFiles = gzipDir.listFiles();
+    if (gzipFiles != null) {
+      stream(gzipFiles).forEach(File::delete);
+    }
+  }
+
   @Test
-  public void testProcessNativeSessions_putsFilesInCorrectLocation() throws IOException {
+  public void testProcessNativeSessions_putsFilesInCorrectLocation() {
     String fileBackedSessionName = "file";
     String byteBackedSessionName = "byte";
     FileBackedNativeSessionFile fileSession =
@@ -58,10 +69,12 @@ public void testProcessNativeSessions_putsFilesInCorrectLocation() throws IOExce
     List<NativeSessionFile> files = Arrays.asList(fileSession, byteSession);
     NativeSessionFileGzipper.processNativeSessions(gzipDir, files);
 
+    File[] gzipFiles = gzipDir.listFiles();
+    assertNotNull(gzipFiles);
     assertEquals(
         Sets.newSet(
             new File(gzipDir, fileBackedSessionName), new File(gzipDir, byteBackedSessionName)),
-        Sets.newSet(gzipDir.listFiles()));
+        Sets.newSet(gzipFiles));
   }
 
   @Test
@@ -75,7 +88,8 @@ public void testProcessNativeSessionsWhenDataIsNull_putsFilesInCorrectLocation()
     List<NativeSessionFile> files = Arrays.asList(fileSession, byteSession);
     NativeSessionFileGzipper.processNativeSessions(gzipDir, files);
 
-    assertEquals(
-        Sets.newSet(new File(gzipDir, byteBackedSessionName)), Sets.newSet(gzipDir.listFiles()));
+    File[] gzipFiles = gzipDir.listFiles();
+    assertNotNull(gzipFiles);
+    assertEquals(Sets.newSet(new File(gzipDir, byteBackedSessionName)), Sets.newSet(gzipFiles));
   }
 }
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java
index fdc0bd6acdd..27ecd0ca3a9 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java
@@ -26,6 +26,7 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -35,12 +36,10 @@
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.CustomAttribute;
-import com.google.firebase.crashlytics.internal.model.ImmutableList;
 import com.google.firebase.crashlytics.internal.persistence.CrashlyticsReportPersistence;
 import com.google.firebase.crashlytics.internal.send.DataTransportCrashlyticsReportSender;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -58,6 +57,7 @@ public class SessionReportingCoordinatorTest {
   @Mock private DataTransportCrashlyticsReportSender reportSender;
   @Mock private LogFileManager logFileManager;
   @Mock private UserMetadata reportMetadata;
+  @Mock private IdManager idManager;
   @Mock private CrashlyticsReport mockReport;
   @Mock private CrashlyticsReport.Session.Event mockEvent;
   @Mock private CrashlyticsReport.Session.Event.Builder mockEventBuilder;
@@ -74,7 +74,12 @@ public void setUp() {
 
     reportingCoordinator =
         new SessionReportingCoordinator(
-            dataCapture, reportPersistence, reportSender, logFileManager, reportMetadata);
+            dataCapture,
+            reportPersistence,
+            reportSender,
+            logFileManager,
+            reportMetadata,
+            idManager);
   }
 
   @Test
@@ -227,8 +232,9 @@ public void testNonFatalEvent_addsSortedKeysToEvent() {
     final CustomAttribute customAttribute2 =
         CustomAttribute.builder().setKey(testKey2).setValue(testValue2).build();
 
-    final ImmutableList<CustomAttribute> expectedCustomAttributes =
-        ImmutableList.from(customAttribute1, customAttribute2);
+    final List<CustomAttribute> expectedCustomAttributes = new ArrayList<>();
+    expectedCustomAttributes.add(customAttribute1);
+    expectedCustomAttributes.add(customAttribute2);
 
     when(reportMetadata.getCustomKeys()).thenReturn(attributes);
     when(reportMetadata.getInternalKeys()).thenReturn(attributes);
@@ -266,6 +272,29 @@ public void testNonFatalEvent_addsNoKeysToEventWhenNoneAvailable() {
     verify(logFileManager, never()).clearLog();
   }
 
+  @Test
+  public void testNonFatalEvent_addRolloutsEvent() {
+    long timestamp = System.currentTimeMillis();
+    String sessionId = "testSessionId";
+    mockEventInteractions();
+
+    List<CrashlyticsReport.Session.Event.RolloutAssignment> rolloutsState =
+        new ArrayList<CrashlyticsReport.Session.Event.RolloutAssignment>();
+    rolloutsState.add(mockRolloutAssignment());
+    when(reportMetadata.getRolloutsState()).thenReturn(rolloutsState);
+
+    reportingCoordinator.onBeginSession(sessionId, timestamp);
+    reportingCoordinator.persistNonFatalEvent(mockException, mockThread, sessionId, timestamp);
+
+    verify(mockEventAppBuilder, never()).setCustomAttributes(any());
+    verify(mockEventAppBuilder, never()).build();
+    verify(mockEventBuilder, never()).setApp(mockEventApp);
+    verify(reportMetadata).getRolloutsState();
+    // first build for custom keys
+    // second build for rollouts
+    verify(mockEventBuilder, times(2)).build();
+  }
+
   @Test
   public void testFatalEvent_addsSortedCustomKeysToEvent() {
     final long timestamp = System.currentTimeMillis();
@@ -288,8 +317,9 @@ public void testFatalEvent_addsSortedCustomKeysToEvent() {
     final CustomAttribute customAttribute2 =
         CustomAttribute.builder().setKey(testKey2).setValue(testValue2).build();
 
-    final ImmutableList<CustomAttribute> expectedCustomAttributes =
-        ImmutableList.from(customAttribute1, customAttribute2);
+    final List<CustomAttribute> expectedCustomAttributes = new ArrayList<>();
+    expectedCustomAttributes.add(customAttribute1);
+    expectedCustomAttributes.add(customAttribute2);
 
     when(reportMetadata.getCustomKeys()).thenReturn(attributes);
 
@@ -325,8 +355,9 @@ public void testFatalEvent_addsSortedInternalKeysToEvent() {
     final CustomAttribute customAttribute2 =
         CustomAttribute.builder().setKey(testKey2).setValue(testValue2).build();
 
-    final ImmutableList<CustomAttribute> expectedCustomAttributes =
-        ImmutableList.from(customAttribute1, customAttribute2);
+    final List<CustomAttribute> expectedCustomAttributes = new ArrayList<>();
+    expectedCustomAttributes.add(customAttribute1);
+    expectedCustomAttributes.add(customAttribute2);
 
     when(reportMetadata.getInternalKeys()).thenReturn(attributes);
 
@@ -362,6 +393,29 @@ public void testFatalEvent_addsNoKeysToEventWhenNoneAvailable() {
     verify(logFileManager, never()).clearLog();
   }
 
+  @Test
+  public void testFatalEvent_addRolloutsToEvent() {
+    long timestamp = System.currentTimeMillis();
+    String sessionId = "testSessionId";
+    mockEventInteractions();
+
+    List<CrashlyticsReport.Session.Event.RolloutAssignment> rolloutsState =
+        new ArrayList<CrashlyticsReport.Session.Event.RolloutAssignment>();
+    rolloutsState.add(mockRolloutAssignment());
+    when(reportMetadata.getRolloutsState()).thenReturn(rolloutsState);
+
+    reportingCoordinator.onBeginSession(sessionId, timestamp);
+    reportingCoordinator.persistFatalEvent(mockException, mockThread, sessionId, timestamp);
+
+    verify(mockEventAppBuilder, never()).setCustomAttributes(any());
+    verify(mockEventAppBuilder, never()).build();
+    verify(mockEventBuilder, never()).setApp(mockEventApp);
+    verify(reportMetadata).getRolloutsState();
+    // first build for custom keys
+    // second build for rollouts
+    verify(mockEventBuilder, times(2)).build();
+  }
+
   @Test
   public void onLog_writesToLogFileManager() {
     long timestamp = System.currentTimeMillis();
@@ -397,11 +451,13 @@ public void testFinalizeSessionWithNativeEvent_createsCrashlyticsReportWithNativ
     String byteBackedSessionName = "byte";
     BytesBackedNativeSessionFile byteSession =
         new BytesBackedNativeSessionFile(byteBackedSessionName, "not_applicable", testBytes);
-    reportingCoordinator.finalizeSessionWithNativeEvent("id", Arrays.asList(byteSession));
+    reportingCoordinator.finalizeSessionWithNativeEvent(
+        "id", Collections.singletonList(byteSession), null);
 
     ArgumentCaptor<CrashlyticsReport.FilesPayload> filesPayload =
         ArgumentCaptor.forClass(CrashlyticsReport.FilesPayload.class);
-    verify(reportPersistence).finalizeSessionWithNativeEvent(eq("id"), filesPayload.capture());
+    verify(reportPersistence)
+        .finalizeSessionWithNativeEvent(eq("id"), filesPayload.capture(), any());
     CrashlyticsReport.FilesPayload ndkPayloadFinalized = filesPayload.getValue();
     assertEquals(1, ndkPayloadFinalized.getFiles().size());
 
@@ -438,13 +494,14 @@ public void onReportSend_successfulReportsAreDeleted() {
     final Task<CrashlyticsReportWithSessionId> failedTask =
         Tasks.forException(new Exception("fail"));
 
-    when(reportSender.sendReport(mockReport1)).thenReturn(successfulTask);
-    when(reportSender.sendReport(mockReport2)).thenReturn(failedTask);
+    when(reportSender.enqueueReport(mockReport1, false)).thenReturn(successfulTask);
+    when(reportSender.enqueueReport(mockReport2, false)).thenReturn(failedTask);
 
+    when(idManager.fetchTrueFid()).thenReturn(new FirebaseInstallationId("fid", "authToken"));
     reportingCoordinator.sendReports(Runnable::run);
 
-    verify(reportSender).sendReport(mockReport1);
-    verify(reportSender).sendReport(mockReport2);
+    verify(reportSender).enqueueReport(mockReport1, false);
+    verify(reportSender).enqueueReport(mockReport2, false);
   }
 
   @Test
@@ -490,6 +547,8 @@ private static CrashlyticsReport mockReport(String sessionId) {
     final CrashlyticsReport.Session mockSession = mock(CrashlyticsReport.Session.class);
     when(mockSession.getIdentifier()).thenReturn(sessionId);
     when(mockReport.getSession()).thenReturn(mockSession);
+    when(mockReport.withFirebaseInstallationId(anyString())).thenReturn(mockReport);
+    when(mockReport.withFirebaseAuthenticationToken(anyString())).thenReturn(mockReport);
     return mockReport;
   }
 
@@ -497,4 +556,17 @@ private static CrashlyticsReportWithSessionId mockReportWithSessionId(String ses
     return CrashlyticsReportWithSessionId.create(
         mockReport(sessionId), sessionId, new File("fake"));
   }
+
+  private static CrashlyticsReport.Session.Event.RolloutAssignment mockRolloutAssignment() {
+    return CrashlyticsReport.Session.Event.RolloutAssignment.builder()
+        .setTemplateVersion(2)
+        .setParameterKey("my_feature")
+        .setParameterValue("false")
+        .setRolloutVariant(
+            CrashlyticsReport.Session.Event.RolloutAssignment.RolloutVariant.builder()
+                .setRolloutId("rollout_1")
+                .setVariantId("enabled")
+                .build())
+        .build();
+  }
 }
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/metadata/MetaDataStoreTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/metadata/MetaDataStoreTest.java
index 7f0d8d9e0bf..364b72bcb2f 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/metadata/MetaDataStoreTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/metadata/MetaDataStoreTest.java
@@ -14,13 +14,22 @@
 
 package com.google.firebase.crashlytics.internal.metadata;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
 import com.google.firebase.crashlytics.internal.common.CrashlyticsBackgroundWorker;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import org.junit.Test;
 
+@SuppressWarnings("ResultOfMethodCallIgnored") // Convenient use of files.
 public class MetaDataStoreTest extends CrashlyticsTestCase {
 
   private static final String SESSION_ID_1 = "session1";
@@ -39,8 +48,16 @@ public class MetaDataStoreTest extends CrashlyticsTestCase {
 
   private static final String ESCAPED = "\ttest\nvalue";
 
+  private static final List<RolloutAssignment> ROLLOUTS_STATE = new ArrayList<>();
+
+  static {
+    RolloutAssignment assignment =
+        RolloutAssignment.create("rollout_1", "my_feature", "false", "control", 1);
+    ROLLOUTS_STATE.add(assignment);
+  }
+
   private FileStore fileStore;
-  private CrashlyticsBackgroundWorker worker = new CrashlyticsBackgroundWorker(Runnable::run);
+  private final CrashlyticsBackgroundWorker worker = new CrashlyticsBackgroundWorker(Runnable::run);
 
   private MetaDataStore storeUnderTest;
 
@@ -83,7 +100,7 @@ public void testWriteUserData_singleField() {
   public void testWriteUserData_null() {
     storeUnderTest.writeUserData(SESSION_ID_1, metadataWithUserId(SESSION_ID_1, null).getUserId());
     UserMetadata userData = UserMetadata.loadFromExistingSession(SESSION_ID_1, fileStore, worker);
-    assertEquals(null, userData.getUserId());
+    assertNull(userData.getUserId());
   }
 
   public void testWriteUserData_emptyString() {
@@ -112,11 +129,100 @@ public void testWriteUserData_readDifferentSession() {
     assertNull(userData.getUserId());
   }
 
+  public void testReadUserData_corruptData() throws IOException {
+    File file = storeUnderTest.getUserDataFileForSession(SESSION_ID_1);
+    try (PrintWriter printWriter = new PrintWriter(file)) {
+      printWriter.println("Matt says hi!");
+    }
+    UserMetadata userData = UserMetadata.loadFromExistingSession(SESSION_ID_1, fileStore, worker);
+    assertNull(userData.getUserId());
+    assertFalse(file.exists());
+  }
+
+  public void testReadUserData_emptyData() throws IOException {
+    File file = storeUnderTest.getUserDataFileForSession(SESSION_ID_1);
+    file.createNewFile();
+    UserMetadata userData = UserMetadata.loadFromExistingSession(SESSION_ID_1, fileStore, worker);
+    assertNull(userData.getUserId());
+    assertFalse(file.exists());
+  }
+
   public void testReadUserData_noStoredData() {
     UserMetadata userData = UserMetadata.loadFromExistingSession(SESSION_ID_1, fileStore, worker);
     assertNull(userData.getUserId());
   }
 
+  @Test
+  public void testUpdateSessionId_notPersistUserIdToNewSessionIfNoUserIdSet() {
+    UserMetadata userMetadata = new UserMetadata(SESSION_ID_1, fileStore, worker);
+    userMetadata.setNewSession(SESSION_ID_2);
+    assertThat(fileStore.getSessionFile(SESSION_ID_2, UserMetadata.USERDATA_FILENAME).exists())
+        .isFalse();
+  }
+
+  @Test
+  public void testUpdateSessionId_notPersistCustomKeysToNewSessionIfNoCustomKeysSet() {
+    UserMetadata userMetadata = new UserMetadata(SESSION_ID_1, fileStore, worker);
+    userMetadata.setNewSession(SESSION_ID_2);
+    assertThat(fileStore.getSessionFile(SESSION_ID_2, UserMetadata.KEYDATA_FILENAME).exists())
+        .isFalse();
+  }
+
+  @Test
+  public void testUpdateSessionId_notPersistRolloutsToNewSessionIfNoRolloutsSet() {
+    UserMetadata userMetadata = new UserMetadata(SESSION_ID_1, fileStore, worker);
+    userMetadata.setNewSession(SESSION_ID_2);
+    assertThat(
+            fileStore.getSessionFile(SESSION_ID_2, UserMetadata.ROLLOUTS_STATE_FILENAME).exists())
+        .isFalse();
+  }
+
+  @Test
+  public void testUpdateSessionId_persistCustomKeysToNewSessionIfCustomKeysSet() {
+    UserMetadata userMetadata = new UserMetadata(SESSION_ID_1, fileStore, worker);
+    final Map<String, String> keys =
+        new HashMap<String, String>() {
+          {
+            put(KEY_1, VALUE_1);
+            put(KEY_2, VALUE_2);
+            put(KEY_3, VALUE_3);
+          }
+        };
+    userMetadata.setCustomKeys(keys);
+    userMetadata.setNewSession(SESSION_ID_2);
+    assertThat(fileStore.getSessionFile(SESSION_ID_2, UserMetadata.KEYDATA_FILENAME).exists())
+        .isTrue();
+
+    MetaDataStore metaDataStore = new MetaDataStore(fileStore);
+    assertThat(metaDataStore.readKeyData(SESSION_ID_2)).isEqualTo(keys);
+  }
+
+  @Test
+  public void testUpdateSessionId_persistUserIdToNewSessionIfUserIdSet() {
+    String userId = "ThemisWang";
+    UserMetadata userMetadata = new UserMetadata(SESSION_ID_1, fileStore, worker);
+    userMetadata.setUserId(userId);
+    userMetadata.setNewSession(SESSION_ID_2);
+    assertThat(fileStore.getSessionFile(SESSION_ID_2, UserMetadata.USERDATA_FILENAME).exists())
+        .isTrue();
+
+    MetaDataStore metaDataStore = new MetaDataStore(fileStore);
+    assertThat(metaDataStore.readUserId(SESSION_ID_2)).isEqualTo(userId);
+  }
+
+  @Test
+  public void testUpdateSessionId_persistRolloutsToNewSessionIfRolloutsSet() {
+    UserMetadata userMetadata = new UserMetadata(SESSION_ID_1, fileStore, worker);
+    userMetadata.updateRolloutsState(ROLLOUTS_STATE);
+    userMetadata.setNewSession(SESSION_ID_2);
+    assertThat(
+            fileStore.getSessionFile(SESSION_ID_2, UserMetadata.ROLLOUTS_STATE_FILENAME).exists())
+        .isTrue();
+
+    MetaDataStore metaDataStore = new MetaDataStore(fileStore);
+    assertThat(metaDataStore.readRolloutsState(SESSION_ID_2)).isEqualTo(ROLLOUTS_STATE);
+  }
+
   // Keys
 
   public void testWriteKeys() {
@@ -237,11 +343,48 @@ public void testWriteKeys_readSeparateFromUser() {
     assertEqualMaps(internalKeys, readInternalKeys);
   }
 
+  public void testReadKeys_corruptData() throws IOException {
+    File file = storeUnderTest.getKeysFileForSession(SESSION_ID_1);
+    try (PrintWriter printWriter = new PrintWriter(file)) {
+      printWriter.println("This is not json.");
+    }
+    final Map<String, String> readKeys = storeUnderTest.readKeyData(SESSION_ID_1);
+    assertEquals(0, readKeys.size());
+    assertFalse(file.exists());
+  }
+
+  public void testReadKeys_emptyStoredData() throws IOException {
+    File file = storeUnderTest.getKeysFileForSession(SESSION_ID_1);
+    file.createNewFile();
+    final Map<String, String> readKeys = storeUnderTest.readKeyData(SESSION_ID_1);
+    assertEquals(0, readKeys.size());
+    assertFalse(file.exists());
+  }
+
   public void testReadKeys_noStoredData() {
     final Map<String, String> readKeys = storeUnderTest.readKeyData(SESSION_ID_1);
     assertEquals(0, readKeys.size());
   }
 
+  @Test
+  public void testWriteReadRolloutState() throws Exception {
+    storeUnderTest.writeRolloutState(SESSION_ID_1, ROLLOUTS_STATE);
+    List<RolloutAssignment> readRolloutsState = storeUnderTest.readRolloutsState(SESSION_ID_1);
+
+    assertThat(readRolloutsState).isEqualTo(ROLLOUTS_STATE);
+  }
+
+  @Test
+  public void testWriteReadRolloutState_writeValidThenEmpty() throws Exception {
+    storeUnderTest.writeRolloutState(SESSION_ID_1, ROLLOUTS_STATE);
+    List<RolloutAssignment> emptyState = new ArrayList<>();
+    storeUnderTest.writeRolloutState(SESSION_ID_1, emptyState);
+
+    assertThat(
+            fileStore.getSessionFile(SESSION_ID_1, UserMetadata.ROLLOUTS_STATE_FILENAME).exists())
+        .isFalse();
+  }
+
   public static void assertEqualMaps(Map<String, String> expected, Map<String, String> actual) {
     assertEquals(expected.size(), actual.size());
     for (String key : expected.keySet()) {
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/metadata/RolloutAssignmentListTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/metadata/RolloutAssignmentListTest.java
new file mode 100644
index 00000000000..26735973913
--- /dev/null
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/metadata/RolloutAssignmentListTest.java
@@ -0,0 +1,137 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal.metadata;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
+import com.google.firebase.encoders.DataEncoder;
+import com.google.firebase.encoders.json.JsonDataEncoderBuilder;
+import java.util.ArrayList;
+import java.util.List;
+import org.json.JSONException;
+import org.junit.Test;
+
+public class RolloutAssignmentListTest extends CrashlyticsTestCase {
+  private static final String ROLLOUTS_STATE_JSON_1 =
+      "[{"
+          + "\"rolloutId\":\"rollout_1\","
+          + "\"variantId\":\"control\","
+          + "\"parameterKey\":\"my_feature\","
+          + "\"parameterValue\":\"false\","
+          + "\"templateVersion\":1"
+          + "}]";
+
+  private static final String ROLLOUTS_STATE_JSON_2 =
+      "["
+          + "{"
+          + "\"rolloutId\":\"rollout_1\","
+          + "\"variantId\":\"control\","
+          + "\"parameterKey\":\"my_feature\","
+          + "\"parameterValue\":\"false\","
+          + "\"templateVersion\":1"
+          + "},"
+          + "{"
+          + "\"rollout_id\":\"rollout_2\""
+          + "\"variantId\":\"control\","
+          + "\"parameterKey\":\"color_feature\","
+          + "\"parameterValue\":\"blue\","
+          + "\"templateVersion\":2"
+          + "}]";
+
+  private static List<RolloutAssignment> ROLLOUTS_STATE_1;
+
+  static {
+    ROLLOUTS_STATE_1 = new ArrayList<>();
+    ROLLOUTS_STATE_1.add(
+        RolloutAssignment.create("rollout_1", "my_feature", "false", "control", 1));
+  }
+
+  private static List<RolloutAssignment> ROLLOUTS_STATE_2;
+
+  static {
+    ROLLOUTS_STATE_2 = new ArrayList<>();
+    ROLLOUTS_STATE_2.add(
+        RolloutAssignment.create("rollout_1", "my_feature", "false", "control", 1));
+    ROLLOUTS_STATE_2.add(
+        RolloutAssignment.create("rollout_2", "color_feature", "false", "control", 2));
+  }
+
+  private static final String ROLLOUT_ASSIGNMENT_JSON =
+      "{"
+          + "\"rolloutId\":\"rollout_1\","
+          + "\"variantId\":\"control\","
+          + "\"parameterKey\":\"my_feature\","
+          + "\"parameterValue\":\"false\","
+          + "\"templateVersion\":1"
+          + "}";
+
+  private static final int MAX_ENTRIES = 64;
+
+  private final RolloutAssignmentList rolloutAssignmentList =
+      new RolloutAssignmentList(MAX_ENTRIES);
+
+  @Test
+  public void testRollAssignmentInit_json() throws JSONException {
+    RolloutAssignment expected =
+        RolloutAssignment.create("rollout_1", "my_feature", "false", "control", 1);
+    RolloutAssignment rolloutAssignmentInitFromJson =
+        RolloutAssignment.create(ROLLOUT_ASSIGNMENT_JSON);
+
+    assertThat(rolloutAssignmentInitFromJson).isEqualTo(expected);
+  }
+
+  @Test
+  public void testRolloutAssignment_encodeJSON() {
+    RolloutAssignment rolloutAssignment =
+        RolloutAssignment.create("rollout_1", "my_feature", "false", "control", 1);
+    DataEncoder encoder =
+        new JsonDataEncoderBuilder().configureWith(AutoRolloutAssignmentEncoder.CONFIG).build();
+    String data = encoder.encode(rolloutAssignment);
+
+    assertThat(data).isNotEmpty();
+  }
+
+  @Test
+  public void testUpdateRolloutAssignmentList() throws Exception {
+    final List<String> changed = new ArrayList<String>();
+
+    rolloutAssignmentList.updateRolloutAssignmentList(ROLLOUTS_STATE_1);
+
+    new Thread(
+            new Runnable() {
+              @Override
+              public void run() {
+                changed.add("changed");
+                rolloutAssignmentList.updateRolloutAssignmentList(ROLLOUTS_STATE_2);
+              }
+            })
+        .start();
+
+    new Thread(
+            new Runnable() {
+              @Override
+              public void run() {
+                List<RolloutAssignment> list = rolloutAssignmentList.getRolloutAssignmentList();
+                if (changed.isEmpty()) {
+                  assertThat(rolloutAssignmentList.getRolloutAssignmentList().size()).isEqualTo(1);
+                } else {
+                  assertThat(rolloutAssignmentList.getRolloutAssignmentList().size()).isEqualTo(2);
+                }
+              }
+            })
+        .start();
+  }
+}
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransformTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransformTest.java
index fa4a8703f22..92f5523c2eb 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransformTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransformTest.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.crashlytics.internal.model.serialization;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.*;
 
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
@@ -24,9 +25,9 @@
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution.Signal;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution.Thread.Frame;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.User;
-import com.google.firebase.crashlytics.internal.model.ImmutableList;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
@@ -60,7 +61,16 @@ public void testReportToJsonAndBack_with_developmentPlatform_equals() throws IOE
 
   @Test
   public void testAnrEventToJsonAndBack_equals() throws IOException {
-    final CrashlyticsReport.Session.Event testEvent = makeAnrEvent();
+    final CrashlyticsReport.Session.Event testEvent = makeAnrEvent(false);
+    final String testEventJson = transform.eventToJson(testEvent);
+    final CrashlyticsReport.Session.Event reifiedEvent = transform.eventFromJson(testEventJson);
+    assertNotSame(reifiedEvent, testEvent);
+    assertEquals(reifiedEvent, testEvent);
+  }
+
+  @Test
+  public void testAnrEventWithBuildIdsToJsonAndBack_equals() throws IOException {
+    final CrashlyticsReport.Session.Event testEvent = makeAnrEvent(true);
     final String testEventJson = transform.eventToJson(testEvent);
     final CrashlyticsReport.Session.Event reifiedEvent = transform.eventFromJson(testEventJson);
     assertNotSame(reifiedEvent, testEvent);
@@ -78,7 +88,7 @@ public void testEventToJsonAndBack_equals() throws IOException {
 
   @Test
   public void testAppExitInfoToJsonAndBack_equals() throws IOException {
-    final CrashlyticsReport.ApplicationExitInfo testAppExitInfo = makeAppExitInfo();
+    final CrashlyticsReport.ApplicationExitInfo testAppExitInfo = makeAppExitInfo(false);
     final String testAppExitInfoJson = transform.applicationExitInfoToJson(testAppExitInfo);
     final CrashlyticsReport.ApplicationExitInfo reifiedAppExitInfo =
         transform.applicationExitInfoFromJson(testAppExitInfoJson);
@@ -86,6 +96,24 @@ public void testAppExitInfoToJsonAndBack_equals() throws IOException {
     assertEquals(reifiedAppExitInfo, testAppExitInfo);
   }
 
+  @Test
+  public void testAppExitInfoWithBuildIdsToJsonAndBack_equals() throws IOException {
+    final CrashlyticsReport.ApplicationExitInfo testAppExitInfo = makeAppExitInfo(true);
+    final String testAppExitInfoJson = transform.applicationExitInfoToJson(testAppExitInfo);
+    final CrashlyticsReport.ApplicationExitInfo reifiedAppExitInfo =
+        transform.applicationExitInfoFromJson(testAppExitInfoJson);
+    assertNotSame(reifiedAppExitInfo, testAppExitInfo);
+    assertEquals(reifiedAppExitInfo, testAppExitInfo);
+  }
+
+  @Test
+  public void testRolloutsEventToJsonAndBack_equals() throws IOException {
+    final CrashlyticsReport.Session.Event testEvent = makeRolloutsEvent();
+    final String testEventJson = transform.eventToJson(testEvent);
+    final CrashlyticsReport.Session.Event reifiedEvent = transform.eventFromJson(testEventJson);
+    assertThat(reifiedEvent).isEqualTo(testEvent);
+  }
+
   private static CrashlyticsReport makeTestReport(boolean useDevelopmentPlatform) {
     return CrashlyticsReport.builder()
         .setSdkVersion("sdkVersion")
@@ -125,14 +153,6 @@ private static Application makeTestApplication(boolean useDevelopmentPlatform) {
     return builder.build();
   }
 
-  private static ImmutableList<Event> makeTestEvents(int numEvents) {
-    List<Event> events = new ArrayList<>();
-    for (int i = 0; i < numEvents; i++) {
-      events.add(makeTestEvent());
-    }
-    return ImmutableList.from(events);
-  }
-
   private static Event makeTestEvent() {
     return Event.builder()
         .setType("type")
@@ -143,7 +163,7 @@ private static Event makeTestEvent() {
                 .setExecution(
                     Execution.builder()
                         .setBinaries(
-                            ImmutableList.from(
+                            Collections.singletonList(
                                 Execution.BinaryImage.builder()
                                     .setBaseAddress(0)
                                     .setName("name")
@@ -159,7 +179,7 @@ private static Event makeTestEvent() {
                                 .build())
                         .setSignal(Signal.builder().setCode("0").setName("0").setAddress(0).build())
                         .setThreads(
-                            ImmutableList.from(
+                            Collections.singletonList(
                                 Session.Event.Application.Execution.Thread.builder()
                                     .setName("name")
                                     .setImportance(4)
@@ -180,7 +200,7 @@ private static Event makeTestEvent() {
         .build();
   }
 
-  private static Event makeAnrEvent() {
+  private static Event makeAnrEvent(boolean withBuildIds) {
     return Event.builder()
         .setType("anr")
         .setTimestamp(1000)
@@ -190,7 +210,7 @@ private static Event makeAnrEvent() {
                 .setExecution(
                     Execution.builder()
                         .setBinaries(
-                            ImmutableList.from(
+                            Collections.singletonList(
                                 Execution.BinaryImage.builder()
                                     .setBaseAddress(0)
                                     .setName("name")
@@ -198,7 +218,7 @@ private static Event makeAnrEvent() {
                                     .setUuid("uuid")
                                     .build()))
                         .setSignal(Signal.builder().setCode("0").setName("0").setAddress(0).build())
-                        .setAppExitInfo(makeAppExitInfo())
+                        .setAppExitInfo(makeAppExitInfo(withBuildIds))
                         .build())
                 .setUiOrientation(1)
                 .build())
@@ -214,29 +234,65 @@ private static Event makeAnrEvent() {
         .build();
   }
 
-  private static ImmutableList<Frame> makeTestFrames() {
-    return ImmutableList.from(
+  private static Event makeRolloutsEvent() {
+    Event baseEvent = makeTestEvent();
+    List<Event.RolloutAssignment> rolloutAssignmentList = new ArrayList<Event.RolloutAssignment>();
+    rolloutAssignmentList.add(
+        Event.RolloutAssignment.builder()
+            .setRolloutVariant(
+                Event.RolloutAssignment.RolloutVariant.builder()
+                    .setRolloutId("rollout_100")
+                    .setVariantId("enabled")
+                    .build())
+            .setParameterValue("true")
+            .setParameterKey("my_test_feature")
+            .setTemplateVersion(4)
+            .build());
+    rolloutAssignmentList.add(
+        Event.RolloutAssignment.builder()
+            .setRolloutVariant(
+                Event.RolloutAssignment.RolloutVariant.builder()
+                    .setRolloutId("rollout_200")
+                    .setVariantId("control")
+                    .build())
+            .setParameterValue("false")
+            .setParameterKey("my_color_feature")
+            .setTemplateVersion(2)
+            .build());
+
+    Event.RolloutsState rolloutsState =
+        Event.RolloutsState.builder().setRolloutAssignments(rolloutAssignmentList).build();
+    Event rolloutsEvent = baseEvent.toBuilder().setRollouts(rolloutsState).build();
+    return rolloutsEvent;
+  }
+
+  private static List<Frame> makeTestFrames() {
+    ArrayList<Frame> frames = new ArrayList<>();
+    frames.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func1")
             .setFile("Test.java")
             .setOffset(36)
             .setImportance(4)
-            .build(),
+            .build());
+    frames.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func2")
             .setFile("Test.java")
             .setOffset(5637)
             .setImportance(4)
-            .build(),
+            .build());
+    frames.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func3")
             .setFile("Test.java")
             .setOffset(22429)
             .setImportance(4)
-            .build(),
+            .build());
+    frames.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func4")
@@ -244,9 +300,22 @@ private static ImmutableList<Frame> makeTestFrames() {
             .setOffset(751)
             .setImportance(4)
             .build());
+    return Collections.unmodifiableList(frames);
   }
 
-  private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo() {
+  private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo(boolean withBuildIds) {
+    List<CrashlyticsReport.ApplicationExitInfo.BuildIdMappingForArch>
+        buildIdMappingForArchImmutableList = null;
+    if (withBuildIds) {
+      buildIdMappingForArchImmutableList =
+          Collections.singletonList(
+              CrashlyticsReport.ApplicationExitInfo.BuildIdMappingForArch.builder()
+                  .setLibraryName("lib.so")
+                  .setArch("x86")
+                  .setBuildId("aabb")
+                  .build());
+    }
+
     return CrashlyticsReport.ApplicationExitInfo.builder()
         .setTraceFile("trace")
         .setTimestamp(1L)
@@ -256,6 +325,7 @@ private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo() {
         .setPid(1)
         .setPss(1L)
         .setRss(1L)
+        .setBuildIdMappingForArch(buildIdMappingForArchImmutableList)
         .build();
   }
 }
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistenceTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistenceTest.java
index 95d5edc9dcc..05622b58c76 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistenceTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistenceTest.java
@@ -14,11 +14,15 @@
 
 package com.google.firebase.crashlytics.internal.persistence;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import androidx.annotation.Nullable;
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
+import com.google.firebase.crashlytics.internal.common.CrashlyticsAppQualitySessionsSubscriber;
 import com.google.firebase.crashlytics.internal.common.CrashlyticsReportWithSessionId;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session;
@@ -27,14 +31,15 @@
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution.Signal;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution.Thread.Frame;
-import com.google.firebase.crashlytics.internal.model.ImmutableList;
-import com.google.firebase.crashlytics.internal.settings.SettingsDataProvider;
-import com.google.firebase.crashlytics.internal.settings.model.SessionSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.Settings;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.ProcessDetails;
+import com.google.firebase.crashlytics.internal.settings.Settings;
+import com.google.firebase.crashlytics.internal.settings.Settings.FeatureFlagData;
+import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
 import java.io.IOException;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -42,21 +47,33 @@
 import org.mockito.internal.util.collections.Sets;
 
 public class CrashlyticsReportPersistenceTest extends CrashlyticsTestCase {
-
   private static final int VERY_LARGE_UPPER_LIMIT = 9999;
+  private static final String APP_QUALITY_SESSION_ID = "9";
 
   private CrashlyticsReportPersistence reportPersistence;
   private FileStore fileStore;
 
-  private static SettingsDataProvider getSettingsMock(
+  private static SettingsProvider createSettingsProviderMock(
       int maxCompleteSessionsCount, int maxCustomExceptionEvents) {
-    SettingsDataProvider settingsDataProvider = mock(SettingsDataProvider.class);
-    Settings settingsMock = mock(Settings.class);
-    SessionSettingsData sessionSettingsDataMock =
-        new SessionSettingsData(maxCustomExceptionEvents, maxCompleteSessionsCount);
-    when(settingsMock.getSessionData()).thenReturn(sessionSettingsDataMock);
-    when(settingsDataProvider.getSettings()).thenReturn(settingsMock);
-    return settingsDataProvider;
+
+    SettingsProvider settingsProvider = mock(SettingsProvider.class);
+
+    Settings.SessionData sessionData =
+        new Settings.SessionData(maxCustomExceptionEvents, maxCompleteSessionsCount);
+    Settings settings =
+        new Settings(0, sessionData, new FeatureFlagData(true, false, false), 3, 0, 1.0, 1.0, 1);
+
+    when(settingsProvider.getSettingsSync()).thenReturn(settings);
+    return settingsProvider;
+  }
+
+  private static CrashlyticsAppQualitySessionsSubscriber createSessionsSubscriberMock(
+      String appQualitySessionId) {
+    CrashlyticsAppQualitySessionsSubscriber mockSessionsSubscriber =
+        mock(CrashlyticsAppQualitySessionsSubscriber.class);
+    when(mockSessionsSubscriber.getAppQualitySessionId(anyString()))
+        .thenReturn(appQualitySessionId);
+    return mockSessionsSubscriber;
   }
 
   @Override
@@ -64,7 +81,9 @@ public void setUp() throws Exception {
     fileStore = new FileStore(getContext());
     reportPersistence =
         new CrashlyticsReportPersistence(
-            fileStore, getSettingsMock(VERY_LARGE_UPPER_LIMIT, VERY_LARGE_UPPER_LIMIT));
+            fileStore,
+            createSettingsProviderMock(VERY_LARGE_UPPER_LIMIT, VERY_LARGE_UPPER_LIMIT),
+            createSessionsSubscriberMock(APP_QUALITY_SESSION_ID));
   }
 
   public void testListSortedOpenSessionIds() {
@@ -144,7 +163,8 @@ public void testLoadFinalizedReports_reportThenEvent_returnsReportWithEvent() {
     assertEquals(
         testReport
             .withSessionEndFields(endedAt, false, null)
-            .withEvents(ImmutableList.from(testEvent)),
+            .withAppQualitySessionId(APP_QUALITY_SESSION_ID)
+            .withEvents(Collections.singletonList(testEvent)),
         finalizedReport);
   }
 
@@ -166,10 +186,14 @@ public void testLoadFinalizedReports_reportThenMultipleEvents_returnsReportWithM
         reportPersistence.loadFinalizedReports();
     assertEquals(1, finalizedReports.size());
     final CrashlyticsReport finalizedReport = finalizedReports.get(0).getReport();
+    ArrayList<Event> events = new ArrayList<>();
+    events.add(testEvent);
+    events.add(testEvent2);
     assertEquals(
         testReport
             .withSessionEndFields(endedAt, false, null)
-            .withEvents(ImmutableList.from(testEvent, testEvent2)),
+            .withAppQualitySessionId(APP_QUALITY_SESSION_ID)
+            .withEvents(events),
         finalizedReport);
   }
 
@@ -198,13 +222,15 @@ public void testLoadFinalizedReports_reportThenMultipleEvents_returnsReportWithM
     assertEquals(
         testReport1
             .withSessionEndFields(endedAt, false, null)
-            .withEvents(ImmutableList.from(testEvent1)),
+            .withAppQualitySessionId(APP_QUALITY_SESSION_ID)
+            .withEvents(Collections.singletonList(testEvent1)),
         finalizedReport1);
     final CrashlyticsReport finalizedReport2 = finalizedReports.get(0).getReport();
     assertEquals(
         testReport2
             .withSessionEndFields(endedAt, false, null)
-            .withEvents(ImmutableList.from(testEvent2)),
+            .withAppQualitySessionId(APP_QUALITY_SESSION_ID)
+            .withEvents(Collections.singletonList(testEvent2)),
         finalizedReport2);
   }
 
@@ -270,7 +296,10 @@ public void testFinalizeReports_skipsCappingCurrentSession() throws IOException
 
   public void testFinalizeReports_capsReports() {
     reportPersistence =
-        new CrashlyticsReportPersistence(fileStore, getSettingsMock(4, VERY_LARGE_UPPER_LIMIT));
+        new CrashlyticsReportPersistence(
+            fileStore,
+            createSettingsProviderMock(4, VERY_LARGE_UPPER_LIMIT),
+            createSessionsSubscriberMock(APP_QUALITY_SESSION_ID));
     for (int i = 0; i < 10; i++) {
       persistReportWithEvent(reportPersistence, "testSession" + i, true);
     }
@@ -283,15 +312,20 @@ public void testFinalizeReports_capsReports() {
   }
 
   public void testFinalizeReports_whenSettingsChanges_capsReports() throws IOException {
-    SettingsDataProvider settingsDataProvider = mock(SettingsDataProvider.class);
-    Settings settingsMock = mock(Settings.class);
-    SessionSettingsData sessionSettingsDataMock =
-        new SessionSettingsData(VERY_LARGE_UPPER_LIMIT, 4);
-    SessionSettingsData sessionSettingsDataMockDifferentValues =
-        new SessionSettingsData(VERY_LARGE_UPPER_LIMIT, 8);
-    when(settingsMock.getSessionData()).thenReturn(sessionSettingsDataMock);
-    when(settingsDataProvider.getSettings()).thenReturn(settingsMock);
-    reportPersistence = new CrashlyticsReportPersistence(fileStore, settingsDataProvider);
+    SettingsProvider settingsProvider = mock(SettingsProvider.class);
+
+    Settings.SessionData sessionData1 = new Settings.SessionData(VERY_LARGE_UPPER_LIMIT, 4);
+    Settings.SessionData sessionData2 = new Settings.SessionData(VERY_LARGE_UPPER_LIMIT, 8);
+
+    Settings settings1 =
+        new Settings(0, sessionData1, new FeatureFlagData(true, true, false), 3, 0, 1.0, 1.0, 1);
+    Settings settings2 =
+        new Settings(0, sessionData2, new FeatureFlagData(true, true, false), 3, 0, 1.0, 1.0, 1);
+
+    when(settingsProvider.getSettingsSync()).thenReturn(settings1);
+    reportPersistence =
+        new CrashlyticsReportPersistence(
+            fileStore, settingsProvider, createSessionsSubscriberMock(APP_QUALITY_SESSION_ID));
 
     DecimalFormat format = new DecimalFormat("00");
     for (int i = 0; i < 16; i++) {
@@ -302,7 +336,7 @@ public void testFinalizeReports_whenSettingsChanges_capsReports() throws IOExcep
     List<CrashlyticsReportWithSessionId> finalizedReports =
         reportPersistence.loadFinalizedReports();
     assertEquals(4, finalizedReports.size());
-    when(settingsMock.getSessionData()).thenReturn(sessionSettingsDataMockDifferentValues);
+    when(settingsProvider.getSettingsSync()).thenReturn(settings2);
 
     for (int i = 16; i < 32; i++) {
       persistReportWithEvent(reportPersistence, "testSession" + i, true);
@@ -316,7 +350,10 @@ public void testFinalizeReports_whenSettingsChanges_capsReports() throws IOExcep
 
   public void testFinalizeReports_removesLowPriorityReportsFirst() throws IOException {
     reportPersistence =
-        new CrashlyticsReportPersistence(fileStore, getSettingsMock(4, VERY_LARGE_UPPER_LIMIT));
+        new CrashlyticsReportPersistence(
+            fileStore,
+            createSettingsProviderMock(4, VERY_LARGE_UPPER_LIMIT),
+            createSessionsSubscriberMock(APP_QUALITY_SESSION_ID));
 
     for (int i = 0; i < 10; i++) {
       boolean priority = i >= 3 && i <= 8;
@@ -338,14 +375,17 @@ public void testFinalizeReports_prioritizesNativeAndNonnativeFatals() throws IOE
 
     CrashlyticsReport.FilesPayload filesPayload = makeFilePayload();
     reportPersistence =
-        new CrashlyticsReportPersistence(fileStore, getSettingsMock(4, VERY_LARGE_UPPER_LIMIT));
+        new CrashlyticsReportPersistence(
+            fileStore,
+            createSettingsProviderMock(4, VERY_LARGE_UPPER_LIMIT),
+            createSessionsSubscriberMock(APP_QUALITY_SESSION_ID));
 
     persistReportWithEvent(reportPersistence, "testSession1", true);
-    reportPersistence.finalizeSessionWithNativeEvent("testSession1", filesPayload);
+    reportPersistence.finalizeSessionWithNativeEvent("testSession1", filesPayload, null);
     persistReportWithEvent(reportPersistence, "testSession2low", false);
     persistReportWithEvent(reportPersistence, "testSession3low", false);
     persistReportWithEvent(reportPersistence, "testSession4", true);
-    reportPersistence.finalizeSessionWithNativeEvent("testSession4", filesPayload);
+    reportPersistence.finalizeSessionWithNativeEvent("testSession4", filesPayload, null);
     reportPersistence.finalizeReports("skippedSession", 0L);
 
     List<CrashlyticsReportWithSessionId> finalizedReports =
@@ -360,7 +400,10 @@ public void testFinalizeReports_prioritizesNativeAndNonnativeFatals() throws IOE
 
   public void testFinalizeReports_removesOldestReportsFirst() throws IOException {
     reportPersistence =
-        new CrashlyticsReportPersistence(fileStore, getSettingsMock(4, VERY_LARGE_UPPER_LIMIT));
+        new CrashlyticsReportPersistence(
+            fileStore,
+            createSettingsProviderMock(4, VERY_LARGE_UPPER_LIMIT),
+            createSessionsSubscriberMock(APP_QUALITY_SESSION_ID));
     for (int i = 0; i < 8; i++) {
       String sessionId = "testSession" + i;
       persistReportWithEvent(reportPersistence, sessionId, true);
@@ -405,6 +448,33 @@ public void testLoadFinalizedReports_reportWithUserId_returnsReportWithProperUse
     assertEquals(userId, finalizedReport.getSession().getUser().getIdentifier());
   }
 
+  public void testLoadFinalizedReports_reportWithProcessDetails_returnsReportWithProcessDetails() {
+    String sessionId = "testSession";
+    CrashlyticsReport testReport = makeTestReport(sessionId);
+    ProcessDetails process1 = makeProcessDetails("process1");
+    ProcessDetails process2 = makeProcessDetails("process2");
+    ArrayList<ProcessDetails> processDetails = new ArrayList<>();
+    processDetails.add(process1);
+    processDetails.add(process2);
+    CrashlyticsReport.Session.Event testEvent =
+        makeTestEvent("java.lang.Exception", "reason", process1, processDetails);
+
+    reportPersistence.persistReport(testReport);
+    reportPersistence.persistEvent(testEvent, sessionId);
+    reportPersistence.finalizeReports(null, 0L);
+
+    List<CrashlyticsReportWithSessionId> finalizedReports =
+        reportPersistence.loadFinalizedReports();
+
+    assertThat(finalizedReports).hasSize(1);
+    CrashlyticsReport finalizedReport = finalizedReports.get(0).getReport();
+    assertThat(finalizedReport.getSession()).isNotNull();
+    assertThat(finalizedReport.getSession().getEvents()).isNotNull();
+    Event event = finalizedReport.getSession().getEvents().get(0);
+    assertThat(event.getApp().getCurrentProcessDetails()).isEqualTo(process1);
+    assertThat(event.getApp().getAppProcessDetails()).containsExactly(process1, process2);
+  }
+
   public void
       testLoadFinalizedReports_reportsWithUserIdInMultipleSessions_returnsReportsWithProperUserIds() {
     final String userId1 = "testUser1";
@@ -443,7 +513,7 @@ public void testFinalizeSessionWithNativeEvent_writesNativeSessions() {
 
     assertEquals(0, finalizedReports.size());
 
-    reportPersistence.finalizeSessionWithNativeEvent("sessionId", filesPayload);
+    reportPersistence.finalizeSessionWithNativeEvent("sessionId", filesPayload, null);
 
     finalizedReports = reportPersistence.loadFinalizedReports();
     assertEquals(1, finalizedReports.size());
@@ -508,7 +578,10 @@ public void testDeleteAllReports_removesAllReports() {
 
   public void testPersistEvent_keepsAppropriateNumberOfMostRecentEvents() throws IOException {
     reportPersistence =
-        new CrashlyticsReportPersistence(fileStore, getSettingsMock(VERY_LARGE_UPPER_LIMIT, 4));
+        new CrashlyticsReportPersistence(
+            fileStore,
+            createSettingsProviderMock(VERY_LARGE_UPPER_LIMIT, 4),
+            createSessionsSubscriberMock(APP_QUALITY_SESSION_ID));
     final String sessionId = "testSession";
     final CrashlyticsReport testReport = makeTestReport(sessionId);
     final CrashlyticsReport.Session.Event testEvent1 = makeTestEvent("type1", "reason1");
@@ -533,24 +606,34 @@ public void testPersistEvent_keepsAppropriateNumberOfMostRecentEvents() throws I
     assertEquals(1, finalizedReports.size());
     final CrashlyticsReport finalizedReport = finalizedReports.get(0).getReport();
     assertEquals(4, finalizedReport.getSession().getEvents().size());
+    ArrayList<Event> events = new ArrayList<>();
+    events.add(testEvent2);
+    events.add(testEvent3);
+    events.add(testEvent4);
+    events.add(testEvent5);
     assertEquals(
         testReport
             .withSessionEndFields(endedAt, false, null)
-            .withEvents(ImmutableList.from(testEvent2, testEvent3, testEvent4, testEvent5)),
+            .withAppQualitySessionId(APP_QUALITY_SESSION_ID)
+            .withEvents(events),
         finalizedReport);
   }
 
   public void testPersistEvent_whenSettingsChanges_keepsAppropriateNumberOfMostRecentEvents()
       throws IOException {
-    SettingsDataProvider settingsDataProvider = mock(SettingsDataProvider.class);
-    Settings settingsMock = mock(Settings.class);
-    SessionSettingsData sessionSettingsDataMock =
-        new SessionSettingsData(4, VERY_LARGE_UPPER_LIMIT);
-    SessionSettingsData sessionSettingsDataMockDifferentValues =
-        new SessionSettingsData(8, VERY_LARGE_UPPER_LIMIT);
-    when(settingsMock.getSessionData()).thenReturn(sessionSettingsDataMock);
-    when(settingsDataProvider.getSettings()).thenReturn(settingsMock);
-    reportPersistence = new CrashlyticsReportPersistence(fileStore, settingsDataProvider);
+    SettingsProvider settingsProvider = mock(SettingsProvider.class);
+    Settings.SessionData sessionData1 = new Settings.SessionData(4, VERY_LARGE_UPPER_LIMIT);
+    Settings.SessionData sessionData2 = new Settings.SessionData(8, VERY_LARGE_UPPER_LIMIT);
+
+    Settings settings1 =
+        new Settings(0, sessionData1, new FeatureFlagData(true, true, false), 3, 0, 1.0, 1.0, 1);
+    Settings settings2 =
+        new Settings(0, sessionData2, new FeatureFlagData(true, true, false), 3, 0, 1.0, 1.0, 1);
+
+    when(settingsProvider.getSettingsSync()).thenReturn(settings1);
+    reportPersistence =
+        new CrashlyticsReportPersistence(
+            fileStore, settingsProvider, createSessionsSubscriberMock(APP_QUALITY_SESSION_ID));
 
     final String sessionId = "testSession";
     final CrashlyticsReport testReport = makeTestReport(sessionId);
@@ -576,13 +659,19 @@ public void testPersistEvent_whenSettingsChanges_keepsAppropriateNumberOfMostRec
     assertEquals(1, finalizedReports.size());
     final CrashlyticsReport finalizedReport = finalizedReports.get(0).getReport();
     assertEquals(4, finalizedReport.getSession().getEvents().size());
+    ArrayList<Event> events = new ArrayList<>();
+    events.add(testEvent2);
+    events.add(testEvent3);
+    events.add(testEvent4);
+    events.add(testEvent5);
     assertEquals(
         testReport
             .withSessionEndFields(endedAt, false, null)
-            .withEvents(ImmutableList.from(testEvent2, testEvent3, testEvent4, testEvent5)),
+            .withAppQualitySessionId(APP_QUALITY_SESSION_ID)
+            .withEvents(events),
         finalizedReport);
 
-    when(settingsMock.getSessionData()).thenReturn(sessionSettingsDataMockDifferentValues);
+    when(settingsProvider.getSettingsSync()).thenReturn(settings2);
 
     final CrashlyticsReport.Session.Event testEvent6 = makeTestEvent("type6", "reason6");
     final CrashlyticsReport.Session.Event testEvent7 = makeTestEvent("type7", "reason7");
@@ -613,25 +702,30 @@ public void testPersistEvent_whenSettingsChanges_keepsAppropriateNumberOfMostRec
     assertEquals(2, finalizedReports2.size());
     final CrashlyticsReport finalizedReport2 = finalizedReports2.get(0).getReport();
     assertEquals(8, finalizedReport2.getSession().getEvents().size());
+    ArrayList<Event> allEvents = new ArrayList<>();
+    allEvents.add(testEvent3);
+    allEvents.add(testEvent4);
+    allEvents.add(testEvent5);
+    allEvents.add(testEvent6);
+    allEvents.add(testEvent7);
+    allEvents.add(testEvent8);
+    allEvents.add(testEvent9);
+    allEvents.add(testEvent10);
+
     assertEquals(
         testReport2
             .withSessionEndFields(endedAt, false, null)
-            .withEvents(
-                ImmutableList.from(
-                    testEvent3,
-                    testEvent4,
-                    testEvent5,
-                    testEvent6,
-                    testEvent7,
-                    testEvent8,
-                    testEvent9,
-                    testEvent10)),
+            .withAppQualitySessionId(APP_QUALITY_SESSION_ID)
+            .withEvents(allEvents),
         finalizedReport2);
   }
 
   public void testPersistReportWithAnrEvent() throws IOException {
     reportPersistence =
-        new CrashlyticsReportPersistence(fileStore, getSettingsMock(VERY_LARGE_UPPER_LIMIT, 4));
+        new CrashlyticsReportPersistence(
+            fileStore,
+            createSettingsProviderMock(VERY_LARGE_UPPER_LIMIT, 4),
+            createSessionsSubscriberMock(APP_QUALITY_SESSION_ID));
     final String sessionId = "testSession";
     final CrashlyticsReport testReport = makeTestReport(sessionId);
     final Event testEvent = makeTestAnrEvent();
@@ -649,6 +743,86 @@ public void testPersistReportWithAnrEvent() throws IOException {
     assertEquals(1, finalizedReport.getSession().getEvents().size());
   }
 
+  public void testFinalizeReports_missingAppQualitySessionId() {
+    reportPersistence =
+        new CrashlyticsReportPersistence(
+            fileStore,
+            createSettingsProviderMock(4, VERY_LARGE_UPPER_LIMIT),
+            // Simulate Sessions subscriber failure by setting appQualitySessionId to null.
+            createSessionsSubscriberMock(/* appQualitySessionId= */ null));
+
+    String sessionId = "testSession";
+    CrashlyticsReport testReport = makeTestReport(sessionId);
+    CrashlyticsReport.Session.Event testEvent = makeTestEvent();
+
+    reportPersistence.persistReport(testReport);
+    reportPersistence.persistEvent(testEvent, sessionId);
+
+    long endedAt = System.currentTimeMillis();
+
+    reportPersistence.finalizeReports("skippedSession", endedAt);
+
+    List<CrashlyticsReportWithSessionId> finalizedReports =
+        reportPersistence.loadFinalizedReports();
+    assertEquals(1, finalizedReports.size());
+    CrashlyticsReport finalizedReport = finalizedReports.get(0).getReport();
+    assertNotNull(finalizedReport.getSession());
+    assertEquals(
+        testReport
+            .withSessionEndFields(endedAt, false, null)
+            .withEvents(Collections.singletonList(testEvent)),
+        finalizedReport);
+
+    // getAppQualitySessionId should return null since sessions subscriber never got an id.
+    assertNull(finalizedReport.getSession().getAppQualitySessionId());
+  }
+
+  public void testPersistEvent_updatesLatestAppQualitySession() {
+    CrashlyticsAppQualitySessionsSubscriber mockSessionsSubscriber =
+        createSessionsSubscriberMock(APP_QUALITY_SESSION_ID);
+    CrashlyticsReportPersistence reportPersistence =
+        new CrashlyticsReportPersistence(
+            fileStore,
+            createSettingsProviderMock(VERY_LARGE_UPPER_LIMIT, VERY_LARGE_UPPER_LIMIT),
+            mockSessionsSubscriber);
+
+    String sessionId = "testSession";
+    CrashlyticsReport testReport = makeTestReport(sessionId);
+    CrashlyticsReport.Session.Event testEvent1 = makeTestEvent("type1", "reason1");
+    CrashlyticsReport.Session.Event testEvent2 = makeTestEvent("type2", "reason2");
+    CrashlyticsReport.Session.Event testEvent3 = makeTestEvent("type3", "reason3");
+
+    reportPersistence.persistReport(testReport);
+    reportPersistence.persistEvent(testEvent1, sessionId);
+    reportPersistence.persistEvent(testEvent2, sessionId);
+
+    // Simulate a new app quality sessions session before the last event.
+    String latestAppQualitySessionId = "300";
+    when(mockSessionsSubscriber.getAppQualitySessionId(anyString()))
+        .thenReturn(latestAppQualitySessionId);
+    reportPersistence.persistEvent(testEvent3, sessionId);
+
+    long endedAt = System.currentTimeMillis();
+
+    reportPersistence.finalizeReports("skippedSession", endedAt);
+
+    List<CrashlyticsReportWithSessionId> finalizedReports =
+        reportPersistence.loadFinalizedReports();
+    assertEquals(1, finalizedReports.size());
+    CrashlyticsReport finalizedReport = finalizedReports.get(0).getReport();
+    assertNotNull(finalizedReport.getSession());
+    ArrayList<Event> events = new ArrayList<>();
+    events.add(testEvent1);
+    events.add(testEvent2);
+    events.add(testEvent3);
+    assertEquals(
+        testReport
+            .withSessionEndFields(endedAt, false, null)
+            .withAppQualitySessionId(latestAppQualitySessionId)
+            .withEvents(events),
+        finalizedReport);
+  }
+
   private static void persistReportWithEvent(
       CrashlyticsReportPersistence reportPersistence, String sessionId, boolean isHighPriority) {
     CrashlyticsReport testReport = makeTestReport(sessionId);
@@ -663,6 +837,8 @@ private static CrashlyticsReport.Builder makeIncompleteReport() {
         .setGmpAppId("gmpAppId")
         .setPlatform(1)
         .setInstallationUuid("installationId")
+        .setFirebaseInstallationId("firebaseInstallationId")
+        .setFirebaseAuthenticationToken("firebaseAuthenticationToken")
         .setBuildVersion("1")
         .setDisplayVersion("1.0.0");
   }
@@ -680,7 +856,7 @@ private static CrashlyticsReport.FilesPayload makeFilePayload() {
     return CrashlyticsReport.FilesPayload.builder()
         .setOrgId("orgId")
         .setFiles(
-            ImmutableList.from(
+            Collections.singletonList(
                 CrashlyticsReport.FilesPayload.File.builder()
                     .setContents(testContents)
                     .setFilename("bytes")
@@ -694,7 +870,7 @@ private static CrashlyticsReport makeTestNativeReport() {
         CrashlyticsReport.FilesPayload.builder()
             .setOrgId("orgId")
             .setFiles(
-                ImmutableList.from(
+                Collections.singletonList(
                     CrashlyticsReport.FilesPayload.File.builder()
                         .setContents(testContents)
                         .setFilename("bytes")
@@ -727,16 +903,27 @@ private static Event makeTestEvent() {
   }
 
   private static Event makeTestEvent(String type, String reason) {
+    return makeTestEvent(
+        type, reason, /* currentProcessDetails= */ null, /* appProcessDetails= */ null);
+  }
+
+  private static Event makeTestEvent(
+      String type,
+      String reason,
+      @Nullable ProcessDetails currentProcessDetails,
+      @Nullable List<ProcessDetails> appProcessDetails) {
     return Event.builder()
         .setType(type)
         .setTimestamp(1000)
         .setApp(
             Session.Event.Application.builder()
                 .setBackground(false)
+                .setCurrentProcessDetails(currentProcessDetails)
+                .setAppProcessDetails(appProcessDetails)
                 .setExecution(
                     Execution.builder()
                         .setBinaries(
-                            ImmutableList.from(
+                            Collections.singletonList(
                                 Execution.BinaryImage.builder()
                                     .setBaseAddress(0)
                                     .setName("name")
@@ -752,7 +939,7 @@ private static Event makeTestEvent(String type, String reason) {
                                 .build())
                         .setSignal(Signal.builder().setCode("0").setName("0").setAddress(0).build())
                         .setThreads(
-                            ImmutableList.from(
+                            Collections.singletonList(
                                 Session.Event.Application.Execution.Thread.builder()
                                     .setName("name")
                                     .setImportance(4)
@@ -783,7 +970,7 @@ private static Event makeTestAnrEvent() {
                 .setExecution(
                     Execution.builder()
                         .setBinaries(
-                            ImmutableList.from(
+                            Collections.singletonList(
                                 Execution.BinaryImage.builder()
                                     .setBaseAddress(0)
                                     .setName("name")
@@ -807,29 +994,33 @@ private static Event makeTestAnrEvent() {
         .build();
   }
 
-  private static ImmutableList<Frame> makeTestFrames() {
-    return ImmutableList.from(
+  private static List<Frame> makeTestFrames() {
+    ArrayList<Frame> l = new ArrayList<>();
+    l.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func1")
             .setFile("Test.java")
             .setOffset(36)
             .setImportance(4)
-            .build(),
+            .build());
+    l.add(
         Frame.builder()
             .setPc(1)
             .setSymbol("func2")
             .setFile("Test.java")
             .setOffset(5637)
             .setImportance(4)
-            .build(),
+            .build());
+    l.add(
         Frame.builder()
             .setPc(2)
             .setSymbol("func3")
             .setFile("Test.java")
             .setOffset(22429)
             .setImportance(4)
-            .build(),
+            .build());
+    l.add(
         Frame.builder()
             .setPc(3)
             .setSymbol("func4")
@@ -837,6 +1028,8 @@ private static ImmutableList<Frame> makeTestFrames() {
             .setOffset(751)
             .setImportance(4)
             .build());
+
+    return l;
   }
 
   private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo() {
@@ -851,4 +1044,13 @@ private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo() {
         .setRss(1L)
         .build();
   }
+
+  private static ProcessDetails makeProcessDetails(String processName) {
+    return ProcessDetails.builder()
+        .setProcessName(processName)
+        .setPid(0)
+        .setImportance(0)
+        .setDefaultProcess(false)
+        .build();
+  }
 }
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/FileStoreTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/FileStoreTest.java
index 5cca7941fca..028e32a207f 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/FileStoreTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/FileStoreTest.java
@@ -14,11 +14,14 @@
 
 package com.google.firebase.crashlytics.internal.persistence;
 
+import static com.google.firebase.crashlytics.internal.persistence.FileStore.sanitizeName;
+
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
+@SuppressWarnings("ResultOfMethodCallIgnored") // Convenient use of files.
 public class FileStoreTest extends CrashlyticsTestCase {
   FileStore fileStore;
 
@@ -31,6 +34,7 @@ protected void setUp() throws Exception {
   public void testGetCommonFile() {
     File commonFile = fileStore.getCommonFile("testCommonFile");
     assertFalse(commonFile.exists());
+    assertNotNull(commonFile.getParentFile());
     assertTrue(commonFile.getParentFile().exists());
   }
 
@@ -39,6 +43,7 @@ public void testGetSessionFile() {
     String filename = "testSessionFile";
     File sessionFile = fileStore.getSessionFile(sessionId, filename);
     assertFalse(sessionFile.exists());
+    assertNotNull(sessionFile.getParentFile());
     assertTrue(sessionFile.getParentFile().exists());
     assertEquals(sessionFile.getParentFile().getName(), sessionId);
 
@@ -122,4 +127,10 @@ public void testGetReports() throws Exception {
     nativeReport.delete();
     assertEquals(0, fileStore.getNativeReports().size());
   }
+
+  public void testSanitizeName() {
+    assertEquals(
+        "com.google.my.awesome.app_big.stuff.Happens_Here123___",
+        sanitizeName("com.google.my.awesome.app:big.stuff.Happens_Here123$%^"));
+  }
 }
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/send/DataTransportCrashlyticsReportSenderTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/send/DataTransportCrashlyticsReportSenderTest.java
index c06bf081051..2fa094840ae 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/send/DataTransportCrashlyticsReportSenderTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/send/DataTransportCrashlyticsReportSenderTest.java
@@ -29,6 +29,7 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.crashlytics.internal.common.CrashlyticsReportWithSessionId;
+import com.google.firebase.crashlytics.internal.common.OnDemandCounter;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import java.io.File;
 import java.util.concurrent.ExecutionException;
@@ -51,7 +52,9 @@ public class DataTransportCrashlyticsReportSenderTest {
   public void setUp() throws Exception {
     MockitoAnnotations.initMocks(this);
     when(mockTransform.apply(any())).thenReturn(new byte[0]);
-    reportSender = new DataTransportCrashlyticsReportSender(mockTransport, mockTransform);
+    reportSender =
+        new DataTransportCrashlyticsReportSender(
+            new ReportQueue(60, 1.2, 3_000, mockTransport, new OnDemandCounter()), mockTransform);
   }
 
   @Test
@@ -61,10 +64,13 @@ public void testSendReportsSuccessful() throws Exception {
     final CrashlyticsReportWithSessionId report1 = mockReportWithSessionId();
     final CrashlyticsReportWithSessionId report2 = mockReportWithSessionId();
 
-    final Task<CrashlyticsReportWithSessionId> send1 = reportSender.sendReport(report1);
-    final Task<CrashlyticsReportWithSessionId> send2 = reportSender.sendReport(report2);
+    final Task<CrashlyticsReportWithSessionId> send1 =
+        reportSender.enqueueReport(report1, /*isOnDemand=*/ true);
+    final Task<CrashlyticsReportWithSessionId> send2 =
+        reportSender.enqueueReport(report2, /*isOnDemand=*/ true);
 
     try {
+      Thread.sleep(2_000); // give time to process queue
       Tasks.await(send1);
       Tasks.await(send2);
     } catch (ExecutionException e) {
@@ -85,10 +91,11 @@ public void testSendReportsFailure() throws Exception {
     final CrashlyticsReportWithSessionId report1 = mockReportWithSessionId();
     final CrashlyticsReportWithSessionId report2 = mockReportWithSessionId();
 
-    final Task<CrashlyticsReportWithSessionId> send1 = reportSender.sendReport(report1);
-    final Task<CrashlyticsReportWithSessionId> send2 = reportSender.sendReport(report2);
+    final Task<CrashlyticsReportWithSessionId> send1 = reportSender.enqueueReport(report1, false);
+    final Task<CrashlyticsReportWithSessionId> send2 = reportSender.enqueueReport(report2, false);
 
     try {
+      Thread.sleep(2_000); // give time to process queue
       Tasks.await(send1);
       Tasks.await(send2);
     } catch (ExecutionException e) {
@@ -112,10 +119,11 @@ public void testSendReports_oneSuccessOneFail() throws Exception {
     final CrashlyticsReportWithSessionId report1 = mockReportWithSessionId();
     final CrashlyticsReportWithSessionId report2 = mockReportWithSessionId();
 
-    final Task<CrashlyticsReportWithSessionId> send1 = reportSender.sendReport(report1);
-    final Task<CrashlyticsReportWithSessionId> send2 = reportSender.sendReport(report2);
+    final Task<CrashlyticsReportWithSessionId> send1 = reportSender.enqueueReport(report1, false);
+    final Task<CrashlyticsReportWithSessionId> send2 = reportSender.enqueueReport(report2, false);
 
     try {
+      Thread.sleep(2_000); // give time to process queue
       Tasks.await(send1);
       Tasks.await(send2);
     } catch (ExecutionException e) {
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsControllerTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsControllerTest.java
index 98918f0cfa9..bd6a349befe 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsControllerTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsControllerTest.java
@@ -31,9 +31,7 @@
 import com.google.firebase.crashlytics.internal.common.DeliveryMechanism;
 import com.google.firebase.crashlytics.internal.common.ExecutorUtils;
 import com.google.firebase.crashlytics.internal.common.InstallIdProvider;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsRequest;
-import com.google.firebase.crashlytics.internal.settings.network.SettingsSpiCall;
+import com.google.firebase.crashlytics.internal.common.InstallIdProvider.InstallIds;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import org.json.JSONObject;
@@ -70,7 +68,7 @@ SettingsController newSettingsController(
       CachedSettingsIo cachedSettingsIo,
       SettingsSpiCall settingsSpiCall,
       DataCollectionArbiter dataCollectionArbiter,
-      final boolean buildInstanceIdentifierChanged) {
+      boolean buildInstanceIdentifierChanged) {
     return new SettingsController(
         getContext(),
         settingsRequest,
@@ -102,18 +100,18 @@ private <T> T await(Task<T> task) throws Exception {
   }
 
   public void testCachedSettingsLoad() throws Exception {
-    final JSONObject cachedJson = new JSONObject();
+    JSONObject cachedJson = new JSONObject();
     when(mockCachedSettingsIo.readCachedSettings()).thenReturn(cachedJson);
 
     when(mockCurrentTimeProvider.getCurrentTimeMillis())
         .thenReturn(Long.valueOf(UNEXPIRED_CURRENT_TIME_MILLIS));
 
-    final SettingsData cachedSettings = new TestSettingsData();
+    Settings cachedSettings = new TestSettings();
     when(mockSettingsJsonParser.parseSettingsJson(cachedJson)).thenReturn(cachedSettings);
 
-    final SettingsRequest requestData = buildSettingsRequest();
+    SettingsRequest requestData = buildSettingsRequest();
 
-    final SettingsController controller =
+    SettingsController controller =
         newSettingsController(
             requestData,
             mockCurrentTimeProvider,
@@ -124,8 +122,7 @@ public void testCachedSettingsLoad() throws Exception {
             false);
 
     await(controller.loadSettingsData(networkExecutor));
-    assertEquals(cachedSettings, controller.getSettings());
-    assertEquals(cachedSettings.appData, await(controller.getAppSettings()));
+    assertEquals(cachedSettings, controller.getSettingsSync());
 
     verifyZeroInteractions(mockSettingsSpiCall);
     verify(mockCachedSettingsIo).readCachedSettings();
@@ -134,9 +131,9 @@ public void testCachedSettingsLoad() throws Exception {
   }
 
   public void testCachedSettingsLoad_newInstanceIdentifier() throws Exception {
-    final SettingsData fetchedSettings = new TestSettingsData();
+    Settings fetchedSettings = new TestSettings();
 
-    final JSONObject fetchedJson = new JSONObject();
+    JSONObject fetchedJson = new JSONObject();
     when(mockSettingsSpiCall.invoke(any(SettingsRequest.class), eq(true))).thenReturn(fetchedJson);
 
     when(mockSettingsJsonParser.parseSettingsJson(fetchedJson)).thenReturn(fetchedSettings);
@@ -145,8 +142,8 @@ public void testCachedSettingsLoad_newInstanceIdentifier() throws Exception {
     when(mockDataCollectionArbiter.waitForDataCollectionPermission(any(Executor.class)))
         .thenReturn(dataCollectionPermission.getTask());
 
-    final SettingsRequest requestData = buildSettingsRequest();
-    final SettingsController controller =
+    SettingsRequest requestData = buildSettingsRequest();
+    SettingsController controller =
         newSettingsController(
             requestData,
             mockCurrentTimeProvider,
@@ -157,11 +154,11 @@ public void testCachedSettingsLoad_newInstanceIdentifier() throws Exception {
             true);
 
     controller.loadSettingsData(SettingsCacheBehavior.SKIP_CACHE_LOOKUP, networkExecutor);
-    assertNotNull(controller.getSettings());
+    assertNotNull(controller.getSettingsSync());
 
     dataCollectionPermission.trySetResult(null);
-    assertEquals(fetchedSettings.appData, await(controller.getAppSettings()));
-    assertEquals(fetchedSettings, controller.getSettings());
+    assertEquals(fetchedSettings, await(controller.getSettingsAsync()));
+    assertEquals(fetchedSettings, controller.getSettingsSync());
 
     verify(mockSettingsSpiCall).invoke(any(SettingsRequest.class), eq(true));
     verify(mockCachedSettingsIo).writeCachedSettings(fetchedSettings.expiresAtMillis, fetchedJson);
@@ -171,13 +168,13 @@ public void testCachedSettingsLoad_newInstanceIdentifier() throws Exception {
 
   public void testExpiredCachedSettingsLoad() throws Exception {
 
-    final SettingsData cachedSettings = new TestSettingsData();
-    final SettingsData fetchedSettings = new TestSettingsData();
+    Settings cachedSettings = new TestSettings();
+    Settings fetchedSettings = new TestSettings();
 
-    final JSONObject fetchedJson = new JSONObject();
+    JSONObject fetchedJson = new JSONObject();
     when(mockSettingsSpiCall.invoke(any(SettingsRequest.class), eq(true))).thenReturn(fetchedJson);
 
-    final JSONObject cachedJson = new JSONObject();
+    JSONObject cachedJson = new JSONObject();
     when(mockCachedSettingsIo.readCachedSettings()).thenReturn(cachedJson);
 
     when(mockCurrentTimeProvider.getCurrentTimeMillis())
@@ -190,8 +187,8 @@ public void testExpiredCachedSettingsLoad() throws Exception {
     when(mockDataCollectionArbiter.waitForDataCollectionPermission(any(Executor.class)))
         .thenReturn(dataCollectionPermission.getTask());
 
-    final SettingsRequest requestData = buildSettingsRequest();
-    final SettingsController controller =
+    SettingsRequest requestData = buildSettingsRequest();
+    SettingsController controller =
         newSettingsController(
             requestData,
             mockCurrentTimeProvider,
@@ -203,14 +200,13 @@ public void testExpiredCachedSettingsLoad() throws Exception {
 
     Task<Void> loadFinished = controller.loadSettingsData(networkExecutor);
 
-    assertEquals(cachedSettings, controller.getSettings());
-    assertEquals(cachedSettings.appData, await(controller.getAppSettings()));
+    assertEquals(cachedSettings, controller.getSettingsSync());
+    assertEquals(cachedSettings, await(controller.getSettingsAsync()));
 
     dataCollectionPermission.trySetResult(null);
     await(loadFinished);
 
-    assertEquals(fetchedSettings.appData, await(controller.getAppSettings()));
-    assertEquals(fetchedSettings, controller.getSettings());
+    assertEquals(fetchedSettings, controller.getSettingsSync());
 
     verify(mockSettingsSpiCall).invoke(any(SettingsRequest.class), eq(true));
     verify(mockCachedSettingsIo, times(2)).readCachedSettings();
@@ -221,17 +217,17 @@ public void testExpiredCachedSettingsLoad() throws Exception {
   }
 
   public void testIgnoreExpiredCachedSettingsLoad() throws Exception {
-    final JSONObject cachedJson = new JSONObject();
+    JSONObject cachedJson = new JSONObject();
     when(mockCachedSettingsIo.readCachedSettings()).thenReturn(cachedJson);
 
     when(mockCurrentTimeProvider.getCurrentTimeMillis())
         .thenReturn(Long.valueOf(EXPIRED_CURRENT_TIME_MILLIS));
 
-    final SettingsData cachedSettings = new TestSettingsData();
+    Settings cachedSettings = new TestSettings();
     when(mockSettingsJsonParser.parseSettingsJson(cachedJson)).thenReturn(cachedSettings);
 
-    final SettingsRequest requestData = buildSettingsRequest();
-    final SettingsController controller =
+    SettingsRequest requestData = buildSettingsRequest();
+    SettingsController controller =
         newSettingsController(
             requestData,
             mockCurrentTimeProvider,
@@ -241,8 +237,7 @@ public void testIgnoreExpiredCachedSettingsLoad() throws Exception {
             mockDataCollectionArbiter,
             false);
     controller.loadSettingsData(SettingsCacheBehavior.IGNORE_CACHE_EXPIRATION, networkExecutor);
-    assertEquals(cachedSettings, controller.getSettings());
-    assertEquals(cachedSettings.appData, await(controller.getAppSettings()));
+    assertEquals(cachedSettings, controller.getSettingsSync());
 
     verifyZeroInteractions(mockSettingsSpiCall);
     verify(mockCachedSettingsIo).readCachedSettings();
@@ -252,20 +247,19 @@ public void testIgnoreExpiredCachedSettingsLoad() throws Exception {
 
   public void testSkipCachedSettingsLoad() throws Exception {
 
-    final SettingsData fetchedSettings = new TestSettingsData();
-
-    final JSONObject fetchedJson = new JSONObject();
+    Settings fetchedSettings = new TestSettings();
+    JSONObject fetchedJson = new JSONObject();
     when(mockSettingsSpiCall.invoke(any(SettingsRequest.class), eq(true))).thenReturn(fetchedJson);
 
     when(mockSettingsJsonParser.parseSettingsJson(fetchedJson)).thenReturn(fetchedSettings);
 
-    final JSONObject expiredCachedSettingsJson = new JSONObject();
+    JSONObject expiredCachedSettingsJson = new JSONObject();
     when(mockCachedSettingsIo.readCachedSettings()).thenReturn(expiredCachedSettingsJson);
 
     when(mockCurrentTimeProvider.getCurrentTimeMillis())
         .thenReturn(Long.valueOf(EXPIRED_CURRENT_TIME_MILLIS));
 
-    final SettingsData expiredCachedSettings = new TestSettingsData();
+    Settings expiredCachedSettings = new TestSettings();
     when(mockSettingsJsonParser.parseSettingsJson(expiredCachedSettingsJson))
         .thenReturn(expiredCachedSettings);
 
@@ -273,8 +267,8 @@ public void testSkipCachedSettingsLoad() throws Exception {
     when(mockDataCollectionArbiter.waitForDataCollectionPermission(any(Executor.class)))
         .thenReturn(dataCollectionPermission.getTask());
 
-    final SettingsRequest requestData = buildSettingsRequest();
-    final SettingsController controller =
+    SettingsRequest requestData = buildSettingsRequest();
+    SettingsController controller =
         newSettingsController(
             requestData,
             mockCurrentTimeProvider,
@@ -286,14 +280,12 @@ public void testSkipCachedSettingsLoad() throws Exception {
 
     Task<Void> loadFinished =
         controller.loadSettingsData(SettingsCacheBehavior.SKIP_CACHE_LOOKUP, networkExecutor);
-    assertEquals(expiredCachedSettings.appData, await(controller.getAppSettings()));
-    assertEquals(expiredCachedSettings, controller.getSettings());
+    assertEquals(expiredCachedSettings, controller.getSettingsSync());
 
     dataCollectionPermission.trySetResult(null);
     await(loadFinished);
 
-    assertEquals(fetchedSettings.appData, await(controller.getAppSettings()));
-    assertEquals(fetchedSettings, controller.getSettings());
+    assertEquals(fetchedSettings, controller.getSettingsSync());
 
     verify(mockSettingsSpiCall).invoke(any(SettingsRequest.class), eq(true));
     verify(mockCachedSettingsIo).readCachedSettings();
@@ -312,13 +304,13 @@ public void testSkipCachedSettingsLoad() throws Exception {
   public void testLastDitchSettingsLoad() throws Exception {
     when(mockSettingsSpiCall.invoke(any(SettingsRequest.class), eq(true))).thenReturn(null);
 
-    final JSONObject expiredCachedSettingsJson = new JSONObject();
+    JSONObject expiredCachedSettingsJson = new JSONObject();
     when(mockCachedSettingsIo.readCachedSettings()).thenReturn(expiredCachedSettingsJson);
 
     when(mockCurrentTimeProvider.getCurrentTimeMillis())
         .thenReturn(Long.valueOf(EXPIRED_CURRENT_TIME_MILLIS));
 
-    final SettingsData expiredCachedSettings = new TestSettingsData();
+    Settings expiredCachedSettings = new TestSettings();
     when(mockSettingsJsonParser.parseSettingsJson(expiredCachedSettingsJson))
         .thenReturn(expiredCachedSettings);
 
@@ -326,8 +318,8 @@ public void testLastDitchSettingsLoad() throws Exception {
     when(mockDataCollectionArbiter.waitForDataCollectionPermission(any(Executor.class)))
         .thenReturn(dataCollectionPermission.getTask());
 
-    final SettingsRequest requestData = buildSettingsRequest();
-    final SettingsController controller =
+    SettingsRequest requestData = buildSettingsRequest();
+    SettingsController controller =
         newSettingsController(
             requestData,
             mockCurrentTimeProvider,
@@ -339,14 +331,12 @@ public void testLastDitchSettingsLoad() throws Exception {
 
     Task<Void> loadFinished =
         controller.loadSettingsData(SettingsCacheBehavior.SKIP_CACHE_LOOKUP, networkExecutor);
-    assertEquals(expiredCachedSettings, controller.getSettings());
-    assertEquals(expiredCachedSettings.appData, await(controller.getAppSettings()));
+    assertEquals(expiredCachedSettings, controller.getSettingsSync());
 
     dataCollectionPermission.trySetResult(null);
     await(loadFinished);
 
-    assertEquals(expiredCachedSettings.appData, await(controller.getAppSettings()));
-    assertEquals(expiredCachedSettings, controller.getSettings());
+    assertEquals(expiredCachedSettings, controller.getSettingsSync());
 
     verify(mockSettingsSpiCall).invoke(any(SettingsRequest.class), eq(true));
     verify(mockCachedSettingsIo).readCachedSettings();
@@ -363,8 +353,8 @@ public void testNoAvailableSettingsLoad() throws Exception {
     when(mockDataCollectionArbiter.waitForDataCollectionPermission(any(Executor.class)))
         .thenReturn(dataCollectionPermission.getTask());
 
-    final SettingsRequest requestData = buildSettingsRequest();
-    final SettingsController controller =
+    SettingsRequest requestData = buildSettingsRequest();
+    SettingsController controller =
         newSettingsController(
             requestData,
             mockCurrentTimeProvider,
@@ -375,14 +365,14 @@ public void testNoAvailableSettingsLoad() throws Exception {
             false);
 
     Task<Void> loadFinished = controller.loadSettingsData(networkExecutor);
-    assertNotNull(controller.getSettings());
-    assertFalse(controller.getAppSettings().isComplete());
+    assertNotNull(controller.getSettingsSync());
+    assertFalse(controller.getSettingsAsync().isComplete());
 
     dataCollectionPermission.trySetResult(null);
     await(loadFinished);
 
-    assertNotNull(controller.getSettings());
-    assertFalse(controller.getAppSettings().isComplete());
+    assertNotNull(controller.getSettingsSync());
+    assertFalse(controller.getSettingsAsync().isComplete());
 
     verify(mockSettingsSpiCall).invoke(any(SettingsRequest.class), eq(true));
     verify(mockCachedSettingsIo, times(2)).readCachedSettings();
@@ -391,13 +381,7 @@ public void testNoAvailableSettingsLoad() throws Exception {
   }
 
   private SettingsRequest buildSettingsRequest() {
-    final InstallIdProvider installIdProvider =
-        new InstallIdProvider() {
-          @Override
-          public String getCrashlyticsInstallId() {
-            return installationId;
-          }
-        };
+    InstallIdProvider installIdProvider = () -> InstallIds.createWithoutFid(installationId);
 
     return new SettingsRequest(
         googleAppId,
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsJsonTransformTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsJsonTransformTest.java
deleted file mode 100644
index 0663b7b40fb..00000000000
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsJsonTransformTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.crashlytics.internal.settings;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
-import com.google.firebase.crashlytics.internal.common.CommonUtils;
-import com.google.firebase.crashlytics.internal.common.CurrentTimeProvider;
-import com.google.firebase.crashlytics.internal.settings.model.AppSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.FeaturesSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SessionSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
-import java.io.IOException;
-import java.io.InputStream;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class DefaultSettingsJsonTransformTest extends CrashlyticsTestCase {
-
-  CurrentTimeProvider mockCurrentTimeProvider;
-  SettingsJsonTransform transform;
-
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-
-    mockCurrentTimeProvider = mock(CurrentTimeProvider.class);
-    when(mockCurrentTimeProvider.getCurrentTimeMillis()).thenReturn(Long.valueOf(10));
-
-    transform = new DefaultSettingsJsonTransform();
-  }
-
-  public void testLoad09xSettings() throws Exception {
-    try {
-      final JSONObject testJson = getTestJSON("0_9_x-settings.json");
-
-      transform.buildFromJson(mockCurrentTimeProvider, testJson);
-      fail();
-    } catch (JSONException e) {
-      // expected exception
-    }
-  }
-
-  public void testSettingsJsonTransform() throws Exception {
-    when(mockCurrentTimeProvider.getCurrentTimeMillis()).thenReturn(Long.valueOf(10));
-
-    final JSONObject testJson = getTestJSON("default_settings.json");
-
-    final SettingsData settingsData = transform.buildFromJson(mockCurrentTimeProvider, testJson);
-
-    verifySettingsDataObject(mockCurrentTimeProvider, settingsData);
-  }
-
-  public void testSettingsJsonTransformWithAnalyticsDefaults() throws Exception {
-    final JSONObject testJson = getTestJSON("default_settings_omitted.json");
-
-    final SettingsData settingsData = transform.buildFromJson(mockCurrentTimeProvider, testJson);
-
-    verifySettingsDataObject(mockCurrentTimeProvider, settingsData);
-  }
-
-  public void testSettingsJsonTransformWithAnalyticsSampling() throws Exception {
-    final JSONObject testJson = getTestJSON("settings_with_sampling.json");
-
-    final SettingsData settingsData = transform.buildFromJson(mockCurrentTimeProvider, testJson);
-
-    verifySettingsDataObject(mockCurrentTimeProvider, settingsData);
-  }
-
-  public void testSettingsJsonTransform_customEventTrackingDisabled() throws Exception {
-    final JSONObject testJson = getTestJSON("settings_without_custom_event_tracking.json");
-
-    final SettingsData settingsData = transform.buildFromJson(mockCurrentTimeProvider, testJson);
-
-    verifySettingsDataObject(mockCurrentTimeProvider, settingsData);
-  }
-
-  public void testToJsonAndBackSurvival() throws IOException, JSONException {
-    final JSONObject testJson = getTestJSON("default_settings.json");
-
-    final SettingsData settingsData = transform.buildFromJson(mockCurrentTimeProvider, testJson);
-
-    final SettingsData roundtrippedSettingsData =
-        transform.buildFromJson(mockCurrentTimeProvider, transform.toJson(settingsData));
-
-    verifySettingsDataObject(mockCurrentTimeProvider, roundtrippedSettingsData);
-  }
-
-  public void testNoIconJsonTransform() throws Exception {
-    final JSONObject testJson = getTestJSON("no_icon_settings.json");
-    final SettingsData settingsData = transform.buildFromJson(mockCurrentTimeProvider, testJson);
-
-    assertEquals(3600010, settingsData.expiresAtMillis);
-    assertAppData(settingsData.appData);
-    assertSettingsData(settingsData.sessionData);
-    assertFeaturesData(settingsData.featuresData);
-
-    verify(mockCurrentTimeProvider).getCurrentTimeMillis();
-  }
-
-  public void testEmptyIconJsonTransform() throws Exception {
-    final JSONObject testJson = getTestJSON("no_icon_settings.json");
-    final SettingsData settingsData = transform.buildFromJson(mockCurrentTimeProvider, testJson);
-
-    assertEquals(3600010, settingsData.expiresAtMillis);
-    assertAppData(settingsData.appData);
-    assertSettingsData(settingsData.sessionData);
-    assertFeaturesData(settingsData.featuresData);
-
-    verify(mockCurrentTimeProvider).getCurrentTimeMillis();
-  }
-
-  public void testCachedJsonTransform() throws Exception {
-    final JSONObject testJson = getTestJSON("cached_settings.json");
-    final SettingsData settingsData = transform.buildFromJson(mockCurrentTimeProvider, testJson);
-
-    assertEquals(1234567890, settingsData.expiresAtMillis);
-    assertEquals(3600, settingsData.cacheDuration);
-    assertAppData(settingsData.appData);
-    assertSettingsData(settingsData.sessionData);
-    assertFeaturesData(settingsData.featuresData);
-    verifyZeroInteractions(mockCurrentTimeProvider);
-  }
-
-  private void assertAppData(AppSettingsData appData) {
-    assertEquals("activated", appData.status);
-    assertEquals("http://localhost:3000/spi/v1/platform/android/apps", appData.url);
-    assertEquals(
-        "http://localhost:3000/spi/v1/platform/android/apps/com.crashlytics.android/reports",
-        appData.reportsUrl);
-  }
-
-  private void assertSettingsData(SessionSettingsData settingsData) {
-    assertEquals(64, settingsData.maxCustomExceptionEvents);
-    assertEquals(4, settingsData.maxCompleteSessionsCount);
-  }
-
-  private void assertFeaturesData(FeaturesSettingsData featuresSettingsData) {
-    assertTrue(featuresSettingsData.collectReports);
-  }
-
-  private void verifySettingsDataObject(
-      CurrentTimeProvider mockCurrentTimeProvider, SettingsData settingsData) {
-    assertEquals(3600010, settingsData.expiresAtMillis);
-
-    assertEquals(2, settingsData.settingsVersion);
-    assertEquals(3600, settingsData.cacheDuration);
-
-    assertAppData(settingsData.appData);
-
-    assertFeaturesData(settingsData.featuresData);
-
-    assertSettingsData(settingsData.sessionData);
-
-    verify(mockCurrentTimeProvider).getCurrentTimeMillis();
-  }
-
-  private JSONObject getTestJSON(String fileName) throws IOException, JSONException {
-    final InputStream jsonInputStream = getContext().getResources().getAssets().open(fileName);
-    final String testJsonString = CommonUtils.streamToString(jsonInputStream);
-    final JSONObject testJson = new JSONObject(testJsonString);
-    return testJson;
-  }
-}
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/network/DefaultSettingsSpiCallTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsSpiCallTest.java
similarity index 96%
rename from firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/network/DefaultSettingsSpiCallTest.java
rename to firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsSpiCallTest.java
index 7f3d7c0f9eb..7131df8c8a4 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/network/DefaultSettingsSpiCallTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsSpiCallTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.crashlytics.internal.settings.network;
+package com.google.firebase.crashlytics.internal.settings;
 
 import static org.mockito.Mockito.*;
 
@@ -20,11 +20,11 @@
 import com.google.firebase.crashlytics.internal.Logger;
 import com.google.firebase.crashlytics.internal.common.CommonUtils;
 import com.google.firebase.crashlytics.internal.common.InstallIdProvider;
+import com.google.firebase.crashlytics.internal.common.InstallIdProvider.InstallIds;
 import com.google.firebase.crashlytics.internal.network.HttpGetRequest;
 import com.google.firebase.crashlytics.internal.network.HttpRequestFactory;
 import com.google.firebase.crashlytics.internal.network.HttpResponse;
 import com.google.firebase.crashlytics.internal.network.InspectableHttpGetRequest;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -231,13 +231,7 @@ public void testRequestWasSuccessful_unsuccessfulStatusCodes() {
   }
 
   private SettingsRequest buildSettingsRequest(String instanceId) {
-    final InstallIdProvider installIdProvider =
-        new InstallIdProvider() {
-          @Override
-          public String getCrashlyticsInstallId() {
-            return INSTALLATION_ID;
-          }
-        };
+    final InstallIdProvider installIdProvider = () -> InstallIds.createWithoutFid(INSTALLATION_ID);
     return new SettingsRequest(
         GOOGLE_APP_ID,
         DEVICE_MODEL,
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonParserTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonParserTest.java
index e3cde7c8386..45b45e896f4 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonParserTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonParserTest.java
@@ -20,7 +20,6 @@
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
 import com.google.firebase.crashlytics.internal.common.CommonUtils;
 import com.google.firebase.crashlytics.internal.common.CurrentTimeProvider;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
 import java.io.IOException;
 import java.io.InputStream;
 import org.json.JSONException;
@@ -42,27 +41,13 @@ protected void setUp() throws Exception {
     settingsJsonParser = new SettingsJsonParser(mockCurrentTimeProvider);
   }
 
-  public void testSettingsV2Parsing() throws Exception {
-    final JSONObject testJson = getTestJSON("default_settings.json");
-
-    final SettingsData settingsData = settingsJsonParser.parseSettingsJson(testJson);
-
-    Assert.assertEquals(
-        "http://localhost:3000/spi/v1/platform/android/apps", settingsData.appData.url);
-    Assert.assertNull(settingsData.appData.organizationId);
-    Assert.assertNull(settingsData.appData.bundleId);
-  }
-
   public void testSettingsV3Parsing() throws Exception {
     final JSONObject testJson = getTestJSON("firebase_settings.json");
 
-    final SettingsData settingsData = settingsJsonParser.parseSettingsJson(testJson);
-
-    Assert.assertEquals(
-        "https://update.crashlytics.com/spi/v1/platforms/android/apps/com.google.firebase.crashlytics.sdk.test",
-        settingsData.appData.url);
-    Assert.assertEquals("12345abcde12345abcde1234", settingsData.appData.organizationId);
-    Assert.assertEquals("com.google.firebase.crashlytics.sdk.test", settingsData.appData.bundleId);
+    Settings settings = settingsJsonParser.parseSettingsJson(testJson);
+    Assert.assertEquals(3, settings.settingsVersion);
+    Assert.assertEquals(7200, settings.cacheDuration);
+    Assert.assertTrue(settings.featureFlagData.collectReports);
   }
 
   private JSONObject getTestJSON(String fileName) throws IOException, JSONException {
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/SettingsV3JsonTransformTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/SettingsV3JsonTransformTest.java
index 6495e7f4902..650a1629f34 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/SettingsV3JsonTransformTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/SettingsV3JsonTransformTest.java
@@ -21,10 +21,6 @@
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
 import com.google.firebase.crashlytics.internal.common.CommonUtils;
 import com.google.firebase.crashlytics.internal.common.CurrentTimeProvider;
-import com.google.firebase.crashlytics.internal.settings.model.AppSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.FeaturesSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SessionSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
 import java.io.IOException;
 import java.io.InputStream;
 import org.json.JSONException;
@@ -45,93 +41,63 @@ protected void setUp() throws Exception {
   }
 
   public void testFirebaseSettingsTransform() throws Exception {
-    final JSONObject testJson = getTestJSON("firebase_settings.json");
+    JSONObject testJson = getTestJSON("firebase_settings.json");
+    Settings settings = transform.buildFromJson(mockCurrentTimeProvider, testJson);
 
-    final SettingsData settingsData = transform.buildFromJson(mockCurrentTimeProvider, testJson);
-
-    verifySettingsDataObject(mockCurrentTimeProvider, settingsData, false);
+    verifySettingsDataObject(mockCurrentTimeProvider, settings, false);
   }
 
   public void testFirebaseSettingsTransform_newApp() throws Exception {
-    final JSONObject testJson = getTestJSON("firebase_settings_new.json");
-
-    final SettingsData settingsData = transform.buildFromJson(mockCurrentTimeProvider, testJson);
+    JSONObject testJson = getTestJSON("firebase_settings_new.json");
+    Settings settings = transform.buildFromJson(mockCurrentTimeProvider, testJson);
 
-    verifySettingsDataObject(mockCurrentTimeProvider, settingsData, true);
+    verifySettingsDataObject(mockCurrentTimeProvider, settings, true);
   }
 
   public void testFirebaseSettingsTransform_collectAnrs() throws Exception {
-    final JSONObject testJson = getTestJSON("firebase_settings_collect_anrs.json");
-
-    final SettingsData settingsData = transform.buildFromJson(mockCurrentTimeProvider, testJson);
-
-    verifySettingsDataObject(mockCurrentTimeProvider, settingsData, false, true);
-  }
-
-  public void testToJsonAndBackSurvival() throws IOException, JSONException {
-    final JSONObject testJson = getTestJSON("firebase_settings.json");
-
-    final SettingsData settingsData = transform.buildFromJson(mockCurrentTimeProvider, testJson);
-
-    final SettingsData roundtrippedSettingsData =
-        transform.buildFromJson(mockCurrentTimeProvider, transform.toJson(settingsData));
+    JSONObject testJson = getTestJSON("firebase_settings_collect_anrs.json");
+    Settings settings = transform.buildFromJson(mockCurrentTimeProvider, testJson);
 
-    verifySettingsDataObject(mockCurrentTimeProvider, roundtrippedSettingsData);
+    verifySettingsDataObject(mockCurrentTimeProvider, settings, false, true);
   }
 
-  private void assertAppData(AppSettingsData appData, boolean isAppNew) {
-    assertEquals(isAppNew ? "new" : "activated", appData.status);
-    assertEquals(
-        isAppNew
-            ? "https://update.crashlytics.com/spi/v1/platforms/android/apps"
-            : "https://update.crashlytics.com/spi/v1/platforms/android/apps/com.google.firebase.crashlytics.sdk.test",
-        appData.url);
-    assertEquals(
-        "https://reports.crashlytics.com/spi/v1/platforms/android/apps/com.google.firebase.crashlytics.sdk.test/reports",
-        appData.reportsUrl);
-    assertEquals(
-        "https://reports.crashlytics.com/sdk-api/v1/platforms/android/apps/com.google.firebase.crashlytics.sdk.test/minidumps",
-        appData.ndkReportsUrl);
-    assertTrue(appData.updateRequired);
-    assertEquals(2, appData.reportUploadVariant);
-    assertEquals(2, appData.nativeReportUploadVariant);
-  }
-
-  private void assertSettingsData(SessionSettingsData settingsData) {
-    assertEquals(8, settingsData.maxCustomExceptionEvents);
-    assertEquals(4, settingsData.maxCompleteSessionsCount);
-  }
+  public void testFirebaseSettingsTransform_collectBuildIds() throws Exception {
+    JSONObject testJson = getTestJSON("firebase_settings_collect_build_ids.json");
+    Settings settings = transform.buildFromJson(mockCurrentTimeProvider, testJson);
 
-  private void assertFeaturesData(FeaturesSettingsData featuresSettingsData, boolean collectAnrs) {
-    assertTrue(featuresSettingsData.collectReports);
-    assertEquals(featuresSettingsData.collectAnrs, collectAnrs);
+    verifySettingsDataObject(mockCurrentTimeProvider, settings, false, true, true);
   }
 
   private void verifySettingsDataObject(
-      CurrentTimeProvider mockCurrentTimeProvider, SettingsData settingsData) {
-    verifySettingsDataObject(mockCurrentTimeProvider, settingsData, false);
+      CurrentTimeProvider mockCurrentTimeProvider, Settings settings, boolean isAppNew) {
+    verifySettingsDataObject(mockCurrentTimeProvider, settings, isAppNew, false, false);
   }
 
   private void verifySettingsDataObject(
-      CurrentTimeProvider mockCurrentTimeProvider, SettingsData settingsData, boolean isAppNew) {
-    verifySettingsDataObject(mockCurrentTimeProvider, settingsData, isAppNew, false);
+      CurrentTimeProvider mockCurrentTimeProvider,
+      Settings settings,
+      boolean isAppNew,
+      boolean collectAnrs) {
+    verifySettingsDataObject(mockCurrentTimeProvider, settings, isAppNew, collectAnrs, false);
   }
 
   private void verifySettingsDataObject(
       CurrentTimeProvider mockCurrentTimeProvider,
-      SettingsData settingsData,
+      Settings settings,
       boolean isAppNew,
-      boolean collectAnrs) {
-    assertEquals(7200010, settingsData.expiresAtMillis);
-
-    assertEquals(3, settingsData.settingsVersion);
-    assertEquals(7200, settingsData.cacheDuration);
+      boolean collectAnrs,
+      boolean collectBuildIds) {
+    assertEquals(7200010, settings.expiresAtMillis);
 
-    assertAppData(settingsData.appData, isAppNew);
+    assertEquals(3, settings.settingsVersion);
+    assertEquals(7200, settings.cacheDuration);
 
-    assertFeaturesData(settingsData.featuresData, collectAnrs);
+    assertEquals(8, settings.sessionData.maxCustomExceptionEvents);
+    assertEquals(4, settings.sessionData.maxCompleteSessionsCount);
 
-    assertSettingsData(settingsData.sessionData);
+    assertTrue(settings.featureFlagData.collectReports);
+    assertEquals(settings.featureFlagData.collectAnrs, collectAnrs);
+    assertEquals(settings.featureFlagData.collectBuildIds, collectBuildIds);
 
     verify(mockCurrentTimeProvider).getCurrentTimeMillis();
   }
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/TestSettings.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/TestSettings.java
new file mode 100644
index 00000000000..d3858f216d7
--- /dev/null
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/TestSettings.java
@@ -0,0 +1,54 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal.settings;
+
+public class TestSettings extends Settings {
+
+  public TestSettings() {
+    this(2);
+  }
+
+  public TestSettings(int settingsVersion) {
+    this(settingsVersion, 0, 0);
+  }
+
+  public TestSettings(int settingsVersion, int reportUploadVariant, int nativeReportUploadVariant) {
+    this(settingsVersion, reportUploadVariant, nativeReportUploadVariant, false);
+  }
+
+  public TestSettings(
+      int settingsVersion,
+      int reportUploadVariant,
+      int nativeReportUploadVarian,
+      boolean collectBuildIds) {
+    super(
+        5,
+        buildSettingsData(),
+        buildFeatureFlagData(collectBuildIds),
+        settingsVersion,
+        3600,
+        10,
+        1.2,
+        60);
+  }
+
+  private static Settings.FeatureFlagData buildFeatureFlagData(boolean collectBuildIds) {
+    return new Settings.FeatureFlagData(true, false, collectBuildIds);
+  }
+
+  private static Settings.SessionData buildSettingsData() {
+    return new Settings.SessionData(64, 4);
+  }
+}
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/TestSettingsData.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/TestSettingsData.java
deleted file mode 100644
index 9885d4c1eeb..00000000000
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/TestSettingsData.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.crashlytics.internal.settings;
-
-import com.google.firebase.crashlytics.internal.settings.model.AppSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.FeaturesSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SessionSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
-
-public class TestSettingsData extends SettingsData {
-
-  public TestSettingsData() {
-    this(2);
-  }
-
-  public TestSettingsData(int settingsVersion) {
-    this(settingsVersion, 0, 0);
-  }
-
-  public TestSettingsData(
-      int settingsVersion, int reportUploadVariant, int nativeReportUploadVariant) {
-    super(
-        5,
-        buildAppData(reportUploadVariant, nativeReportUploadVariant),
-        buildSettingsData(),
-        buildFeaturesData(),
-        settingsVersion,
-        3600);
-  }
-
-  private static FeaturesSettingsData buildFeaturesData() {
-    return new FeaturesSettingsData(true, false);
-  }
-
-  private static SessionSettingsData buildSettingsData() {
-    return new SessionSettingsData(64, 4);
-  }
-
-  private static AppSettingsData buildAppData(
-      int reportUploadVariant, int nativeReportUploadVariant) {
-    return new AppSettingsData(
-        AppSettingsData.STATUS_ACTIVATED,
-        "http://localhost",
-        "http://localhost",
-        "http://localhost",
-        "testBundleId",
-        "testOrganizationId",
-        false,
-        reportUploadVariant,
-        nativeReportUploadVariant);
-  }
-}
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/stacktrace/TrimmedThrowableDataTest.java b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/stacktrace/TrimmedThrowableDataTest.java
index ee38ca2a6b3..744ae664124 100644
--- a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/stacktrace/TrimmedThrowableDataTest.java
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/stacktrace/TrimmedThrowableDataTest.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.crashlytics.internal.stacktrace;
 
+import static com.google.firebase.crashlytics.internal.stacktrace.TrimmedThrowableData.makeTrimmedThrowableData;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
@@ -53,7 +54,7 @@ public void testStackTraceIsTrimmed() {
     doReturn(mockStackTrace(3)).when(mockException).getStackTrace();
 
     final StackTraceTrimmingStrategy trimmingStrategy = new TruncateStrategy(1);
-    final TrimmedThrowableData t = new TrimmedThrowableData(mockException, trimmingStrategy);
+    final TrimmedThrowableData t = makeTrimmedThrowableData(mockException, trimmingStrategy);
 
     assertEquals(1, t.stacktrace.length);
     assertEquals(mockException.getStackTrace()[0], t.stacktrace[0]);
@@ -65,7 +66,7 @@ public void testCauseStackTraceIsTrimmed() {
     doReturn(mockCause).when(mockException).getCause();
 
     final StackTraceTrimmingStrategy trimmingStrategy = new TruncateStrategy(1);
-    final TrimmedThrowableData t = new TrimmedThrowableData(mockException, trimmingStrategy);
+    final TrimmedThrowableData t = makeTrimmedThrowableData(mockException, trimmingStrategy);
 
     assertEquals(1, t.stacktrace.length);
     assertEquals(mockException.getStackTrace()[0], t.stacktrace[0]);
@@ -78,7 +79,7 @@ public void testStackTraceIsNotModifiedIfSmallEnough() {
     doReturn(mockStackTrace(3)).when(mockException).getStackTrace();
 
     final StackTraceTrimmingStrategy trimmingStrategy = new TruncateStrategy(5);
-    final TrimmedThrowableData t = new TrimmedThrowableData(mockException, trimmingStrategy);
+    final TrimmedThrowableData t = makeTrimmedThrowableData(mockException, trimmingStrategy);
 
     assertEquals(3, t.stacktrace.length);
     assertTrue(Arrays.equals(mockException.getStackTrace(), t.stacktrace));
@@ -90,7 +91,7 @@ public void testCauseStackTraceIsNotModifiedIfSmallEnough() {
     doReturn(mockCause).when(mockException).getCause();
 
     final StackTraceTrimmingStrategy trimmingStrategy = new TruncateStrategy(5);
-    final TrimmedThrowableData t = new TrimmedThrowableData(mockException, trimmingStrategy);
+    final TrimmedThrowableData t = makeTrimmedThrowableData(mockException, trimmingStrategy);
 
     assertEquals(3, t.stacktrace.length);
     assertTrue(Arrays.equals(mockException.getStackTrace(), t.stacktrace));
@@ -105,7 +106,7 @@ public void testOnlyCauseStackTraceIsTrimmed() {
     doReturn(mockCause).when(mockException).getCause();
 
     final StackTraceTrimmingStrategy trimmingStrategy = new TruncateStrategy(4);
-    final TrimmedThrowableData t = new TrimmedThrowableData(mockException, trimmingStrategy);
+    final TrimmedThrowableData t = makeTrimmedThrowableData(mockException, trimmingStrategy);
 
     assertEquals(3, t.stacktrace.length);
     assertTrue(Arrays.equals(mockException.getStackTrace(), t.stacktrace));
diff --git a/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/ktx/CrashlyticsTests.kt b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/ktx/CrashlyticsTests.kt
new file mode 100644
index 00000000000..8015b7c3a91
--- /dev/null
+++ b/firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/ktx/CrashlyticsTests.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class CrashlyticsTests {
+  @Before
+  fun setUp() {
+    @Suppress("DEPRECATION")
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId(PROJECT_ID)
+        .build(),
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+
+  @Test
+  fun firebaseCrashlyticsDelegates() {
+    assertThat(Firebase.crashlytics).isSameInstanceAs(FirebaseCrashlytics.getInstance())
+  }
+
+  @Test
+  fun libraryRegistrationAtRuntime() {
+    Firebase.app.get(UserAgentPublisher::class.java)
+  }
+
+  companion object {
+    private const val APP_ID = "1:1:android:1a"
+    private const val API_KEY = "API-KEY-API-KEY-API-KEY-API-KEY-API-KEY"
+    private const val PROJECT_ID = "PROJECT-ID"
+  }
+}
diff --git a/firebase-crashlytics/src/main/AndroidManifest.xml b/firebase-crashlytics/src/main/AndroidManifest.xml
index 60c5602ce0b..1c760ea7c55 100644
--- a/firebase-crashlytics/src/main/AndroidManifest.xml
+++ b/firebase-crashlytics/src/main/AndroidManifest.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.crashlytics" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 
     <application>
-        <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
+        <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.crashlytics.FirebaseCrashlyticsKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.crashlytics.CrashlyticsRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java
index 49b2391f94e..e5a4886597d 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java
@@ -24,23 +24,35 @@
 import com.google.firebase.inject.Deferred;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
+import com.google.firebase.remoteconfig.interop.FirebaseRemoteConfigInterop;
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
+import com.google.firebase.sessions.api.SessionSubscriber;
 import java.util.Arrays;
 import java.util.List;
 
 /** @hide */
 public class CrashlyticsRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-cls";
+
+  static {
+    // Add Crashlytics as a dependency of Sessions when this class is loaded into memory.
+    FirebaseSessionsDependencies.addDependency(SessionSubscriber.Name.CRASHLYTICS);
+  }
+
   @Override
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(FirebaseCrashlytics.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(FirebaseInstallationsApi.class))
             .add(Dependency.deferred(CrashlyticsNativeComponent.class))
             .add(Dependency.deferred(AnalyticsConnector.class))
+            .add(Dependency.deferred(FirebaseRemoteConfigInterop.class))
             .factory(this::buildCrashlytics)
             .eagerInDefaultApp()
             .build(),
-        LibraryVersionComponent.create("fire-cls", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 
   private FirebaseCrashlytics buildCrashlytics(ComponentContainer container) {
@@ -54,7 +66,10 @@ private FirebaseCrashlytics buildCrashlytics(ComponentContainer container) {
 
     FirebaseInstallationsApi firebaseInstallations = container.get(FirebaseInstallationsApi.class);
 
+    Deferred<FirebaseRemoteConfigInterop> remoteConfigInterop =
+        container.getDeferred(FirebaseRemoteConfigInterop.class);
+
     return FirebaseCrashlytics.init(
-        app, firebaseInstallations, nativeComponent, analyticsConnector);
+        app, firebaseInstallations, nativeComponent, analyticsConnector, remoteConfigInterop);
   }
 }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java
index e21237a3894..022ef53226b 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java
@@ -28,8 +28,11 @@
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponentDeferredProxy;
 import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
 import com.google.firebase.crashlytics.internal.Logger;
+import com.google.firebase.crashlytics.internal.RemoteConfigDeferredProxy;
 import com.google.firebase.crashlytics.internal.common.AppData;
+import com.google.firebase.crashlytics.internal.common.BuildIdInfo;
 import com.google.firebase.crashlytics.internal.common.CommonUtils;
+import com.google.firebase.crashlytics.internal.common.CrashlyticsAppQualitySessionsSubscriber;
 import com.google.firebase.crashlytics.internal.common.CrashlyticsCore;
 import com.google.firebase.crashlytics.internal.common.DataCollectionArbiter;
 import com.google.firebase.crashlytics.internal.common.ExecutorUtils;
@@ -39,6 +42,9 @@
 import com.google.firebase.crashlytics.internal.settings.SettingsController;
 import com.google.firebase.inject.Deferred;
 import com.google.firebase.installations.FirebaseInstallationsApi;
+import com.google.firebase.remoteconfig.interop.FirebaseRemoteConfigInterop;
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
+import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 
@@ -61,7 +67,8 @@ public class FirebaseCrashlytics {
       @NonNull FirebaseApp app,
       @NonNull FirebaseInstallationsApi firebaseInstallationsApi,
       @NonNull Deferred<CrashlyticsNativeComponent> nativeComponent,
-      @NonNull Deferred<AnalyticsConnector> analyticsConnector) {
+      @NonNull Deferred<AnalyticsConnector> analyticsConnector,
+      @NonNull Deferred<FirebaseRemoteConfigInterop> remoteConfigInteropDeferred) {
 
     Context context = app.getApplicationContext();
     final String appIdentifier = context.getPackageName();
@@ -86,6 +93,13 @@ public class FirebaseCrashlytics {
     final ExecutorService crashHandlerExecutor =
         ExecutorUtils.buildSingleThreadExecutorService("Crashlytics Exception Handler");
 
+    CrashlyticsAppQualitySessionsSubscriber sessionsSubscriber =
+        new CrashlyticsAppQualitySessionsSubscriber(arbiter, fileStore);
+    FirebaseSessionsDependencies.register(sessionsSubscriber);
+
+    RemoteConfigDeferredProxy remoteConfigDeferredProxy =
+        new RemoteConfigDeferredProxy(remoteConfigInteropDeferred);
+
     final CrashlyticsCore core =
         new CrashlyticsCore(
             app,
@@ -95,13 +109,24 @@ public class FirebaseCrashlytics {
             analyticsDeferredProxy.getDeferredBreadcrumbSource(),
             analyticsDeferredProxy.getAnalyticsEventLogger(),
             fileStore,
-            crashHandlerExecutor);
+            crashHandlerExecutor,
+            sessionsSubscriber,
+            remoteConfigDeferredProxy);
 
     final String googleAppId = app.getOptions().getApplicationId();
     final String mappingFileId = CommonUtils.getMappingFileId(context);
+    final List<BuildIdInfo> buildIdInfoList = CommonUtils.getBuildIdInfo(context);
 
     Logger.getLogger().d("Mapping file ID is: " + mappingFileId);
 
+    for (BuildIdInfo buildIdInfo : buildIdInfoList) {
+      Logger.getLogger()
+          .d(
+              String.format(
+                  "Build id for %s on %s: %s",
+                  buildIdInfo.getLibraryName(), buildIdInfo.getArch(), buildIdInfo.getBuildId()));
+    }
+
     final DevelopmentPlatformProvider developmentPlatformProvider =
         new DevelopmentPlatformProvider(context);
 
@@ -109,7 +134,12 @@ public class FirebaseCrashlytics {
     try {
       appData =
           AppData.create(
-              context, idManager, googleAppId, mappingFileId, developmentPlatformProvider);
+              context,
+              idManager,
+              googleAppId,
+              mappingFileId,
+              buildIdInfoList,
+              developmentPlatformProvider);
     } catch (PackageManager.NameNotFoundException e) {
       Logger.getLogger().e("Error retrieving app package info.", e);
       return null;
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.kt b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.kt
new file mode 100644
index 00000000000..8ef2a5cf277
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics
+
+import androidx.annotation.Keep
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+
+/** Returns the [FirebaseCrashlytics] instance of the default [FirebaseApp]. */
+val Firebase.crashlytics: FirebaseCrashlytics
+  get() = FirebaseCrashlytics.getInstance()
+
+/** Associates all key-value parameters with the reports */
+fun FirebaseCrashlytics.setCustomKeys(init: KeyValueBuilder.() -> Unit) {
+  val builder = KeyValueBuilder(this)
+  builder.init()
+}
+
+/** @suppress */
+@Keep
+internal class FirebaseCrashlyticsKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+
+  companion object {}
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/KeyValueBuilder.kt b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/KeyValueBuilder.kt
new file mode 100644
index 00000000000..eafd968f1f5
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/KeyValueBuilder.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics
+
+/** Helper class to enable fluent syntax in [setCustomKeys] */
+class KeyValueBuilder(private val crashlytics: FirebaseCrashlytics) {
+
+  /** Sets a custom key and value that are associated with reports. */
+  fun key(key: String, value: Boolean) = crashlytics.setCustomKey(key, value)
+
+  /** Sets a custom key and value that are associated with reports. */
+  fun key(key: String, value: Double) = crashlytics.setCustomKey(key, value)
+
+  /** Sets a custom key and value that are associated with reports. */
+  fun key(key: String, value: Float) = crashlytics.setCustomKey(key, value)
+
+  /** Sets a custom key and value that are associated with reports. */
+  fun key(key: String, value: Int) = crashlytics.setCustomKey(key, value)
+
+  /** Sets a custom key and value that are associated with reports. */
+  fun key(key: String, value: Long) = crashlytics.setCustomKey(key, value)
+
+  /** Sets a custom key and value that are associated with reports. */
+  fun key(key: String, value: String) = crashlytics.setCustomKey(key, value)
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/CrashlyticsNativeComponentDeferredProxy.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/CrashlyticsNativeComponentDeferredProxy.java
index aa11d557c0b..a36b2c850e2 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/CrashlyticsNativeComponentDeferredProxy.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/CrashlyticsNativeComponentDeferredProxy.java
@@ -15,6 +15,7 @@
 package com.google.firebase.crashlytics.internal;
 
 import androidx.annotation.NonNull;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.model.StaticSessionData;
 import com.google.firebase.inject.Deferred;
 import java.io.File;
@@ -85,6 +86,11 @@ public File getMinidumpFile() {
       return null;
     }
 
+    @Override
+    public CrashlyticsReport.ApplicationExitInfo getApplicationExitInto() {
+      return null;
+    }
+
     @Override
     public File getBinaryImagesFile() {
       return null;
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/CrashlyticsRemoteConfigListener.kt b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/CrashlyticsRemoteConfigListener.kt
new file mode 100644
index 00000000000..40ca993c893
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/CrashlyticsRemoteConfigListener.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics.internal
+
+import com.google.firebase.crashlytics.internal.metadata.RolloutAssignment
+import com.google.firebase.crashlytics.internal.metadata.UserMetadata
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutsState
+import com.google.firebase.remoteconfig.interop.rollouts.RolloutsStateSubscriber
+
+class CrashlyticsRemoteConfigListener(private val userMetadata: UserMetadata) :
+  RolloutsStateSubscriber {
+  override fun onRolloutsStateChanged(rolloutsState: RolloutsState) {
+    userMetadata.updateRolloutsState(
+      rolloutsState.rolloutAssignments.map { it ->
+        RolloutAssignment.create(
+          it.rolloutId,
+          it.parameterKey,
+          it.parameterValue,
+          it.variantId,
+          it.templateVersion
+        )
+      }
+    )
+    Logger.getLogger().d("Updated Crashlytics Rollout State")
+  }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/DevelopmentPlatformProvider.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/DevelopmentPlatformProvider.java
index f44e871af7d..c6d25e8e1ed 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/DevelopmentPlatformProvider.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/DevelopmentPlatformProvider.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import androidx.annotation.Nullable;
 import java.io.IOException;
+import java.io.InputStream;
 
 /** Provider for the development platform info. */
 public class DevelopmentPlatformProvider {
@@ -26,7 +27,7 @@ public class DevelopmentPlatformProvider {
   private static final String FLUTTER_PLATFORM = "Flutter";
 
   private static final String UNITY_VERSION_FIELD = "com.google.firebase.crashlytics.unity_version";
-  private static final String FLUTTER_ASSETS_PATH = "flutter_assets";
+  private static final String FLUTTER_ASSET_FILE = "flutter_assets/NOTICES.Z";
 
   private final Context context;
   @Nullable private DevelopmentPlatform developmentPlatform;
@@ -66,14 +67,13 @@ public static boolean isUnity(Context context) {
     return getResourcesIdentifier(context, UNITY_VERSION_FIELD, "string") != 0;
   }
 
-  /** Quickly and safely check if the given asset path exists. */
-  private boolean assetPathExists(String path) {
-    try {
-      if (context.getAssets() == null) {
-        return false;
-      }
-      String[] list = context.getAssets().list(path);
-      return list != null && list.length > 0;
+  /** Quickly and safely check if the given asset file exists. */
+  private boolean assetFileExists(String file) {
+    if (context.getAssets() == null) {
+      return false;
+    }
+    try (InputStream ignored = context.getAssets().open(file)) {
+      return true;
     } catch (IOException ex) {
       return false;
     }
@@ -101,7 +101,7 @@ private DevelopmentPlatform() {
       }
 
       // Flutter
-      if (assetPathExists(FLUTTER_ASSETS_PATH)) {
+      if (assetFileExists(FLUTTER_ASSET_FILE)) {
         developmentPlatform = FLUTTER_PLATFORM;
         // TODO: Get the version when available - https://github.com/flutter/flutter/issues/92681
         developmentPlatformVersion = null;
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/NativeSessionFileProvider.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/NativeSessionFileProvider.java
index 8860d83d2bb..843546f4918 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/NativeSessionFileProvider.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/NativeSessionFileProvider.java
@@ -15,6 +15,7 @@
 package com.google.firebase.crashlytics.internal;
 
 import androidx.annotation.Nullable;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import java.io.File;
 
 /** Provides references to the files that make up a native crash report. */
@@ -25,6 +26,9 @@ public interface NativeSessionFileProvider {
   @Nullable
   File getMinidumpFile();
 
+  @Nullable
+  CrashlyticsReport.ApplicationExitInfo getApplicationExitInto();
+
   @Nullable
   File getBinaryImagesFile();
 
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/ProcessDetailsProvider.kt b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/ProcessDetailsProvider.kt
new file mode 100644
index 00000000000..49fd2fafd18
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/ProcessDetailsProvider.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics.internal
+
+import android.app.ActivityManager
+import android.app.Application
+import android.content.Context
+import android.os.Build
+import android.os.Process
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.ProcessDetails
+
+/**
+ * Provider of ProcessDetails.
+ *
+ * @hide
+ */
+internal object ProcessDetailsProvider {
+  /** Gets the details for all of this app's running processes. */
+  fun getAppProcessDetails(context: Context): List<ProcessDetails> {
+    val appUid = context.applicationInfo.uid
+    val defaultProcessName = context.applicationInfo.processName
+    val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as? ActivityManager
+    val runningAppProcesses = activityManager?.runningAppProcesses ?: listOf()
+
+    return runningAppProcesses
+      .filterNotNull()
+      .filter {
+        // Only collect process info for this app's processes.
+        it.uid == appUid
+      }
+      .map { runningAppProcessInfo ->
+        ProcessDetails.builder()
+          .setProcessName(runningAppProcessInfo.processName)
+          .setPid(runningAppProcessInfo.pid)
+          .setImportance(runningAppProcessInfo.importance)
+          .setDefaultProcess(runningAppProcessInfo.processName == defaultProcessName)
+          .build()
+      }
+  }
+
+  /**
+   * Gets this app's current process details.
+   *
+   * If the current process details are not found for whatever reason, returns process details with
+   * just the current process name and pid set.
+   */
+  fun getCurrentProcessDetails(context: Context): ProcessDetails {
+    val pid = Process.myPid()
+    return getAppProcessDetails(context).find { it.pid == pid }
+      ?: buildProcessDetails(getProcessName(), pid)
+  }
+
+  /** Builds a ProcessDetails object. */
+  @JvmOverloads
+  fun buildProcessDetails(
+    processName: String,
+    pid: Int = 0,
+    importance: Int = 0,
+    isDefaultProcess: Boolean = false
+  ) =
+    ProcessDetails.builder()
+      .setProcessName(processName)
+      .setPid(pid)
+      .setImportance(importance)
+      .setDefaultProcess(isDefaultProcess)
+      .build()
+
+  /** Gets the app's current process name. If the API is not available, returns an empty string. */
+  private fun getProcessName(): String =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      Process.myProcessName()
+    } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      Application.getProcessName() ?: ""
+    } else {
+      ""
+    }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/RemoteConfigDeferredProxy.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/RemoteConfigDeferredProxy.java
new file mode 100644
index 00000000000..30d74b396a1
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/RemoteConfigDeferredProxy.java
@@ -0,0 +1,42 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal;
+
+import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
+import com.google.firebase.inject.Deferred;
+import com.google.firebase.remoteconfig.interop.FirebaseRemoteConfigInterop;
+
+public class RemoteConfigDeferredProxy {
+  private final Deferred<FirebaseRemoteConfigInterop> remoteConfigInteropDeferred;
+
+  public RemoteConfigDeferredProxy(
+      Deferred<FirebaseRemoteConfigInterop> remoteConfigInteropDeferred) {
+    this.remoteConfigInteropDeferred = remoteConfigInteropDeferred;
+  }
+
+  public void setupListener(UserMetadata metadata) {
+    if (metadata == null) {
+      Logger.getLogger().w("Didn't successfully register with UserMetadata for rollouts listener");
+      return;
+    }
+    CrashlyticsRemoteConfigListener listener = new CrashlyticsRemoteConfigListener(metadata);
+    remoteConfigInteropDeferred.whenAvailable(
+        remoteConfigInteropProvider -> {
+          FirebaseRemoteConfigInterop interop = remoteConfigInteropProvider.get();
+          interop.registerRolloutsStateSubscriber("firebase", listener);
+          Logger.getLogger().d("Registering RemoteConfig Rollouts subscriber");
+        });
+  }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/AppData.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/AppData.java
index c1070982da5..ce1dd1281ff 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/AppData.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/AppData.java
@@ -17,12 +17,15 @@
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
+import java.util.List;
 
 /** Carries static information about the app. */
 public class AppData {
   public final String googleAppId;
   public final String buildId;
+  public final List<BuildIdInfo> buildIdInfoList;
 
   public final String installerPackageName;
 
@@ -37,19 +40,21 @@ public static AppData create(
       IdManager idManager,
       String googleAppId,
       String buildId,
+      List<BuildIdInfo> buildIdInfoList,
       DevelopmentPlatformProvider developmentPlatformProvider)
       throws PackageManager.NameNotFoundException {
     final String packageName = context.getPackageName();
     final String installerPackageName = idManager.getInstallerPackageName();
     final PackageManager packageManager = context.getPackageManager();
     final PackageInfo packageInfo = packageManager.getPackageInfo(packageName, 0);
-    final String versionCode = Integer.toString(packageInfo.versionCode);
+    final String versionCode = getAppBuildVersion(packageInfo);
     final String versionName =
         packageInfo.versionName == null ? IdManager.DEFAULT_VERSION_NAME : packageInfo.versionName;
 
     return new AppData(
         googleAppId,
         buildId,
+        buildIdInfoList,
         installerPackageName,
         packageName,
         versionCode,
@@ -57,9 +62,19 @@ public static AppData create(
         developmentPlatformProvider);
   }
 
+  @SuppressWarnings("DEPRECATION")
+  private static String getAppBuildVersion(PackageInfo packageInfo) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      return Long.toString(packageInfo.getLongVersionCode());
+    } else {
+      return Integer.toString(packageInfo.versionCode);
+    }
+  }
+
   public AppData(
       String googleAppId,
       String buildId,
+      List<BuildIdInfo> buildIdInfoList,
       String installerPackageName,
       String packageName,
       String versionCode,
@@ -67,6 +82,7 @@ public AppData(
       DevelopmentPlatformProvider developmentPlatformProvider) {
     this.googleAppId = googleAppId;
     this.buildId = buildId;
+    this.buildIdInfoList = buildIdInfoList;
     this.installerPackageName = installerPackageName;
     this.packageName = packageName;
     this.versionCode = versionCode;
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/BuildIdInfo.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/BuildIdInfo.java
new file mode 100644
index 00000000000..dd18c21101c
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/BuildIdInfo.java
@@ -0,0 +1,45 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal.common;
+
+/** Information about a particular build id which represents a single .so within the project. */
+public class BuildIdInfo {
+  private final String libraryName;
+  private final String arch;
+  private final String buildId;
+
+  /**
+   * @param libraryName The file name of the .so file
+   * @param arch the architecture for which the .so was built
+   * @param buildId the build id of the .so file as found in the ELF header section
+   */
+  public BuildIdInfo(String libraryName, String arch, String buildId) {
+    this.libraryName = libraryName;
+    this.arch = arch;
+    this.buildId = buildId;
+  }
+
+  public String getLibraryName() {
+    return libraryName;
+  }
+
+  public String getArch() {
+    return arch;
+  }
+
+  public String getBuildId() {
+    return buildId;
+  }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CLSUUID.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CLSUUID.java
index b3732075f21..ad0f5978522 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CLSUUID.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CLSUUID.java
@@ -40,10 +40,9 @@ class CLSUUID {
     this.populateSequenceNumber(bytes);
     this.populatePID(bytes);
 
-    // appInstallationUUID may be empty but is guaranteed not to be null.
     // sha1 it to ensure the string is long enough, has only valid hex characters, and to
     // increase entropy.
-    final String idSha = CommonUtils.sha1(idManager.getCrashlyticsInstallId());
+    final String idSha = CommonUtils.sha1(idManager.getInstallIds().getCrashlyticsInstallId());
     final String timeSeqPid = CommonUtils.hexify(bytes);
 
     _clsId =
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java
index f1254b6f71a..33369524b2c 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java
@@ -30,14 +30,11 @@
 import android.os.Build;
 import android.os.Debug;
 import android.os.StatFs;
-import android.provider.Settings.Secure;
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import com.google.firebase.crashlytics.internal.Logger;
-import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.MessageDigest;
@@ -48,7 +45,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 public class CommonUtils {
 
@@ -67,15 +63,12 @@ public class CommonUtils {
   static final String MAPPING_FILE_ID_RESOURCE_NAME =
       "com.google.firebase.crashlytics.mapping_file_id";
   static final String LEGACY_MAPPING_FILE_ID_RESOURCE_NAME = "com.crashlytics.android.build_id";
-
-  private static final long UNCALCULATED_TOTAL_RAM = -1;
-  static final int BYTES_IN_A_GIGABYTE = 1073741824;
-  static final int BYTES_IN_A_MEGABYTE = 1048576;
-  static final int BYTES_IN_A_KILOBYTE = 1024;
-
-  // Caches the result of the total ram calculation, which is expensive, so we only want to
-  // perform it once. The value won't change over time, so it's safe to cache.
-  private static long totalRamInBytes = UNCALCULATED_TOTAL_RAM;
+  static final String BUILD_IDS_LIB_NAMES_RESOURCE_NAME =
+      "com.google.firebase.crashlytics.build_ids_lib";
+  static final String BUILD_IDS_ARCH_RESOURCE_NAME =
+      "com.google.firebase.crashlytics.build_ids_arch";
+  static final String BUILD_IDS_BUILD_ID_RESOURCE_NAME =
+      "com.google.firebase.crashlytics.build_ids_build_id";
 
   // TODO: Maybe move this method into a more appropriate class.
   public static SharedPreferences getSharedPrefs(Context context) {
@@ -87,37 +80,6 @@ public static SharedPreferences getLegacySharedPrefs(Context context) {
     return context.getSharedPreferences(LEGACY_SHARED_PREFS_NAME, Context.MODE_PRIVATE);
   }
 
-  /**
-   * Utility method to open the given file and extract the field matching fieldname. Assumes each
-   * line of the file is formatted "fieldID:value" with an arbitrary amount of whitespace on both
-   * sides of the colon. Will return null if the file can't be opened or the field was not found.
-   */
-  public static String extractFieldFromSystemFile(File file, String fieldname) {
-    String toReturn = null;
-    if (file.exists()) {
-
-      BufferedReader br = null;
-      try {
-        br = new BufferedReader(new FileReader(file), 1024);
-        String line;
-        while ((line = br.readLine()) != null) {
-          final Pattern pattern = Pattern.compile("\\s*:\\s*");
-          final String[] pieces = pattern.split(line, 2);
-          if (pieces.length > 1 && pieces[0].equals(fieldname)) {
-            toReturn = pieces[1];
-
-            break;
-          }
-        }
-      } catch (Exception e) {
-        Logger.getLogger().e("Error parsing " + file, e);
-      } finally {
-        CommonUtils.closeOrLog(br, "Failed to close system file reader.");
-      }
-    }
-    return toReturn;
-  }
-
   /**
    * Get Architecture based on Integer order in Protobuf enum
    *
@@ -170,71 +132,6 @@ static Architecture getValue() {
     }
   }
 
-  /**
-   * Returns the total ram of the device, in bytes, as read from the /proc/meminfo file. No API call
-   * exists to get this value in API level 7.
-   */
-  public static synchronized long getTotalRamInBytes() {
-    if (totalRamInBytes == UNCALCULATED_TOTAL_RAM) {
-      long bytes = 0;
-      String result = extractFieldFromSystemFile(new File("/proc/meminfo"), "MemTotal");
-
-      if (!TextUtils.isEmpty(result)) {
-        result = result.toUpperCase(Locale.US);
-
-        try {
-          if (result.endsWith("KB")) {
-            bytes = convertMemInfoToBytes(result, "KB", BYTES_IN_A_KILOBYTE);
-          } else if (result.endsWith("MB")) {
-            // It is uncertain that this notation would ever be returned, but we'll
-            // leave in this handling since we don't know for certain it isn't.
-            bytes = convertMemInfoToBytes(result, "MB", BYTES_IN_A_MEGABYTE);
-          } else if (result.endsWith("GB")) {
-            // It is uncertain that this notation would ever be returned, but we'll
-            // leave in this handling since we don't know for certain it isn't.
-            bytes = convertMemInfoToBytes(result, "GB", BYTES_IN_A_GIGABYTE);
-          } else {
-            Logger.getLogger().w("Unexpected meminfo format while computing RAM: " + result);
-          }
-        } catch (NumberFormatException e) {
-          Logger.getLogger().e("Unexpected meminfo format while computing RAM: " + result, e);
-        }
-      }
-      totalRamInBytes = bytes;
-    }
-    return totalRamInBytes;
-  }
-
-  /**
-   * Converts a meminfo value String with associated size notation into bytes by stripping the
-   * provided unit notation and applying the provided multiplier.
-   */
-  static long convertMemInfoToBytes(String memInfo, String notation, int notationMultiplier) {
-    return Long.parseLong(memInfo.split(notation)[0].trim()) * notationMultiplier;
-  }
-
-  /**
-   * Returns the RunningAppProcessInfo object for the given package, or null if it cannot be found.
-   */
-  public static ActivityManager.RunningAppProcessInfo getAppProcessInfo(
-      String packageName, Context context) {
-    final ActivityManager actman =
-        (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-    final List<ActivityManager.RunningAppProcessInfo> processes = actman.getRunningAppProcesses();
-    ActivityManager.RunningAppProcessInfo procInfo = null;
-    // According to docs, the result of getRunningAppProcesses can be null instead of empty.
-    // Yay.
-    if (processes != null) {
-      for (ActivityManager.RunningAppProcessInfo info : processes) {
-        if (info.processName.equals(packageName)) {
-          procInfo = info;
-          break;
-        }
-      }
-    }
-    return procInfo;
-  }
-
   public static String streamToString(InputStream is) {
     // Previous code was running into this: http://code.google.com/p/android/issues/detail?id=14562
     // on Android 2.3.3. The below code below does not exhibit that problem.
@@ -306,6 +203,13 @@ public static String createInstanceIdFrom(String... sliceIds) {
     return (concatValue.length() > 0) ? sha1(concatValue) : null;
   }
 
+  /** Calculates the total ram of the device, in bytes. */
+  public static synchronized long calculateTotalRamInBytes(Context context) {
+    MemoryInfo mi = new MemoryInfo();
+    ((ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE)).getMemoryInfo(mi);
+    return mi.totalMem;
+  }
+
   /**
    * Calculates and returns the amount of free RAM in bytes.
    *
@@ -333,7 +237,7 @@ public static long calculateUsedDiskSpaceInBytes(String path) {
   }
 
   public static boolean getProximitySensorEnabled(Context context) {
-    if (isEmulator(context)) {
+    if (isEmulator()) {
       // For whatever reason, accessing the sensor manager locks up the emulator. Just return
       // false since it's doesn't really have one anyway.
       return false;
@@ -400,15 +304,14 @@ public static int getResourcesIdentifier(Context context, String key, String res
    *
    * @return boolean value indicating that we are or are not running in an emulator.
    */
-  public static boolean isEmulator(Context context) {
-    final String androidId = Secure.getString(context.getContentResolver(), Secure.ANDROID_ID);
+  public static boolean isEmulator() {
+    // TODO(mrober): Consider other heuristics to decide if we are running on an Android emulator.
     return Build.PRODUCT.contains(SDK)
         || Build.HARDWARE.contains(GOLDFISH)
-        || Build.HARDWARE.contains(RANCHU)
-        || androidId == null;
+        || Build.HARDWARE.contains(RANCHU);
   }
 
-  public static boolean isRooted(Context context) {
+  public static boolean isRooted() {
     // No reliable way to determine if an android phone is rooted, since a rooted phone could
     // always disguise itself as non-rooted. Some common approaches can be found on SO:
     //   http://stackoverflow.com/questions/1101380/determine-if-running-on-a-rooted-device
@@ -416,7 +319,7 @@ public static boolean isRooted(Context context) {
     // http://stackoverflow.com/questions/3576989/how-can-you-detect-if-the-device-is-rooted-in-the-app
     //
     // http://stackoverflow.com/questions/7727021/how-can-androids-copy-protection-check-if-the-device-is-rooted
-    final boolean isEmulator = isEmulator(context);
+    final boolean isEmulator = isEmulator();
     final String buildTags = Build.TAGS;
     if (!isEmulator && buildTags != null && buildTags.contains("test-keys")) {
       return true;
@@ -451,13 +354,13 @@ public static boolean isDebuggerAttached() {
   public static final int DEVICE_STATE_VENDORINTERNAL = 1 << 4;
   public static final int DEVICE_STATE_COMPROMISEDLIBRARIES = 1 << 5;
 
-  public static int getDeviceState(Context context) {
+  public static int getDeviceState() {
     int deviceState = 0;
-    if (CommonUtils.isEmulator(context)) {
+    if (CommonUtils.isEmulator()) {
       deviceState |= DEVICE_STATE_ISSIMULATOR;
     }
 
-    if (CommonUtils.isRooted(context)) {
+    if (CommonUtils.isRooted()) {
       deviceState |= DEVICE_STATE_JAILBROKEN;
     }
 
@@ -488,25 +391,6 @@ public static boolean isAppDebuggable(Context context) {
     return (context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
   }
 
-  /**
-   * Gets values for string properties in the strings.xml file by its name. If a key is not present,
-   * an empty String is returned.
-   *
-   * @param context {@link Context} to use when accessing resources
-   * @param key {@link String} name of the string value to look up
-   * @return {@link String} value of the specified property, or an empty string if it could not be
-   *     found.
-   */
-  public static String getStringsFileValue(Context context, String key) {
-    final int id = getResourcesIdentifier(context, key, "string");
-
-    if (id > 0) {
-      return context.getString(id);
-    }
-
-    return "";
-  }
-
   /**
    * Closes a {@link Closeable}, ignoring any {@link IOException}s raised in the process. Does
    * nothing if the {@link Closeable} is <code>null</code>.
@@ -599,6 +483,44 @@ public static String getMappingFileId(Context context) {
     return mappingFileId;
   }
 
+  public static List<BuildIdInfo> getBuildIdInfo(Context context) {
+    // TODO: This functionality should be refactored into an InstanceIdProvider class or similar.
+    List<BuildIdInfo> buildIdInfoList = new ArrayList<>();
+    String[] libNames;
+    String[] arch;
+    String[] buildIds;
+    int libId =
+        CommonUtils.getResourcesIdentifier(context, BUILD_IDS_LIB_NAMES_RESOURCE_NAME, "array");
+    int archId = CommonUtils.getResourcesIdentifier(context, BUILD_IDS_ARCH_RESOURCE_NAME, "array");
+    int buildId =
+        CommonUtils.getResourcesIdentifier(context, BUILD_IDS_BUILD_ID_RESOURCE_NAME, "array");
+
+    if (libId == 0 || archId == 0 || buildId == 0) {
+      Logger.getLogger()
+          .d(String.format("Could not find resources: %d %d %d", libId, archId, buildId));
+      return buildIdInfoList;
+    }
+
+    libNames = context.getResources().getStringArray(libId);
+    arch = context.getResources().getStringArray(archId);
+    buildIds = context.getResources().getStringArray(buildId);
+
+    if (libNames.length != buildIds.length || arch.length != buildIds.length) {
+      Logger.getLogger()
+          .d(
+              String.format(
+                  "Lengths did not match: %d %d %d",
+                  libNames.length, arch.length, buildIds.length));
+      return buildIdInfoList;
+    }
+
+    for (int i = 0; i < buildIds.length; i++) {
+      buildIdInfoList.add(new BuildIdInfo(libNames[i], arch[i], buildIds[i]));
+    }
+
+    return buildIdInfoList;
+  }
+
   public static void closeQuietly(Closeable closeable) {
     if (closeable != null) {
       try {
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsAppQualitySessionsStore.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsAppQualitySessionsStore.java
new file mode 100644
index 00000000000..5b3fc8789c9
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsAppQualitySessionsStore.java
@@ -0,0 +1,112 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal.common;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import com.google.firebase.crashlytics.internal.Logger;
+import com.google.firebase.crashlytics.internal.persistence.FileStore;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Handles persistence of App Quality Sessions session id for Crashlytics, keeps track of the
+ * appQualitySessionId and the Crashlytics sessionId, which are different.
+ *
+ * <p>All public methods are intended to be called from background threads.
+ */
+class CrashlyticsAppQualitySessionsStore {
+  private static final String AQS_SESSION_ID_FILENAME_PREFIX = "aqs.";
+
+  private static final FilenameFilter AQS_SESSION_ID_FILE_FILTER =
+      (dir, name) -> name.startsWith(AQS_SESSION_ID_FILENAME_PREFIX);
+
+  private static final Comparator<File> FILE_RECENCY_COMPARATOR =
+      (file1, file2) -> Long.compare(file2.lastModified(), file1.lastModified());
+
+  private final FileStore fileStore;
+
+  @Nullable private String sessionId = null;
+  @Nullable private String appQualitySessionId = null;
+
+  /** TODO(mrober): Document why public methods are synchronized. */
+  CrashlyticsAppQualitySessionsStore(FileStore fileStore) {
+    this.fileStore = fileStore;
+  }
+
+  /** Gets the App Quality Sessions session id for the given Crashlytics session id. */
+  @Nullable
+  public synchronized String getAppQualitySessionId(@NonNull String sessionId) {
+    if (Objects.equals(this.sessionId, sessionId)) {
+      return this.appQualitySessionId;
+    }
+
+    return readAqsSessionIdFile(fileStore, sessionId);
+  }
+
+  /** Rotates the App Quality Sessions session id. */
+  public synchronized void rotateAppQualitySessionId(@NonNull String newAppQualitySessionId) {
+    if (!Objects.equals(this.appQualitySessionId, newAppQualitySessionId)) {
+      persist(fileStore, this.sessionId, newAppQualitySessionId);
+      this.appQualitySessionId = newAppQualitySessionId;
+    }
+  }
+
+  /** Rotates the Crashlytics session id, null means the session was closed. */
+  public synchronized void rotateSessionId(@Nullable String newSessionId) {
+    if (!Objects.equals(this.sessionId, newSessionId)) {
+      persist(fileStore, newSessionId, this.appQualitySessionId);
+      this.sessionId = newSessionId;
+    }
+  }
+
+  /** Persists the given session ids to disk, only if they are all non-null. */
+  private static void persist(
+      FileStore fileStore, @Nullable String sessionId, @Nullable String appQualitySessionId) {
+    if (sessionId != null && appQualitySessionId != null) {
+      try {
+        // Instead of storing the AQS session id in the file's contents, write the id as part of
+        // the file name. In all circumstances a file needs to necessarily be created. By writing
+        // the id in the file name, an IO operation of writing the id into the contents of the file
+        // is eliminated. Profiling shows this is an order of magnitude more performant.
+
+        //noinspection ResultOfMethodCallIgnored Noop if the file already exists.
+        fileStore
+            .getSessionFile(sessionId, AQS_SESSION_ID_FILENAME_PREFIX + appQualitySessionId)
+            .createNewFile();
+      } catch (IOException ex) {
+        Logger.getLogger().w("Failed to persist App Quality Sessions session id.", ex);
+      }
+    }
+  }
+
+  @VisibleForTesting
+  @Nullable
+  static String readAqsSessionIdFile(FileStore fileStore, @NonNull String sessionId) {
+    List<File> aqsFiles = fileStore.getSessionFiles(sessionId, AQS_SESSION_ID_FILE_FILTER);
+    if (aqsFiles.isEmpty()) {
+      Logger.getLogger().w("Unable to read App Quality Sessions session id.");
+      return null;
+    }
+    File mostRecentAqsFile = Collections.min(aqsFiles, FILE_RECENCY_COMPARATOR);
+    return mostRecentAqsFile.getName().substring(AQS_SESSION_ID_FILENAME_PREFIX.length());
+  }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsAppQualitySessionsSubscriber.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsAppQualitySessionsSubscriber.java
new file mode 100644
index 00000000000..9036971e302
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsAppQualitySessionsSubscriber.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics.internal.common;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.firebase.crashlytics.internal.Logger;
+import com.google.firebase.crashlytics.internal.persistence.FileStore;
+import com.google.firebase.sessions.api.SessionSubscriber;
+
+/**
+ * App Quality Sessions subscriber for Crashlytics to subscribe to and store the
+ * appQualitySessionId, which is different than the Crashlytics sessionId.
+ */
+public class CrashlyticsAppQualitySessionsSubscriber implements SessionSubscriber {
+  private final DataCollectionArbiter dataCollectionArbiter;
+  private final CrashlyticsAppQualitySessionsStore appQualitySessionsStore;
+
+  public CrashlyticsAppQualitySessionsSubscriber(
+      DataCollectionArbiter dataCollectionArbiter, FileStore fileStore) {
+    this.dataCollectionArbiter = dataCollectionArbiter;
+    appQualitySessionsStore = new CrashlyticsAppQualitySessionsStore(fileStore);
+  }
+
+  /** Gets the App Quality Sessions session id for the given Crashlytics session id. */
+  @Nullable
+  public String getAppQualitySessionId(@NonNull String sessionId) {
+    return appQualitySessionsStore.getAppQualitySessionId(sessionId);
+  }
+
+  /** Called when the Crashlytics session id changes or closes. */
+  public void setSessionId(@Nullable String sessionId) {
+    appQualitySessionsStore.rotateSessionId(sessionId);
+  }
+
+  /** Called by the Sessions sdk when the App Quality Sessions session id changes. */
+  @Override
+  public void onSessionChanged(@NonNull SessionDetails sessionDetails) {
+    Logger.getLogger().d("App Quality Sessions session changed: " + sessionDetails);
+    appQualitySessionsStore.rotateAppQualitySessionId(sessionDetails.getSessionId());
+  }
+
+  @Override
+  public boolean isDataCollectionEnabled() {
+    return dataCollectionArbiter.isAutomaticDataCollectionEnabled();
+  }
+
+  @NonNull
+  @Override
+  public SessionSubscriber.Name getSessionSubscriberName() {
+    return SessionSubscriber.Name.CRASHLYTICS;
+  }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java
index 56c9fd5785b..dfaf035624c 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.firebase.crashlytics.internal.common;
 
+import android.annotation.SuppressLint;
 import android.app.ActivityManager;
 import android.app.ApplicationExitInfo;
 import android.content.Context;
@@ -21,6 +22,7 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.StatFs;
+import android.util.Base64;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.SuccessContinuation;
@@ -33,13 +35,16 @@
 import com.google.firebase.crashlytics.internal.analytics.AnalyticsEventLogger;
 import com.google.firebase.crashlytics.internal.metadata.LogFileManager;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.model.StaticSessionData;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
-import com.google.firebase.crashlytics.internal.settings.SettingsDataProvider;
-import com.google.firebase.crashlytics.internal.settings.model.AppSettingsData;
+import com.google.firebase.crashlytics.internal.settings.Settings;
+import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -49,6 +54,7 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 class CrashlyticsController {
@@ -67,6 +73,10 @@ class CrashlyticsController {
 
   private static final String GENERATOR_FORMAT = "Crashlytics Android SDK/%s";
 
+  private static final String VERSION_CONTROL_INFO_KEY = "com.crashlytics.version-control-info";
+  private static final String VERSION_CONTROL_INFO_FILE = "version-control-info.textproto";
+  private static final String META_INF_FOLDER = "META-INF/";
+
   private final Context context;
   private final DataCollectionArbiter dataCollectionArbiter;
   private final CrashlyticsFileMarker crashMarker;
@@ -82,9 +92,11 @@ class CrashlyticsController {
   private final LogFileManager logFileManager;
   private final CrashlyticsNativeComponent nativeComponent;
   private final AnalyticsEventLogger analyticsEventLogger;
+  private final CrashlyticsAppQualitySessionsSubscriber sessionsSubscriber;
   private final SessionReportingCoordinator reportingCoordinator;
 
   private CrashlyticsUncaughtExceptionHandler crashHandler;
+  private SettingsProvider settingsProvider = null;
 
   // A promise that will be resolved when unsent reports are found on the device, and
   // send/deleteUnsentReports can be called to decide how to deal with them.
@@ -114,7 +126,8 @@ class CrashlyticsController {
       LogFileManager logFileManager,
       SessionReportingCoordinator sessionReportingCoordinator,
       CrashlyticsNativeComponent nativeComponent,
-      AnalyticsEventLogger analyticsEventLogger) {
+      AnalyticsEventLogger analyticsEventLogger,
+      CrashlyticsAppQualitySessionsSubscriber sessionsSubscriber) {
     this.context = context;
     this.backgroundWorker = backgroundWorker;
     this.idManager = idManager;
@@ -126,7 +139,7 @@ class CrashlyticsController {
     this.logFileManager = logFileManager;
     this.nativeComponent = nativeComponent;
     this.analyticsEventLogger = analyticsEventLogger;
-
+    this.sessionsSubscriber = sessionsSubscriber;
     this.reportingCoordinator = sessionReportingCoordinator;
   }
 
@@ -139,7 +152,8 @@ private Context getContext() {
   void enableExceptionHandling(
       String sessionIdentifier,
       Thread.UncaughtExceptionHandler defaultHandler,
-      SettingsDataProvider settingsProvider) {
+      SettingsProvider settingsProvider) {
+    this.settingsProvider = settingsProvider;
     // This must be called before installing the controller with
     // Thread.setDefaultUncaughtExceptionHandler to ensure that we are ready to handle
     // any crashes we catch.
@@ -148,7 +162,7 @@ void enableExceptionHandling(
         new CrashlyticsUncaughtExceptionHandler.CrashListener() {
           @Override
           public void onUncaughtException(
-              @NonNull SettingsDataProvider settingsDataProvider,
+              @NonNull SettingsProvider settingsDataProvider,
               @NonNull Thread thread,
               @NonNull Throwable ex) {
             handleUncaughtException(settingsDataProvider, thread, ex);
@@ -160,10 +174,18 @@ public void onUncaughtException(
     Thread.setDefaultUncaughtExceptionHandler(crashHandler);
   }
 
-  synchronized void handleUncaughtException(
-      @NonNull SettingsDataProvider settingsDataProvider,
+  void handleUncaughtException(
+      @NonNull SettingsProvider settingsProvider,
       @NonNull final Thread thread,
       @NonNull final Throwable ex) {
+    handleUncaughtException(settingsProvider, thread, ex, /* isOnDemand= */ false);
+  }
+
+  synchronized void handleUncaughtException(
+      @NonNull SettingsProvider settingsProvider,
+      @NonNull final Thread thread,
+      @NonNull final Throwable ex,
+      boolean isOnDemand) {
 
     Logger.getLogger()
         .d("Handling uncaught " + "exception \"" + ex + "\" from thread " + thread.getName());
@@ -193,8 +215,8 @@ public Task<Void> call() throws Exception {
                     ex, thread, currentSessionId, timestampSeconds);
 
                 doWriteAppExceptionMarker(timestampMillis);
-                doCloseSessions(settingsDataProvider);
-                doOpenSession(new CLSUUID(idManager).toString());
+                doCloseSessions(settingsProvider);
+                doOpenSession(new CLSUUID(idManager).toString(), isOnDemand);
 
                 // If automatic data collection is disabled, we'll need to wait until the next run
                 // of the app.
@@ -204,16 +226,15 @@ public Task<Void> call() throws Exception {
 
                 Executor executor = backgroundWorker.getExecutor();
 
-                return settingsDataProvider
-                    .getAppSettings()
+                return settingsProvider
+                    .getSettingsAsync()
                     .onSuccessTask(
                         executor,
-                        new SuccessContinuation<AppSettingsData, Void>() {
+                        new SuccessContinuation<Settings, Void>() {
                           @NonNull
                           @Override
-                          public Task<Void> then(@Nullable AppSettingsData appSettingsData)
-                              throws Exception {
-                            if (appSettingsData == null) {
+                          public Task<Void> then(@Nullable Settings settings) throws Exception {
+                            if (settings == null) {
                               Logger.getLogger()
                                   .w(
                                       "Received null app settings, cannot send reports at crash time.");
@@ -222,14 +243,18 @@ public Task<Void> then(@Nullable AppSettingsData appSettingsData)
                             // Data collection is enabled, so it's safe to send the report.
                             return Tasks.whenAll(
                                 logAnalyticsAppExceptionEvents(),
-                                reportingCoordinator.sendReports(executor));
+                                reportingCoordinator.sendReports(
+                                    executor, isOnDemand ? currentSessionId : null));
                           }
                         });
               }
             });
 
     try {
+      // TODO(mrober): Don't block the main thread ever for on-demand fatals.
       Utils.awaitEvenIfOnMainThread(handleUncaughtExceptionTask);
+    } catch (TimeoutException e) {
+      Logger.getLogger().e("Cannot send reports. Timed out while fetching settings.");
     } catch (Exception e) {
       Logger.getLogger().e("Error handling uncaught exception", e);
       // Nothing to do in this case.
@@ -258,6 +283,8 @@ private Task<Boolean> waitForReportAction() {
 
     // If data collection gets enabled while we are waiting for an action, go ahead and send the
     // reports, and any subsequent explicit response will be ignored.
+    // TODO(b/261014167): Use an explicit executor in continuations.
+    @SuppressLint("TaskMainThread")
     final Task<Boolean> collectionEnabled =
         dataCollectionArbiter
             .waitForAutomaticDataCollectionEnabled()
@@ -313,7 +340,9 @@ Task<Void> deleteUnsentReports() {
     return unsentReportsHandled.getTask();
   }
 
-  Task<Void> submitAllReports(Task<AppSettingsData> appSettingsDataTask) {
+  // TODO(b/261014167): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
+  Task<Void> submitAllReports(Task<Settings> settingsDataTask) {
     if (!reportingCoordinator.hasReportsToSend()) {
       // Just notify the user that there are no reports and stop.
       Logger.getLogger().v("No crash reports are available to be sent.");
@@ -352,12 +381,12 @@ public Task<Void> call() throws Exception {
 
                         Executor executor = backgroundWorker.getExecutor();
 
-                        return appSettingsDataTask.onSuccessTask(
+                        return settingsDataTask.onSuccessTask(
                             executor,
-                            new SuccessContinuation<AppSettingsData, Void>() {
+                            new SuccessContinuation<Settings, Void>() {
                               @NonNull
                               @Override
-                              public Task<Void> then(@Nullable AppSettingsData appSettingsData)
+                              public Task<Void> then(@Nullable Settings appSettingsData)
                                   throws Exception {
                                 if (appSettingsData == null) {
                                   Logger.getLogger()
@@ -419,6 +448,14 @@ public void run() {
         });
   }
 
+  void logFatalException(Thread thread, Throwable ex) {
+    if (settingsProvider == null) {
+      Logger.getLogger().w("settingsProvider not set");
+      return;
+    }
+    handleUncaughtException(settingsProvider, thread, ex, /* isOnDemand= */ true);
+  }
+
   void setUserId(String identifier) {
     userMetadata.setUserId(identifier);
   }
@@ -461,7 +498,7 @@ void openSession(String sessionIdentifier) {
         new Callable<Void>() {
           @Override
           public Void call() throws Exception {
-            doOpenSession(sessionIdentifier);
+            doOpenSession(sessionIdentifier, /*isOnDemand=*/ false);
             return null;
           }
         });
@@ -487,9 +524,9 @@ private String getCurrentSessionId() {
    * <p>This method can not be called while the {@link CrashlyticsCore} settings lock is held. It
    * will result in a deadlock!
    *
-   * @param settingsDataProvider
+   * @param settingsProvider
    */
-  boolean finalizeSessions(SettingsDataProvider settingsDataProvider) {
+  boolean finalizeSessions(SettingsProvider settingsProvider) {
     backgroundWorker.checkRunningOnThread();
 
     if (isHandlingException()) {
@@ -499,7 +536,7 @@ boolean finalizeSessions(SettingsDataProvider settingsDataProvider) {
 
     Logger.getLogger().v("Finalizing previously open sessions.");
     try {
-      doCloseSessions(true, settingsDataProvider);
+      doCloseSessions(true, settingsProvider);
     } catch (Exception e) {
       Logger.getLogger().e("Unable to finalize previously open sessions.", e);
       return false;
@@ -513,7 +550,7 @@ boolean finalizeSessions(SettingsDataProvider settingsDataProvider) {
    * Not synchronized/locked. Must be executed from the single thread executor service used by this
    * class.
    */
-  private void doOpenSession(String sessionIdentifier) {
+  private void doOpenSession(String sessionIdentifier, Boolean isOnDemand) {
     final long startedAtSeconds = getCurrentTimestampSeconds();
 
     Logger.getLogger().d("Opening a new session with ID " + sessionIdentifier);
@@ -522,8 +559,8 @@ private void doOpenSession(String sessionIdentifier) {
         String.format(Locale.US, GENERATOR_FORMAT, CrashlyticsCore.getVersion());
 
     StaticSessionData.AppData appData = createAppData(idManager, this.appData);
-    StaticSessionData.OsData osData = createOsData(getContext());
-    StaticSessionData.DeviceData deviceData = createDeviceData(getContext());
+    StaticSessionData.OsData osData = createOsData();
+    StaticSessionData.DeviceData deviceData = createDeviceData(context);
 
     nativeComponent.prepareNativeSession(
         sessionIdentifier,
@@ -531,20 +568,28 @@ private void doOpenSession(String sessionIdentifier) {
         startedAtSeconds,
         StaticSessionData.create(appData, osData, deviceData));
 
+    // If is on-demand fatal, we need to update the session id for userMetadata
+    // as well(since we don't really change the object to a new one for a new session).
+    // all the information in the previous session is still in memory, but we do need to
+    // manually writing them into persistence for the new session.
+    if (isOnDemand && sessionIdentifier != null) {
+      userMetadata.setNewSession(sessionIdentifier);
+    }
+
     logFileManager.setCurrentSession(sessionIdentifier);
+    sessionsSubscriber.setSessionId(sessionIdentifier);
     reportingCoordinator.onBeginSession(sessionIdentifier, startedAtSeconds);
   }
 
-  void doCloseSessions(SettingsDataProvider settingsDataProvider) {
-    doCloseSessions(false, settingsDataProvider);
+  void doCloseSessions(SettingsProvider settingsProvider) {
+    doCloseSessions(false, settingsProvider);
   }
 
   /**
    * Not synchronized/locked. Must be executed from the single thread executor service used by this
    * class.
    */
-  private void doCloseSessions(
-      boolean skipCurrentSession, SettingsDataProvider settingsDataProvider) {
+  private void doCloseSessions(boolean skipCurrentSession, SettingsProvider settingsProvider) {
     final int offset = skipCurrentSession ? 1 : 0;
 
     // :TODO HW2021 this implementation can be cleaned up.
@@ -558,7 +603,7 @@ private void doCloseSessions(
 
     final String mostRecentSessionIdToClose = sortedOpenSessions.get(offset);
 
-    if (settingsDataProvider.getSettings().getFeaturesData().collectAnrs) {
+    if (settingsProvider.getSettingsSync().featureFlagData.collectAnrs) {
       writeApplicationExitInfoEventIfRelevant(mostRecentSessionIdToClose);
     } else {
       Logger.getLogger().v("ANR feature disabled.");
@@ -573,6 +618,14 @@ private void doCloseSessions(
     String currentSessionId = null;
     if (skipCurrentSession) {
       currentSessionId = sortedOpenSessions.get(0);
+    } else {
+      // The Sessions SDK can rotate the AQS session id independently of the Crashlytics session.
+      // There is a window of time between Crashlytics closing the current session and opening a
+      // new session when the Sessions SDK is able to rotate the AQS session id. For such cases it
+      // is necessary to clear the current Crashlytics session id from the Sessions subscriber in
+      // order to prevent the newly rotated AQS session id from being associated with the closed
+      // Crashlytics session. On-demand fatals is an example of where this can happen.
+      sessionsSubscriber.setSessionId(/* sessionId= */ null);
     }
 
     reportingCoordinator.finalizeSessions(getCurrentTimestampSeconds(), currentSessionId);
@@ -584,15 +637,69 @@ List<File> listAppExceptionMarkerFiles() {
     return fileStore.getCommonFiles(APP_EXCEPTION_MARKER_FILTER);
   }
 
+  void saveVersionControlInfo() {
+    try {
+      String versionControlInfo = getVersionControlInfo();
+      if (versionControlInfo != null) {
+        setInternalKey(VERSION_CONTROL_INFO_KEY, versionControlInfo);
+        Logger.getLogger().i("Saved version control info");
+      }
+    } catch (IOException e) {
+      Logger.getLogger().w("Unable to save version control info", e);
+    }
+  }
+
+  String getVersionControlInfo() throws IOException {
+    InputStream is = getResourceAsStream(META_INF_FOLDER + VERSION_CONTROL_INFO_FILE);
+    if (is == null) {
+      return null;
+    }
+
+    Logger.getLogger().d("Read version control info");
+    return Base64.encodeToString(readResource(is), 0);
+  }
+
+  private InputStream getResourceAsStream(String resource) {
+    ClassLoader classLoader = this.getClass().getClassLoader();
+    if (classLoader == null) {
+      Logger.getLogger().w("Couldn't get Class Loader");
+      return null;
+    }
+
+    InputStream is = classLoader.getResourceAsStream(resource);
+    if (is == null) {
+      Logger.getLogger().i("No version control information found");
+      return null;
+    }
+
+    return is;
+  }
+
+  private static byte[] readResource(InputStream is) throws IOException {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    byte[] buffer = new byte[1024];
+    int length;
+
+    while ((length = is.read(buffer)) != -1) {
+      out.write(buffer, 0, length);
+    }
+
+    return out.toByteArray();
+  }
+
   private void finalizePreviousNativeSession(String previousSessionId) {
     Logger.getLogger().v("Finalizing native report for session " + previousSessionId);
     NativeSessionFileProvider nativeSessionFileProvider =
         nativeComponent.getSessionFileProvider(previousSessionId);
     File minidumpFile = nativeSessionFileProvider.getMinidumpFile();
-    if (minidumpFile == null || !minidumpFile.exists()) {
-      Logger.getLogger().w("No minidump data found for session " + previousSessionId);
+    CrashlyticsReport.ApplicationExitInfo applicationExitInfo =
+        nativeSessionFileProvider.getApplicationExitInto();
+
+    if (nativeCoreAbsent(previousSessionId, minidumpFile, applicationExitInfo)) {
+      Logger.getLogger().w("No native core present");
       return;
     }
+
     // Because we don't want to read the minidump to get its timestamp, just use file creation time.
     final long eventTime = minidumpFile.lastModified();
 
@@ -616,10 +723,26 @@ private void finalizePreviousNativeSession(String previousSessionId) {
 
     Logger.getLogger().d("CrashlyticsController#finalizePreviousNativeSession");
 
-    reportingCoordinator.finalizeSessionWithNativeEvent(previousSessionId, nativeSessionFiles);
+    reportingCoordinator.finalizeSessionWithNativeEvent(
+        previousSessionId, nativeSessionFiles, applicationExitInfo);
     previousSessionLogManager.clearLog();
   }
 
+  private static boolean nativeCoreAbsent(
+      String previousSessionId,
+      File minidumpFile,
+      CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
+    if (minidumpFile == null || !minidumpFile.exists()) {
+      Logger.getLogger().w("No minidump data found for session " + previousSessionId);
+    }
+
+    if (applicationExitInfo == null) {
+      Logger.getLogger().i("No Tombstones data found for session " + previousSessionId);
+    }
+
+    return (minidumpFile == null || !minidumpFile.exists()) && applicationExitInfo == null;
+  }
+
   private static long getCurrentTimestampSeconds() {
     return getTimestampSeconds(System.currentTimeMillis());
   }
@@ -645,14 +768,14 @@ private static StaticSessionData.AppData createAppData(IdManager idManager, AppD
         idManager.getAppIdentifier(),
         appData.versionCode,
         appData.versionName,
-        idManager.getCrashlyticsInstallId(),
+        idManager.getInstallIds().getCrashlyticsInstallId(),
         DeliveryMechanism.determineFrom(appData.installerPackageName).getId(),
         appData.developmentPlatformProvider);
   }
 
-  private static StaticSessionData.OsData createOsData(Context context) {
+  private static StaticSessionData.OsData createOsData() {
     return StaticSessionData.OsData.create(
-        VERSION.RELEASE, VERSION.CODENAME, CommonUtils.isRooted(context));
+        VERSION.RELEASE, VERSION.CODENAME, CommonUtils.isRooted());
   }
 
   private static StaticSessionData.DeviceData createDeviceData(Context context) {
@@ -663,10 +786,10 @@ private static StaticSessionData.DeviceData createDeviceData(Context context) {
         CommonUtils.getCpuArchitectureInt(),
         Build.MODEL,
         Runtime.getRuntime().availableProcessors(),
-        CommonUtils.getTotalRamInBytes(),
+        CommonUtils.calculateTotalRamInBytes(context),
         diskSpace,
-        CommonUtils.isEmulator(context),
-        CommonUtils.getDeviceState(context),
+        CommonUtils.isEmulator(),
+        CommonUtils.getDeviceState(),
         Build.MANUFACTURER,
         Build.PRODUCT);
   }
@@ -713,6 +836,9 @@ private Task<Void> logAnalyticsAppExceptionEvent(long timestamp) {
       return Tasks.forResult(null);
     }
     Logger.getLogger().d("Logging app exception event to Firebase Analytics");
+
+    // TODO(b/258263226): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     final ThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1);
     return Tasks.call(
         executor,
@@ -756,6 +882,8 @@ static List<NativeSessionFile> getNativeSessionFiles(
         fileStore.getSessionFile(previousSessionId, UserMetadata.USERDATA_FILENAME);
     final File keysFile =
         fileStore.getSessionFile(previousSessionId, UserMetadata.KEYDATA_FILENAME);
+    final File rolloutsFile =
+        fileStore.getSessionFile(previousSessionId, UserMetadata.ROLLOUTS_STATE_FILENAME);
 
     List<NativeSessionFile> nativeSessionFiles = new ArrayList<>();
     nativeSessionFiles.add(new BytesBackedNativeSessionFile("logs_file", "logs", logBytes));
@@ -772,14 +900,22 @@ static List<NativeSessionFile> getNativeSessionFiles(
             "device_meta_file", "device", fileProvider.getDeviceFile()));
     nativeSessionFiles.add(
         new FileBackedNativeSessionFile("os_meta_file", "os", fileProvider.getOsFile()));
-    nativeSessionFiles.add(
-        new FileBackedNativeSessionFile(
-            "minidump_file", "minidump", fileProvider.getMinidumpFile()));
+    nativeSessionFiles.add(nativeCoreFile(fileProvider));
     nativeSessionFiles.add(new FileBackedNativeSessionFile("user_meta_file", "user", userFile));
     nativeSessionFiles.add(new FileBackedNativeSessionFile("keys_file", "keys", keysFile));
+    nativeSessionFiles.add(
+        new FileBackedNativeSessionFile("rollouts_file", "rollouts", rolloutsFile));
     return nativeSessionFiles;
   }
 
+  private static NativeSessionFile nativeCoreFile(NativeSessionFileProvider fileProvider) {
+    File minidump = fileProvider.getMinidumpFile();
+
+    return minidump == null || !minidump.exists()
+        ? new BytesBackedNativeSessionFile("minidump_file", "minidump", new byte[] {0})
+        : new FileBackedNativeSessionFile("minidump_file", "minidump", minidump);
+  }
+
   // endregion
 
   // region ApplicationExitInfo
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java
index d4c0074b26d..073b621fb70 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java
@@ -22,17 +22,19 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.crashlytics.BuildConfig;
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponent;
 import com.google.firebase.crashlytics.internal.Logger;
+import com.google.firebase.crashlytics.internal.RemoteConfigDeferredProxy;
 import com.google.firebase.crashlytics.internal.analytics.AnalyticsEventLogger;
 import com.google.firebase.crashlytics.internal.breadcrumbs.BreadcrumbSource;
 import com.google.firebase.crashlytics.internal.metadata.LogFileManager;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
-import com.google.firebase.crashlytics.internal.settings.SettingsDataProvider;
-import com.google.firebase.crashlytics.internal.settings.model.Settings;
+import com.google.firebase.crashlytics.internal.settings.Settings;
+import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
 import com.google.firebase.crashlytics.internal.stacktrace.MiddleOutFallbackStrategy;
 import com.google.firebase.crashlytics.internal.stacktrace.RemoveRepeatsStrategy;
 import com.google.firebase.crashlytics.internal.stacktrace.StackTraceTrimmingStrategy;
@@ -47,10 +49,10 @@
 @SuppressWarnings("PMD.NullAssignment")
 public class CrashlyticsCore {
   private static final String MISSING_BUILD_ID_MSG =
-      "The Crashlytics build ID is missing. This "
-          + "occurs when Crashlytics tooling is absent from your app's build configuration. "
-          + "Please review Crashlytics onboarding instructions and ensure you have a valid "
-          + "Crashlytics account.";
+      "The Crashlytics build ID is missing. This occurs when the Crashlytics Gradle plugin is "
+          + "missing from your app's build configuration. Please review the Firebase Crashlytics "
+          + "onboarding instructions at "
+          + "https://firebase.google.com/docs/crashlytics/get-started?platform=android#add-plugin";
 
   static final int MAX_STACK_SIZE = 1024;
   static final int NUM_STACK_REPETITIONS_ALLOWED = 10;
@@ -59,7 +61,12 @@ public class CrashlyticsCore {
   static final String CRASHLYTICS_REQUIRE_BUILD_ID = "com.crashlytics.RequireBuildId";
   static final boolean CRASHLYTICS_REQUIRE_BUILD_ID_DEFAULT = true;
 
-  static final int DEFAULT_MAIN_HANDLER_TIMEOUT_SEC = 4;
+  static final int DEFAULT_MAIN_HANDLER_TIMEOUT_SEC = 3;
+
+  private static final String ON_DEMAND_RECORDED_KEY =
+      "com.crashlytics.on-demand.recorded-exceptions";
+  private static final String ON_DEMAND_DROPPED_KEY =
+      "com.crashlytics.on-demand.dropped-exceptions";
 
   // If this marker sticks around, the app is crashing before we finished initializing
   private static final String INITIALIZATION_MARKER_FILE_NAME = "initialization_marker";
@@ -68,6 +75,7 @@ public class CrashlyticsCore {
   private final Context context;
   private final FirebaseApp app;
   private final DataCollectionArbiter dataCollectionArbiter;
+  private final OnDemandCounter onDemandCounter;
 
   private final long startTime;
 
@@ -84,9 +92,12 @@ public class CrashlyticsCore {
 
   private final ExecutorService crashHandlerExecutor;
   private final CrashlyticsBackgroundWorker backgroundWorker;
+  private final CrashlyticsAppQualitySessionsSubscriber sessionsSubscriber;
 
   private final CrashlyticsNativeComponent nativeComponent;
 
+  private final RemoteConfigDeferredProxy remoteConfigDeferredProxy;
+
   // region Constructors
 
   public CrashlyticsCore(
@@ -97,7 +108,9 @@ public CrashlyticsCore(
       BreadcrumbSource breadcrumbSource,
       AnalyticsEventLogger analyticsEventLogger,
       FileStore fileStore,
-      ExecutorService crashHandlerExecutor) {
+      ExecutorService crashHandlerExecutor,
+      CrashlyticsAppQualitySessionsSubscriber sessionsSubscriber,
+      RemoteConfigDeferredProxy remoteConfigDeferredProxy) {
     this.app = app;
     this.dataCollectionArbiter = dataCollectionArbiter;
     this.context = app.getApplicationContext();
@@ -108,15 +121,18 @@ public CrashlyticsCore(
     this.crashHandlerExecutor = crashHandlerExecutor;
     this.fileStore = fileStore;
     this.backgroundWorker = new CrashlyticsBackgroundWorker(crashHandlerExecutor);
+    this.sessionsSubscriber = sessionsSubscriber;
+    this.remoteConfigDeferredProxy = remoteConfigDeferredProxy;
 
     startTime = System.currentTimeMillis();
+    onDemandCounter = new OnDemandCounter();
   }
 
   // endregion
 
   // region Initialization
 
-  public boolean onPreExecute(AppData appData, SettingsDataProvider settingsProvider) {
+  public boolean onPreExecute(AppData appData, SettingsProvider settingsProvider) {
     // before starting the crash detector make sure that this was built with our build
     // tools.
     // Throw an exception and halt the app if the build ID is required and not present.
@@ -141,6 +157,8 @@ public boolean onPreExecute(AppData appData, SettingsDataProvider settingsProvid
           new MiddleOutFallbackStrategy(
               MAX_STACK_SIZE, new RemoveRepeatsStrategy(NUM_STACK_REPETITIONS_ALLOWED));
 
+      remoteConfigDeferredProxy.setupListener(userMetadata);
+
       final SessionReportingCoordinator sessionReportingCoordinator =
           SessionReportingCoordinator.create(
               context,
@@ -150,7 +168,9 @@ public boolean onPreExecute(AppData appData, SettingsDataProvider settingsProvid
               logFileManager,
               userMetadata,
               stackTraceTrimmingStrategy,
-              settingsProvider);
+              settingsProvider,
+              onDemandCounter,
+              sessionsSubscriber);
 
       controller =
           new CrashlyticsController(
@@ -165,7 +185,8 @@ public boolean onPreExecute(AppData appData, SettingsDataProvider settingsProvid
               logFileManager,
               sessionReportingCoordinator,
               nativeComponent,
-              analyticsEventLogger);
+              analyticsEventLogger,
+              sessionsSubscriber);
 
       // If the file is present at this point, then the previous run's initialization
       // did not complete, and we want to perform initialization synchronously this time.
@@ -200,7 +221,8 @@ public boolean onPreExecute(AppData appData, SettingsDataProvider settingsProvid
   }
 
   /** Performs background initialization asynchronously on the background worker's thread. */
-  public Task<Void> doBackgroundInitializationAsync(SettingsDataProvider settingsProvider) {
+  @CanIgnoreReturnValue
+  public Task<Void> doBackgroundInitializationAsync(SettingsProvider settingsProvider) {
     return Utils.callTask(
         crashHandlerExecutor,
         new Callable<Task<Void>>() {
@@ -212,16 +234,19 @@ public Task<Void> call() throws Exception {
   }
 
   /** Performs background initialization synchronously on the calling thread. */
-  private Task<Void> doBackgroundInitialization(SettingsDataProvider settingsProvider) {
+  @CanIgnoreReturnValue
+  private Task<Void> doBackgroundInitialization(SettingsProvider settingsProvider) {
     // create the marker for this run
     markInitializationStarted();
 
     try {
       breadcrumbSource.registerBreadcrumbHandler(this::log);
 
-      final Settings settingsData = settingsProvider.getSettings();
+      controller.saveVersionControlInfo();
 
-      if (!settingsData.getFeaturesData().collectReports) {
+      final Settings settingsData = settingsProvider.getSettingsSync();
+
+      if (!settingsData.featureFlagData.collectReports) {
         Logger.getLogger().d("Collection of crash reports disabled in Crashlytics settings.");
         // TODO: This isn't actually an error condition, so figure out the right way to
         // handle this case.
@@ -236,7 +261,7 @@ private Task<Void> doBackgroundInitialization(SettingsDataProvider settingsProvi
       // TODO: Move this call out of this method, so that the return value merely indicates
       // initialization is complete. Callers that want to know when report sending is complete can
       // handle that as a separate call.
-      return controller.submitAllReports(settingsProvider.getAppSettings());
+      return controller.submitAllReports(settingsProvider.getSettingsAsync());
     } catch (Exception e) {
       Logger.getLogger()
           .e("Crashlytics encountered a problem during asynchronous initialization.", e);
@@ -348,6 +373,10 @@ public void setCustomKeys(Map<String, String> keysAndValues) {
     controller.setCustomKeys(keysAndValues);
   }
 
+  // endregion
+
+  // region Internal API
+
   /**
    * Set a value to be associated with a given key for your crash data. The key/value pairs will be
    * reported with any crash that occurs in this session. A maximum of 64 key/value pairs can be
@@ -364,6 +393,19 @@ public void setInternalKey(String key, String value) {
     controller.setInternalKey(key, value);
   }
 
+  /** Logs a fatal Throwable on the Crashlytics servers on-demand. */
+  public void logFatalException(Throwable throwable) {
+    Logger.getLogger()
+        .d("Recorded on-demand fatal events: " + onDemandCounter.getRecordedOnDemandExceptions());
+    Logger.getLogger()
+        .d("Dropped on-demand fatal events: " + onDemandCounter.getDroppedOnDemandExceptions());
+    controller.setInternalKey(
+        ON_DEMAND_RECORDED_KEY, Integer.toString(onDemandCounter.getRecordedOnDemandExceptions()));
+    controller.setInternalKey(
+        ON_DEMAND_DROPPED_KEY, Integer.toString(onDemandCounter.getDroppedOnDemandExceptions()));
+    controller.logFatalException(Thread.currentThread(), throwable);
+  }
+
   // endregion
 
   // region Package-protected getters
@@ -380,13 +422,13 @@ CrashlyticsController getController() {
    * When a startup crash occurs, Crashlytics must lock on the main thread and complete
    * initializaiton to upload crash result. 4 seconds is chosen for the lock to prevent ANR
    */
-  private void finishInitSynchronously(SettingsDataProvider settingsDataProvider) {
+  private void finishInitSynchronously(SettingsProvider settingsProvider) {
 
     final Runnable runnable =
         new Runnable() {
           @Override
           public void run() {
-            doBackgroundInitialization(settingsDataProvider);
+            doBackgroundInitialization(settingsProvider);
           }
         };
 
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsReportDataCapture.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsReportDataCapture.java
index c955ce5a29d..8fbb3107f63 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsReportDataCapture.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsReportDataCapture.java
@@ -14,6 +14,8 @@
 
 package com.google.firebase.crashlytics.internal.common;
 
+import static com.google.firebase.crashlytics.internal.stacktrace.TrimmedThrowableData.makeTrimmedThrowableData;
+
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningAppProcessInfo;
 import android.content.Context;
@@ -23,15 +25,18 @@
 import android.os.StatFs;
 import android.text.TextUtils;
 import com.google.firebase.crashlytics.BuildConfig;
+import com.google.firebase.crashlytics.internal.ProcessDetailsProvider;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Architecture;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution.BinaryImage;
-import com.google.firebase.crashlytics.internal.model.ImmutableList;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.ProcessDetails;
+import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
 import com.google.firebase.crashlytics.internal.stacktrace.StackTraceTrimmingStrategy;
 import com.google.firebase.crashlytics.internal.stacktrace.TrimmedThrowableData;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -41,6 +46,7 @@
  * This class is responsible for capturing information from the system and exception objects,
  * parsing them, and returning canonical CrashlyticsReport and Event objects.
  */
+@SuppressWarnings("KotlinInternal")
 public class CrashlyticsReportDataCapture {
 
   private static final Map<String, Integer> ARCHITECTURES_BY_NAME = new HashMap<>();
@@ -67,16 +73,20 @@ public class CrashlyticsReportDataCapture {
   private final IdManager idManager;
   private final AppData appData;
   private final StackTraceTrimmingStrategy stackTraceTrimmingStrategy;
+  private final SettingsProvider settingsProvider;
+  private final ProcessDetailsProvider processDetailsProvider = ProcessDetailsProvider.INSTANCE;
 
   public CrashlyticsReportDataCapture(
       Context context,
       IdManager idManager,
       AppData appData,
-      StackTraceTrimmingStrategy stackTraceTrimmingStrategy) {
+      StackTraceTrimmingStrategy stackTraceTrimmingStrategy,
+      SettingsProvider settingsProvider) {
     this.context = context;
     this.idManager = idManager;
     this.appData = appData;
     this.stackTraceTrimmingStrategy = stackTraceTrimmingStrategy;
+    this.settingsProvider = settingsProvider;
   }
 
   public CrashlyticsReport captureReportData(String identifier, long timestampSeconds) {
@@ -93,7 +103,7 @@ public Event captureEventData(
       boolean includeAllThreads) {
     final int orientation = context.getResources().getConfiguration().orientation;
     final TrimmedThrowableData trimmedEvent =
-        new TrimmedThrowableData(event, stackTraceTrimmingStrategy);
+        makeTrimmedThrowableData(event, stackTraceTrimmingStrategy);
 
     return Event.builder()
         .setType(type)
@@ -119,16 +129,50 @@ public Event captureAnrEventData(CrashlyticsReport.ApplicationExitInfo applicati
     return Event.builder()
         .setType("anr")
         .setTimestamp(applicationExitInfo.getTimestamp())
-        .setApp(populateEventApplicationData(orientation, applicationExitInfo))
+        .setApp(populateEventApplicationData(orientation, addBuildIdInfo(applicationExitInfo)))
         .setDevice(populateEventDeviceData(orientation))
         .build();
   }
 
+  private CrashlyticsReport.ApplicationExitInfo addBuildIdInfo(
+      CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
+    List<CrashlyticsReport.ApplicationExitInfo.BuildIdMappingForArch>
+        buildIdMappingForArchImmutableList = null;
+    if (settingsProvider.getSettingsSync().featureFlagData.collectBuildIds
+        && appData.buildIdInfoList.size() > 0) {
+      List<CrashlyticsReport.ApplicationExitInfo.BuildIdMappingForArch> buildIdMappingForArchList =
+          new ArrayList<>();
+      for (BuildIdInfo buildIdInfo : appData.buildIdInfoList) {
+        buildIdMappingForArchList.add(
+            CrashlyticsReport.ApplicationExitInfo.BuildIdMappingForArch.builder()
+                .setLibraryName(buildIdInfo.getLibraryName())
+                .setArch(buildIdInfo.getArch())
+                .setBuildId(buildIdInfo.getBuildId())
+                .build());
+      }
+      buildIdMappingForArchImmutableList = Collections.unmodifiableList(buildIdMappingForArchList);
+    }
+
+    return CrashlyticsReport.ApplicationExitInfo.builder()
+        .setImportance(applicationExitInfo.getImportance())
+        .setProcessName(applicationExitInfo.getProcessName())
+        .setReasonCode(applicationExitInfo.getReasonCode())
+        .setTimestamp(applicationExitInfo.getTimestamp())
+        .setPid(applicationExitInfo.getPid())
+        .setPss(applicationExitInfo.getPss())
+        .setRss(applicationExitInfo.getRss())
+        .setTraceFile(applicationExitInfo.getTraceFile())
+        .setBuildIdMappingForArch(buildIdMappingForArchImmutableList)
+        .build();
+  }
+
   private CrashlyticsReport.Builder buildReportData() {
     return CrashlyticsReport.builder()
         .setSdkVersion(BuildConfig.VERSION_NAME)
         .setGmpAppId(appData.googleAppId)
-        .setInstallationUuid(idManager.getCrashlyticsInstallId())
+        .setInstallationUuid(idManager.getInstallIds().getCrashlyticsInstallId())
+        .setFirebaseInstallationId(idManager.getInstallIds().getFirebaseInstallationId())
+        .setFirebaseAuthenticationToken(idManager.getInstallIds().getFirebaseAuthenticationToken())
         .setBuildVersion(appData.versionCode)
         .setDisplayVersion(appData.versionName)
         .setPlatform(REPORT_ANDROID_PLATFORM);
@@ -152,7 +196,7 @@ private CrashlyticsReport.Session.Application populateSessionApplicationData() {
             .setIdentifier(idManager.getAppIdentifier())
             .setVersion(appData.versionCode)
             .setDisplayVersion(appData.versionName)
-            .setInstallationUuid(idManager.getCrashlyticsInstallId())
+            .setInstallationUuid(idManager.getInstallIds().getCrashlyticsInstallId())
             .setDevelopmentPlatform(appData.developmentPlatformProvider.getDevelopmentPlatform())
             .setDevelopmentPlatformVersion(
                 appData.developmentPlatformProvider.getDevelopmentPlatformVersion());
@@ -164,7 +208,7 @@ private CrashlyticsReport.Session.OperatingSystem populateSessionOperatingSystem
         .setPlatform(SESSION_ANDROID_PLATFORM)
         .setVersion(VERSION.RELEASE)
         .setBuildVersion(VERSION.CODENAME)
-        .setJailbroken(CommonUtils.isRooted(context))
+        .setJailbroken(CommonUtils.isRooted())
         .build();
   }
 
@@ -172,10 +216,10 @@ private CrashlyticsReport.Session.Device populateSessionDeviceData() {
     final StatFs statFs = new StatFs(Environment.getDataDirectory().getPath());
     final int arch = getDeviceArchitecture();
     final int availableProcessors = Runtime.getRuntime().availableProcessors();
-    final long totalRam = CommonUtils.getTotalRamInBytes();
+    final long totalRam = CommonUtils.calculateTotalRamInBytes(context);
     final long diskSpace = (long) statFs.getBlockCount() * (long) statFs.getBlockSize();
-    final boolean isEmulator = CommonUtils.isEmulator(context);
-    final int state = CommonUtils.getDeviceState(context);
+    final boolean isEmulator = CommonUtils.isEmulator();
+    final int state = CommonUtils.getDeviceState();
     final String manufacturer = Build.MANUFACTURER;
     final String modelClass = Build.PRODUCT;
 
@@ -200,17 +244,18 @@ private Event.Application populateEventApplicationData(
       int maxChainedExceptions,
       boolean includeAllThreads) {
     Boolean isBackground = null;
-    final RunningAppProcessInfo runningAppProcessInfo =
-        CommonUtils.getAppProcessInfo(appData.packageName, context);
-    if (runningAppProcessInfo != null) {
+    ProcessDetails currentProcessDetails = processDetailsProvider.getCurrentProcessDetails(context);
+    if (currentProcessDetails.getImportance() > 0) {
       // Several different types of "background" states, easiest to check for not foreground.
       isBackground =
-          runningAppProcessInfo.importance
+          currentProcessDetails.getImportance()
               != ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
     }
 
     return Event.Application.builder()
         .setBackground(isBackground)
+        .setCurrentProcessDetails(currentProcessDetails)
+        .setAppProcessDetails(processDetailsProvider.getAppProcessDetails(context))
         .setUiOrientation(orientation)
         .setExecution(
             populateExecutionData(
@@ -229,6 +274,7 @@ private Event.Application populateEventApplicationData(
 
     return Event.Application.builder()
         .setBackground(isBackground)
+        .setCurrentProcessDetails(processDetailsFromApplicationExitInfo(applicationExitInfo))
         .setUiOrientation(orientation)
         .setExecution(populateExecutionData(applicationExitInfo))
         .build();
@@ -241,7 +287,9 @@ private Event.Device populateEventDeviceData(int orientation) {
     final int batteryVelocity = battery.getBatteryVelocity();
     final boolean proximityEnabled = CommonUtils.getProximitySensorEnabled(context);
     final long usedRamBytes =
-        CommonUtils.getTotalRamInBytes() - CommonUtils.calculateFreeRamInBytes(context);
+        ensureNonNegative(
+            CommonUtils.calculateTotalRamInBytes(context)
+                - CommonUtils.calculateFreeRamInBytes(context));
     final long diskUsedBytes =
         CommonUtils.calculateUsedDiskSpaceInBytes(Environment.getDataDirectory().getPath());
 
@@ -281,7 +329,7 @@ private Execution populateExecutionData(
         .build();
   }
 
-  private ImmutableList<Execution.Thread> populateThreadsList(
+  private List<Execution.Thread> populateThreadsList(
       TrimmedThrowableData trimmedEvent,
       Thread eventThread,
       int eventThreadImportance,
@@ -304,7 +352,7 @@ private ImmutableList<Execution.Thread> populateThreadsList(
       }
     }
 
-    return ImmutableList.from(threadsList);
+    return Collections.unmodifiableList(threadsList);
   }
 
   private Execution.Thread populateThreadData(Thread thread, StackTraceElement[] stacktrace) {
@@ -316,18 +364,18 @@ private Execution.Thread populateThreadData(
     return Execution.Thread.builder()
         .setName(thread.getName())
         .setImportance(importance)
-        .setFrames(ImmutableList.from(populateFramesList(stacktrace, importance)))
+        .setFrames(populateFramesList(stacktrace, importance))
         .build();
   }
 
-  private ImmutableList<Execution.Thread.Frame> populateFramesList(
+  private List<Execution.Thread.Frame> populateFramesList(
       StackTraceElement[] stacktrace, int importance) {
     final List<Execution.Thread.Frame> framesList = new ArrayList<>();
     for (StackTraceElement element : stacktrace) {
       framesList.add(
           populateFrameData(element, Execution.Thread.Frame.builder().setImportance(importance)));
     }
-    return ImmutableList.from(framesList);
+    return Collections.unmodifiableList(framesList);
   }
 
   private Execution.Exception populateExceptionData(
@@ -359,7 +407,7 @@ private Execution.Exception populateExceptionData(
         Execution.Exception.builder()
             .setType(type)
             .setReason(reason)
-            .setFrames(ImmutableList.from(populateFramesList(stacktrace, eventThreadImportance)))
+            .setFrames(populateFramesList(stacktrace, eventThreadImportance))
             .setOverflowCount(overflowCount);
 
     if (cause != null && overflowCount == 0) {
@@ -393,8 +441,8 @@ private Execution.Thread.Frame populateFrameData(
     return frameBuilder.setPc(pc).setSymbol(symbol).setFile(file).setOffset(offset).build();
   }
 
-  private ImmutableList<BinaryImage> populateBinaryImagesList() {
-    return ImmutableList.from(populateBinaryImageData());
+  private List<BinaryImage> populateBinaryImagesList() {
+    return Collections.singletonList(populateBinaryImageData());
   }
 
   private Execution.BinaryImage populateBinaryImageData() {
@@ -429,4 +477,18 @@ private static int getDeviceArchitecture() {
 
     return arch;
   }
+
+  /** Returns the given value, or zero is the value is negative. */
+  private static long ensureNonNegative(long value) {
+    return value > 0 ? value : 0;
+  }
+
+  /** Builds a ProcessDetails object from the details in applicationExitInfo. */
+  private ProcessDetails processDetailsFromApplicationExitInfo(
+      CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
+    return processDetailsProvider.buildProcessDetails(
+        applicationExitInfo.getProcessName(),
+        applicationExitInfo.getPid(),
+        applicationExitInfo.getImportance());
+  }
 }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsUncaughtExceptionHandler.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsUncaughtExceptionHandler.java
index c168af4e28a..9a4bba92952 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsUncaughtExceptionHandler.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsUncaughtExceptionHandler.java
@@ -16,19 +16,18 @@
 
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponent;
 import com.google.firebase.crashlytics.internal.Logger;
-import com.google.firebase.crashlytics.internal.settings.SettingsDataProvider;
+import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 class CrashlyticsUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
 
   interface CrashListener {
 
-    void onUncaughtException(
-        SettingsDataProvider settingsDataProvider, Thread thread, Throwable ex);
+    void onUncaughtException(SettingsProvider settingsProvider, Thread thread, Throwable ex);
   }
 
   private final CrashListener crashListener;
-  private final SettingsDataProvider settingsDataProvider;
+  private final SettingsProvider settingsProvider;
   private final Thread.UncaughtExceptionHandler defaultHandler;
   private final CrashlyticsNativeComponent nativeComponent;
 
@@ -37,11 +36,11 @@ void onUncaughtException(
 
   public CrashlyticsUncaughtExceptionHandler(
       CrashListener crashListener,
-      SettingsDataProvider settingsProvider,
+      SettingsProvider settingsProvider,
       Thread.UncaughtExceptionHandler defaultHandler,
       CrashlyticsNativeComponent nativeComponent) {
     this.crashListener = crashListener;
-    this.settingsDataProvider = settingsProvider;
+    this.settingsProvider = settingsProvider;
     this.defaultHandler = defaultHandler;
     this.isHandlingException = new AtomicBoolean(false);
     this.nativeComponent = nativeComponent;
@@ -52,7 +51,7 @@ public void uncaughtException(Thread thread, Throwable ex) {
     isHandlingException.set(true);
     try {
       if (shouldRecordUncaughtException(thread, ex)) {
-        crashListener.onUncaughtException(settingsDataProvider, thread, ex);
+        crashListener.onUncaughtException(settingsProvider, thread, ex);
       } else {
         Logger.getLogger().d("Uncaught exception will not be recorded by Crashlytics.");
       }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/DataCollectionArbiter.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/DataCollectionArbiter.java
index bdd629b28e6..84493f7b355 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/DataCollectionArbiter.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/DataCollectionArbiter.java
@@ -75,11 +75,24 @@ public synchronized boolean isAutomaticDataCollectionEnabled() {
     final boolean dataCollectionEnabled =
         crashlyticsDataCollectionEnabled != null
             ? crashlyticsDataCollectionEnabled
-            : firebaseApp.isDataCollectionDefaultEnabled();
+            : isFirebaseDataCollectionDefaultEnabled();
     logDataCollectionState(dataCollectionEnabled);
     return dataCollectionEnabled;
   }
 
+  /**
+   * Determine whether automatic data collection is enabled or disabled by default in all SDKs.
+   *
+   * <p>If the FirebaseApp has been deleted, returns false.
+   */
+  private boolean isFirebaseDataCollectionDefaultEnabled() {
+    try {
+      return firebaseApp.isDataCollectionDefaultEnabled();
+    } catch (IllegalStateException ignored) {
+      return false;
+    }
+  }
+
   public synchronized void setCrashlyticsDataCollectionEnabled(@Nullable Boolean enabled) {
     if (enabled != null) {
       setInManifest = false;
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/ExecutorUtils.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/ExecutorUtils.java
index 9147921af73..77fafe9adc5 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/ExecutorUtils.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/ExecutorUtils.java
@@ -16,6 +16,7 @@
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 
+import android.annotation.SuppressLint;
 import com.google.firebase.crashlytics.internal.Logger;
 import java.util.Locale;
 import java.util.concurrent.ExecutorService;
@@ -43,6 +44,8 @@ public static ExecutorService buildSingleThreadExecutorService(String name) {
 
   public static ScheduledExecutorService buildSingleThreadScheduledExecutorService(String name) {
     final ThreadFactory threadFactory = ExecutorUtils.getNamedThreadFactory(name);
+    // TODO(b/258263226): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     final ScheduledExecutorService executor =
         Executors.newSingleThreadScheduledExecutor(threadFactory);
     ExecutorUtils.addDelayedShutdownHook(name, executor);
@@ -70,6 +73,8 @@ public void onRun() {
     };
   }
 
+  // TODO(b/258263226): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   private static ExecutorService newSingleThreadExecutor(
       ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
     return Executors.unconfigurableExecutorService(
@@ -88,11 +93,14 @@ private static void addDelayedShutdownHook(String serviceName, ExecutorService s
         serviceName, service, DEFAULT_TERMINATION_TIMEOUT, SECONDS);
   }
 
+  // TODO(b/258263226): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   private static void addDelayedShutdownHook(
       final String serviceName,
       final ExecutorService service,
       final long terminationTimeout,
       final TimeUnit timeUnit) {
+
     Runtime.getRuntime()
         .addShutdownHook(
             new Thread(
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/FileBackedNativeSessionFile.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/FileBackedNativeSessionFile.java
index 3e8e6c4a50b..07f68a076b7 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/FileBackedNativeSessionFile.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/FileBackedNativeSessionFile.java
@@ -30,6 +30,8 @@ class FileBackedNativeSessionFile implements NativeSessionFile {
 
   @NonNull private final File file;
   @NonNull private final String dataTransportFilename;
+
+  // Legacy field for AWS
   @NonNull private final String reportsEndpointFilename;
 
   FileBackedNativeSessionFile(
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/FirebaseInstallationId.kt b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/FirebaseInstallationId.kt
new file mode 100644
index 00000000000..61d294e2e69
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/FirebaseInstallationId.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics.internal.common
+
+/**
+ * Simple data class to contain the true Firebase installation id and Firebase authentication token.
+ *
+ * <p>This is not the Crashlytics installation id.
+ */
+data class FirebaseInstallationId(val fid: String?, val authToken: String?)
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/IdManager.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/IdManager.java
index 04e2fc67502..cf06005ebfa 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/IdManager.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/IdManager.java
@@ -14,15 +14,16 @@
 
 package com.google.firebase.crashlytics.internal.common;
 
+import static com.google.firebase.crashlytics.internal.common.Utils.awaitEvenIfOnMainThread;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.gms.tasks.Task;
 import com.google.firebase.crashlytics.internal.Logger;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
@@ -35,7 +36,7 @@ public class IdManager implements InstallIdProvider {
   static final String PREFKEY_FIREBASE_IID = "firebase.installation.id";
   static final String PREFKEY_LEGACY_INSTALLATION_UUID = "crashlytics.installation.id";
 
-  /** Regex for stripping all non-alphnumeric characters from ALL the identifier fields. */
+  /** Regex for stripping all non-alphanumeric characters from ALL the identifier fields. */
   private static final Pattern ID_PATTERN = Pattern.compile("[^\\p{Alnum}]");
 
   private static final String SYNTHETIC_FID_PREFIX = "SYN_";
@@ -47,12 +48,12 @@ public class IdManager implements InstallIdProvider {
   private final String appIdentifier;
 
   // The FirebaseInstallationsApi encapsulates a Firebase-wide install id
-  private final FirebaseInstallationsApi firebaseInstallationsApi;
+  private final FirebaseInstallationsApi firebaseInstallations;
 
   private final DataCollectionArbiter dataCollectionArbiter;
 
-  // Crashlytics maintains a Crashlytics-specific install id, used in the crash processing backend
-  private String crashlyticsInstallId;
+  // Stores a Crashlytics-specific install id, and Firebase installation id.
+  private InstallIds installIds;
 
   /**
    * @param appContext Application {@link Context}
@@ -64,7 +65,7 @@ public class IdManager implements InstallIdProvider {
   public IdManager(
       Context appContext,
       String appIdentifier,
-      FirebaseInstallationsApi firebaseInstallationsApi,
+      FirebaseInstallationsApi firebaseInstallations,
       DataCollectionArbiter dataCollectionArbiter) {
     if (appContext == null) {
       throw new IllegalArgumentException("appContext must not be null");
@@ -74,18 +75,16 @@ public IdManager(
     }
     this.appContext = appContext;
     this.appIdentifier = appIdentifier;
-    this.firebaseInstallationsApi = firebaseInstallationsApi;
+    this.firebaseInstallations = firebaseInstallations;
     this.dataCollectionArbiter = dataCollectionArbiter;
 
     installerPackageNameProvider = new InstallerPackageNameProvider();
   }
 
-  /**
-   * Apply consistent formatting and stripping of special characters. Null input is allowed, will
-   * return null.
-   */
-  private static String formatId(String id) {
-    return (id == null) ? null : ID_PATTERN.matcher(id).replaceAll("").toLowerCase(Locale.US);
+  /** Apply consistent formatting and stripping of special characters. */
+  @NonNull
+  private static String formatId(@NonNull String id) {
+    return ID_PATTERN.matcher(id).replaceAll("").toLowerCase(Locale.US);
   }
 
   /**
@@ -101,9 +100,9 @@ private static String formatId(String id) {
    */
   @Override
   @NonNull
-  public synchronized String getCrashlyticsInstallId() {
-    if (crashlyticsInstallId != null) {
-      return crashlyticsInstallId;
+  public synchronized InstallIds getInstallIds() {
+    if (!shouldRefresh()) {
+      return installIds;
     }
 
     Logger.getLogger().v("Determining Crashlytics installation ID...");
@@ -114,39 +113,50 @@ public synchronized String getCrashlyticsInstallId() {
     // We only look at the FID if Crashlytics data collection is enabled, since querying it can
     // result in a network call that registers the FID with Firebase.
     if (dataCollectionArbiter.isAutomaticDataCollectionEnabled()) {
-      String trueFid = fetchTrueFid();
+      FirebaseInstallationId trueFid = fetchTrueFid();
       Logger.getLogger().v("Fetched Firebase Installation ID: " + trueFid);
 
-      if (trueFid == null) {
+      if (trueFid.getFid() == null) {
         // This shouldn't happen often. We will assume the cached FID is valid, if it exists.
         // Otherwise, the safest thing to do is to create a synthetic ID instead
-        trueFid = (cachedFid == null ? createSyntheticFid() : cachedFid);
+        trueFid =
+            new FirebaseInstallationId(cachedFid == null ? createSyntheticFid() : cachedFid, null);
       }
 
-      if (trueFid.equals(cachedFid)) {
+      if (Objects.equals(trueFid.getFid(), cachedFid)) {
         // the current FID is the same as the cached FID, so we keep the cached Crashlytics ID
-        crashlyticsInstallId = readCachedCrashlyticsInstallId(prefs);
+        installIds = InstallIds.create(readCachedCrashlyticsInstallId(prefs), trueFid);
       } else {
         // the current FID has changed, so we generate a new Crashlytics ID
-        crashlyticsInstallId = createAndCacheCrashlyticsInstallId(trueFid, prefs);
+        installIds =
+            InstallIds.create(createAndCacheCrashlyticsInstallId(trueFid.getFid(), prefs), trueFid);
       }
     } else { // data collection is NOT enabled; we can't use the FID
       if (isSyntheticFid(cachedFid)) {
         // We already have a cached synthetic FID, so we don't need to change the Crashlytics ID
-        crashlyticsInstallId = readCachedCrashlyticsInstallId(prefs);
+        installIds = InstallIds.createWithoutFid(readCachedCrashlyticsInstallId(prefs));
       } else {
         // we don't have a synthetic FID, so we need to replace the cached FID with a synthetic
         // one and create a new Crashlytics install id.
-        crashlyticsInstallId = createAndCacheCrashlyticsInstallId(createSyntheticFid(), prefs);
+        installIds =
+            InstallIds.createWithoutFid(
+                createAndCacheCrashlyticsInstallId(createSyntheticFid(), prefs));
       }
     }
-    if (crashlyticsInstallId == null) {
-      // Should not happen but we don't want to throw any exceptions
-      Logger.getLogger().w("Unable to determine Crashlytics Install Id, creating a new one.");
-      crashlyticsInstallId = createAndCacheCrashlyticsInstallId(createSyntheticFid(), prefs);
-    }
-    Logger.getLogger().v("Crashlytics installation ID: " + crashlyticsInstallId);
-    return crashlyticsInstallId;
+    Logger.getLogger().v("Install IDs: " + installIds);
+    return installIds;
+  }
+
+  /**
+   * Returns true if we have not cached an InstallIds, or should force refresh the fid.
+   *
+   * <p>We should force refresh the fid if data collection is enabled but we don't have a cached
+   * fid. This can happen if data collection was disabled at crash time, but enabled at upload time.
+   */
+  private boolean shouldRefresh() {
+    return installIds == null
+        || (installIds.getFirebaseInstallationId() == null
+            && dataCollectionArbiter.isAutomaticDataCollectionEnabled());
   }
 
   static String createSyntheticFid() {
@@ -161,18 +171,29 @@ private String readCachedCrashlyticsInstallId(SharedPreferences prefs) {
     return prefs.getString(PREFKEY_INSTALLATION_UUID, null);
   }
 
-  /** Makes a blocking call to query FID. If the call fails, logs a warning and returns null. */
-  @Nullable
-  private String fetchTrueFid() {
-    Task<String> currentFidTask = firebaseInstallationsApi.getId();
-    String currentFid = null;
+  /**
+   * Makes a blocking call to query the Firebase installation id and Firebase authentication token.
+   *
+   * <p>If either call fails for any reason, logs a warning and sets a null value for that field.
+   */
+  @NonNull
+  public FirebaseInstallationId fetchTrueFid() {
+    String fid = null;
+    String authToken = null;
 
+    // Fetch the auth token first, so the fid will be validated.
+    try {
+      authToken = awaitEvenIfOnMainThread(firebaseInstallations.getToken(false)).getToken();
+    } catch (Exception ex) {
+      Logger.getLogger().w("Error getting Firebase authentication token.", ex);
+    }
     try {
-      currentFid = Utils.awaitEvenIfOnMainThread(currentFidTask);
-    } catch (Exception e) {
-      Logger.getLogger().w("Failed to retrieve Firebase Installations ID.", e);
+      fid = awaitEvenIfOnMainThread(firebaseInstallations.getId());
+    } catch (Exception ex) {
+      Logger.getLogger().w("Error getting Firebase installation id.", ex);
     }
-    return currentFid;
+
+    return new FirebaseInstallationId(fid, authToken);
   }
 
   @NonNull
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/InstallIdProvider.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/InstallIdProvider.java
index 0b52b8edac0..f620d09bb9e 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/InstallIdProvider.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/InstallIdProvider.java
@@ -14,8 +14,40 @@
 
 package com.google.firebase.crashlytics.internal.common;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.auto.value.AutoValue;
+
 public interface InstallIdProvider {
 
-  /** @return an ID that uniquely identifies the app installation on the current device. */
-  String getCrashlyticsInstallId();
+  /** Returns an InstallIds that uniquely identifies the app installation on the current device. */
+  InstallIds getInstallIds();
+
+  @AutoValue
+  abstract class InstallIds {
+    @NonNull
+    public abstract String getCrashlyticsInstallId();
+
+    @Nullable
+    public abstract String getFirebaseInstallationId();
+
+    @Nullable
+    public abstract String getFirebaseAuthenticationToken();
+
+    /** Creates an InstallIds with just a crashlyticsInstallId, no firebaseInstallationId. */
+    public static InstallIds createWithoutFid(String crashlyticsInstallId) {
+      return new AutoValue_InstallIdProvider_InstallIds(
+          crashlyticsInstallId,
+          /* firebaseInstallationId= */ null,
+          /* firebaseAuthenticationToken= */ null);
+    }
+
+    static InstallIds create(
+        String crashlyticsInstallId, FirebaseInstallationId firebaseInstallationId) {
+      return new AutoValue_InstallIdProvider_InstallIds(
+          crashlyticsInstallId,
+          firebaseInstallationId.getFid(),
+          firebaseInstallationId.getAuthToken());
+    }
+  }
 }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/OnDemandCounter.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/OnDemandCounter.java
new file mode 100644
index 00000000000..f29a6d3e1a5
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/OnDemandCounter.java
@@ -0,0 +1,48 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal.common;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/** Simple, thread-safe, class to keep count of recorded and dropped on-demand events. */
+public final class OnDemandCounter {
+  private final AtomicInteger recordedOnDemandExceptions;
+  private final AtomicInteger droppedOnDemandExceptions;
+
+  public OnDemandCounter() {
+    recordedOnDemandExceptions = new AtomicInteger();
+    droppedOnDemandExceptions = new AtomicInteger();
+  }
+
+  public int getRecordedOnDemandExceptions() {
+    return recordedOnDemandExceptions.get();
+  }
+
+  public void incrementRecordedOnDemandExceptions() {
+    recordedOnDemandExceptions.getAndIncrement();
+  }
+
+  public int getDroppedOnDemandExceptions() {
+    return droppedOnDemandExceptions.get();
+  }
+
+  public void incrementDroppedOnDemandExceptions() {
+    droppedOnDemandExceptions.getAndIncrement();
+  }
+
+  public void resetDroppedOnDemandExceptions() {
+    droppedOnDemandExceptions.set(0);
+  }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java
index 1c5b208e268..50f7cd6b391 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java
@@ -29,11 +29,10 @@
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.CustomAttribute;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.FilesPayload;
-import com.google.firebase.crashlytics.internal.model.ImmutableList;
 import com.google.firebase.crashlytics.internal.persistence.CrashlyticsReportPersistence;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
 import com.google.firebase.crashlytics.internal.send.DataTransportCrashlyticsReportSender;
-import com.google.firebase.crashlytics.internal.settings.SettingsDataProvider;
+import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
 import com.google.firebase.crashlytics.internal.stacktrace.StackTraceTrimmingStrategy;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -67,15 +66,18 @@ public static SessionReportingCoordinator create(
       LogFileManager logFileManager,
       UserMetadata userMetadata,
       StackTraceTrimmingStrategy stackTraceTrimmingStrategy,
-      SettingsDataProvider settingsProvider) {
+      SettingsProvider settingsProvider,
+      OnDemandCounter onDemandCounter,
+      CrashlyticsAppQualitySessionsSubscriber sessionsSubscriber) {
     final CrashlyticsReportDataCapture dataCapture =
-        new CrashlyticsReportDataCapture(context, idManager, appData, stackTraceTrimmingStrategy);
+        new CrashlyticsReportDataCapture(
+            context, idManager, appData, stackTraceTrimmingStrategy, settingsProvider);
     final CrashlyticsReportPersistence reportPersistence =
-        new CrashlyticsReportPersistence(fileStore, settingsProvider);
+        new CrashlyticsReportPersistence(fileStore, settingsProvider, sessionsSubscriber);
     final DataTransportCrashlyticsReportSender reportSender =
-        DataTransportCrashlyticsReportSender.create(context);
+        DataTransportCrashlyticsReportSender.create(context, settingsProvider, onDemandCounter);
     return new SessionReportingCoordinator(
-        dataCapture, reportPersistence, reportSender, logFileManager, userMetadata);
+        dataCapture, reportPersistence, reportSender, logFileManager, userMetadata, idManager);
   }
 
   private final CrashlyticsReportDataCapture dataCapture;
@@ -83,18 +85,21 @@ public static SessionReportingCoordinator create(
   private final DataTransportCrashlyticsReportSender reportsSender;
   private final LogFileManager logFileManager;
   private final UserMetadata reportMetadata;
+  private final IdManager idManager;
 
   SessionReportingCoordinator(
       CrashlyticsReportDataCapture dataCapture,
       CrashlyticsReportPersistence reportPersistence,
       DataTransportCrashlyticsReportSender reportsSender,
       LogFileManager logFileManager,
-      UserMetadata reportMetadata) {
+      UserMetadata reportMetadata,
+      IdManager idManager) {
     this.dataCapture = dataCapture;
     this.reportPersistence = reportPersistence;
     this.reportsSender = reportsSender;
     this.logFileManager = logFileManager;
     this.reportMetadata = reportMetadata;
+    this.idManager = idManager;
   }
 
   @Override
@@ -151,15 +156,19 @@ public void persistRelevantAppExitInfoEvent(
         dataCapture.captureAnrEventData(convertApplicationExitInfo(relevantApplicationExitInfo));
 
     Logger.getLogger().d("Persisting anr for session " + sessionId);
-    reportPersistence.persistEvent(
+
+    CrashlyticsReport.Session.Event eventWithLogsAndCustomKeys =
         addLogsAndCustomKeysToEvent(
-            capturedEvent, logFileManagerForSession, userMetadataForSession),
-        sessionId,
-        true);
+            capturedEvent, logFileManagerForSession, userMetadataForSession);
+    CrashlyticsReport.Session.Event eventWithRolloutsState =
+        addRolloutsStateToEvent(eventWithLogsAndCustomKeys, userMetadataForSession);
+    reportPersistence.persistEvent(eventWithRolloutsState, sessionId, true);
   }
 
   public void finalizeSessionWithNativeEvent(
-      @NonNull String sessionId, @NonNull List<NativeSessionFile> nativeSessionFiles) {
+      @NonNull String sessionId,
+      @NonNull List<NativeSessionFile> nativeSessionFiles,
+      CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
 
     Logger.getLogger().d("SessionReportingCoordinator#finalizeSessionWithNativeEvent");
 
@@ -172,7 +181,9 @@ public void finalizeSessionWithNativeEvent(
     }
 
     reportPersistence.finalizeSessionWithNativeEvent(
-        sessionId, FilesPayload.builder().setFiles(ImmutableList.from(nativeFiles)).build());
+        sessionId,
+        FilesPayload.builder().setFiles(Collections.unmodifiableList(nativeFiles)).build(),
+        applicationExitInfo);
   }
 
   /**
@@ -202,18 +213,58 @@ public void removeAllReports() {
    *     sent.
    */
   public Task<Void> sendReports(@NonNull Executor reportSendCompleteExecutor) {
+    return sendReports(reportSendCompleteExecutor, /* sessionId= */ null);
+  }
+
+  public Task<Void> sendReports(
+      @NonNull Executor reportSendCompleteExecutor, @Nullable String sessionId) {
     final List<CrashlyticsReportWithSessionId> reportsToSend =
         reportPersistence.loadFinalizedReports();
     final List<Task<Boolean>> sendTasks = new ArrayList<>();
     for (CrashlyticsReportWithSessionId reportToSend : reportsToSend) {
-      sendTasks.add(
-          reportsSender
-              .sendReport(reportToSend)
-              .continueWith(reportSendCompleteExecutor, this::onReportSendComplete));
+      if (sessionId == null || sessionId.equals(reportToSend.getSessionId())) {
+        sendTasks.add(
+            reportsSender
+                .enqueueReport(ensureHasFid(reportToSend), sessionId != null)
+                .continueWith(reportSendCompleteExecutor, this::onReportSendComplete));
+      }
     }
     return Tasks.whenAll(sendTasks);
   }
 
+  /**
+   * Ensure reportToSend has a populated fid.
+   *
+   * <p>This is needed because it's possible to capture reports while data collection is disabled,
+   * and then upload the report later by calling sendUnsentReports or enabling data collection.
+   */
+  private CrashlyticsReportWithSessionId ensureHasFid(CrashlyticsReportWithSessionId reportToSend) {
+    // Only do the update if the fid is already missing from the report.
+    if (reportToSend.getReport().getFirebaseInstallationId() == null
+        || reportToSend.getReport().getFirebaseAuthenticationToken() == null) {
+      // Fetch the true fid, regardless of automatic data collection since it's uploading.
+      FirebaseInstallationId firebaseInstallationId = idManager.fetchTrueFid();
+      return CrashlyticsReportWithSessionId.create(
+          reportToSend
+              .getReport()
+              .withFirebaseInstallationId(firebaseInstallationId.getFid())
+              .withFirebaseAuthenticationToken(firebaseInstallationId.getAuthToken()),
+          reportToSend.getSessionId(),
+          reportToSend.getReportFile());
+    }
+
+    return reportToSend;
+  }
+
+  private CrashlyticsReport.Session.Event addMetaDataToEvent(
+      CrashlyticsReport.Session.Event capturedEvent) {
+    CrashlyticsReport.Session.Event eventWithLogsAndCustomKeys =
+        addLogsAndCustomKeysToEvent(capturedEvent, logFileManager, reportMetadata);
+    CrashlyticsReport.Session.Event eventWithRollouts =
+        addRolloutsStateToEvent(eventWithLogsAndCustomKeys, reportMetadata);
+    return eventWithRollouts;
+  }
+
   private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent(
       CrashlyticsReport.Session.Event capturedEvent) {
     return addLogsAndCustomKeysToEvent(capturedEvent, logFileManager, reportMetadata);
@@ -244,14 +295,31 @@ private CrashlyticsReport.Session.Event addLogsAndCustomKeysToEvent(
     if (!sortedCustomAttributes.isEmpty() || !sortedInternalKeys.isEmpty()) {
       eventBuilder.setApp(
           capturedEvent.getApp().toBuilder()
-              .setCustomAttributes(ImmutableList.from(sortedCustomAttributes))
-              .setInternalKeys(ImmutableList.from(sortedInternalKeys))
+              .setCustomAttributes(sortedCustomAttributes)
+              .setInternalKeys(sortedInternalKeys)
               .build());
     }
 
     return eventBuilder.build();
   }
 
+  private CrashlyticsReport.Session.Event addRolloutsStateToEvent(
+      CrashlyticsReport.Session.Event capturedEvent, UserMetadata reportMetadata) {
+    List<CrashlyticsReport.Session.Event.RolloutAssignment> reportRolloutAssignments =
+        reportMetadata.getRolloutsState();
+
+    if (reportRolloutAssignments.isEmpty()) {
+      return capturedEvent;
+    }
+
+    CrashlyticsReport.Session.Event.Builder eventBuilder = capturedEvent.toBuilder();
+    eventBuilder.setRollouts(
+        CrashlyticsReport.Session.Event.RolloutsState.builder()
+            .setRolloutAssignments(reportRolloutAssignments)
+            .build());
+    return eventBuilder.build();
+  }
+
   private void persistEvent(
       @NonNull Throwable event,
       @NonNull Thread thread,
@@ -272,8 +340,7 @@ private void persistEvent(
             MAX_CHAINED_EXCEPTION_DEPTH,
             includeAllThreads);
 
-    reportPersistence.persistEvent(
-        addLogsAndCustomKeysToEvent(capturedEvent), sessionId, isHighPriority);
+    reportPersistence.persistEvent(addMetaDataToEvent(capturedEvent), sessionId, isHighPriority);
   }
 
   private boolean onReportSendComplete(@NonNull Task<CrashlyticsReportWithSessionId> task) {
@@ -309,7 +376,7 @@ private static List<CustomAttribute> getSortedCustomAttributes(
         attributesList,
         (CustomAttribute attr1, CustomAttribute attr2) -> attr1.getKey().compareTo(attr2.getKey()));
 
-    return attributesList;
+    return Collections.unmodifiableList(attributesList);
   }
 
   @RequiresApi(api = Build.VERSION_CODES.R)
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/Utils.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/Utils.java
index 0957a7a0054..ea7e1a02e99 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/Utils.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/Utils.java
@@ -14,13 +14,12 @@
 
 package com.google.firebase.crashlytics.internal.common;
 
-import static java.util.Objects.requireNonNull;
-
+import android.annotation.SuppressLint;
 import android.os.Looper;
-import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
@@ -30,19 +29,21 @@
 import java.util.concurrent.TimeoutException;
 
 /** Utils */
+@SuppressWarnings({"ResultOfMethodCallIgnored", "UnusedReturnValue"})
 public final class Utils {
-
-  private Utils() {}
+  private static final int TIMEOUT_SEC = 4;
 
   /** @return A tasks that is resolved when either of the given tasks is resolved. */
+  // TODO(b/261014167): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   public static <T> Task<T> race(Task<T> t1, Task<T> t2) {
     final TaskCompletionSource<T> result = new TaskCompletionSource<>();
     Continuation<T, Void> continuation =
         task -> {
           if (task.isSuccessful()) {
             result.trySetResult(task.getResult());
-          } else {
-            result.trySetException(requireNonNull(task.getException()));
+          } else if (task.getException() != null) {
+            result.trySetException(task.getException());
           }
           return null;
         };
@@ -58,8 +59,8 @@ public static <T> Task<T> race(Executor executor, Task<T> t1, Task<T> t2) {
         task -> {
           if (task.isSuccessful()) {
             result.trySetResult(task.getResult());
-          } else {
-            result.trySetException(requireNonNull(task.getException()));
+          } else if (task.getException() != null) {
+            result.trySetException(task.getException());
           }
           return null;
         };
@@ -70,32 +71,27 @@ public static <T> Task<T> race(Executor executor, Task<T> t1, Task<T> t2) {
 
   /** Similar to Tasks.call, but takes a Callable that returns a Task. */
   public static <T> Task<T> callTask(Executor executor, Callable<Task<T>> callable) {
-    final TaskCompletionSource<T> tcs = new TaskCompletionSource<T>();
+    final TaskCompletionSource<T> result = new TaskCompletionSource<>();
     executor.execute(
-        new Runnable() {
-          @Override
-          public void run() {
-            try {
-              callable
-                  .call()
-                  .continueWith(
-                      new Continuation<T, Void>() {
-                        @Override
-                        public Void then(@NonNull Task<T> task) throws Exception {
-                          if (task.isSuccessful()) {
-                            tcs.setResult(task.getResult());
-                          } else {
-                            tcs.setException(task.getException());
-                          }
-                          return null;
-                        }
-                      });
-            } catch (Exception e) {
-              tcs.setException(e);
-            }
+        () -> {
+          try {
+            callable
+                .call()
+                .continueWith(
+                    executor,
+                    task -> {
+                      if (task.isSuccessful()) {
+                        result.setResult(task.getResult());
+                      } else if (task.getException() != null) {
+                        result.setException(task.getException());
+                      }
+                      return null;
+                    });
+          } catch (Exception e) {
+            result.setException(e);
           }
         });
-    return tcs.getTask();
+    return result.getTask();
   }
 
   /**
@@ -125,7 +121,7 @@ public static <T> T awaitEvenIfOnMainThread(Task<T> task)
     if (Looper.getMainLooper() == Looper.myLooper()) {
       latch.await(CrashlyticsCore.DEFAULT_MAIN_HANDLER_TIMEOUT_SEC, TimeUnit.SECONDS);
     } else {
-      latch.await();
+      latch.await(TIMEOUT_SEC, TimeUnit.SECONDS);
     }
 
     if (task.isSuccessful()) {
@@ -139,6 +135,30 @@ public static <T> T awaitEvenIfOnMainThread(Task<T> task)
     }
   }
 
+  /** Invokes latch.await(timeout, unit) uninterruptibly. */
+  @CanIgnoreReturnValue
+  public static boolean awaitUninterruptibly(CountDownLatch latch, long timeout, TimeUnit unit) {
+    boolean interrupted = false;
+    try {
+      long remainingNanos = unit.toNanos(timeout);
+      long end = System.nanoTime() + remainingNanos;
+
+      while (true) {
+        try {
+          // CountDownLatch treats negative timeouts just like zero.
+          return latch.await(remainingNanos, TimeUnit.NANOSECONDS);
+        } catch (InterruptedException e) {
+          interrupted = true;
+          remainingNanos = end - System.nanoTime();
+        }
+      }
+    } finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+
   /**
    * ExecutorService that is used exclusively by the awaitEvenIfOnMainThread function. If the
    * Continuation which counts down the latch is called on the same thread which is waiting on the
@@ -147,4 +167,6 @@ public static <T> T awaitEvenIfOnMainThread(Task<T> task)
   private static final ExecutorService TASK_CONTINUATION_EXECUTOR_SERVICE =
       ExecutorUtils.buildSingleThreadExecutorService(
           "awaitEvenIfOnMainThread task continuation executor");
+
+  private Utils() {}
 }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/MetaDataStore.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/MetaDataStore.java
index 63108afbdd7..ce9667e4ed9 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/MetaDataStore.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/MetaDataStore.java
@@ -27,10 +27,13 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -59,7 +62,7 @@ public void writeUserData(String sessionId, String userId) {
       writer.write(userIdJson);
       writer.flush();
     } catch (Exception e) {
-      Logger.getLogger().e("Error serializing user metadata.", e);
+      Logger.getLogger().w("Error serializing user metadata.", e);
     } finally {
       CommonUtils.closeOrLog(writer, "Failed to close user metadata file.");
     }
@@ -68,8 +71,9 @@ public void writeUserData(String sessionId, String userId) {
   @Nullable
   public String readUserId(String sessionId) {
     final File f = getUserDataFileForSession(sessionId);
-    if (!f.exists()) {
+    if (!f.exists() || f.length() == 0) {
       Logger.getLogger().d("No userId set for session " + sessionId);
+      safeDeleteCorruptFile(f);
       return null;
     }
 
@@ -80,7 +84,8 @@ public String readUserId(String sessionId) {
       Logger.getLogger().d("Loaded userId " + userId + " for session " + sessionId);
       return userId;
     } catch (Exception e) {
-      Logger.getLogger().e("Error deserializing user metadata.", e);
+      Logger.getLogger().w("Error deserializing user metadata.", e);
+      safeDeleteCorruptFile(f);
     } finally {
       CommonUtils.closeOrLog(is, "Failed to close user metadata file.");
     }
@@ -101,7 +106,8 @@ public void writeKeyData(String sessionId, Map<String, String> keyData, boolean
       writer.write(keyDataString);
       writer.flush();
     } catch (Exception e) {
-      Logger.getLogger().e("Error serializing key/value metadata.", e);
+      Logger.getLogger().w("Error serializing key/value metadata.", e);
+      safeDeleteCorruptFile(f);
     } finally {
       CommonUtils.closeOrLog(writer, "Failed to close key/value metadata file.");
     }
@@ -114,7 +120,8 @@ public Map<String, String> readKeyData(String sessionId) {
   Map<String, String> readKeyData(String sessionId, boolean isInternal) {
     final File f =
         isInternal ? getInternalKeysFileForSession(sessionId) : getKeysFileForSession(sessionId);
-    if (!f.exists()) {
+    if (!f.exists() || f.length() == 0) {
+      safeDeleteCorruptFile(f);
       return Collections.emptyMap();
     }
 
@@ -123,13 +130,58 @@ Map<String, String> readKeyData(String sessionId, boolean isInternal) {
       is = new FileInputStream(f);
       return jsonToKeysData(CommonUtils.streamToString(is));
     } catch (Exception e) {
-      Logger.getLogger().e("Error deserializing user metadata.", e);
+      Logger.getLogger().w("Error deserializing user metadata.", e);
+      safeDeleteCorruptFile(f);
     } finally {
       CommonUtils.closeOrLog(is, "Failed to close user metadata file.");
     }
     return Collections.emptyMap();
   }
 
+  public List<RolloutAssignment> readRolloutsState(String sessionId) {
+    final File f = getRolloutsStateForSession(sessionId);
+    if (!f.exists() || f.length() == 0) {
+      safeDeleteCorruptFile(f);
+      return Collections.emptyList();
+    }
+
+    InputStream is = null;
+    try {
+      is = new FileInputStream(f);
+      List<RolloutAssignment> rolloutsState = jsonToRolloutsState(CommonUtils.streamToString(is));
+      Logger.getLogger()
+          .d("Loaded rollouts state:\n" + rolloutsState + "\nfor session " + sessionId);
+      return rolloutsState;
+    } catch (Exception e) {
+      Logger.getLogger().w("Error deserializing rollouts state.", e);
+      safeDeleteCorruptFile(f);
+    } finally {
+      CommonUtils.closeOrLog(is, "Failed to close rollouts state file.");
+    }
+    return Collections.emptyList();
+  }
+
+  public void writeRolloutState(String sessionId, List<RolloutAssignment> rolloutsState) {
+    final File f = getRolloutsStateForSession(sessionId);
+    if (rolloutsState.isEmpty()) {
+      safeDeleteCorruptFile(f);
+      return;
+    }
+
+    Writer writer = null;
+    try {
+      final String rolloutsStateString = rolloutsStateToJson(rolloutsState);
+      writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f), UTF_8));
+      writer.write(rolloutsStateString);
+      writer.flush();
+    } catch (Exception e) {
+      Logger.getLogger().w("Error serializing rollouts state.", e);
+      safeDeleteCorruptFile(f);
+    } finally {
+      CommonUtils.closeOrLog(writer, "Failed to close rollouts state file.");
+    }
+  }
+
   @NonNull
   public File getUserDataFileForSession(String sessionId) {
     return fileStore.getSessionFile(sessionId, UserMetadata.USERDATA_FILENAME);
@@ -145,6 +197,11 @@ public File getInternalKeysFileForSession(String sessionId) {
     return fileStore.getSessionFile(sessionId, UserMetadata.INTERNAL_KEYDATA_FILENAME);
   }
 
+  @NonNull
+  public File getRolloutsStateForSession(String sessionId) {
+    return fileStore.getSessionFile(sessionId, UserMetadata.ROLLOUTS_STATE_FILENAME);
+  }
+
   @Nullable
   private String jsonToUserId(String json) throws JSONException {
     final JSONObject dataObj = new JSONObject(json);
@@ -174,7 +231,48 @@ private static String keysDataToJson(final Map<String, String> keyData) {
     return new JSONObject(keyData).toString();
   }
 
+  private static List<RolloutAssignment> jsonToRolloutsState(String json) throws JSONException {
+    JSONObject object = new JSONObject(json);
+    JSONArray dataArray = object.getJSONArray(RolloutAssignmentList.ROLLOUTS_STATE);
+    List<RolloutAssignment> rolloutsState = new ArrayList<RolloutAssignment>();
+
+    for (int i = 0; i < dataArray.length(); i++) {
+      String dataObjectString = dataArray.getString(i);
+
+      try {
+        final RolloutAssignment rolloutAssignment = RolloutAssignment.create(dataObjectString);
+        rolloutsState.add(rolloutAssignment);
+      } catch (Exception e) {
+        Logger.getLogger().w("Failed de-serializing rollouts state. " + dataObjectString, e);
+      }
+    }
+    return rolloutsState;
+  }
+
+  private static String rolloutsStateToJson(List<RolloutAssignment> rolloutsState) {
+    HashMap<String, JSONArray> jsonObject = new HashMap<>();
+    JSONArray rolloutsStateJsonArray = new JSONArray();
+    for (int i = 0; i < rolloutsState.size(); i++) {
+      String rolloutAssignmentJson =
+          RolloutAssignment.ROLLOUT_ASSIGNMENT_JSON_ENCODER.encode(rolloutsState.get(i));
+      try {
+        rolloutsStateJsonArray.put(new JSONObject(rolloutAssignmentJson));
+      } catch (JSONException e) {
+        Logger.getLogger().w("Exception parsing rollout assignment!", e);
+      }
+    }
+    jsonObject.put(RolloutAssignmentList.ROLLOUTS_STATE, rolloutsStateJsonArray);
+
+    return new JSONObject(jsonObject).toString();
+  }
+
   private static String valueOrNull(JSONObject json, String key) {
     return !json.isNull(key) ? json.optString(key, null) : null;
   }
+
+  private static void safeDeleteCorruptFile(File file) {
+    if (file.exists() && file.delete()) {
+      Logger.getLogger().i("Deleted corrupt file: " + file.getAbsolutePath());
+    }
+  }
 }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/RolloutAssignment.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/RolloutAssignment.java
new file mode 100644
index 00000000000..deb300b1584
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/RolloutAssignment.java
@@ -0,0 +1,91 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal.metadata;
+
+import com.google.auto.value.AutoValue;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
+import com.google.firebase.encoders.DataEncoder;
+import com.google.firebase.encoders.annotations.Encodable;
+import com.google.firebase.encoders.json.JsonDataEncoderBuilder;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * model used in user metadata context which make rollout assignment serialize, deserialize easier
+ */
+@Encodable
+@AutoValue
+public abstract class RolloutAssignment {
+  private static final int MAX_PARAMETER_VALUE_LENGTH = 256;
+
+  public abstract String getRolloutId();
+
+  public abstract String getParameterKey();
+
+  public abstract String getParameterValue();
+
+  public abstract String getVariantId();
+
+  public abstract long getTemplateVersion();
+
+  public static RolloutAssignment create(
+      String rolloutId,
+      String parameterKey,
+      String parameterValue,
+      String variantId,
+      long templateVersion) {
+
+    String validatedParameterValue = validate(parameterValue);
+
+    return new AutoValue_RolloutAssignment(
+        rolloutId, parameterKey, validatedParameterValue, variantId, templateVersion);
+  }
+
+  public static final DataEncoder ROLLOUT_ASSIGNMENT_JSON_ENCODER =
+      new JsonDataEncoderBuilder().configureWith(AutoRolloutAssignmentEncoder.CONFIG).build();
+
+  static RolloutAssignment create(String json) throws JSONException {
+    final JSONObject dataObj = new JSONObject(json);
+    String rolloutId = dataObj.getString("rolloutId");
+    String parameterKey = dataObj.getString("parameterKey");
+    String parameterValue = dataObj.getString("parameterValue");
+    String variantId = dataObj.getString("variantId");
+    long templateVersion = dataObj.getLong("templateVersion");
+
+    return RolloutAssignment.create(
+        rolloutId, parameterKey, parameterValue, variantId, templateVersion);
+  }
+
+  public CrashlyticsReport.Session.Event.RolloutAssignment toReportProto() {
+    return CrashlyticsReport.Session.Event.RolloutAssignment.builder()
+        .setRolloutVariant(
+            CrashlyticsReport.Session.Event.RolloutAssignment.RolloutVariant.builder()
+                .setVariantId(getVariantId())
+                .setRolloutId(getRolloutId())
+                .build())
+        .setParameterKey(getParameterKey())
+        .setParameterValue(getParameterValue())
+        .setTemplateVersion(getTemplateVersion())
+        .build();
+  }
+
+  private static String validate(String parameterValue) {
+    String validatedParameterValue = parameterValue;
+    if (validatedParameterValue.length() > MAX_PARAMETER_VALUE_LENGTH) {
+      validatedParameterValue = validatedParameterValue.substring(0, MAX_PARAMETER_VALUE_LENGTH);
+    }
+    return validatedParameterValue;
+  }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/RolloutAssignmentList.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/RolloutAssignmentList.java
new file mode 100644
index 00000000000..761ba1ca57f
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/RolloutAssignmentList.java
@@ -0,0 +1,72 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal.metadata;
+
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.google.firebase.crashlytics.internal.Logger;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/** Handles RolloutsState for metadata */
+public class RolloutAssignmentList {
+  // Sync on list itself rather than the elements, this is because for Rollout
+  // we only care about the snapshot of the state for all assignments
+  private final List<RolloutAssignment> rolloutsState = new ArrayList<>();
+  private final int maxEntries;
+
+  static final String ROLLOUTS_STATE = "rolloutsState";
+
+  // init
+  public RolloutAssignmentList(int maxEntries) {
+    this.maxEntries = maxEntries;
+  }
+
+  public synchronized List<RolloutAssignment> getRolloutAssignmentList() {
+    return Collections.unmodifiableList(new ArrayList<RolloutAssignment>(rolloutsState));
+  }
+
+  @CanIgnoreReturnValue
+  public synchronized boolean updateRolloutAssignmentList(List<RolloutAssignment> newMapList) {
+    rolloutsState.clear();
+    int nOverLimit = 0;
+
+    if (newMapList.size() > maxEntries) {
+      Logger.getLogger()
+          .w(
+              "Ignored "
+                  + nOverLimit
+                  + " entries when adding rollout assignments. "
+                  + "Maximum allowable: "
+                  + maxEntries);
+      List<RolloutAssignment> maxAllowedNewMapList = newMapList.subList(0, maxEntries);
+      return rolloutsState.addAll(maxAllowedNewMapList);
+    }
+    return rolloutsState.addAll(newMapList);
+  }
+
+  // TODO: Nest assignments as a field in RolloutsState
+  public List<CrashlyticsReport.Session.Event.RolloutAssignment> getReportRolloutsState() {
+    List<RolloutAssignment> rolloutAssignments = getRolloutAssignmentList();
+    List<CrashlyticsReport.Session.Event.RolloutAssignment> rolloutsState =
+        new ArrayList<CrashlyticsReport.Session.Event.RolloutAssignment>();
+
+    for (int i = 0; i < rolloutAssignments.size(); i++) {
+      rolloutsState.add(rolloutAssignments.get(i).toReportProto());
+    }
+    return rolloutsState;
+  }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/UserMetadata.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/UserMetadata.java
index 90aec643ae1..e6af8a9bea3 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/UserMetadata.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/metadata/UserMetadata.java
@@ -16,9 +16,12 @@
 
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.firebase.crashlytics.internal.common.CommonUtils;
 import com.google.firebase.crashlytics.internal.common.CrashlyticsBackgroundWorker;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicMarkableReference;
@@ -35,13 +38,17 @@ public class UserMetadata {
   public static final String KEYDATA_FILENAME = "keys";
   public static final String INTERNAL_KEYDATA_FILENAME = "internal-keys";
 
+  public static final String ROLLOUTS_STATE_FILENAME = "rollouts-state";
+
   @VisibleForTesting public static final int MAX_ATTRIBUTES = 64;
   @VisibleForTesting public static final int MAX_ATTRIBUTE_SIZE = 1024;
   @VisibleForTesting public static final int MAX_INTERNAL_KEY_SIZE = 8192;
 
+  @VisibleForTesting public static final int MAX_ROLLOUT_ASSIGNMENTS = 128;
+
   private final MetaDataStore metaDataStore;
   private final CrashlyticsBackgroundWorker backgroundWorker;
-  private final String sessionIdentifier;
+  private String sessionIdentifier;
 
   // The following references contain a marker bit, which is true if the data maintained in the
   // associated reference has been serialized since the last time it was updated.
@@ -50,6 +57,10 @@ public class UserMetadata {
   // as atomic APIs.
   private final SerializeableKeysMap customKeys = new SerializeableKeysMap(false);
   private final SerializeableKeysMap internalKeys = new SerializeableKeysMap(true);
+
+  private final RolloutAssignmentList rolloutsState =
+      new RolloutAssignmentList(MAX_ROLLOUT_ASSIGNMENTS);
+
   private final AtomicMarkableReference<String> userId = new AtomicMarkableReference<>(null, false);
 
   @Nullable
@@ -66,7 +77,7 @@ public static UserMetadata loadFromExistingSession(
     metadata.customKeys.map.getReference().setKeys(store.readKeyData(sessionId, false));
     metadata.internalKeys.map.getReference().setKeys(store.readKeyData(sessionId, true));
     metadata.userId.set(store.readUserId(sessionId), false);
-
+    metadata.rolloutsState.updateRolloutAssignmentList(store.readRolloutsState(sessionId));
     return metadata;
   }
 
@@ -77,6 +88,29 @@ public UserMetadata(
     this.backgroundWorker = backgroundWorker;
   }
 
+  /**
+   * Refresh the userMetadata to reflect the status of the new session. This API is mainly for
+   * on-demand fatal feature since we need to close and update to a new session. UserMetadata also
+   * need to make this update instead of updating session id, we also need to manually writing the
+   * into persistence for the new session.
+   */
+  public void setNewSession(String sessionId) {
+    synchronized (sessionIdentifier) {
+      sessionIdentifier = sessionId;
+      Map<String, String> keyData = customKeys.getKeys();
+      List<RolloutAssignment> rolloutAssignments = rolloutsState.getRolloutAssignmentList();
+      if (getUserId() != null) {
+        metaDataStore.writeUserData(sessionId, getUserId());
+      }
+      if (!keyData.isEmpty()) {
+        metaDataStore.writeKeyData(sessionId, keyData);
+      }
+      if (!rolloutAssignments.isEmpty()) {
+        metaDataStore.writeRolloutState(sessionId, rolloutAssignments);
+      }
+    }
+  }
+
   @Nullable
   public String getUserId() {
     return userId.getReference();
@@ -139,6 +173,30 @@ public boolean setInternalKey(String key, String value) {
     return internalKeys.setKey(key, value);
   }
 
+  public List<CrashlyticsReport.Session.Event.RolloutAssignment> getRolloutsState() {
+    return rolloutsState.getReportRolloutsState();
+  }
+
+  /**
+   * Update RolloutsState in memory and persistence. Return True if update successfully, false
+   * otherwise
+   */
+  @CanIgnoreReturnValue
+  public boolean updateRolloutsState(List<RolloutAssignment> rolloutAssignments) {
+    synchronized (rolloutsState) {
+      if (!rolloutsState.updateRolloutAssignmentList(rolloutAssignments)) {
+        return false;
+      }
+      List<RolloutAssignment> updatedRolloutAssignments = rolloutsState.getRolloutAssignmentList();
+      backgroundWorker.submit(
+          () -> {
+            metaDataStore.writeRolloutState(sessionIdentifier, updatedRolloutAssignments);
+            return null;
+          });
+      return true;
+    }
+  }
+
   /**
    * Write the user-specific metadata to disk, if it has changed since the last time this method was
    * called. This method should be called on a worker thread, since the write operation (if
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/CrashlyticsReport.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/CrashlyticsReport.java
index d203c5191f3..4b9e3a1ace1 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/CrashlyticsReport.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/CrashlyticsReport.java
@@ -26,6 +26,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.charset.Charset;
+import java.util.List;
 
 /**
  * This class represents the data captured by and reported to Crashlytics.
@@ -91,6 +92,15 @@ public Type getType() {
   @NonNull
   public abstract String getInstallationUuid();
 
+  @Nullable
+  public abstract String getFirebaseInstallationId();
+
+  @Nullable
+  public abstract String getFirebaseAuthenticationToken();
+
+  @Nullable
+  public abstract String getAppQualitySessionId();
+
   @NonNull
   public abstract String getBuildVersion();
 
@@ -103,6 +113,9 @@ public Type getType() {
   @Nullable
   public abstract FilesPayload getNdkPayload();
 
+  @Nullable
+  public abstract ApplicationExitInfo getAppExitInfo();
+
   @NonNull
   protected abstract Builder toBuilder();
 
@@ -112,7 +125,7 @@ public Type getType() {
    * @return a new {@link CrashlyticsReport} with its events list set to the given list of events.
    */
   @NonNull
-  public CrashlyticsReport withEvents(@NonNull ImmutableList<Event> events) {
+  public CrashlyticsReport withEvents(@NonNull List<Event> events) {
     if (getSession() == null) {
       throw new IllegalStateException("Reports without sessions cannot have events added to them.");
     }
@@ -153,6 +166,11 @@ public CrashlyticsReport withNdkPayload(@NonNull FilesPayload filesPayload) {
     return toBuilder().setSession(null).setNdkPayload(filesPayload).build();
   }
 
+  @NonNull
+  public CrashlyticsReport withApplicationExitInfo(ApplicationExitInfo appExitInfo) {
+    return appExitInfo == null ? this : toBuilder().setAppExitInfo(appExitInfo).build();
+  }
+
   /**
    * Augment an existing {@link CrashlyticsReport} with fields set at session end.
    *
@@ -171,6 +189,32 @@ public CrashlyticsReport withSessionEndFields(
     return builder.build();
   }
 
+  /** Augment an existing {@link CrashlyticsReport} with the given app quality session id. */
+  @NonNull
+  public CrashlyticsReport withAppQualitySessionId(@Nullable String appQualitySessionId) {
+    // For native crashes and ANRs, the SDK does not construct the Session value holder for
+    // technical reasons. As such, the AQS session id needs to be set at the Report level. For
+    // non-native crashes and non-ANRs, we can set the AQS session id at the Session level.
+    Builder builder = toBuilder().setAppQualitySessionId(appQualitySessionId);
+    if (getSession() != null) {
+      builder.setSession(getSession().withAppQualitySessionId(appQualitySessionId));
+    }
+    return builder.build();
+  }
+
+  /** Update an existing {@link CrashlyticsReport} with the given firebaseInstallationId. */
+  @NonNull
+  public CrashlyticsReport withFirebaseInstallationId(@Nullable String firebaseInstallationId) {
+    return toBuilder().setFirebaseInstallationId(firebaseInstallationId).build();
+  }
+
+  /** Update an existing {@link CrashlyticsReport} with the given firebaseAuthenticationToken. */
+  @NonNull
+  public CrashlyticsReport withFirebaseAuthenticationToken(
+      @Nullable String firebaseAuthenticationToken) {
+    return toBuilder().setFirebaseAuthenticationToken(firebaseAuthenticationToken).build();
+  }
+
   @AutoValue
   public abstract static class FilesPayload {
 
@@ -180,7 +224,7 @@ public static Builder builder() {
     }
 
     @NonNull
-    public abstract ImmutableList<File> getFiles();
+    public abstract List<File> getFiles();
 
     @Nullable
     public abstract String getOrgId();
@@ -217,7 +261,7 @@ public abstract static class Builder {
     @AutoValue.Builder
     public abstract static class Builder {
 
-      public abstract Builder setFiles(ImmutableList<File> value);
+      public abstract Builder setFiles(List<File> value);
 
       public abstract Builder setOrgId(String value);
 
@@ -275,6 +319,10 @@ public byte[] getIdentifierUtf8Bytes() {
       return getIdentifier().getBytes(UTF_8);
     }
 
+    /** The last FirebaseSessions Session ID associated with the crash. */
+    @Nullable
+    public abstract String getAppQualitySessionId();
+
     public abstract long getStartedAt();
 
     @Nullable
@@ -295,7 +343,7 @@ public byte[] getIdentifierUtf8Bytes() {
     public abstract Device getDevice();
 
     @Nullable
-    public abstract ImmutableList<Event> getEvents();
+    public abstract List<Event> getEvents();
 
     public abstract int getGeneratorType();
 
@@ -303,7 +351,7 @@ public byte[] getIdentifierUtf8Bytes() {
     public abstract Builder toBuilder();
 
     @NonNull
-    Session withEvents(@NonNull ImmutableList<Event> events) {
+    Session withEvents(@NonNull List<Event> events) {
       return toBuilder().setEvents(events).build();
     }
 
@@ -319,11 +367,16 @@ Session withSessionEndFields(long timestamp, boolean isCrashed, @Nullable String
       builder.setEndedAt(timestamp);
       builder.setCrashed(isCrashed);
       if (userId != null) {
-        builder.setUser(User.builder().setIdentifier(userId).build()).build();
+        builder.setUser(User.builder().setIdentifier(userId).build());
       }
       return builder.build();
     }
 
+    @NonNull
+    Session withAppQualitySessionId(@Nullable String appQualitySessionId) {
+      return toBuilder().setAppQualitySessionId(appQualitySessionId).build();
+    }
+
     /** Builder for {@link Session}. */
     @AutoValue.Builder
     public abstract static class Builder {
@@ -339,6 +392,9 @@ public Builder setIdentifierFromUtf8Bytes(@NonNull byte[] utf8Bytes) {
         return setIdentifier(new String(utf8Bytes, UTF_8));
       }
 
+      @NonNull
+      public abstract Builder setAppQualitySessionId(@Nullable String appQualitySessionId);
+
       @NonNull
       public abstract Builder setStartedAt(long startedAt);
 
@@ -361,7 +417,7 @@ public Builder setIdentifierFromUtf8Bytes(@NonNull byte[] utf8Bytes) {
       public abstract Builder setDevice(@NonNull Device value);
 
       @NonNull
-      public abstract Builder setEvents(@NonNull ImmutableList<Event> value);
+      public abstract Builder setEvents(@NonNull List<Event> value);
 
       @NonNull
       public abstract Builder setGeneratorType(int generatorType);
@@ -618,6 +674,9 @@ public static Builder builder() {
       @Nullable
       public abstract Log getLog();
 
+      @Nullable
+      public abstract RolloutsState getRollouts();
+
       @NonNull
       public abstract Builder toBuilder();
 
@@ -633,14 +692,20 @@ public static Builder builder() {
         public abstract Execution getExecution();
 
         @Nullable
-        public abstract ImmutableList<CustomAttribute> getCustomAttributes();
+        public abstract List<CustomAttribute> getCustomAttributes();
 
         @Nullable
-        public abstract ImmutableList<CustomAttribute> getInternalKeys();
+        public abstract List<CustomAttribute> getInternalKeys();
 
         @Nullable
         public abstract Boolean getBackground();
 
+        @Nullable
+        public abstract ProcessDetails getCurrentProcessDetails();
+
+        @Nullable
+        public abstract List<ProcessDetails> getAppProcessDetails();
+
         public abstract int getUiOrientation();
 
         @NonNull
@@ -655,7 +720,7 @@ public static Builder builder() {
           }
 
           @Nullable
-          public abstract ImmutableList<Thread> getThreads();
+          public abstract List<Thread> getThreads();
 
           @Nullable
           public abstract Exception getException();
@@ -667,7 +732,7 @@ public static Builder builder() {
           public abstract Signal getSignal();
 
           @NonNull
-          public abstract ImmutableList<BinaryImage> getBinaries();
+          public abstract List<BinaryImage> getBinaries();
 
           @AutoValue
           public abstract static class Thread {
@@ -684,7 +749,7 @@ public static Builder builder() {
             public abstract int getImportance();
 
             @NonNull
-            public abstract ImmutableList<Frame> getFrames();
+            public abstract List<Frame> getFrames();
 
             @AutoValue
             public abstract static class Frame {
@@ -742,7 +807,7 @@ public abstract static class Builder {
               public abstract Builder setImportance(int value);
 
               @NonNull
-              public abstract Builder setFrames(@NonNull ImmutableList<Frame> value);
+              public abstract Builder setFrames(@NonNull List<Frame> value);
 
               @NonNull
               public abstract Thread build();
@@ -765,7 +830,7 @@ public static Builder builder() {
             public abstract String getReason();
 
             @NonNull
-            public abstract ImmutableList<Frame> getFrames();
+            public abstract List<Frame> getFrames();
 
             @Nullable
             public abstract Exception getCausedBy();
@@ -783,7 +848,7 @@ public abstract static class Builder {
               public abstract Builder setReason(@NonNull String value);
 
               @NonNull
-              public abstract Builder setFrames(@NonNull ImmutableList<Frame> value);
+              public abstract Builder setFrames(@NonNull List<Frame> value);
 
               @NonNull
               public abstract Builder setCausedBy(@NonNull Exception value);
@@ -891,7 +956,7 @@ public Builder setUuidFromUtf8Bytes(@NonNull byte[] utf8Bytes) {
           public abstract static class Builder {
 
             @NonNull
-            public abstract Builder setThreads(@NonNull ImmutableList<Thread> value);
+            public abstract Builder setThreads(@NonNull List<Thread> value);
 
             @NonNull
             public abstract Builder setException(@NonNull Exception value);
@@ -903,13 +968,50 @@ public abstract static class Builder {
             public abstract Builder setSignal(@NonNull Signal value);
 
             @NonNull
-            public abstract Builder setBinaries(@NonNull ImmutableList<BinaryImage> value);
+            public abstract Builder setBinaries(@NonNull List<BinaryImage> value);
 
             @NonNull
             public abstract Execution build();
           }
         }
 
+        @AutoValue
+        public abstract static class ProcessDetails {
+          @NonNull
+          public abstract String getProcessName();
+
+          public abstract int getPid();
+
+          public abstract int getImportance();
+
+          public abstract boolean isDefaultProcess();
+
+          @NonNull
+          public static Builder builder() {
+            return new AutoValue_CrashlyticsReport_Session_Event_Application_ProcessDetails
+                .Builder();
+          }
+
+          /** Builder for {@link ProcessDetails}. */
+          @AutoValue.Builder
+          public abstract static class Builder {
+            @NonNull
+            public abstract Builder setProcessName(@NonNull String processName);
+
+            @NonNull
+            public abstract Builder setPid(int pid);
+
+            @NonNull
+            public abstract Builder setImportance(int importance);
+
+            @NonNull
+            public abstract Builder setDefaultProcess(boolean isDefaultProcess);
+
+            @NonNull
+            public abstract ProcessDetails build();
+          }
+        }
+
         /** Builder for {@link Application}. */
         @AutoValue.Builder
         public abstract static class Builder {
@@ -918,15 +1020,21 @@ public abstract static class Builder {
           public abstract Builder setExecution(@NonNull Execution value);
 
           @NonNull
-          public abstract Builder setCustomAttributes(
-              @NonNull ImmutableList<CustomAttribute> value);
+          public abstract Builder setCustomAttributes(@NonNull List<CustomAttribute> value);
 
           @NonNull
-          public abstract Builder setInternalKeys(@NonNull ImmutableList<CustomAttribute> value);
+          public abstract Builder setInternalKeys(@NonNull List<CustomAttribute> value);
 
           @NonNull
           public abstract Builder setBackground(@Nullable Boolean value);
 
+          @NonNull
+          public abstract Builder setCurrentProcessDetails(@Nullable ProcessDetails processDetails);
+
+          @NonNull
+          public abstract Builder setAppProcessDetails(
+              @Nullable List<ProcessDetails> appProcessDetails);
+
           @NonNull
           public abstract Builder setUiOrientation(int value);
 
@@ -1006,6 +1114,98 @@ public abstract static class Builder {
         }
       }
 
+      @AutoValue
+      public abstract static class RolloutsState {
+        @NonNull
+        public static RolloutsState.Builder builder() {
+          return new AutoValue_CrashlyticsReport_Session_Event_RolloutsState.Builder();
+        }
+
+        @NonNull
+        @Field(name = "assignments")
+        public abstract List<RolloutAssignment> getRolloutAssignments();
+
+        @AutoValue.Builder
+        public abstract static class Builder {
+          @NonNull
+          public abstract RolloutsState.Builder setRolloutAssignments(
+              @NonNull List<RolloutAssignment> rolloutAssignments);
+
+          @NonNull
+          public abstract RolloutsState build();
+        }
+      }
+
+      @AutoValue
+      public abstract static class RolloutAssignment {
+
+        @NonNull
+        public static RolloutAssignment.Builder builder() {
+          return new AutoValue_CrashlyticsReport_Session_Event_RolloutAssignment.Builder();
+        }
+
+        @NonNull
+        public abstract RolloutVariant getRolloutVariant();
+
+        @NonNull
+        public abstract String getParameterKey();
+
+        @NonNull
+        public abstract String getParameterValue();
+
+        @NonNull
+        public abstract long getTemplateVersion();
+
+        /** Builder for {@link RolloutAssignment}. */
+        @AutoValue.Builder
+        public abstract static class Builder {
+          @NonNull
+          public abstract RolloutAssignment.Builder setRolloutVariant(
+              @NonNull RolloutVariant rolloutVariant);
+
+          @NonNull
+          public abstract RolloutAssignment.Builder setParameterKey(@NonNull String parameterKey);
+
+          @NonNull
+          public abstract RolloutAssignment.Builder setParameterValue(
+              @NonNull String parameterValue);
+
+          @NonNull
+          public abstract RolloutAssignment.Builder setTemplateVersion(
+              @NonNull long templateVersion);
+
+          @NonNull
+          public abstract RolloutAssignment build();
+        }
+
+        @AutoValue
+        public abstract static class RolloutVariant {
+          public static RolloutVariant.Builder builder() {
+            return new AutoValue_CrashlyticsReport_Session_Event_RolloutAssignment_RolloutVariant
+                .Builder();
+          }
+
+          @NonNull
+          public abstract String getRolloutId();
+
+          @NonNull
+          public abstract String getVariantId();
+
+          /** Builder for {@link RolloutVariant}. */
+          @AutoValue.Builder
+          public abstract static class Builder {
+            @NonNull
+            public abstract RolloutVariant.Builder setRolloutId(@NonNull String rolloutId);
+
+            @NonNull
+            public abstract RolloutVariant.Builder setVariantId(@NonNull String variantId);
+
+            @NonNull
+            public abstract RolloutVariant build();
+          }
+        }
+      }
+
       /** Builder for {@link Event}. */
       @AutoValue.Builder
       public abstract static class Builder {
@@ -1025,6 +1225,9 @@ public abstract static class Builder {
         @NonNull
         public abstract Builder setLog(@NonNull Log value);
 
+        @NonNull
+        public abstract Builder setRollouts(@NonNull RolloutsState rolloutsState);
+
         @NonNull
         public abstract Event build();
       }
@@ -1064,6 +1267,10 @@ public static ApplicationExitInfo.Builder builder() {
     // Not all ApplicationExitInfos have a trace file.
     public abstract String getTraceFile();
 
+    @Nullable
+    // Not all ApplicationExitInfos have build id info
+    public abstract List<BuildIdMappingForArch> getBuildIdMappingForArch();
+
     /** Builder for {@link ApplicationExitInfo}. */
     @AutoValue.Builder
     public abstract static class Builder {
@@ -1091,9 +1298,47 @@ public abstract static class Builder {
       @NonNull
       public abstract ApplicationExitInfo.Builder setTraceFile(@Nullable String value);
 
+      @NonNull
+      public abstract ApplicationExitInfo.Builder setBuildIdMappingForArch(
+          @Nullable List<BuildIdMappingForArch> value);
+
       @NonNull
       public abstract ApplicationExitInfo build();
     }
+
+    @AutoValue
+    public abstract static class BuildIdMappingForArch {
+
+      @NonNull
+      public static BuildIdMappingForArch.Builder builder() {
+        return new AutoValue_CrashlyticsReport_ApplicationExitInfo_BuildIdMappingForArch.Builder();
+      }
+
+      @NonNull
+      public abstract String getArch();
+
+      @NonNull
+      public abstract String getLibraryName();
+
+      @NonNull
+      public abstract String getBuildId();
+
+      @AutoValue.Builder
+      public abstract static class Builder {
+
+        @NonNull
+        public abstract Builder setArch(@NonNull String value);
+
+        @NonNull
+        public abstract Builder setLibraryName(@NonNull String value);
+
+        @NonNull
+        public abstract Builder setBuildId(@NonNull String value);
+
+        @NonNull
+        public abstract BuildIdMappingForArch build();
+      }
+    }
   }
 
   @AutoValue.Builder
@@ -1111,6 +1356,15 @@ public abstract static class Builder {
     @NonNull
     public abstract Builder setInstallationUuid(@NonNull String value);
 
+    @NonNull
+    public abstract Builder setAppQualitySessionId(@Nullable String appQualitySessionId);
+
+    @NonNull
+    public abstract Builder setFirebaseInstallationId(@Nullable String value);
+
+    @NonNull
+    public abstract Builder setFirebaseAuthenticationToken(@Nullable String value);
+
     @NonNull
     public abstract Builder setBuildVersion(@NonNull String value);
 
@@ -1123,6 +1377,9 @@ public abstract static class Builder {
     @NonNull
     public abstract Builder setNdkPayload(FilesPayload value);
 
+    @NonNull
+    public abstract Builder setAppExitInfo(ApplicationExitInfo applicationExitInfo);
+
     @NonNull
     public abstract CrashlyticsReport build();
   }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/ImmutableList.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/ImmutableList.java
deleted file mode 100644
index 93b8c550dd4..00000000000
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/ImmutableList.java
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.crashlytics.internal.model;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.RandomAccess;
-
-/** Immutable list implementation for use with AutoValue */
-public final class ImmutableList<E> implements List<E>, RandomAccess {
-
-  @NonNull
-  public static <E> ImmutableList<E> from(E... elements) {
-    return new ImmutableList<>(Arrays.asList(elements));
-  }
-
-  @NonNull
-  public static <E> ImmutableList<E> from(@NonNull List<E> mutableList) {
-    return new ImmutableList<>(mutableList);
-  }
-
-  private final List<E> immutableList;
-
-  private ImmutableList(List<E> mutableList) {
-    this.immutableList = Collections.unmodifiableList(mutableList);
-  }
-
-  @Override
-  public int size() {
-    return immutableList.size();
-  }
-
-  @Override
-  public boolean isEmpty() {
-    return immutableList.isEmpty();
-  }
-
-  @Override
-  public boolean contains(@Nullable Object o) {
-    return immutableList.contains(o);
-  }
-
-  @NonNull
-  @Override
-  public Iterator<E> iterator() {
-    return immutableList.iterator();
-  }
-
-  @Nullable
-  @Override
-  public Object[] toArray() {
-    return immutableList.toArray();
-  }
-
-  @Override
-  public <T> T[] toArray(@Nullable T[] a) {
-    return immutableList.toArray(a);
-  }
-
-  @Override
-  public boolean add(@NonNull E e) {
-    return immutableList.add(e);
-  }
-
-  @Override
-  public boolean remove(@Nullable Object o) {
-    return immutableList.remove(o);
-  }
-
-  @Override
-  public boolean containsAll(@NonNull Collection<?> c) {
-    return immutableList.containsAll(c);
-  }
-
-  @Override
-  public boolean addAll(@NonNull Collection<? extends E> c) {
-    return immutableList.addAll(c);
-  }
-
-  @Override
-  public boolean addAll(int index, @NonNull Collection<? extends E> c) {
-    return immutableList.addAll(index, c);
-  }
-
-  @Override
-  public boolean removeAll(@NonNull Collection<?> c) {
-    return immutableList.removeAll(c);
-  }
-
-  @Override
-  public boolean retainAll(@NonNull Collection<?> c) {
-    return immutableList.retainAll(c);
-  }
-
-  @Override
-  public void clear() {
-    immutableList.clear();
-  }
-
-  @Override
-  public boolean equals(@Nullable Object o) {
-    return immutableList.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return immutableList.hashCode();
-  }
-
-  @NonNull
-  @Override
-  public E get(int index) {
-    return immutableList.get(index);
-  }
-
-  @NonNull
-  @Override
-  public E set(int index, @NonNull E element) {
-    return immutableList.set(index, element);
-  }
-
-  @Override
-  public void add(int index, @NonNull E element) {
-    immutableList.add(index, element);
-  }
-
-  @Override
-  public E remove(int index) {
-    return immutableList.remove(index);
-  }
-
-  @Override
-  public int indexOf(@Nullable Object o) {
-    return immutableList.indexOf(o);
-  }
-
-  @Override
-  public int lastIndexOf(@Nullable Object o) {
-    return immutableList.lastIndexOf(o);
-  }
-
-  @NonNull
-  @Override
-  public ListIterator<E> listIterator() {
-    return immutableList.listIterator();
-  }
-
-  @NonNull
-  @Override
-  public ListIterator<E> listIterator(int index) {
-    return immutableList.listIterator(index);
-  }
-
-  @NonNull
-  @Override
-  public List<E> subList(int fromIndex, int toIndex) {
-    return immutableList.subList(fromIndex, toIndex);
-  }
-}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransform.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransform.java
index 7a222b445c8..a384f669cf4 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransform.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransform.java
@@ -19,14 +19,15 @@
 import androidx.annotation.NonNull;
 import com.google.firebase.crashlytics.internal.model.AutoCrashlyticsReportEncoder;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.ApplicationExitInfo.BuildIdMappingForArch;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.CustomAttribute;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event;
-import com.google.firebase.crashlytics.internal.model.ImmutableList;
 import com.google.firebase.encoders.DataEncoder;
 import com.google.firebase.encoders.json.JsonDataEncoderBuilder;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class CrashlyticsReportJsonTransform {
@@ -101,6 +102,15 @@ private static CrashlyticsReport parseReport(@NonNull JsonReader jsonReader) thr
         case "installationUuid":
           builder.setInstallationUuid(jsonReader.nextString());
           break;
+        case "firebaseInstallationId":
+          builder.setFirebaseInstallationId(jsonReader.nextString());
+          break;
+        case "firebaseAuthenticationToken":
+          builder.setFirebaseAuthenticationToken(jsonReader.nextString());
+          break;
+        case "appQualitySessionId":
+          builder.setAppQualitySessionId(jsonReader.nextString());
+          break;
         case "buildVersion":
           builder.setBuildVersion(jsonReader.nextString());
           break;
@@ -113,6 +123,9 @@ private static CrashlyticsReport parseReport(@NonNull JsonReader jsonReader) thr
         case "ndkPayload":
           builder.setNdkPayload(parseNdkPayload(jsonReader));
           break;
+        case "appExitInfo":
+          builder.setAppExitInfo(parseAppExitInfo(jsonReader));
+          break;
         default:
           jsonReader.skipValue();
           break;
@@ -138,6 +151,9 @@ private static CrashlyticsReport.Session parseSession(@NonNull JsonReader jsonRe
           builder.setIdentifierFromUtf8Bytes(
               Base64.decode(jsonReader.nextString(), Base64.NO_WRAP));
           break;
+        case "appQualitySessionId":
+          builder.setAppQualitySessionId(jsonReader.nextString());
+          break;
         case "startedAt":
           builder.setStartedAt(jsonReader.nextLong());
           break;
@@ -234,6 +250,10 @@ private static CrashlyticsReport.ApplicationExitInfo parseAppExitInfo(
         case "traceFile":
           builder.setTraceFile(jsonReader.nextString());
           break;
+        case "buildIdMappingForArch":
+          builder.setBuildIdMappingForArch(
+              parseArray(jsonReader, CrashlyticsReportJsonTransform::parseBuildIdMappingForArch));
+          break;
         default:
           jsonReader.skipValue();
           break;
@@ -277,13 +297,10 @@ private static CrashlyticsReport.Session.User parseUser(@NonNull JsonReader json
     jsonReader.beginObject();
     while (jsonReader.hasNext()) {
       String name = jsonReader.nextName();
-      switch (name) {
-        case "identifier":
-          builder.setIdentifier(jsonReader.nextString());
-          break;
-        default:
-          jsonReader.skipValue();
-          break;
+      if (name.equals("identifier")) {
+        builder.setIdentifier(jsonReader.nextString());
+      } else {
+        jsonReader.skipValue();
       }
     }
     jsonReader.endObject();
@@ -431,6 +448,9 @@ private static Event parseEvent(@NonNull JsonReader jsonReader) throws IOExcepti
         case "log":
           builder.setLog(parseEventLog(jsonReader));
           break;
+        case "rollouts":
+          builder.setRollouts(parseEventRolloutsState(jsonReader));
+          break;
         default:
           jsonReader.skipValue();
           break;
@@ -466,12 +486,50 @@ private static Event.Application parseEventApp(@NonNull JsonReader jsonReader)
           builder.setInternalKeys(
               parseArray(jsonReader, CrashlyticsReportJsonTransform::parseCustomAttribute));
           break;
+        case "currentProcessDetails":
+          builder.setCurrentProcessDetails(parseProcessDetails(jsonReader));
+          break;
+        case "appProcessDetails":
+          builder.setAppProcessDetails(
+              parseArray(jsonReader, CrashlyticsReportJsonTransform::parseProcessDetails));
+          break;
+        default:
+          jsonReader.skipValue();
+          break;
+      }
+    }
+    jsonReader.endObject();
+    return builder.build();
+  }
+
+  @NonNull
+  private static Event.Application.ProcessDetails parseProcessDetails(
+      @NonNull JsonReader jsonReader) throws IOException {
+    Event.Application.ProcessDetails.Builder builder = Event.Application.ProcessDetails.builder();
+
+    jsonReader.beginObject();
+    while (jsonReader.hasNext()) {
+      String name = jsonReader.nextName();
+      switch (name) {
+        case "processName":
+          builder.setProcessName(jsonReader.nextString());
+          break;
+        case "pid":
+          builder.setPid(jsonReader.nextInt());
+          break;
+        case "importance":
+          builder.setImportance(jsonReader.nextInt());
+          break;
+        case "defaultProcess":
+          builder.setDefaultProcess(jsonReader.nextBoolean());
+          break;
         default:
           jsonReader.skipValue();
           break;
       }
     }
     jsonReader.endObject();
+
     return builder.build();
   }
 
@@ -706,12 +764,86 @@ private static Event.Device parseEventDevice(@NonNull JsonReader jsonReader) thr
   private static Event.Log parseEventLog(@NonNull JsonReader jsonReader) throws IOException {
     final Event.Log.Builder builder = Event.Log.builder();
 
+    jsonReader.beginObject();
+    while (jsonReader.hasNext()) {
+      String name = jsonReader.nextName();
+      if (name.equals("content")) {
+        builder.setContent(jsonReader.nextString());
+      } else {
+        jsonReader.skipValue();
+      }
+    }
+    jsonReader.endObject();
+    return builder.build();
+  }
+
+  @NonNull
+  private static Event.RolloutsState parseEventRolloutsState(@NonNull JsonReader jsonReader)
+      throws IOException {
+    Event.RolloutsState.Builder builder = Event.RolloutsState.builder();
+
     jsonReader.beginObject();
     while (jsonReader.hasNext()) {
       String name = jsonReader.nextName();
       switch (name) {
-        case "content":
-          builder.setContent(jsonReader.nextString());
+        case "assignments":
+          builder.setRolloutAssignments(
+              parseArray(jsonReader, CrashlyticsReportJsonTransform::parseEventRolloutsAssignment));
+          break;
+        default:
+          jsonReader.skipValue();
+          break;
+      }
+    }
+    jsonReader.endObject();
+    return builder.build();
+  }
+
+  @NonNull
+  private static Event.RolloutAssignment parseEventRolloutsAssignment(
+      @NonNull JsonReader jsonReader) throws IOException {
+    Event.RolloutAssignment.Builder builder = Event.RolloutAssignment.builder();
+
+    jsonReader.beginObject();
+    while (jsonReader.hasNext()) {
+      String name = jsonReader.nextName();
+      switch (name) {
+        case "rolloutVariant":
+          builder.setRolloutVariant(parseRolloutAssignmentRolloutVariant(jsonReader));
+          break;
+        case "parameterKey":
+          builder.setParameterKey(jsonReader.nextString());
+          break;
+        case "parameterValue":
+          builder.setParameterValue(jsonReader.nextString());
+          break;
+        case "templateVersion":
+          builder.setTemplateVersion(jsonReader.nextLong());
+          break;
+        default:
+          jsonReader.skipValue();
+          break;
+      }
+    }
+    jsonReader.endObject();
+    return builder.build();
+  }
+
+  @NonNull
+  private static Event.RolloutAssignment.RolloutVariant parseRolloutAssignmentRolloutVariant(
+      @NonNull JsonReader jsonReader) throws IOException {
+    Event.RolloutAssignment.RolloutVariant.Builder builder =
+        Event.RolloutAssignment.RolloutVariant.builder();
+
+    jsonReader.beginObject();
+    while (jsonReader.hasNext()) {
+      String name = jsonReader.nextName();
+      switch (name) {
+        case "rolloutId":
+          builder.setRolloutId(jsonReader.nextString());
+          break;
+        case "variantId":
+          builder.setVariantId(jsonReader.nextString());
           break;
         default:
           jsonReader.skipValue();
@@ -747,7 +879,34 @@ private static CustomAttribute parseCustomAttribute(@NonNull JsonReader jsonRead
   }
 
   @NonNull
-  private static <T> ImmutableList<T> parseArray(
+  private static BuildIdMappingForArch parseBuildIdMappingForArch(@NonNull JsonReader jsonReader)
+      throws IOException {
+    BuildIdMappingForArch.Builder builder = BuildIdMappingForArch.builder();
+
+    jsonReader.beginObject();
+    while (jsonReader.hasNext()) {
+      String name = jsonReader.nextName();
+      switch (name) {
+        case "libraryName":
+          builder.setLibraryName(jsonReader.nextString());
+          break;
+        case "arch":
+          builder.setArch(jsonReader.nextString());
+          break;
+        case "buildId":
+          builder.setBuildId(jsonReader.nextString());
+          break;
+        default:
+          jsonReader.skipValue();
+          break;
+      }
+    }
+    jsonReader.endObject();
+    return builder.build();
+  }
+
+  @NonNull
+  private static <T> List<T> parseArray(
       @NonNull JsonReader jsonReader, @NonNull ObjectParser<T> objectParser) throws IOException {
     final List<T> objects = new ArrayList<>();
 
@@ -757,7 +916,7 @@ private static <T> ImmutableList<T> parseArray(
     }
     jsonReader.endArray();
 
-    return ImmutableList.from(objects);
+    return Collections.unmodifiableList(objects);
   }
 
   private interface ObjectParser<T> {
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/network/HttpGetRequest.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/network/HttpGetRequest.java
index 3b113fa3625..205e10fb4a5 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/network/HttpGetRequest.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/network/HttpGetRequest.java
@@ -19,7 +19,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -95,7 +97,8 @@ public HttpResponse execute() throws IOException {
     return new HttpResponse(responseCode, body);
   }
 
-  private String createUrlWithParams(String url, Map<String, String> queryParams) {
+  private String createUrlWithParams(String url, Map<String, String> queryParams)
+      throws UnsupportedEncodingException {
     String queryParamsString = createParamsString(queryParams);
 
     if (queryParamsString.isEmpty()) {
@@ -112,16 +115,22 @@ private String createUrlWithParams(String url, Map<String, String> queryParams)
     }
   }
 
-  private String createParamsString(Map<String, String> queryParams) {
+  private String createParamsString(Map<String, String> queryParams)
+      throws UnsupportedEncodingException {
     StringBuilder paramsString = new StringBuilder();
     Iterator<Map.Entry<String, String>> iterator = queryParams.entrySet().iterator();
-    Map.Entry<String, String> entry = (Map.Entry<String, String>) iterator.next();
-
-    paramsString.append(entry.getKey() + "=" + (entry.getValue() != null ? entry.getValue() : ""));
+    Map.Entry<String, String> entry = iterator.next();
+    paramsString
+        .append(entry.getKey())
+        .append("=")
+        .append(entry.getValue() != null ? URLEncoder.encode(entry.getValue(), "UTF-8") : "");
     while (iterator.hasNext()) {
-      entry = (Map.Entry<String, String>) iterator.next();
-      paramsString.append(
-          "&" + entry.getKey() + "=" + (entry.getValue() != null ? entry.getValue() : ""));
+      entry = iterator.next();
+      paramsString
+          .append("&")
+          .append(entry.getKey())
+          .append("=")
+          .append(entry.getValue() != null ? URLEncoder.encode(entry.getValue(), "UTF-8") : "");
     }
     return paramsString.toString();
   }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistence.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistence.java
index ace9394f878..d684fda7b31 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistence.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistence.java
@@ -17,14 +17,14 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.firebase.crashlytics.internal.Logger;
+import com.google.firebase.crashlytics.internal.common.CrashlyticsAppQualitySessionsSubscriber;
 import com.google.firebase.crashlytics.internal.common.CrashlyticsReportWithSessionId;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event;
-import com.google.firebase.crashlytics.internal.model.ImmutableList;
 import com.google.firebase.crashlytics.internal.model.serialization.CrashlyticsReportJsonTransform;
-import com.google.firebase.crashlytics.internal.settings.SettingsDataProvider;
+import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -78,13 +78,16 @@ public class CrashlyticsReportPersistence {
   private final AtomicInteger eventCounter = new AtomicInteger(0);
 
   private final FileStore fileStore;
-
-  @NonNull private final SettingsDataProvider settingsDataProvider;
+  private final SettingsProvider settingsProvider;
+  private final CrashlyticsAppQualitySessionsSubscriber sessionsSubscriber;
 
   public CrashlyticsReportPersistence(
-      FileStore fileStore, SettingsDataProvider settingsDataProvider) {
+      FileStore fileStore,
+      SettingsProvider settingsProvider,
+      CrashlyticsAppQualitySessionsSubscriber sessionsSubscriber) {
     this.fileStore = fileStore;
-    this.settingsDataProvider = settingsDataProvider;
+    this.settingsProvider = settingsProvider;
+    this.sessionsSubscriber = sessionsSubscriber;
   }
 
   public void persistReport(@NonNull CrashlyticsReport report) {
@@ -123,19 +126,20 @@ public void persistEvent(
    *
    * <p>Only a certain number of normal priority events are stored per-session. When this maximum is
    * reached, the oldest events will be dropped. High priority events are not subject to this limit.
+   *
+   * <p>Also persists the current app quality sessions session id.
    */
   public void persistEvent(
       @NonNull CrashlyticsReport.Session.Event event,
       @NonNull String sessionId,
       boolean isHighPriority) {
-    int maxEventsToKeep =
-        settingsDataProvider.getSettings().getSessionData().maxCustomExceptionEvents;
+    int maxEventsToKeep = settingsProvider.getSettingsSync().sessionData.maxCustomExceptionEvents;
     final String json = TRANSFORM.eventToJson(event);
     final String fileName = generateEventFilename(eventCounter.getAndIncrement(), isHighPriority);
     try {
       writeTextFile(fileStore.getSessionFile(sessionId, fileName), json);
-    } catch (IOException e) {
-      Logger.getLogger().w("Could not persist event for session " + sessionId, e);
+    } catch (IOException ex) {
+      Logger.getLogger().w("Could not persist event for session " + sessionId, ex);
     }
     trimEvents(sessionId, maxEventsToKeep);
   }
@@ -196,11 +200,13 @@ public void finalizeReports(@Nullable String currentSessionId, long sessionEndTi
   }
 
   public void finalizeSessionWithNativeEvent(
-      String previousSessionId, CrashlyticsReport.FilesPayload ndkPayload) {
+      String previousSessionId,
+      CrashlyticsReport.FilesPayload ndkPayload,
+      CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
     final File reportFile = fileStore.getSessionFile(previousSessionId, REPORT_FILE_NAME);
     Logger.getLogger()
         .d("Writing native session report for " + previousSessionId + " to file: " + reportFile);
-    synthesizeNativeReportFile(reportFile, ndkPayload, previousSessionId);
+    synthesizeNativeReportFile(reportFile, ndkPayload, previousSessionId, applicationExitInfo);
   }
 
   /**
@@ -225,9 +231,7 @@ public List<CrashlyticsReportWithSessionId> loadFinalizedReports() {
   }
 
   private SortedSet<String> capAndGetOpenSessions(@Nullable String currentSessionId) {
-
-    // Fixes b/195664514
-    fileStore.cleanupLegacyFiles();
+    fileStore.cleanupPreviousFileSystems();
 
     SortedSet<String> openSessionIds = getOpenSessionIds();
     if (currentSessionId != null) {
@@ -248,8 +252,7 @@ private SortedSet<String> capAndGetOpenSessions(@Nullable String currentSessionI
   }
 
   private void capFinalizedReports() {
-    int maxReportsToKeep =
-        settingsDataProvider.getSettings().getSessionData().maxCompleteSessionsCount;
+    int maxReportsToKeep = settingsProvider.getSettingsSync().sessionData.maxCompleteSessionsCount;
     List<File> finalizedReportFiles = getAllFinalizedReportFiles();
 
     int fileCount = finalizedReportFiles.size();
@@ -313,18 +316,26 @@ private void synthesizeReport(String sessionId, long sessionEndTime) {
     }
 
     String userId = UserMetadata.readUserId(sessionId, fileStore);
+    String appQualitySessionId = sessionsSubscriber.getAppQualitySessionId(sessionId);
 
-    final File reportFile = fileStore.getSessionFile(sessionId, REPORT_FILE_NAME);
-    synthesizeReportFile(reportFile, events, sessionEndTime, isHighPriorityReport, userId);
+    File reportFile = fileStore.getSessionFile(sessionId, REPORT_FILE_NAME);
+    synthesizeReportFile(
+        reportFile, events, sessionEndTime, isHighPriorityReport, userId, appQualitySessionId);
   }
 
   private void synthesizeNativeReportFile(
       @NonNull File reportFile,
       @NonNull CrashlyticsReport.FilesPayload ndkPayload,
-      @NonNull String previousSessionId) {
+      @NonNull String previousSessionId,
+      CrashlyticsReport.ApplicationExitInfo applicationExitInfo) {
+    String appQualitySessionId = sessionsSubscriber.getAppQualitySessionId(previousSessionId);
     try {
       final CrashlyticsReport report =
-          TRANSFORM.reportFromJson(readTextFile(reportFile)).withNdkPayload(ndkPayload);
+          TRANSFORM
+              .reportFromJson(readTextFile(reportFile))
+              .withNdkPayload(ndkPayload)
+              .withApplicationExitInfo(applicationExitInfo)
+              .withAppQualitySessionId(appQualitySessionId);
 
       writeTextFile(fileStore.getNativeReport(previousSessionId), TRANSFORM.reportToJson(report));
     } catch (IOException e) {
@@ -337,13 +348,15 @@ private void synthesizeReportFile(
       @NonNull List<Event> events,
       long sessionEndTime,
       boolean isHighPriorityReport,
-      @Nullable String userId) {
+      @Nullable String userId,
+      @Nullable String appQualitySessionId) {
     try {
       CrashlyticsReport report =
           TRANSFORM
               .reportFromJson(readTextFile(reportFile))
               .withSessionEndFields(sessionEndTime, isHighPriorityReport, userId)
-              .withEvents(ImmutableList.from(events));
+              .withAppQualitySessionId(appQualitySessionId)
+              .withEvents(events);
       final Session session = report.getSession();
 
       if (session == null) {
@@ -351,6 +364,8 @@ private void synthesizeReportFile(
         return;
       }
 
+      Logger.getLogger().d("appQualitySessionId: " + appQualitySessionId);
+
       File finalizedReportFile =
           isHighPriorityReport
               ? fileStore.getPriorityReport(session.getIdentifier())
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/FileStore.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/FileStore.java
index 7895c732080..ec4f8e8a735 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/FileStore.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/FileStore.java
@@ -14,7 +14,11 @@
 
 package com.google.firebase.crashlytics.internal.persistence;
 
+import android.annotation.SuppressLint;
+import android.app.Application;
 import android.content.Context;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.crashlytics.internal.Logger;
@@ -31,7 +35,7 @@
  *
  * <ul>
  *   <li>"Common" files, that exist independent of a specific session id.
- *   <li>"Open session" files, which contain a varierty of temporary files specific ot a Crashlytics
+ *   <li>"Open session" files, which contain a variety of temporary files specific ot a Crashlytics
  *       session. These files may or may not eventually be combined into a Crashlytics crash report
  *       file.
  *   <li>"Report" files, which are processed reports, ready to be uploaded to Crashlytics servers.
@@ -48,46 +52,54 @@
  * convention, any use of new File(...) or similar outside of this class is a code smell.
  */
 public class FileStore {
-
-  private static final String FILES_PATH = ".com.google.firebase.crashlytics.files.v1";
+  private static final String CRASHLYTICS_PATH_V1 = ".com.google.firebase.crashlytics.files.v1";
+  private static final String CRASHLYTICS_PATH_V2 = ".com.google.firebase.crashlytics.files.v2";
   private static final String SESSIONS_PATH = "open-sessions";
   private static final String NATIVE_SESSION_SUBDIR = "native";
   private static final String REPORTS_PATH = "reports";
   private static final String PRIORITY_REPORTS_PATH = "priority-reports";
   private static final String NATIVE_REPORTS_PATH = "native-reports";
 
-  private final File rootDir;
+  private final File filesDir;
+  private final File crashlyticsDir;
   private final File sessionsDir;
   private final File reportsDir;
   private final File priorityReportsDir;
   private final File nativeReportsDir;
 
   public FileStore(Context context) {
-    rootDir = prepareBaseDir(new File(context.getFilesDir(), FILES_PATH));
-    sessionsDir = prepareBaseDir(new File(rootDir, SESSIONS_PATH));
-    reportsDir = prepareBaseDir(new File(rootDir, REPORTS_PATH));
-    priorityReportsDir = prepareBaseDir(new File(rootDir, PRIORITY_REPORTS_PATH));
-    nativeReportsDir = prepareBaseDir(new File(rootDir, NATIVE_REPORTS_PATH));
+    filesDir = context.getFilesDir();
+    String crashlyticsPath =
+        useV2FileSystem()
+            ? CRASHLYTICS_PATH_V2 + File.pathSeparator + sanitizeName(Application.getProcessName())
+            : CRASHLYTICS_PATH_V1;
+    crashlyticsDir = prepareBaseDir(new File(filesDir, crashlyticsPath));
+    sessionsDir = prepareBaseDir(new File(crashlyticsDir, SESSIONS_PATH));
+    reportsDir = prepareBaseDir(new File(crashlyticsDir, REPORTS_PATH));
+    priorityReportsDir = prepareBaseDir(new File(crashlyticsDir, PRIORITY_REPORTS_PATH));
+    nativeReportsDir = prepareBaseDir(new File(crashlyticsDir, NATIVE_REPORTS_PATH));
   }
 
   @VisibleForTesting
   public void deleteAllCrashlyticsFiles() {
-    recursiveDelete(rootDir);
+    recursiveDelete(crashlyticsDir);
   }
 
-  public void cleanupLegacyFiles() {
-    // Fixes b/195664514
-    // :TODO: consider removing this method in mid 2023, to give all clients time to upgrade
-    File[] legacyDirs =
-        new File[] {
-          new File(rootDir.getParent(), ".com.google.firebase.crashlytics"),
-          new File(rootDir.getParent(), ".com.google.firebase.crashlytics-ndk")
-        };
+  /** Clean up files from previous file systems. */
+  public void cleanupPreviousFileSystems() {
+    // Clean up pre-versioned file systems.
+    cleanupDir(new File(filesDir, ".com.google.firebase.crashlytics"));
+    cleanupDir(new File(filesDir, ".com.google.firebase.crashlytics-ndk"));
 
-    for (File legacyDir : legacyDirs) {
-      if (legacyDir.exists() && recursiveDelete(legacyDir)) {
-        Logger.getLogger().d("Deleted legacy Crashlytics files from " + legacyDir.getPath());
-      }
+    // Clean up v1 file system.
+    if (useV2FileSystem()) {
+      cleanupDir(new File(filesDir, CRASHLYTICS_PATH_V1));
+    }
+  }
+
+  private void cleanupDir(File dir) {
+    if (dir.exists() && recursiveDelete(dir)) {
+      Logger.getLogger().d("Deleted previous Crashlytics file system: " + dir.getPath());
     }
   }
 
@@ -103,12 +115,12 @@ static boolean recursiveDelete(File fileOrDirectory) {
 
   /** @return internal File used by Crashlytics, that is not specific to a session */
   public File getCommonFile(String filename) {
-    return new File(rootDir, filename);
+    return new File(crashlyticsDir, filename);
   }
 
   /** @return all common (non session specific) files matching the given filter. */
   public List<File> getCommonFiles(FilenameFilter filter) {
-    return safeArrayToList(rootDir.listFiles(filter));
+    return safeArrayToList(crashlyticsDir.listFiles(filter));
   }
 
   private File getSessionDir(String sessionId) {
@@ -185,7 +197,7 @@ private static synchronized File prepareBaseDir(File file) {
       }
     }
     if (!file.mkdirs()) {
-      throw new IllegalStateException("Could not create Crashlytics-specific directory: " + file);
+      Logger.getLogger().e("Could not create Crashlytics-specific directory: " + file);
     }
     return file;
   }
@@ -193,4 +205,15 @@ private static synchronized File prepareBaseDir(File file) {
   private static <T> List<T> safeArrayToList(@Nullable T[] array) {
     return (array == null) ? Collections.emptyList() : Arrays.asList(array);
   }
+
+  @SuppressLint("AnnotateVersionCheck")
+  private static boolean useV2FileSystem() {
+    return VERSION.SDK_INT >= VERSION_CODES.P;
+  }
+
+  /** Replace potentially unsafe chars with underscores to make a safe file name. */
+  @VisibleForTesting
+  static String sanitizeName(String filename) {
+    return filename.replaceAll("[^a-zA-Z0-9.]", "_");
+  }
 }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/send/DataTransportCrashlyticsReportSender.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/send/DataTransportCrashlyticsReportSender.java
index e1cbf7ea566..7637f7218d8 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/send/DataTransportCrashlyticsReportSender.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/send/DataTransportCrashlyticsReportSender.java
@@ -17,16 +17,16 @@
 import android.content.Context;
 import androidx.annotation.NonNull;
 import com.google.android.datatransport.Encoding;
-import com.google.android.datatransport.Event;
 import com.google.android.datatransport.Transformer;
 import com.google.android.datatransport.Transport;
 import com.google.android.datatransport.cct.CCTDestination;
 import com.google.android.datatransport.runtime.TransportRuntime;
 import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.crashlytics.internal.common.CrashlyticsReportWithSessionId;
+import com.google.firebase.crashlytics.internal.common.OnDemandCounter;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.model.serialization.CrashlyticsReportJsonTransform;
+import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
 import java.nio.charset.Charset;
 
 /**
@@ -45,10 +45,11 @@ public class DataTransportCrashlyticsReportSender {
   private static final Transformer<CrashlyticsReport, byte[]> DEFAULT_TRANSFORM =
       (r) -> TRANSFORM.reportToJson(r).getBytes(Charset.forName("UTF-8"));
 
-  private final Transport<CrashlyticsReport> transport;
+  private final ReportQueue reportQueue;
   private final Transformer<CrashlyticsReport, byte[]> transportTransform;
 
-  public static DataTransportCrashlyticsReportSender create(Context context) {
+  public static DataTransportCrashlyticsReportSender create(
+      Context context, SettingsProvider settingsProvider, OnDemandCounter onDemandCounter) {
     TransportRuntime.initialize(context);
     final Transport<CrashlyticsReport> transport =
         TransportRuntime.getInstance()
@@ -58,32 +59,21 @@ public static DataTransportCrashlyticsReportSender create(Context context) {
                 CrashlyticsReport.class,
                 Encoding.of("json"),
                 DEFAULT_TRANSFORM);
-    return new DataTransportCrashlyticsReportSender(transport, DEFAULT_TRANSFORM);
+    ReportQueue reportQueue =
+        new ReportQueue(transport, settingsProvider.getSettingsSync(), onDemandCounter);
+    return new DataTransportCrashlyticsReportSender(reportQueue, DEFAULT_TRANSFORM);
   }
 
   DataTransportCrashlyticsReportSender(
-      Transport<CrashlyticsReport> transport,
-      Transformer<CrashlyticsReport, byte[]> transportTransform) {
-    this.transport = transport;
+      ReportQueue reportQueue, Transformer<CrashlyticsReport, byte[]> transportTransform) {
+    this.reportQueue = reportQueue;
     this.transportTransform = transportTransform;
   }
 
   @NonNull
-  public Task<CrashlyticsReportWithSessionId> sendReport(
-      @NonNull CrashlyticsReportWithSessionId reportWithSessionId) {
-    final CrashlyticsReport report = reportWithSessionId.getReport();
-
-    TaskCompletionSource<CrashlyticsReportWithSessionId> tcs = new TaskCompletionSource<>();
-    transport.schedule(
-        Event.ofUrgent(report),
-        error -> {
-          if (error != null) {
-            tcs.trySetException(error);
-            return;
-          }
-          tcs.trySetResult(reportWithSessionId);
-        });
-    return tcs.getTask();
+  public Task<CrashlyticsReportWithSessionId> enqueueReport(
+      @NonNull CrashlyticsReportWithSessionId reportWithSessionId, boolean isOnDemand) {
+    return reportQueue.enqueueReport(reportWithSessionId, isOnDemand).getTask();
   }
 
   private static String mergeStrings(String part1, String part2) {
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/send/ReportQueue.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/send/ReportQueue.java
new file mode 100644
index 00000000000..0bbc3834141
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/send/ReportQueue.java
@@ -0,0 +1,243 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal.send;
+
+import android.annotation.SuppressLint;
+import android.database.SQLException;
+import android.os.SystemClock;
+import com.google.android.datatransport.Event;
+import com.google.android.datatransport.Priority;
+import com.google.android.datatransport.Transport;
+import com.google.android.datatransport.runtime.ForcedSender;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.firebase.crashlytics.internal.Logger;
+import com.google.firebase.crashlytics.internal.common.CrashlyticsReportWithSessionId;
+import com.google.firebase.crashlytics.internal.common.OnDemandCounter;
+import com.google.firebase.crashlytics.internal.common.Utils;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
+import com.google.firebase.crashlytics.internal.settings.Settings;
+import java.util.Locale;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/** Represents a rate limited bounded queue for sending Crashlytics reports. */
+final class ReportQueue {
+  private static final int MS_PER_SECOND = 1_000;
+  private static final int MS_PER_MINUTE = 60_000;
+  private static final int MAX_DELAY_MS = 3_600_000; // 1 hour.
+  private static final int STARTUP_DURATION_MS = 2_000; // 2 seconds.
+
+  private final double ratePerMinute;
+  private final double base;
+  private final long stepDurationMs;
+  private final long startTimeMs;
+
+  private final int queueCapacity;
+  private final BlockingQueue<Runnable> queue;
+  private final ThreadPoolExecutor singleThreadExecutor;
+  private final Transport<CrashlyticsReport> transport;
+  private final OnDemandCounter onDemandCounter;
+
+  private int step;
+  private long lastUpdatedMs;
+
+  ReportQueue(
+      Transport<CrashlyticsReport> transport, Settings settings, OnDemandCounter onDemandCounter) {
+    this(
+        settings.onDemandUploadRatePerMinute,
+        settings.onDemandBackoffBase,
+        (long) settings.onDemandBackoffStepDurationSeconds * MS_PER_SECOND,
+        transport,
+        onDemandCounter);
+  }
+
+  // TODO(b/258263226): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
+  ReportQueue(
+      double ratePerMinute,
+      double base,
+      long stepDurationMs,
+      Transport<CrashlyticsReport> transport,
+      OnDemandCounter onDemandCounter) {
+    this.ratePerMinute = ratePerMinute;
+    this.base = base;
+    this.stepDurationMs = stepDurationMs;
+    this.transport = transport;
+    this.onDemandCounter = onDemandCounter;
+
+    startTimeMs = SystemClock.elapsedRealtime();
+
+    // The queue capacity is the per-minute rate number. // TODO(mrober): Round up to next int?
+    queueCapacity = (int) ratePerMinute;
+    queue = new ArrayBlockingQueue<>(queueCapacity);
+    singleThreadExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, queue);
+
+    step = 0;
+    lastUpdatedMs = 0;
+  }
+
+  /**
+   * Enqueue a report to send through Google DataTransport. If the queue is full, drop the report.
+   *
+   * <p>The report will be sent according to the per-minute rate. avoiding bursts.
+   */
+  TaskCompletionSource<CrashlyticsReportWithSessionId> enqueueReport(
+      CrashlyticsReportWithSessionId reportWithSessionId, boolean isOnDemand) {
+    synchronized (queue) {
+      TaskCompletionSource<CrashlyticsReportWithSessionId> tcs = new TaskCompletionSource<>();
+      if (isOnDemand) {
+        onDemandCounter.incrementRecordedOnDemandExceptions();
+        if (isQueueAvailable()) {
+          Logger.getLogger().d("Enqueueing report: " + reportWithSessionId.getSessionId());
+          Logger.getLogger().d("Queue size: " + queue.size());
+          singleThreadExecutor.execute(new ReportRunnable(reportWithSessionId, tcs));
+
+          // TODO(mrober): Avoid this, so queued tasks can still fail properly.
+          // Complete the task right away to not block on-demand callers.
+          Logger.getLogger().d("Closing task for report: " + reportWithSessionId.getSessionId());
+          tcs.trySetResult(reportWithSessionId);
+
+          return tcs;
+        }
+
+        calcStep();
+        Logger.getLogger()
+            .d("Dropping report due to queue being full: " + reportWithSessionId.getSessionId());
+        onDemandCounter.incrementDroppedOnDemandExceptions();
+        tcs.trySetResult(reportWithSessionId); // Complete the task right away.
+        return tcs;
+      }
+
+      sendReport(reportWithSessionId, tcs);
+      return tcs;
+    }
+  }
+
+  // TODO(b/258263226): Migrate to go/firebase-android-executors
+  @SuppressLint({"DiscouragedApi", "ThreadPoolCreation"}) // best effort only
+  public void flushScheduledReportsIfAble() {
+    CountDownLatch latch = new CountDownLatch(1);
+    new Thread(
+            () -> {
+              try {
+                ForcedSender.sendBlocking(transport, Priority.HIGHEST);
+              } catch (SQLException ignored) {
+                // best effort only.
+              }
+              latch.countDown();
+            })
+        .start();
+    Utils.awaitUninterruptibly(latch, 2, TimeUnit.SECONDS);
+  }
+
+  /** Send the report to Crashlytics through Google DataTransport. */
+  private void sendReport(
+      CrashlyticsReportWithSessionId reportWithSessionId,
+      TaskCompletionSource<CrashlyticsReportWithSessionId> tcs) {
+    Logger.getLogger()
+        .d("Sending report through Google DataTransport: " + reportWithSessionId.getSessionId());
+    boolean isStartup = (SystemClock.elapsedRealtime() - startTimeMs) < STARTUP_DURATION_MS;
+    transport.schedule(
+        Event.ofUrgent(reportWithSessionId.getReport()),
+        error -> {
+          if (error != null) {
+            tcs.trySetException(error);
+            return;
+          }
+          if (isStartup) {
+            flushScheduledReportsIfAble();
+          }
+          tcs.trySetResult(reportWithSessionId);
+        });
+  }
+
+  private boolean isQueueAvailable() {
+    return queue.size() < queueCapacity;
+  }
+
+  private boolean isQueueFull() {
+    return queue.size() == queueCapacity;
+  }
+
+  /** Calculate the time to delay after sending a fatal event. */
+  private double calcDelay() {
+    return Math.min(MAX_DELAY_MS, MS_PER_MINUTE / ratePerMinute * Math.pow(base, calcStep()));
+  }
+
+  /** Calculate the current step value, based on the stored value and current time. */
+  private int calcStep() {
+    if (lastUpdatedMs == 0) {
+      lastUpdatedMs = now();
+    }
+
+    int delta = (int) ((now() - lastUpdatedMs) / stepDurationMs);
+    int calcStep =
+        isQueueFull()
+            ? Math.min(100, step + delta)
+            : Math.max(0, step - delta); // Step cannot go below 0.
+
+    // Update the stored step value and last updated time if changed.
+    if (step != calcStep) {
+      step = calcStep;
+      lastUpdatedMs = now();
+    }
+
+    return calcStep;
+  }
+
+  // TODO(mrober): Use some time provider that can be mocked in tests. SDK already has one?
+  private long now() {
+    return System.currentTimeMillis();
+  }
+
+  private final class ReportRunnable implements Runnable {
+    private final CrashlyticsReportWithSessionId reportWithSessionId;
+    private final TaskCompletionSource<CrashlyticsReportWithSessionId> tcs;
+
+    private ReportRunnable(
+        CrashlyticsReportWithSessionId reportWithSessionId,
+        TaskCompletionSource<CrashlyticsReportWithSessionId> tcs) {
+      this.reportWithSessionId = reportWithSessionId;
+      this.tcs = tcs;
+    }
+
+    @Override
+    public void run() {
+      sendReport(reportWithSessionId, tcs);
+      onDemandCounter.resetDroppedOnDemandExceptions();
+
+      // Block the single thread executor to enforce the rate, with or without backoff.
+      double delay = calcDelay();
+      Logger.getLogger()
+          .d(
+              "Delay for: "
+                  + String.format(Locale.US, "%.2f", delay / 1000)
+                  + " s for report: "
+                  + reportWithSessionId.getSessionId());
+      sleep(delay);
+    }
+  }
+
+  private static void sleep(double millis) {
+    try {
+      Thread.sleep((long) millis);
+    } catch (InterruptedException ignored) {
+      // nop
+    }
+  }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsJsonTransform.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsJsonTransform.java
index d5d3870774a..8d68e3ebf04 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsJsonTransform.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsJsonTransform.java
@@ -15,148 +15,51 @@
 package com.google.firebase.crashlytics.internal.settings;
 
 import com.google.firebase.crashlytics.internal.common.CurrentTimeProvider;
-import com.google.firebase.crashlytics.internal.settings.model.AppSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.FeaturesSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SessionSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.Settings;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
-import org.json.JSONException;
 import org.json.JSONObject;
 
-/** Default implementation of the JSON <-> {@link SettingsData} transform logic. */
+/**
+ * Default implementation of a SettingsJsonTransform that ignores the JSON and populates all fields
+ * with default values.
+ */
 class DefaultSettingsJsonTransform implements SettingsJsonTransform {
 
   @Override
-  public SettingsData buildFromJson(CurrentTimeProvider currentTimeProvider, JSONObject json)
-      throws JSONException {
+  public Settings buildFromJson(CurrentTimeProvider currentTimeProvider, JSONObject json) {
 
-    final int settingsVersion =
-        json.optInt(
-            SettingsJsonConstants.SETTINGS_VERSION, SettingsJsonConstants.SETTINGS_VERSION_DEFAULT);
-    final int cacheDuration =
-        json.optInt(
-            SettingsJsonConstants.CACHE_DURATION_KEY,
-            SettingsJsonConstants.SETTINGS_CACHE_DURATION_DEFAULT);
-
-    final AppSettingsData appData =
-        buildAppDataFrom(json.getJSONObject(SettingsJsonConstants.APP_KEY));
-    final SessionSettingsData settingsData =
-        buildSessionDataFrom(json.getJSONObject(SettingsJsonConstants.SESSION_KEY));
-    final FeaturesSettingsData featureData =
-        buildFeaturesSessionDataFrom(json.getJSONObject(SettingsJsonConstants.FEATURES_KEY));
-
-    final long expiresAtMillis = getExpiresAtFrom(currentTimeProvider, cacheDuration, json);
-
-    return new SettingsData(
-        expiresAtMillis, appData, settingsData, featureData, settingsVersion, cacheDuration);
+    return defaultSettings(currentTimeProvider);
   }
 
   /** Creates a new Settings with reasonable default values. */
   static Settings defaultSettings(CurrentTimeProvider currentTimeProvider) {
-    final int settingsVersion = SettingsJsonConstants.SETTINGS_VERSION_DEFAULT;
-    final int cacheDuration = SettingsJsonConstants.SETTINGS_CACHE_DURATION_DEFAULT;
-
-    JSONObject empty = new JSONObject();
-    final AppSettingsData appData = null;
-    final SessionSettingsData settingsData = buildSessionDataFrom(empty);
-    final FeaturesSettingsData featureData = buildFeaturesSessionDataFrom(empty);
-
-    final long expiresAtMillis = getExpiresAtFrom(currentTimeProvider, cacheDuration, empty);
-
-    return new SettingsData(
-        expiresAtMillis, appData, settingsData, featureData, settingsVersion, cacheDuration);
-  }
-
-  @Override
-  public JSONObject toJson(SettingsData settingsData) throws JSONException {
-    return new JSONObject()
-        .put(SettingsJsonConstants.EXPIRES_AT_KEY, settingsData.expiresAtMillis)
-        .put(SettingsJsonConstants.CACHE_DURATION_KEY, settingsData.cacheDuration)
-        .put(SettingsJsonConstants.SETTINGS_VERSION, settingsData.settingsVersion)
-        .put(SettingsJsonConstants.FEATURES_KEY, toFeaturesJson(settingsData.featuresData))
-        .put(SettingsJsonConstants.APP_KEY, toAppJson(settingsData.appData))
-        .put(SettingsJsonConstants.SESSION_KEY, toSessionJson(settingsData.sessionData));
-  }
-
-  private static AppSettingsData buildAppDataFrom(JSONObject json) throws JSONException {
-    final String status = json.getString(SettingsJsonConstants.APP_STATUS_KEY);
-    final String url = json.getString(SettingsJsonConstants.APP_URL_KEY);
-    final String reportsUrl = json.getString(SettingsJsonConstants.APP_REPORTS_URL_KEY);
-    final String ndkReportsUrl = json.getString(SettingsJsonConstants.APP_NDK_REPORTS_URL_KEY);
-    final boolean updateRequired =
-        json.optBoolean(
-            SettingsJsonConstants.APP_UPDATE_REQUIRED_KEY,
-            SettingsJsonConstants.APP_UPDATE_REQUIRED_DEFAULT);
-
-    return new AppSettingsData(status, url, reportsUrl, ndkReportsUrl, updateRequired);
-  }
-
-  private static FeaturesSettingsData buildFeaturesSessionDataFrom(JSONObject json) {
-    final boolean collectReports =
-        json.optBoolean(
-            SettingsJsonConstants.FEATURES_COLLECT_REPORTS_KEY,
-            SettingsJsonConstants.FEATURES_COLLECT_REPORTS_DEFAULT);
-
-    final boolean collectAnrs =
-        json.optBoolean(
-            SettingsJsonConstants.FEATURES_COLLECT_ANRS_KEY,
-            SettingsJsonConstants.FEATURES_COLLECT_ANRS_DEFAULT);
-
-    return new FeaturesSettingsData(collectReports, collectAnrs);
-  }
-
-  private static SessionSettingsData buildSessionDataFrom(JSONObject json) {
-    final int maxCustomExceptionEvents =
-        json.optInt(
-            SettingsJsonConstants.SETTINGS_MAX_CUSTOM_EXCEPTION_EVENTS_KEY,
-            SettingsJsonConstants.SETTINGS_MAX_CUSTOM_EXCEPTION_EVENTS_DEFAULT);
-    final int maxCompleteSessionsCount =
-        SettingsJsonConstants.SETTINGS_MAX_COMPLETE_SESSIONS_COUNT_DEFAULT;
-
-    return new SessionSettingsData(maxCustomExceptionEvents, maxCompleteSessionsCount);
-  }
-
-  private static long getExpiresAtFrom(
-      CurrentTimeProvider currentTimeProvider, long cacheDurationSeconds, JSONObject json) {
-    long expiresAtMillis = 0;
-
-    if (json.has(SettingsJsonConstants.EXPIRES_AT_KEY)) {
-      // If the JSON we receive has an expires_at key, use that value
-      expiresAtMillis = json.optLong(SettingsJsonConstants.EXPIRES_AT_KEY);
-    } else {
-      // If not, construct a new one from the current time and the loaded cache duration
-      // (in seconds)
-      final long currentTimeMillis = currentTimeProvider.getCurrentTimeMillis();
-      expiresAtMillis = currentTimeMillis + (cacheDurationSeconds * 1000);
-    }
-
-    return expiresAtMillis;
-  }
-
-  private JSONObject toAppJson(AppSettingsData appData) throws JSONException {
-    final JSONObject json =
-        new JSONObject()
-            .put(SettingsJsonConstants.APP_STATUS_KEY, appData.status)
-            .put(SettingsJsonConstants.APP_URL_KEY, appData.url)
-            .put(SettingsJsonConstants.APP_REPORTS_URL_KEY, appData.reportsUrl)
-            .put(SettingsJsonConstants.APP_NDK_REPORTS_URL_KEY, appData.ndkReportsUrl)
-            .put(SettingsJsonConstants.APP_UPDATE_REQUIRED_KEY, appData.updateRequired);
-
-    return json;
-  }
-
-  private JSONObject toFeaturesJson(FeaturesSettingsData features) throws JSONException {
-    return new JSONObject()
-        .put(SettingsJsonConstants.FEATURES_COLLECT_REPORTS_KEY, features.collectReports);
-  }
-
-  private JSONObject toSessionJson(SessionSettingsData data) throws JSONException {
-    return new JSONObject()
-        .put(
-            SettingsJsonConstants.SETTINGS_MAX_CUSTOM_EXCEPTION_EVENTS_KEY,
-            data.maxCustomExceptionEvents)
-        .put(
-            SettingsJsonConstants.SETTINGS_MAX_COMPLETE_SESSIONS_COUNT_KEY,
-            data.maxCompleteSessionsCount);
+    int settingsVersion = SettingsJsonConstants.SETTINGS_VERSION_DEFAULT;
+    int cacheDurationSeconds = SettingsJsonConstants.SETTINGS_CACHE_DURATION_DEFAULT;
+    double onDemandUploadRatePerMinute =
+        SettingsJsonConstants.SETTINGS_ON_DEMAND_UPLOAD_RATE_PER_MINUTE_DEFAULT;
+    double onDemandBackoffBase = SettingsJsonConstants.SETTINGS_ON_DEMAND_BACKOFF_BASE_DEFAULT;
+    int onDemandBackoffStepDurationSeconds =
+        SettingsJsonConstants.SETTINGS_ON_DEMAND_BACKOFF_STEP_DURATION_SECONDS_DEFAULT;
+
+    final Settings.SessionData sessionData =
+        new Settings.SessionData(
+            SettingsJsonConstants.SETTINGS_MAX_CUSTOM_EXCEPTION_EVENTS_DEFAULT,
+            SettingsJsonConstants.SETTINGS_MAX_COMPLETE_SESSIONS_COUNT_DEFAULT);
+    final Settings.FeatureFlagData featureFlagData =
+        new Settings.FeatureFlagData(
+            SettingsJsonConstants.FEATURES_COLLECT_REPORTS_DEFAULT,
+            SettingsJsonConstants.FEATURES_COLLECT_ANRS_DEFAULT,
+            SettingsJsonConstants.FEATURES_COLLECT_BUILD_IDS_DEFAULT);
+
+    long expiresAtMillis =
+        currentTimeProvider.getCurrentTimeMillis() + (cacheDurationSeconds * 1000);
+
+    return new Settings(
+        expiresAtMillis,
+        sessionData,
+        featureFlagData,
+        settingsVersion,
+        cacheDurationSeconds,
+        onDemandUploadRatePerMinute,
+        onDemandBackoffBase,
+        onDemandBackoffStepDurationSeconds);
   }
 }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/network/DefaultSettingsSpiCall.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsSpiCall.java
similarity index 96%
rename from firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/network/DefaultSettingsSpiCall.java
rename to firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsSpiCall.java
index 4eedaef5a19..dcfbdf8d0fd 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/network/DefaultSettingsSpiCall.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsSpiCall.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.crashlytics.internal.settings.network;
+package com.google.firebase.crashlytics.internal.settings;
 
 import android.text.TextUtils;
 import com.google.firebase.crashlytics.internal.Logger;
@@ -20,7 +20,6 @@
 import com.google.firebase.crashlytics.internal.network.HttpGetRequest;
 import com.google.firebase.crashlytics.internal.network.HttpRequestFactory;
 import com.google.firebase.crashlytics.internal.network.HttpResponse;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsRequest;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.util.HashMap;
@@ -28,7 +27,7 @@
 import org.json.JSONObject;
 
 /** Default implementation of the {@link SettingsSpiCall} */
-public class DefaultSettingsSpiCall implements SettingsSpiCall {
+class DefaultSettingsSpiCall implements SettingsSpiCall {
 
   static final String HEADER_GOOGLE_APP_ID = "X-CRASHLYTICS-GOOGLE-APP-ID";
   static final String HEADER_CLIENT_TYPE = "X-CRASHLYTICS-API-CLIENT-TYPE";
@@ -181,7 +180,9 @@ private HttpGetRequest applyHeadersTo(HttpGetRequest request, SettingsRequest re
     applyNonNullHeader(request, HEADER_OS_BUILD_VERSION, requestData.osBuildVersion);
     applyNonNullHeader(request, HEADER_OS_DISPLAY_VERSION, requestData.osDisplayVersion);
     applyNonNullHeader(
-        request, HEADER_INSTALLATION_ID, requestData.installIdProvider.getCrashlyticsInstallId());
+        request,
+        HEADER_INSTALLATION_ID,
+        requestData.installIdProvider.getInstallIds().getCrashlyticsInstallId());
 
     return request;
   }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/Settings.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/Settings.java
new file mode 100644
index 00000000000..e13dadd2633
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/Settings.java
@@ -0,0 +1,74 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.crashlytics.internal.settings;
+
+/** Immutable value object used to represent settings in memory. */
+public class Settings {
+
+  // Subsections of the Settings payload include session-specific params & feature flags.
+  public static class SessionData {
+    public final int maxCustomExceptionEvents;
+    public final int maxCompleteSessionsCount;
+
+    public SessionData(int maxCustomExceptionEvents, int maxCompleteSessionsCount) {
+      this.maxCustomExceptionEvents = maxCustomExceptionEvents;
+      this.maxCompleteSessionsCount = maxCompleteSessionsCount;
+    }
+  }
+
+  public static class FeatureFlagData {
+    public final boolean collectReports;
+    public final boolean collectAnrs;
+    public final boolean collectBuildIds;
+
+    public FeatureFlagData(boolean collectReports, boolean collectAnrs, boolean collectBuildIds) {
+      this.collectReports = collectReports;
+      this.collectAnrs = collectAnrs;
+      this.collectBuildIds = collectBuildIds;
+    }
+  }
+
+  public final SessionData sessionData;
+  public final FeatureFlagData featureFlagData;
+  public final long expiresAtMillis;
+  public final int settingsVersion;
+  public final int cacheDuration;
+  public final double onDemandUploadRatePerMinute;
+  public final double onDemandBackoffBase;
+  public final int onDemandBackoffStepDurationSeconds;
+
+  public Settings(
+      long expiresAtMillis,
+      SessionData sessionData,
+      FeatureFlagData featureFlagData,
+      int settingsVersion,
+      int cacheDuration,
+      double onDemandUploadRatePerMinute,
+      double onDemandBackoffBase,
+      int onDemandBackoffStepDurationSeconds) {
+    this.expiresAtMillis = expiresAtMillis;
+    this.sessionData = sessionData;
+    this.featureFlagData = featureFlagData;
+    this.settingsVersion = settingsVersion;
+    this.cacheDuration = cacheDuration;
+    this.onDemandUploadRatePerMinute = onDemandUploadRatePerMinute;
+    this.onDemandBackoffBase = onDemandBackoffBase;
+    this.onDemandBackoffStepDurationSeconds = onDemandBackoffStepDurationSeconds;
+  }
+
+  public boolean isExpired(long currentTimeMillis) {
+    return expiresAtMillis < currentTimeMillis;
+  }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsCacheBehavior.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsCacheBehavior.java
index 3df128aa84c..44f0ee7260d 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsCacheBehavior.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsCacheBehavior.java
@@ -15,7 +15,7 @@
 package com.google.firebase.crashlytics.internal.settings;
 
 /** Enum defining possible behaviors when looking up settings from cache */
-public enum SettingsCacheBehavior {
+enum SettingsCacheBehavior {
   /**
    * The normal behavior - tries to return settings from the cache, respecting their expiration
    * date/time.
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsController.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsController.java
index e16a7841683..d44c37257e3 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsController.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsController.java
@@ -32,12 +32,6 @@
 import com.google.firebase.crashlytics.internal.common.SystemCurrentTimeProvider;
 import com.google.firebase.crashlytics.internal.network.HttpRequestFactory;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
-import com.google.firebase.crashlytics.internal.settings.model.AppSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.Settings;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsRequest;
-import com.google.firebase.crashlytics.internal.settings.network.DefaultSettingsSpiCall;
-import com.google.firebase.crashlytics.internal.settings.network.SettingsSpiCall;
 import java.util.Locale;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicReference;
@@ -45,7 +39,7 @@
 import org.json.JSONObject;
 
 /** Implements the logic of when to use cached settings, and when to load them from the network. */
-public class SettingsController implements SettingsDataProvider {
+public class SettingsController implements SettingsProvider {
   private static final String PREFS_BUILD_INSTANCE_IDENTIFIER = "existing_instance_identifier";
 
   private static final String SETTINGS_URL_FORMAT =
@@ -62,7 +56,7 @@ public class SettingsController implements SettingsDataProvider {
   private final DataCollectionArbiter dataCollectionArbiter;
 
   private final AtomicReference<Settings> settings = new AtomicReference<>();
-  private final AtomicReference<TaskCompletionSource<AppSettingsData>> appSettingsData =
+  private final AtomicReference<TaskCompletionSource<Settings>> settingsTask =
       new AtomicReference<>(new TaskCompletionSource<>());
 
   SettingsController(
@@ -132,17 +126,22 @@ public static SettingsController create(
         dataCollectionArbiter);
   }
 
-  /** Gets the best available settings that have been loaded. */
-  public Settings getSettings() {
-    return settings.get();
+  /**
+   * Returns a Task that will be resolved with SettingsData, once it has been fetched from the
+   * network or loaded from the cache.
+   */
+  @Override
+  public Task<Settings> getSettingsAsync() {
+    return settingsTask.get().getTask();
   }
 
   /**
-   * Returns a Task that will be resolved with AppSettingsData, once it has been fetched from the
+   * Returns a Task that will be resolved with SettingsData, once it has been fetched from the
    * network or loaded from the cache.
    */
-  public Task<AppSettingsData> getAppSettings() {
-    return appSettingsData.get().getTask();
+  @Override
+  public Settings getSettingsSync() {
+    return settings.get();
   }
 
   /**
@@ -166,10 +165,10 @@ public Task<Void> loadSettingsData(SettingsCacheBehavior cacheBehavior, Executor
     // We need to bypass the cache if this is the first time a new build has run so the
     // backend will know about it.
     if (!buildInstanceIdentifierChanged()) {
-      final SettingsData cachedSettings = getCachedSettingsData(cacheBehavior);
+      final Settings cachedSettings = getCachedSettingsData(cacheBehavior);
       if (cachedSettings != null) {
         settings.set(cachedSettings);
-        appSettingsData.get().trySetResult(cachedSettings.getAppSettingsData());
+        settingsTask.get().trySetResult(cachedSettings);
         return Tasks.forResult(null);
       }
     }
@@ -179,11 +178,11 @@ public Task<Void> loadSettingsData(SettingsCacheBehavior cacheBehavior, Executor
     // This has been true in production for some time, though, so no rush to "fix" it.
 
     // The cached settings are too old, so if there are expired settings, use those for now.
-    final SettingsData expiredSettings =
+    final Settings expiredSettings =
         getCachedSettingsData(SettingsCacheBehavior.IGNORE_CACHE_EXPIRATION);
     if (expiredSettings != null) {
       settings.set(expiredSettings);
-      appSettingsData.get().trySetResult(expiredSettings.getAppSettingsData());
+      settingsTask.get().trySetResult(expiredSettings);
     }
 
     // Kick off fetching fresh settings.
@@ -201,10 +200,10 @@ public Task<Void> then(@Nullable Void aVoid) throws Exception {
                     settingsSpiCall.invoke(settingsRequest, dataCollectionToken);
 
                 if (settingsJson != null) {
-                  final SettingsData fetchedSettings =
+                  final Settings fetchedSettings =
                       settingsJsonParser.parseSettingsJson(settingsJson);
                   cachedSettingsIo.writeCachedSettings(
-                      fetchedSettings.getExpiresAtMillis(), settingsJson);
+                      fetchedSettings.expiresAtMillis, settingsJson);
                   logSettings(settingsJson, "Loaded settings: ");
 
                   setStoredBuildInstanceIdentifier(settingsRequest.instanceId);
@@ -212,14 +211,8 @@ public Task<Void> then(@Nullable Void aVoid) throws Exception {
                   // Update the regular settings.
                   settings.set(fetchedSettings);
 
-                  // Signal the app settings on any Tasks that already exist, and then replace the
-                  // task so
-                  // that any new callers get the new app settings instead of any old ones.
-                  appSettingsData.get().trySetResult(fetchedSettings.getAppSettingsData());
-                  TaskCompletionSource<AppSettingsData> fetchedAppSettings =
-                      new TaskCompletionSource<>();
-                  fetchedAppSettings.trySetResult(fetchedSettings.getAppSettingsData());
-                  appSettingsData.set(fetchedAppSettings);
+                  // Signal the Task that we have a new valid settings
+                  settingsTask.get().trySetResult(fetchedSettings);
                 }
 
                 return Tasks.forResult(null);
@@ -227,24 +220,24 @@ public Task<Void> then(@Nullable Void aVoid) throws Exception {
             });
   }
 
-  private SettingsData getCachedSettingsData(SettingsCacheBehavior cacheBehavior) {
-    SettingsData toReturn = null;
+  private Settings getCachedSettingsData(SettingsCacheBehavior cacheBehavior) {
+    Settings toReturn = null;
 
     try {
       if (!SettingsCacheBehavior.SKIP_CACHE_LOOKUP.equals(cacheBehavior)) {
         final JSONObject settingsJson = cachedSettingsIo.readCachedSettings();
 
         if (settingsJson != null) {
-          final SettingsData settingsData = settingsJsonParser.parseSettingsJson(settingsJson);
+          final Settings settings = settingsJsonParser.parseSettingsJson(settingsJson);
 
-          if (settingsData != null) {
+          if (settings != null) {
             logSettings(settingsJson, "Loaded cached settings: ");
 
             final long currentTimeMillis = currentTimeProvider.getCurrentTimeMillis();
 
             if (SettingsCacheBehavior.IGNORE_CACHE_EXPIRATION.equals(cacheBehavior)
-                || !settingsData.isExpired(currentTimeMillis)) {
-              toReturn = settingsData;
+                || !settings.isExpired(currentTimeMillis)) {
+              toReturn = settings;
               Logger.getLogger().v("Returning cached settings.");
             } else {
               Logger.getLogger().v("Cached settings have expired.");
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonConstants.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonConstants.java
index 2d7bfcd7393..d1e4079c7df 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonConstants.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonConstants.java
@@ -17,12 +17,14 @@
 class SettingsJsonConstants {
   // Top-level JSON Keys
   static final String EXPIRES_AT_KEY = "expires_at";
-  static final String APP_KEY = "app";
   static final String SESSION_KEY = "session";
   static final String SETTINGS_VERSION = "settings_version";
   static final String FEATURES_KEY = "features";
   static final String CACHE_DURATION_KEY = "cache_duration";
-  static final String FABRIC_KEY = "fabric";
+  static final String ON_DEMAND_UPLOAD_RATE_PER_MINUTE_KEY = "on_demand_upload_rate_per_minute";
+  static final String ON_DEMAND_BACKOFF_BASE_KEY = "on_demand_backoff_base";
+  static final String ON_DEMAND_BACKOFF_STEP_DURATION_SECONDS_KEY =
+      "on_demand_backoff_step_duration_seconds";
 
   // Top-level Defaults
   static final int SETTINGS_VERSION_DEFAULT = 0;
@@ -30,28 +32,15 @@ class SettingsJsonConstants {
   // Feature Switch Keys
   static final String FEATURES_COLLECT_REPORTS_KEY = "collect_reports";
   static final String FEATURES_COLLECT_ANRS_KEY = "collect_anrs";
+  static final String FEATURES_COLLECT_BUILD_IDS_KEY = "collect_build_ids";
 
   // Feature Switch Defaults
   static final boolean FEATURES_COLLECT_REPORTS_DEFAULT = true;
   static final boolean FEATURES_COLLECT_ANRS_DEFAULT = false;
-
-  // Fabric JSON Keys
-  static final String FABRIC_BUNDLE_ID = "bundle_id";
-  static final String FABRIC_ORGANIZATION_ID = "org_id";
+  static final boolean FEATURES_COLLECT_BUILD_IDS_DEFAULT = false;
 
   // App JSON Keys
   static final String APP_STATUS_KEY = "status";
-  static final String APP_URL_KEY = "url";
-  static final String APP_REPORTS_URL_KEY = "reports_url";
-  static final String APP_NDK_REPORTS_URL_KEY = "ndk_reports_url";
-  static final String APP_UPDATE_REQUIRED_KEY = "update_required";
-  static final String APP_REPORT_UPLOAD_VARIANT_KEY = "report_upload_variant";
-  static final String APP_NATIVE_REPORT_UPLOAD_VARIANT_KEY = "native_report_upload_variant";
-
-  // App JSON Defaults
-  static final boolean APP_UPDATE_REQUIRED_DEFAULT = false;
-  static final int APP_REPORT_UPLOAD_VARIANT_DEFAULT = 0;
-  static final int APP_NATIVE_REPORT_UPLOAD_VARIANT_DEFAULT = 0;
 
   // Settings JSON Keys
   static final String SETTINGS_MAX_CUSTOM_EXCEPTION_EVENTS_KEY = "max_custom_exception_events";
@@ -61,4 +50,7 @@ class SettingsJsonConstants {
   static final int SETTINGS_CACHE_DURATION_DEFAULT = 3600;
   static final int SETTINGS_MAX_CUSTOM_EXCEPTION_EVENTS_DEFAULT = 8;
   static final int SETTINGS_MAX_COMPLETE_SESSIONS_COUNT_DEFAULT = 4;
+  static final double SETTINGS_ON_DEMAND_UPLOAD_RATE_PER_MINUTE_DEFAULT = 10;
+  static final double SETTINGS_ON_DEMAND_BACKOFF_BASE_DEFAULT = 1.2;
+  static final int SETTINGS_ON_DEMAND_BACKOFF_STEP_DURATION_SECONDS_DEFAULT = 60;
 }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonParser.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonParser.java
index 5510eb64774..e24208b9a4a 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonParser.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonParser.java
@@ -14,8 +14,8 @@
 
 package com.google.firebase.crashlytics.internal.settings;
 
+import com.google.firebase.crashlytics.internal.Logger;
 import com.google.firebase.crashlytics.internal.common.CurrentTimeProvider;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -28,7 +28,7 @@ public class SettingsJsonParser {
     this.currentTimeProvider = currentTimeProvider;
   }
 
-  public SettingsData parseSettingsJson(JSONObject settingsJson) throws JSONException {
+  public Settings parseSettingsJson(JSONObject settingsJson) throws JSONException {
     final int version = settingsJson.getInt(SettingsJsonConstants.SETTINGS_VERSION);
     final SettingsJsonTransform jsonTransform = getJsonTransformForVersion(version);
     return jsonTransform.buildFromJson(currentTimeProvider, settingsJson);
@@ -39,6 +39,11 @@ private static SettingsJsonTransform getJsonTransformForVersion(int settingsVers
       case 3:
         return new SettingsV3JsonTransform();
       default:
+        Logger.getLogger()
+            .e(
+                "Could not determine SettingsJsonTransform for settings version "
+                    + settingsVersion
+                    + ". Using default settings values.");
         return new DefaultSettingsJsonTransform();
     }
   }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonTransform.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonTransform.java
index 89d2166a331..e6ba3424ff7 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonTransform.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonTransform.java
@@ -15,35 +15,24 @@
 package com.google.firebase.crashlytics.internal.settings;
 
 import com.google.firebase.crashlytics.internal.common.CurrentTimeProvider;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 /**
- * Internal interface defining bi-direction conversion to-from settings JSON and {@link
- * SettingsData} a model object.
+ * Internal interface defining bi-direction conversion to-from settings JSON and {@link Settings} a
+ * model object.
  */
 interface SettingsJsonTransform {
   /**
-   * Transforms the input JSON into the corresponding {@link SettingsData} model object. Should
-   * throw an exception rather than returning <code>null</code> in the event of a problem.
+   * Transforms the input JSON into the corresponding {@link Settings} model object. Should throw an
+   * exception rather than returning <code>null</code> in the event of a problem.
    *
    * @param currentTimeProvider {@link CurrentTimeProvider} to be used in filling in the {@link
-   *     SettingsData#expiresAtMillis} value
+   *     Settings#expiresAtMillis} value
    * @param json {@link JSONObject} to be translated
-   * @return {@link SettingsData} representing the translated JSON data
+   * @return {@link Settings} representing the translated JSON data
    * @throws JSONException if an exception occurs while handling the JSON
    */
-  SettingsData buildFromJson(CurrentTimeProvider currentTimeProvider, JSONObject json)
+  Settings buildFromJson(CurrentTimeProvider currentTimeProvider, JSONObject json)
       throws JSONException;
-
-  /**
-   * Transforms the provided {@link SettingsData} model object to its JSON representation. Should
-   * throw an exception rather than returning <code>null</code> in the event of a problem.
-   *
-   * @param settingsData {@link SettingsData} to translate
-   * @return {@link JSONObject} representing the settings data
-   * @throws JSONException if a problem occurs while translating the settings data.
-   */
-  JSONObject toJson(SettingsData settingsData) throws JSONException;
 }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsDataProvider.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsProvider.java
similarity index 72%
rename from firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsDataProvider.java
rename to firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsProvider.java
index 3f3ecad1cd4..4470f53498e 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsDataProvider.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsProvider.java
@@ -15,11 +15,9 @@
 package com.google.firebase.crashlytics.internal.settings;
 
 import com.google.android.gms.tasks.Task;
-import com.google.firebase.crashlytics.internal.settings.model.AppSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.Settings;
 
-public interface SettingsDataProvider {
-  Settings getSettings();
+public interface SettingsProvider {
+  Settings getSettingsSync();
 
-  Task<AppSettingsData> getAppSettings();
+  Task<Settings> getSettingsAsync();
 }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/SettingsRequest.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsRequest.java
similarity index 89%
rename from firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/SettingsRequest.java
rename to firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsRequest.java
index ea2b0cf75ae..48746100ae2 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/SettingsRequest.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsRequest.java
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.crashlytics.internal.settings.model;
+package com.google.firebase.crashlytics.internal.settings;
 
 import com.google.firebase.crashlytics.internal.common.InstallIdProvider;
 
 /** Immutable value object capturing the data needed to make an settings query SPI web request. */
-public class SettingsRequest {
+class SettingsRequest {
   public final String googleAppId;
   public final String deviceModel;
   public final String osBuildVersion;
@@ -33,7 +33,7 @@ public SettingsRequest(
       String deviceModel,
       String osBuildVersion,
       String osDisplayVersion,
-      InstallIdProvider installIdProvier,
+      InstallIdProvider installIdProvider,
       String instanceId,
       String displayVersion,
       String buildVersion,
@@ -42,7 +42,7 @@ public SettingsRequest(
     this.deviceModel = deviceModel;
     this.osBuildVersion = osBuildVersion;
     this.osDisplayVersion = osDisplayVersion;
-    this.installIdProvider = installIdProvier;
+    this.installIdProvider = installIdProvider;
     this.instanceId = instanceId;
     this.displayVersion = displayVersion;
     this.buildVersion = buildVersion;
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/network/SettingsSpiCall.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsSpiCall.java
similarity index 85%
rename from firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/network/SettingsSpiCall.java
rename to firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsSpiCall.java
index cb6f47b36b3..62bdac1bfcf 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/network/SettingsSpiCall.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsSpiCall.java
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.crashlytics.internal.settings.network;
+package com.google.firebase.crashlytics.internal.settings;
 
-import com.google.firebase.crashlytics.internal.settings.model.SettingsRequest;
 import org.json.JSONObject;
 
 /** Internal interface representing the SPI REST call to get settings from the server. */
-public interface SettingsSpiCall {
+interface SettingsSpiCall {
   /**
    * @param requestData {@link SettingsRequest} data to be sent to the server
    * @return the {@link JSONObject} created from JSON returned from the server, or <code>null</code>
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsV3JsonTransform.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsV3JsonTransform.java
index 5422c4512c5..e1cbbc6463e 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsV3JsonTransform.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsV3JsonTransform.java
@@ -15,105 +15,58 @@
 package com.google.firebase.crashlytics.internal.settings;
 
 import com.google.firebase.crashlytics.internal.common.CurrentTimeProvider;
-import com.google.firebase.crashlytics.internal.settings.model.AppSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.FeaturesSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SessionSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.SettingsData;
-import java.util.Locale;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 class SettingsV3JsonTransform implements SettingsJsonTransform {
 
-  private static final String CRASHLYTICS_APP_URL =
-      "https://update.crashlytics.com/spi/v1/platforms/android/apps";
-  private static final String CRASHLYTICS_APP_URL_FORMAT =
-      "https://update.crashlytics.com/spi/v1/platforms/android/apps/%s";
-  private static final String REPORTS_URL_FORMAT =
-      "https://reports.crashlytics.com/spi/v1/platforms/android/apps/%s/reports";
-  private static final String NDK_REPORTS_URL_FORMAT =
-      "https://reports.crashlytics.com/sdk-api/v1/platforms/android/apps/%s/minidumps";
-
   @Override
-  public SettingsData buildFromJson(CurrentTimeProvider currentTimeProvider, JSONObject json)
+  public Settings buildFromJson(CurrentTimeProvider currentTimeProvider, JSONObject json)
       throws JSONException {
-    final int settingsVersion =
+    int settingsVersion =
         json.optInt(
             SettingsJsonConstants.SETTINGS_VERSION, SettingsJsonConstants.SETTINGS_VERSION_DEFAULT);
-    final int cacheDuration =
+    int cacheDuration =
         json.optInt(
             SettingsJsonConstants.CACHE_DURATION_KEY,
             SettingsJsonConstants.SETTINGS_CACHE_DURATION_DEFAULT);
-
-    final AppSettingsData appData =
-        buildAppDataFrom(
-            json.getJSONObject(SettingsJsonConstants.FABRIC_KEY),
-            json.getJSONObject(SettingsJsonConstants.APP_KEY));
-    final SessionSettingsData sessionData = defaultSessionData();
-    final FeaturesSettingsData featureData =
-        buildFeaturesSessionDataFrom(json.getJSONObject(SettingsJsonConstants.FEATURES_KEY));
-
-    final long expiresAtMillis = getExpiresAtFrom(currentTimeProvider, cacheDuration, json);
-
-    return new SettingsData(
-        expiresAtMillis, appData, sessionData, featureData, settingsVersion, cacheDuration);
-  }
-
-  @Override
-  public JSONObject toJson(SettingsData settingsData) throws JSONException {
-    return new JSONObject()
-        .put(SettingsJsonConstants.EXPIRES_AT_KEY, settingsData.expiresAtMillis)
-        .put(SettingsJsonConstants.CACHE_DURATION_KEY, settingsData.cacheDuration)
-        .put(SettingsJsonConstants.SETTINGS_VERSION, settingsData.settingsVersion)
-        .put(SettingsJsonConstants.FEATURES_KEY, toFeaturesJson(settingsData.featuresData))
-        .put(SettingsJsonConstants.APP_KEY, toAppJson(settingsData.appData))
-        .put(SettingsJsonConstants.FABRIC_KEY, toFabricJson(settingsData.appData));
-  }
-
-  private static AppSettingsData buildAppDataFrom(JSONObject fabricJson, JSONObject appJson)
-      throws JSONException {
-    final String status = appJson.getString(SettingsJsonConstants.APP_STATUS_KEY);
-    final boolean isNewApp = AppSettingsData.STATUS_NEW.equals(status);
-
-    final String bundleId = fabricJson.getString(SettingsJsonConstants.FABRIC_BUNDLE_ID);
-    final String organizationId =
-        fabricJson.getString(SettingsJsonConstants.FABRIC_ORGANIZATION_ID);
-
-    final String url =
-        isNewApp
-            ? CRASHLYTICS_APP_URL
-            : String.format(Locale.US, CRASHLYTICS_APP_URL_FORMAT, bundleId);
-    final String reportsUrl = String.format(Locale.US, REPORTS_URL_FORMAT, bundleId);
-    final String ndkReportsUrl = String.format(Locale.US, NDK_REPORTS_URL_FORMAT, bundleId);
-
-    final boolean updateRequired =
-        appJson.optBoolean(
-            SettingsJsonConstants.APP_UPDATE_REQUIRED_KEY,
-            SettingsJsonConstants.APP_UPDATE_REQUIRED_DEFAULT);
-
-    final int reportUploadVariant =
-        appJson.optInt(
-            SettingsJsonConstants.APP_REPORT_UPLOAD_VARIANT_KEY,
-            SettingsJsonConstants.APP_REPORT_UPLOAD_VARIANT_DEFAULT);
-
-    final int nativeReportUploadVariant =
-        appJson.optInt(
-            SettingsJsonConstants.APP_NATIVE_REPORT_UPLOAD_VARIANT_KEY,
-            SettingsJsonConstants.APP_NATIVE_REPORT_UPLOAD_VARIANT_DEFAULT);
-
-    return new AppSettingsData(
-        status,
-        url,
-        reportsUrl,
-        ndkReportsUrl,
-        bundleId,
-        organizationId,
-        updateRequired,
-        reportUploadVariant,
-        nativeReportUploadVariant);
+    double onDemandUploadRatePerMinute =
+        json.optDouble(
+            SettingsJsonConstants.ON_DEMAND_UPLOAD_RATE_PER_MINUTE_KEY,
+            SettingsJsonConstants.SETTINGS_ON_DEMAND_UPLOAD_RATE_PER_MINUTE_DEFAULT);
+    double onDemandBackoffBase =
+        json.optDouble(
+            SettingsJsonConstants.ON_DEMAND_BACKOFF_BASE_KEY,
+            SettingsJsonConstants.SETTINGS_ON_DEMAND_BACKOFF_BASE_DEFAULT);
+    int onDemandBackoffStepDurationSeconds =
+        json.optInt(
+            SettingsJsonConstants.ON_DEMAND_BACKOFF_STEP_DURATION_SECONDS_KEY,
+            SettingsJsonConstants.SETTINGS_ON_DEMAND_BACKOFF_STEP_DURATION_SECONDS_DEFAULT);
+
+    // There's an "app" section that includes deprecated fields. We skip reading those.
+
+    // "session" section is not returned in current Settings values.
+    Settings.SessionData sessionData =
+        json.has(SettingsJsonConstants.SESSION_KEY)
+            ? buildSessionDataFrom(json.getJSONObject(SettingsJsonConstants.SESSION_KEY))
+            : buildSessionDataFrom(new JSONObject());
+    Settings.FeatureFlagData featureFlagData =
+        buildFeatureFlagDataFrom(json.getJSONObject(SettingsJsonConstants.FEATURES_KEY));
+
+    long expiresAtMillis = getExpiresAtFrom(currentTimeProvider, cacheDuration, json);
+
+    return new Settings(
+        expiresAtMillis,
+        sessionData,
+        featureFlagData,
+        settingsVersion,
+        cacheDuration,
+        onDemandUploadRatePerMinute,
+        onDemandBackoffBase,
+        onDemandBackoffStepDurationSeconds);
   }
 
-  private static FeaturesSettingsData buildFeaturesSessionDataFrom(JSONObject json) {
+  private static Settings.FeatureFlagData buildFeatureFlagDataFrom(JSONObject json) {
     final boolean collectReports =
         json.optBoolean(
             SettingsJsonConstants.FEATURES_COLLECT_REPORTS_KEY,
@@ -124,61 +77,36 @@ private static FeaturesSettingsData buildFeaturesSessionDataFrom(JSONObject json
             SettingsJsonConstants.FEATURES_COLLECT_ANRS_KEY,
             SettingsJsonConstants.FEATURES_COLLECT_ANRS_DEFAULT);
 
-    // TODO: Build support back for "collect logged exceptions"
+    final boolean collectBuildIds =
+        json.optBoolean(
+            SettingsJsonConstants.FEATURES_COLLECT_BUILD_IDS_KEY,
+            SettingsJsonConstants.FEATURES_COLLECT_BUILD_IDS_DEFAULT);
 
-    return new FeaturesSettingsData(collectReports, collectAnrs);
+    return new Settings.FeatureFlagData(collectReports, collectAnrs, collectBuildIds);
   }
 
-  private static SessionSettingsData defaultSessionData() {
+  private static Settings.SessionData buildSessionDataFrom(JSONObject json) {
     final int maxCustomExceptionEvents =
-        SettingsJsonConstants.SETTINGS_MAX_CUSTOM_EXCEPTION_EVENTS_DEFAULT;
+        json.optInt(
+            SettingsJsonConstants.SETTINGS_MAX_CUSTOM_EXCEPTION_EVENTS_KEY,
+            SettingsJsonConstants.SETTINGS_MAX_CUSTOM_EXCEPTION_EVENTS_DEFAULT);
     final int maxCompleteSessionsCount =
         SettingsJsonConstants.SETTINGS_MAX_COMPLETE_SESSIONS_COUNT_DEFAULT;
 
-    return new SessionSettingsData(maxCustomExceptionEvents, maxCompleteSessionsCount);
-  }
-
-  private JSONObject toFabricJson(AppSettingsData appData) throws JSONException {
-    final JSONObject json =
-        new JSONObject()
-            .put(SettingsJsonConstants.FABRIC_BUNDLE_ID, appData.bundleId)
-            .put(SettingsJsonConstants.FABRIC_ORGANIZATION_ID, appData.organizationId);
-
-    return json;
-  }
-
-  private JSONObject toAppJson(AppSettingsData appData) throws JSONException {
-    final JSONObject json =
-        new JSONObject()
-            .put(SettingsJsonConstants.APP_STATUS_KEY, appData.status)
-            .put(SettingsJsonConstants.APP_UPDATE_REQUIRED_KEY, appData.updateRequired)
-            .put(SettingsJsonConstants.APP_REPORT_UPLOAD_VARIANT_KEY, appData.reportUploadVariant)
-            .put(
-                SettingsJsonConstants.APP_NATIVE_REPORT_UPLOAD_VARIANT_KEY,
-                appData.nativeReportUploadVariant);
-
-    return json;
-  }
-
-  private JSONObject toFeaturesJson(FeaturesSettingsData features) throws JSONException {
-    return new JSONObject()
-        .put(SettingsJsonConstants.FEATURES_COLLECT_REPORTS_KEY, features.collectReports);
+    return new Settings.SessionData(maxCustomExceptionEvents, maxCompleteSessionsCount);
   }
 
   private static long getExpiresAtFrom(
       CurrentTimeProvider currentTimeProvider, long cacheDurationSeconds, JSONObject json) {
-    long expiresAtMillis = 0;
 
+    long expiresAtMillis;
     if (json.has(SettingsJsonConstants.EXPIRES_AT_KEY)) {
       // If the JSON we receive has an expires_at key, use that value
       expiresAtMillis = json.optLong(SettingsJsonConstants.EXPIRES_AT_KEY);
     } else {
-      // If not, construct a new one from the current time and the loaded cache duration
-      // (in seconds)
-      final long currentTimeMillis = currentTimeProvider.getCurrentTimeMillis();
-      expiresAtMillis = currentTimeMillis + (cacheDurationSeconds * 1000);
+      // If not, make a new one from the current time and the loaded cache duration (in seconds)
+      expiresAtMillis = currentTimeProvider.getCurrentTimeMillis() + (cacheDurationSeconds * 1000);
     }
-
     return expiresAtMillis;
   }
 }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/AppRequestData.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/AppRequestData.java
deleted file mode 100644
index d596441f101..00000000000
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/AppRequestData.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.crashlytics.internal.settings.model;
-
-/** Immutable value object capturing the data needed to make an App-related SPI web request. */
-public class AppRequestData {
-
-  public final String organizationId;
-  public final String googleAppId;
-  public final String appId;
-  public final String displayVersion;
-  public final String buildVersion;
-
-  public final String instanceIdentifier;
-  public final String name;
-  public final int source;
-  public final String minSdkVersion;
-  public final String builtSdkVersion;
-
-  public AppRequestData(
-      String organizationId,
-      String googleAppId,
-      String appId,
-      String displayVersion,
-      String buildVersion,
-      String instanceIdentifier,
-      String name,
-      int source,
-      String minSdkVersion,
-      String builtSdkVersion) {
-    this.organizationId = organizationId;
-    this.googleAppId = googleAppId;
-    this.appId = appId;
-    this.displayVersion = displayVersion;
-    this.buildVersion = buildVersion;
-
-    this.instanceIdentifier = instanceIdentifier;
-    this.name = name;
-    this.source = source;
-    this.minSdkVersion = minSdkVersion;
-    this.builtSdkVersion = builtSdkVersion;
-  }
-}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/AppSettingsData.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/AppSettingsData.java
deleted file mode 100644
index 114e9d1a452..00000000000
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/AppSettingsData.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.crashlytics.internal.settings.model;
-
-/** Immutable value object used to represent the App portion of settings in memory. */
-public class AppSettingsData {
-  public static final String STATUS_NEW = "new";
-  public static final String STATUS_CONFIGURED = "configured";
-  public static final String STATUS_ACTIVATED = "activated";
-
-  public final String status;
-  public final String url;
-  public final String reportsUrl;
-  public final String ndkReportsUrl;
-  public final String bundleId;
-  public final String organizationId;
-  public final boolean updateRequired;
-  public final int reportUploadVariant;
-  public final int nativeReportUploadVariant;
-
-  public AppSettingsData(
-      String status,
-      String url,
-      String reportsUrl,
-      String ndkReportsUrl,
-      String bundleId,
-      String organizationId,
-      boolean updateRequired,
-      int reportUploadVariant,
-      int nativeReportUploadVariant) {
-    this.status = status;
-    this.url = url;
-    this.reportsUrl = reportsUrl;
-    this.ndkReportsUrl = ndkReportsUrl;
-    this.bundleId = bundleId;
-    this.organizationId = organizationId;
-    this.updateRequired = updateRequired;
-    this.reportUploadVariant = reportUploadVariant;
-    this.nativeReportUploadVariant = nativeReportUploadVariant;
-  }
-
-  public AppSettingsData(
-      String status, String url, String reportsUrl, String ndkReportsUrl, boolean updateRequired) {
-    this(status, url, reportsUrl, ndkReportsUrl, null, null, updateRequired, 0, 0);
-  }
-}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/SettingsData.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/SettingsData.java
deleted file mode 100644
index 2483da6d805..00000000000
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/SettingsData.java
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.crashlytics.internal.settings.model;
-
-/** Immutable value object used to represent hold settings in memory. */
-public class SettingsData implements Settings {
-  public final AppSettingsData appData;
-  public final SessionSettingsData sessionData;
-  public final FeaturesSettingsData featuresData;
-  public final long expiresAtMillis;
-  public final int settingsVersion;
-  public final int cacheDuration;
-
-  public SettingsData(
-      long expiresAtMillis,
-      AppSettingsData appData,
-      SessionSettingsData sessionData,
-      FeaturesSettingsData featuresData,
-      int settingsVersion,
-      int cacheDuration) {
-    this.expiresAtMillis = expiresAtMillis;
-    this.appData = appData;
-    this.sessionData = sessionData;
-    this.featuresData = featuresData;
-    this.settingsVersion = settingsVersion;
-    this.cacheDuration = cacheDuration;
-  }
-
-  public AppSettingsData getAppSettingsData() {
-    return appData;
-  }
-
-  @Override
-  public boolean isExpired(long currentTimeMillis) {
-    return expiresAtMillis < currentTimeMillis;
-  }
-
-  @Override
-  public SessionSettingsData getSessionData() {
-    return sessionData;
-  }
-
-  @Override
-  public FeaturesSettingsData getFeaturesData() {
-    return featuresData;
-  }
-
-  @Override
-  public long getExpiresAtMillis() {
-    return expiresAtMillis;
-  }
-
-  @Override
-  public int getSettingsVersion() {
-    return settingsVersion;
-  }
-
-  @Override
-  public int getCacheDuration() {
-    return cacheDuration;
-  }
-}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/stacktrace/TrimmedThrowableData.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/stacktrace/TrimmedThrowableData.java
index d3fa541ab38..a69d43b58b3 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/stacktrace/TrimmedThrowableData.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/stacktrace/TrimmedThrowableData.java
@@ -14,6 +14,9 @@
 
 package com.google.firebase.crashlytics.internal.stacktrace;
 
+import androidx.annotation.Nullable;
+import java.util.Stack;
+
 /**
  * Decorator class that exposes the appropriate APIs for Crashlytics to write crash data, but which
  * pre-processes the stack trace to remove unnecessary frames based on the passed-in
@@ -23,14 +26,39 @@ public class TrimmedThrowableData {
   public final String localizedMessage;
   public final String className;
   public final StackTraceElement[] stacktrace;
-  public final TrimmedThrowableData cause;
+  @Nullable public final TrimmedThrowableData cause;
+
+  private TrimmedThrowableData(
+      String localizedMessage,
+      String className,
+      StackTraceElement[] stacktrace,
+      @Nullable TrimmedThrowableData cause) {
+    this.localizedMessage = localizedMessage;
+    this.className = className;
+    this.stacktrace = stacktrace;
+    this.cause = cause;
+  }
+
+  public static TrimmedThrowableData makeTrimmedThrowableData(
+      Throwable ex, StackTraceTrimmingStrategy trimmingStrategy) {
+    Stack<Throwable> throwableStack = new Stack<>();
+    Throwable exCause = ex;
+    while (exCause != null) {
+      throwableStack.push(exCause);
+      exCause = exCause.getCause();
+    }
 
-  public TrimmedThrowableData(Throwable ex, StackTraceTrimmingStrategy trimmingStrategy) {
-    this.localizedMessage = ex.getLocalizedMessage();
-    this.className = ex.getClass().getName();
-    this.stacktrace = trimmingStrategy.getTrimmedStackTrace(ex.getStackTrace());
+    TrimmedThrowableData trimmedThrowableData = null;
+    while (!throwableStack.isEmpty()) {
+      Throwable throwable = throwableStack.pop();
+      trimmedThrowableData =
+          new TrimmedThrowableData(
+              throwable.getLocalizedMessage(),
+              throwable.getClass().getName(),
+              trimmingStrategy.getTrimmedStackTrace(throwable.getStackTrace()),
+              trimmedThrowableData);
+    }
 
-    final Throwable exCause = ex.getCause();
-    this.cause = (exCause != null) ? new TrimmedThrowableData(exCause, trimmingStrategy) : null;
+    return trimmedThrowableData;
   }
 }
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/ktx/FirebaseCrashlytics.kt b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/ktx/FirebaseCrashlytics.kt
new file mode 100644
index 00000000000..84b64d8ecee
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/ktx/FirebaseCrashlytics.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.firebase.ktx.Firebase
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseCrashlytics] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-crashlytics-ktx` are now deprecated. As early as April 2024, we'll
+ * no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.crashlytics: FirebaseCrashlytics
+  get() = FirebaseCrashlytics.getInstance()
+
+/**
+ * Associates all key-value parameters with the reports
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-crashlytics-ktx` are now deprecated. As early as April 2024, we'll
+ * no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun FirebaseCrashlytics.setCustomKeys(init: KeyValueBuilder.() -> Unit) {
+  val builder = KeyValueBuilder(this)
+  builder.init()
+}
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase:firebase-crashlytics-ktx` are now deprecated. As early as April 2024, we'll
+ * no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+@Keep
+internal class FirebaseCrashlyticsKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+
+  companion object {}
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/ktx/KeyValueBuilder.kt b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/ktx/KeyValueBuilder.kt
new file mode 100644
index 00000000000..d24cdf1de93
--- /dev/null
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/ktx/KeyValueBuilder.kt
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.crashlytics.ktx
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+
+/** Helper class to enable fluent syntax in [setCustomKeys] */
+@Deprecated(
+  "Use `com.google.firebase.crashlytics.KeyValueBuilder` from the main module.",
+)
+class KeyValueBuilder(private val crashlytics: FirebaseCrashlytics) {
+
+  /**
+   * Sets a custom key and value that are associated with reports.
+   * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+   * respective main modules, and the Kotlin extension (KTX) APIs in
+   * `com.google.firebase:firebase-crashlytics-ktx` are now deprecated. As early as April 2024,
+   * we'll no longer release KTX modules. For details, see the
+   * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+   */
+  @Deprecated(
+    "Use `com.google.firebase.crashlytics.KeyValueBuilder.key(key, value)` from the main module.",
+    ReplaceWith("")
+  )
+  fun key(key: String, value: Boolean) = crashlytics.setCustomKey(key, value)
+
+  /**
+   * Sets a custom key and value that are associated with reports.
+   * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+   * respective main modules, and the Kotlin extension (KTX) APIs in
+   * `com.google.firebase:firebase-crashlytics-ktx` are now deprecated. As early as April 2024,
+   * we'll no longer release KTX modules. For details, see the
+   * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+   */
+  @Deprecated(
+    "Use `com.google.firebase.crashlytics.KeyValueBuilder.key(key, value)` from the main module.",
+    ReplaceWith("")
+  )
+  fun key(key: String, value: Double) = crashlytics.setCustomKey(key, value)
+
+  /**
+   * Sets a custom key and value that are associated with reports.
+   * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+   * respective main modules, and the Kotlin extension (KTX) APIs in
+   * `com.google.firebase:firebase-crashlytics-ktx` are now deprecated. As early as April 2024,
+   * we'll no longer release KTX modules. For details, see the
+   * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+   */
+  @Deprecated(
+    "Use `com.google.firebase.crashlytics.KeyValueBuilder.key(key, value)` from the main module.",
+    ReplaceWith("")
+  )
+  fun key(key: String, value: Float) = crashlytics.setCustomKey(key, value)
+
+  /**
+   * Sets a custom key and value that are associated with reports.
+   * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+   * respective main modules, and the Kotlin extension (KTX) APIs in
+   * `com.google.firebase:firebase-crashlytics-ktx` are now deprecated. As early as April 2024,
+   * we'll no longer release KTX modules. For details, see the
+   * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+   */
+  @Deprecated(
+    "Use `com.google.firebase.crashlytics.KeyValueBuilder.key(key, value)` from the main module.",
+    ReplaceWith("")
+  )
+  fun key(key: String, value: Int) = crashlytics.setCustomKey(key, value)
+
+  /**
+   * Sets a custom key and value that are associated with reports.
+   * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+   * respective main modules, and the Kotlin extension (KTX) APIs in
+   * `com.google.firebase:firebase-crashlytics-ktx` are now deprecated. As early as April 2024,
+   * we'll no longer release KTX modules. For details, see the
+   * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+   */
+  @Deprecated(
+    "Use `com.google.firebase.crashlytics.KeyValueBuilder.key(key, value)` from the main module.",
+    ReplaceWith("")
+  )
+  fun key(key: String, value: Long) = crashlytics.setCustomKey(key, value)
+
+  /**
+   * Sets a custom key and value that are associated with reports.
+   * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+   * respective main modules, and the Kotlin extension (KTX) APIs in
+   * `com.google.firebase:firebase-crashlytics-ktx` are now deprecated. As early as April 2024,
+   * we'll no longer release KTX modules. For details, see the
+   * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+   */
+  @Deprecated(
+    "Use `com.google.firebase.crashlytics.KeyValueBuilder.key(key, value)` from the main module.",
+    ReplaceWith("")
+  )
+  fun key(key: String, value: String) = crashlytics.setCustomKey(key, value)
+}
diff --git a/firebase-crashlytics/src/main/res/raw/firebase_crashlytics_keep.xml b/firebase-crashlytics/src/main/res/raw/firebase_crashlytics_keep.xml
new file mode 100644
index 00000000000..3c739b26c52
--- /dev/null
+++ b/firebase-crashlytics/src/main/res/raw/firebase_crashlytics_keep.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2024 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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 xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@string/com.google.firebase.crashlytics_*" />
\ No newline at end of file
diff --git a/firebase-crashlytics/src/test/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerRobolectricTest.java b/firebase-crashlytics/src/test/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerRobolectricTest.java
index b73943fc506..24ce37dd4b7 100644
--- a/firebase-crashlytics/src/test/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerRobolectricTest.java
+++ b/firebase-crashlytics/src/test/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerRobolectricTest.java
@@ -35,10 +35,12 @@
 import com.google.firebase.crashlytics.internal.metadata.LogFileManager;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
-import com.google.firebase.crashlytics.internal.settings.SettingsDataProvider;
-import com.google.firebase.crashlytics.internal.settings.model.FeaturesSettingsData;
-import com.google.firebase.crashlytics.internal.settings.model.Settings;
+import com.google.firebase.crashlytics.internal.settings.Settings;
+import com.google.firebase.crashlytics.internal.settings.Settings.FeatureFlagData;
+import com.google.firebase.crashlytics.internal.settings.Settings.SessionData;
+import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
 import com.google.firebase.inject.Deferred;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.TreeSet;
@@ -56,7 +58,7 @@ public class CrashlyticsControllerRobolectricTest {
 
   private Context testContext;
   @Mock private IdManager idManager;
-  @Mock private SettingsDataProvider mockSettingsDataProvider;
+  @Mock private SettingsProvider mockSettingsProvider;
   @Mock private FileStore testFileStore;
   @Mock private SessionReportingCoordinator mockSessionReportingCoordinator;
   @Mock private DataCollectionArbiter mockDataCollectionArbiter;
@@ -73,7 +75,7 @@ public void whenAvailable(
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     testContext = getApplicationContext();
     testFileStore = new FileStore(testContext);
   }
@@ -85,8 +87,8 @@ public void testDoCloseSession_enabledAnrs_doesNotPersistsAppExitInfoIfItDoesntE
 
     when(mockSessionReportingCoordinator.listSortedOpenSessionIds())
         .thenReturn(new TreeSet<>(Collections.singletonList(sessionId)));
-    mockSettingsData(true);
-    controller.doCloseSessions(mockSettingsDataProvider);
+    mockSettingsProvider(true, false);
+    controller.doCloseSessions(mockSettingsProvider);
     // Since we haven't added any app exit info to the shadow activity manager, there won't exist a
     // single app exit info, and so this method won't be called.
     verify(mockSessionReportingCoordinator, never())
@@ -106,8 +108,8 @@ public void testDoCloseSession_enabledAnrs_persistsAppExitInfoIfItExists() {
 
     when(mockSessionReportingCoordinator.listSortedOpenSessionIds())
         .thenReturn(new TreeSet<>(Collections.singletonList(sessionId)));
-    mockSettingsData(true);
-    controller.doCloseSessions(mockSettingsDataProvider);
+    mockSettingsProvider(true, false);
+    controller.doCloseSessions(mockSettingsProvider);
     verify(mockSessionReportingCoordinator)
         .persistRelevantAppExitInfoEvent(
             eq(sessionId),
@@ -123,25 +125,36 @@ public void testDoCloseSession_disabledAnrs_doesNotPersistsAppExitInfo() {
 
     when(mockSessionReportingCoordinator.listSortedOpenSessionIds())
         .thenReturn(new TreeSet<>(Collections.singletonList(sessionId)));
-    mockSettingsData(false);
-    controller.doCloseSessions(mockSettingsDataProvider);
+    mockSettingsProvider(false, false);
+    controller.doCloseSessions(mockSettingsProvider);
     verify(mockSessionReportingCoordinator, never())
         .persistRelevantAppExitInfoEvent(
             eq(sessionId), any(), any(LogFileManager.class), any(UserMetadata.class));
   }
 
-  private void mockSettingsData(boolean collectAnrs) {
-    Settings mockSettings = mock(Settings.class);
-    when(mockSettingsDataProvider.getSettings()).thenReturn(mockSettings);
-    when(mockSettings.getFeaturesData()).thenReturn(new FeaturesSettingsData(true, collectAnrs));
+  private void mockSettingsProvider(boolean collectAnrs, boolean collectBuildIds) {
+    Settings settings =
+        new Settings(
+            0,
+            new SessionData(4, 4),
+            new FeatureFlagData(true, collectAnrs, collectBuildIds),
+            3,
+            0,
+            1.0,
+            1.0,
+            1);
+    when(mockSettingsProvider.getSettingsSync()).thenReturn(settings);
   }
 
   /** Creates a new CrashlyticsController with default options and opens a session. */
   private CrashlyticsController createController() {
+    List<BuildIdInfo> buildIdInfoList = new ArrayList<>();
+    buildIdInfoList.add(new BuildIdInfo("lib.so", "x86", "aabb"));
     AppData appData =
         new AppData(
             GOOGLE_APP_ID,
             "buildId",
+            buildIdInfoList,
             "installerPackageName",
             "packageName",
             "versionCode",
@@ -161,7 +174,8 @@ private CrashlyticsController createController() {
             null,
             mockSessionReportingCoordinator,
             MISSING_NATIVE_COMPONENT,
-            mock(AnalyticsEventLogger.class));
+            mock(AnalyticsEventLogger.class),
+            mock(CrashlyticsAppQualitySessionsSubscriber.class));
     controller.openSession(SESSION_ID);
     return controller;
   }
diff --git a/firebase-crashlytics/src/test/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorRobolectricTest.java b/firebase-crashlytics/src/test/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorRobolectricTest.java
index d7e99245dcc..c29041668a6 100644
--- a/firebase-crashlytics/src/test/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorRobolectricTest.java
+++ b/firebase-crashlytics/src/test/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorRobolectricTest.java
@@ -51,6 +51,7 @@ public class SessionReportingCoordinatorRobolectricTest {
   @Mock private DataTransportCrashlyticsReportSender reportSender;
   @Mock private LogFileManager logFileManager;
   @Mock private UserMetadata reportMetadata;
+  @Mock private IdManager idManager;
   @Mock private CrashlyticsReport.Session.Event mockEvent;
   @Mock private CrashlyticsReport.Session.Event.Builder mockEventBuilder;
   @Mock private CrashlyticsReport.Session.Event.Application mockEventApp;
@@ -66,7 +67,12 @@ public void setUp() {
 
     reportingCoordinator =
         new SessionReportingCoordinator(
-            dataCapture, reportPersistence, reportSender, logFileManager, reportMetadata);
+            dataCapture,
+            reportPersistence,
+            reportSender,
+            logFileManager,
+            reportMetadata,
+            idManager);
     mockEventInteractions();
   }
 
diff --git a/firebase-crashlytics/src/test/java/com/google/firebase/crashlytics/internal/model/CrashlyticsReportTest.java b/firebase-crashlytics/src/test/java/com/google/firebase/crashlytics/internal/model/CrashlyticsReportTest.java
index 81e2240c31c..222ab0cceb9 100644
--- a/firebase-crashlytics/src/test/java/com/google/firebase/crashlytics/internal/model/CrashlyticsReportTest.java
+++ b/firebase-crashlytics/src/test/java/com/google/firebase/crashlytics/internal/model/CrashlyticsReportTest.java
@@ -25,6 +25,7 @@
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution.Thread.Frame;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
 
@@ -41,6 +42,8 @@ public void testWithEvents_returnsNewReportWithEvents() {
     assertNotEquals(testReport, withEventsReport);
     assertNotNull(withEventsReport.getSession().getEvents());
     assertEquals(2, withEventsReport.getSession().getEvents().size());
+    // no rollouts feature so we don't expect any rollouts state info within a event
+    assertNull(withEventsReport.getSession().getEvents().get(0).getRollouts());
   }
 
   @Test
@@ -49,7 +52,7 @@ public void testWithEvents_returnsNewReportWithAnr() {
 
     assertNull(testReport.getSession().getEvents());
     final CrashlyticsReport withAnrEventsReport =
-        testReport.withEvents(ImmutableList.from(makeAnrEvent()));
+        testReport.withEvents(Collections.singletonList(makeAnrEvent()));
 
     assertNotEquals(testReport, withAnrEventsReport);
     assertNotNull(withAnrEventsReport.getSession().getEvents());
@@ -191,6 +194,21 @@ public void testSetBinaryImageUuidUtf8Bytes_returnsProperUuid() {
     assertEquals(expectedUuid, binaryImage.getUuid());
   }
 
+  @Test
+  public void testWithEvents_returnsNewReportWithRolloutsState() {
+    final CrashlyticsReport testReport = makeTestReport();
+
+    List<Event> eventList = new ArrayList<Event>();
+    eventList.add(makeEventWithRolloutsState());
+    final CrashlyticsReport withEventsReport = testReport.withEvents(eventList);
+
+    assertNotEquals(testReport, withEventsReport);
+    assertNotNull(withEventsReport.getSession().getEvents());
+    assertEquals(1, withEventsReport.getSession().getEvents().size());
+
+    assertNotNull(withEventsReport.getSession().getEvents().get(0).getRollouts());
+  }
+
   private static CrashlyticsReport makeTestReport() {
     return CrashlyticsReport.builder()
         .setSdkVersion("sdkVersion")
@@ -221,12 +239,12 @@ private static Application makeTestApplication() {
         .build();
   }
 
-  private static ImmutableList<Event> makeTestEvents(int numEvents) {
+  private static List<Event> makeTestEvents(int numEvents) {
     List<Event> events = new ArrayList<>();
     for (int i = 0; i < numEvents; i++) {
       events.add(makeTestEvent());
     }
-    return ImmutableList.from(events);
+    return events;
   }
 
   private static Event makeAnrEvent() {
@@ -239,7 +257,7 @@ private static Event makeAnrEvent() {
                 .setExecution(
                     Execution.builder()
                         .setBinaries(
-                            ImmutableList.from(
+                            Collections.singletonList(
                                 Execution.BinaryImage.builder()
                                     .setBaseAddress(0)
                                     .setName("name")
@@ -273,7 +291,7 @@ private static Event makeTestEvent() {
                 .setExecution(
                     Execution.builder()
                         .setBinaries(
-                            ImmutableList.from(
+                            Collections.singletonList(
                                 Execution.BinaryImage.builder()
                                     .setBaseAddress(0)
                                     .setName("name")
@@ -289,7 +307,7 @@ private static Event makeTestEvent() {
                                 .build())
                         .setSignal(Signal.builder().setCode("0").setName("0").setAddress(0).build())
                         .setThreads(
-                            ImmutableList.from(
+                            Collections.singletonList(
                                 Session.Event.Application.Execution.Thread.builder()
                                     .setName("name")
                                     .setImportance(4)
@@ -310,6 +328,28 @@ private static Event makeTestEvent() {
         .build();
   }
 
+  private static Event makeEventWithRolloutsState() {
+    final Event event = makeTestEvent();
+
+    List<Event.RolloutAssignment> rolloutAssignmentList = new ArrayList<Event.RolloutAssignment>();
+    rolloutAssignmentList.add(
+        Event.RolloutAssignment.builder()
+            .setRolloutVariant(
+                Event.RolloutAssignment.RolloutVariant.builder()
+                    .setRolloutId("rollout_100")
+                    .setVariantId("enabled")
+                    .build())
+            .setParameterValue("true")
+            .setParameterKey("my_test_feature")
+            .setTemplateVersion(4)
+            .build());
+
+    Event.RolloutsState rolloutsState =
+        Event.RolloutsState.builder().setRolloutAssignments(rolloutAssignmentList).build();
+    final Event eventWithRolloutsState = event.toBuilder().setRollouts(rolloutsState).build();
+    return eventWithRolloutsState;
+  }
+
   private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo() {
     return CrashlyticsReport.ApplicationExitInfo.builder()
         .setTraceFile("trace")
@@ -323,29 +363,33 @@ private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo() {
         .build();
   }
 
-  private static ImmutableList<Frame> makeTestFrames() {
-    return ImmutableList.from(
+  private static List<Frame> makeTestFrames() {
+    ArrayList<Frame> frames = new ArrayList<>();
+    frames.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func1")
             .setFile("Test.java")
             .setOffset(36)
             .setImportance(4)
-            .build(),
+            .build());
+    frames.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func2")
             .setFile("Test.java")
             .setOffset(5637)
             .setImportance(4)
-            .build(),
+            .build());
+    frames.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func3")
             .setFile("Test.java")
             .setOffset(22429)
             .setImportance(4)
-            .build(),
+            .build());
+    frames.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func4")
@@ -353,5 +397,6 @@ private static ImmutableList<Frame> makeTestFrames() {
             .setOffset(751)
             .setImportance(4)
             .build());
+    return frames;
   }
 }
diff --git a/firebase-database-collection/CHANGELOG.md b/firebase-database-collection/CHANGELOG.md
new file mode 100644
index 00000000000..f514bbb890e
--- /dev/null
+++ b/firebase-database-collection/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Unreleased
+
+
diff --git a/firebase-database-collection/firebase-database-collection.gradle b/firebase-database-collection/firebase-database-collection.gradle
deleted file mode 100644
index 1764b056048..00000000000
--- a/firebase-database-collection/firebase-database-collection.gradle
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-plugins {
-    id 'firebase-library'
-}
-
-firebaseLibrary {
-    publishSources = true
-}
-
-android {
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-        targetSdkVersion project.targetSdkVersion
-        minSdkVersion project.minSdkVersion
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-    implementation 'com.google.android.gms:play-services-base:18.0.1'
-
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'net.java:quickcheck:0.6'
-
-    testAnnotationProcessor 'net.java:quickcheck-src-generator:0.6'
-    testAnnotationProcessor 'net.java.quickcheck:quickcheck-src-generator:0.6'
-}
diff --git a/firebase-database-collection/firebase-database-collection.gradle.kts b/firebase-database-collection/firebase-database-collection.gradle.kts
new file mode 100644
index 00000000000..be4edd44630
--- /dev/null
+++ b/firebase-database-collection/firebase-database-collection.gradle.kts
@@ -0,0 +1,50 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins { id("firebase-library") }
+
+firebaseLibrary {
+  publishSources = true
+  publishJavadoc = false
+  publishReleaseNotes = false
+}
+
+android {
+  val compileSdkVersion : Int by rootProject
+  val targetSdkVersion: Int by rootProject
+  val minSdkVersion: Int by rootProject
+
+  compileSdk = compileSdkVersion
+
+  namespace = "com.google.firebase.database.collection"
+  defaultConfig {
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+  }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+}
+
+dependencies {
+  implementation(libs.playservices.base)
+
+  testAnnotationProcessor("net.java:quickcheck-src-generator:0.6")
+  testAnnotationProcessor("net.java.quickcheck:quickcheck-src-generator:0.6")
+
+  testImplementation(libs.junit)
+  testImplementation(libs.quickcheck)
+}
diff --git a/firebase-database-collection/gradle.properties b/firebase-database-collection/gradle.properties
index 9b7be4891d1..977ba4623fa 100644
--- a/firebase-database-collection/gradle.properties
+++ b/firebase-database-collection/gradle.properties
@@ -1,2 +1,2 @@
-version=18.0.1
-latestReleasedVersion=18.0.0
+version=19.0.0
+latestReleasedVersion=18.0.1
diff --git a/firebase-database-collection/src/main/AndroidManifest.xml b/firebase-database-collection/src/main/AndroidManifest.xml
index 7ab0714c484..f2756910355 100644
--- a/firebase-database-collection/src/main/AndroidManifest.xml
+++ b/firebase-database-collection/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.database.collection">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for bazel builds-->
-    <!--<uses-sdk android:minSdkVersion="9" />-->
+    <!--<uses-sdk android:minSdkVersion="21" />-->
 </manifest>
diff --git a/firebase-database/CHANGELOG.md b/firebase-database/CHANGELOG.md
index aa7b51e4618..ffcef965f22 100644
--- a/firebase-database/CHANGELOG.md
+++ b/firebase-database/CHANGELOG.md
@@ -1,78 +1,301 @@
 # Unreleased
-- [fixed] Fixed a crash that prevented the RTDB SDK from reconnecting to the
-  backend if a token refresh attempt was unsuccesful.
+
+
+# 21.0.0
+* [changed] Bump internal dependencies
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.1
+* [fixed] Fixed the `@Exclude` annotation doesn't been propagated to Kotlin's corresponding bridge methods. [#5626](//github.com/firebase/firebase-android-sdk/pull/5706)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-database-ktx`
+  to `com.google.firebase:firebase-database` under the `com.google.firebase.database` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-database-ktx` have been added to
+  `com.google.firebase:firebase-database` under the `com.google.firebase.database` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-database-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.2.2
+* [changed] Internal changes to ensure alignment with other SDK releases.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.2.1
+* [changed] Internal changes to ensure alignment with other SDK releases.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.2.0
+* [unchanged] Updated to accommodate the release of the updated
+  [database] Kotlin extensions library.
+
+
+## Kotlin
+* [feature] Added
+  [`Query.values<T>()`](/docs/reference/kotlin/com/google/firebase/database/ktx/package-summary#values)
+  Kotlin Flows to listen for realtime updates and convert its values to a
+  specific type.
+
+# 20.1.0
+* [unchanged] Updated to accommodate the release of the updated
+[database] Kotlin extensions library.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+  `firebase-database` library. The Kotlin extensions library has the following
+  additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-database-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+* [feature] Added
+  [`Query.snapshots`](/docs/reference/kotlin/com/google/firebase/database/ktx/package-summary#snapshots)
+  and
+  [`Query.childEvents`](/docs/reference/kotlin/com/google/firebase/database/ktx/package-summary#childEvents)
+  Kotlin Flows to listen to realtime events.
+
+# 20.0.6
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+* [fixed] Fixed issue where `Query.get()` was propagating events to
+  listeners on unrelated queries.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.5
+* [fixed] `Query.get` no longer throws "Client is offline" exception when local
+  value is not available. Instead, it waits for a backend connection.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.4
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.3
+* [fixed] Fixed a crash that prevented the SDK from connecting to the
+backend if a credential refresh was unsuccesful.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
 
 # 20.0.2
-- [fixed] The SDK can now continue to issue writes for apps that send an
-  invalid App Check tokens if AppCheck enforcement is not enabled.
+* [fixed] The SDK can now continue to issue writes for apps that send
+  invalid [app_check] tokens if [app_check] enforcement is not enabled.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
 
 # 20.0.1
-- [fixed] Fixed an issue where connections would hang when using appcheck
-  without Auth.
+* [fixed] Fixed an issue that prevented clients from connecting to the
+  backend when the app used [app_check] without [auth].
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.0
+* [feature] Added abuse reduction features.
+* [changed] Internal changes to support dynamic feature modules.
+* [changed] Internal infrastructure improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
 
 # 19.7.0
-- [added] Added `Query.startAfter()` and `Query.endBefore()` filter for paginating
-  RTDB queries.
-- [fixed] Fixed an issue with `Query.get()` that caused the client to go offline if
-  only `get()` operations were pending.
+* [feature] Added [`Query#startAfter()`](/docs/reference/android/com/google/firebase/database/Query#startAfter(java.lang.String,%20java.lang.String))
+  and [`Query#endBefore()`](/docs/reference/android/com/google/firebase/database/Query#endBefore(java.lang.String,%20java.lang.String))
+  filters to help with paginated queries.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
 
 # 19.6.0
-- [fixed] Fixed a crash on some Pixel devices that occurred when closing the
+* [feature] Added [`DatabaseReference#get()`](/docs/reference/android/com/google/firebase/database/DatabaseReference#get())
+  and [`Query#get()`](/docs/reference/android/com/google/firebase/database/Query#get()),
+  which return data from the server even when older data is available in the local
+  cache.
+* [fixed] Fixed a crash that occured on some Pixel devices when closing the
   network connection.
-- [added] Added `Query.get()`, which allows users to receive a single data
-  snapshot. `Query.get()` returns the latest value even if an older value
-  already exists in cache.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
 
 # 19.5.1
-- [fixed] Fixes a regression in v19.4 that may cause assertion failures,
-  especially when persistence is enabled.
+* [fixed] Fixed a regression introduced in v19.3.0 that may cause assertion
+  failures, especially when persistence is enabled.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
 
 # 19.5.0
-- [changed] The SDK can now infer a default database URL if none is provided in
-  the config.
+* [feature] The SDK can now infer a default database URL even if it is omitted
+in the project's configuration.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
 
 # 19.4.0
-- [changed] Added internal HTTP header to the WebChannel connection.
-- [feature] Realtime Database now supports connecting to a local emulator via
- `FirebaseDatabase#useEmulator()`
+* [feature] Added support for connecting to the Firebase Emulator Suite via
+  a new method,
+  [`FirebaseDatabase#useEmulator()`](/docs/reference/android/com/google/firebase/database/FirebaseDatabase#useEmulator(java.lang.String,%20int)).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.3.1
+* [changed] Added internal HTTP header to the WebChannel connection.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
 
 # 19.3.0
-- [feature] Added ServerValue.increment() to support atomic field value increments
-  without transactions.
+* [feature] Added [`ServerValue.increment()`](/docs/reference/android/com/google/firebase/database/ServerValue#increment(double))
+  to support atomic field value increments without transactions.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.2.1
+* [changed] Internal changes to ensure functionality alignment with other SDK releases.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-database` library. The Kotlin extensions library has no additional
+updates.
 
 # 19.2.0
-- [changed] Added support for type wildcards in GenericTypeIndicator, expanding
-  our custom class serialization to include classes with wildcard generics
-  (#792).
+* [feature] Added support for type wildcards in
+  [`GenericTypeIndicator`](/docs/reference/android/com/google/firebase/database/GenericTypeIndicator),
+  expanding our custom class serialization to include classes with wildcard
+  generics.
 
-# 19.1.1
-- [fixed] Fixed a crash that occurred when we attempted to start a network
-  connection during app shutdown (#672).
+
+## Kotlin
+* [feature] The beta release of a [database] Android library with
+  Kotlin extensions is now available. The Kotlin extensions library transitively
+  includes the base `firebase-database` library. To learn more,  visit the
+  [[database] KTX documentation](/docs/reference/kotlin/com/google/firebase/database/ktx/package-summary).
 
 # 19.1.0
-- [feature] Added support for the Firebase Database Emulator. To connect to
-  the emulator, specify "http://<emulatorHost>/?ns=<projectId>" as your
-  Database URL (via `FirebaseDatabase.getInstance(String)`).
-  Note that if you are running the Database Emulator on "localhost" and
-  connecting from an app that is running inside an Android Emulator, the
-  emulator host will be "10.0.2.2" followed by its port.
+* [feature] Added support for the [firebase_database] Emulator. To connect
+  to the emulator, specify "http://<hostname>:<port>/?ns=<project_id>" as your
+  Database URL (via [`FirebaseDatabase.getInstance(String)`](/docs/reference/android/com/google/firebase/database/FirebaseDatabase.html#getSdkVersion())).
+  Note that if you are running the [database] Emulator on "localhost" and
+  connecting from an app that is running inside an Android Emulator,
+  the [database] Emulator host will be "10.0.2.2" followed by its port.
+
+# 19.0.0
+* [changed] Versioned to add nullability annotations to improve the Kotlin
+  developer experience. No other changes.
 
 # 18.0.1
-- [changed] The SDK now reports the correct version number (via
-  `FirebaseDatabase.getSdkVersion()`).
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases.
+* [fixed] The SDK now reports the correct version number (via
+  [`FirebaseDatabase.getSdkVersion()`](/docs/reference/android/com/google/firebase/database/FirebaseDatabase.html#getSdkVersion()`).
 
 # 17.0.0
-- [changed] Added `@RestrictTo` annotations to discourage the use of APIs that
-  are not public. This affects internal APIs that were previously obfuscated
-  and are not mentioned in our documentation.
-- [changed] Improved error messages for certain Number types that are not
-  supported by our serialization layer (#272).
-- [internal] Updated the SDK initialization process and removed usages of
-  deprecated method.
-- [changed] Added missing nullability annotations for better Kotlin interop.
-- [internal] Removed `@PublicApi` annotations as they are no longer enforced
-  and have no semantic meaning.
+* [changed] Internal changes that rely on an updated API to obtain
+  authentication credentials. If you use [firebase_auth], update to
+  `firebase-auth` v17.0.0 or later to ensure functionality alignment.
 
 # 16.0.6
-- [fixed] Fixed an issue that could cause a NullPointerException during the
-  initial handshake with the Firebase backend (#119).
+* [fixed] Fixed a potential `NullPointerException` calling method
+  `java.lang.String.toLowerCase`.
+  (https://github.com/firebase/firebase-android-sdk/issues/179)
+
+# 16.0.3
+* [fixed] Fixed an initialization issue that prevented the Realtime Database
+client from being initialized outside of Android's main thread.
+
+# 16.0.2
+* [fixed] This release includes minor fixes and improvements.
+
+# 16.0.1
+* [changed] Added `Nullability` annotations to all public API classes/methods.
+
diff --git a/firebase-database/api.txt b/firebase-database/api.txt
index 10826b93c8a..402c0ff3f02 100644
--- a/firebase-database/api.txt
+++ b/firebase-database/api.txt
@@ -1,6 +1,50 @@
 // Signature format: 2.0
 package com.google.firebase.database {
 
+  public abstract sealed class ChildEvent {
+  }
+
+  public static final class ChildEvent.Added extends com.google.firebase.database.ChildEvent {
+    ctor public ChildEvent.Added(@NonNull com.google.firebase.database.DataSnapshot snapshot, @Nullable String previousChildName);
+    method @NonNull public com.google.firebase.database.DataSnapshot component1();
+    method @Nullable public String component2();
+    method @NonNull public com.google.firebase.database.ChildEvent.Added copy(@NonNull com.google.firebase.database.DataSnapshot snapshot, @Nullable String previousChildName);
+    method @Nullable public String getPreviousChildName();
+    method @NonNull public com.google.firebase.database.DataSnapshot getSnapshot();
+    property @Nullable public final String previousChildName;
+    property @NonNull public final com.google.firebase.database.DataSnapshot snapshot;
+  }
+
+  public static final class ChildEvent.Changed extends com.google.firebase.database.ChildEvent {
+    ctor public ChildEvent.Changed(@NonNull com.google.firebase.database.DataSnapshot snapshot, @Nullable String previousChildName);
+    method @NonNull public com.google.firebase.database.DataSnapshot component1();
+    method @Nullable public String component2();
+    method @NonNull public com.google.firebase.database.ChildEvent.Changed copy(@NonNull com.google.firebase.database.DataSnapshot snapshot, @Nullable String previousChildName);
+    method @Nullable public String getPreviousChildName();
+    method @NonNull public com.google.firebase.database.DataSnapshot getSnapshot();
+    property @Nullable public final String previousChildName;
+    property @NonNull public final com.google.firebase.database.DataSnapshot snapshot;
+  }
+
+  public static final class ChildEvent.Moved extends com.google.firebase.database.ChildEvent {
+    ctor public ChildEvent.Moved(@NonNull com.google.firebase.database.DataSnapshot snapshot, @Nullable String previousChildName);
+    method @NonNull public com.google.firebase.database.DataSnapshot component1();
+    method @Nullable public String component2();
+    method @NonNull public com.google.firebase.database.ChildEvent.Moved copy(@NonNull com.google.firebase.database.DataSnapshot snapshot, @Nullable String previousChildName);
+    method @Nullable public String getPreviousChildName();
+    method @NonNull public com.google.firebase.database.DataSnapshot getSnapshot();
+    property @Nullable public final String previousChildName;
+    property @NonNull public final com.google.firebase.database.DataSnapshot snapshot;
+  }
+
+  public static final class ChildEvent.Removed extends com.google.firebase.database.ChildEvent {
+    ctor public ChildEvent.Removed(@NonNull com.google.firebase.database.DataSnapshot snapshot);
+    method @NonNull public com.google.firebase.database.DataSnapshot component1();
+    method @NonNull public com.google.firebase.database.ChildEvent.Removed copy(@NonNull com.google.firebase.database.DataSnapshot snapshot);
+    method @NonNull public com.google.firebase.database.DataSnapshot getSnapshot();
+    property @NonNull public final com.google.firebase.database.DataSnapshot snapshot;
+  }
+
   public interface ChildEventListener {
     method public void onCancelled(@NonNull com.google.firebase.database.DatabaseError);
     method public void onChildAdded(@NonNull com.google.firebase.database.DataSnapshot, @Nullable String);
@@ -49,6 +93,18 @@ package com.google.firebase.database {
   public class DatabaseException extends java.lang.RuntimeException {
   }
 
+  public final class DatabaseKt {
+    method @NonNull public static com.google.firebase.database.FirebaseDatabase database(@NonNull com.google.firebase.Firebase, @NonNull String url);
+    method @NonNull public static com.google.firebase.database.FirebaseDatabase database(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @NonNull public static com.google.firebase.database.FirebaseDatabase database(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String url);
+    method @NonNull public static kotlinx.coroutines.flow.Flow<com.google.firebase.database.ChildEvent> getChildEvents(@NonNull com.google.firebase.database.Query);
+    method @NonNull public static com.google.firebase.database.FirebaseDatabase getDatabase(@NonNull com.google.firebase.Firebase);
+    method @NonNull public static kotlinx.coroutines.flow.Flow<com.google.firebase.database.DataSnapshot> getSnapshots(@NonNull com.google.firebase.database.Query);
+    method public static inline <reified T> T getValue(@NonNull com.google.firebase.database.DataSnapshot);
+    method public static inline <reified T> T getValue(@NonNull com.google.firebase.database.MutableData);
+    method public static inline <reified T> kotlinx.coroutines.flow.Flow<? extends T> values(@NonNull com.google.firebase.database.Query);
+  }
+
   public class DatabaseReference extends com.google.firebase.database.Query {
     method @NonNull public com.google.firebase.database.DatabaseReference child(@NonNull String);
     method @NonNull public com.google.firebase.database.FirebaseDatabase getDatabase();
@@ -231,3 +287,63 @@ package com.google.firebase.database {
 
 }
 
+package com.google.firebase.database.ktx {
+
+  @Deprecated public abstract sealed class ChildEvent {
+  }
+
+  @Deprecated public static final class ChildEvent.Added extends com.google.firebase.database.ktx.ChildEvent {
+    ctor @Deprecated public ChildEvent.Added(@NonNull com.google.firebase.database.DataSnapshot snapshot, @Nullable String previousChildName);
+    method @Deprecated @NonNull public com.google.firebase.database.DataSnapshot component1();
+    method @Deprecated @Nullable public String component2();
+    method @Deprecated @NonNull public com.google.firebase.database.ktx.ChildEvent.Added copy(@NonNull com.google.firebase.database.DataSnapshot snapshot, @Nullable String previousChildName);
+    method @Deprecated @Nullable public String getPreviousChildName();
+    method @Deprecated @NonNull public com.google.firebase.database.DataSnapshot getSnapshot();
+    property @Nullable public final String previousChildName;
+    property @NonNull public final com.google.firebase.database.DataSnapshot snapshot;
+  }
+
+  @Deprecated public static final class ChildEvent.Changed extends com.google.firebase.database.ktx.ChildEvent {
+    ctor @Deprecated public ChildEvent.Changed(@NonNull com.google.firebase.database.DataSnapshot snapshot, @Nullable String previousChildName);
+    method @Deprecated @NonNull public com.google.firebase.database.DataSnapshot component1();
+    method @Deprecated @Nullable public String component2();
+    method @Deprecated @NonNull public com.google.firebase.database.ktx.ChildEvent.Changed copy(@NonNull com.google.firebase.database.DataSnapshot snapshot, @Nullable String previousChildName);
+    method @Deprecated @Nullable public String getPreviousChildName();
+    method @Deprecated @NonNull public com.google.firebase.database.DataSnapshot getSnapshot();
+    property @Nullable public final String previousChildName;
+    property @NonNull public final com.google.firebase.database.DataSnapshot snapshot;
+  }
+
+  @Deprecated public static final class ChildEvent.Moved extends com.google.firebase.database.ktx.ChildEvent {
+    ctor @Deprecated public ChildEvent.Moved(@NonNull com.google.firebase.database.DataSnapshot snapshot, @Nullable String previousChildName);
+    method @Deprecated @NonNull public com.google.firebase.database.DataSnapshot component1();
+    method @Deprecated @Nullable public String component2();
+    method @Deprecated @NonNull public com.google.firebase.database.ktx.ChildEvent.Moved copy(@NonNull com.google.firebase.database.DataSnapshot snapshot, @Nullable String previousChildName);
+    method @Deprecated @Nullable public String getPreviousChildName();
+    method @Deprecated @NonNull public com.google.firebase.database.DataSnapshot getSnapshot();
+    property @Nullable public final String previousChildName;
+    property @NonNull public final com.google.firebase.database.DataSnapshot snapshot;
+  }
+
+  @Deprecated public static final class ChildEvent.Removed extends com.google.firebase.database.ktx.ChildEvent {
+    ctor @Deprecated public ChildEvent.Removed(@NonNull com.google.firebase.database.DataSnapshot snapshot);
+    method @Deprecated @NonNull public com.google.firebase.database.DataSnapshot component1();
+    method @Deprecated @NonNull public com.google.firebase.database.ktx.ChildEvent.Removed copy(@NonNull com.google.firebase.database.DataSnapshot snapshot);
+    method @Deprecated @NonNull public com.google.firebase.database.DataSnapshot getSnapshot();
+    property @NonNull public final com.google.firebase.database.DataSnapshot snapshot;
+  }
+
+  public final class DatabaseKt {
+    method @Deprecated @NonNull public static com.google.firebase.database.FirebaseDatabase database(@NonNull com.google.firebase.ktx.Firebase, @NonNull String url);
+    method @Deprecated @NonNull public static com.google.firebase.database.FirebaseDatabase database(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @Deprecated @NonNull public static com.google.firebase.database.FirebaseDatabase database(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String url);
+    method @Deprecated @NonNull public static kotlinx.coroutines.flow.Flow<com.google.firebase.database.ktx.ChildEvent> getChildEvents(@NonNull com.google.firebase.database.Query);
+    method @Deprecated @NonNull public static com.google.firebase.database.FirebaseDatabase getDatabase(@NonNull com.google.firebase.ktx.Firebase);
+    method @Deprecated @NonNull public static kotlinx.coroutines.flow.Flow<com.google.firebase.database.DataSnapshot> getSnapshots(@NonNull com.google.firebase.database.Query);
+    method @Deprecated public static inline <reified T> T getValue(@NonNull com.google.firebase.database.DataSnapshot);
+    method @Deprecated public static inline <reified T> T getValue(@NonNull com.google.firebase.database.MutableData);
+    method @Deprecated public static inline <reified T> kotlinx.coroutines.flow.Flow<? extends T> values(@NonNull com.google.firebase.database.Query);
+  }
+
+}
+
diff --git a/firebase-database/firebase-database.gradle b/firebase-database/firebase-database.gradle
deleted file mode 100644
index 4a4898d39a1..00000000000
--- a/firebase-database/firebase-database.gradle
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-plugins {
-    id 'firebase-library'
-}
-
-firebaseLibrary {
-    testLab.enabled = true
-    publishSources = true
-}
-
-android {
-    adbOptions {
-        timeOutInMs 60 * 1000
-    }
-
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-        targetSdkVersion project.targetSdkVersion
-        minSdkVersion project.minSdkVersion
-        versionName version
-        multiDexEnabled true
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-        debug {
-        }
-    }
-    sourceSets {
-        androidTest {
-            java {
-                srcDir 'src/testUtil/java'
-            }
-        }
-        test {
-            java {
-                srcDir 'src/testUtil/java'
-            }
-            resources {
-                srcDirs "src/test/resources"
-            }
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    packagingOptions {
-        exclude 'META-INF/DEPENDENCIES'
-    }
-
-    testOptions.unitTests.includeAndroidResources = true
-}
-
-dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-database-collection')
-    implementation project(':firebase-components')
-    implementation project(':appcheck:firebase-appcheck-interop')
-
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'com.google.android.gms:play-services-basement:18.0.0'
-    implementation 'com.google.android.gms:play-services-base:18.0.1'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation('com.google.firebase:firebase-auth-interop:19.0.2') {
-        exclude group: "com.google.firebase", module: "firebase-common"
-    }
-
-    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
-
-    androidTestImplementation "androidx.annotation:annotation:1.1.0"
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'com.fasterxml.jackson.core:jackson-core:2.9.8'
-    androidTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'org.hamcrest:hamcrest:2.2'
-    androidTestImplementation 'org.hamcrest:hamcrest-library:2.2'
-    androidTestImplementation 'net.java:quickcheck:0.6'
-
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'com.firebase:firebase-token-generator:2.0.0'
-    testImplementation 'com.fasterxml.jackson.core:jackson-core:2.9.8'
-    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
-    testImplementation 'net.java.quickcheck:quickcheck:0.6'
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'androidx.test:rules:1.2.0'
-}
-
-gradle.projectsEvaluated {
-    tasks.withType(JavaCompile) {
-        // TODO: Re-enable error on warnings once errorprone issues are fixed.
-        options.compilerArgs << "-Xlint:deprecation" // << "-Werror"
-    }
-}
-
-// ==========================================================================
-// Copy from here down if you want to use the google-services plugin in your
-// androidTest integration tests.
-// ==========================================================================
-ext.packageName = "com.google.firebase.database"
-apply from: '../gradle/googleServices.gradle'
diff --git a/firebase-database/firebase-database.gradle.kts b/firebase-database/firebase-database.gradle.kts
new file mode 100644
index 00000000000..0bcab4ea88f
--- /dev/null
+++ b/firebase-database/firebase-database.gradle.kts
@@ -0,0 +1,96 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+    id("firebase-library")
+    id("kotlin-android")
+    id("copy-google-services")
+}
+
+firebaseLibrary {
+  libraryGroup("database")
+  testLab.enabled = true
+  publishSources = true
+}
+
+android {
+  val compileSdkVersion : Int by rootProject
+  val targetSdkVersion: Int by rootProject
+  val minSdkVersion: Int by rootProject
+
+  installation.timeOutInMs = 60 * 1000
+  compileSdk = compileSdkVersion
+
+  namespace = "com.google.firebase.database"
+  defaultConfig {
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+    multiDexEnabled = true
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+  }
+
+  buildTypes { release { isMinifyEnabled = false } }
+
+  sourceSets {
+    named("androidTest") { java.srcDir("src/testUtil/java") }
+    named("test") { java.srcDir("src/testUtil") }
+
+    compileOptions {
+      sourceCompatibility = JavaVersion.VERSION_1_8
+      targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions { jvmTarget = "1.8" }
+
+    packagingOptions.resources.excludes += "META-INF/DEPENDENCIES"
+    testOptions.unitTests.isIncludeAndroidResources = true
+  }
+}
+
+dependencies {
+    api("com.google.firebase:firebase-appcheck-interop:17.1.0")
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
+    api("com.google.firebase:firebase-auth-interop:20.0.0") {
+     exclude(group = "com.google.firebase", module = "firebase-common")
+     exclude(group = "com.google.firebase", module = "firebase-components")
+   }
+    api("com.google.firebase:firebase-database-collection:18.0.1")
+    implementation(libs.androidx.annotation)
+    implementation(libs.bundles.playservices)
+    implementation(libs.kotlin.stdlib)
+    implementation(libs.kotlinx.coroutines.core)
+    api(libs.playservices.tasks)
+
+    testImplementation("com.fasterxml.jackson.core:jackson-core:2.13.1")
+    testImplementation("com.fasterxml.jackson.core:jackson-databind:2.13.1")
+    testImplementation("com.firebase:firebase-token-generator:2.0.0")
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.androidx.test.rules)
+    testImplementation(libs.junit)
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.quickcheck)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.truth)
+
+    androidTestImplementation("com.fasterxml.jackson.core:jackson-core:2.13.1")
+    androidTestImplementation("com.fasterxml.jackson.core:jackson-databind:2.13.1")
+    androidTestImplementation("org.hamcrest:hamcrest:2.2")
+    androidTestImplementation("org.hamcrest:hamcrest-library:2.2")
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.junit)
+    androidTestImplementation(libs.quickcheck)
+    androidTestImplementation(libs.truth)
+}
diff --git a/firebase-database/gradle.properties b/firebase-database/gradle.properties
index 340de2eeb6e..245bf5280b1 100644
--- a/firebase-database/gradle.properties
+++ b/firebase-database/gradle.properties
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=20.0.4
-latestReleasedVersion=20.0.3
+version=21.0.1
+latestReleasedVersion=21.0.0
 android.enableUnitTestBinaryResources=true
diff --git a/firebase-database/ktx/api.txt b/firebase-database/ktx/api.txt
index 848faff2eff..9767e86197c 100644
--- a/firebase-database/ktx/api.txt
+++ b/firebase-database/ktx/api.txt
@@ -1,14 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.database.ktx {
 
-  public final class DatabaseKt {
-    ctor public DatabaseKt();
-    method @NonNull public static com.google.firebase.database.FirebaseDatabase database(@NonNull com.google.firebase.ktx.Firebase, @NonNull String url);
-    method @NonNull public static com.google.firebase.database.FirebaseDatabase database(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
-    method @NonNull public static com.google.firebase.database.FirebaseDatabase database(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String url);
-    method @NonNull public static com.google.firebase.database.FirebaseDatabase getDatabase(@NonNull com.google.firebase.ktx.Firebase);
-    method @Nullable public static inline <reified T> T getValue(@NonNull com.google.firebase.database.DataSnapshot);
-    method @Nullable public static inline <reified T> T getValue(@NonNull com.google.firebase.database.MutableData);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-database/ktx/ktx.gradle b/firebase-database/ktx/ktx.gradle
deleted file mode 100644
index 1c89f194283..00000000000
--- a/firebase-database/ktx/ktx.gradle
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-plugins {
-    id 'firebase-library'
-    id 'kotlin-android'
-}
-
-firebaseLibrary {
-    releaseWith project(':firebase-database')
-    publishJavadoc = true
-    publishSources = true
-}
-
-android {
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-        minSdkVersion 16
-        multiDexEnabled true
-        targetSdkVersion project.targetSdkVersion
-        versionName version
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-        test.java {
-            srcDir 'src/test/kotlin'
-        }
-    }
-    testOptions.unitTests.includeAndroidResources = true
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-database')
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
-}
diff --git a/firebase-database/ktx/ktx.gradle.kts b/firebase-database/ktx/ktx.gradle.kts
new file mode 100644
index 00000000000..fd7f6bfba09
--- /dev/null
+++ b/firebase-database/ktx/ktx.gradle.kts
@@ -0,0 +1,63 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+  id("firebase-library")
+  id("kotlin-android")
+  kotlin("android")
+}
+
+group = "com.google.firebase"
+
+firebaseLibrary {
+  libraryGroup("database")
+  publishJavadoc = false
+  publishReleaseNotes = false
+  publishSources = true
+}
+
+android {
+  val compileSdkVersion: Int by rootProject
+  val targetSdkVersion: Int by rootProject
+  val minSdkVersion: Int by rootProject
+
+  compileSdk = compileSdkVersion
+
+  namespace = "com.google.firebase.database.ktx"
+  defaultConfig {
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+    multiDexEnabled = true
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+  }
+  sourceSets {
+    named("main") { java.srcDir("src/main/kotlin") }
+    named("test") { java.srcDir("src/test/kotlin") }
+  }
+
+  testOptions.unitTests.isIncludeAndroidResources = true
+}
+
+dependencies {
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api(project(":firebase-database"))
+
+    implementation("com.google.firebase:firebase-components:18.0.0")
+
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.junit)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.truth)
+}
diff --git a/firebase-database/ktx/src/main/AndroidManifest.xml b/firebase-database/ktx/src/main/AndroidManifest.xml
index 6c97f4b3b14..1d98a5ed1e0 100644
--- a/firebase-database/ktx/src/main/AndroidManifest.xml
+++ b/firebase-database/ktx/src/main/AndroidManifest.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.database.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.database.ktx.FirebaseDatabaseKtxRegistrar"
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.database.ktx.FirebaseDatabaseLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
diff --git a/firebase-database/ktx/src/main/kotlin/com/google/firebase/database/ktx/Database.kt b/firebase-database/ktx/src/main/kotlin/com/google/firebase/database/ktx/Database.kt
deleted file mode 100644
index 4e607399cbe..00000000000
--- a/firebase-database/ktx/src/main/kotlin/com/google/firebase/database/ktx/Database.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.database.ktx
-
-import androidx.annotation.Keep
-import com.google.firebase.FirebaseApp
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.database.DataSnapshot
-import com.google.firebase.database.FirebaseDatabase
-import com.google.firebase.database.GenericTypeIndicator
-import com.google.firebase.database.MutableData
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.platforminfo.LibraryVersionComponent
-
-/** Returns the [FirebaseDatabase] instance of the default [FirebaseApp]. */
-val Firebase.database: FirebaseDatabase
-    get() = FirebaseDatabase.getInstance()
-
-/** Returns the [FirebaseDatabase] instance for the specified [url]. */
-fun Firebase.database(url: String): FirebaseDatabase = FirebaseDatabase.getInstance(url)
-
-/** Returns the [FirebaseDatabase] instance of the given [FirebaseApp]. */
-fun Firebase.database(app: FirebaseApp): FirebaseDatabase = FirebaseDatabase.getInstance(app)
-
-/** Returns the [FirebaseDatabase] instance of the given [FirebaseApp] and [url]. */
-fun Firebase.database(app: FirebaseApp, url: String): FirebaseDatabase =
-FirebaseDatabase.getInstance(app, url)
-
-/**
- * Returns the content of the DataSnapshot converted to a POJO.
- *
- * Supports generics like List<> or Map<>. Use @JvmSuppressWildcards to force the compiler to
- * use the type `T`, and not `? extends T`.
- */
-inline fun <reified T> DataSnapshot.getValue(): T? {
-    return getValue(object : GenericTypeIndicator<T>() {})
-}
-
-/**
- * Returns the content of the MutableData converted to a POJO.
- *
- * Supports generics like List<> or Map<>. Use @JvmSuppressWildcards to force the compiler to
- * use the type `T`, and not `? extends T`.
- */
-inline fun <reified T> MutableData.getValue(): T? {
-    return getValue(object : GenericTypeIndicator<T>() {})
-}
-
-internal const val LIBRARY_NAME: String = "fire-db-ktx"
-
-/** @suppress */
-@Keep
-class FirebaseDatabaseKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-database/ktx/src/main/kotlin/com/google/firebase/database/ktx/Logging.kt b/firebase-database/ktx/src/main/kotlin/com/google/firebase/database/ktx/Logging.kt
new file mode 100644
index 00000000000..6f42bad09df
--- /dev/null
+++ b/firebase-database/ktx/src/main/kotlin/com/google/firebase/database/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.database.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.database.BuildConfig
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-db-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseDatabaseLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-database/ktx/src/test/kotlin/com/google/firebase/database/DataSnapshotUtil.kt b/firebase-database/ktx/src/test/kotlin/com/google/firebase/database/DataSnapshotUtil.kt
index 0890fe497e1..a2e8d1451b4 100644
--- a/firebase-database/ktx/src/test/kotlin/com/google/firebase/database/DataSnapshotUtil.kt
+++ b/firebase-database/ktx/src/test/kotlin/com/google/firebase/database/DataSnapshotUtil.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.database
 
@@ -20,22 +22,22 @@ import com.google.firebase.database.snapshot.NodeUtilities
 /**
  * Creates a custom DataSnapshot.
  *
- * This method is a workaround that enables the creation of a custom
- * DataSnapshot using package-private methods.
+ * This method is a workaround that enables the creation of a custom DataSnapshot using
+ * package-private methods.
  */
 fun createDataSnapshot(data: Any?, db: FirebaseDatabase): DataSnapshot {
-    var ref = DatabaseReference("https://test.firebaseio.com", db.config)
-    val node = NodeUtilities.NodeFromJSON(data)
-    return DataSnapshot(ref, IndexedNode.from(node))
+  var ref = DatabaseReference("https://test.firebaseio.com", db.config)
+  val node = NodeUtilities.NodeFromJSON(data)
+  return DataSnapshot(ref, IndexedNode.from(node))
 }
 
 /**
  * Creates a custom MutableData.
  *
- * This method is a workaround that enables the creation of a custom
- * MutableData using package-private methods.
+ * This method is a workaround that enables the creation of a custom MutableData using
+ * package-private methods.
  */
 fun createMutableData(data: Any?): MutableData {
-    val node = NodeUtilities.NodeFromJSON(data)
-    return MutableData(node)
+  val node = NodeUtilities.NodeFromJSON(data)
+  return MutableData(node)
 }
diff --git a/firebase-database/ktx/src/test/kotlin/com/google/firebase/database/ktx/DatabaseTests.kt b/firebase-database/ktx/src/test/kotlin/com/google/firebase/database/ktx/DatabaseTests.kt
index 3860d2c93e7..5ba53fa7edf 100644
--- a/firebase-database/ktx/src/test/kotlin/com/google/firebase/database/ktx/DatabaseTests.kt
+++ b/firebase-database/ktx/src/test/kotlin/com/google/firebase/database/ktx/DatabaseTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.database.ktx
 
@@ -40,194 +42,178 @@ const val EXISTING_APP = "existing"
 
 @IgnoreExtraProperties
 data class Player(
-    var name: String? = "",
-    var jersey: Int? = -1,
-    var goalkeeper: Boolean? = false,
-    var avg_goals_per_game: Double? = 0.0
+  var name: String? = "",
+  var jersey: Int? = -1,
+  var goalkeeper: Boolean? = false,
+  var avg_goals_per_game: Double? = 0.0
 ) {
-    @Exclude
-    fun toMap(): Map<String, Any?> {
-        return mapOf(
-            "name" to name,
-            "jersey" to jersey,
-            "goalkeeper" to goalkeeper,
-            "avg_goals_per_game" to avg_goals_per_game
-        )
-    }
+  @Exclude
+  fun toMap(): Map<String, Any?> {
+    return mapOf(
+      "name" to name,
+      "jersey" to jersey,
+      "goalkeeper" to goalkeeper,
+      "avg_goals_per_game" to avg_goals_per_game
+    )
+  }
 }
 
 abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .setDatabaseUrl("http://tests.fblocal.com:9000")
-                        .build()
-        )
-
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .setDatabaseUrl("http://tests.fblocal.com:9000")
-                        .build(),
-                EXISTING_APP
-        )
-    }
-
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .setDatabaseUrl("http://tests.fblocal.com:9000")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .setDatabaseUrl("http://tests.fblocal.com:9000")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class DatabaseTests : BaseTestCase() {
-    @Test
-    fun `database should delegate to FirebaseDatabase#getInstance()`() {
-        assertThat(Firebase.database).isSameInstanceAs(FirebaseDatabase.getInstance())
-    }
-
-    @Test
-    fun `FirebaseApp#database should delegate to FirebaseDatabase#getInstance(FirebaseApp)`() {
-        val app = Firebase.app(EXISTING_APP)
-        assertThat(Firebase.database(app)).isSameInstanceAs(FirebaseDatabase.getInstance(app))
-    }
-
-    @Test
-    fun `Firebase#database should delegate to FirebaseDatabase#getInstance(url)`() {
-        val url = "http://tests.fblocal.com:9000"
-        assertThat(Firebase.database(url)).isSameInstanceAs(FirebaseDatabase.getInstance(url))
-    }
-
-    @Test
-    fun `Firebase#database should delegate to FirebaseDatabase#getInstance(FirebaseApp, url)`() {
-        val app = Firebase.app(EXISTING_APP)
-        val url = "http://tests.fblocal.com:9000"
-        assertThat(Firebase.database(app, url)).isSameInstanceAs(FirebaseDatabase.getInstance(app, url))
-    }
+  @Test
+  fun `database should delegate to FirebaseDatabase#getInstance()`() {
+    assertThat(Firebase.database).isSameInstanceAs(FirebaseDatabase.getInstance())
+  }
+
+  @Test
+  fun `FirebaseApp#database should delegate to FirebaseDatabase#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.database(app)).isSameInstanceAs(FirebaseDatabase.getInstance(app))
+  }
+
+  @Test
+  fun `Firebase#database should delegate to FirebaseDatabase#getInstance(url)`() {
+    val url = "http://tests.fblocal.com:9000"
+    assertThat(Firebase.database(url)).isSameInstanceAs(FirebaseDatabase.getInstance(url))
+  }
+
+  @Test
+  fun `Firebase#database should delegate to FirebaseDatabase#getInstance(FirebaseApp, url)`() {
+    val app = Firebase.app(EXISTING_APP)
+    val url = "http://tests.fblocal.com:9000"
+    assertThat(Firebase.database(app, url)).isSameInstanceAs(FirebaseDatabase.getInstance(app, url))
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class DataSnapshotTests : BaseTestCase() {
-    @Test
-    fun `reified getValue works with basic types`() {
-        val data = mapOf(
-            "name" to "John Doe",
-            "jersey" to 35L,
-            "goalkeeper" to false,
-            "avg_goals_per_game" to 0.35
-        )
-        val dataSnapshot = createDataSnapshot(data, Firebase.database)
-        assertThat(dataSnapshot.child("name").getValue<String>()).isEqualTo("John Doe")
-        assertThat(dataSnapshot.child("jersey").getValue<Long>()).isEqualTo(35L)
-        assertThat(dataSnapshot.child("goalkeeper").getValue<Boolean>()).isEqualTo(false)
-        assertThat(dataSnapshot.child("avg_goals_per_game").getValue<Double>()).isEqualTo(0.35)
-    }
-
-    @Test
-    fun `reified getValue works with maps`() {
-        val data = mapOf(
-            "name" to "John Doe",
-            "jersey" to 35L,
-            "goalkeeper" to false,
-            "avg_goals_per_game" to 0.35
-        )
-        val dataSnapshot = createDataSnapshot(data, Firebase.database)
-        assertThat(dataSnapshot.getValue<Map<String, Any>>()).isEqualTo(data)
-    }
-
-    @Test
-    fun `reified getValue works with lists types`() {
-        val data = listOf(
-            "George",
-            "John",
-            "Paul",
-            "Ringo"
-        )
-        val dataSnapshot = createDataSnapshot(data, Firebase.database)
-        assertThat(dataSnapshot.getValue<List<String>>()).isEqualTo(data)
-    }
-
-    @Test
-    fun `reified getValue works with custom types`() {
-        val data = Player(
-            name = "John Doe",
-            jersey = 35,
-            goalkeeper = false,
-            avg_goals_per_game = 0.35
-        )
-        val dataSnapshot = createDataSnapshot(data.toMap(), Firebase.database)
-        assertThat(dataSnapshot.getValue<Player>()).isEqualTo(data)
-    }
+  @Test
+  fun `reified getValue works with basic types`() {
+    val data =
+      mapOf(
+        "name" to "John Doe",
+        "jersey" to 35L,
+        "goalkeeper" to false,
+        "avg_goals_per_game" to 0.35
+      )
+    val dataSnapshot = createDataSnapshot(data, Firebase.database)
+    assertThat(dataSnapshot.child("name").getValue<String>()).isEqualTo("John Doe")
+    assertThat(dataSnapshot.child("jersey").getValue<Long>()).isEqualTo(35L)
+    assertThat(dataSnapshot.child("goalkeeper").getValue<Boolean>()).isEqualTo(false)
+    assertThat(dataSnapshot.child("avg_goals_per_game").getValue<Double>()).isEqualTo(0.35)
+  }
+
+  @Test
+  fun `reified getValue works with maps`() {
+    val data =
+      mapOf(
+        "name" to "John Doe",
+        "jersey" to 35L,
+        "goalkeeper" to false,
+        "avg_goals_per_game" to 0.35
+      )
+    val dataSnapshot = createDataSnapshot(data, Firebase.database)
+    assertThat(dataSnapshot.getValue<Map<String, Any>>()).isEqualTo(data)
+  }
+
+  @Test
+  fun `reified getValue works with lists types`() {
+    val data = listOf("George", "John", "Paul", "Ringo")
+    val dataSnapshot = createDataSnapshot(data, Firebase.database)
+    assertThat(dataSnapshot.getValue<List<String>>()).isEqualTo(data)
+  }
+
+  @Test
+  fun `reified getValue works with custom types`() {
+    val data = Player(name = "John Doe", jersey = 35, goalkeeper = false, avg_goals_per_game = 0.35)
+    val dataSnapshot = createDataSnapshot(data.toMap(), Firebase.database)
+    assertThat(dataSnapshot.getValue<Player>()).isEqualTo(data)
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class MutableDataTests : BaseTestCase() {
-    @Test
-    fun `reified getValue works with basic types`() {
-        val data = mapOf(
-                "name" to "John Doe",
-                "jersey" to 35L,
-                "goalkeeper" to false,
-                "avg_goals_per_game" to 0.35
-        )
-        val mutableData = createMutableData(data)
-
-        assertThat(mutableData.child("name").getValue<String>()).isEqualTo("John Doe")
-        assertThat(mutableData.child("jersey").getValue<Long>()).isEqualTo(35L)
-        assertThat(mutableData.child("goalkeeper").getValue<Boolean>()).isEqualTo(false)
-        assertThat(mutableData.child("avg_goals_per_game").getValue<Double>()).isEqualTo(0.35)
-    }
-
-    @Test
-    fun `reified getValue works with maps`() {
-        val data = mapOf(
-                "name" to "John Doe",
-                "jersey" to 35L,
-                "goalkeeper" to false,
-                "avg_goals_per_game" to 0.35
-        )
-        val mutableData = createMutableData(data)
-        assertThat(mutableData.getValue<Map<String, Any>>()).isEqualTo(data)
-    }
-
-    @Test
-    fun `reified getValue works with lists types`() {
-        val data = listOf(
-                "George",
-                "John",
-                "Paul",
-                "Ringo"
-        )
-        val mutableData = createMutableData(data)
-        assertThat(mutableData.getValue<List<String>>()).isEqualTo(data)
-    }
-
-    @Test
-    fun `reified getValue works with custom types`() {
-        val data = Player(
-                name = "John Doe",
-                jersey = 35,
-                goalkeeper = false,
-                avg_goals_per_game = 0.35
-        )
-        val mutableData = createMutableData(data.toMap())
-        assertThat(mutableData.getValue<Player>()).isEqualTo(data)
-    }
+  @Test
+  fun `reified getValue works with basic types`() {
+    val data =
+      mapOf(
+        "name" to "John Doe",
+        "jersey" to 35L,
+        "goalkeeper" to false,
+        "avg_goals_per_game" to 0.35
+      )
+    val mutableData = createMutableData(data)
+
+    assertThat(mutableData.child("name").getValue<String>()).isEqualTo("John Doe")
+    assertThat(mutableData.child("jersey").getValue<Long>()).isEqualTo(35L)
+    assertThat(mutableData.child("goalkeeper").getValue<Boolean>()).isEqualTo(false)
+    assertThat(mutableData.child("avg_goals_per_game").getValue<Double>()).isEqualTo(0.35)
+  }
+
+  @Test
+  fun `reified getValue works with maps`() {
+    val data =
+      mapOf(
+        "name" to "John Doe",
+        "jersey" to 35L,
+        "goalkeeper" to false,
+        "avg_goals_per_game" to 0.35
+      )
+    val mutableData = createMutableData(data)
+    assertThat(mutableData.getValue<Map<String, Any>>()).isEqualTo(data)
+  }
+
+  @Test
+  fun `reified getValue works with lists types`() {
+    val data = listOf("George", "John", "Paul", "Ringo")
+    val mutableData = createMutableData(data)
+    assertThat(mutableData.getValue<List<String>>()).isEqualTo(data)
+  }
+
+  @Test
+  fun `reified getValue works with custom types`() {
+    val data = Player(name = "John Doe", jersey = 35, goalkeeper = false, avg_goals_per_game = 0.35)
+    val mutableData = createMutableData(data.toMap())
+    assertThat(mutableData.getValue<Player>()).isEqualTo(data)
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun `library version should be registered with runtime`() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
 }
diff --git a/firebase-database/src/androidTest/AndroidManifest.xml b/firebase-database/src/androidTest/AndroidManifest.xml
index 3df3c947faf..19545e3769d 100644
--- a/firebase-database/src/androidTest/AndroidManifest.xml
+++ b/firebase-database/src/androidTest/AndroidManifest.xml
@@ -14,9 +14,8 @@
 <!-- limitations under the License. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.google.firebase.database.android">
-    <!--<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23"/>-->
+          xmlns:tools="http://schemas.android.com/tools">
+    <!--<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33"/>-->
     <uses-permission android:name="android.permission.INTERNET"/>
     <application android:label="FirebaseDatabaseTests" android:largeHeap="true">
         <uses-library android:name="android.test.runner"/>
diff --git a/firebase-database/src/androidTest/java/com/google/firebase/database/DataTest.java b/firebase-database/src/androidTest/java/com/google/firebase/database/DataTest.java
index f14bdf3ed30..721cfbdf3f3 100644
--- a/firebase-database/src/androidTest/java/com/google/firebase/database/DataTest.java
+++ b/firebase-database/src/androidTest/java/com/google/firebase/database/DataTest.java
@@ -1084,10 +1084,10 @@ public void urlEncodingAndDecodingWorks()
 
     DatabaseReference ref =
         new DatabaseReference(
-            IntegrationTestValues.getNamespace() + "/a%b&c@d/space: /non-ascii:ø", ctx);
+            IntegrationTestValues.getDatabaseUrl() + "/a%b&c@d/space: /non-ascii:ø", ctx);
     String result = ref.toString();
     String encoded =
-        IntegrationTestValues.getNamespace() + "/a%25b%26c%40d/space%3A%20/non-ascii%3A%C3%B8";
+        IntegrationTestValues.getDatabaseUrl() + "/a%25b%26c%40d/space%3A%20/non-ascii%3A%C3%B8";
     assertEquals(encoded, result);
 
     String child = "" + new Random().nextInt(100000000);
@@ -1102,7 +1102,7 @@ public void nameWorksForRootAndNonRootLocations()
           InterruptedException {
     DatabaseConfig ctx = IntegrationTestHelpers.getContext(0);
 
-    DatabaseReference ref = new DatabaseReference(IntegrationTestValues.getNamespace(), ctx);
+    DatabaseReference ref = new DatabaseReference(IntegrationTestValues.getDatabaseUrl(), ctx);
     assertNull(ref.getKey());
     assertEquals("a", ref.child("a").getKey());
     assertEquals("c", ref.child("b/c").getKey());
@@ -1114,7 +1114,7 @@ public void nameAndRefWorkForSnapshots()
           InterruptedException {
     DatabaseConfig ctx = IntegrationTestHelpers.getContext(0);
 
-    DatabaseReference ref = new DatabaseReference(IntegrationTestValues.getNamespace(), ctx);
+    DatabaseReference ref = new DatabaseReference(IntegrationTestValues.getDatabaseUrl(), ctx);
     // Clear any data there
     new WriteFuture(ref, new MapBuilder().put("foo", 10).build()).timedGet();
 
@@ -1133,7 +1133,7 @@ public void nameAndRefWorkForSnapshots()
   public void parentWorksForRootAndNonRootLocations() throws DatabaseException {
     DatabaseConfig ctx = IntegrationTestHelpers.getContext(0);
 
-    DatabaseReference ref = new DatabaseReference(IntegrationTestValues.getNamespace(), ctx);
+    DatabaseReference ref = new DatabaseReference(IntegrationTestValues.getDatabaseUrl(), ctx);
     assertNull(ref.getParent());
     DatabaseReference child = ref.child("a");
     assertEquals(ref, child.getParent());
@@ -1146,9 +1146,9 @@ public void rootWorksForRootAndNonRootLocations() throws DatabaseException {
     DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
 
     ref = ref.getRoot();
-    assertEquals(IntegrationTestValues.getNamespace(), ref.toString());
+    assertEquals(IntegrationTestValues.getDatabaseUrl(), ref.toString());
     ref = ref.getRoot(); // Should be a no-op
-    assertEquals(IntegrationTestValues.getNamespace(), ref.toString());
+    assertEquals(IntegrationTestValues.getDatabaseUrl(), ref.toString());
   }
 
   // NOTE: skip test about child accepting numbers. Not applicable in a type-safe language
@@ -1187,14 +1187,14 @@ public void accessingInvalidPathsShouldThrow() throws DatabaseException, Interru
       }
 
       try {
-        new DatabaseReference(IntegrationTestValues.getNamespace() + "/" + path, ctx);
+        new DatabaseReference(IntegrationTestValues.getDatabaseUrl() + "/" + path, ctx);
         fail("Should not be a valid path: " + path);
       } catch (DatabaseException e) {
         // No-op, expected
       }
 
       try {
-        new DatabaseReference(IntegrationTestValues.getNamespace() + "/tests/" + path, ctx);
+        new DatabaseReference(IntegrationTestValues.getDatabaseUrl() + "/tests/" + path, ctx);
         fail("Should not be a valid path: " + path);
       } catch (DatabaseException e) {
         // No-op, expected
@@ -1478,7 +1478,7 @@ public void namespaceAreCaseInsensitive()
 
     String child = "" + new Random().nextInt(100000000);
     DatabaseReference ref1 =
-        new DatabaseReference(IntegrationTestValues.getNamespace() + "/" + child, ctx1);
+        new DatabaseReference(IntegrationTestValues.getDatabaseUrl() + "/" + child, ctx1);
     DatabaseReference ref2 =
         new DatabaseReference(
             "http://"
@@ -1497,7 +1497,7 @@ public void namespaceAreCaseInsensitive()
   @Test
   public void namespacesAreCaseInsensitiveInToString() throws DatabaseException {
     DatabaseConfig ctx = IntegrationTestHelpers.getContext(0);
-    DatabaseReference ref1 = new DatabaseReference(IntegrationTestValues.getNamespace(), ctx);
+    DatabaseReference ref1 = new DatabaseReference(IntegrationTestValues.getDatabaseUrl(), ctx);
     DatabaseReference ref2 =
         new DatabaseReference(
             "http://"
diff --git a/firebase-database/src/androidTest/java/com/google/firebase/database/EventTest.java b/firebase-database/src/androidTest/java/com/google/firebase/database/EventTest.java
index e2b782a2c9e..8a42a555181 100644
--- a/firebase-database/src/androidTest/java/com/google/firebase/database/EventTest.java
+++ b/firebase-database/src/androidTest/java/com/google/firebase/database/EventTest.java
@@ -264,6 +264,7 @@ public void writeLargeLongValueThenIncrement() throws DatabaseException, Interru
     ZombieVerifier.verifyRepoZombies(refs);
   }
 
+  // TODO(mtewani): This test can be flaky. It should be rewritten to ensure stability.
   @Test
   public void setMultipleEventListenersOnSameNode() throws DatabaseException, InterruptedException {
     List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
@@ -281,6 +282,9 @@ public void setMultipleEventListenersOnSameNode() throws DatabaseException, Inte
     ZombieVerifier.verifyRepoZombies(refs);
 
     writer.setValue(42);
+
+    IntegrationTestHelpers.waitForRoundtrip(reader);
+    IntegrationTestHelpers.waitForRoundtrip(writer);
     assertTrue(writeHelper.waitForEvents());
     assertTrue(writeHelper2.waitForEvents());
     assertTrue(readHelper.waitForEvents());
@@ -1070,6 +1074,7 @@ public void priorityChangeShouldRaiseChildMovedAndChildChangedAndValueOnParentAn
     ZombieVerifier.verifyRepoZombies(ref);
   }
 
+  // TODO(mtewani): This test can be flaky. It should be rewritten to ensure stability.
   @Test
   public void priorityChangeShouldRaiseChildMovedAndChildChangedAndValueOnParentAndChild2()
       throws DatabaseException, InterruptedException {
diff --git a/firebase-database/src/androidTest/java/com/google/firebase/database/FirebaseDatabaseTest.java b/firebase-database/src/androidTest/java/com/google/firebase/database/FirebaseDatabaseTest.java
index db7c69c66a5..2580e49dd1a 100644
--- a/firebase-database/src/androidTest/java/com/google/firebase/database/FirebaseDatabaseTest.java
+++ b/firebase-database/src/androidTest/java/com/google/firebase/database/FirebaseDatabaseTest.java
@@ -107,9 +107,9 @@ public void getInstanceForAppWithEmulator_throwsIfSetLate() {
   public void getInstanceForAppWithUrl() {
     FirebaseApp app =
         appForDatabaseUrl(IntegrationTestValues.getAltNamespace(), "getInstanceForAppWithUrl");
-    FirebaseDatabase db = FirebaseDatabase.getInstance(app, IntegrationTestValues.getNamespace());
+    FirebaseDatabase db = FirebaseDatabase.getInstance(app, IntegrationTestValues.getDatabaseUrl());
 
-    assertEquals(IntegrationTestValues.getNamespace(), db.getReference().toString());
+    assertEquals(IntegrationTestValues.getDatabaseUrl(), db.getReference().toString());
   }
 
   @Test
@@ -140,15 +140,15 @@ public void canInferDatabaseUrlFromProjectId() {
   public void getDifferentInstanceForAppWithUrl() {
     FirebaseApp app =
         appForDatabaseUrl(
-            IntegrationTestValues.getNamespace(), "getDifferentInstanceForAppWithUrl");
+            IntegrationTestValues.getDatabaseUrl(), "getDifferentInstanceForAppWithUrl");
     FirebaseDatabase unspecified = FirebaseDatabase.getInstance(app);
     FirebaseDatabase original =
-        FirebaseDatabase.getInstance(app, IntegrationTestValues.getNamespace());
+        FirebaseDatabase.getInstance(app, IntegrationTestValues.getDatabaseUrl());
     FirebaseDatabase alternate =
         FirebaseDatabase.getInstance(app, IntegrationTestValues.getAltNamespace());
 
-    assertEquals(IntegrationTestValues.getNamespace(), unspecified.getReference().toString());
-    assertEquals(IntegrationTestValues.getNamespace(), original.getReference().toString());
+    assertEquals(IntegrationTestValues.getDatabaseUrl(), unspecified.getReference().toString());
+    assertEquals(IntegrationTestValues.getDatabaseUrl(), original.getReference().toString());
     assertEquals(IntegrationTestValues.getAltNamespace(), alternate.getReference().toString());
   }
 
@@ -201,7 +201,8 @@ public void getInstanceForAppWithInvalidUrls() {
   @Test
   public void getReference() {
     FirebaseDatabase db = FirebaseDatabase.getInstance();
-    assertEquals(IntegrationTestValues.getNamespace() + "/foo", db.getReference("foo").toString());
+    assertEquals(
+        IntegrationTestValues.getDatabaseUrl() + "/foo", db.getReference("foo").toString());
   }
 
   @Test
@@ -235,16 +236,16 @@ public void persistenceSettings() {
   @Test
   public void getReferenceFromURLWithEmptyPath() {
     FirebaseDatabase db = FirebaseDatabase.getInstance();
-    DatabaseReference ref = db.getReferenceFromUrl(IntegrationTestValues.getNamespace());
-    assertEquals(IntegrationTestValues.getNamespace(), ref.toString());
+    DatabaseReference ref = db.getReferenceFromUrl(IntegrationTestValues.getDatabaseUrl());
+    assertEquals(IntegrationTestValues.getDatabaseUrl(), ref.toString());
   }
 
   @Test
   public void getReferenceFromURLWithPath() {
     FirebaseDatabase db = FirebaseDatabase.getInstance();
     DatabaseReference ref =
-        db.getReferenceFromUrl(IntegrationTestValues.getNamespace() + "/foo/bar");
-    assertEquals(IntegrationTestValues.getNamespace() + "/foo/bar", ref.toString());
+        db.getReferenceFromUrl(IntegrationTestValues.getDatabaseUrl() + "/foo/bar");
+    assertEquals(IntegrationTestValues.getDatabaseUrl() + "/foo/bar", ref.toString());
   }
 
   @Test(expected = DatabaseException.class)
@@ -261,8 +262,8 @@ public void getReferenceWithCustomDatabaseUrl() {
 
   @Test
   public void referenceEqualityForDatabase() {
-    FirebaseDatabase db1 = dbForDatabaseUrl(IntegrationTestValues.getNamespace(), "db1");
-    FirebaseDatabase db2 = dbForDatabaseUrl(IntegrationTestValues.getNamespace(), "db2");
+    FirebaseDatabase db1 = dbForDatabaseUrl(IntegrationTestValues.getDatabaseUrl(), "db1");
+    FirebaseDatabase db2 = dbForDatabaseUrl(IntegrationTestValues.getDatabaseUrl(), "db2");
     FirebaseDatabase altDb = dbForDatabaseUrl(IntegrationTestValues.getAltNamespace(), "altdb");
 
     DatabaseReference testRef1 = db1.getReference();
diff --git a/firebase-database/src/androidTest/java/com/google/firebase/database/InfoTest.java b/firebase-database/src/androidTest/java/com/google/firebase/database/InfoTest.java
index bd8c72ea17f..72a09bcf6ea 100644
--- a/firebase-database/src/androidTest/java/com/google/firebase/database/InfoTest.java
+++ b/firebase-database/src/androidTest/java/com/google/firebase/database/InfoTest.java
@@ -48,16 +48,16 @@ private DatabaseReference getRootNode() throws DatabaseException {
   public void canGetAReferenceToDotInfoNodes() throws DatabaseException {
     DatabaseReference root = getRootNode();
 
-    assertEquals(IntegrationTestValues.getNamespace() + "/.info", root.child(".info").toString());
+    assertEquals(IntegrationTestValues.getDatabaseUrl() + "/.info", root.child(".info").toString());
     assertEquals(
-        IntegrationTestValues.getNamespace() + "/.info/foo", root.child(".info/foo").toString());
+        IntegrationTestValues.getDatabaseUrl() + "/.info/foo", root.child(".info/foo").toString());
 
     DatabaseConfig ctx = IntegrationTestHelpers.getContext(0);
     DatabaseReference ref =
-        new DatabaseReference(IntegrationTestValues.getNamespace() + "/.info", ctx);
-    assertEquals(IntegrationTestValues.getNamespace() + "/.info", ref.toString());
-    ref = new DatabaseReference(IntegrationTestValues.getNamespace() + "/.info/foo", ctx);
-    assertEquals(IntegrationTestValues.getNamespace() + "/.info/foo", ref.toString());
+        new DatabaseReference(IntegrationTestValues.getDatabaseUrl() + "/.info", ctx);
+    assertEquals(IntegrationTestValues.getDatabaseUrl() + "/.info", ref.toString());
+    ref = new DatabaseReference(IntegrationTestValues.getDatabaseUrl() + "/.info/foo", ctx);
+    assertEquals(IntegrationTestValues.getDatabaseUrl() + "/.info/foo", ref.toString());
   }
 
   @Test
diff --git a/firebase-database/src/androidTest/java/com/google/firebase/database/IntegrationTestHelpers.java b/firebase-database/src/androidTest/java/com/google/firebase/database/IntegrationTestHelpers.java
index 69f4bd14923..75430c5a2a1 100644
--- a/firebase-database/src/androidTest/java/com/google/firebase/database/IntegrationTestHelpers.java
+++ b/firebase-database/src/androidTest/java/com/google/firebase/database/IntegrationTestHelpers.java
@@ -19,9 +19,11 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import androidx.test.platform.app.InstrumentationRegistry;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
 import com.google.firebase.database.android.AndroidAppCheckTokenProvider;
 import com.google.firebase.database.android.AndroidAuthTokenProvider;
 import com.google.firebase.database.core.CompoundWrite;
@@ -218,7 +220,7 @@ public static DatabaseConfig getContext(int i) {
   }
 
   public static DatabaseReference rootWithConfig(DatabaseConfig config) {
-    return new DatabaseReference(IntegrationTestValues.getNamespace(), config);
+    return new DatabaseReference(IntegrationTestValues.getDatabaseUrl(), config);
   }
 
   public static DatabaseReference getRandomNode() throws DatabaseException {
@@ -240,7 +242,7 @@ public static List<DatabaseReference> getRandomNode(int count) throws DatabaseEx
     String name = null;
     for (int i = 0; i < count; ++i) {
       DatabaseReference ref =
-          new DatabaseReference(IntegrationTestValues.getNamespace(), contexts.get(i));
+          new DatabaseReference(IntegrationTestValues.getDatabaseUrl(), contexts.get(i));
       if (name == null) {
         name = ref.push().getKey();
       }
@@ -307,7 +309,8 @@ public static String getTestSecret() {
     if (testSecret == null) {
       try {
         InputStream response =
-            new URL(IntegrationTestValues.getNamespace() + "/.nsadmin/.json?key=1234").openStream();
+            new URL(IntegrationTestValues.getDatabaseUrl() + "/.nsadmin/.json?key=1234")
+                .openStream();
         TypeReference<Map<String, Object>> t = new TypeReference<Map<String, Object>>() {};
         Map<String, Object> data = new ObjectMapper().readValue(response, t);
         testSecret = (String) ((List) data.get("secrets")).get(0);
@@ -333,6 +336,31 @@ public static void waitFor(Semaphore semaphore, int count, long timeout, TimeUni
     assertTrue("Operation timed out", success);
   }
 
+  public static DatabaseReference translateReference(DatabaseReference node, FirebaseDatabase db) {
+    return db.getReference().child(node.getPath().toString());
+  }
+
+  public static DataSnapshot referenceAtPath(DatabaseReference node, EventRecord record) {
+    return record.getSnapshot().child(node.getPath().toString());
+  }
+
+  public static FirebaseApp appForDatabaseUrl(String url, String name) {
+    return FirebaseApp.initializeApp(
+        InstrumentationRegistry.getInstrumentation().getTargetContext(),
+        new FirebaseOptions.Builder()
+            .setApplicationId("appid")
+            .setApiKey("apikey")
+            .setDatabaseUrl(url)
+            .build(),
+        name);
+  }
+
+  public static FirebaseDatabase getNewDatabase() {
+    FirebaseApp app =
+        appForDatabaseUrl(IntegrationTestValues.getDatabaseUrl(), UUID.randomUUID().toString());
+    return FirebaseDatabase.getInstance(app);
+  }
+
   public static DataSnapshot getSnap(Query ref) throws InterruptedException {
 
     final Semaphore semaphore = new Semaphore(0);
diff --git a/firebase-database/src/androidTest/java/com/google/firebase/database/IntegrationTestValues.java b/firebase-database/src/androidTest/java/com/google/firebase/database/IntegrationTestValues.java
index 2ba10d3d1a5..66f31d6574b 100644
--- a/firebase-database/src/androidTest/java/com/google/firebase/database/IntegrationTestValues.java
+++ b/firebase-database/src/androidTest/java/com/google/firebase/database/IntegrationTestValues.java
@@ -16,6 +16,7 @@
 
 import android.content.Context;
 import androidx.test.platform.app.InstrumentationRegistry;
+import com.google.android.gms.common.internal.StringResourceValueReader;
 
 public class IntegrationTestValues {
   private static final String TEST_ALT_NAMESPACE = "https://test.firebaseio.com";
@@ -24,9 +25,19 @@ public class IntegrationTestValues {
 
   private IntegrationTestValues() {}
 
+  public static String getDatabaseUrl() {
+    return getResource("firebase_database_url");
+  }
+
   public static String getNamespace() {
-    Context c = InstrumentationRegistry.getInstrumentation().getContext();
-    return c.getResources().getString(R.string.firebase_database_url);
+    String dbUrl = getDatabaseUrl();
+    String namespaceWithScheme = dbUrl.substring(0, dbUrl.indexOf('.'));
+    return namespaceWithScheme.substring(namespaceWithScheme.lastIndexOf("/") + 1);
+  }
+
+  public static String getHostname() {
+    String dbUrl = getDatabaseUrl();
+    return dbUrl.substring(dbUrl.lastIndexOf("/") + 1);
   }
 
   public static String getAltNamespace() {
@@ -34,8 +45,7 @@ public static String getAltNamespace() {
   }
 
   public static String getProjectId() {
-    Context c = InstrumentationRegistry.getInstrumentation().getContext();
-    return c.getResources().getString(R.string.project_id);
+    return getResource("project_id");
   }
 
   public static long getTimeout() {
@@ -45,4 +55,9 @@ public static long getTimeout() {
   public static String getServer() {
     return TEST_SERVER;
   }
+
+  private static String getResource(String name) {
+    Context currentContext = InstrumentationRegistry.getInstrumentation().getContext();
+    return new StringResourceValueReader(currentContext).getString(name);
+  }
 }
diff --git a/firebase-database/src/androidTest/java/com/google/firebase/database/QueryTest.java b/firebase-database/src/androidTest/java/com/google/firebase/database/QueryTest.java
index 99e8fd76f93..d2826c7cded 100644
--- a/firebase-database/src/androidTest/java/com/google/firebase/database/QueryTest.java
+++ b/firebase-database/src/androidTest/java/com/google/firebase/database/QueryTest.java
@@ -14,6 +14,13 @@
 
 package com.google.firebase.database;
 
+import static android.os.AsyncTask.THREAD_POOL_EXECUTOR;
+import static com.google.android.gms.tasks.Tasks.await;
+import static com.google.firebase.database.IntegrationTestHelpers.getNewDatabase;
+import static com.google.firebase.database.IntegrationTestHelpers.getRandomNode;
+import static com.google.firebase.database.IntegrationTestHelpers.referenceAtPath;
+import static com.google.firebase.database.IntegrationTestHelpers.translateReference;
+import static com.google.firebase.database.IntegrationTestHelpers.waitFor;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,12 +31,8 @@
 
 import androidx.annotation.NonNull;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.platform.app.InstrumentationRegistry;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
 import com.google.firebase.database.core.DatabaseConfig;
 import com.google.firebase.database.core.Path;
 import com.google.firebase.database.core.RepoManager;
@@ -39,9 +42,11 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -64,7 +69,7 @@ public void tearDown() {
   @Test
   public void canCreateBasicQueries() throws DatabaseException {
     // Just make sure they don't throw anything
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.limitToLast(10);
     ref.startAt("199").limitToLast(10);
@@ -91,7 +96,7 @@ public void canCreateBasicQueries() throws DatabaseException {
 
   @Test
   public void invalidPathsToOrderByThrow() throws DatabaseException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     List<String> badKeys =
         Arrays.asList(
@@ -117,7 +122,7 @@ public void invalidPathsToOrderByThrow() throws DatabaseException {
 
   @Test
   public void invalidQueriesThrow() throws DatabaseException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     try {
       ref.orderByKey().orderByPriority();
@@ -395,7 +400,7 @@ public void invalidQueriesThrow() throws DatabaseException {
 
   @Test
   public void passingInvalidKeysToStartAtOrEndAtThrows() throws DatabaseException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     List<String> badKeys =
         Arrays.asList(
@@ -419,7 +424,7 @@ public void passingInvalidKeysToStartAtOrEndAtThrows() throws DatabaseException
 
   @Test
   public void passingInvalidKeysToStartAfterOrEndBeforeThrows() throws DatabaseException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     List<String> badKeys =
         Arrays.asList(
@@ -446,7 +451,7 @@ public void passingInvalidKeysToStartAfterOrEndBeforeThrows() throws DatabaseExc
   public void listenerCanBeRemovedFromSpecificQuery()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final Semaphore semaphore = new Semaphore(0);
     ValueEventListener listener =
@@ -474,7 +479,7 @@ public void onCancelled(DatabaseError error) {}
   public void removingListenersWorks()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final Semaphore semaphore = new Semaphore(0);
     ValueEventListener listener =
@@ -491,7 +496,7 @@ public void onCancelled(DatabaseError error) {}
                 });
 
     ref.setValue(new MapBuilder().put("a", 5).put("b", 6).build());
-    IntegrationTestHelpers.waitFor(semaphore, 1);
+    waitFor(semaphore, 1);
     ref.limitToLast(5).removeEventListener(listener);
     new WriteFuture(ref, new MapBuilder().put("a", 6).put("b", 5).build()).timedGet();
     IntegrationTestHelpers.waitForQueue(ref);
@@ -504,7 +509,7 @@ public void onCancelled(DatabaseError error) {}
   @Test
   public void limit5ShouldHave5Children()
       throws DatabaseException, TestFailure, TimeoutException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(
         new MapBuilder()
@@ -528,7 +533,7 @@ public void limit5ShouldHave5Children()
   public void serverShouldOnlySend5Items()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     for (int i = 0; i < 9; ++i) {
       ref.push().setValue(i);
@@ -549,7 +554,7 @@ public void serverShouldOnlySend5Items()
   @Test
   public void setVariousLimitsEnsureDataIsCorrect()
       throws DatabaseException, InterruptedException, TimeoutException, TestFailure {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ValueExpectationHelper expectations = new ValueExpectationHelper();
     expectations.add(ref.limitToLast(1), new MapBuilder().put("c", 3L).build());
@@ -567,7 +572,7 @@ public void setVariousLimitsEnsureDataIsCorrect()
 
   @Test
   public void setVariousLimitsWithStartAtName() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ValueExpectationHelper expectations = new ValueExpectationHelper();
     expectations.add(ref.startAt(null).limitToFirst(1), new MapBuilder().put("a", 1L).build());
@@ -587,13 +592,13 @@ public void setVariousLimitsWithStartAtName() throws DatabaseException, Interrup
   public void testStartAfterWithOrderByKey()
       throws DatabaseException, InterruptedException, ExecutionException, TimeoutException,
           TestFailure {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     DatabaseReference childOne = ref.push();
     DatabaseReference childTwo = ref.push();
-    Tasks.await(childOne.setValue(1L));
-    Tasks.await(childTwo.setValue(2L));
+    await(childOne.setValue(1L));
+    await(childTwo.setValue(2L));
 
-    DataSnapshot snapshot = Tasks.await(ref.orderByKey().startAfter(childOne.getKey()).get());
+    DataSnapshot snapshot = await(ref.orderByKey().startAfter(childOne.getKey()).get());
 
     Map<String, Long> values = (Map<String, Long>) snapshot.getValue();
 
@@ -605,13 +610,13 @@ public void testStartAfterWithOrderByKey()
   @Test
   public void testEndBeforeWithOrderByKey()
       throws DatabaseException, InterruptedException, ExecutionException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     DatabaseReference childOne = ref.push();
     DatabaseReference childTwo = ref.push();
-    Tasks.await(childOne.setValue(1L));
-    Tasks.await(childTwo.setValue(2L));
+    await(childOne.setValue(1L));
+    await(childTwo.setValue(2L));
 
-    DataSnapshot snapshot = Tasks.await(ref.orderByKey().endBefore(childTwo.getKey()).get());
+    DataSnapshot snapshot = await(ref.orderByKey().endBefore(childTwo.getKey()).get());
     Map<String, Long> values = (Map<String, Long>) snapshot.getValue();
 
     assertNotNull(values);
@@ -624,11 +629,11 @@ public void testEndBeforeWithOrderByKey()
   @Test
   public void testEndBeforeWithOrderByKeyOverlappingListener()
       throws DatabaseException, InterruptedException, ExecutionException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     DatabaseReference childOne = ref.push();
     DatabaseReference childTwo = ref.push();
-    Tasks.await(childOne.setValue(1L));
-    Tasks.await(childTwo.setValue(2L));
+    await(childOne.setValue(1L));
+    await(childTwo.setValue(2L));
 
     Semaphore semaphore = new Semaphore(0);
     ValueEventListener listener =
@@ -644,9 +649,9 @@ public void onCancelled(@NonNull DatabaseError error) {}
 
     ref.addValueEventListener(listener);
 
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
 
-    DataSnapshot snapshot = Tasks.await(ref.orderByKey().endBefore(childTwo.getKey()).get());
+    DataSnapshot snapshot = await(ref.orderByKey().endBefore(childTwo.getKey()).get());
     Map<String, Long> values = (Map<String, Long>) snapshot.getValue();
 
     assertNotNull(values);
@@ -658,11 +663,11 @@ public void onCancelled(@NonNull DatabaseError error) {}
   @Test
   public void testStartAfterWithOrderByKeyOverlappingListener()
       throws DatabaseException, InterruptedException, ExecutionException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     DatabaseReference childOne = ref.push();
     DatabaseReference childTwo = ref.push();
-    Tasks.await(childOne.setValue(1L));
-    Tasks.await(childTwo.setValue(2L));
+    await(childOne.setValue(1L));
+    await(childTwo.setValue(2L));
 
     Semaphore semaphore = new Semaphore(0);
     ValueEventListener listener =
@@ -677,9 +682,9 @@ public void onCancelled(@NonNull DatabaseError error) {}
         };
     ref.addValueEventListener(listener);
 
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
 
-    DataSnapshot snapshot = Tasks.await(ref.orderByKey().startAfter(childOne.getKey()).get());
+    DataSnapshot snapshot = await(ref.orderByKey().startAfter(childOne.getKey()).get());
     Map<String, Long> values = (Map<String, Long>) snapshot.getValue();
 
     assertNotNull(values);
@@ -690,7 +695,7 @@ public void onCancelled(@NonNull DatabaseError error) {}
 
   @Test
   public void setVariousLimitsWithStartAfterName() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ValueExpectationHelper expectations = new ValueExpectationHelper();
     expectations.add(ref.startAfter(null).limitToFirst(1), null);
@@ -714,7 +719,7 @@ public void setVariousLimitsWithStartAfterName() throws DatabaseException, Inter
   public void setVariousLimitsWithStartAtNameWithServerData()
       throws DatabaseException, InterruptedException, TestFailure, ExecutionException,
           TimeoutException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     // TODO: this test kinda has race conditions. The listens are added sequentially, so we get a
     // lot of partial data back from the server. This all correct, and we end up in the correct
@@ -739,7 +744,7 @@ public void setVariousLimitsWithStartAtNameWithServerData()
   public void setVariousLimitsWithStartAfterNameWithServerData()
       throws DatabaseException, InterruptedException, TestFailure, ExecutionException,
           TimeoutException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     // TODO: this test kinda has race conditions. The listens are added sequentially, so we get a
     // lot of partial data back from the server. This all correct, and we end up in the correct
@@ -770,7 +775,7 @@ public void setVariousLimitsWithStartAfterNameWithServerData()
   public void setLimitEnsureChildRemovedAndChildAddedHitWhenLimitIsHit()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> added = new ArrayList<String>();
     final List<String> removed = new ArrayList<String>();
@@ -820,7 +825,7 @@ public void onCancelled(DatabaseError error) {}
   public void setLimitEnsureChildRemovedAndChildAddedHitWhenLimitIsHitWithServerData()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> added = new ArrayList<String>();
     final List<String> removed = new ArrayList<String>();
@@ -855,7 +860,7 @@ public void onChildMoved(DataSnapshot snapshot, String previousChildName) {
               public void onCancelled(DatabaseError error) {}
             });
 
-    IntegrationTestHelpers.waitFor(semaphore, 2);
+    waitFor(semaphore, 2);
     List<String> expected = new ArrayList<String>();
     expected.add("b");
     expected.add("c");
@@ -873,7 +878,7 @@ public void onCancelled(DatabaseError error) {}
   public void setLimitEnsureChildRemovedAndChildAddedHitWhenLimitIsHitFromFront()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> added = new ArrayList<String>();
     final List<String> removed = new ArrayList<String>();
@@ -924,7 +929,7 @@ public void onCancelled(DatabaseError error) {}
   public void setLimitEnsureChildRemovedAndChildAddedHitWhenDataEntersLimitWithStartAfter()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> added = new ArrayList<String>();
     final List<String> removed = new ArrayList<String>();
@@ -975,7 +980,7 @@ public void onCancelled(DatabaseError error) {}
   public void setLimitEnsureChildRemovedAndChildAddedHitWhenLimitIsHitFromFrontWithServerData()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> added = new ArrayList<String>();
     final List<String> removed = new ArrayList<String>();
@@ -1011,7 +1016,7 @@ public void onChildMoved(DataSnapshot snapshot, String previousChildName) {
               public void onCancelled(DatabaseError error) {}
             });
 
-    IntegrationTestHelpers.waitFor(semaphore, 2);
+    waitFor(semaphore, 2);
     List<String> expected = new ArrayList<String>();
     expected.add("a");
     expected.add("b");
@@ -1030,7 +1035,7 @@ public void onCancelled(DatabaseError error) {}
       setLimitEnsureChildRemovedAndChildAddedHitWhenLimitIsHitFromFrontWithServerDataWithStartAfter()
           throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
               InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> added = new ArrayList<String>();
     final List<String> removed = new ArrayList<String>();
@@ -1066,7 +1071,7 @@ public void onChildMoved(DataSnapshot snapshot, String previousChildName) {
               public void onCancelled(DatabaseError error) {}
             });
 
-    IntegrationTestHelpers.waitFor(semaphore, 2);
+    waitFor(semaphore, 2);
     List<String> expected = new ArrayList<String>();
     expected.add("b");
     expected.add("c");
@@ -1084,7 +1089,7 @@ public void onCancelled(DatabaseError error) {}
   public void setStartAndLimitEnsureChildAddedFiredWhenLimitIsntHit()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> added = new ArrayList<String>();
     final List<String> removed = new ArrayList<String>();
@@ -1134,7 +1139,7 @@ public void onCancelled(DatabaseError error) {}
   public void setStartAfterAndLimitEnsureChildAddedFiredWhenLimitIsntHit()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> added = new ArrayList<String>();
     final List<String> removed = new ArrayList<String>();
@@ -1186,7 +1191,7 @@ public void onCancelled(DatabaseError error) {}
   public void setStartAndLimitEnsureChildAddedFiredWhenLimitIsntHitWithServerData()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     new WriteFuture(ref, new MapBuilder().put("c", 3).build()).timedGet();
 
@@ -1222,7 +1227,7 @@ public void onChildMoved(DataSnapshot snapshot, String previousChildName) {
               public void onCancelled(DatabaseError error) {}
             });
 
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
     List<String> expected = new ArrayList<String>();
     expected.add("c");
     DeepEquals.assertEquals(expected, added);
@@ -1239,7 +1244,7 @@ public void onCancelled(DatabaseError error) {}
   public void setStartAfterAndLimitEnsureChildAddedFiredWhenLimitIsntHitWithServerData()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     new WriteFuture(ref, new MapBuilder().put("a", 5).build()).timedGet();
     new WriteFuture(ref, new MapBuilder().put("c", 3).build()).timedGet();
@@ -1276,7 +1281,7 @@ public void onChildMoved(DataSnapshot snapshot, String previousChildName) {
               public void onCancelled(DatabaseError error) {}
             });
 
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
     List<String> expected = new ArrayList<String>();
     expected.add("c");
     DeepEquals.assertEquals(expected, added);
@@ -1293,7 +1298,7 @@ public void onCancelled(DatabaseError error) {}
   public void setLimitEnsureChildAddedAndChildRemovedAreFiredWhenAnElementIsRemoved()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> added = new ArrayList<String>();
     final List<String> removed = new ArrayList<String>();
@@ -1345,7 +1350,7 @@ public void onCancelled(DatabaseError error) {}
   public void setLimitEnsureChildAddedAndChildRemovedAreFiredWhenAnElementIsRemovedUsingServerData()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     new WriteFuture(ref, new MapBuilder().put("a", 1).put("b", 2).put("c", 3).build()).timedGet();
     final List<String> added = new ArrayList<String>();
@@ -1379,7 +1384,7 @@ public void onChildMoved(DataSnapshot snapshot, String previousChildName) {
               public void onCancelled(DatabaseError error) {}
             });
 
-    IntegrationTestHelpers.waitFor(semaphore, 2);
+    waitFor(semaphore, 2);
     List<String> expected = new ArrayList<String>();
     expected.add("b");
     expected.add("c");
@@ -1399,7 +1404,7 @@ public void onCancelled(DatabaseError error) {}
   public void setLimitEnsureChildRemovedFiredWhenAllElementsRemoved()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> added = new ArrayList<String>();
     final List<String> removed = new ArrayList<String>();
@@ -1453,7 +1458,7 @@ public void onCancelled(DatabaseError error) {}
   public void setLimitEnsureChildRemovedFiredWhenAllElementsRemovedUsingServerData()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     new WriteFuture(ref, new MapBuilder().put("b", 2).put("c", 3).build()).timedGet();
     final List<String> added = new ArrayList<String>();
@@ -1488,7 +1493,7 @@ public void onChildMoved(DataSnapshot snapshot, String previousChildName) {
                   public void onCancelled(DatabaseError error) {}
                 });
 
-    IntegrationTestHelpers.waitFor(semaphore, 2);
+    waitFor(semaphore, 2);
     List<String> expected = new ArrayList<String>();
     expected.add("b");
     expected.add("c");
@@ -1509,7 +1514,7 @@ public void onCancelled(DatabaseError error) {}
 
   @Test
   public void startAtEndAtWithPriorityWorks() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ValueExpectationHelper helper = new ValueExpectationHelper();
     helper.add(
@@ -1531,7 +1536,7 @@ public void startAtEndAtWithPriorityWorks() throws DatabaseException, Interrupte
 
   @Test
   public void startAfterEndAtWithPriorityWorks() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ValueExpectationHelper helper = new ValueExpectationHelper();
     helper.add(ref.startAfter("w").endAt("y"), new MapBuilder().put("b", 2L).put("c", 3L).build());
@@ -1551,7 +1556,7 @@ public void startAfterEndAtWithPriorityWorks() throws DatabaseException, Interru
 
   @Test
   public void startAtEndBeforeWithPriorityWorks() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ValueExpectationHelper helper = new ValueExpectationHelper();
     helper.add(ref.startAt("w").endBefore("y"), new MapBuilder().put("c", 3L).put("d", 4L).build());
@@ -1572,7 +1577,7 @@ public void startAtEndBeforeWithPriorityWorks() throws DatabaseException, Interr
   @Test
   public void startAfterEndBeforeWithPriorityWorks()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ValueExpectationHelper helper = new ValueExpectationHelper();
     helper.add(
@@ -1601,7 +1606,7 @@ public void onComplete(@NonNull Task<Void> task) {
   @Test
   public void startAtEndAtWithPriorityWorksWithServerData()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(
         new MapBuilder()
@@ -1624,7 +1629,7 @@ public void startAtEndAtWithPriorityWorksWithServerData()
   @Test
   public void startAfterEndAtWithPriorityWorksWithServerData()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(
         new MapBuilder()
@@ -1645,7 +1650,7 @@ public void startAfterEndAtWithPriorityWorksWithServerData()
   @Test
   public void startAtEndBeforeWithPriorityWorksWithServerData()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(
         new MapBuilder()
@@ -1666,7 +1671,7 @@ public void startAtEndBeforeWithPriorityWorksWithServerData()
   @Test
   public void startAfterEndBeforeWithPriorityWorksWithServerData()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(
         new MapBuilder()
@@ -1687,7 +1692,7 @@ public void startAfterEndBeforeWithPriorityWorksWithServerData()
   @Test
   public void startAtEndAtWithPriorityAndNameWorks()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ValueExpectationHelper helper = new ValueExpectationHelper();
     helper.add(
@@ -1711,7 +1716,7 @@ public void startAtEndAtWithPriorityAndNameWorks()
   @Test
   public void startAfterEndAtWithPriorityAndNameWorks()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ValueExpectationHelper helper = new ValueExpectationHelper();
     helper.add(
@@ -1734,7 +1739,7 @@ public void startAfterEndAtWithPriorityAndNameWorks()
   @Test
   public void startAtEndAtWithPriorityAndNameWorksWithServerData()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(
         new MapBuilder()
@@ -1758,7 +1763,7 @@ public void startAtEndAtWithPriorityAndNameWorksWithServerData()
   @Test
   public void startAfterEndAtWithPriorityAndNameWorksWithServerData()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(
         new MapBuilder()
@@ -1781,7 +1786,7 @@ public void startAfterEndAtWithPriorityAndNameWorksWithServerData()
   @Test
   public void startAtEndAtWithPriorityAndNameWorks2()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ValueExpectationHelper helper = new ValueExpectationHelper();
     helper.add(
@@ -1805,7 +1810,7 @@ public void startAtEndAtWithPriorityAndNameWorks2()
   @Test
   public void startAtEndAtWithPriorityAndNameWorksWithServerData2()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(
         new MapBuilder()
@@ -1830,7 +1835,7 @@ public void startAtEndAtWithPriorityAndNameWorksWithServerData2()
   public void ensurePrevNameWorksWithLimit()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> names = new ArrayList<String>();
     ref.limitToLast(2)
@@ -1876,7 +1881,7 @@ public void onCancelled(DatabaseError error) {}
   public void setALimitMoveNodesCheckPrevName()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> names = new ArrayList<String>();
     ref.limitToLast(2)
@@ -1931,7 +1936,7 @@ public void onCancelled(DatabaseError error) {}
   public void setALimitAddNodesRemotelyWatchForEvents()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     DatabaseReference writer = refs.get(0);
     DatabaseReference reader = refs.get(1);
 
@@ -1988,14 +1993,14 @@ public void onCancelled(DatabaseError error) {
             "2 removed",
             "4 added"));
     // Make sure we wait for all the events
-    IntegrationTestHelpers.waitFor(semaphore, 5);
+    waitFor(semaphore, 5);
     DeepEquals.assertEquals(expected, events);
     reader.limitToLast(2).removeEventListener(listener);
   }
 
   @Test
   public void attachingAListenerReturnsTheListener() throws DatabaseException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ValueEventListener listener =
         ref.limitToLast(1)
@@ -2016,7 +2021,7 @@ public void onCancelled(DatabaseError error) {}
   @Test
   public void limitOnUnsyncedNodeFiresValueEvent()
       throws DatabaseException, TestFailure, TimeoutException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     // This will timeout if value never fires
     org.junit.Assert.assertEquals(1, new ReadFuture(ref.limitToLast(1)).timedGet().size());
@@ -2024,7 +2029,7 @@ public void limitOnUnsyncedNodeFiresValueEvent()
 
   @Test
   public void filteringToOnlyNullPrioritiesWorks() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(
         new MapBuilder()
@@ -2043,7 +2048,7 @@ public void filteringToOnlyNullPrioritiesWorks() throws DatabaseException, Inter
 
   @Test
   public void nullPrioritiesIncludedInEndAt2() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(
         new MapBuilder()
@@ -2062,7 +2067,7 @@ public void nullPrioritiesIncludedInEndAt2() throws DatabaseException, Interrupt
 
   @Test
   public void nullPrioritiesIncludedInStartAt() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(
         new MapBuilder()
@@ -2081,7 +2086,7 @@ public void nullPrioritiesIncludedInStartAt() throws DatabaseException, Interrup
 
   @Test
   public void nullPrioritiesIncludedInStartAfter() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(
         new MapBuilder()
@@ -2122,7 +2127,7 @@ public void onCancelled(DatabaseError error) {
   @Test
   @Ignore // TODO: re-enable once dumpListens is implemented again
   public void dedupeListensListenOnParent() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     ValueEventListener listener = dummyListener();
 
     assertEquals("[]", dumpListens(ref));
@@ -2150,7 +2155,7 @@ public void dedupeListensListenOnParent() throws DatabaseException, InterruptedE
   @Test
   @Ignore // TODO: re-enable once dumpListens is implemented again
   public void dedupeListensListenOnGrandChild() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     ValueEventListener listener = dummyListener();
 
     ref.addValueEventListener(listener);
@@ -2174,7 +2179,7 @@ public void dedupeListensListenOnGrandChild() throws DatabaseException, Interrup
   @Ignore // TODO: re-enable once dumpListens is implemented again
   public void dedupeListensListenOnGrandparentOfTwoChildren()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     ValueEventListener listener = dummyListener();
 
     String listens = dumpListens(ref);
@@ -2210,7 +2215,7 @@ public void dedupeListensListenOnGrandparentOfTwoChildren()
   // broken with org.json.  Need to make more robust.
   public void dedupeQueriedListensMultipleListensNoDupes()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     ValueEventListener listener = dummyListener();
 
     ref.child("a").limitToLast(1).addValueEventListener(listener);
@@ -2241,7 +2246,7 @@ public void dedupeQueriedListensMultipleListensNoDupes()
   @Test
   public void limitWithMixOfNullAndNonNullPrioritiesUsingServerData()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     Map<String, Object> toSet =
         new MapBuilder()
             .put(
@@ -2312,7 +2317,7 @@ public void onChildMoved(DataSnapshot snapshot, String previousChildName) {
               public void onCancelled(DatabaseError error) {}
             });
 
-    IntegrationTestHelpers.waitFor(semaphore, 5);
+    waitFor(semaphore, 5);
     List<String> expected = new ArrayList<String>();
     expected.addAll(Arrays.asList("Sally", "James", "Andrew", "Mike", "Vikrum"));
     DeepEquals.assertEquals(expected, names);
@@ -2320,7 +2325,7 @@ public void onCancelled(DatabaseError error) {}
 
   @Test
   public void limitOnNodeWithPriority() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     final Semaphore semaphore = new Semaphore(0);
 
     final Map data = new MapBuilder().put("a", "blah").put(".priority", "priority").build();
@@ -2346,13 +2351,13 @@ public void onCancelled(DatabaseError error) {}
           }
         });
 
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
   }
 
   @Test
   public void limitWithMixOfNullAndNonNullPriorities()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     Map<String, Object> toSet =
         new MapBuilder()
             .put(
@@ -2426,7 +2431,7 @@ public void onCancelled(DatabaseError error) {
                   }
                 });
     ref.setValue(toSet);
-    IntegrationTestHelpers.waitFor(semaphore, 5);
+    waitFor(semaphore, 5);
     List<String> expected = new ArrayList<String>();
     expected.addAll(Arrays.asList("Sally", "James", "Andrew", "Mike", "Vikrum"));
     DeepEquals.assertEquals(expected, names);
@@ -2438,7 +2443,7 @@ public void onCancelled(DatabaseError error) {
   @Test
   public void handlesAnUpdateThatDeletesEntireQueryWindow()
       throws DatabaseException, InterruptedException, TestFailure, TimeoutException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ReadFuture readFuture = ReadFuture.untilCount(ref.limitToLast(2), 3);
 
@@ -2472,7 +2477,7 @@ public void handlesAnUpdateThatDeletesEntireQueryWindow()
   public void handlesAnOutOfViewQueryOnAChild()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ReadFuture parentFuture = ReadFuture.untilCountAfterNull(ref.limitToLast(1), 2);
 
@@ -2512,7 +2517,7 @@ public void onCancelled(DatabaseError error) {}
   public void handlesAChildQueryGoingOutOfViewOfTheParent()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ReadFuture parentFuture = ReadFuture.untilCountAfterNull(ref.limitToLast(1), 3);
 
@@ -2561,7 +2566,7 @@ public void onCancelled(DatabaseError error) {
   public void handlesDivergingViews()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<DataSnapshot> cSnaps = new ArrayList<DataSnapshot>();
     final List<DataSnapshot> dSnaps = new ArrayList<DataSnapshot>();
@@ -2616,7 +2621,7 @@ public void onCancelled(DatabaseError error) {}
   public void handlesRemovingAQueriedElement()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<Long> vals = new ArrayList<Long>();
     final Semaphore semaphore = new Semaphore(0);
@@ -2653,7 +2658,7 @@ public void onCancelled(DatabaseError error) {}
 
     ref.setValue(new MapBuilder().put("a", 1).put("b", 2).build());
     ref.child("b").removeValue();
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
     List<Long> expected = new ArrayList<Long>();
     expected.addAll(Arrays.asList(2L, 1L));
     DeepEquals.assertEquals(expected, vals);
@@ -2661,7 +2666,7 @@ public void onCancelled(DatabaseError error) {}
 
   @Test
   public void startAtLimitWorks() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(new MapBuilder().put("a", 1).put("b", 2).build());
     DataSnapshot snap = IntegrationTestHelpers.getSnap(ref.limitToFirst(1));
@@ -2672,7 +2677,7 @@ public void startAtLimitWorks() throws DatabaseException, InterruptedException {
   @Test
   public void startAtLimitWorksWhenChildIsRemovedCase1664()
       throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.setValue(new MapBuilder().put("a", 1).put("b", 2).build());
     final List<Long> vals = new ArrayList<Long>();
@@ -2707,10 +2712,10 @@ public void onCancelled(DatabaseError error) {}
             });
 
     // Wait for first value
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
     assertEquals((Long) 1L, vals.get(0));
     ref.child("a").removeValue();
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
     assertEquals((Long) 2L, vals.get(1));
   }
 
@@ -2718,7 +2723,7 @@ public void onCancelled(DatabaseError error) {}
   public void startAtWithTwoArgumentsWorksCase1169()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     new WriteFuture(
             ref,
@@ -2754,7 +2759,7 @@ public void startAtWithTwoArgumentsWorksCase1169()
   public void startAfterWithTwoArgumentsWorks()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     new WriteFuture(
             ref,
@@ -2791,7 +2796,7 @@ public void startAfterWithTwoArgumentsWorks()
   public void handlesMultipleQueriesOnTheSameNode()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     new WriteFuture(
             ref,
@@ -2823,7 +2828,7 @@ public void onCancelled(DatabaseError error) {}
 
     // Skipping nested calls, no re-entrant APIs in Java
 
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
 
     DataSnapshot snap = IntegrationTestHelpers.getSnap(ref.limitToLast(1));
     Map<String, Object> expected = new MapBuilder().put("f", 6L).build();
@@ -2835,7 +2840,7 @@ public void onCancelled(DatabaseError error) {}
   public void handlesOnceCalledOnANodeWithADefaultListener()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     new WriteFuture(
             ref,
@@ -2864,7 +2869,7 @@ public void onDataChange(DataSnapshot snapshot) {
           public void onCancelled(DatabaseError error) {}
         });
 
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
 
     DataSnapshot snap = IntegrationTestHelpers.getSnap(ref.limitToLast(1));
     Map<String, Object> expected = new MapBuilder().put("f", 6L).build();
@@ -2876,7 +2881,7 @@ public void onCancelled(DatabaseError error) {}
   public void handlesOnceCalledOnANodeWithADefaultListenerAndNonCompleteLimit()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     new WriteFuture(ref, new MapBuilder().put("a", 1).put("b", 2).put("c", 3).build()).timedGet();
 
@@ -2905,7 +2910,7 @@ public void onCancelled(DatabaseError error) {}
   public void remoteRemoveEventTriggers()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     final DatabaseReference writer = refs.get(0);
     DatabaseReference reader = refs.get(1);
 
@@ -2948,7 +2953,7 @@ public boolean isComplete(List<EventRecord> events) {
   public void endAtWithTwoArgumentsAndLimitWorks()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     Map<String, Object> toSet =
         new MapBuilder()
@@ -2981,7 +2986,7 @@ public void endAtWithTwoArgumentsAndLimitWorks()
   public void complexUpdateAtQueryRootRaisesCorrectValueEvent()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     DatabaseReference writer = refs.get(0);
     DatabaseReference reader = refs.get(1);
 
@@ -3003,7 +3008,7 @@ public boolean isComplete(List<EventRecord> events) {
               }
             });
 
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
     Map<String, Object> update =
         new MapBuilder()
             .put("b", null)
@@ -3030,7 +3035,7 @@ public boolean isComplete(List<EventRecord> events) {
   public void updateAtQueryRootRaisesCorrectValueEvent()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     DatabaseReference writer = refs.get(0);
     DatabaseReference reader = refs.get(1);
 
@@ -3052,7 +3057,7 @@ public boolean isComplete(List<EventRecord> events) {
               }
             });
 
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
     Map<String, Object> update =
         new MapBuilder().put("bar", "d").put("bam", null).put("bat", "e").build();
     writer.updateChildren(update);
@@ -3072,7 +3077,7 @@ public boolean isComplete(List<EventRecord> events) {
   public void listenForChildAddedEventsWithLimit()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     DatabaseReference writer = refs.get(0);
     DatabaseReference reader = refs.get(1);
     writer.child("a").setValue(1);
@@ -3128,14 +3133,14 @@ public void onChildMoved(DataSnapshot snapshot, String previousChildName) {
               public void onCancelled(DatabaseError error) {}
             });
 
-    IntegrationTestHelpers.waitFor(semaphore, 3);
+    waitFor(semaphore, 3);
   }
 
   @Test
   public void listenForChildChangedEventsWithLimit()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     DatabaseReference writer = refs.get(0);
     DatabaseReference reader = refs.get(1);
     new WriteFuture(
@@ -3166,7 +3171,7 @@ public void onCancelled(DatabaseError error) {}
             });
 
     // Wait for the read to be initialized
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
 
     reader
         .limitToLast(3)
@@ -3215,14 +3220,14 @@ public void onCancelled(DatabaseError error) {}
     writer.child("b").setValue("b");
     writer.child("c").setValue(deepObject);
 
-    IntegrationTestHelpers.waitFor(semaphore, 3);
+    waitFor(semaphore, 3);
   }
 
   @Test
   public void listenForChildRemoveEventsWithLimit()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     DatabaseReference writer = refs.get(0);
     DatabaseReference reader = refs.get(1);
     writer.child("a").setValue(1);
@@ -3252,7 +3257,7 @@ public void onCancelled(DatabaseError error) {}
             });
 
     // Wait for the read to be initialized
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
 
     reader
         .limitToLast(3)
@@ -3298,14 +3303,14 @@ public void onCancelled(DatabaseError error) {}
     writer.child("b").removeValue();
     writer.child("c").removeValue();
 
-    IntegrationTestHelpers.waitFor(semaphore, 3);
+    waitFor(semaphore, 3);
   }
 
   @Test
   public void listenForChildRemovedWhenParentRemoved()
       throws DatabaseException, InterruptedException, TestFailure, ExecutionException,
           TimeoutException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     DatabaseReference writer = refs.get(0);
     DatabaseReference reader = refs.get(1);
     writer.child("a").setValue(1);
@@ -3335,7 +3340,7 @@ public void onCancelled(DatabaseError error) {}
             });
 
     // Wait for the read to be initialized
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
 
     reader
         .limitToLast(3)
@@ -3379,14 +3384,14 @@ public void onCancelled(DatabaseError error) {}
 
     writer.removeValue();
 
-    IntegrationTestHelpers.waitFor(semaphore, 3);
+    waitFor(semaphore, 3);
   }
 
   @Test
   public void listenForChildRemovedWhenParentSetToScalar()
       throws DatabaseException, InterruptedException, TestFailure, ExecutionException,
           TimeoutException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     DatabaseReference writer = refs.get(0);
     DatabaseReference reader = refs.get(1);
     writer.child("a").setValue(1);
@@ -3416,7 +3421,7 @@ public void onCancelled(DatabaseError error) {}
             });
 
     // Wait for the read to be initialized
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
 
     reader
         .limitToLast(3)
@@ -3460,14 +3465,14 @@ public void onCancelled(DatabaseError error) {}
 
     writer.setValue("scalar");
 
-    IntegrationTestHelpers.waitFor(semaphore, 3);
+    waitFor(semaphore, 3);
   }
 
   @Test
   public void queriesBehaveAfterOnce()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     DatabaseReference writer = refs.get(0);
     DatabaseReference reader = refs.get(1);
 
@@ -3537,7 +3542,7 @@ public void onChildMoved(DataSnapshot snapshot, String previousChildName) {
           public void onCancelled(DatabaseError error) {}
         });
 
-    IntegrationTestHelpers.waitFor(semaphore, 5);
+    waitFor(semaphore, 5);
     assertEquals(1, queryAddedCount.get());
     assertEquals(4, defaultAddedCount.get());
   }
@@ -3546,7 +3551,7 @@ public void onCancelled(DatabaseError error) {}
   public void case2003CorrectlyGetEventsForStartAtEndAtQueriesWhenPriorityChanges()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> addedFirst = new ArrayList<String>();
     final List<String> removedFirst = new ArrayList<String>();
@@ -3632,7 +3637,7 @@ public void onCancelled(DatabaseError error) {}
   public void correctlyGetEventsForStartAfterEndAtQueriesWhenPriorityChanges()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> addedFirst = new ArrayList<String>();
     final List<String> removedFirst = new ArrayList<String>();
@@ -3718,7 +3723,7 @@ public void onCancelled(DatabaseError error) {}
   public void correctlyGetEventsForStartAtEndBeforeQueriesWhenPriorityChanges()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     final List<String> addedFirst = new ArrayList<String>();
     final List<String> removedFirst = new ArrayList<String>();
@@ -3805,7 +3810,7 @@ public void onCancelled(DatabaseError error) {}
   public void behavesWithDivergingQueries()
       throws DatabaseException, TestFailure, ExecutionException, TimeoutException,
           InterruptedException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     final DatabaseReference writer = refs.get(0);
     DatabaseReference reader = refs.get(1);
 
@@ -3859,7 +3864,7 @@ public boolean isComplete(List<EventRecord> events) {
   @Test
   public void staleItemsRemovedFromTheCache()
       throws InterruptedException, TestFailure, TimeoutException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     DatabaseReference reader = refs.get(0);
     DatabaseReference writer = refs.get(1);
 
@@ -3883,7 +3888,7 @@ public boolean isComplete(List<EventRecord> events) {
               }
             });
 
-    IntegrationTestHelpers.waitFor(ready);
+    waitFor(ready);
     for (int i = 0; i < 4; ++i) {
       writer.child("k" + i).setValue(i);
     }
@@ -3895,7 +3900,7 @@ public boolean isComplete(List<EventRecord> events) {
   @Test
   public void integerKeysBehaveNumerically1()
       throws InterruptedException, TestFailure, TimeoutException {
-    final DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    final DatabaseReference ref = getRandomNode();
     final Semaphore done = new Semaphore(0);
     ref.setValue(
         new MapBuilder()
@@ -3932,13 +3937,13 @@ public void onCancelled(DatabaseError error) {}
           }
         });
 
-    IntegrationTestHelpers.waitFor(done);
+    waitFor(done);
   }
 
   @Test
   public void integerKeysBehaveNumericallyStartAfter()
       throws InterruptedException, TestFailure, TimeoutException {
-    final DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    final DatabaseReference ref = getRandomNode();
     final Semaphore done = new Semaphore(0);
     ref.setValue(
         new MapBuilder()
@@ -3971,13 +3976,13 @@ public void onCancelled(DatabaseError error) {}
           }
         });
 
-    IntegrationTestHelpers.waitFor(done);
+    waitFor(done);
   }
 
   @Test
   public void integerKeysBehaveNumericallyEndBefore()
       throws InterruptedException, TestFailure, TimeoutException {
-    final DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    final DatabaseReference ref = getRandomNode();
     final Semaphore done = new Semaphore(0);
     ref.setValue(
         new MapBuilder()
@@ -4010,13 +4015,13 @@ public void onCancelled(DatabaseError error) {}
           }
         });
 
-    IntegrationTestHelpers.waitFor(done);
+    waitFor(done);
   }
 
   @Test
   public void integerKeysBehaveNumericallyWithStartAfterOverflow()
       throws InterruptedException, TestFailure, TimeoutException {
-    final DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    final DatabaseReference ref = getRandomNode();
     final Semaphore done = new Semaphore(0);
     ref.setValue(
         new MapBuilder()
@@ -4050,13 +4055,13 @@ public void onCancelled(DatabaseError error) {}
           }
         });
 
-    IntegrationTestHelpers.waitFor(done);
+    waitFor(done);
   }
 
   @Test
   public void integerKeysBehaveNumericallyWithEndBeforeUnderflow()
       throws InterruptedException, TestFailure, TimeoutException {
-    final DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    final DatabaseReference ref = getRandomNode();
     final Semaphore done = new Semaphore(0);
     ref.setValue(
         new MapBuilder()
@@ -4088,13 +4093,13 @@ public void onCancelled(DatabaseError error) {}
           }
         });
 
-    IntegrationTestHelpers.waitFor(done);
+    waitFor(done);
   }
 
   @Test
   public void integerKeysBehaveNumericallyWithEndBeforeMinLex()
       throws InterruptedException, TestFailure, TimeoutException {
-    final DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    final DatabaseReference ref = getRandomNode();
     final Semaphore done = new Semaphore(0);
     ref.setValue(
         new MapBuilder()
@@ -4139,13 +4144,13 @@ public void onCancelled(DatabaseError error) {}
           }
         });
 
-    IntegrationTestHelpers.waitFor(done);
+    waitFor(done);
   }
 
   @Test
   public void integerKeysBehaveNumerically2()
       throws InterruptedException, TestFailure, TimeoutException {
-    final DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    final DatabaseReference ref = getRandomNode();
     final Semaphore done = new Semaphore(0);
     ref.setValue(
         new MapBuilder()
@@ -4183,13 +4188,13 @@ public void onCancelled(DatabaseError error) {}
           }
         });
 
-    IntegrationTestHelpers.waitFor(done);
+    waitFor(done);
   }
 
   @Test
   public void integerKeysBehaveNumerically3()
       throws InterruptedException, TestFailure, TimeoutException {
-    final DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    final DatabaseReference ref = getRandomNode();
     final Semaphore done = new Semaphore(0);
     ref.setValue(
         new MapBuilder()
@@ -4227,13 +4232,13 @@ public void onCancelled(DatabaseError error) {}
           }
         });
 
-    IntegrationTestHelpers.waitFor(done);
+    waitFor(done);
   }
 
   @Test
   public void integerKeysBehaveNumericallyWithStartAfterEndAt()
       throws InterruptedException, TestFailure, TimeoutException {
-    final DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    final DatabaseReference ref = getRandomNode();
     final Semaphore done = new Semaphore(0);
     ref.setValue(
         new MapBuilder()
@@ -4267,13 +4272,13 @@ public void onCancelled(DatabaseError error) {}
           }
         });
 
-    IntegrationTestHelpers.waitFor(done);
+    waitFor(done);
   }
 
   @Test
   public void moveOutsideOfWindowIntoWindow()
       throws InterruptedException, ExecutionException, TimeoutException, TestFailure {
-    final DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    final DatabaseReference ref = getRandomNode();
     Map<String, Object> initialValue =
         new MapBuilder()
             .put("a", new MapBuilder().put(".priority", 1L).put(".value", "a").build())
@@ -4303,7 +4308,7 @@ public void onDataChange(DataSnapshot snapshot) {
           public void onCancelled(DatabaseError error) {}
         });
 
-    IntegrationTestHelpers.waitFor(ready);
+    waitFor(ready);
 
     ref.child("a")
         .setPriority(
@@ -4315,12 +4320,12 @@ public void onComplete(DatabaseError error, DatabaseReference ref) {
               }
             });
 
-    IntegrationTestHelpers.waitFor(ready);
+    waitFor(ready);
   }
 
   @Test
   public void emptyLimitWithBadHash() throws InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ref.getRepo().setHijackHash(true);
 
@@ -4333,7 +4338,7 @@ public void emptyLimitWithBadHash() throws InterruptedException {
   @Test
   public void addingQueriesDoesNotAffectOthers()
       throws InterruptedException, ExecutionException, TimeoutException, TestFailure {
-    final DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    final DatabaseReference ref = getRandomNode();
 
     new WriteFuture(ref.child("0"), "test1").timedGet();
 
@@ -4364,7 +4369,7 @@ public void onCancelled(DatabaseError firebaseError) {}
 
   @Test
   public void equalToOnlyReturnsChildrenEqualTo() throws DatabaseException, InterruptedException {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
 
     ValueExpectationHelper expectations = new ValueExpectationHelper();
     expectations.add(ref.equalTo(1), new MapBuilder().put("a", "vala").build());
@@ -4384,7 +4389,7 @@ public void equalToOnlyReturnsChildrenEqualTo() throws DatabaseException, Interr
   @Test
   public void removeListenerOnDefaultQueryRemovesAllQueryListeners()
       throws InterruptedException, ExecutionException, TimeoutException, TestFailure {
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     new WriteFuture(ref.child("a"), "foo", 100).timedGet();
 
     final Semaphore semaphore = new Semaphore(0);
@@ -4406,7 +4411,7 @@ public void onCancelled(DatabaseError error) {
                   }
                 });
 
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
     Map<String, Object> expected = new MapBuilder().put("a", "foo").build();
     DeepEquals.assertEquals(expected, snapshotHolder[0].getValue());
 
@@ -4419,7 +4424,7 @@ public void onCancelled(DatabaseError error) {
 
   @Test
   public void handlesFallbackForOrderBy() throws InterruptedException {
-    final DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    final DatabaseReference ref = getRandomNode();
     final Semaphore done = new Semaphore(0);
 
     Map<String, Object> initial =
@@ -4438,7 +4443,7 @@ public void onComplete(DatabaseError error, DatabaseReference ref) {
           }
         });
 
-    IntegrationTestHelpers.waitFor(done);
+    waitFor(done);
 
     final List<String> children = new ArrayList<String>();
     ref.orderByChild("foo")
@@ -4465,7 +4470,7 @@ public void onChildMoved(DataSnapshot snapshot, String previousChildName) {}
               public void onCancelled(DatabaseError error) {}
             });
 
-    IntegrationTestHelpers.waitFor(done);
+    waitFor(done);
 
     List<String> expected = new ArrayList<String>();
     expected.add("b");
@@ -4477,7 +4482,7 @@ public void onCancelled(DatabaseError error) {}
   @Test
   public void notifiesOfDeletesWhileOffline() throws DatabaseException, InterruptedException {
     // Create a fresh connection so we can be sure we won't get any other data updates for stuff.
-    DatabaseReference writerRef = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference writerRef = getRandomNode();
     final DatabaseConfig ctx = IntegrationTestHelpers.newTestConfig();
     final DatabaseReference queryRef = new DatabaseReference(writerRef.toString(), ctx);
     final List<DataSnapshot> readSnaps = new ArrayList<DataSnapshot>();
@@ -4514,7 +4519,7 @@ public void onCancelled(DatabaseError error) {}
           }
         });
 
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
 
     // Now make the queryRef go offline so we don't get updates.
     RepoManager.interrupt(ctx);
@@ -4532,70 +4537,383 @@ public void onComplete(DatabaseError error, DatabaseReference ref) {
             });
 
     // Now wait for us to get notified that b is deleted.
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
   }
 
-  private static FirebaseApp appForDatabaseUrl(String url, String name) {
-    return FirebaseApp.initializeApp(
-        InstrumentationRegistry.getInstrumentation().getTargetContext(),
-        new FirebaseOptions.Builder()
-            .setApplicationId("appid")
-            .setApiKey("apikey")
-            .setDatabaseUrl(url)
-            .build(),
-        name);
+  @Test
+  public void testGetPropagatesEventsToListeners()
+      throws DatabaseException, InterruptedException, ExecutionException {
+    /**
+     * There's a situation where if you have a pending `get()` and then an `onValue` at a child
+     * location and the get resolves before onValue does, onValue gets no events. What we are trying
+     * to reproduce is: 1. Call `get()` 2. Run sleep to ensure `get()` has more time and comes back
+     * before the `onValue` event is fired. 3. Create `onValue()` event registration 4. `get()`
+     * comes back and then `onValue` event is fired Note: This is a smoke test due to the fact that
+     * it is difficult to reproduce the scenario when the parent get() request resolves before a
+     * child onValue listener.
+     *
+     * <p>Because this exact timing is difficult to reproduce, there may be some cases in the smoke
+     * test where the above scenario isn't observed.
+     */
+    AtomicBoolean successful = new AtomicBoolean();
+    int count = 0;
+    int sleepTime = 170;
+    while (count++ < 15 && !successful.get()) {
+      // To ensure that we don't read the cached results, we need a separate app.
+      FirebaseDatabase readDb = getNewDatabase();
+      FirebaseDatabase writeDb = getNewDatabase();
+      DatabaseReference writeNode = writeDb.getReference().push();
+      DatabaseReference readNode = translateReference(writeNode, readDb);
+      try {
+        Map<String, Object> toWrite =
+            new MapBuilder().put("foo1", "child1").put("foo2", "child2").build();
+        await(writeNode.setValue(toWrite));
+        readDb.goOffline();
+        AtomicBoolean resolved = new AtomicBoolean();
+        Task<DataSnapshot> getTask = readNode.get();
+        getTask.addOnCompleteListener(
+            new OnCompleteListener<DataSnapshot>() {
+              @Override
+              public void onComplete(@NonNull Task<DataSnapshot> task) {
+                DataSnapshot snapshot = task.getResult();
+                assertEquals(toWrite, snapshot.getValue());
+                resolved.set(true);
+              }
+            });
+
+        DatabaseReference childRef = readNode.child("foo1");
+        readDb.goOnline();
+        Thread.sleep(
+            sleepTime); // An arbitrary value to help make sure `onValue` doesn't resolve before
+        // `get()`
+        if (resolved.get()) {
+          sleepTime -= 5;
+          continue;
+        }
+        ReadFuture future =
+            new ReadFuture(
+                childRef,
+                events -> {
+                  if (!resolved.get()) {
+                    return true;
+                  }
+                  assertEquals(1, events.size());
+                  assertEquals("child1", events.get(0).getSnapshot().getValue());
+                  successful.set(true);
+                  return true;
+                });
+        await(getTask);
+        future.timedGet(10000, TimeUnit.MILLISECONDS);
+      } catch (Exception e) {
+        fail("Exception occurred when attempting to test get event propagation" + e);
+      }
+    }
   }
 
   @Test
   public void testGetReturnsNullForEmptyNodeWhenOnline()
       throws DatabaseException, InterruptedException, ExecutionException {
-    FirebaseApp app =
-        appForDatabaseUrl(IntegrationTestValues.getNamespace(), UUID.randomUUID().toString());
-    FirebaseDatabase db = FirebaseDatabase.getInstance(app);
-    assertNull(Tasks.await(db.getReference(UUID.randomUUID().toString()).get()).getValue());
+    FirebaseDatabase db = getNewDatabase();
+    assertNull(await(db.getReference(UUID.randomUUID().toString()).get()).getValue());
   }
 
   @Test
-  public void testGetThrowsExceptionForEmptyNodeWhenOffline()
-      throws DatabaseException, InterruptedException {
-    FirebaseApp app =
-        appForDatabaseUrl(IntegrationTestValues.getNamespace(), UUID.randomUUID().toString());
-    FirebaseDatabase db = FirebaseDatabase.getInstance(app);
-    DatabaseReference node = db.getReference().child(db.getReference().push().getKey());
+  public void testGetWaitsForConnection() throws DatabaseException, InterruptedException {
+    FirebaseDatabase db = getNewDatabase();
+    DatabaseReference node =
+        db.getReference().child(Objects.requireNonNull(db.getReference().push().getKey()));
     db.goOffline();
+    AtomicBoolean receivedValue = new AtomicBoolean();
+    THREAD_POOL_EXECUTOR.execute(
+        () -> {
+          try {
+            Thread.sleep(200L);
+          } catch (InterruptedException e) {
+            fail("Exception while pausing for get.");
+          } finally {
+            assertFalse(receivedValue.get());
+            db.goOnline();
+          }
+        });
     try {
-      Tasks.await(node.get());
+      await(node.get());
+      receivedValue.set(true);
     } catch (ExecutionException e) {
-      assertEquals(e.getCause().getMessage(), "Client is offline");
-      return;
-    } finally {
+      fail("get threw an exception: " + e);
+    }
+  }
+
+  @Test
+  public void testGetResolvesToCacheWhenOfflineAndNoListeners()
+      throws DatabaseException, InterruptedException {
+    FirebaseDatabase db = getNewDatabase();
+    db.setPersistenceEnabled(true);
+    DatabaseReference node = db.getReference().push();
+    long val = 34;
+
+    try {
+      await(node.setValue(val));
+      db.goOffline();
+
+      DataSnapshot snapshot = await(node.get());
+      assertEquals(val, snapshot.getValue());
+    } catch (ExecutionException e) {
+      fail("get threw an exception: " + e);
+    }
+  }
+
+  @Test
+  public void testGetResolvesWhenOnlineAndParentListener()
+      throws DatabaseException, InterruptedException {
+    FirebaseDatabase writeDb = getNewDatabase();
+    FirebaseDatabase readDb = getNewDatabase();
+    long val = 34;
+    DatabaseReference writeNode = writeDb.getReference().push();
+    DatabaseReference readNode = translateReference(writeNode, readDb);
+
+    try {
+      await(writeNode.setValue(val));
+      DatabaseReference topLevelNode = readDb.getReference();
+      ReadFuture readFuture =
+          new ReadFuture(
+              topLevelNode,
+              events -> {
+                assertEquals(1, events.size());
+                DataSnapshot childNode = referenceAtPath(writeNode, events.get(0));
+                assertEquals(val, childNode.getValue());
+                return true;
+              });
+      readFuture.timedGet();
+      DataSnapshot snapshot = await(readNode.get());
+      assertEquals(val, Objects.requireNonNull(snapshot.getValue()));
+    } catch (TestFailure | TimeoutException | ExecutionException e) {
+      e.printStackTrace();
+    }
+  }
+
+  @Test
+  public void testGetResolvesWhenOnlineAndSameLevelListener()
+      throws DatabaseException, InterruptedException, ExecutionException, TestFailure,
+          TimeoutException {
+    FirebaseDatabase writeDb = getNewDatabase();
+    FirebaseDatabase readDb = getNewDatabase();
+    long val = 34;
+    DatabaseReference writeNode = writeDb.getReference().push();
+    await(writeNode.setValue(val));
+    DatabaseReference readNode = translateReference(writeNode, readDb);
+    new ReadFuture(
+            readNode,
+            events -> {
+              assertEquals(1, events.size());
+              assertEquals(val, events.get(0).getSnapshot().getValue());
+              return true;
+            })
+        .timedGet();
+
+    try {
+      DataSnapshot snapshot = await(readNode.get());
+      assertEquals(val, snapshot.getValue());
+      // need to rewrite it
+    } catch (ExecutionException e) {
+      fail("get threw an exception: " + e);
+    }
+  }
+
+  @Test
+  public void testGetResolvesToServerCacheWhenListenerIsAvailable()
+      throws DatabaseException, InterruptedException {
+    // To ensure that we don't read the cached results, we need a separate app.
+    FirebaseDatabase db = getNewDatabase();
+    db.setPersistenceEnabled(false);
+    long val = 34;
+    DatabaseReference node = db.getReference().push();
+
+    try {
+      await(node.setValue(val));
+      Semaphore semaphore = new Semaphore(0);
+      ValueEventListener listener =
+          new ValueEventListener() {
+            @Override
+            public void onDataChange(@NonNull DataSnapshot snapshot) {
+              assertEquals(val, snapshot.getValue());
+              semaphore.release();
+            }
+
+            @Override
+            public void onCancelled(@NonNull DatabaseError error) {}
+          };
+      node.addValueEventListener(listener);
+      waitFor(semaphore);
+      db.goOffline();
+      DataSnapshot snapshot = await(node.get());
+      assertEquals(val, snapshot.getValue());
+      node.removeEventListener(listener);
       db.goOnline();
+    } catch (ExecutionException e) {
+      fail("get threw an exception: " + e);
+    }
+  }
+
+  @Test
+  public void testGetResolvesWhenOnlineAndChildLevelListener()
+      throws DatabaseException, InterruptedException {
+    FirebaseDatabase readDb = getNewDatabase();
+    FirebaseDatabase writeDb = getNewDatabase();
+    Semaphore semaphore = new Semaphore(0);
+    long val = 34;
+    String parentNodeKey = Objects.requireNonNull(writeDb.getReference().push().getKey());
+    DatabaseReference parentWriteNode = writeDb.getReference().child(parentNodeKey);
+    String childNodeKey = Objects.requireNonNull(parentWriteNode.push().getKey());
+    DatabaseReference childReadNode =
+        readDb.getReference().child(parentNodeKey).child(childNodeKey);
+    DatabaseReference childWriteNode = parentWriteNode.child(childNodeKey);
+    ValueEventListener listener =
+        new ValueEventListener() {
+          @Override
+          public void onDataChange(@NonNull DataSnapshot snapshot) {
+            semaphore.release();
+          }
+
+          @Override
+          public void onCancelled(@NonNull DatabaseError error) {
+            // no-op
+          }
+        };
+
+    try {
+      await(childWriteNode.setValue(val));
+      ReadFuture.untilEquals(childReadNode, val).timedGet();
+      childReadNode.addValueEventListener(listener);
+      DatabaseReference parentReadNode = readDb.getReference().child(parentNodeKey);
+      waitFor(semaphore);
+      DataSnapshot snapshot = await(parentReadNode.get());
+      assertEquals(snapshot.child(childNodeKey).getValue(), val);
+      await(parentWriteNode.setValue(new MapBuilder().put(childNodeKey, val).build()));
+      DataSnapshot parentSnapshot = await(childReadNode.get());
+      assertEquals(parentSnapshot.getValue(), val);
+      childReadNode.removeEventListener(listener);
+    } catch (ExecutionException | TimeoutException | TestFailure e) {
+      fail("get threw an exception: " + e);
+    }
+  }
+
+  @Test
+  public void testLimitToGetWithListenerOnlyFiresOnce()
+      throws DatabaseException, InterruptedException, ExecutionException {
+    FirebaseDatabase readDb = getNewDatabase();
+    FirebaseDatabase writeDb = getNewDatabase();
+    String refKey = UUID.randomUUID().toString();
+    DatabaseReference writeRef = writeDb.getReference().child(refKey);
+    DatabaseReference readRef = readDb.getReference().child(refKey);
+    Map<String, Object> expected =
+        new MapBuilder().put("child1", "test1").put("child2", "test2").build();
+    try {
+      await(writeRef.setValue(expected));
+      ReadFuture.untilEquals(readRef, expected).timedGet();
+    } catch (Exception e) {
+      fail("Test failed with exception" + e);
+    }
+
+    Query query = readRef.limitToFirst(1);
+    DataSnapshot snapshot = await(query.get());
+    Map<String, Object> map = new MapBuilder().put("child1", "test1").build();
+    assertEquals(map, snapshot.getValue());
+  }
+
+  @Test
+  public void testDisjointedListenAndGet() {
+    FirebaseDatabase readDb = getNewDatabase();
+    FirebaseDatabase writeDb = getNewDatabase();
+    String parentKey = UUID.randomUUID().toString();
+    DatabaseReference writeRef = writeDb.getReference().child(parentKey);
+    DatabaseReference child1Ref = readDb.getReference().child(parentKey).child("child1");
+    Query otherChildrenQuery =
+        readDb.getReference().child(parentKey).orderByKey().startAt("child2");
+    Map<String, Object> topLevelValues =
+        new MapBuilder()
+            .put("child1", "test1")
+            .put("child2", "test2")
+            .put("child3", "test3")
+            .build();
+    try {
+      await(writeRef.setValue(topLevelValues));
+      ReadFuture.untilEquals(child1Ref, "test1");
+      DataSnapshot snapshot = await(otherChildrenQuery.get());
+      assertEquals(
+          new MapBuilder().put("child2", "test2").put("child3", "test3").build(),
+          snapshot.getValue());
+    } catch (Exception e) {
+      fail("Test failed with exception" + e);
+    }
+  }
+
+  @Test
+  public void testGetWithLimitToListenerOnlyFiresOnce()
+      throws DatabaseException, InterruptedException, ExecutionException {
+    FirebaseDatabase readDb = getNewDatabase();
+    FirebaseDatabase writeDb = getNewDatabase();
+    String refKey = UUID.randomUUID().toString();
+    DatabaseReference writeRef = writeDb.getReference().child(refKey);
+    DatabaseReference defaultRef = translateReference(writeRef, readDb);
+    Query readQuery = defaultRef.limitToFirst(1);
+    Map<String, Object> expected =
+        new MapBuilder().put("child1", "test1").put("child2", "test2").build();
+    try {
+      readDb.goOnline();
+      await(writeRef.setValue(expected));
+      ReadFuture.untilEquals(readQuery, new MapBuilder().put("child1", "test1").build()).timedGet();
+    } catch (Exception e) {
+      fail("Test failed with exception" + e);
+    }
+    DataSnapshot snapshot = await(defaultRef.get());
+    Map<String, Object> map =
+        new MapBuilder().put("child1", "test1").put("child2", "test2").build();
+    assertEquals(map, snapshot.getValue());
+  }
+
+  @Test
+  public void testStartWithGetWithListenerOnlyFiresOnce()
+      throws DatabaseException, InterruptedException, ExecutionException {
+    FirebaseDatabase readDb = getNewDatabase();
+    FirebaseDatabase writeDb = getNewDatabase();
+    DatabaseReference writeRef = writeDb.getReference().child(UUID.randomUUID().toString());
+    DatabaseReference readRef = translateReference(writeRef, readDb);
+    Map<String, Object> expected =
+        new MapBuilder()
+            .put("child1", "test1")
+            .put("child2", "test2")
+            .put("child3", "test3")
+            .build();
+    try {
+      await(writeRef.setValue(expected));
+      ReadFuture.untilEquals(readRef, expected).timedGet();
+    } catch (Exception e) {
+      fail("Test failed with exception" + e);
     }
-    fail("Client get succeeded even though offline.");
+
+    Query query = readRef.orderByKey().startAt("child2");
+    DataSnapshot snapshot = await(query.get());
+    Map<String, Object> map =
+        new MapBuilder().put("child2", "test2").put("child3", "test3").build();
+    assertEquals(map, snapshot.getValue());
   }
 
   @Test
   public void testGetSendsServerGetForNodeWithNoListenerWhenOnline()
       throws DatabaseException, InterruptedException, ExecutionException {
-    FirebaseApp app =
-        appForDatabaseUrl(IntegrationTestValues.getNamespace(), UUID.randomUUID().toString());
-    FirebaseDatabase db = FirebaseDatabase.getInstance(app);
+    FirebaseDatabase db = getNewDatabase();
     DatabaseReference node = db.getReference();
-    Tasks.await(node.setValue(42));
-    assertEquals(42L, Tasks.await(node.get()).getValue());
+    await(node.setValue(42));
+    assertEquals(42L, await(node.get()).getValue());
   }
 
   @Test
   public void testGetProbesInMemoryCacheForActiveListenerWhenOffline()
       throws DatabaseException, InterruptedException, ExecutionException, TestFailure,
           TimeoutException {
-    FirebaseApp readerApp =
-        appForDatabaseUrl(IntegrationTestValues.getNamespace(), UUID.randomUUID().toString());
-    FirebaseApp writerApp =
-        appForDatabaseUrl(IntegrationTestValues.getNamespace(), UUID.randomUUID().toString());
-    FirebaseDatabase readerDb = FirebaseDatabase.getInstance(readerApp);
+    FirebaseDatabase readerDb = getNewDatabase();
     readerDb.setPersistenceEnabled(true);
-    FirebaseDatabase writerDb = FirebaseDatabase.getInstance(writerApp);
+    FirebaseDatabase writerDb = getNewDatabase();
 
     DatabaseReference reader = readerDb.getReference();
     DatabaseReference writer = writerDb.getReference();
@@ -4607,14 +4925,14 @@ public void testGetProbesInMemoryCacheForActiveListenerWhenOffline()
     try {
       new WriteFuture(writer, 42L).timedGet();
 
-      assertEquals(Tasks.await(reader.get()).getValue(), 42L);
+      assertEquals(42L, await(reader.get()).getValue());
 
       Semaphore semaphore = new Semaphore(0);
       listener =
           new ValueEventListener() {
             @Override
             public void onDataChange(@NonNull DataSnapshot snapshot) {
-              assertEquals(snapshot.getValue(), 42L);
+              assertEquals(42L, snapshot.getValue());
               semaphore.release();
             }
 
@@ -4622,9 +4940,9 @@ public void onDataChange(@NonNull DataSnapshot snapshot) {
             public void onCancelled(@NonNull DatabaseError error) {}
           };
       reader.addValueEventListener(listener);
-      IntegrationTestHelpers.waitFor(semaphore);
+      waitFor(semaphore);
       readerDb.goOffline();
-      assertEquals(Tasks.await(reader.get()).getValue(), 42L);
+      assertEquals(42L, await(reader.get()).getValue());
     } finally {
       if (listener != null) {
         reader.removeEventListener(listener);
@@ -4635,13 +4953,13 @@ public void onCancelled(@NonNull DatabaseError error) {}
 
   @Test
   public void testGetWithPendingWrites() throws ExecutionException, InterruptedException {
-    DatabaseReference node = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference node = getRandomNode();
     node.getDatabase().goOffline();
     try {
       Map<String, Object> expected = new MapBuilder().put("foo", "bar").build();
       node.setValue(expected);
-      DataSnapshot snapshot = Tasks.await(node.get());
-      assertEquals(snapshot.getValue(), expected);
+      DataSnapshot snapshot = await(node.get());
+      assertEquals(expected, snapshot.getValue());
     } finally {
       node.getDatabase().goOnline();
     }
@@ -4649,12 +4967,12 @@ public void testGetWithPendingWrites() throws ExecutionException, InterruptedExc
 
   @Test
   public void testGetChildOfPendingWrites() throws ExecutionException, InterruptedException {
-    DatabaseReference node = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference node = getRandomNode();
     node.getDatabase().goOffline();
     try {
       node.setValue(new MapBuilder().put("foo", "bar").build());
-      DataSnapshot snapshot = Tasks.await(node.child("foo").get());
-      assertEquals(snapshot.getValue(), "bar");
+      DataSnapshot snapshot = await(node.child("foo").get());
+      assertEquals("bar", snapshot.getValue());
     } finally {
       node.getDatabase().goOnline();
     }
@@ -4664,13 +4982,9 @@ public void testGetChildOfPendingWrites() throws ExecutionException, Interrupted
   public void testGetSendsServerProbesPersistenceCacheWhenOfflineWithNoListener()
       throws DatabaseException, InterruptedException, ExecutionException, TestFailure,
           TimeoutException {
-    FirebaseApp readerApp =
-        appForDatabaseUrl(IntegrationTestValues.getNamespace(), UUID.randomUUID().toString());
-    FirebaseApp writerApp =
-        appForDatabaseUrl(IntegrationTestValues.getNamespace(), UUID.randomUUID().toString());
-    FirebaseDatabase readerDb = FirebaseDatabase.getInstance(readerApp);
+    FirebaseDatabase readerDb = getNewDatabase();
     readerDb.setPersistenceEnabled(true);
-    FirebaseDatabase writerDb = FirebaseDatabase.getInstance(writerApp);
+    FirebaseDatabase writerDb = getNewDatabase();
 
     DatabaseReference reader = readerDb.getReference();
     DatabaseReference writer = writerDb.getReference();
@@ -4694,12 +5008,12 @@ public void onDataChange(@NonNull DataSnapshot snapshot) {
           public void onCancelled(@NonNull DatabaseError error) {}
         };
     reader.addValueEventListener(listener);
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
 
     readerDb.goOffline();
     try {
       reader.removeEventListener(listener);
-      assertEquals(Tasks.await(reader.get()).getValue(), 42L);
+      assertEquals(42L, await(reader.get()).getValue());
     } finally {
       readerDb.goOnline();
     }
@@ -4709,13 +5023,9 @@ public void onCancelled(@NonNull DatabaseError error) {}
   public void testGetUpdatesPersistenceCacheWhenEnabled()
       throws DatabaseException, InterruptedException, ExecutionException, TestFailure,
           TimeoutException {
-    FirebaseApp readerApp =
-        appForDatabaseUrl(IntegrationTestValues.getNamespace(), UUID.randomUUID().toString());
-    FirebaseApp writerApp =
-        appForDatabaseUrl(IntegrationTestValues.getNamespace(), UUID.randomUUID().toString());
-    FirebaseDatabase readerDb = FirebaseDatabase.getInstance(readerApp);
+    FirebaseDatabase readerDb = getNewDatabase();
     readerDb.setPersistenceEnabled(true);
-    FirebaseDatabase writerDb = FirebaseDatabase.getInstance(writerApp);
+    FirebaseDatabase writerDb = getNewDatabase();
 
     DatabaseReference reader = readerDb.getReference();
     DatabaseReference writer = writerDb.getReference();
@@ -4724,7 +5034,7 @@ public void testGetUpdatesPersistenceCacheWhenEnabled()
     writer = writer.child(key);
 
     assertNull(new WriteFuture(writer, 42L).timedGet());
-    assertEquals(42L, Tasks.await(reader.get()).getValue());
+    assertEquals(42L, await(reader.get()).getValue());
 
     readerDb.goOffline();
     try {
@@ -4737,13 +5047,9 @@ public void testGetUpdatesPersistenceCacheWhenEnabled()
   @Test
   public void testGetSkipsPersistenceCacheWhenOnline()
       throws InterruptedException, ExecutionException, TimeoutException, TestFailure {
-    FirebaseApp readerApp =
-        appForDatabaseUrl(IntegrationTestValues.getNamespace(), UUID.randomUUID().toString());
-    FirebaseApp writerApp =
-        appForDatabaseUrl(IntegrationTestValues.getNamespace(), UUID.randomUUID().toString());
-    FirebaseDatabase readerDb = FirebaseDatabase.getInstance(readerApp);
+    FirebaseDatabase readerDb = getNewDatabase();
     readerDb.setPersistenceEnabled(true);
-    FirebaseDatabase writerDb = FirebaseDatabase.getInstance(writerApp);
+    FirebaseDatabase writerDb = getNewDatabase();
 
     DatabaseReference reader = readerDb.getReference();
     DatabaseReference writer = writerDb.getReference();
@@ -4768,18 +5074,18 @@ public void onCancelled(@NonNull DatabaseError error) {}
 
     reader.addValueEventListener(listener);
     assertNull(new WriteFuture(writer, 42L).timedGet());
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
     reader.removeEventListener(listener);
 
     assertNull(new WriteFuture(writer, 43L).timedGet());
-    assertEquals(43L, Tasks.await(reader.get()).getValue());
+    assertEquals(43L, await(reader.get()).getValue());
   }
 
   @Test
   public void querySnapshotChildrenRespectDefaultOrdering()
       throws DatabaseException, ExecutionException, TimeoutException, TestFailure,
           InterruptedException {
-    List<DatabaseReference> refs = IntegrationTestHelpers.getRandomNode(2);
+    List<DatabaseReference> refs = getRandomNode(2);
     DatabaseReference writer = refs.get(0);
     DatabaseReference reader = refs.get(1);
     final Semaphore semaphore = new Semaphore(0);
@@ -4866,7 +5172,7 @@ public void onDataChange(DataSnapshot snapshot) {
               @Override
               public void onCancelled(DatabaseError error) {}
             });
-    IntegrationTestHelpers.waitFor(semaphore);
+    waitFor(semaphore);
   }
 
   @Test
@@ -4880,7 +5186,7 @@ public void testAddingListensForTheSamePathDoesNotCheckFail() throws Throwable {
     // default view. This left the zombie one-time listener and check failed on the second attempt
     // to create a listener for the same path (asana#61028598952586).
 
-    DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
+    DatabaseReference ref = getRandomNode();
     final Semaphore semaphore = new Semaphore(0);
 
     ValueEventListener dummyListen =
@@ -4898,13 +5204,13 @@ public void onCancelled(DatabaseError error) {}
 
     ref.orderByChild("name").equalTo("John").addValueEventListener(dummyListen);
     ref.child("child").addValueEventListener(dummyListen);
-    IntegrationTestHelpers.waitFor(semaphore, 2);
+    waitFor(semaphore, 2);
 
     ref.child("child").child("favoriteToy").addListenerForSingleValueEvent(dummyListen);
-    IntegrationTestHelpers.waitFor(semaphore, 1);
+    waitFor(semaphore, 1);
 
     ref.child("child").child("favoriteToy").addListenerForSingleValueEvent(dummyListen);
-    IntegrationTestHelpers.waitFor(semaphore, 1);
+    waitFor(semaphore, 1);
 
     ref.removeEventListener(dummyListen);
     ref.child("child").removeEventListener(dummyListen);
diff --git a/firebase-database/src/androidTest/java/com/google/firebase/database/RealtimeTest.java b/firebase-database/src/androidTest/java/com/google/firebase/database/RealtimeTest.java
index bd6e3b18e42..3e639dae983 100644
--- a/firebase-database/src/androidTest/java/com/google/firebase/database/RealtimeTest.java
+++ b/firebase-database/src/androidTest/java/com/google/firebase/database/RealtimeTest.java
@@ -900,7 +900,7 @@ public void testShutdown()
       throws InterruptedException, ExecutionException, TestFailure, TimeoutException {
     DatabaseConfig config = IntegrationTestHelpers.newTestConfig();
     config.setLogLevel(Logger.Level.DEBUG);
-    DatabaseReference ref = new DatabaseReference(IntegrationTestValues.getNamespace(), config);
+    DatabaseReference ref = new DatabaseReference(IntegrationTestValues.getDatabaseUrl(), config);
 
     // Shut it down right away
     DatabaseReference.goOffline(config);
diff --git a/firebase-database/src/androidTest/java/com/google/firebase/database/connection/ConnectionTest.java b/firebase-database/src/androidTest/java/com/google/firebase/database/connection/ConnectionTest.java
index cdd47d446a5..041aa7ef993 100644
--- a/firebase-database/src/androidTest/java/com/google/firebase/database/connection/ConnectionTest.java
+++ b/firebase-database/src/androidTest/java/com/google/firebase/database/connection/ConnectionTest.java
@@ -62,8 +62,8 @@ public void onCacheHost(String s) {}
         };
     HostInfo info =
         new HostInfo(
-            IntegrationTestValues.getProjectId() + "." + IntegrationTestValues.getServer(),
-            IntegrationTestValues.getProjectId(),
+            IntegrationTestValues.getHostname(),
+            IntegrationTestValues.getNamespace(),
             /*secure=*/ true);
     DatabaseConfig config = IntegrationTestHelpers.newFrozenTestConfig();
     Connection conn = new Connection(config.getConnectionContext(), info, null, del, null, "");
diff --git a/firebase-database/src/androidTest/java/com/google/firebase/database/future/ReadFuture.java b/firebase-database/src/androidTest/java/com/google/firebase/database/future/ReadFuture.java
index 376d15b9aa8..177860d50df 100644
--- a/firebase-database/src/androidTest/java/com/google/firebase/database/future/ReadFuture.java
+++ b/firebase-database/src/androidTest/java/com/google/firebase/database/future/ReadFuture.java
@@ -34,7 +34,8 @@
 public class ReadFuture implements Future<List<EventRecord>> {
 
   public interface CompletionCondition {
-    public boolean isComplete(List<EventRecord> events);
+    public boolean isComplete(List<EventRecord> events)
+        throws ExecutionException, InterruptedException;
   }
 
   private List<EventRecord> events = new ArrayList<EventRecord>();
@@ -66,6 +67,7 @@ public void onDataChange(DataSnapshot snapshot) {
               }
             } catch (Exception e) {
               exception = e;
+              ref.removeEventListener(valueEventListener);
               finish();
             }
           }
@@ -73,6 +75,7 @@ public void onDataChange(DataSnapshot snapshot) {
           @Override
           public void onCancelled(DatabaseError error) {
             wasCancelled = true;
+            ref.removeEventListener(valueEventListener);
             finish();
           }
         };
diff --git a/firebase-database/src/androidTest/java/com/google/firebase/database/snapshot/CompoundHashingIntegrationTest.java b/firebase-database/src/androidTest/java/com/google/firebase/database/snapshot/CompoundHashingIntegrationTest.java
index aec72b385a1..b29e0d82414 100644
--- a/firebase-database/src/androidTest/java/com/google/firebase/database/snapshot/CompoundHashingIntegrationTest.java
+++ b/firebase-database/src/androidTest/java/com/google/firebase/database/snapshot/CompoundHashingIntegrationTest.java
@@ -149,7 +149,7 @@ private static Node randomNode(int numLeafs) {
   private void oneRound() throws Throwable {
     final Node initialState = randomNode(random.nextInt(5000));
     Node currentState = initialState;
-    SynchronousConnection conn = new SynchronousConnection(IntegrationTestValues.getNamespace());
+    SynchronousConnection conn = new SynchronousConnection(IntegrationTestValues.getDatabaseUrl());
     conn.connect();
     conn.setValue(Path.getEmptyPath(), initialState, /*wait=*/ false);
     int numUpdates = random.nextInt(30);
diff --git a/firebase-database/src/main/AndroidManifest.xml b/firebase-database/src/main/AndroidManifest.xml
index 8511e313ac4..fb146dd8402 100644
--- a/firebase-database/src/main/AndroidManifest.xml
+++ b/firebase-database/src/main/AndroidManifest.xml
@@ -13,16 +13,15 @@
 <!-- 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="com.google.firebase.database">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application>
-        <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
+        <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.database.FirebaseDatabaseKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.database.DatabaseRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
diff --git a/firebase-database/src/main/java/com/google/firebase/database/ChildEvent.kt b/firebase-database/src/main/java/com/google/firebase/database/ChildEvent.kt
new file mode 100644
index 00000000000..fd9745b94b5
--- /dev/null
+++ b/firebase-database/src/main/java/com/google/firebase/database/ChildEvent.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.database
+
+/**
+ * Used to emit events about changes in the child locations of a given [Query] when using the
+ * [childEvents] Flow.
+ */
+sealed class ChildEvent {
+  /**
+   * Emitted when a new child is added to the location.
+   *
+   * @param snapshot An immutable snapshot of the data at the new child location
+   * @param previousChildName The key name of sibling location ordered before the new child. This
+   * ```
+   *     will be null for the first child node of a location.
+   * ```
+   */
+  data class Added(val snapshot: DataSnapshot, val previousChildName: String?) : ChildEvent()
+
+  /**
+   * Emitted when the data at a child location has changed.
+   *
+   * @param snapshot An immutable snapshot of the data at the new data at the child location
+   * @param previousChildName The key name of sibling location ordered before the child. This will
+   * ```
+   *     be null for the first child node of a location.
+   * ```
+   */
+  data class Changed(val snapshot: DataSnapshot, val previousChildName: String?) : ChildEvent()
+
+  /**
+   * Emitted when a child is removed from the location.
+   *
+   * @param snapshot An immutable snapshot of the data at the child that was removed.
+   */
+  data class Removed(val snapshot: DataSnapshot) : ChildEvent()
+
+  /**
+   * Emitted when a child location's priority changes.
+   *
+   * @param snapshot An immutable snapshot of the data at the location that moved.
+   * @param previousChildName The key name of the sibling location ordered before the child
+   * ```
+   *     location. This will be null if this location is ordered first.
+   * ```
+   */
+  data class Moved(val snapshot: DataSnapshot, val previousChildName: String?) : ChildEvent()
+}
diff --git a/firebase-database/src/main/java/com/google/firebase/database/DataSnapshot.java b/firebase-database/src/main/java/com/google/firebase/database/DataSnapshot.java
index 11db5a93b2f..ab9174389e8 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/DataSnapshot.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/DataSnapshot.java
@@ -34,9 +34,8 @@
  * DatabaseReference#addListenerForSingleValueEvent(ValueEventListener)}. <br>
  * <br>
  * They are efficiently-generated immutable copies of the data at a Firebase Database location. They
- * can't be modified and will never change. To modify data at a location, use a {@link
- * DatabaseReference DatabaseReference} reference (e.g. with {@link
- * DatabaseReference#setValue(Object)}).
+ * can't be modified and will never change. To modify data at a location, use a <br>
+ * {@link DatabaseReference} reference (e.g. with {@link DatabaseReference#setValue(Object)}).
  */
 public class DataSnapshot {
 
@@ -105,12 +104,12 @@ public boolean exists() {
    * returned are:
    *
    * <ul>
-   *   <li>Boolean
-   *   <li>String
-   *   <li>Long
-   *   <li>Double
-   *   <li>Map&lt;String, Object&gt;
-   *   <li>List&lt;Object&gt;
+   *   <li><code>Boolean</code>
+   *   <li><code>String</code>
+   *   <li><code>Long</code>
+   *   <li><code>Double</code>
+   *   <li><code>Map&lt;String, Object&gt;</code>
+   *   <li><code>List&lt;Object&gt;</code>
    * </ul>
    *
    * This list is recursive; the possible types for {@link java.lang.Object} in the above list is
@@ -129,12 +128,12 @@ public Object getValue() {
    * returned are:
    *
    * <ul>
-   *   <li>Boolean
-   *   <li>String
-   *   <li>Long
-   *   <li>Double
-   *   <li>Map&lt;String, Object&gt;
-   *   <li>List&lt;Object&gt;
+   *   <li><code>Boolean</code>
+   *   <li><code>String</code>
+   *   <li><code>Long</code>
+   *   <li><code>Double</code>
+   *   <li><code>Map&lt;String, Object&gt;</code>
+   *   <li><code>List&lt;Object&gt;</code>
    * </ul>
    *
    * This list is recursive; the possible types for {@link java.lang.Object} in the above list is
@@ -166,7 +165,7 @@ public Object getValue(boolean useExportFormat) {
    *
    * An example class might look like:
    *
-   * <pre><code>
+   * <pre>
    *     class Message {
    *         private String author;
    *         private String text;
@@ -190,7 +189,7 @@ public Object getValue(boolean useExportFormat) {
    *
    *     // Later
    *     Message m = snapshot.getValue(Message.class);
-   * </code></pre>
+   * </pre>
    *
    * @param valueType The class into which this snapshot should be marshalled
    * @param <T> The type to return. Implicitly defined from the class passed in
@@ -208,13 +207,13 @@ public <T> T getValue(@NonNull Class<T> valueType) {
    * properly-typed Collection. So, in the case where you want a {@link java.util.List} of Message
    * instances, you will need to do something like the following:
    *
-   * <pre><code>
+   * <pre>
    *     GenericTypeIndicator&lt;List&lt;Message&gt;&gt; t = new GenericTypeIndicator&lt;List&lt;Message&gt;&gt;() {};
    *     List&lt;Message&gt; messages = snapshot.getValue(t);
-   * </code></pre>
+   * </pre>
    *
-   * It is important to use a subclass of {@link GenericTypeIndicator}. See {@link
-   * GenericTypeIndicator} for more details
+   * It is important to use a subclass of {@link GenericTypeIndicator}. <br>
+   * See {@link GenericTypeIndicator} for more details
    *
    * @param t A subclass of {@link GenericTypeIndicator} indicating the type of generic collection
    *     to be returned.
@@ -255,11 +254,13 @@ public String getKey() {
 
   /**
    * Gives access to all of the immediate children of this snapshot. Can be used in native for
-   * loops: <code>
-   * <br>    for (DataSnapshot child : parent.getChildren()) {
-   * <br>    &nbsp;&nbsp;&nbsp;&nbsp;...
-   * <br>    }
-   * </code>
+   * loops:
+   *
+   * <pre>
+   * for (DataSnapshot child : parent.getChildren()) {
+   *   &nbsp;&nbsp;&nbsp;&nbsp;...
+   * }
+   * </pre>
    *
    * @return The immediate children of this snapshot
    */
@@ -298,8 +299,8 @@ public void remove() {
    * types:
    *
    * <ul>
-   *   <li>Double
-   *   <li>String
+   *   <li><code>Double</code>
+   *   <li><code>String</code>
    * </ul>
    *
    * Note that null is also allowed
diff --git a/firebase-database/src/main/java/com/google/firebase/database/Database.kt b/firebase-database/src/main/java/com/google/firebase/database/Database.kt
new file mode 100644
index 00000000000..b4d9fc15c71
--- /dev/null
+++ b/firebase-database/src/main/java/com/google/firebase/database/Database.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.database
+
+import androidx.annotation.Keep
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.trySendBlocking
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.map
+
+/** Returns the [FirebaseDatabase] instance of the default [FirebaseApp]. */
+val Firebase.database: FirebaseDatabase
+  get() = FirebaseDatabase.getInstance()
+
+/** Returns the [FirebaseDatabase] instance for the specified [url]. */
+fun Firebase.database(url: String): FirebaseDatabase = FirebaseDatabase.getInstance(url)
+
+/** Returns the [FirebaseDatabase] instance of the given [FirebaseApp]. */
+fun Firebase.database(app: FirebaseApp): FirebaseDatabase = FirebaseDatabase.getInstance(app)
+
+/** Returns the [FirebaseDatabase] instance of the given [FirebaseApp] and [url]. */
+fun Firebase.database(app: FirebaseApp, url: String): FirebaseDatabase =
+  FirebaseDatabase.getInstance(app, url)
+
+/**
+ * Returns the content of the DataSnapshot converted to a POJO.
+ *
+ * Supports generics like List<> or Map<>. Use @JvmSuppressWildcards to force the compiler to use
+ * the type `T`, and not `? extends T`.
+ */
+inline fun <reified T> DataSnapshot.getValue(): T? {
+  return getValue(object : GenericTypeIndicator<T>() {})
+}
+
+/**
+ * Returns the content of the MutableData converted to a POJO.
+ *
+ * Supports generics like List<> or Map<>. Use @JvmSuppressWildcards to force the compiler to use
+ * the type `T`, and not `? extends T`.
+ */
+inline fun <reified T> MutableData.getValue(): T? {
+  return getValue(object : GenericTypeIndicator<T>() {})
+}
+
+/**
+ * Starts listening to this query and emits its values via a [Flow].
+ *
+ * - When the returned flow starts being collected, a [ValueEventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ */
+val Query.snapshots
+  get() =
+    callbackFlow<DataSnapshot> {
+      val listener =
+        addValueEventListener(
+          object : ValueEventListener {
+            override fun onDataChange(snapshot: DataSnapshot) {
+              repo.scheduleNow { trySendBlocking(snapshot) }
+            }
+
+            override fun onCancelled(error: DatabaseError) {
+              cancel(message = "Error getting Query snapshot", cause = error.toException())
+            }
+          }
+        )
+      awaitClose { removeEventListener(listener) }
+    }
+
+/**
+ * Starts listening to this query's child events and emits its values via a [Flow].
+ *
+ * - When the returned flow starts being collected, a [ChildEventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ */
+val Query.childEvents
+  get() =
+    callbackFlow<ChildEvent> {
+      val listener =
+        addChildEventListener(
+          object : ChildEventListener {
+            override fun onChildAdded(snapshot: DataSnapshot, previousChildName: String?) {
+              repo.scheduleNow { trySendBlocking(ChildEvent.Added(snapshot, previousChildName)) }
+            }
+
+            override fun onChildChanged(snapshot: DataSnapshot, previousChildName: String?) {
+              repo.scheduleNow { trySendBlocking(ChildEvent.Changed(snapshot, previousChildName)) }
+            }
+
+            override fun onChildRemoved(snapshot: DataSnapshot) {
+              repo.scheduleNow { trySendBlocking(ChildEvent.Removed(snapshot)) }
+            }
+
+            override fun onChildMoved(snapshot: DataSnapshot, previousChildName: String?) {
+              repo.scheduleNow { trySendBlocking(ChildEvent.Moved(snapshot, previousChildName)) }
+            }
+
+            override fun onCancelled(error: DatabaseError) {
+              cancel(message = "Error getting Query childEvent", cause = error.toException())
+            }
+          }
+        )
+      awaitClose { removeEventListener(listener) }
+    }
+
+/**
+ * Starts listening to this query and emits its values converted to a POJO via a [Flow].
+ *
+ * - When the returned flow starts being collected, a [ValueEventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ */
+inline fun <reified T : Any> Query.values(): Flow<T?> {
+  return snapshots.map { it.getValue(T::class.java) }
+}
+
+/** @suppress */
+@Keep
+class FirebaseDatabaseKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-database/src/main/java/com/google/firebase/database/DatabaseReference.java b/firebase-database/src/main/java/com/google/firebase/database/DatabaseReference.java
index 85e511041cc..c9db620a8ac 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/DatabaseReference.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/DatabaseReference.java
@@ -126,12 +126,12 @@ public DatabaseReference push() {
    * correspond to the JSON types:
    *
    * <ul>
-   *   <li>Boolean
-   *   <li>Long
-   *   <li>Double
-   *   <li>String
-   *   <li>Map&lt;String, Object&gt;
-   *   <li>List&lt;Object&gt;
+   *   <li><code>Boolean</code>
+   *   <li><code>Long</code>
+   *   <li><code>Double</code>
+   *   <li><code>String</code>
+   *   <li><code>Map&lt;String, Object&gt;</code>
+   *   <li><code>List&lt;Object&gt;</code>
    * </ul>
    *
    * <br>
@@ -165,12 +165,12 @@ public Task<Void> setValue(@Nullable Object value) {
    * the JSON types:
    *
    * <ul>
-   *   <li>Boolean
-   *   <li>Long
-   *   <li>Double
-   *   <li>String
-   *   <li>Map&lt;String, Object&gt;
-   *   <li>List&lt;Object&gt;
+   *   <li><code>Boolean</code>
+   *   <li><code>Long</code>
+   *   <li><code>Double</code>
+   *   <li><code>String</code>
+   *   <li><code>Map&lt;String, Object&gt;</code>
+   *   <li><code>List&lt;Object&gt;</code>
    * </ul>
    *
    * <br>
@@ -205,12 +205,12 @@ public Task<Void> setValue(@Nullable Object value, @Nullable Object priority) {
    * correspond to the JSON types:
    *
    * <ul>
-   *   <li>Boolean
-   *   <li>Long
-   *   <li>Double
-   *   <li>String
-   *   <li>Map&lt;String, Object&gt;
-   *   <li>List&lt;Object&gt;
+   *   <li><code>Boolean</code>
+   *   <li><code>Long</code>
+   *   <li><code>Double</code>
+   *   <li><code>String</code>
+   *   <li><code>Map&lt;String, Object&gt;</code>
+   *   <li><code>List&lt;Object&gt;</code>
    * </ul>
    *
    * <br>
@@ -242,12 +242,12 @@ public void setValue(@Nullable Object value, @Nullable CompletionListener listen
    * value correspond to the JSON types:
    *
    * <ul>
-   *   <li>Boolean
-   *   <li>Long
-   *   <li>Double
-   *   <li>String
-   *   <li>Map&lt;String, Object&gt;
-   *   <li>List&lt;Object&gt;
+   *   <li><code>Boolean</code>
+   *   <li><code>Long</code>
+   *   <li><code>Double</code>
+   *   <li><code>String</code>
+   *   <li><code>Map&lt;String, Object&gt;</code>
+   *   <li><code>List&lt;Object&gt;</code>
    * </ul>
    *
    * <br>
diff --git a/firebase-database/src/main/java/com/google/firebase/database/DatabaseRegistrar.java b/firebase-database/src/main/java/com/google/firebase/database/DatabaseRegistrar.java
index 7827118aa1c..c569420ac3c 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/DatabaseRegistrar.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/DatabaseRegistrar.java
@@ -17,7 +17,7 @@
 import androidx.annotation.Keep;
 import androidx.annotation.RestrictTo;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
@@ -30,20 +30,23 @@
 @Keep
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class DatabaseRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-rtdb";
+
   @Override
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(FirebaseDatabaseComponent.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.deferred(InternalAuthProvider.class))
-            .add(Dependency.deferred(InternalAppCheckTokenProvider.class))
+            .add(Dependency.deferred(InteropAppCheckTokenProvider.class))
             .factory(
                 c ->
                     new FirebaseDatabaseComponent(
                         c.get(FirebaseApp.class),
                         c.getDeferred(InternalAuthProvider.class),
-                        c.getDeferred(InternalAppCheckTokenProvider.class)))
+                        c.getDeferred(InteropAppCheckTokenProvider.class)))
             .build(),
-        LibraryVersionComponent.create("fire-rtdb", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabase.java b/firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabase.java
index a3a8a85b449..e1191e4efcd 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabase.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabase.java
@@ -186,9 +186,9 @@ public DatabaseReference getReference(@NonNull String path) {
 
   /**
    * Gets a DatabaseReference for the provided URL. The URL must be a URL to a path within this
-   * FirebaseDatabase. To create a DatabaseReference to a different database, create a {@link
-   * FirebaseApp} with a {@link FirebaseOptions} object configured with the appropriate database
-   * URL.
+   * FirebaseDatabase. To create a DatabaseReference to a different database, create a <br>
+   * {@link FirebaseApp} with a {@link FirebaseOptions} object configured with the appropriate
+   * database URL.
    *
    * @param url A URL to a path within your database.
    * @return A DatabaseReference for the provided URL.
@@ -211,7 +211,7 @@ public DatabaseReference getReferenceFromUrl(@NonNull String url) {
               + url
               + ") passed to getReference().  "
               + "URL was expected to match configured Database URL: "
-              + getReference().toString());
+              + getReference());
     }
 
     return new DatabaseReference(this.repo, parsedUrl.path);
diff --git a/firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabaseComponent.java b/firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabaseComponent.java
index b01748070db..976774f6b4d 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabaseComponent.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabaseComponent.java
@@ -16,7 +16,7 @@
 
 import androidx.annotation.NonNull;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.database.android.AndroidAppCheckTokenProvider;
 import com.google.firebase.database.android.AndroidAuthTokenProvider;
@@ -44,7 +44,7 @@ class FirebaseDatabaseComponent {
   FirebaseDatabaseComponent(
       @NonNull FirebaseApp app,
       Deferred<InternalAuthProvider> authProvider,
-      Deferred<InternalAppCheckTokenProvider> appCheckProvider) {
+      Deferred<InteropAppCheckTokenProvider> appCheckProvider) {
     this.app = app;
     this.authProvider = new AndroidAuthTokenProvider(authProvider);
     this.appCheckProvider = new AndroidAppCheckTokenProvider(appCheckProvider);
diff --git a/firebase-database/src/main/java/com/google/firebase/database/GenericTypeIndicator.java b/firebase-database/src/main/java/com/google/firebase/database/GenericTypeIndicator.java
index 0d6d099e6e4..ea447861a7b 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/GenericTypeIndicator.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/GenericTypeIndicator.java
@@ -25,7 +25,7 @@
  * {@link DataSnapshot}: <br>
  * <br>
  *
- * <pre><code>
+ * <pre>
  *     class Message {
  *         private String author;
  *         private String text;
@@ -51,7 +51,7 @@
  *     GenericTypeIndicator&lt;List&lt;Message&gt;&gt; t = new GenericTypeIndicator&lt;List&lt;Message&gt;&gt;() {};
  *     List&lt;Message&gt; messages = snapshot.getValue(t);
  *
- * </code></pre>
+ * </pre>
  *
  * @param <T> The type of generic collection that this instance servers as an indicator for
  */
diff --git a/firebase-database/src/main/java/com/google/firebase/database/MutableData.java b/firebase-database/src/main/java/com/google/firebase/database/MutableData.java
index fda1c2a7c7a..cbc96202832 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/MutableData.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/MutableData.java
@@ -91,11 +91,13 @@ public long getChildrenCount() {
   }
 
   /**
-   * Used to iterate over the immediate children at this location <code>
-   *     <br>for (MutableData child : parent.getChildren()) {
-   *         <br>&nbsp;&nbsp;&nbsp;&nbsp;...
-   *     <br>}
-   * </code>
+   * Used to iterate over the immediate children at this location
+   *
+   * <pre>
+   *     for (MutableData child : parent.getChildren()) {
+   *         &nbsp;&nbsp;&nbsp;&nbsp;...
+   *     }
+   * </pre>
    *
    * @return The immediate children at this location
    */
@@ -164,12 +166,12 @@ public String getKey() {
    * returned are:
    *
    * <ul>
-   *   <li>Boolean
-   *   <li>String
-   *   <li>Long
-   *   <li>Double
-   *   <li>Map&lt;String, Object&gt;
-   *   <li>List&lt;Object&gt;
+   *   <li><code>Boolean</code>
+   *   <li><code>Long</code>
+   *   <li><code>Double</code>
+   *   <li><code>String</code>
+   *   <li><code>Map&lt;String, Object&gt;</code>
+   *   <li><code>List&lt;Object&gt;</code>
    * </ul>
    *
    * This list is recursive; the possible types for {@link java.lang.Object} in the above list is
@@ -196,7 +198,7 @@ public Object getValue() {
    *
    * An example class might look like:
    *
-   * <pre><code>
+   * <pre>
    *     class Message {
    *         private String author;
    *         private String text;
@@ -220,7 +222,7 @@ public Object getValue() {
    *
    *     // Later
    *     Message m = mutableData.getValue(Message.class);
-   * </code></pre>
+   * </pre>
    *
    * @param valueType The class into which this data in this instance should be marshalled
    * @param <T> The type to return. Implicitly defined from the class passed in
@@ -238,14 +240,14 @@ public <T> T getValue(@NonNull Class<T> valueType) {
    * properly-typed Collection. So, in the case where you want a {@link java.util.List} of Message
    * instances, you will need to do something like the following:
    *
-   * <pre><code>
+   * <pre>
    *     GenericTypeIndicator&lt;List&lt;Message&gt;&gt; t =
    *         new GenericTypeIndicator&lt;List&lt;Message&gt;&gt;() {};
    *     List&lt;Message&gt; messages = mutableData.getValue(t);
-   * </code></pre>
+   * </pre>
    *
-   * It is important to use a subclass of {@link GenericTypeIndicator}. See {@link
-   * GenericTypeIndicator} for more details
+   * It is important to use a subclass of {@link GenericTypeIndicator}. See <br>
+   * {@link GenericTypeIndicator} for more details
    *
    * @param t A subclass of {@link GenericTypeIndicator} indicating the type of generic collection
    *     to be returned.
@@ -265,11 +267,11 @@ public <T> T getValue(@NonNull GenericTypeIndicator<T> t) {
    * the value correspond to the JSON types:
    *
    * <ul>
-   *   <li>Boolean
-   *   <li>Long
-   *   <li>Double
-   *   <li>Map&lt;String, Object&gt;
-   *   <li>List&lt;Object&gt;
+   *   <li><code>Boolean</code>
+   *   <li><code>Long</code>
+   *   <li><code>Double</code>
+   *   <li><code>Map&lt;String, Object&gt;</code>
+   *   <li><code>List&lt;Object&gt;</code>
    * </ul>
    *
    * <br>
@@ -315,8 +317,8 @@ public void setPriority(@Nullable Object priority) {
    * Gets the current priority at this location. The possible return types are:
    *
    * <ul>
-   *   <li>Double
-   *   <li>String
+   *   <li><code>Double</code>
+   *   <li><code>String</code>
    * </ul>
    *
    * Note that null is allowed
diff --git a/firebase-database/src/main/java/com/google/firebase/database/Transaction.java b/firebase-database/src/main/java/com/google/firebase/database/Transaction.java
index 1d78cae955a..c4990e3bb81 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/Transaction.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/Transaction.java
@@ -25,8 +25,8 @@
  * <br>
  * To run a transaction, provide a {@link Handler} to {@link
  * DatabaseReference#runTransaction(com.google.firebase.database.Transaction.Handler)}. That handler
- * will be passed the current data at the location, and must return a {@link Result}. A {@link
- * Result} can be created using either {@link Transaction#success(MutableData)} or {@link
+ * will be passed the current data at the location, and must return a {@link Result}.<br>
+ * A {@link Result} can be created using either {@link Transaction#success(MutableData)} or {@link
  * com.google.firebase.database.Transaction#abort()}.
  */
 public class Transaction {
diff --git a/firebase-database/src/main/java/com/google/firebase/database/android/AndroidAppCheckTokenProvider.java b/firebase-database/src/main/java/com/google/firebase/database/android/AndroidAppCheckTokenProvider.java
index dddb403afa1..bc6bb4061d8 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/android/AndroidAppCheckTokenProvider.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/android/AndroidAppCheckTokenProvider.java
@@ -14,21 +14,22 @@
 
 package com.google.firebase.database.android;
 
+import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.appcheck.AppCheckTokenResult;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.database.core.TokenProvider;
 import com.google.firebase.inject.Deferred;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class AndroidAppCheckTokenProvider implements TokenProvider {
-  private final Deferred<InternalAppCheckTokenProvider> deferredAppCheckProvider;
-  private final AtomicReference<InternalAppCheckTokenProvider> internalAppCheck;
+  private final Deferred<InteropAppCheckTokenProvider> deferredAppCheckProvider;
+  private final AtomicReference<InteropAppCheckTokenProvider> internalAppCheck;
 
   public AndroidAppCheckTokenProvider(
-      Deferred<InternalAppCheckTokenProvider> deferredAppCheckProvider) {
+      Deferred<InteropAppCheckTokenProvider> deferredAppCheckProvider) {
     this.deferredAppCheckProvider = deferredAppCheckProvider;
     this.internalAppCheck = new AtomicReference<>();
 
@@ -36,9 +37,11 @@ public AndroidAppCheckTokenProvider(
         authProvider -> internalAppCheck.set(authProvider.get()));
   }
 
+  // TODO(b/261014172): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   @Override
   public void getToken(boolean forceRefresh, @NonNull final GetTokenCompletionListener listener) {
-    InternalAppCheckTokenProvider appCheckProvider = internalAppCheck.get();
+    InteropAppCheckTokenProvider appCheckProvider = internalAppCheck.get();
 
     if (appCheckProvider != null) {
       Task<AppCheckTokenResult> getTokenResult = appCheckProvider.getToken(forceRefresh);
diff --git a/firebase-database/src/main/java/com/google/firebase/database/android/AndroidAuthTokenProvider.java b/firebase-database/src/main/java/com/google/firebase/database/android/AndroidAuthTokenProvider.java
index 7630b0409dd..c1a93cb8088 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/android/AndroidAuthTokenProvider.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/android/AndroidAuthTokenProvider.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.database.android;
 
+import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApiNotAvailableException;
@@ -36,6 +37,8 @@ public AndroidAuthTokenProvider(Deferred<InternalAuthProvider> deferredAuthProvi
     deferredAuthProvider.whenAvailable(authProvider -> internalAuth.set(authProvider.get()));
   }
 
+  // TODO(b/261014172): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   @Override
   public void getToken(boolean forceRefresh, @NonNull final GetTokenCompletionListener listener) {
     InternalAuthProvider authProvider = internalAuth.get();
diff --git a/firebase-database/src/main/java/com/google/firebase/database/android/AndroidEventTarget.java b/firebase-database/src/main/java/com/google/firebase/database/android/AndroidEventTarget.java
index be033c49e91..e76f1bac9c8 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/android/AndroidEventTarget.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/android/AndroidEventTarget.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.database.android;
 
+import android.annotation.SuppressLint;
 import android.os.Handler;
 import android.os.Looper;
 import com.google.firebase.database.core.EventTarget;
@@ -21,6 +22,8 @@
 public class AndroidEventTarget implements EventTarget {
   private final Handler handler;
 
+  // TODO(b/258277572): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   public AndroidEventTarget() {
     this.handler = new Handler(Looper.getMainLooper());
   }
diff --git a/firebase-database/src/main/java/com/google/firebase/database/android/AndroidPlatform.java b/firebase-database/src/main/java/com/google/firebase/database/android/AndroidPlatform.java
index d4e900dd9e6..1ddd20e4c96 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/android/AndroidPlatform.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/android/AndroidPlatform.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.database.android;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
 import android.os.Handler;
@@ -88,6 +89,8 @@ public void handleException(final Throwable e) {
         // Rethrow on main thread, so the application will crash
         // The exception might indicate that there is something seriously wrong and better crash,
         // than continue run in an undefined state...
+        // TODO(b/258277572): Migrate to go/firebase-android-executors
+        @SuppressLint("ThreadPoolCreation")
         Handler handler = new Handler(applicationContext.getMainLooper());
         handler.post(
             new Runnable() {
diff --git a/firebase-database/src/main/java/com/google/firebase/database/android/SqlPersistenceStorageEngine.java b/firebase-database/src/main/java/com/google/firebase/database/android/SqlPersistenceStorageEngine.java
index f442047ddb3..0a434254dcf 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/android/SqlPersistenceStorageEngine.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/android/SqlPersistenceStorageEngine.java
@@ -58,7 +58,7 @@
 /**
  * This class is an Android/SQL-backed implementation of PersistenceStorageEngine.
  *
- * <p>The implementation uses 3 tables for persistence: - writes: A list of all currently
+ * <p>The implementation uses 4 tables for persistence: - writes: A list of all currently
  * outstanding (visible) writes. A row represents a single write containing a unique-across-restarts
  * write id, the path string, the type which can be 'o' for an overwrite or 'm' for a merge, and the
  * serialized node wrapped. Part number is NULL for normal writes. Large writes (>256K) are split
@@ -1058,6 +1058,7 @@ private Cursor loadNestedQuery(Path path, String[] columns) {
     arguments[path.size() + 1] = pathPrefixStart;
     arguments[path.size() + 2] = pathPrefixEnd;
     String orderBy = PATH_COLUMN_NAME;
+    // TODO: We need to modify this to make sure that we limit based on trackedquerykeys
 
     return database.query(SERVER_CACHE_TABLE, columns, whereClause, arguments, null, null, orderBy);
   }
diff --git a/firebase-database/src/main/java/com/google/firebase/database/connection/PersistentConnectionImpl.java b/firebase-database/src/main/java/com/google/firebase/database/connection/PersistentConnectionImpl.java
index 6d2771c11cd..0363f259e9d 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/connection/PersistentConnectionImpl.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/connection/PersistentConnectionImpl.java
@@ -275,7 +275,6 @@ private enum ConnectionState {
   private static final long SUCCESSFUL_CONNECTION_ESTABLISHED_DELAY = 30 * 1000;
 
   private static final long IDLE_TIMEOUT = 60 * 1000;
-  private static final long GET_CONNECT_TIMEOUT = 3 * 1000;
 
   /**
    * If auth or appcheck fails repeatedly, we'll assume something is wrong and log a warning / back
@@ -420,7 +419,6 @@ public Task<Object> get(List<String> path, Map<String, Object> queryParams) {
               String status = (String) response.get(REQUEST_STATUS);
               if (status.equals("ok")) {
                 Object body = response.get(SERVER_DATA_UPDATE_BODY);
-                delegate.onDataUpdate(query.path, body, /*isMerge=*/ false, /*tagNumber=*/ null);
                 source.setResult(body);
               } else {
                 source.setException(new Exception((String) response.get(SERVER_DATA_UPDATE_BODY)));
@@ -428,22 +426,6 @@ public Task<Object> get(List<String> path, Map<String, Object> queryParams) {
             });
     outstandingGets.put(readId, outstandingGet);
 
-    if (!connected()) {
-      executorService.schedule(
-          () -> {
-            if (!outstandingGet.markSent()) {
-              return;
-            }
-            if (logger.logsDebug()) {
-              logger.debug("get " + readId + " timed out waiting for connection");
-            }
-            outstandingGets.remove(readId);
-            source.setException(new Exception("Client is offline"));
-          },
-          GET_CONNECT_TIMEOUT,
-          TimeUnit.MILLISECONDS);
-    }
-
     if (canSendReads()) {
       sendGet(readId);
     }
diff --git a/firebase-database/src/main/java/com/google/firebase/database/core/Path.java b/firebase-database/src/main/java/com/google/firebase/database/core/Path.java
index 3265a1d6f9d..3e12542fed9 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/core/Path.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/core/Path.java
@@ -75,6 +75,8 @@ public Path(String pathString) {
         count++;
       }
     }
+    // We are essentially doing the same work twice; once here, and once again in the constructor on
+    // line 60
     pieces = new ChildKey[count];
     int j = 0;
     for (String segment : segments) {
diff --git a/firebase-database/src/main/java/com/google/firebase/database/core/Repo.java b/firebase-database/src/main/java/com/google/firebase/database/core/Repo.java
index 2ea321b1b10..160a5c6ff57 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/core/Repo.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/core/Repo.java
@@ -17,7 +17,6 @@
 import static com.google.firebase.database.core.utilities.Utilities.hardAssert;
 
 import androidx.annotation.NonNull;
-import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.database.DataSnapshot;
@@ -57,10 +56,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 
 public class Repo implements PersistentConnection.Delegate {
 
   private static final String INTERRUPT_REASON = "repo_interrupt";
+  private static final int GET_TIMEOUT_MS = 3000;
 
   private final RepoInfo repoInfo;
   private final OffsetClock serverClock = new OffsetClock(new DefaultClock(), 0);
@@ -303,6 +304,11 @@ public void scheduleNow(Runnable r) {
     ctx.getRunLoop().scheduleNow(r);
   }
 
+  public void scheduleDelayed(Runnable r, long millis) {
+    ctx.requireStarted();
+    ctx.getRunLoop().schedule(r, millis);
+  }
+
   public void postEvent(Runnable r) {
     ctx.requireStarted();
     ctx.getEventTarget().postEvent(r);
@@ -508,12 +514,13 @@ public void onRequestResult(String optErrorCode, String optErrorMessage) {
    */
   public Task<DataSnapshot> getValue(Query query) {
     TaskCompletionSource<DataSnapshot> source = new TaskCompletionSource<>();
+    final Repo repo = this;
     this.scheduleNow(
         new Runnable() {
           @Override
           public void run() {
             // Always check active-listener in-memory caches first. These are always at least as
-            // up to date as the persistence cache.
+            // up to date as the persistence cache
             Node serverValue = serverSyncTree.getServerValue(query.getSpec());
             if (serverValue != null) {
               source.setResult(
@@ -522,35 +529,54 @@ public void run() {
               return;
             }
             serverSyncTree.setQueryActive(query.getSpec());
+            final DataSnapshot persisted = serverSyncTree.persistenceServerCache(query);
+            if (persisted.exists()) {
+              // Prefer the locally persisted value if the server is not responsive.
+              scheduleDelayed(() -> source.trySetResult(persisted), GET_TIMEOUT_MS);
+            }
             connection
                 .get(query.getPath().asList(), query.getSpec().getParams().getWireProtocolParams())
                 .addOnCompleteListener(
                     ((DefaultRunLoop) ctx.getRunLoop()).getExecutorService(),
-                    new OnCompleteListener<Object>() {
-                      @Override
-                      public void onComplete(@NonNull Task<Object> task) {
-                        if (!task.isSuccessful()) {
-                          operationLogger.info(
-                              "get for query "
-                                  + query.getPath()
-                                  + " falling back to disk cache after error: "
-                                  + task.getException().getMessage());
-                          DataSnapshot cached = serverSyncTree.persistenceServerCache(query);
-                          if (!cached.exists()) {
-                            source.setException(task.getException());
-                          } else {
-                            source.setResult(cached);
-                          }
+                    (@NonNull Task<Object> task) -> {
+                      if (source.getTask().isComplete()) {
+                        return;
+                      }
+                      if (!task.isSuccessful()) {
+                        if (persisted.exists()) {
+                          source.setResult(persisted);
+                        } else {
+                          source.setException(Objects.requireNonNull(task.getException()));
+                        }
+                      } else {
+                        /*
+                         * We need to replicate the behavior that occurs when running `once()`. In other words,
+                         * we need to create a new eventRegistration, register it with a view and then
+                         * overwrite the data at that location, and then remove the view.
+                         */
+                        Node serverNode = NodeUtilities.NodeFromJSON(task.getResult());
+                        QuerySpec spec = query.getSpec();
+                        // EventRegistrations require a listener to be attached, so a dummy
+                        // ValueEventListener was created.
+                        keepSynced(spec, /*keep=*/ true, /*skipDedup=*/ true);
+                        List<? extends Event> events;
+                        if (spec.loadsAllData()) {
+                          events = serverSyncTree.applyServerOverwrite(spec.getPath(), serverNode);
                         } else {
-                          Node serverNode = NodeUtilities.NodeFromJSON(task.getResult());
-                          postEvents(
-                              serverSyncTree.applyServerOverwrite(query.getPath(), serverNode));
-                          source.setResult(
-                              InternalHelpers.createDataSnapshot(
-                                  query.getRef(),
-                                  IndexedNode.from(serverNode, query.getSpec().getIndex())));
+                          events =
+                              serverSyncTree.applyTaggedQueryOverwrite(
+                                  spec.getPath(),
+                                  serverNode,
+                                  getServerSyncTree().tagForQuery(spec));
                         }
-                        serverSyncTree.setQueryInactive(query.getSpec());
+                        repo.postEvents(
+                            events); // to ensure that other listeners end up getting their cached
+                        // events.
+                        source.setResult(
+                            InternalHelpers.createDataSnapshot(
+                                query.getRef(),
+                                IndexedNode.from(serverNode, query.getSpec().getIndex())));
+                        keepSynced(spec, /*keep=*/ false, /*skipDedup=*/ true);
                       }
                     });
           }
@@ -738,9 +764,12 @@ public void addEventCallback(@NotNull EventRegistration eventRegistration) {
   }
 
   public void keepSynced(QuerySpec query, boolean keep) {
-    hardAssert(query.getPath().isEmpty() || !query.getPath().getFront().equals(Constants.DOT_INFO));
+    keepSynced(query, keep, /*skipDedup=*/ false);
+  }
 
-    serverSyncTree.keepSynced(query, keep);
+  public void keepSynced(QuerySpec query, boolean keep, final boolean skipDedup) {
+    hardAssert(query.getPath().isEmpty() || !query.getPath().getFront().equals(Constants.DOT_INFO));
+    serverSyncTree.keepSynced(query, keep, skipDedup);
   }
 
   PersistentConnection getConnection() {
diff --git a/firebase-database/src/main/java/com/google/firebase/database/core/SyncPoint.java b/firebase-database/src/main/java/com/google/firebase/database/core/SyncPoint.java
index ad2dd03f69f..3854dc12f23 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/core/SyncPoint.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/core/SyncPoint.java
@@ -235,8 +235,9 @@ public List<View> getQueryViews() {
 
   public Node getCompleteServerCache(Path path) {
     for (View view : this.views.values()) {
-      if (view.getCompleteServerCache(path) != null) {
-        return view.getCompleteServerCache(path);
+      Node serverCache = view.getCompleteServerCache(path);
+      if (serverCache != null) {
+        return serverCache;
       }
     }
     return null;
diff --git a/firebase-database/src/main/java/com/google/firebase/database/core/SyncTree.java b/firebase-database/src/main/java/com/google/firebase/database/core/SyncTree.java
index a4363018d20..4f22419fdc4 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/core/SyncTree.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/core/SyncTree.java
@@ -538,9 +538,14 @@ public Node getServerValue(QuerySpec query) {
         });
   }
 
-  /** Add an event callback for the specified query. */
   public List<? extends Event> addEventRegistration(
       @NotNull final EventRegistration eventRegistration) {
+    return addEventRegistration(eventRegistration, false);
+  }
+
+  /** Add an event callback for the specified query. */
+  public List<? extends Event> addEventRegistration(
+      @NotNull final EventRegistration eventRegistration, final boolean skipListenerSetup) {
     return persistenceManager.runInTransaction(
         new Callable<List<? extends Event>>() {
           @Override
@@ -635,7 +640,7 @@ public List<? extends Event> call() {
             WriteTreeRef writesCache = pendingWriteTree.childWrites(path);
             List<? extends Event> events =
                 syncPoint.addEventRegistration(eventRegistration, writesCache, serverCache);
-            if (!viewAlreadyExists && !foundAncestorDefaultView) {
+            if (!viewAlreadyExists && !foundAncestorDefaultView && !skipListenerSetup) {
               View view = syncPoint.viewForQuery(query);
               setupListener(query, view);
             }
@@ -650,7 +655,14 @@ public List<? extends Event> call() {
    * <p>If query is the default query, we'll check all queries for the specified eventRegistration.
    */
   public List<Event> removeEventRegistration(@NotNull EventRegistration eventRegistration) {
-    return this.removeEventRegistration(eventRegistration.getQuerySpec(), eventRegistration, null);
+    return this.removeEventRegistration(
+        eventRegistration.getQuerySpec(), eventRegistration, null, false);
+  }
+
+  public List<Event> removeEventRegistration(
+      @NotNull EventRegistration eventRegistration, boolean skipDedup) {
+    return this.removeEventRegistration(
+        eventRegistration.getQuerySpec(), eventRegistration, null, skipDedup);
   }
 
   /**
@@ -660,13 +672,14 @@ public List<Event> removeEventRegistration(@NotNull EventRegistration eventRegis
    */
   public List<Event> removeAllEventRegistrations(
       @NotNull QuerySpec query, @NotNull DatabaseError error) {
-    return this.removeEventRegistration(query, null, error);
+    return this.removeEventRegistration(query, null, error, false);
   }
 
   private List<Event> removeEventRegistration(
       final @NotNull QuerySpec query,
       final @Nullable EventRegistration eventRegistration,
-      final @Nullable DatabaseError cancelError) {
+      final @Nullable DatabaseError cancelError,
+      final boolean skipDedup) {
     return persistenceManager.runInTransaction(
         new Callable<List<Event>>() {
           @Override
@@ -688,6 +701,7 @@ public List<Event> call() {
               if (maybeSyncPoint.isEmpty()) {
                 syncPointTree = syncPointTree.remove(path);
               }
+
               List<QuerySpec> removed = removedAndEvents.getFirst();
               cancelEvents = removedAndEvents.getSecond();
               // We may have just removed one of many listeners and can short-circuit this whole
@@ -701,6 +715,25 @@ public List<Event> call() {
                 persistenceManager.setQueryInactive(query);
                 removingDefault = removingDefault || queryRemoved.loadsAllData();
               }
+
+              /**
+               * This is to handle removeRegistration by {@link Repo#getValue(Query)}. Specifically
+               * to avoid the scenario where: A listener is attached at a child path, and {@link
+               * Repo#getValue(Query)} is called on the parent path. Normally, when a listener is
+               * attached on a child path and then a parent path has a listener attached to it, to
+               * reduce the number of listeners, the listen() function will unlisten to the child
+               * path and listen instead on the parent path. And then, when removeRegistration is
+               * called on the parent path, the child path will get listened to, since it doesn't
+               * have anything covering its path. However, for {@link Repo#getValue(Query)}, we do
+               * not call listen on the parent path, and the child path is still listened to and so
+               * when the deduping happens below, the SyncTree assumes that the child listener has
+               * been removed and attempts to call listen again, but since we are still listening on
+               * that location, listen would be called twice on the same query. skipDedup allows us
+               * to skip this deduping process altogether.
+               */
+              if (skipDedup) {
+                return null;
+              }
               ImmutableTree<SyncPoint> currentTree = syncPointTree;
               boolean covered =
                   currentTree.getValue() != null && currentTree.getValue().hasCompleteView();
@@ -815,12 +848,17 @@ public int hashCode() {
   }
 
   public void keepSynced(final QuerySpec query, final boolean keep) {
+    keepSynced(query, keep, false);
+  }
+
+  public void keepSynced(final QuerySpec query, final boolean keep, final boolean skipDedup) {
     if (keep && !keepSyncedQueries.contains(query)) {
       // TODO[persistence]: Find better / more efficient way to do keep-synced listeners.
-      addEventRegistration(new KeepSyncedEventRegistration(query));
+      addEventRegistration(
+          new KeepSyncedEventRegistration(query), /*skipListenerSetup=*/ skipDedup);
       keepSyncedQueries.add(query);
     } else if (!keep && keepSyncedQueries.contains(query)) {
-      removeEventRegistration(new KeepSyncedEventRegistration(query));
+      removeEventRegistration(new KeepSyncedEventRegistration(query), skipDedup);
       keepSyncedQueries.remove(query);
     }
   }
@@ -915,7 +953,7 @@ private QuerySpec queryForTag(Tag tag) {
   }
 
   /** Return the tag associated with the given query. */
-  private Tag tagForQuery(QuerySpec query) {
+  public Tag tagForQuery(QuerySpec query) {
     return this.queryToTagMap.get(query);
   }
 
diff --git a/firebase-database/src/main/java/com/google/firebase/database/core/ThreadPoolEventTarget.java b/firebase-database/src/main/java/com/google/firebase/database/core/ThreadPoolEventTarget.java
index 90bd199e496..f7c8b4e5df7 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/core/ThreadPoolEventTarget.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/core/ThreadPoolEventTarget.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.database.core;
 
+import android.annotation.SuppressLint;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
@@ -25,6 +26,8 @@ class ThreadPoolEventTarget implements EventTarget {
 
   private final ThreadPoolExecutor executor;
 
+  // TODO(b/258277572): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   public ThreadPoolEventTarget(
       final ThreadFactory wrappedFactory, final ThreadInitializer threadInitializer) {
     int poolSize = 1;
diff --git a/firebase-database/src/main/java/com/google/firebase/database/core/ZombieEventManager.java b/firebase-database/src/main/java/com/google/firebase/database/core/ZombieEventManager.java
index c4994b582c5..2bd206a1dbd 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/core/ZombieEventManager.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/core/ZombieEventManager.java
@@ -122,7 +122,7 @@ public void zombifyForRemove(EventRegistration registration) {
       if (registrationList != null && !registrationList.isEmpty()) {
         if (registration.getQuerySpec().isDefault()) {
           // The behavior here has to match the behavior of SyncPoint.removeEventRegistration.
-          // If the query is default, it remove a single instance of the registration
+          // If the query is default, it removes a single instance of the registration
           // from each unique query.  So for example, if you had 3 copies registered under default,
           // you would end up with 2 still registered.
           // If you had 1 registration in default and 2 in query a', you'd end up with just
diff --git a/firebase-database/src/main/java/com/google/firebase/database/core/utilities/encoding/CustomClassMapper.java b/firebase-database/src/main/java/com/google/firebase/database/core/utilities/encoding/CustomClassMapper.java
index 249a3de13e6..0705ff33aaa 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/core/utilities/encoding/CustomClassMapper.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/core/utilities/encoding/CustomClassMapper.java
@@ -494,6 +494,7 @@ public BeanMapper(Class<T> clazz) {
       // getMethods/getFields only returns public methods/fields we need to traverse the
       // class hierarchy to find the appropriate setter or field.
       Class<? super T> currentClass = clazz;
+      Map<String, Method> bridgeMethods = new HashMap<>();
       do {
         // Add any setters
         for (Method method : currentClass.getDeclaredMethods()) {
@@ -504,12 +505,19 @@ public BeanMapper(Class<T> clazz) {
               if (!existingPropertyName.equals(propertyName)) {
                 throw new DatabaseException(
                     "Found setter with invalid " + "case-sensitive name: " + method.getName());
+              } else if (method.isBridge()) {
+                // We ignore bridge setters when creating a bean, but include them in the map
+                // for the purpose of the `isSetterOverride()` check
+                bridgeMethods.put(propertyName, method);
               } else {
                 Method existingSetter = setters.get(propertyName);
+                Method correspondingBridgeMethod = bridgeMethods.get(propertyName);
                 if (existingSetter == null) {
                   method.setAccessible(true);
                   setters.put(propertyName, method);
-                } else if (!isSetterOverride(method, existingSetter)) {
+                } else if (!isSetterOverride(method, existingSetter)
+                    && !(correspondingBridgeMethod != null
+                        && isSetterOverride(method, correspondingBridgeMethod))) {
                   // We require that setters with conflicting property names are
                   // overrides from a base class
                   throw new DatabaseException(
@@ -703,6 +711,10 @@ private static boolean shouldIncludeGetter(Method method) {
       if (method.getParameterTypes().length != 0) {
         return false;
       }
+      // Bridge methods
+      if (method.isBridge()) {
+        return false;
+      }
       // Excluded methods
       if (method.isAnnotationPresent(Exclude.class)) {
         return false;
diff --git a/firebase-database/src/main/java/com/google/firebase/database/ktx/ChildEvent.kt b/firebase-database/src/main/java/com/google/firebase/database/ktx/ChildEvent.kt
new file mode 100644
index 00000000000..79fb9db7c16
--- /dev/null
+++ b/firebase-database/src/main/java/com/google/firebase/database/ktx/ChildEvent.kt
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.database.ktx
+
+import com.google.firebase.database.DataSnapshot
+
+/**
+ * Used to emit events about changes in the child locations of a given [Query] when using the
+ * [childEvents] Flow.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+sealed class ChildEvent {
+  /**
+   * Emitted when a new child is added to the location.
+   *
+   * @param snapshot An immutable snapshot of the data at the new child location
+   * @param previousChildName The key name of sibling location ordered before the new child. This
+   * ```
+   *     will be null for the first child node of a location.
+   * ```
+   * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+   * respective main modules, and the Kotlin extension (KTX) APIs in
+   * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll
+   * no longer release KTX modules. For details, see the
+   * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+   */
+  @Deprecated(
+    "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+    ReplaceWith("")
+  )
+  data class Added(val snapshot: DataSnapshot, val previousChildName: String?) : ChildEvent()
+
+  /**
+   * Emitted when the data at a child location has changed.
+   *
+   * @param snapshot An immutable snapshot of the data at the new data at the child location
+   * @param previousChildName The key name of sibling location ordered before the child. This will
+   * ```
+   *     be null for the first child node of a location.
+   * ```
+   * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+   * respective main modules, and the Kotlin extension (KTX) APIs in
+   * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll
+   * no longer release KTX modules. For details, see the
+   * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+   */
+  @Deprecated(
+    "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+    ReplaceWith("")
+  )
+  data class Changed(val snapshot: DataSnapshot, val previousChildName: String?) : ChildEvent()
+
+  /**
+   * Emitted when a child is removed from the location.
+   *
+   * @param snapshot An immutable snapshot of the data at the child that was removed.
+   * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+   * respective main modules, and the Kotlin extension (KTX) APIs in
+   * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll
+   * no longer release KTX modules. For details, see the
+   * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+   */
+  @Deprecated(
+    "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+    ReplaceWith("")
+  )
+  data class Removed(val snapshot: DataSnapshot) : ChildEvent()
+
+  /**
+   * Emitted when a child location's priority changes.
+   *
+   * @param snapshot An immutable snapshot of the data at the location that moved.
+   * @param previousChildName The key name of the sibling location ordered before the child
+   * ```
+   *     location. This will be null if this location is ordered first.
+   * ```
+   * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+   * respective main modules, and the Kotlin extension (KTX) APIs in
+   * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll
+   * no longer release KTX modules. For details, see the
+   * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+   */
+  @Deprecated(
+    "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+    ReplaceWith("")
+  )
+  data class Moved(val snapshot: DataSnapshot, val previousChildName: String?) : ChildEvent()
+}
diff --git a/firebase-database/src/main/java/com/google/firebase/database/ktx/Database.kt b/firebase-database/src/main/java/com/google/firebase/database/ktx/Database.kt
new file mode 100644
index 00000000000..684dc9ebd37
--- /dev/null
+++ b/firebase-database/src/main/java/com/google/firebase/database/ktx/Database.kt
@@ -0,0 +1,242 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.database.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.database.ChildEventListener
+import com.google.firebase.database.DataSnapshot
+import com.google.firebase.database.DatabaseError
+import com.google.firebase.database.FirebaseDatabase
+import com.google.firebase.database.GenericTypeIndicator
+import com.google.firebase.database.MutableData
+import com.google.firebase.database.Query
+import com.google.firebase.database.ValueEventListener
+import com.google.firebase.ktx.Firebase
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.trySendBlocking
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.map
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseDatabase] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.database: FirebaseDatabase
+  get() = FirebaseDatabase.getInstance()
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseDatabase] instance for the specified [url].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.database(url: String): FirebaseDatabase = FirebaseDatabase.getInstance(url)
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseDatabase] instance of the given [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.database(app: FirebaseApp): FirebaseDatabase = FirebaseDatabase.getInstance(app)
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseDatabase] instance of the given [FirebaseApp] and [url].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.database(app: FirebaseApp, url: String): FirebaseDatabase =
+  FirebaseDatabase.getInstance(app, url)
+
+/**
+ * Returns the content of the DataSnapshot converted to a POJO.
+ *
+ * Supports generics like List<> or Map<>. Use @JvmSuppressWildcards to force the compiler to use
+ * the type `T`, and not `? extends T`.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T> DataSnapshot.getValue(): T? {
+  return getValue(object : GenericTypeIndicator<T>() {})
+}
+
+/**
+ * Returns the content of the MutableData converted to a POJO.
+ *
+ * Supports generics like List<> or Map<>. Use @JvmSuppressWildcards to force the compiler to use
+ * the type `T`, and not `? extends T`.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T> MutableData.getValue(): T? {
+  return getValue(object : GenericTypeIndicator<T>() {})
+}
+
+/**
+ * Starts listening to this query and emits its values via a [Flow].
+ *
+ * - When the returned flow starts being collected, a [ValueEventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+val Query.snapshots
+  get() =
+    callbackFlow<DataSnapshot> {
+      val listener =
+        addValueEventListener(
+          object : ValueEventListener {
+            override fun onDataChange(snapshot: DataSnapshot) {
+              repo.scheduleNow { trySendBlocking(snapshot) }
+            }
+
+            override fun onCancelled(error: DatabaseError) {
+              cancel(message = "Error getting Query snapshot", cause = error.toException())
+            }
+          }
+        )
+      awaitClose { removeEventListener(listener) }
+    }
+/**
+ * Starts listening to this query's child events and emits its values via a [Flow].
+ *
+ * - When the returned flow starts being collected, a [ChildEventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+val Query.childEvents
+  get() =
+    callbackFlow<ChildEvent> {
+      val listener =
+        addChildEventListener(
+          object : ChildEventListener {
+            override fun onChildAdded(snapshot: DataSnapshot, previousChildName: String?) {
+              repo.scheduleNow { trySendBlocking(ChildEvent.Added(snapshot, previousChildName)) }
+            }
+
+            override fun onChildChanged(snapshot: DataSnapshot, previousChildName: String?) {
+              repo.scheduleNow { trySendBlocking(ChildEvent.Changed(snapshot, previousChildName)) }
+            }
+
+            override fun onChildRemoved(snapshot: DataSnapshot) {
+              repo.scheduleNow { trySendBlocking(ChildEvent.Removed(snapshot)) }
+            }
+
+            override fun onChildMoved(snapshot: DataSnapshot, previousChildName: String?) {
+              repo.scheduleNow { trySendBlocking(ChildEvent.Moved(snapshot, previousChildName)) }
+            }
+
+            override fun onCancelled(error: DatabaseError) {
+              cancel(message = "Error getting Query childEvent", cause = error.toException())
+            }
+          }
+        )
+      awaitClose { removeEventListener(listener) }
+    }
+
+/**
+ * Starts listening to this query and emits its values converted to a POJO via a [Flow].
+ *
+ * - When the returned flow starts being collected, a [ValueEventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T : Any> Query.values(): Flow<T?> {
+  return snapshots.map { it.getValue(T::class.java) }
+}
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+@Keep
+class FirebaseDatabaseKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-database/src/test/java/com/google/firebase/database/DataSnapshotUtil.kt b/firebase-database/src/test/java/com/google/firebase/database/DataSnapshotUtil.kt
new file mode 100644
index 00000000000..a2e8d1451b4
--- /dev/null
+++ b/firebase-database/src/test/java/com/google/firebase/database/DataSnapshotUtil.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.database
+
+import com.google.firebase.database.snapshot.IndexedNode
+import com.google.firebase.database.snapshot.NodeUtilities
+
+/**
+ * Creates a custom DataSnapshot.
+ *
+ * This method is a workaround that enables the creation of a custom DataSnapshot using
+ * package-private methods.
+ */
+fun createDataSnapshot(data: Any?, db: FirebaseDatabase): DataSnapshot {
+  var ref = DatabaseReference("https://test.firebaseio.com", db.config)
+  val node = NodeUtilities.NodeFromJSON(data)
+  return DataSnapshot(ref, IndexedNode.from(node))
+}
+
+/**
+ * Creates a custom MutableData.
+ *
+ * This method is a workaround that enables the creation of a custom MutableData using
+ * package-private methods.
+ */
+fun createMutableData(data: Any?): MutableData {
+  val node = NodeUtilities.NodeFromJSON(data)
+  return MutableData(node)
+}
diff --git a/firebase-database/src/test/java/com/google/firebase/database/DatabaseTests.kt b/firebase-database/src/test/java/com/google/firebase/database/DatabaseTests.kt
new file mode 100644
index 00000000000..895454e274f
--- /dev/null
+++ b/firebase-database/src/test/java/com/google/firebase/database/DatabaseTests.kt
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.database
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+@IgnoreExtraProperties
+data class Player(
+  var name: String? = "",
+  var jersey: Int? = -1,
+  var goalkeeper: Boolean? = false,
+  var avg_goals_per_game: Double? = 0.0
+) {
+  @Exclude
+  fun toMap(): Map<String, Any?> {
+    return mapOf(
+      "name" to name,
+      "jersey" to jersey,
+      "goalkeeper" to goalkeeper,
+      "avg_goals_per_game" to avg_goals_per_game
+    )
+  }
+}
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .setDatabaseUrl("http://tests.fblocal.com:9000")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .setDatabaseUrl("http://tests.fblocal.com:9000")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class DatabaseTests : BaseTestCase() {
+  @Test
+  fun `database should delegate to FirebaseDatabase#getInstance()`() {
+    assertThat(Firebase.database).isSameInstanceAs(FirebaseDatabase.getInstance())
+  }
+
+  @Test
+  fun `FirebaseApp#database should delegate to FirebaseDatabase#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.database(app)).isSameInstanceAs(FirebaseDatabase.getInstance(app))
+  }
+
+  @Test
+  fun `Firebase#database should delegate to FirebaseDatabase#getInstance(url)`() {
+    val url = "http://tests.fblocal.com:9000"
+    assertThat(Firebase.database(url)).isSameInstanceAs(FirebaseDatabase.getInstance(url))
+  }
+
+  @Test
+  fun `Firebase#database should delegate to FirebaseDatabase#getInstance(FirebaseApp, url)`() {
+    val app = Firebase.app(EXISTING_APP)
+    val url = "http://tests.fblocal.com:9000"
+    assertThat(Firebase.database(app, url)).isSameInstanceAs(FirebaseDatabase.getInstance(app, url))
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class DataSnapshotTests : BaseTestCase() {
+  @Test
+  fun `reified getValue works with basic types`() {
+    val data =
+      mapOf(
+        "name" to "John Doe",
+        "jersey" to 35L,
+        "goalkeeper" to false,
+        "avg_goals_per_game" to 0.35
+      )
+    val dataSnapshot = createDataSnapshot(data, Firebase.database)
+    assertThat(dataSnapshot.child("name").getValue<String>()).isEqualTo("John Doe")
+    assertThat(dataSnapshot.child("jersey").getValue<Long>()).isEqualTo(35L)
+    assertThat(dataSnapshot.child("goalkeeper").getValue<Boolean>()).isEqualTo(false)
+    assertThat(dataSnapshot.child("avg_goals_per_game").getValue<Double>()).isEqualTo(0.35)
+  }
+
+  @Test
+  fun `reified getValue works with maps`() {
+    val data =
+      mapOf(
+        "name" to "John Doe",
+        "jersey" to 35L,
+        "goalkeeper" to false,
+        "avg_goals_per_game" to 0.35
+      )
+    val dataSnapshot = createDataSnapshot(data, Firebase.database)
+    assertThat(dataSnapshot.getValue<Map<String, Any>>()).isEqualTo(data)
+  }
+
+  @Test
+  fun `reified getValue works with lists types`() {
+    val data = listOf("George", "John", "Paul", "Ringo")
+    val dataSnapshot = createDataSnapshot(data, Firebase.database)
+    assertThat(dataSnapshot.getValue<List<String>>()).isEqualTo(data)
+  }
+
+  @Test
+  fun `reified getValue works with custom types`() {
+    val data = Player(name = "John Doe", jersey = 35, goalkeeper = false, avg_goals_per_game = 0.35)
+    val dataSnapshot = createDataSnapshot(data.toMap(), Firebase.database)
+    assertThat(dataSnapshot.getValue<Player>()).isEqualTo(data)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class MutableDataTests : BaseTestCase() {
+  @Test
+  fun `reified getValue works with basic types`() {
+    val data =
+      mapOf(
+        "name" to "John Doe",
+        "jersey" to 35L,
+        "goalkeeper" to false,
+        "avg_goals_per_game" to 0.35
+      )
+    val mutableData = createMutableData(data)
+
+    assertThat(mutableData.child("name").getValue<String>()).isEqualTo("John Doe")
+    assertThat(mutableData.child("jersey").getValue<Long>()).isEqualTo(35L)
+    assertThat(mutableData.child("goalkeeper").getValue<Boolean>()).isEqualTo(false)
+    assertThat(mutableData.child("avg_goals_per_game").getValue<Double>()).isEqualTo(0.35)
+  }
+
+  @Test
+  fun `reified getValue works with maps`() {
+    val data =
+      mapOf(
+        "name" to "John Doe",
+        "jersey" to 35L,
+        "goalkeeper" to false,
+        "avg_goals_per_game" to 0.35
+      )
+    val mutableData = createMutableData(data)
+    assertThat(mutableData.getValue<Map<String, Any>>()).isEqualTo(data)
+  }
+
+  @Test
+  fun `reified getValue works with lists types`() {
+    val data = listOf("George", "John", "Paul", "Ringo")
+    val mutableData = createMutableData(data)
+    assertThat(mutableData.getValue<List<String>>()).isEqualTo(data)
+  }
+
+  @Test
+  fun `reified getValue works with custom types`() {
+    val data = Player(name = "John Doe", jersey = 35, goalkeeper = false, avg_goals_per_game = 0.35)
+    val mutableData = createMutableData(data.toMap())
+    assertThat(mutableData.getValue<Player>()).isEqualTo(data)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-database/src/test/java/com/google/firebase/database/KotlinEntities.kt b/firebase-database/src/test/java/com/google/firebase/database/KotlinEntities.kt
new file mode 100644
index 00000000000..6922f950cd9
--- /dev/null
+++ b/firebase-database/src/test/java/com/google/firebase/database/KotlinEntities.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.database
+
+interface GenericInterface<T> {
+  var value: T?
+}
+
+class GenericExcludedSetterBeanKotlin : GenericInterface<String> {
+
+  @set:Exclude
+  override var value: String? = null
+    set(value) {
+      field = "wrong_setter"
+    }
+}
diff --git a/firebase-database/src/test/java/com/google/firebase/database/MapperTest.java b/firebase-database/src/test/java/com/google/firebase/database/MapperTest.java
index 505758fc19a..a7666340d02 100644
--- a/firebase-database/src/test/java/com/google/firebase/database/MapperTest.java
+++ b/firebase-database/src/test/java/com/google/firebase/database/MapperTest.java
@@ -20,6 +20,7 @@
 import static org.junit.Assert.fail;
 
 import androidx.annotation.Keep;
+import androidx.annotation.Nullable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.firebase.database.core.utilities.encoding.CustomClassMapper;
@@ -849,6 +850,22 @@ public void setValue(String value) {
     }
   }
 
+  private static class GenericExcludedSetterBean implements GenericInterface<String> {
+    private String value = null;
+
+    @Nullable
+    @Override
+    public String getValue() {
+      return value;
+    }
+
+    @Exclude
+    @Override
+    public void setValue(@Nullable String value) {
+      this.value = "wrong setter";
+    }
+  }
+
   private abstract static class GenericTypeIndicatorSubclass<T> extends GenericTypeIndicator<T> {}
 
   private abstract static class NonGenericTypeIndicatorSubclass
@@ -2000,12 +2017,26 @@ public void genericSettersFromSubclassConflictsWithBaseClass() {
     serialize(bean);
   }
 
-  // This should work, but generics and subclassing are tricky to get right. For now we will just
-  // throw and we can add support for generics & subclassing if it becomes a high demand feature
-  @Test(expected = DatabaseException.class)
-  public void settersCanOverrideGenericSettersParsingNot() {
+  @Test
+  public void settersCanOverrideGenericSettersParsing() {
     NonConflictingGenericSetterSubBean bean =
         deserialize("{'value': 'value'}", NonConflictingGenericSetterSubBean.class);
     assertEquals("subsetter:value", bean.value);
   }
+
+  @Test
+  public void excludedOverriddenGenericSetterSetsValueNotJava() {
+    GenericExcludedSetterBean bean =
+        deserialize("{'value': 'foo'}", GenericExcludedSetterBean.class);
+    assertEquals("foo", bean.value);
+  }
+
+  // Unlike Java, in Kotlin, annotations do not get propagated to bridge methods.
+  // That's why there are 2 separate tests for Java and Kotlin
+  @Test
+  public void excludedOverriddenGenericSetterSetsValueNotKotlin() {
+    GenericExcludedSetterBeanKotlin bean =
+        deserialize("{'value': 'foo'}", GenericExcludedSetterBeanKotlin.class);
+    assertEquals("foo", bean.getValue());
+  }
 }
diff --git a/firebase-database/src/test/java/com/google/firebase/database/PushIdGeneratorTest.java b/firebase-database/src/test/java/com/google/firebase/database/PushIdGeneratorTest.java
index 6feabe4e4c7..d09317f4e18 100644
--- a/firebase-database/src/test/java/com/google/firebase/database/PushIdGeneratorTest.java
+++ b/firebase-database/src/test/java/com/google/firebase/database/PushIdGeneratorTest.java
@@ -19,7 +19,6 @@
 import static org.junit.Assert.assertEquals;
 
 import com.google.firebase.database.core.utilities.PushIdGenerator;
-import org.codehaus.plexus.util.StringUtils;
 import org.junit.Test;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
@@ -41,8 +40,7 @@ public void testSuccessorSpecialValue() {
         PushIdGenerator.successor(String.valueOf(Integer.MAX_VALUE)));
     assertEquals(
         MAX_KEY_NAME,
-        PushIdGenerator.successor(
-            StringUtils.repeat(Character.toString(MAX_PUSH_CHAR), MAX_KEY_LEN)));
+        PushIdGenerator.successor(repeat(Character.toString(MAX_PUSH_CHAR), MAX_KEY_LEN)));
   }
 
   @Test
@@ -51,9 +49,7 @@ public void testSuccessorBasic() {
     assertEquals(
         "abd",
         PushIdGenerator.successor(
-            "abc"
-                + StringUtils.repeat(
-                    Character.toString(MAX_PUSH_CHAR), MAX_KEY_LEN - "abc".length())));
+            "abc" + repeat(Character.toString(MAX_PUSH_CHAR), MAX_KEY_LEN - "abc".length())));
     assertEquals(
         "abc" + MIN_PUSH_CHAR + MIN_PUSH_CHAR, PushIdGenerator.successor("abc" + MIN_PUSH_CHAR));
   }
@@ -69,8 +65,18 @@ public void testPredecessorSpecialValue() {
   @Test
   public void testPredecessorBasicValue() {
     assertEquals(
-        "abb" + StringUtils.repeat(Character.toString(MAX_PUSH_CHAR), MAX_KEY_LEN - "abc".length()),
+        "abb" + repeat(Character.toString(MAX_PUSH_CHAR), MAX_KEY_LEN - "abc".length()),
         PushIdGenerator.predecessor("abc"));
     assertEquals("abc", PushIdGenerator.predecessor("abc" + MIN_PUSH_CHAR));
   }
+
+  private static String repeat(String str, int repeat) {
+    // Copied from
+    // https://github.com/codehaus-plexus/plexus-utils/blob/master/src/main/java/org/codehaus/plexus/util/StringUtils.java.
+    StringBuilder buffer = new StringBuilder(repeat * str.length());
+    for (int i = 0; i < repeat; i++) {
+      buffer.append(str);
+    }
+    return buffer.toString();
+  }
 }
diff --git a/firebase-database/src/test/java/com/google/firebase/database/ktx/DatabaseTests.kt b/firebase-database/src/test/java/com/google/firebase/database/ktx/DatabaseTests.kt
new file mode 100644
index 00000000000..d5859df5751
--- /dev/null
+++ b/firebase-database/src/test/java/com/google/firebase/database/ktx/DatabaseTests.kt
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.database.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.database.Exclude
+import com.google.firebase.database.FirebaseDatabase
+import com.google.firebase.database.IgnoreExtraProperties
+import com.google.firebase.database.createDataSnapshot
+import com.google.firebase.database.createMutableData
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+@IgnoreExtraProperties
+data class Player(
+  var name: String? = "",
+  var jersey: Int? = -1,
+  var goalkeeper: Boolean? = false,
+  var avg_goals_per_game: Double? = 0.0
+) {
+  @Exclude
+  fun toMap(): Map<String, Any?> {
+    return mapOf(
+      "name" to name,
+      "jersey" to jersey,
+      "goalkeeper" to goalkeeper,
+      "avg_goals_per_game" to avg_goals_per_game
+    )
+  }
+}
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .setDatabaseUrl("http://tests.fblocal.com:9000")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .setDatabaseUrl("http://tests.fblocal.com:9000")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class DatabaseTests : BaseTestCase() {
+  @Test
+  fun `database should delegate to FirebaseDatabase#getInstance()`() {
+    assertThat(Firebase.database).isSameInstanceAs(FirebaseDatabase.getInstance())
+  }
+
+  @Test
+  fun `FirebaseApp#database should delegate to FirebaseDatabase#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.database(app)).isSameInstanceAs(FirebaseDatabase.getInstance(app))
+  }
+
+  @Test
+  fun `Firebase#database should delegate to FirebaseDatabase#getInstance(url)`() {
+    val url = "http://tests.fblocal.com:9000"
+    assertThat(Firebase.database(url)).isSameInstanceAs(FirebaseDatabase.getInstance(url))
+  }
+
+  @Test
+  fun `Firebase#database should delegate to FirebaseDatabase#getInstance(FirebaseApp, url)`() {
+    val app = Firebase.app(EXISTING_APP)
+    val url = "http://tests.fblocal.com:9000"
+    assertThat(Firebase.database(app, url)).isSameInstanceAs(FirebaseDatabase.getInstance(app, url))
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class DataSnapshotTests : BaseTestCase() {
+  @Test
+  fun `reified getValue works with basic types`() {
+    val data =
+      mapOf(
+        "name" to "John Doe",
+        "jersey" to 35L,
+        "goalkeeper" to false,
+        "avg_goals_per_game" to 0.35
+      )
+    val dataSnapshot = createDataSnapshot(data, Firebase.database)
+    assertThat(dataSnapshot.child("name").getValue<String>()).isEqualTo("John Doe")
+    assertThat(dataSnapshot.child("jersey").getValue<Long>()).isEqualTo(35L)
+    assertThat(dataSnapshot.child("goalkeeper").getValue<Boolean>()).isEqualTo(false)
+    assertThat(dataSnapshot.child("avg_goals_per_game").getValue<Double>()).isEqualTo(0.35)
+  }
+
+  @Test
+  fun `reified getValue works with maps`() {
+    val data =
+      mapOf(
+        "name" to "John Doe",
+        "jersey" to 35L,
+        "goalkeeper" to false,
+        "avg_goals_per_game" to 0.35
+      )
+    val dataSnapshot = createDataSnapshot(data, Firebase.database)
+    assertThat(dataSnapshot.getValue<Map<String, Any>>()).isEqualTo(data)
+  }
+
+  @Test
+  fun `reified getValue works with lists types`() {
+    val data = listOf("George", "John", "Paul", "Ringo")
+    val dataSnapshot = createDataSnapshot(data, Firebase.database)
+    assertThat(dataSnapshot.getValue<List<String>>()).isEqualTo(data)
+  }
+
+  @Test
+  fun `reified getValue works with custom types`() {
+    val data = Player(name = "John Doe", jersey = 35, goalkeeper = false, avg_goals_per_game = 0.35)
+    val dataSnapshot = createDataSnapshot(data.toMap(), Firebase.database)
+    assertThat(dataSnapshot.getValue<Player>()).isEqualTo(data)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class MutableDataTests : BaseTestCase() {
+  @Test
+  fun `reified getValue works with basic types`() {
+    val data =
+      mapOf(
+        "name" to "John Doe",
+        "jersey" to 35L,
+        "goalkeeper" to false,
+        "avg_goals_per_game" to 0.35
+      )
+    val mutableData = createMutableData(data)
+
+    assertThat(mutableData.child("name").getValue<String>()).isEqualTo("John Doe")
+    assertThat(mutableData.child("jersey").getValue<Long>()).isEqualTo(35L)
+    assertThat(mutableData.child("goalkeeper").getValue<Boolean>()).isEqualTo(false)
+    assertThat(mutableData.child("avg_goals_per_game").getValue<Double>()).isEqualTo(0.35)
+  }
+
+  @Test
+  fun `reified getValue works with maps`() {
+    val data =
+      mapOf(
+        "name" to "John Doe",
+        "jersey" to 35L,
+        "goalkeeper" to false,
+        "avg_goals_per_game" to 0.35
+      )
+    val mutableData = createMutableData(data)
+    assertThat(mutableData.getValue<Map<String, Any>>()).isEqualTo(data)
+  }
+
+  @Test
+  fun `reified getValue works with lists types`() {
+    val data = listOf("George", "John", "Paul", "Ringo")
+    val mutableData = createMutableData(data)
+    assertThat(mutableData.getValue<List<String>>()).isEqualTo(data)
+  }
+
+  @Test
+  fun `reified getValue works with custom types`() {
+    val data = Player(name = "John Doe", jersey = 35, goalkeeper = false, avg_goals_per_game = 0.35)
+    val mutableData = createMutableData(data.toMap())
+    assertThat(mutableData.getValue<Player>()).isEqualTo(data)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-datatransport/CHANGELOG.md b/firebase-datatransport/CHANGELOG.md
new file mode 100644
index 00000000000..6a1a882bbc3
--- /dev/null
+++ b/firebase-datatransport/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Unreleased
+* [changed] Bump internal dependencies.
+
+# 18.2.0
+* [feature] Expose the transport factory as a qualified dependency based on the endpoint connected.
diff --git a/firebase-datatransport/firebase-datatransport.gradle b/firebase-datatransport/firebase-datatransport.gradle
index a22dc35c209..24751efb847 100644
--- a/firebase-datatransport/firebase-datatransport.gradle
+++ b/firebase-datatransport/firebase-datatransport.gradle
@@ -18,6 +18,7 @@ plugins {
 
 firebaseLibrary {
     publishJavadoc = false
+    publishReleaseNotes = false
     publishSources = true
 }
 
@@ -26,7 +27,8 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.datatransport"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
@@ -37,6 +39,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
     testOptions {
         unitTests {
             includeAndroidResources = true
@@ -45,16 +48,18 @@ android {
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':transport:transport-api')
-    implementation project(':transport:transport-runtime')
-    implementation project(':transport:transport-backend-cct')
+    api 'com.google.firebase:firebase-common:21.0.0'
+    api 'com.google.firebase:firebase-components:18.0.0'
+
     implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'com.google.android.datatransport:transport-api:3.1.0'
+    implementation 'com.google.android.datatransport:transport-backend-cct:3.2.0'
+    implementation 'com.google.android.datatransport:transport-runtime:3.2.0'
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22")
 
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'androidx.test:runner:1.2.0'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
diff --git a/firebase-datatransport/gradle.properties b/firebase-datatransport/gradle.properties
index a89f490105c..3e23d87e99f 100644
--- a/firebase-datatransport/gradle.properties
+++ b/firebase-datatransport/gradle.properties
@@ -1,4 +1,3 @@
-version=18.1.2
-latestReleasedVersion=18.1.1
+version=19.0.1
+latestReleasedVersion=19.0.0
 android.enableUnitTestBinaryResources=true
-
diff --git a/firebase-datatransport/src/main/AndroidManifest.xml b/firebase-datatransport/src/main/AndroidManifest.xml
index ef936920aad..9d728b886a5 100644
--- a/firebase-datatransport/src/main/AndroidManifest.xml
+++ b/firebase-datatransport/src/main/AndroidManifest.xml
@@ -14,10 +14,9 @@
 <!-- limitations under the License. -->
 
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.datatransport">
+    xmlns:android="http://schemas.android.com/apk/res/android">
   <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="14"/>-->
+  <!--<uses-sdk android:minSdkVersion="21"/>-->
   <application>
     <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
       <meta-data android:name="com.google.firebase.components:com.google.firebase.datatransport.TransportRegistrar"
diff --git a/firebase-datatransport/src/main/java/com/google/firebase/datatransport/LegacyTransportBackend.java b/firebase-datatransport/src/main/java/com/google/firebase/datatransport/LegacyTransportBackend.java
new file mode 100644
index 00000000000..04b489e7ede
--- /dev/null
+++ b/firebase-datatransport/src/main/java/com/google/firebase/datatransport/LegacyTransportBackend.java
@@ -0,0 +1,23 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.datatransport;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
+@Qualifier
+@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
+public @interface LegacyTransportBackend {}
diff --git a/gradle/buildCache.gradle b/firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportBackend.java
similarity index 65%
rename from gradle/buildCache.gradle
rename to firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportBackend.java
index 98e227e1593..77a8f6adbf4 100644
--- a/gradle/buildCache.gradle
+++ b/firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportBackend.java
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,17 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-ext.isCiServer = System.getenv().containsKey("FIREBASE_CI")
+package com.google.firebase.datatransport;
 
-buildCache {
-  local {
-    enabled = !isCiServer
-  }
-
-  remote(HttpBuildCache) {
-    push = true
-    url = 'http://gradle-cache/cache/'
-    enabled = isCiServer
-  }
-}
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import javax.inject.Qualifier;
 
+@Qualifier
+@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD})
+public @interface TransportBackend {}
diff --git a/firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportRegistrar.java b/firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportRegistrar.java
index 7972b411148..2491d38ba45 100644
--- a/firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportRegistrar.java
+++ b/firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportRegistrar.java
@@ -16,22 +16,36 @@
 
 import android.content.Context;
 import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
 import com.google.android.datatransport.TransportFactory;
 import com.google.android.datatransport.cct.CCTDestination;
 import com.google.android.datatransport.runtime.TransportRuntime;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
 
 @Keep
 public class TransportRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-transport";
+
   @Override
+  @NonNull
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(TransportFactory.class)
+            .name(LIBRARY_NAME)
+            .add(Dependency.required(Context.class))
+            .factory(
+                c -> {
+                  TransportRuntime.initialize(c.get(Context.class));
+                  return TransportRuntime.getInstance().newFactory(CCTDestination.LEGACY_INSTANCE);
+                })
+            .build(),
+        Component.builder(Qualified.qualified(LegacyTransportBackend.class, TransportFactory.class))
             .add(Dependency.required(Context.class))
             .factory(
                 c -> {
@@ -39,6 +53,14 @@ public List<Component<?>> getComponents() {
                   return TransportRuntime.getInstance().newFactory(CCTDestination.LEGACY_INSTANCE);
                 })
             .build(),
-        LibraryVersionComponent.create("fire-transport", BuildConfig.VERSION_NAME));
+        Component.builder(Qualified.qualified(TransportBackend.class, TransportFactory.class))
+            .add(Dependency.required(Context.class))
+            .factory(
+                c -> {
+                  TransportRuntime.initialize(c.get(Context.class));
+                  return TransportRuntime.getInstance().newFactory(CCTDestination.INSTANCE);
+                })
+            .build(),
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-dynamic-links/CHANGELOG.md b/firebase-dynamic-links/CHANGELOG.md
new file mode 100644
index 00000000000..0bf1ea23aa7
--- /dev/null
+++ b/firebase-dynamic-links/CHANGELOG.md
@@ -0,0 +1,156 @@
+# Unreleased
+
+
+# 22.0.0
+* [changed] Bump internal dependencies
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-dynamic-links` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.2.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-dynamic-links-ktx`
+  to `com.google.firebase:firebase-dynamic-links` under the `com.google.firebase.dynamiclinks` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-dynamic-links-ktx` have been added to
+  `com.google.firebase:firebase-dynamic-links` under the `com.google.firebase.dynamiclinks` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-dynamic-links-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-dynamic-links` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.1.0
+* [unchanged] Updated to accommodate the release of the updated
+  [ddls] Kotlin extensions library.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+  `firebase-dynamic-links` library. The Kotlin extensions library has the
+  following additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-dynamic-links-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+
+# 21.0.2
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-dynamic-links` library. The Kotlin extensions library has no
+additional updates.
+
+# 21.0.1
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-dynamic-links` library. The Kotlin extensions library has no
+additional updates.
+
+# 21.0.0
+* [changed] Due to its
+  [dependency on Google Play services](/docs/android/android-play-services),
+  this SDK now requires devices and emulators to target API level 19 (KitKat)
+  or higher and to use Android 4.4 or higher.
+* [fixed] Fixed non-null annotation.
+  #2336
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-dynamic-links` library. The Kotlin extensions library has no
+additional updates.
+
+# 20.1.1
+* [changed] Internal infrastructure improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-dynamic-links` library. The Kotlin extensions library has no
+additional updates.
+
+# 20.1.0
+* [feature] Added `getUtmParameters` method to `PendingDynamicLinkData`.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-dynamic-links` library. The Kotlin extensions library has no
+additional updates.
+
+# 20.0.0
+* [changed] Internal infrastructure improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-dynamic-links` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.1
+* [changed] Updated to support improvements in the KTX library (see below).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library and has the following additional updates:
+
+* [feature] Added API support for destructuring of
+  [`ShortDynamicLink`](/docs/reference/kotlin/com/google/firebase/dynamiclinks/ShortDynamicLink)
+  and
+  [`PendingDynamicLinkData`](/docs/reference/kotlin/com/google/firebase/dynamiclinks/PendingDynamicLinkData).
+
+# 19.1.0
+* [feature] Added new getter methods to
+  [`DynamicLink.Builder`](//firebase.google.com/docs/reference/android/com/google/firebase/dynamiclinks/DynamicLink.Builder)
+  to improve Kotlin interop.
+
+
+## Kotlin
+* [feature] The beta release of a [ddls] Android library with
+  Kotlin extensions is now available. The Kotlin extensions library transitively
+  includes the base `firebase-dynamic-links` library. To learn more, visit the
+  [[ddls] KTX documentation](/docs/reference/kotlin/com/google/firebase/dynamiclinks/ktx/package-summary).
+
+# 19.0.0
+* [changed] Versioned to add nullability annotations to improve the Kotlin
+  developer experience. No other changes.
+
+# 16.2.0
+* [changed] Refactored code to ensure functionality alignment with other
+  updated Firebase libraries.
+* [changed] Updated minSdkVersion to API level 16.
+
+# 16.1.7
+* [changed] Internal refactor.
+
+# 16.1.3
+* [fixed] Fixed an issue that caused short link creation to fail when creating
+links through `FirebaseDynamicLinks.getInstance().createDynamicLink().buildShortDynamicLink()`
+using Google Play Services 13.2.80 and FDL SDK 16.1.0. The issue only occurred
+when creating shortening links from parameters, links created using
+preconstructed long links from `setLongLink()` were unaffected. This fix also
+addresses issues in newer versions of Google Play Services.
+
diff --git a/firebase-dynamic-links/README.md b/firebase-dynamic-links/README.md
new file mode 100644
index 00000000000..7abc80bf791
--- /dev/null
+++ b/firebase-dynamic-links/README.md
@@ -0,0 +1,7 @@
+Firebase Dynamic Links
+======================
+
+> [!IMPORTANT]
+> Firebase Dynamic Links is **deprecated** and should not be used in new projects. The service will shut down on August 25, 2025.
+>
+> Please see our [Dynamic Links Deprecation FAQ documentation](https://firebase.google.com/support/dynamic-links-faq) for more guidance.
diff --git a/firebase-dynamic-links/api.txt b/firebase-dynamic-links/api.txt
index 3493796685b..ff50754c965 100644
--- a/firebase-dynamic-links/api.txt
+++ b/firebase-dynamic-links/api.txt
@@ -116,12 +116,34 @@ package com.google.firebase.dynamiclinks {
   public abstract class FirebaseDynamicLinks {
     ctor public FirebaseDynamicLinks();
     method @NonNull public abstract com.google.firebase.dynamiclinks.DynamicLink.Builder createDynamicLink();
-    method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.PendingDynamicLinkData> getDynamicLink(@NonNull android.content.Intent);
+    method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.PendingDynamicLinkData> getDynamicLink(@Nullable android.content.Intent);
     method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.PendingDynamicLinkData> getDynamicLink(@NonNull android.net.Uri);
     method @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getInstance();
     method @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getInstance(@NonNull com.google.firebase.FirebaseApp);
   }
 
+  public final class FirebaseDynamicLinksKt {
+    method public static void androidParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder,kotlin.Unit> init);
+    method public static void androidParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull String packageName, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder,kotlin.Unit> init);
+    method @Nullable public static operator android.net.Uri component1(@NonNull com.google.firebase.dynamiclinks.ShortDynamicLink);
+    method @Nullable public static operator android.net.Uri component1(@NonNull com.google.firebase.dynamiclinks.PendingDynamicLinkData);
+    method @Nullable public static operator android.net.Uri component2(@NonNull com.google.firebase.dynamiclinks.ShortDynamicLink);
+    method public static operator int component2(@NonNull com.google.firebase.dynamiclinks.PendingDynamicLinkData);
+    method @NonNull public static operator java.util.List<com.google.firebase.dynamiclinks.ShortDynamicLink.Warning> component3(@NonNull com.google.firebase.dynamiclinks.ShortDynamicLink);
+    method public static operator long component3(@NonNull com.google.firebase.dynamiclinks.PendingDynamicLinkData);
+    method @NonNull public static com.google.firebase.dynamiclinks.DynamicLink dynamicLink(@NonNull com.google.firebase.dynamiclinks.FirebaseDynamicLinks, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks dynamicLinks(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getDynamicLinks(@NonNull com.google.firebase.Firebase);
+    method public static void googleAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder,kotlin.Unit> init);
+    method public static void googleAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull String source, @NonNull String medium, @NonNull String campaign, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder,kotlin.Unit> init);
+    method public static void iosParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull String bundleId, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder,kotlin.Unit> init);
+    method public static void itunesConnectAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters.Builder,kotlin.Unit> init);
+    method public static void navigationInfoParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.NavigationInfoParameters.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink> shortLinkAsync(@NonNull com.google.firebase.dynamiclinks.FirebaseDynamicLinks, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink> shortLinkAsync(@NonNull com.google.firebase.dynamiclinks.FirebaseDynamicLinks, int suffix, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
+    method public static void socialMetaTagParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder,kotlin.Unit> init);
+  }
+
   public class PendingDynamicLinkData {
     ctor protected PendingDynamicLinkData(@Nullable String, int, long, @Nullable android.net.Uri);
     method public long getClickTimestamp();
@@ -137,7 +159,7 @@ package com.google.firebase.dynamiclinks {
     method @NonNull public java.util.List<? extends com.google.firebase.dynamiclinks.ShortDynamicLink.Warning> getWarnings();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @IntDef({com.google.firebase.dynamiclinks.ShortDynamicLink.Suffix.UNGUESSABLE, com.google.firebase.dynamiclinks.ShortDynamicLink.Suffix.SHORT}) public static @interface ShortDynamicLink.Suffix {
+  @IntDef({com.google.firebase.dynamiclinks.ShortDynamicLink.Suffix.UNGUESSABLE, com.google.firebase.dynamiclinks.ShortDynamicLink.Suffix.SHORT}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface ShortDynamicLink.Suffix {
     field public static final int SHORT = 2; // 0x2
     field public static final int UNGUESSABLE = 1; // 0x1
   }
@@ -149,3 +171,29 @@ package com.google.firebase.dynamiclinks {
 
 }
 
+package com.google.firebase.dynamiclinks.ktx {
+
+  public final class FirebaseDynamicLinksKt {
+    method @Deprecated public static void androidParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void androidParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull String packageName, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder,kotlin.Unit> init);
+    method @Deprecated @Nullable public static operator android.net.Uri component1(@NonNull com.google.firebase.dynamiclinks.ShortDynamicLink);
+    method @Deprecated @Nullable public static operator android.net.Uri component1(@NonNull com.google.firebase.dynamiclinks.PendingDynamicLinkData);
+    method @Deprecated @Nullable public static operator android.net.Uri component2(@NonNull com.google.firebase.dynamiclinks.ShortDynamicLink);
+    method @Deprecated public static operator int component2(@NonNull com.google.firebase.dynamiclinks.PendingDynamicLinkData);
+    method @Deprecated @NonNull public static operator java.util.List<com.google.firebase.dynamiclinks.ShortDynamicLink.Warning> component3(@NonNull com.google.firebase.dynamiclinks.ShortDynamicLink);
+    method @Deprecated public static operator long component3(@NonNull com.google.firebase.dynamiclinks.PendingDynamicLinkData);
+    method @Deprecated @NonNull public static com.google.firebase.dynamiclinks.DynamicLink dynamicLink(@NonNull com.google.firebase.dynamiclinks.FirebaseDynamicLinks, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
+    method @Deprecated @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks dynamicLinks(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @Deprecated @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getDynamicLinks(@NonNull com.google.firebase.ktx.Firebase);
+    method @Deprecated public static void googleAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void googleAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull String source, @NonNull String medium, @NonNull String campaign, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void iosParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull String bundleId, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void itunesConnectAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters.Builder,kotlin.Unit> init);
+    method @Deprecated public static void navigationInfoParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.NavigationInfoParameters.Builder,kotlin.Unit> init);
+    method @Deprecated @NonNull public static com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink> shortLinkAsync(@NonNull com.google.firebase.dynamiclinks.FirebaseDynamicLinks, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
+    method @Deprecated @NonNull public static com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink> shortLinkAsync(@NonNull com.google.firebase.dynamiclinks.FirebaseDynamicLinks, int suffix, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
+    method @Deprecated public static void socialMetaTagParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder,kotlin.Unit> init);
+  }
+
+}
+
diff --git a/firebase-dynamic-links/firebase-dynamic-links.gradle b/firebase-dynamic-links/firebase-dynamic-links.gradle
index ae853545272..1705502356d 100644
--- a/firebase-dynamic-links/firebase-dynamic-links.gradle
+++ b/firebase-dynamic-links/firebase-dynamic-links.gradle
@@ -14,9 +14,11 @@
 
 plugins {
     id 'firebase-library'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
+    libraryGroup "dynamic-links"
     testLab.enabled = false
     publishSources = true
 }
@@ -26,10 +28,15 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion project.targetSdkVersion
+    buildFeatures {
+        aidl true
+    }
+
+    namespace "com.google.firebase.dynamiclinks"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         targetSdkVersion project.targetSdkVersion
-        minSdkVersion 19
+        minSdkVersion project.minSdkVersion
         versionName version
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -39,6 +46,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions { jvmTarget = "1.8" }
 
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
@@ -48,40 +56,42 @@ android {
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
+    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
+    javadocClasspath 'org.checkerframework:checker-qual:2.5.2'
 
-    implementation 'androidx.annotation:annotation:1.2.0'
+    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api('com.google.firebase:firebase-auth-interop:20.0.0') {
+         exclude group: "com.google.firebase", module: "firebase-common"
+     }
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
+    api('com.google.firebase:firebase-measurement-connector:19.0.0') {
+         exclude group: 'com.google.firebase', module: 'firebase-common'
+     }
 
-    implementation 'com.google.android.gms:play-services-basement:18.0.0'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    implementation 'androidx.annotation:annotation:1.2.0'
     implementation 'com.google.android.gms:play-services-base:18.0.1'
+    implementation 'com.google.android.gms:play-services-basement:18.1.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
-    implementation('com.google.firebase:firebase-auth-interop:20.0.0') {
-        exclude group: "com.google.firebase", module: "firebase-common"
-    }
-    implementation('com.google.firebase:firebase-measurement-connector:19.0.0') {
-        exclude group: 'com.google.firebase', module: 'firebase-common'
-    }
-    testCompileOnly 'com.google.auto.value:auto-value-annotations:1.6.3'
     testAnnotationProcessor "com.google.auto.value:auto-value:1.6.3"
 
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
-    javadocClasspath 'org.checkerframework:checker-qual:2.5.2'
-
-    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
-
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'androidx.test:core:1.3.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'com.android.support.test:runner:1.0.2'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.10.2'
-    testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
     testImplementation('com.google.android.gms:play-services-appinvite:18.0.0') {
-        exclude group: 'com.google.firebase', module: 'firebase-common'
-        exclude group: 'com.google.firebase', module: 'firebase-dynamic-links'
-    }
-}
+         exclude group: 'com.google.firebase', module: 'firebase-common'
+         exclude group: 'com.google.firebase', module: 'firebase-dynamic-links'
+     }
+    testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 
+    testCompileOnly 'com.google.auto.value:auto-value-annotations:1.6.3'
+}
diff --git a/firebase-dynamic-links/gradle.properties b/firebase-dynamic-links/gradle.properties
index 245bf5280b1..575718ab54c 100644
--- a/firebase-dynamic-links/gradle.properties
+++ b/firebase-dynamic-links/gradle.properties
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=21.0.1
-latestReleasedVersion=21.0.0
+version=22.0.1
+latestReleasedVersion=22.0.0
 android.enableUnitTestBinaryResources=true
diff --git a/firebase-dynamic-links/ktx/api.txt b/firebase-dynamic-links/ktx/api.txt
index 6fdf9095c54..448c591bfb5 100644
--- a/firebase-dynamic-links/ktx/api.txt
+++ b/firebase-dynamic-links/ktx/api.txt
@@ -1,27 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.dynamiclinks.ktx {
 
-  public final class FirebaseDynamicLinksKt {
-    ctor public FirebaseDynamicLinksKt();
-    method @NonNull public static void androidParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder,kotlin.Unit> init);
-    method @NonNull public static void androidParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull String packageName, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder,kotlin.Unit> init);
-    method @Nullable public static operator android.net.Uri component1(@NonNull com.google.firebase.dynamiclinks.ShortDynamicLink);
-    method @Nullable public static operator android.net.Uri component1(@NonNull com.google.firebase.dynamiclinks.PendingDynamicLinkData);
-    method @Nullable public static operator android.net.Uri component2(@NonNull com.google.firebase.dynamiclinks.ShortDynamicLink);
-    method public static operator int component2(@NonNull com.google.firebase.dynamiclinks.PendingDynamicLinkData);
-    method @NonNull public static operator java.util.List<com.google.firebase.dynamiclinks.ShortDynamicLink.Warning> component3(@NonNull com.google.firebase.dynamiclinks.ShortDynamicLink);
-    method public static operator long component3(@NonNull com.google.firebase.dynamiclinks.PendingDynamicLinkData);
-    method @NonNull public static com.google.firebase.dynamiclinks.DynamicLink dynamicLink(@NonNull com.google.firebase.dynamiclinks.FirebaseDynamicLinks, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
-    method @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks dynamicLinks(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
-    method @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getDynamicLinks(@NonNull com.google.firebase.ktx.Firebase);
-    method @NonNull public static void googleAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder,kotlin.Unit> init);
-    method @NonNull public static void googleAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull String source, @NonNull String medium, @NonNull String campaign, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters.Builder,kotlin.Unit> init);
-    method @NonNull public static void iosParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull String bundleId, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder,kotlin.Unit> init);
-    method @NonNull public static void itunesConnectAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters.Builder,kotlin.Unit> init);
-    method @NonNull public static void navigationInfoParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.NavigationInfoParameters.Builder,kotlin.Unit> init);
-    method @NonNull public static com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink> shortLinkAsync(@NonNull com.google.firebase.dynamiclinks.FirebaseDynamicLinks, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
-    method @NonNull public static com.google.android.gms.tasks.Task<com.google.firebase.dynamiclinks.ShortDynamicLink> shortLinkAsync(@NonNull com.google.firebase.dynamiclinks.FirebaseDynamicLinks, int suffix, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.Builder,kotlin.Unit> init);
-    method @NonNull public static void socialMetaTagParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder,kotlin.Unit> init);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-dynamic-links/ktx/ktx.gradle b/firebase-dynamic-links/ktx/ktx.gradle
index 590d9a753d8..6340f7d0a82 100644
--- a/firebase-dynamic-links/ktx/ktx.gradle
+++ b/firebase-dynamic-links/ktx/ktx.gradle
@@ -14,19 +14,21 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-dynamic-links')
-    publishJavadoc = true
+    libraryGroup "dynamic-links"
+    publishJavadoc = false
+    publishReleaseNotes = false
     publishSources = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+        namespace "com.google.firebase.dynamiclinks.ktx"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
@@ -42,18 +44,15 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api(project(":firebase-dynamic-links"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
 
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-dynamic-links')
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    implementation("com.google.firebase:firebase-components:18.0.0")
 
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
diff --git a/firebase-dynamic-links/ktx/src/main/AndroidManifest.xml b/firebase-dynamic-links/ktx/src/main/AndroidManifest.xml
index 46202bd99dc..67a08a3eba6 100644
--- a/firebase-dynamic-links/ktx/src/main/AndroidManifest.xml
+++ b/firebase-dynamic-links/ktx/src/main/AndroidManifest.xml
@@ -13,13 +13,12 @@
 <!-- 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="com.google.firebase.dynamiclinks.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.dynamiclinks.ktx.FirebaseDynamicLinksKtxRegistrar"
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.dynamiclinks.ktx.FirebaseDynamicLinksLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
diff --git a/firebase-dynamic-links/ktx/src/main/kotlin/com/google/firebase/dynamiclinks/ktx/FirebaseDynamicLinks.kt b/firebase-dynamic-links/ktx/src/main/kotlin/com/google/firebase/dynamiclinks/ktx/FirebaseDynamicLinks.kt
deleted file mode 100644
index 89c6f625828..00000000000
--- a/firebase-dynamic-links/ktx/src/main/kotlin/com/google/firebase/dynamiclinks/ktx/FirebaseDynamicLinks.kt
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.dynamiclinks.ktx
-
-import androidx.annotation.Keep
-import com.google.android.gms.tasks.Task
-import com.google.firebase.FirebaseApp
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.dynamiclinks.DynamicLink
-import com.google.firebase.dynamiclinks.FirebaseDynamicLinks
-import com.google.firebase.dynamiclinks.PendingDynamicLinkData
-import com.google.firebase.dynamiclinks.ShortDynamicLink
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.platforminfo.LibraryVersionComponent
-
-/** Returns the [FirebaseDynamicLinks] instance of the default [FirebaseApp]. */
-val Firebase.dynamicLinks: FirebaseDynamicLinks
-    get() = FirebaseDynamicLinks.getInstance()
-
-/** Returns the [FirebaseDynamicLinks] instance of a given [FirebaseApp]. */
-fun Firebase.dynamicLinks(app: FirebaseApp): FirebaseDynamicLinks {
-    return FirebaseDynamicLinks.getInstance(app)
-}
-
-/** Creates a [DynamicLink.AndroidParameters] object initialized using the [init] function and sets it to the [DynamicLink.Builder] */
-fun DynamicLink.Builder.androidParameters(init: DynamicLink.AndroidParameters.Builder.() -> Unit) {
-    val builder = DynamicLink.AndroidParameters.Builder()
-    builder.init()
-    setAndroidParameters(builder.build())
-}
-
-/** Creates a [DynamicLink.AndroidParameters] object initialized with the specified [packageName] and using the [init] function and sets it to the [DynamicLink.Builder] */
-fun DynamicLink.Builder.androidParameters(packageName: String, init: DynamicLink.AndroidParameters.Builder.() -> Unit) {
-    val builder = DynamicLink.AndroidParameters.Builder(packageName)
-    builder.init()
-    setAndroidParameters(builder.build())
-}
-
-/** Creates a [DynamicLink.IosParameters] object initialized with the specified [bundleId] and using the [init] function and sets it to the [DynamicLink.Builder] */
-fun DynamicLink.Builder.iosParameters(bundleId: String, init: DynamicLink.IosParameters.Builder.() -> Unit) {
-    val builder = DynamicLink.IosParameters.Builder(bundleId)
-    builder.init()
-    setIosParameters(builder.build())
-}
-
-/** Creates a [DynamicLink.GoogleAnalyticsParameters] object initialized using the [init] function and sets it to the [DynamicLink.Builder] */
-fun DynamicLink.Builder.googleAnalyticsParameters(init: DynamicLink.GoogleAnalyticsParameters.Builder.() -> Unit) {
-    val builder = DynamicLink.GoogleAnalyticsParameters.Builder()
-    builder.init()
-    setGoogleAnalyticsParameters(builder.build())
-}
-
-/** Creates a [DynamicLink.GoogleAnalyticsParameters] object initialized with the specified
- * [source], [medium], [campaign] and using the [init] function and sets it to the [DynamicLink.Builder]. */
-fun DynamicLink.Builder.googleAnalyticsParameters(
-    source: String,
-    medium: String,
-    campaign: String,
-    init: DynamicLink.GoogleAnalyticsParameters.Builder.() -> Unit
-) {
-    val builder = DynamicLink.GoogleAnalyticsParameters.Builder(source, medium, campaign)
-    builder.init()
-    setGoogleAnalyticsParameters(builder.build())
-}
-
-/** Creates a [DynamicLink.ItunesConnectAnalyticsParameters] object initialized using the [init] function and sets it to the [DynamicLink.Builder] */
-fun DynamicLink.Builder.itunesConnectAnalyticsParameters(init: DynamicLink.ItunesConnectAnalyticsParameters.Builder.() -> Unit) {
-    val builder = DynamicLink.ItunesConnectAnalyticsParameters.Builder()
-    builder.init()
-    setItunesConnectAnalyticsParameters(builder.build())
-}
-
-/** Creates a [DynamicLink.SocialMetaTagParameters] object initialized using the [init] function and sets it to the [DynamicLink.Builder] */
-fun DynamicLink.Builder.socialMetaTagParameters(init: DynamicLink.SocialMetaTagParameters.Builder.() -> Unit) {
-    val builder = DynamicLink.SocialMetaTagParameters.Builder()
-    builder.init()
-    setSocialMetaTagParameters(builder.build())
-}
-
-/** Creates a [DynamicLink.NavigationInfoParameters] object initialized using the [init] function and sets it to the [DynamicLink.Builder] */
-fun DynamicLink.Builder.navigationInfoParameters(init: DynamicLink.NavigationInfoParameters.Builder.() -> Unit) {
-    val builder = DynamicLink.NavigationInfoParameters.Builder()
-    builder.init()
-    setNavigationInfoParameters(builder.build())
-}
-
-/** Creates a [DynamicLink] object initialized using the [init] function. */
-fun FirebaseDynamicLinks.dynamicLink(init: DynamicLink.Builder.() -> Unit): DynamicLink {
-    val builder = FirebaseDynamicLinks.getInstance().createDynamicLink()
-    builder.init()
-    return builder.buildDynamicLink()
-}
-
-/** Creates a [ShortDynamicLink] object initialized using the [init] function. */
-fun FirebaseDynamicLinks.shortLinkAsync(init: DynamicLink.Builder.() -> Unit): Task<ShortDynamicLink> {
-    val builder = FirebaseDynamicLinks.getInstance().createDynamicLink()
-    builder.init()
-    return builder.buildShortDynamicLink()
-}
-
-/** Creates a [ShortDynamicLink] object initialized using the [init] function. */
-fun FirebaseDynamicLinks.shortLinkAsync(suffix: Int, init: DynamicLink.Builder.() -> Unit): Task<ShortDynamicLink> {
-    val builder = FirebaseDynamicLinks.getInstance().createDynamicLink()
-    builder.init()
-    return builder.buildShortDynamicLink(suffix)
-}
-
-/** Destructuring declaration for [ShortDynamicLink] to provide shortLink. */
-operator fun ShortDynamicLink.component1() = shortLink
-
-/** Destructuring declaration for [ShortDynamicLink] to provide previewLink. */
-operator fun ShortDynamicLink.component2() = previewLink
-
-/** Destructuring declaration for [ShortDynamicLink] to provide warnings. */
-operator fun ShortDynamicLink.component3(): List<ShortDynamicLink.Warning> = warnings
-
-/** Destructuring declaration for [PendingDynamicLinkData] to provide link. */
-operator fun PendingDynamicLinkData.component1() = link
-
-/** Destructuring declaration for [PendingDynamicLinkData] to provide minimumAppVersion. */
-operator fun PendingDynamicLinkData.component2() = minimumAppVersion
-
-/** Destructuring declaration for [PendingDynamicLinkData] to provide clickTimestamp. */
-operator fun PendingDynamicLinkData.component3() = clickTimestamp
-
-internal const val LIBRARY_NAME: String = "fire-dl-ktx"
-
-/** @suppress */
-@Keep
-class FirebaseDynamicLinksKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-dynamic-links/ktx/src/main/kotlin/com/google/firebase/dynamiclinks/ktx/Logging.kt b/firebase-dynamic-links/ktx/src/main/kotlin/com/google/firebase/dynamiclinks/ktx/Logging.kt
new file mode 100644
index 00000000000..37249965572
--- /dev/null
+++ b/firebase-dynamic-links/ktx/src/main/kotlin/com/google/firebase/dynamiclinks/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.dynamiclinks.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.dynamiclinks.BuildConfig
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-dl-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseDynamicLinksLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-dynamic-links/ktx/src/test/kotlin/com/google/firebase/dynamiclinks/ktx/DynamicLinksTests.kt b/firebase-dynamic-links/ktx/src/test/kotlin/com/google/firebase/dynamiclinks/ktx/DynamicLinksTests.kt
index 27c4874553e..48531d72990 100644
--- a/firebase-dynamic-links/ktx/src/test/kotlin/com/google/firebase/dynamiclinks/ktx/DynamicLinksTests.kt
+++ b/firebase-dynamic-links/ktx/src/test/kotlin/com/google/firebase/dynamiclinks/ktx/DynamicLinksTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.dynamiclinks.ktx
 
@@ -29,8 +31,8 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mockito.`when`
 import org.mockito.Mockito.mock
+import org.mockito.Mockito.`when`
 import org.robolectric.RobolectricTestRunner
 
 const val APP_ID = "APP_ID"
@@ -39,233 +41,241 @@ const val API_KEY = "API_KEY"
 const val EXISTING_APP = "existing"
 
 abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
-
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build(),
-                EXISTING_APP
-        )
-    }
-
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class DynamicLinksTests : BaseTestCase() {
 
-    @Test
-    fun `Firebase#dynamicLinks should delegate to FirebaseDynamicLinks#getInstance()`() {
-        assertThat(Firebase.dynamicLinks).isSameInstanceAs(FirebaseDynamicLinks.getInstance())
-    }
-
-    @Test
-    fun `Firebase#dynamicLinks should delegate to FirebaseDynamicLinks#getInstance(FirebaseApp)`() {
-        val app = Firebase.app(EXISTING_APP)
-        assertThat(Firebase.dynamicLinks(app))
-                .isSameInstanceAs(FirebaseDynamicLinks.getInstance(app))
-    }
-
-    @Test
-    fun `Firebase#dynamicLinks#createDynamicLink`() {
-        val exampleLink = "https://example.com"
-        val exampleDomainUriPrefix = "https://example.page.link"
-
-        val dynamicLinkKtx = Firebase.dynamicLinks.dynamicLink {
-            link = Uri.parse(exampleLink)
-            domainUriPrefix = exampleDomainUriPrefix
-        }
-
-        val dynamicLink = FirebaseDynamicLinks.getInstance().createDynamicLink()
-                .setLink(Uri.parse(exampleLink))
-                .setDomainUriPrefix(exampleDomainUriPrefix)
-                .buildDynamicLink()
-
-        assertThat(dynamicLinkKtx.uri).isEqualTo(dynamicLink.uri)
-    }
-
-    @Test
-    fun `androidParameters type-safe builder extension works`() {
-        val fallbackLink = "https://android.com"
-        val minVersion = 19
-        val packageName = "com.example.android"
-
-        val dynamicLink = Firebase.dynamicLinks.dynamicLink {
-            link = Uri.parse("https://example.com")
-            domainUriPrefix = "https://example.page.link"
-            androidParameters {
-                minimumVersion = minVersion
-                fallbackUrl = Uri.parse(fallbackLink)
-            }
-        }
-
-        val anotherDynamicLink = Firebase.dynamicLinks.dynamicLink {
-            link = Uri.parse("https://example.com")
-            domainUriPrefix = "https://example.page.link"
-            androidParameters(packageName) {
-                minimumVersion = minVersion
-                fallbackUrl = Uri.parse(fallbackLink)
-            }
+  @Test
+  fun `Firebase#dynamicLinks should delegate to FirebaseDynamicLinks#getInstance()`() {
+    assertThat(Firebase.dynamicLinks).isSameInstanceAs(FirebaseDynamicLinks.getInstance())
+  }
+
+  @Test
+  fun `Firebase#dynamicLinks should delegate to FirebaseDynamicLinks#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.dynamicLinks(app)).isSameInstanceAs(FirebaseDynamicLinks.getInstance(app))
+  }
+
+  @Test
+  fun `Firebase#dynamicLinks#createDynamicLink`() {
+    val exampleLink = "https://example.com"
+    val exampleDomainUriPrefix = "https://example.page.link"
+
+    val dynamicLinkKtx =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse(exampleLink)
+        domainUriPrefix = exampleDomainUriPrefix
+      }
+
+    val dynamicLink =
+      FirebaseDynamicLinks.getInstance()
+        .createDynamicLink()
+        .setLink(Uri.parse(exampleLink))
+        .setDomainUriPrefix(exampleDomainUriPrefix)
+        .buildDynamicLink()
+
+    assertThat(dynamicLinkKtx.uri).isEqualTo(dynamicLink.uri)
+  }
+
+  @Test
+  fun `androidParameters type-safe builder extension works`() {
+    val fallbackLink = "https://android.com"
+    val minVersion = 19
+    val packageName = "com.example.android"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        androidParameters {
+          minimumVersion = minVersion
+          fallbackUrl = Uri.parse(fallbackLink)
         }
-
-        assertThat(dynamicLink.uri.getQueryParameter("amv")?.toInt()).isEqualTo(minVersion)
-        assertThat(dynamicLink.uri.getQueryParameter("afl")).isEqualTo(fallbackLink)
-
-        assertThat(anotherDynamicLink.uri.getQueryParameter("amv")?.toInt()).isEqualTo(minVersion)
-        assertThat(anotherDynamicLink.uri.getQueryParameter("afl")).isEqualTo(fallbackLink)
-        assertThat(anotherDynamicLink.uri.getQueryParameter("apn")).isEqualTo(packageName)
-    }
-
-    @Test
-    fun `iosParameters type-safe builder extension works`() {
-        val iosAppStoreId = "123456789"
-        val iosMinimumVersion = "1.0.1"
-        val iosBundleId = "com.example.ios"
-
-        val dynamicLink = Firebase.dynamicLinks.dynamicLink {
-            link = Uri.parse("https://example.com")
-            domainUriPrefix = "https://example.page.link"
-            iosParameters(iosBundleId) {
-                appStoreId = iosAppStoreId
-                minimumVersion = iosMinimumVersion
-            }
-        }
-
-        assertThat(dynamicLink.uri.getQueryParameter("ibi")).isEqualTo(iosBundleId)
-        assertThat(dynamicLink.uri.getQueryParameter("imv")).isEqualTo(iosMinimumVersion)
-        assertThat(dynamicLink.uri.getQueryParameter("isi")).isEqualTo(iosAppStoreId)
-    }
-
-    @Test
-    fun `googleAnalyticsParameters type-safe builder extension works`() {
-        val campaignTerm = "Example Term"
-        val campaignContent = "Example Content"
-        val campaignSource = "Twitter"
-        val campaignMedium = "Social"
-        val campaignName = "Example Promo"
-
-        val dynamicLink = Firebase.dynamicLinks.dynamicLink {
-            link = Uri.parse("https://example.com")
-            domainUriPrefix = "https://example.page.link"
-            googleAnalyticsParameters(campaignSource, campaignMedium, campaignName) {
-                term = campaignTerm
-                content = campaignContent
-            }
+      }
+
+    val anotherDynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        androidParameters(packageName) {
+          minimumVersion = minVersion
+          fallbackUrl = Uri.parse(fallbackLink)
         }
-
-        assertThat(dynamicLink.uri.getQueryParameter("utm_content")).isEqualTo(campaignContent)
-        assertThat(dynamicLink.uri.getQueryParameter("utm_term")).isEqualTo(campaignTerm)
-        assertThat(dynamicLink.uri.getQueryParameter("utm_source")).isEqualTo(campaignSource)
-        assertThat(dynamicLink.uri.getQueryParameter("utm_medium")).isEqualTo(campaignMedium)
-        assertThat(dynamicLink.uri.getQueryParameter("utm_campaign")).isEqualTo(campaignName)
-    }
-
-    @Test
-    fun `itunesConnectAnalyticsParameters type-safe builder extension works`() {
-        val ct = "example-campaign"
-        val pt = "123456"
-
-        val dynamicLink = Firebase.dynamicLinks.dynamicLink {
-            link = Uri.parse("https://example.com")
-            domainUriPrefix = "https://example.page.link"
-            itunesConnectAnalyticsParameters {
-                providerToken = pt
-                campaignToken = ct
-            }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("amv")?.toInt()).isEqualTo(minVersion)
+    assertThat(dynamicLink.uri.getQueryParameter("afl")).isEqualTo(fallbackLink)
+
+    assertThat(anotherDynamicLink.uri.getQueryParameter("amv")?.toInt()).isEqualTo(minVersion)
+    assertThat(anotherDynamicLink.uri.getQueryParameter("afl")).isEqualTo(fallbackLink)
+    assertThat(anotherDynamicLink.uri.getQueryParameter("apn")).isEqualTo(packageName)
+  }
+
+  @Test
+  fun `iosParameters type-safe builder extension works`() {
+    val iosAppStoreId = "123456789"
+    val iosMinimumVersion = "1.0.1"
+    val iosBundleId = "com.example.ios"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        iosParameters(iosBundleId) {
+          appStoreId = iosAppStoreId
+          minimumVersion = iosMinimumVersion
         }
-
-        assertThat(dynamicLink.uri.getQueryParameter("pt")).isEqualTo(pt)
-        assertThat(dynamicLink.uri.getQueryParameter("ct")).isEqualTo(ct)
-    }
-
-    @Test
-    fun `socialMetaTagParameters type-safe builder extension works`() {
-        val socialTitle = "Example Title"
-        val socialDescription = "This link works whether the app is installed or not!"
-
-        val dynamicLink = Firebase.dynamicLinks.dynamicLink {
-            link = Uri.parse("https://example.com")
-            domainUriPrefix = "https://example.page.link"
-            socialMetaTagParameters {
-                title = socialTitle
-                description = socialDescription
-            }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("ibi")).isEqualTo(iosBundleId)
+    assertThat(dynamicLink.uri.getQueryParameter("imv")).isEqualTo(iosMinimumVersion)
+    assertThat(dynamicLink.uri.getQueryParameter("isi")).isEqualTo(iosAppStoreId)
+  }
+
+  @Test
+  fun `googleAnalyticsParameters type-safe builder extension works`() {
+    val campaignTerm = "Example Term"
+    val campaignContent = "Example Content"
+    val campaignSource = "Twitter"
+    val campaignMedium = "Social"
+    val campaignName = "Example Promo"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        googleAnalyticsParameters(campaignSource, campaignMedium, campaignName) {
+          term = campaignTerm
+          content = campaignContent
         }
-
-        assertThat(dynamicLink.uri.getQueryParameter("st")).isEqualTo(socialTitle)
-        assertThat(dynamicLink.uri.getQueryParameter("sd")).isEqualTo(socialDescription)
-    }
-
-    @Test
-    fun `navigationInfoParameters type-safe builder extension works`() {
-        val forcedRedirect = true
-
-        val dynamicLink = Firebase.dynamicLinks.dynamicLink {
-            link = Uri.parse("https://example.com")
-            domainUriPrefix = "https://example.page.link"
-            navigationInfoParameters {
-                forcedRedirectEnabled = true
-            }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("utm_content")).isEqualTo(campaignContent)
+    assertThat(dynamicLink.uri.getQueryParameter("utm_term")).isEqualTo(campaignTerm)
+    assertThat(dynamicLink.uri.getQueryParameter("utm_source")).isEqualTo(campaignSource)
+    assertThat(dynamicLink.uri.getQueryParameter("utm_medium")).isEqualTo(campaignMedium)
+    assertThat(dynamicLink.uri.getQueryParameter("utm_campaign")).isEqualTo(campaignName)
+  }
+
+  @Test
+  fun `itunesConnectAnalyticsParameters type-safe builder extension works`() {
+    val ct = "example-campaign"
+    val pt = "123456"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        itunesConnectAnalyticsParameters {
+          providerToken = pt
+          campaignToken = ct
         }
-
-        val efr = Integer.parseInt(dynamicLink.uri.getQueryParameter("efr")!!) == 1
-        assertThat(efr).isEqualTo(forcedRedirect)
-    }
-
-    @Test
-    fun `ShortDynamicLink destructure declaration works`() {
-        val fakeWarning = object : ShortDynamicLink.Warning {
-            override fun getMessage() = "Warning"
-            override fun getCode() = "warning"
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("pt")).isEqualTo(pt)
+    assertThat(dynamicLink.uri.getQueryParameter("ct")).isEqualTo(ct)
+  }
+
+  @Test
+  fun `socialMetaTagParameters type-safe builder extension works`() {
+    val socialTitle = "Example Title"
+    val socialDescription = "This link works whether the app is installed or not!"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        socialMetaTagParameters {
+          title = socialTitle
+          description = socialDescription
         }
-
-        val expectedShortLink = Uri.parse("https://example.com")
-        val expectedPreviewLink = Uri.parse("https://example.com/preview")
-        val expectedWarnings = mutableListOf<ShortDynamicLink.Warning>(fakeWarning)
-
-        val mockShortDynamicLink = mock(ShortDynamicLink::class.java)
-        `when`(mockShortDynamicLink.shortLink).thenReturn(expectedShortLink)
-        `when`(mockShortDynamicLink.previewLink).thenReturn(expectedPreviewLink)
-        `when`(mockShortDynamicLink.warnings).thenReturn(expectedWarnings)
-
-        val (shortLink, previewLink, warnings) = mockShortDynamicLink
-
-        assertThat(shortLink).isEqualTo(expectedShortLink)
-        assertThat(previewLink).isEqualTo(expectedPreviewLink)
-        assertThat(warnings).isEqualTo(expectedWarnings)
-    }
-
-    @Test
-    fun `PendingDynamicLinkData destructure declaration works`() {
-        val expectedLink = Uri.parse("https://example.com")
-        val expectedMinAppVersion = 30
-        val expectedTimestamp = 172947600L
-
-        val mockPendingData = mock(PendingDynamicLinkData::class.java)
-        `when`(mockPendingData.link).thenReturn(expectedLink)
-        `when`(mockPendingData.minimumAppVersion).thenReturn(expectedMinAppVersion)
-        `when`(mockPendingData.clickTimestamp).thenReturn(expectedTimestamp)
-
-        val (link, minAppVersion, timestamp) = mockPendingData
-
-        assertThat(link).isEqualTo(expectedLink)
-        assertThat(minAppVersion).isEqualTo(expectedMinAppVersion)
-        assertThat(timestamp).isEqualTo(expectedTimestamp)
-    }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("st")).isEqualTo(socialTitle)
+    assertThat(dynamicLink.uri.getQueryParameter("sd")).isEqualTo(socialDescription)
+  }
+
+  @Test
+  fun `navigationInfoParameters type-safe builder extension works`() {
+    val forcedRedirect = true
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        navigationInfoParameters { forcedRedirectEnabled = true }
+      }
+
+    val efr = Integer.parseInt(dynamicLink.uri.getQueryParameter("efr")!!) == 1
+    assertThat(efr).isEqualTo(forcedRedirect)
+  }
+
+  @Test
+  fun `ShortDynamicLink destructure declaration works`() {
+    val fakeWarning =
+      object : ShortDynamicLink.Warning {
+        override fun getMessage() = "Warning"
+        override fun getCode() = "warning"
+      }
+
+    val expectedShortLink = Uri.parse("https://example.com")
+    val expectedPreviewLink = Uri.parse("https://example.com/preview")
+    val expectedWarnings = mutableListOf<ShortDynamicLink.Warning>(fakeWarning)
+
+    val mockShortDynamicLink = mock(ShortDynamicLink::class.java)
+    `when`(mockShortDynamicLink.shortLink).thenReturn(expectedShortLink)
+    `when`(mockShortDynamicLink.previewLink).thenReturn(expectedPreviewLink)
+    `when`(mockShortDynamicLink.warnings).thenReturn(expectedWarnings)
+
+    val (shortLink, previewLink, warnings) = mockShortDynamicLink
+
+    assertThat(shortLink).isEqualTo(expectedShortLink)
+    assertThat(previewLink).isEqualTo(expectedPreviewLink)
+    assertThat(warnings).isEqualTo(expectedWarnings)
+  }
+
+  @Test
+  fun `PendingDynamicLinkData destructure declaration works`() {
+    val expectedLink = Uri.parse("https://example.com")
+    val expectedMinAppVersion = 30
+    val expectedTimestamp = 172947600L
+
+    val mockPendingData = mock(PendingDynamicLinkData::class.java)
+    `when`(mockPendingData.link).thenReturn(expectedLink)
+    `when`(mockPendingData.minimumAppVersion).thenReturn(expectedMinAppVersion)
+    `when`(mockPendingData.clickTimestamp).thenReturn(expectedTimestamp)
+
+    val (link, minAppVersion, timestamp) = mockPendingData
+
+    assertThat(link).isEqualTo(expectedLink)
+    assertThat(minAppVersion).isEqualTo(expectedMinAppVersion)
+    assertThat(timestamp).isEqualTo(expectedTimestamp)
+  }
 }
diff --git a/firebase-dynamic-links/src/main/AndroidManifest.xml b/firebase-dynamic-links/src/main/AndroidManifest.xml
index a04d2b01c73..376c46e3cb3 100644
--- a/firebase-dynamic-links/src/main/AndroidManifest.xml
+++ b/firebase-dynamic-links/src/main/AndroidManifest.xml
@@ -13,13 +13,12 @@
 <!-- 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="com.google.firebase.dynamiclinks">
-  <!--<uses-sdk android:minSdkVersion="16"/>-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <!--<uses-sdk android:minSdkVersion="21"/>-->
 
   <application>
       <service android:name="com.google.firebase.components.ComponentDiscoveryService"
-          android:exported="false">
+          android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.dynamiclinks.FirebaseDynamicLinksKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
           <meta-data
               android:name="com.google.firebase.components:com.google.firebase.dynamiclinks.internal.FirebaseDynamicLinkRegistrar"
               android:value="com.google.firebase.components.ComponentRegistrar" />
diff --git a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/FirebaseDynamicLinks.java b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/FirebaseDynamicLinks.java
index 4c7243b3768..5fff6d3e795 100644
--- a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/FirebaseDynamicLinks.java
+++ b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/FirebaseDynamicLinks.java
@@ -30,12 +30,13 @@
  *
  * <p>When a dynamic link is clicked, the app is launched, or if the app is not yet installed, the
  * user is directed to the Play Store to install and launch the app. In both cases the dynamic link
- * made available to the app using {@link #getDynamicLink(Intent)}. An {@link
- * android.content.IntentFilter} for the deeplink can also be used to launch the app directly into a
- * targeted {@link android.app.Activity} or otherwise will start in the main launch Activity.
+ * made available to the app using {@link #getDynamicLink(Intent)}. <br>
+ * An {@link android.content.IntentFilter} for the deeplink can also be used to launch the app
+ * directly into a targeted {@link android.app.Activity} or otherwise will start in the main launch
+ * Activity.
  *
- * <p>Dynamic link data returned from {@link #getDynamicLink(Intent)} can be accessed using {@link
- * PendingDynamicLinkData} class.
+ * <p>Dynamic link data returned from {@link #getDynamicLink(Intent)} can be accessed using the
+ * {@link PendingDynamicLinkData} class.
  *
  * <p><a href="https://developer.android.com/training/app-links/index.html">Android App Links</a>
  * can also be used to launch the app with dynamic links by registering to handle your Dynamic Links
diff --git a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/FirebaseDynamicLinks.kt b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/FirebaseDynamicLinks.kt
new file mode 100644
index 00000000000..8edc25e6540
--- /dev/null
+++ b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/FirebaseDynamicLinks.kt
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.dynamiclinks
+
+import androidx.annotation.Keep
+import com.google.android.gms.tasks.Task
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+
+/** Returns the [FirebaseDynamicLinks] instance of the default [FirebaseApp]. */
+val Firebase.dynamicLinks: FirebaseDynamicLinks
+  get() = FirebaseDynamicLinks.getInstance()
+
+/** Returns the [FirebaseDynamicLinks] instance of a given [FirebaseApp]. */
+fun Firebase.dynamicLinks(app: FirebaseApp): FirebaseDynamicLinks {
+  return FirebaseDynamicLinks.getInstance(app)
+}
+
+/**
+ * Creates a [DynamicLink.AndroidParameters] object initialized using the [init] function and sets
+ * it to the [DynamicLink.Builder]
+ */
+fun DynamicLink.Builder.androidParameters(init: DynamicLink.AndroidParameters.Builder.() -> Unit) {
+  val builder = DynamicLink.AndroidParameters.Builder()
+  builder.init()
+  setAndroidParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.AndroidParameters] object initialized with the specified [packageName] and
+ * using the [init] function and sets it to the [DynamicLink.Builder]
+ */
+fun DynamicLink.Builder.androidParameters(
+  packageName: String,
+  init: DynamicLink.AndroidParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.AndroidParameters.Builder(packageName)
+  builder.init()
+  setAndroidParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.IosParameters] object initialized with the specified [bundleId] and using
+ * the [init] function and sets it to the [DynamicLink.Builder]
+ */
+fun DynamicLink.Builder.iosParameters(
+  bundleId: String,
+  init: DynamicLink.IosParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.IosParameters.Builder(bundleId)
+  builder.init()
+  setIosParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.GoogleAnalyticsParameters] object initialized using the [init] function
+ * and sets it to the [DynamicLink.Builder]
+ */
+fun DynamicLink.Builder.googleAnalyticsParameters(
+  init: DynamicLink.GoogleAnalyticsParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.GoogleAnalyticsParameters.Builder()
+  builder.init()
+  setGoogleAnalyticsParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.GoogleAnalyticsParameters] object initialized with the specified [source],
+ * [medium], [campaign] and using the [init] function and sets it to the [DynamicLink.Builder].
+ */
+fun DynamicLink.Builder.googleAnalyticsParameters(
+  source: String,
+  medium: String,
+  campaign: String,
+  init: DynamicLink.GoogleAnalyticsParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.GoogleAnalyticsParameters.Builder(source, medium, campaign)
+  builder.init()
+  setGoogleAnalyticsParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.ItunesConnectAnalyticsParameters] object initialized using the [init]
+ * function and sets it to the [DynamicLink.Builder]
+ */
+fun DynamicLink.Builder.itunesConnectAnalyticsParameters(
+  init: DynamicLink.ItunesConnectAnalyticsParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.ItunesConnectAnalyticsParameters.Builder()
+  builder.init()
+  setItunesConnectAnalyticsParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.SocialMetaTagParameters] object initialized using the [init] function and
+ * sets it to the [DynamicLink.Builder]
+ */
+fun DynamicLink.Builder.socialMetaTagParameters(
+  init: DynamicLink.SocialMetaTagParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.SocialMetaTagParameters.Builder()
+  builder.init()
+  setSocialMetaTagParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.NavigationInfoParameters] object initialized using the [init] function and
+ * sets it to the [DynamicLink.Builder]
+ */
+fun DynamicLink.Builder.navigationInfoParameters(
+  init: DynamicLink.NavigationInfoParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.NavigationInfoParameters.Builder()
+  builder.init()
+  setNavigationInfoParameters(builder.build())
+}
+
+/** Creates a [DynamicLink] object initialized using the [init] function. */
+fun FirebaseDynamicLinks.dynamicLink(init: DynamicLink.Builder.() -> Unit): DynamicLink {
+  val builder = FirebaseDynamicLinks.getInstance().createDynamicLink()
+  builder.init()
+  return builder.buildDynamicLink()
+}
+
+/** Creates a [ShortDynamicLink] object initialized using the [init] function. */
+fun FirebaseDynamicLinks.shortLinkAsync(
+  init: DynamicLink.Builder.() -> Unit
+): Task<ShortDynamicLink> {
+  val builder = FirebaseDynamicLinks.getInstance().createDynamicLink()
+  builder.init()
+  return builder.buildShortDynamicLink()
+}
+
+/** Creates a [ShortDynamicLink] object initialized using the [init] function. */
+fun FirebaseDynamicLinks.shortLinkAsync(
+  suffix: Int,
+  init: DynamicLink.Builder.() -> Unit
+): Task<ShortDynamicLink> {
+  val builder = FirebaseDynamicLinks.getInstance().createDynamicLink()
+  builder.init()
+  return builder.buildShortDynamicLink(suffix)
+}
+
+/** Destructuring declaration for [ShortDynamicLink] to provide shortLink. */
+operator fun ShortDynamicLink.component1() = shortLink
+
+/** Destructuring declaration for [ShortDynamicLink] to provide previewLink. */
+operator fun ShortDynamicLink.component2() = previewLink
+
+/** Destructuring declaration for [ShortDynamicLink] to provide warnings. */
+operator fun ShortDynamicLink.component3(): List<ShortDynamicLink.Warning> = warnings
+
+/** Destructuring declaration for [PendingDynamicLinkData] to provide link. */
+operator fun PendingDynamicLinkData.component1() = link
+
+/** Destructuring declaration for [PendingDynamicLinkData] to provide minimumAppVersion. */
+operator fun PendingDynamicLinkData.component2() = minimumAppVersion
+
+/** Destructuring declaration for [PendingDynamicLinkData] to provide clickTimestamp. */
+operator fun PendingDynamicLinkData.component3() = clickTimestamp
+
+/** @suppress */
+@Keep
+class FirebaseDynamicLinksKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/PendingDynamicLinkData.java b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/PendingDynamicLinkData.java
index 71425fd4568..1d2fb7992ac 100644
--- a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/PendingDynamicLinkData.java
+++ b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/PendingDynamicLinkData.java
@@ -21,10 +21,11 @@
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.android.gms.common.annotation.KeepForSdk;
 import com.google.android.gms.common.util.DefaultClock;
-import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.firebase.dynamiclinks.internal.DynamicLinkData;
 import com.google.firebase.dynamiclinks.internal.DynamicLinkUTMParams;
 
@@ -71,12 +72,12 @@ protected PendingDynamicLinkData(
   }
 
   /**
-   * Return the {@link Bundle} so that 1P dynamic links extensions can access extension data. The
+   * Returns the {@link Bundle} so that 1P dynamic links extensions can access extension data. The
    * data is stored bundle with keys defined by the extension. The bundle is shared with all
    * extensions, so the keys should be unique using the package name of the extension to define the
    * namespace.
    *
-   * @return A bundle will all extension data.
+   * @return A bundle with all extensions data.
    * @hide
    */
   @KeepForSdk
@@ -89,7 +90,7 @@ public Bundle getExtensions() {
   }
 
   /**
-   * Return the link parameter of the dynamic link.
+   * Returns the link parameter of the Firebase Dynamic Link.
    *
    * <p>This link will be set as data in the launch Intent, see {@link Intent#setData(Uri)}, which
    * will match {@link android.content.IntentFilter} to deep link into the app.
@@ -109,8 +110,8 @@ public Uri getLink() {
   }
 
   /**
-   * Return the {@link Bundle} which contains utm parameters associated with the firebase dynamic
-   * link.
+   * Returns the {@link Bundle} which contains utm parameters associated with the Firebase Dynamic
+   * Link.
    *
    * @return Bundle of utm parameters associated with firebase dynamic link.
    */
@@ -124,9 +125,9 @@ public Bundle getUtmParameters() {
   }
 
   /**
-   * The minimum app version requested to process the dynamic link that can be compared directly
-   * with {@link android.content.pm.PackageInfo#versionCode}. If the minimum version code is higher
-   * than the installed app version code, the app can upgrade using {@link
+   * Gets the minimum app version requested to process the Firebase Dynamic Link that can be
+   * compared directly with {@link android.content.pm.PackageInfo#versionCode}. If the minimum
+   * version code is higher than the installed app version code, the app can upgrade using {@link
    * #getUpdateAppIntent(Context)}.
    *
    * @return minimum version code set on the dynamic link, or 0 if not specified.
@@ -139,8 +140,8 @@ public int getMinimumAppVersion() {
   }
 
   /**
-   * The time that the user clicked on the dynamic link. This can be used to determine the amount of
-   * time that has passed since the user selected the link until the app is launched.
+   * Gets the time that the user clicked on the Firebase Dynamic Link. This can be used to determine
+   * the amount of time that has passed since the user selected the link until the app is launched.
    *
    * @return The number of milliseconds that have elapsed since January 1, 1970.
    */
@@ -152,7 +153,7 @@ public long getClickTimestamp() {
   }
 
   /**
-   * Provides the redirect url, which is used as the alternative to opening the app. This url may
+   * Gets the redirect url, which is used as the alternative to opening the app. This url may
    * install the app or go to an app specific website.
    *
    * @return Url that can be used to create an intent to launch an activity.
@@ -168,7 +169,7 @@ public Uri getRedirectUrl() {
   }
 
   /**
-   * Provide an intent to update the app to the version in the Play Store.
+   * Gets the intent to update the app to the version in the Play Store.
    *
    * <p>An intent is returned to be used as a parameter to {@link
    * android.app.Activity#startActivity(Intent)} to launch the Play Store update flow for the app.
diff --git a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinksApi.java b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinksApi.java
index 32c08a906ec..7b13f55889b 100644
--- a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinksApi.java
+++ b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinksApi.java
@@ -17,6 +17,8 @@
 import android.content.Context;
 import android.os.Looper;
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
 import com.google.android.gms.common.api.Api;
 import com.google.android.gms.common.api.Api.ApiOptions;
 import com.google.android.gms.common.api.Api.ApiOptions.NoOptions;
@@ -24,7 +26,6 @@
 import com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks;
 import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
 import com.google.android.gms.common.internal.ClientSettings;
-import com.google.android.gms.common.util.VisibleForTesting;
 
 public class DynamicLinksApi extends GoogleApi<NoOptions> {
 
diff --git a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.java b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.java
index c9bb92041cf..d63fdce1b53 100644
--- a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.java
+++ b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.java
@@ -21,7 +21,9 @@
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.dynamiclinks.BuildConfig;
 import com.google.firebase.dynamiclinks.FirebaseDynamicLinks;
+import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
 
@@ -35,12 +37,14 @@
 @KeepForSdk
 @Keep
 public final class FirebaseDynamicLinkRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-dl";
 
   @Override
   @Keep
   public List<Component<?>> getComponents() {
     Component<FirebaseDynamicLinks> firebaseDynamicLinks =
         Component.builder(FirebaseDynamicLinks.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.optionalProvider(AnalyticsConnector.class))
             .factory(
@@ -50,6 +54,8 @@ public List<Component<?>> getComponents() {
                         container.getProvider(AnalyticsConnector.class)))
             .build(); // no need for eager init for the Internal component.
 
-    return Arrays.asList(firebaseDynamicLinks);
+    return Arrays.asList(
+        firebaseDynamicLinks,
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinksImpl.java b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinksImpl.java
index c25f8d0a60a..9f99a0757d1 100644
--- a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinksImpl.java
+++ b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinksImpl.java
@@ -22,6 +22,8 @@
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 import com.google.android.gms.common.api.Api.ApiOptions.NoOptions;
 import com.google.android.gms.common.api.GoogleApi;
 import com.google.android.gms.common.api.Status;
@@ -29,7 +31,6 @@
 import com.google.android.gms.common.api.internal.TaskUtil;
 import com.google.android.gms.common.internal.Preconditions;
 import com.google.android.gms.common.internal.safeparcel.SafeParcelableSerializer;
-import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
diff --git a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/ktx/FirebaseDynamicLinks.kt b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/ktx/FirebaseDynamicLinks.kt
new file mode 100644
index 00000000000..b0591e2f082
--- /dev/null
+++ b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/ktx/FirebaseDynamicLinks.kt
@@ -0,0 +1,385 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.dynamiclinks.ktx
+
+import androidx.annotation.Keep
+import com.google.android.gms.tasks.Task
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.dynamiclinks.DynamicLink
+import com.google.firebase.dynamiclinks.FirebaseDynamicLinks
+import com.google.firebase.dynamiclinks.PendingDynamicLinkData
+import com.google.firebase.dynamiclinks.ShortDynamicLink
+import com.google.firebase.ktx.Firebase
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseDynamicLinks] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.dynamicLinks: FirebaseDynamicLinks
+  get() = FirebaseDynamicLinks.getInstance()
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseDynamicLinks] instance of a given [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.dynamicLinks(app: FirebaseApp): FirebaseDynamicLinks {
+  return FirebaseDynamicLinks.getInstance(app)
+}
+
+/**
+ * Creates a [DynamicLink.AndroidParameters] object initialized using the [init] function and sets
+ * it to the [DynamicLink.Builder]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun DynamicLink.Builder.androidParameters(init: DynamicLink.AndroidParameters.Builder.() -> Unit) {
+  val builder = DynamicLink.AndroidParameters.Builder()
+  builder.init()
+  setAndroidParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.AndroidParameters] object initialized with the specified [packageName] and
+ * using the [init] function and sets it to the [DynamicLink.Builder]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun DynamicLink.Builder.androidParameters(
+  packageName: String,
+  init: DynamicLink.AndroidParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.AndroidParameters.Builder(packageName)
+  builder.init()
+  setAndroidParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.IosParameters] object initialized with the specified [bundleId] and using
+ * the [init] function and sets it to the [DynamicLink.Builder]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun DynamicLink.Builder.iosParameters(
+  bundleId: String,
+  init: DynamicLink.IosParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.IosParameters.Builder(bundleId)
+  builder.init()
+  setIosParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.GoogleAnalyticsParameters] object initialized using the [init] function
+ * and sets it to the [DynamicLink.Builder]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun DynamicLink.Builder.googleAnalyticsParameters(
+  init: DynamicLink.GoogleAnalyticsParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.GoogleAnalyticsParameters.Builder()
+  builder.init()
+  setGoogleAnalyticsParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.GoogleAnalyticsParameters] object initialized with the specified [source],
+ * [medium], [campaign] and using the [init] function and sets it to the [DynamicLink.Builder].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated("com.google.firebase.dynam", ReplaceWith(""))
+fun DynamicLink.Builder.googleAnalyticsParameters(
+  source: String,
+  medium: String,
+  campaign: String,
+  init: DynamicLink.GoogleAnalyticsParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.GoogleAnalyticsParameters.Builder(source, medium, campaign)
+  builder.init()
+  setGoogleAnalyticsParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.ItunesConnectAnalyticsParameters] object initialized using the [init]
+ * function and sets it to the [DynamicLink.Builder]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun DynamicLink.Builder.itunesConnectAnalyticsParameters(
+  init: DynamicLink.ItunesConnectAnalyticsParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.ItunesConnectAnalyticsParameters.Builder()
+  builder.init()
+  setItunesConnectAnalyticsParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.SocialMetaTagParameters] object initialized using the [init] function and
+ * sets it to the [DynamicLink.Builder]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun DynamicLink.Builder.socialMetaTagParameters(
+  init: DynamicLink.SocialMetaTagParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.SocialMetaTagParameters.Builder()
+  builder.init()
+  setSocialMetaTagParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink.NavigationInfoParameters] object initialized using the [init] function and
+ * sets it to the [DynamicLink.Builder]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun DynamicLink.Builder.navigationInfoParameters(
+  init: DynamicLink.NavigationInfoParameters.Builder.() -> Unit
+) {
+  val builder = DynamicLink.NavigationInfoParameters.Builder()
+  builder.init()
+  setNavigationInfoParameters(builder.build())
+}
+
+/**
+ * Creates a [DynamicLink] object initialized using the [init] function.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun FirebaseDynamicLinks.dynamicLink(init: DynamicLink.Builder.() -> Unit): DynamicLink {
+  val builder = FirebaseDynamicLinks.getInstance().createDynamicLink()
+  builder.init()
+  return builder.buildDynamicLink()
+}
+
+/**
+ * Creates a [ShortDynamicLink] object initialized using the [init] function.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun FirebaseDynamicLinks.shortLinkAsync(
+  init: DynamicLink.Builder.() -> Unit
+): Task<ShortDynamicLink> {
+  val builder = FirebaseDynamicLinks.getInstance().createDynamicLink()
+  builder.init()
+  return builder.buildShortDynamicLink()
+}
+
+/**
+ * Creates a [ShortDynamicLink] object initialized using the [init] function.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun FirebaseDynamicLinks.shortLinkAsync(
+  suffix: Int,
+  init: DynamicLink.Builder.() -> Unit
+): Task<ShortDynamicLink> {
+  val builder = FirebaseDynamicLinks.getInstance().createDynamicLink()
+  builder.init()
+  return builder.buildShortDynamicLink(suffix)
+}
+
+/**
+ * Destructuring declaration for [ShortDynamicLink] to provide shortLink.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun ShortDynamicLink.component1() = shortLink
+
+/**
+ * Destructuring declaration for [ShortDynamicLink] to provide previewLink.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun ShortDynamicLink.component2() = previewLink
+
+/**
+ * Destructuring declaration for [ShortDynamicLink] to provide warnings.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun ShortDynamicLink.component3(): List<ShortDynamicLink.Warning> = warnings
+
+/**
+ * Destructuring declaration for [PendingDynamicLinkData] to provide link.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun PendingDynamicLinkData.component1() = link
+
+/**
+ * Destructuring declaration for [PendingDynamicLinkData] to provide minimumAppVersion.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun PendingDynamicLinkData.component2() = minimumAppVersion
+
+/**
+ * Destructuring declaration for [PendingDynamicLinkData] to provide clickTimestamp.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun PendingDynamicLinkData.component3() = clickTimestamp
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-dynamic-links-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+@Keep
+class FirebaseDynamicLinksKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-dynamic-links/src/test/AndroidManifest.xml b/firebase-dynamic-links/src/test/AndroidManifest.xml
index a657b9865c3..7b16095e97c 100644
--- a/firebase-dynamic-links/src/test/AndroidManifest.xml
+++ b/firebase-dynamic-links/src/test/AndroidManifest.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.dynamiclink.test"
           android:versionCode="1"
           android:versionName="1">
 
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 
 
     <application>
diff --git a/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/DynamicLinksTests.kt b/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/DynamicLinksTests.kt
new file mode 100644
index 00000000000..a1b7f84d5a5
--- /dev/null
+++ b/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/DynamicLinksTests.kt
@@ -0,0 +1,278 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.dynamiclinks
+
+import android.net.Uri
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.mock
+import org.mockito.Mockito.`when`
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class DynamicLinksTests : BaseTestCase() {
+
+  @Test
+  fun `Firebase#dynamicLinks should delegate to FirebaseDynamicLinks#getInstance()`() {
+    assertThat(Firebase.dynamicLinks).isSameInstanceAs(FirebaseDynamicLinks.getInstance())
+  }
+
+  @Test
+  fun `Firebase#dynamicLinks should delegate to FirebaseDynamicLinks#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.dynamicLinks(app)).isSameInstanceAs(FirebaseDynamicLinks.getInstance(app))
+  }
+
+  @Test
+  fun `Firebase#dynamicLinks#createDynamicLink`() {
+    val exampleLink = "https://example.com"
+    val exampleDomainUriPrefix = "https://example.page.link"
+
+    val dynamicLinkKtx =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse(exampleLink)
+        domainUriPrefix = exampleDomainUriPrefix
+      }
+
+    val dynamicLink =
+      FirebaseDynamicLinks.getInstance()
+        .createDynamicLink()
+        .setLink(Uri.parse(exampleLink))
+        .setDomainUriPrefix(exampleDomainUriPrefix)
+        .buildDynamicLink()
+
+    assertThat(dynamicLinkKtx.uri).isEqualTo(dynamicLink.uri)
+  }
+
+  @Test
+  fun `androidParameters type-safe builder extension works`() {
+    val fallbackLink = "https://android.com"
+    val minVersion = 19
+    val packageName = "com.example.android"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        androidParameters {
+          minimumVersion = minVersion
+          fallbackUrl = Uri.parse(fallbackLink)
+        }
+      }
+
+    val anotherDynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        androidParameters(packageName) {
+          minimumVersion = minVersion
+          fallbackUrl = Uri.parse(fallbackLink)
+        }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("amv")?.toInt()).isEqualTo(minVersion)
+    assertThat(dynamicLink.uri.getQueryParameter("afl")).isEqualTo(fallbackLink)
+
+    assertThat(anotherDynamicLink.uri.getQueryParameter("amv")?.toInt()).isEqualTo(minVersion)
+    assertThat(anotherDynamicLink.uri.getQueryParameter("afl")).isEqualTo(fallbackLink)
+    assertThat(anotherDynamicLink.uri.getQueryParameter("apn")).isEqualTo(packageName)
+  }
+
+  @Test
+  fun `iosParameters type-safe builder extension works`() {
+    val iosAppStoreId = "123456789"
+    val iosMinimumVersion = "1.0.1"
+    val iosBundleId = "com.example.ios"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        iosParameters(iosBundleId) {
+          appStoreId = iosAppStoreId
+          minimumVersion = iosMinimumVersion
+        }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("ibi")).isEqualTo(iosBundleId)
+    assertThat(dynamicLink.uri.getQueryParameter("imv")).isEqualTo(iosMinimumVersion)
+    assertThat(dynamicLink.uri.getQueryParameter("isi")).isEqualTo(iosAppStoreId)
+  }
+
+  @Test
+  fun `googleAnalyticsParameters type-safe builder extension works`() {
+    val campaignTerm = "Example Term"
+    val campaignContent = "Example Content"
+    val campaignSource = "Twitter"
+    val campaignMedium = "Social"
+    val campaignName = "Example Promo"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        googleAnalyticsParameters(campaignSource, campaignMedium, campaignName) {
+          term = campaignTerm
+          content = campaignContent
+        }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("utm_content")).isEqualTo(campaignContent)
+    assertThat(dynamicLink.uri.getQueryParameter("utm_term")).isEqualTo(campaignTerm)
+    assertThat(dynamicLink.uri.getQueryParameter("utm_source")).isEqualTo(campaignSource)
+    assertThat(dynamicLink.uri.getQueryParameter("utm_medium")).isEqualTo(campaignMedium)
+    assertThat(dynamicLink.uri.getQueryParameter("utm_campaign")).isEqualTo(campaignName)
+  }
+
+  @Test
+  fun `itunesConnectAnalyticsParameters type-safe builder extension works`() {
+    val ct = "example-campaign"
+    val pt = "123456"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        itunesConnectAnalyticsParameters {
+          providerToken = pt
+          campaignToken = ct
+        }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("pt")).isEqualTo(pt)
+    assertThat(dynamicLink.uri.getQueryParameter("ct")).isEqualTo(ct)
+  }
+
+  @Test
+  fun `socialMetaTagParameters type-safe builder extension works`() {
+    val socialTitle = "Example Title"
+    val socialDescription = "This link works whether the app is installed or not!"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        socialMetaTagParameters {
+          title = socialTitle
+          description = socialDescription
+        }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("st")).isEqualTo(socialTitle)
+    assertThat(dynamicLink.uri.getQueryParameter("sd")).isEqualTo(socialDescription)
+  }
+
+  @Test
+  fun `navigationInfoParameters type-safe builder extension works`() {
+    val forcedRedirect = true
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        navigationInfoParameters { forcedRedirectEnabled = true }
+      }
+
+    val efr = Integer.parseInt(dynamicLink.uri.getQueryParameter("efr")!!) == 1
+    assertThat(efr).isEqualTo(forcedRedirect)
+  }
+
+  @Test
+  fun `ShortDynamicLink destructure declaration works`() {
+    val fakeWarning =
+      object : ShortDynamicLink.Warning {
+        override fun getMessage() = "Warning"
+        override fun getCode() = "warning"
+      }
+
+    val expectedShortLink = Uri.parse("https://example.com")
+    val expectedPreviewLink = Uri.parse("https://example.com/preview")
+    val expectedWarnings = mutableListOf<ShortDynamicLink.Warning>(fakeWarning)
+
+    val mockShortDynamicLink = mock(ShortDynamicLink::class.java)
+    `when`(mockShortDynamicLink.shortLink).thenReturn(expectedShortLink)
+    `when`(mockShortDynamicLink.previewLink).thenReturn(expectedPreviewLink)
+    `when`(mockShortDynamicLink.warnings).thenReturn(expectedWarnings)
+
+    val (shortLink, previewLink, warnings) = mockShortDynamicLink
+
+    assertThat(shortLink).isEqualTo(expectedShortLink)
+    assertThat(previewLink).isEqualTo(expectedPreviewLink)
+    assertThat(warnings).isEqualTo(expectedWarnings)
+  }
+
+  @Test
+  fun `PendingDynamicLinkData destructure declaration works`() {
+    val expectedLink = Uri.parse("https://example.com")
+    val expectedMinAppVersion = 30
+    val expectedTimestamp = 172947600L
+
+    val mockPendingData = mock(PendingDynamicLinkData::class.java)
+    `when`(mockPendingData.link).thenReturn(expectedLink)
+    `when`(mockPendingData.minimumAppVersion).thenReturn(expectedMinAppVersion)
+    `when`(mockPendingData.clickTimestamp).thenReturn(expectedTimestamp)
+
+    val (link, minAppVersion, timestamp) = mockPendingData
+
+    assertThat(link).isEqualTo(expectedLink)
+    assertThat(minAppVersion).isEqualTo(expectedMinAppVersion)
+    assertThat(timestamp).isEqualTo(expectedTimestamp)
+  }
+}
diff --git a/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/ktx/DynamicLinksTests.kt b/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/ktx/DynamicLinksTests.kt
new file mode 100644
index 00000000000..48531d72990
--- /dev/null
+++ b/firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/ktx/DynamicLinksTests.kt
@@ -0,0 +1,281 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.dynamiclinks.ktx
+
+import android.net.Uri
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.dynamiclinks.FirebaseDynamicLinks
+import com.google.firebase.dynamiclinks.PendingDynamicLinkData
+import com.google.firebase.dynamiclinks.ShortDynamicLink
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.mock
+import org.mockito.Mockito.`when`
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class DynamicLinksTests : BaseTestCase() {
+
+  @Test
+  fun `Firebase#dynamicLinks should delegate to FirebaseDynamicLinks#getInstance()`() {
+    assertThat(Firebase.dynamicLinks).isSameInstanceAs(FirebaseDynamicLinks.getInstance())
+  }
+
+  @Test
+  fun `Firebase#dynamicLinks should delegate to FirebaseDynamicLinks#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.dynamicLinks(app)).isSameInstanceAs(FirebaseDynamicLinks.getInstance(app))
+  }
+
+  @Test
+  fun `Firebase#dynamicLinks#createDynamicLink`() {
+    val exampleLink = "https://example.com"
+    val exampleDomainUriPrefix = "https://example.page.link"
+
+    val dynamicLinkKtx =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse(exampleLink)
+        domainUriPrefix = exampleDomainUriPrefix
+      }
+
+    val dynamicLink =
+      FirebaseDynamicLinks.getInstance()
+        .createDynamicLink()
+        .setLink(Uri.parse(exampleLink))
+        .setDomainUriPrefix(exampleDomainUriPrefix)
+        .buildDynamicLink()
+
+    assertThat(dynamicLinkKtx.uri).isEqualTo(dynamicLink.uri)
+  }
+
+  @Test
+  fun `androidParameters type-safe builder extension works`() {
+    val fallbackLink = "https://android.com"
+    val minVersion = 19
+    val packageName = "com.example.android"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        androidParameters {
+          minimumVersion = minVersion
+          fallbackUrl = Uri.parse(fallbackLink)
+        }
+      }
+
+    val anotherDynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        androidParameters(packageName) {
+          minimumVersion = minVersion
+          fallbackUrl = Uri.parse(fallbackLink)
+        }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("amv")?.toInt()).isEqualTo(minVersion)
+    assertThat(dynamicLink.uri.getQueryParameter("afl")).isEqualTo(fallbackLink)
+
+    assertThat(anotherDynamicLink.uri.getQueryParameter("amv")?.toInt()).isEqualTo(minVersion)
+    assertThat(anotherDynamicLink.uri.getQueryParameter("afl")).isEqualTo(fallbackLink)
+    assertThat(anotherDynamicLink.uri.getQueryParameter("apn")).isEqualTo(packageName)
+  }
+
+  @Test
+  fun `iosParameters type-safe builder extension works`() {
+    val iosAppStoreId = "123456789"
+    val iosMinimumVersion = "1.0.1"
+    val iosBundleId = "com.example.ios"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        iosParameters(iosBundleId) {
+          appStoreId = iosAppStoreId
+          minimumVersion = iosMinimumVersion
+        }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("ibi")).isEqualTo(iosBundleId)
+    assertThat(dynamicLink.uri.getQueryParameter("imv")).isEqualTo(iosMinimumVersion)
+    assertThat(dynamicLink.uri.getQueryParameter("isi")).isEqualTo(iosAppStoreId)
+  }
+
+  @Test
+  fun `googleAnalyticsParameters type-safe builder extension works`() {
+    val campaignTerm = "Example Term"
+    val campaignContent = "Example Content"
+    val campaignSource = "Twitter"
+    val campaignMedium = "Social"
+    val campaignName = "Example Promo"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        googleAnalyticsParameters(campaignSource, campaignMedium, campaignName) {
+          term = campaignTerm
+          content = campaignContent
+        }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("utm_content")).isEqualTo(campaignContent)
+    assertThat(dynamicLink.uri.getQueryParameter("utm_term")).isEqualTo(campaignTerm)
+    assertThat(dynamicLink.uri.getQueryParameter("utm_source")).isEqualTo(campaignSource)
+    assertThat(dynamicLink.uri.getQueryParameter("utm_medium")).isEqualTo(campaignMedium)
+    assertThat(dynamicLink.uri.getQueryParameter("utm_campaign")).isEqualTo(campaignName)
+  }
+
+  @Test
+  fun `itunesConnectAnalyticsParameters type-safe builder extension works`() {
+    val ct = "example-campaign"
+    val pt = "123456"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        itunesConnectAnalyticsParameters {
+          providerToken = pt
+          campaignToken = ct
+        }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("pt")).isEqualTo(pt)
+    assertThat(dynamicLink.uri.getQueryParameter("ct")).isEqualTo(ct)
+  }
+
+  @Test
+  fun `socialMetaTagParameters type-safe builder extension works`() {
+    val socialTitle = "Example Title"
+    val socialDescription = "This link works whether the app is installed or not!"
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        socialMetaTagParameters {
+          title = socialTitle
+          description = socialDescription
+        }
+      }
+
+    assertThat(dynamicLink.uri.getQueryParameter("st")).isEqualTo(socialTitle)
+    assertThat(dynamicLink.uri.getQueryParameter("sd")).isEqualTo(socialDescription)
+  }
+
+  @Test
+  fun `navigationInfoParameters type-safe builder extension works`() {
+    val forcedRedirect = true
+
+    val dynamicLink =
+      Firebase.dynamicLinks.dynamicLink {
+        link = Uri.parse("https://example.com")
+        domainUriPrefix = "https://example.page.link"
+        navigationInfoParameters { forcedRedirectEnabled = true }
+      }
+
+    val efr = Integer.parseInt(dynamicLink.uri.getQueryParameter("efr")!!) == 1
+    assertThat(efr).isEqualTo(forcedRedirect)
+  }
+
+  @Test
+  fun `ShortDynamicLink destructure declaration works`() {
+    val fakeWarning =
+      object : ShortDynamicLink.Warning {
+        override fun getMessage() = "Warning"
+        override fun getCode() = "warning"
+      }
+
+    val expectedShortLink = Uri.parse("https://example.com")
+    val expectedPreviewLink = Uri.parse("https://example.com/preview")
+    val expectedWarnings = mutableListOf<ShortDynamicLink.Warning>(fakeWarning)
+
+    val mockShortDynamicLink = mock(ShortDynamicLink::class.java)
+    `when`(mockShortDynamicLink.shortLink).thenReturn(expectedShortLink)
+    `when`(mockShortDynamicLink.previewLink).thenReturn(expectedPreviewLink)
+    `when`(mockShortDynamicLink.warnings).thenReturn(expectedWarnings)
+
+    val (shortLink, previewLink, warnings) = mockShortDynamicLink
+
+    assertThat(shortLink).isEqualTo(expectedShortLink)
+    assertThat(previewLink).isEqualTo(expectedPreviewLink)
+    assertThat(warnings).isEqualTo(expectedWarnings)
+  }
+
+  @Test
+  fun `PendingDynamicLinkData destructure declaration works`() {
+    val expectedLink = Uri.parse("https://example.com")
+    val expectedMinAppVersion = 30
+    val expectedTimestamp = 172947600L
+
+    val mockPendingData = mock(PendingDynamicLinkData::class.java)
+    `when`(mockPendingData.link).thenReturn(expectedLink)
+    `when`(mockPendingData.minimumAppVersion).thenReturn(expectedMinAppVersion)
+    `when`(mockPendingData.clickTimestamp).thenReturn(expectedTimestamp)
+
+    val (link, minAppVersion, timestamp) = mockPendingData
+
+    assertThat(link).isEqualTo(expectedLink)
+    assertThat(minAppVersion).isEqualTo(expectedMinAppVersion)
+    assertThat(timestamp).isEqualTo(expectedTimestamp)
+  }
+}
diff --git a/firebase-firestore/CHANGELOG.md b/firebase-firestore/CHANGELOG.md
index ada20aa7670..cf3d3772d64 100644
--- a/firebase-firestore/CHANGELOG.md
+++ b/firebase-firestore/CHANGELOG.md
@@ -1,329 +1,921 @@
-Android changes are not released automatically. Ensure that changes are released 
-by opting into a release at 
-[go/firebase-android-release](http:go/firebase-android-release) (Googlers only).
+# Unreleased
+
+
+# 25.0.0
+* [feature] Enable queries with range & inequality filters on multiple fields. [#5729](//github.com/firebase/firebase-android-sdk/pull/5729)
+* [changed] Internal improvements.
+* [feature] Support conversion between `java.time.Instant` and `Timestamp` [#5853](//github.com/firebase/firebase-android-sdk/pull/5853)
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.11.0
+* [feature] Enable snapshot listener option to retrieve data from local cache only. [#5690](//github.com/firebase/firebase-android-sdk/pull/5690)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.10.3
+* [fixed] Fixed the missing handling setter annotations bug introduced by [#5626](//github.com/firebase/firebase-android-sdk/pull/5626). [#5706](//github.com/firebase/firebase-android-sdk/pull/5706)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.10.2
+* [changed] Internal test improvements.
+* [fixed] Fixed the `@Exclude` annotation doesn't been propagated to Kotlin's corresponding bridge methods. [#5626](//github.com/firebase/firebase-android-sdk/pull/5626)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.10.1
+* [fixed] Fixed an issue caused by calling mutation on immutable map object. [#5573](//github.com/firebase/firebase-android-sdk/pull/5573)
+* [fixed] Fixed an issue in the local cache synchronization logic where all locally-cached documents that matched a resumed query would be unnecessarily re-downloaded; with the fix it now only downloads the documents that are known to be out-of-sync. [#5506](//github.com/firebase/firebase-android-sdk/pull/5506)
+* [fixed] Fixed an issue where GC runs into a infinite loop in a certain case. [#5417](https://github.com/firebase/firebase-android-sdk/issues/5417)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.10.0
+* [fixed] Fixed the `DocumentSnapshot` equals method to not consider internal state when comparing snapshots.
+
+# 24.9.1
+* [feature] Expose Sum/Average aggregate query support in API. [#5217](//github.com/firebase/firebase-android-sdk/pull/5217)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.9.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-firestore-ktx`
+  to `com.google.firebase:firebase-firestore` under the `com.google.firebase.firestore` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-firestore-ktx` have been added to
+  `com.google.firebase:firebase-firestore` under the `com.google.firebase.firestore` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-firestore-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.8.1
+* [fixed] Disabled `GradleMetadataPublishing` to fix breakage of the Kotlin extensions library. [#5337]
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.8.0
+* [feature] Added the option to allow the SDK to create cache indexes automatically to
+  improve query execution locally. See
+  [`db.getPersistentCacheIndexManager().enableIndexAutoCreation()`](/docs/reference/android/com/google/firebase/firestore/PersistentCacheIndexManager#enableIndexAutoCreation())
+  ([GitHub [#4987](//github.com/firebase/firebase-android-sdk/pull/4987){: .external}).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.7.1
+* [fixed] Implement equals method on Filter class. [#5210](//github.com/firebase/firebase-android-sdk/issues/5210)
+
+# 24.7.0
+* [feature] Expose MultiDb support in API. [#4015](//github.com/firebase/firebase-android-sdk/issues/4015)
+* [fixed] Fixed a thread interference issue that may lead to a ConcurrentModificationException.
+  (GitHub [#5091](//github.com/firebase/firebase-android-sdk/issues/5091){: .external})
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.6.1
+* [feature] Implemented an optimization in the local cache synchronization logic that reduces the number of billed document reads when documents were deleted on the server while the client was not actively listening to the query (e.g. while the client was offline). (GitHub [#4982](//github.com/firebase/firebase-android-sdk/pull/4982){: .external})
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.6.0
+* [fixed] Fixed stack overflow caused by deeply nested server timestamps.
+  (GitHub [#4702](//github.com/firebase/firebase-android-sdk/issues/4702){: .external})
+* [feature] Added new
+  [cache config APIs](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestoreSettings.Builder#setLocalCacheSettings(com.google.firebase.firestore.LocalCacheSettings))
+  to customize the SDK's cache setup.
+* [feature] Added
+  [LRU garbage collector](/docs/reference/android/com/google/firebase/firestore/MemoryLruGcSettings)
+  to the SDK's memory cache.
+* [deprecated] Deprecated the following APIs from
+  [`FirebaseFirestoreSettings`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestoreSettings):<br>
+  `isPersistenceEnabled` and `getCacheSizeBytes`.
+* [deprecated] Deprecated the following APIs from
+  [`FirebaseFirestoreSettings.Builder`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestoreSettings.Builder#setLocalCacheSettings(com.google.firebase.firestore.LocalCacheSettings)):<br>
+  `isPersistenceEnabled`, `getCacheSizeBytes`, `setPersistenceEnabled`,
+  and `setCacheSizeBytes`.
+* [changed] Internal changes to ensure alignment with other SDK releases.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.5.0
+* [fixed] Fixed stack overflow caused by deeply nested server timestamps.
+  (GitHub [#4702](//github.com/firebase/firebase-android-sdk/issues/4702){: .external})
+
+
+## Kotlin
+* [feature] Added
+  [`Query.dataObjects<T>()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#dataObjects)
+  and
+  [`DocumentReference.dataObjects<T>()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#dataObjects_1)
+  Kotlin Flows to listen for realtime updates and convert its values to a
+  specific type.
+
+# 24.4.5
+* [feature] Added support for disjunctions in queries (`OR` queries).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.4.4
+* [changed] Relaxed certain query validations performed by the SDK
+  ([GitHub Issue #4231](//github.com/firebase/firebase-android-sdk/issues/4231)).
+* [changed] Updated gRPC to 1.52.1, and updated JavaLite, protoc, and
+  protobuf-java-util to 3.21.11.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.4.3
+* [fixed] Fixed a potential high-memory usage issue.
+* [fixed] Fixed an issue that stopped some performance optimization from being
+  applied.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.4.2
+* [fixed] Fixed an issue that stopped some performance optimization from being
+  applied.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.4.1
+* [fixed] Fix `FAILED_PRECONDITION` when writing to a deleted document in a
+  transaction.
+  (#5871)
+* [fixed] Fixed [firestore] failing to raise initial snapshot from an empty
+  local cache result.
+  (#4207)
+* [fixed] Removed invalid suggestions to use `GenericTypeIndicator` from
+  error messages.
+  (#222)
+* [changed] Updated dependency of `io.grpc.*` to its latest version
+  (v1.50.2).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.4.0
+* [feature] Added
+  [`Query.count()`](/docs/reference/android/com/google/firebase/firestore/Query#count()),
+  which fetches the number of documents in the result set without actually
+  downloading the documents.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+  `firebase-firestore` library. The Kotlin extensions library has the following
+  additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-firestore-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+
+# 24.3.1
+* [changed] Updated dependency of `io.grpc.*` to its latest
+  version (v1.48.1).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library.
+
+# 24.3.0
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library also has the
+following additional updates:
+
+* [feature] Added
+  [`Query.snapshots()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#snapshots_1)
+  and
+  [`DocumentReference.snapshots()`](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary#snapshots)
+  Kotlin Flows to listen for realtime updates.
+
+# 24.2.2
+* [fixed] Fixed an issue in `waitForPendingWrites()` that could lead to a
+  `NullPointerException`.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.2.1
+* [changed] Internal refactor and test improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.2.0
+* [feature] Added customization support for
+  [`FirebaseFirestore.runTransaction`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestore#runTransaction(com.google.firebase.firestore.Transaction.Function%3CTResult%3E)).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.1.2
+* [fixed] Fixed an issue where patching multiple fields shadows each other.
+  (#3528).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.1.1
+* [fixed] Fixed an issue in the beta version of the index engine that might
+  cause [firestore] to exclude document results for limit queries with local
+  modifications.
+* [changed] [firestore] can now serialize objects with `android.net.Uri`s.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.1.0
+* [feature] Added beta support for indexed query execution. You can
+  enable indexes by invoking `FirebaseFirestore.setIndexConfiguration()` with
+  the JSON index definition exported by the [firebase_cli]. Queries against
+  the cache are executed using an index once the asynchronous index generation
+  completes.
+* [fixed] Fixed missing document fields issue with offline overlays.
+  (#3528).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 24.0.2
-- [fixed] Fixed an issue of long grpc reconnection period, when App moves to
-  foreground after staying in background for a while.
-- [fixed] Fixed an AppCheck issue that caused Firestore listeners to stop
-  working and receive a "Permission Denied" error. This issue only occurred for
-  AppCheck users that set their expiration time to under an hour.
-- [fixed] Fixed a potential problem during Firestore's shutdown that prevented 
-  the shutdown from proceeding if a network connection was opened right before.
-- [changed] Queries are now send to the backend before the SDK starts local 
-  processing, which reduces overall Query latency.
-- [fixed] Fixed a NPE issue where mutations with multiple documents are not
-  handled correctly during previous mutation acknowledgement(#3490).
+* [fixed] Fixed a [firebase_app_check] issue that caused [firestore]
+  listeners to stop working and receive a `Permission Denied` error. This issue
+  only occurred if the [app_check] expiration time was set to under an hour.
+* [fixed] Fixed a potential problem during the shutdown of [firestore] that
+  prevented the shutdown from proceeding if a network connection was opened
+  right before.
+* [fixed] Fixed an NPE issue where mutations with multiple documents were not
+  handled correctly during previous mutation acknowledgement.
+  (#3490).
+* [changed] Queries are now sent to the backend before the SDK starts local
+  processing, which reduces overall query latency.
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 24.0.1
-- [changed] Improved performance for databases that contain many document
-  updates that have not yet been synced with the backend.
-- [changed] Improved performance for queries against collections that contain
+* [changed] Optimized performance for offline usage.
+* [changed] Optimized performance for queries with collections that contain
   subcollections.
-- [fixed] Fixed an issue that can result in incomplete Query snapshots when an
-  app is backgrounded during query execution.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 24.0.0
-- [feature] Added support for Firebase AppCheck.
+* [changed] This SDK now requires devices and emulators to target API level
+  19 (KitKat) or higher and to use Android 4.4 or higher. This is due to an
+  update in its gRPC dependency version and to align with requirements of other
+  Firebase libraries.
+* [feature] Added support for [firebase_app_check].
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 23.0.4
-- [fixed] Fixed an issue where some fields were missed when copying in the
+* [fixed] Fixed an issue where some fields were missed when copying in the
   `FirebaseFirestoreSettings.Builder` copy constructor.
 
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
 # 23.0.3
-- [fixed] Fixed an issue when loading a data bundle with
-  multi-byte Unicode characters leads to failures.
+* [fixed] Fixed an issue that was causing failures when a data bundle with
+  multi-byte Unicode characters was loaded.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 23.0.2
-- [changed] Increases the aggressiveness of network retries when an app's
-  foreground status changes.
+* [changed] Improved Firestore's network condition detection.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 23.0.1
-- [changed] The SDK now tries to immediately establish a connection to the
+* [changed] The SDK now tries to immediately establish a connection to the
   backend when the app enters the foreground.
-  
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
 # 23.0.0
- - [changed] Internal infrastructure improvements.
- - [changed] Internal changes to support dynamic feature modules.
+* [changed] Internal infrastructure improvements.
+* [changed] Internal changes to support dynamic feature modules.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 22.1.2
+* [changed] Internal changes in preparation for future support of
+  dynamic feature modules.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 22.1.1
-- [fixed] Fixed an issue that dropped the limit for queries loaded from
-  Bundles that were generated by the NodeJS SDK.
-- [fixed] Fixed a Firestore bug where local cache inconsistencies were
-  unnecessarily being resolved, causing the `Task` objects returned from `get()`
-  invocations to never complete (#2404).
+* [fixed] Fixed an issue that dropped the limit for queries loaded from
+  [firestore] bundles that were generated by the NodeJS SDK.
+* [fixed] Fixed a bug where local cache inconsistencies were unnecessarily
+  being resolved, causing the `Task` objects returned from `get()`
+  invocations to never complete.
+  #2404
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 22.1.0
-- [feature] Added support for Firestore Bundles via
-  `FirebaseFirestore.loadBundle()` and `FirebaseFirestore.getNamedQuery()`.
-  Bundles contain pre-packaged data produced with the NodeJS Server SDK and
-  can be used to populate Firestore's cache without reading documents from
-  the backend.
-
-# (22.0.2)
-- [changed] A write to a document that contains FieldValue transforms is no
-  longer split up into two separate operations. This reduces the number of
-  writes the backend performs and allows each WriteBatch to hold 500 writes
-  regardless of how many FieldValue transformations are attached.
-
-# (22.0.1)
-- [fixed] Removed excess validation of null and NaN values in query filters.
-  This more closely aligns the SDK with the Firestore backend, which has always
-  accepted null and NaN for all operators, even though this isn't necessarily
-  useful.
-
-# (22.0.0)
-- [changed] Removed the deprecated `timestampsInSnapshotsEnabled` setting.
-  Any timestamps in Firestore documents are now returned as `Timestamps`. To
-  convert `Timestamp` classed to `java.util.Date`, use `Timestamp.toDate()`.
-
-# 21.6.1
-- [changed] Added new internal HTTP headers to the gRPC connection.
+* [feature] Added support for [firestore] bundles via
+  [`FirebaseFirestore.loadBundle()`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestore#loadBundle(java.nio.ByteBuffer))
+  and
+  [`FirebaseFirestore.getNamedQuery()`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestore#getNamedQuery(java.lang.String)).
+  Bundles contain pre-packaged data produced with the Firebase Admin Node.js SDK
+  and can be used to populate the cache for [firestore] without the need to
+  read documents from the backend.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 22.0.2
+* [changed] A write to a document that contains `FieldValue` transforms is no
+  longer split into two separate operations. This reduces the number of writes
+  that the backend performs and allows each `WriteBatch` to hold 500 writes
+  regardless of how many `FieldValue` transformations are attached.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 22.0.1
+* [changed] Removed excess validation of null and NaN values in query filters.
+  This more closely aligns the SDK with the [firestore] backend, which has
+  always accepted null and NaN for all operators.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 22.0.0
+* [changed] Removed the deprecated `timestampsInSnapshotsEnabled` setting.
+  Any timestamp in a [firestore] document is now returned as a `Timestamp`. To
+  convert `Timestamp` classes to `java.util.Date`, use
+  [`Timestamp.toDate()`](/docs/reference/android/com/google/firebase/Timestamp#toDate()).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.7.1
+* [changed] Added new internal HTTP headers to the gRPC connection.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.7.0
+* [feature] Added
+  [`Query.whereNotIn()`](/docs/reference/android/com/google/firebase/firestore/Query#whereNotIn(java.lang.String,%20java.util.List<?%20extends%20java.lang.Object>))
+  and
+  [`Query.whereNotEqualTo()`](/docs/reference/android/com/google/firebase/firestore/Query#whereNotEqualTo(java.lang.String,%20java.lang.Object))
+  query operators.
+
+  * `Query.whereNotIn()` finds documents where a specified field's value is
+    not in a specified array.
+  * `Query.whereNotEqualTo()` finds documents where a specified field's value
+    does not equal the specified value.
+
+  Neither query operator finds documents where the specified field isn't
+  present.
+* [fixed] Fixed an issue that caused poor performance for queries that
+  filtered results using nested array values.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 21.6.0
-- [fixed] Removed a delay that may have prevented Firestore from immediately
-  reestablishing a network connection if a connectivity change occurred while
-  the app was in the background.
-- [fixed] Fixed an issue that may have prevented the client from connecting
+* [fixed] Removed a delay that may have prevented [firestore] from
+  immediately reestablishing a network connection if a connectivity change
+  occurred while the app was in the background.
+* [fixed] Fixed an issue that may have prevented the client from connecting
   to the backend immediately after a user signed in.
-- [feature] Cloud Firestore now supports connecting to a local emulator via
- `FirebaseFirestore#useEmulator()`
-- [feature] Added `Query.whereNotIn()` and `Query.whereNotEqualTo()` query
-  operators. `Query.whereNotIn()` finds documents where a specified field’s
-  value is not in a specified array. `Query.whereNotEqualTo()` finds
-  documents where a specified field's value does not equal the specified value.
-  Neither query operator will match documents where the specified field is not
-  present.
+* [feature] Added support for connecting to the Firebase Emulator Suite via
+  a new method,
+  [`FirebaseFirestore#useEmulator()`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestore#useEmulator(java.lang.String,%20int)).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.5.0
+* [changed] Updated the protocol buffer dependency to the newer
+  `protobuf-javalite` artifact. The new artifact is incompatible with the old
+  one, so this library needed to be upgraded to avoid conflicts.
+  No developer action is necessary.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 21.4.3
-- [changed] Firestore now limits the number of concurrent document lookups it
-  will perform when resolving inconsistencies in the local cache (#1374).
+* [changed] [firestore] now limits the number of concurrent document lookups
+  it will perform when resolving inconsistencies in the local cache.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 21.4.2
-- [changed] Removed Guava dependency from the SDK. This change is the first
+* [changed] Removed Guava dependency from the SDK. This change is the first
   step in eliminating crashes caused by apps that depend on the wrong flavor of
-  Guava (#1125).
+  Guava. ([Issue #1125](//github.com/firebase/firebase-android-sdk/issues/1125))
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 21.4.1
-- [fixed] Fixed a performance regression introduced by the addition of
-  `Query.limitToLast(n: long)` in Firestore 23.3.1.
-- [changed] Changed the in-memory representation of Firestore documents to
-  reduce memory allocations and improve performance. Calls to 
+* [fixed] Fixed a performance regression introduced by the addition of
+  `Query.limitToLast(n: long)` in [firestore] v21.3.1.
+* [changed] Changed the in-memory representation of [firestore] documents to
+  reduce memory allocations and improve performance. Calls to
   `DocumentSnapshot.getData()` and `DocumentSnapshot.toObject()` will see
   the biggest improvement.
 
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
 # 21.4.0
-- [feature] Firestore previously required that every document read in a
+* [feature] Cloud Firestore previously required that every document read in a
   transaction must also be written. This requirement has been removed, and
   you can now read a document in a transaction without writing to it.
-- [changed] Firestore now recovers more quickly once connections suffering
-  packet loss return to normal. 
+* [changed] Cloud Firestore now recovers more quickly when connections
+  suffering packet loss return to normal.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 21.3.1
-- [feature] Added `Query.limitToLast(n: long)`, which returns the last `n`
+* [feature] Added `Query.limitToLast(n: long)`, which returns the last `n`
   documents as the result.
 
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
 # 21.3.0
-- [feature] Added `Query.whereIn()` and `Query.whereArrayContainsAny()` query
+* [feature] Added `Query.whereIn()` and `Query.whereArrayContainsAny()` query
   operators. `Query.whereIn()` finds documents where a specified field’s value
   is IN a specified array. `Query.whereArrayContainsAny()` finds documents
   where a specified field is an array and contains ANY element of a specified
   array.
-- [changed] Improved the performance of repeatedly executed queries. Recently
+* [changed] Improved the performance of repeatedly executed queries. Recently
   executed queries should see dramatic improvements. This benefit is reduced
   if changes accumulate while the query is inactive. Queries that use the
   `limit()` API may not always benefit, depending on the accumulated changes.
 
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
 # 21.2.1
-- [fixed] Fixed an issue where Android API level 19 and earlier devices would
-  crash when unable to connect to Firestore (#904).
-- [fixed] Fixed a race condition in Documents where access to getData and
-  getField on the same document in different threads could cause a
-  NullPointerException.
-- [fixed] Fix a race condition that could cause a `NullPointerException` during
-  client initialization.
+* [fixed] Fixed an issue where devices targeting Android API level 19 or
+  earlier would crash when they were unable to connect to [firestore].
+* [fixed] Fixed a race condition in Documents where access to `getData` and
+  `getField` on the same document in different threads could cause a
+  `NullPointerException`.
+* [fixed] Fixed a race condition that could cause a `NullPointerException`
+  during client initialization.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 21.2.0
-- [feature] Added an `addSnapshotsInSyncListener()` method to 
-  `FirebaseFirestore`that notifies you when all your snapshot listeners are
+* [feature] Added an [`addSnapshotsInSyncListener()`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestore#addSnapshotsInSyncListener(java.lang.Runnable)) method to
+  `FirebaseFirestore` that notifies you when all your snapshot listeners are
   in sync with each other.
 
-# 21.1.2
-- [fixed] Fixed a crash that could occur when a large number of documents were
-  removed during garbage collection of the persistence cache.
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 21.1.1
-- [fixed] Addressed a regression in 21.1.0 that caused the crash: "Cannot add
+* [fixed] Addressed a regression in v21.1.0 that caused the crash: "Cannot add
   document to the RemoteDocumentCache with a read time of zero".
 
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
 # 21.1.0
-- [feature] Added a `terminate()` method to `FirebaseFirestore` which
-  terminates the instance, releasing any held resources. Once it completes, you
-  can optionally call `clearPersistence()` to wipe persisted Firestore data from
-  disk.
-- [feature] Added a `waitForPendingWrites()` method to `FirebaseFirestore`
-  which allows users to wait on a promise that resolves when all pending writes
-  are acknowledged by the Firestore backend.
-- [changed] Transactions now perform exponential backoff before retrying. This
-  means transactions on highly contended documents are more likely to succeed.
+Warning: We have received reports that this **v21.1.0 release** of the Firebase
+Android SDK for [firestore] can trigger an uncaught exception. Make sure to
+update to the next version of the Cloud Firestore SDK to get the fix.
+
+* [feature] Added a
+  [`FirebaseFirestore.terminate()`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestore#terminate())
+  method which terminates the instance, releasing any held resources. Once it
+  completes, you can optionally call `clearPersistence()` to wipe persisted
+  [firestore] data from disk.
+* [feature] Added a
+  [`FirebaseFirestore.waitForPendingWrites()`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestore#waitForPendingWrites())
+  method which allows users to wait on a promise that resolves when all pending
+  writes are acknowledged by the [firestore] backend.
+* [changed] Transactions now perform exponential backoff before retrying.
+  This means transactions on highly contended documents are more likely to
+  succeed.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 21.0.0
-- [changed] Transactions are now more flexible. Some sequences of operations
+* [changed] Transactions are now more flexible. Some sequences of operations
   that were previously incorrectly disallowed are now allowed. For example,
   after reading a document that doesn't exist, you can now set it multiple
   times successfully in a transaction.
-- [fixed] Fixed an issue where query results were temporarily missing documents
-  that previously had not matched but had been updated to now match the
-  query (#155).
+* [fixed] Fixed an issue where query results were temporarily missing
+  documents that previously had not matched but had been updated to now match
+  the query. Refer to this
+  [GitHub issue](https://github.com/firebase/firebase-android-sdk/issues/155)
+  for more details.
+* [changed] Added nullability annotations to improve the Kotlin developer
+  experience.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 20.2.0
-- [feature] Added a `@DocumentId` annotation which can be used on a
+* [feature] Added a `@DocumentId` annotation which can be used on a
   `DocumentReference` or `String` property in a POJO to indicate that the SDK
   should automatically populate it with the document's ID.
-- [fixed] Fixed an internal assertion that was triggered when an update
-  with a `FieldValue.serverTimestamp()` and an update with a
-  `FieldValue.increment()` were pending for the same document (#491).
-- [changed] Improved performance of queries with large result sets.
-- [changed] Improved performance for queries with filters that only return a
+* [fixed] Fixed an internal assertion that was triggered when an update with
+  a `FieldValue.serverTimestamp()` and an update with a
+  `FieldValue.increment()` were pending for the same document. Refer to this
+  [GitHub issue](https://github.com/firebase/firebase-android-sdk/issues/491)
+  for more details.
+* [changed] Improved performance of queries with large result sets.
+* [changed] Improved performance for queries with filters that only return a
   small subset of the documents in a collection.
-- [changed] Instead of failing silently, Firestore now crashes the client app
-  if it fails to load SSL Ciphers. To avoid these crashes, you must bundle 
+* [changed] Instead of failing silently, [firestore] now crashes the client
+  app if it fails to load SSL Ciphers. To avoid these crashes, you must bundle
   Conscrypt to support non-GMSCore devices on Android API level 19 (KitKat) or
   earlier (for more information, refer to
-  https://github.com/grpc/grpc-java/blob/master/SECURITY.md#tls-on-android).
-- [changed] Failed transactions now fail with the exception from the last 
-  attempt instead of always failing with an exception with code `ABORTED`.
+  [TLS on Android](https://github.com/grpc/grpc-java/blob/master/SECURITY.md#tls-on-android)).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 20.1.0
-- [changed] SSL and gRPC initialization now happens on a separate thread, which
-  reduces the time taken to produce the first query result.
-- [feature] Added `clearPersistence()`, which clears the persistent storage
+* [changed] SSL and gRPC initialization now happens on a separate thread,
+  which reduces the time taken to produce the first query result.
+* [feature] Added `clearPersistence()`, which clears the persistent storage
   including pending writes and cached documents. This is intended to help
-  write reliable tests (https://github.com/firebase/firebase-js-sdk/issues/449).
+  write reliable tests. Refer to this
+  [GitHub issue](https://github.com/firebase/firebase-js-sdk/issues/449) for
+  more details.
 
-# 20.0.0
-- [changed] Migrated from the Android Support Libraries to the Jetpack
-  (AndroidX) Libraries.
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 19.0.2
-- [fixed] Updated gRPC to 1.21.0. A bug in the prior version would occasionally
-  cause a crash if a network state change occurred concurrently with an RPC.
-  (#428)
+* [fixed] Updated gRPC to 1.21.0. A bug in the prior version would
+  occasionally cause a crash if a network state change occurred concurrently
+  with an RPC. Refer to
+  [GitHub issue #428](https://github.com/firebase/firebase-android-sdk/issues/428)
+  for more details.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 19.0.1
-- [fixed] Fixed an issue that prevented schema migrations for clients with
-  large offline datasets (#370).
+* [fixed] Fixed an issue that prevented schema migrations for clients with
+  large offline datasets. Refer to this
+  [GitHub issue](https://github.com/firebase/firebase-android-sdk/issues/370)
+  for more details.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 19.0.0
-- [feature] You can now query across all collections in your database with a
-  given collection ID using the `FirebaseFirestore.collectionGroup()` method.
-- [changed] The garbage collection process for on-disk persistence that
+* [feature] You can now query across all collections in your database with a
+  given collection ID using the
+  [`FirebaseFirestore.collectionGroup()`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestore#collectionGroup)
+  method.
+* [changed] The garbage collection process for on-disk persistence that
   removes older documents is now enabled by default. The SDK will attempt to
   periodically clean up older, unused documents once the on-disk cache passes a
-  threshold size (default: 100 MB). This threshold can be configured by setting
-  `FirebaseFirestoreSettings.Builder.setCacheSizeBytes`. It must be set to a
-  minimum of 1 MB. The garbage collection process can be disabled entirely by
-  setting `FirebaseFirestoreSettings.setCacheSizeBytes` to
-  `FirebaseFirestoreSettings.CACHE_SIZE_UNLIMITED`.
+  threshold size (default: 100 MB). See
+  [Configure cache size](/docs/firestore/manage-data/enable-offline#configure_cache_size)
+  for details on how to configure this.
+* [changed] Internal changes that rely on an updated API to obtain
+  authentication credentials. If you use [firebase_auth], update to
+  `firebase-auth` v17.0.0 or later to ensure functionality alignment.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
+
+# 18.2.0
+* [unchanged] No changes to the base `firebase-firestore` library.
+
+
+## Kotlin
+* [feature] The beta release of a [firestore] Android library with Kotlin
+  extensions is now available. The Kotlin extensions library transitively
+  includes the base `firebase-firestore` library.  To learn more, visit the
+  [[firestore] KTX documentation](/docs/reference/kotlin/com/google/firebase/firestore/ktx/package-summary).
 
 # 18.2.0
-- [feature] Added `FieldValue.increment()`, which can be used in `update()` and
-  `set(..., SetOptions.merge())` to increment or decrement numeric field values
-  safely without transactions.
-- [feature] Added functional interface `FirebaseFirestore.runBatch()`, similar
-  to `FirebaseFirestore.runTransaction()`, which allows a developer to focus on
-  the mutations of the batch rather than on creating and committing the batch.
-- [changed] Prepared the persistence layer to support collection group queries.
-  While this feature is not yet available, all schema changes are included in
-  this release.
-- [changed] Added `@RestrictTo` annotations to discourage the use of APIs that
+* [feature] Added [`FieldValue.increment()`](/docs/reference/android/com/google/firebase/firestore/FieldValue#increment(double)),
+  which can be used in `update()` and `set(..., SetOptions.merge())` to
+  increment or decrement numeric field values safely without transactions.
+* [feature] Added functional interface [`FirebaseFirestore.runBatch()`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestore#runBatch( com.google.firebase.firestore.WriteBatch.Function)),
+  similar to [`FirebaseFirestore.runTransaction()`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestore#runTransaction(com.google.firebase.firestore.Transaction.Function%3CTResult%3E )),
+  which allows a developer to focus on the mutations of the batch rather than on
+  creating and committing the batch.
+* [changed] Prepared the persistence layer to support collection group
+  queries. While this feature is not yet available, all schema changes are
+  included in this release.
+* [changed] Added `@RestrictTo` annotations to discourage the use of APIs that
   are not public. This affects internal APIs that were previously obfuscated and
   are not mentioned in our documentation.
-- [changed] Improved error messages for certain Number types that are not
-  supported by our serialization layer (#272).
+* [changed] Improved error messages for certain Number types that are not
+  supported by our serialization layer.
 
 # 18.1.0
-- [changed] Internal changes to ensure functionality alignment with other SDK
+* [changed] Internal changes to ensure functionality alignment with other SDK
   releases.
-- [fixed] Fixed calculation of SQLite database size on Android 9 Pie devices.
+* [fixed] Fixed calculation of SQLite database size on Android 9 Pie devices.
   On these devices, the previous method sometimes incorrectly calculated the
   size by a few MBs, potentially delaying garbage collection.
 
 # 18.0.1
-- [fixed] Fixed an issue where Firestore would crash if handling write batches
-  larger than 2 MB in size (#208).
-- [changed] Firestore now recovers more quickly from long periods without
-  network access (#217).
+* [fixed] Fixed an issue where [firestore] would crash if handling write
+  batches larger than 2 MB in size.
+* [changed] [firestore] now recovers more quickly from long periods without
+  network access.
 
 # 18.0.0
-- [changed] The `timestampsInSnapshotsEnabled` setting is now enabled by
-  default. Timestamp fields that read from a `DocumentSnapshot` are now
-  returned as `Timestamp` objects instead of `Date` objects. This is a breaking
-  change; developers must update any code that expects to receive a `Date`
-  object. See https://firebase.google.com/docs/reference/android/com/google/firebase/firestore/FirebaseFirestoreSettings.Builder.html#setTimestampsInSnapshotsEnabled(boolean) for more details.
-- [feature] Custom objects (POJOs) can now be passed in several ways: as a
+* [changed] The `timestampsInSnapshotsEnabled` setting is now enabled by
+  default. Timestamp fields that read from a `DocumentSnapshot` are now returned
+  as `Timestamp` objects instead of `Date` objects. This is a breaking change;
+  developers must update any code that expects to receive a `Date` object. See
+  [`FirebaseFirestoreSettings.Builder.setTimestampsInSnapshotsEnabled()`](/docs/reference/android/com/google/firebase/firestore/FirebaseFirestoreSettings.Builder.html#setTimestampsInSnapshotsEnabled(boolean))
+  for more details.
+* [feature] Custom objects (POJOs) can now be passed in several ways: as a
   field value in `update()`, within `Map<>` objects passed to `set()`, in array
   transform operations, and in query filters.
-- [feature] `DocumentSnapshot.get()` now supports retrieving fields as
-  custom objects (POJOs) by passing a `Class<T>` instance, e.g.,
+* [feature] `DocumentSnapshot.get()` now supports retrieving fields as custom
+  objects (POJOs) by passing a `Class<T>` instance, e.g.,
   `snapshot.get("field", CustomType.class)`.
-- [fixed] Fixed an issue where if an app sent a write to the server, but the
+* [fixed] Fixed an issue where if an app sent a write to the server, but the
   app was shut down before a listener received the write, the app could crash.
 
 # 17.1.5
-- [changed] Firestore now recovers more quickly from bad network states.
-- [changed] Improved performance for reading large collections.
-- [fixed] Offline persistence now properly records schema downgrades. This is a
-  forward-looking change that allows you to safely downgrade from future SDK
+* [changed] [firestore] now recovers more quickly from bad network states.
+* [changed] Improved performance for reading large collections.
+* [fixed] Offline persistence now properly records schema downgrades. This is
+  a forward-looking change that allows you to safely downgrade from future SDK
   versions to this version (v17.1.5). You can already safely downgrade versions
   now depending on the source version. For example, you can safely downgrade
   from v17.1.4 to v17.1.2 because there are no schema changes between those
-  versions. (#134)
+  versions.  Related:
+  https://github.com/firebase/firebase-android-sdk/issues/134
 
 # 17.1.4
-- [fixed] Fixed a SQLite transaction handling issue that occasionally masked
+* [fixed] Fixed a SQLite transaction-handling issue that occasionally masked
   exceptions when Firestore closed a transaction that was never started. For
-  more information, see the issue report in GitHub (https://github.com/firebase/firebase-android-sdk/issues/115).
-- [fixed] Fixed a race condition that caused a `SQLiteDatabaseLockedException`
+  more information, see the [issue report in GitHub](https://github.com/firebase/firebase-android-sdk/issues/115).
+* [fixed] Fixed a race condition that caused a `SQLiteDatabaseLockedException`
   when an app attempted to access the SQLite database from multiple threads.
 
 # 17.1.2
-- [changed] Changed how the SDK handles locally-updated documents while syncing
-  those updates with Cloud Firestore servers. This can lead to slight behavior
-  changes and may affect the `SnapshotMetadata.hasPendingWrites()` metadata
-  flag.
-- [changed] Eliminated superfluous update events for locally cached documents
-  that are known to lag behind the server version. Instead, the SDK buffers
-  these events until the client has caught up with the server.
+* [changed] Changed how the SDK handles locally-updated documents while syncing those updates with Cloud Firestore servers. This can lead to slight behavior changes and may affect the [`SnapshotMetadata.hasPendingWrites()`](/docs/reference/android/com/google/firebase/firestore/SnapshotMetadata.html#hasPendingWrites()) metadata flag.
+* [changed] Eliminated superfluous update events for locally cached documents that are known to lag behind the server version. Instead, the SDK buffers these events until the client has caught up with the server.
 
 # 17.1.1
-- [fixed] Fixed an issue where the first `get()` call made after being offline
-  could incorrectly return cached data without attempting to reach the backend.
-- [changed] Changed `get()` to only make one attempt to reach the backend before
-  returning cached data, potentially reducing delays while offline.
-- [fixed] Fixed an issue that caused Firebase to drop empty objects from calls
-  to `set(..., SetOptions.merge())`.
-- [fixed] Updated printf-style templates to ensure that they're compile time
-  constants. Previously, some were influenced by error messages. When those
-  error messages contained `%p` or other, related tokens, `String.format()`
-  would throw an exception.
-- [changed] Some SDK errors that represent common mistakes, like permission
-  errors or missing indexes, are automatically be logged as warnings in addition
-  to being surfaced via the API.
+* [fixed] Fixed an issue where the first `get()` call made after being offline could incorrectly return cached data without attempting to reach the backend.
+* [changed] Changed `get()` to only make one attempt to reach the backend before returning cached data, potentially reducing delays while offline.
+* [fixed] Fixed an issue that caused Firebase to drop empty objects from calls to `set(..., SetOptions.merge())`.
+* [fixed] Updated printf-style templates to ensure that they're compile time constants. Previously, some were influenced by error messages. When those error messages contained `%p` or other, related tokens, `String.format()` would throw an exception.
+* [changed] Some SDK errors that represent common mistakes, like permission errors or missing indexes, are automatically logged as warnings in addition to being surfaced via the API.
 
 # 17.1.0
-- [feature] Added `FieldValue.arrayUnion()` and `FieldValue.arrayRemove()` to
-  atomically add and remove elements from an array field in a document.
-- [feature] Added `Query.whereArrayContains()` query operator to find documents
-  where an array field contains a specific element.
+* [fixed] Corrected an issue with methods in the Cloud Firestore v17.0.5 release. To avoid potential errors, don't use v17.0.5.
+
+# 17.0.5
+* [feature] Added [`FieldValue.arrayUnion()`](/docs/reference/android/com/google/firebase/firestore/FieldValue.html#arrayUnion(Object...)) and [`FieldValue.arrayRemove()`](/docs/reference/android/com/google/firebase/firestore/FieldValue.html#arrayRemove(Object...)) to atomically add and remove elements from an array field in a document.
+* [feature] Added [`Query.whereArrayContains()`](/docs/reference/android/com/google/firebase/firestore/Query.html#whereArrayContains(com.google.firebase.firestore.FieldPath, java.lang.Object)) query operator to find documents where an array field contains a specific element.
+* [changed] Improved offline performance with many outstanding writes.
+* [fixed] Firestore will now recover from auth token expiration when the system clock is wrong.
 
 # 17.0.4
-- [fixed] Fixed an issue where queries returned fewer results than they should,
-  caused by documents that were cached as deleted when they should not have
-  been (firebase/firebase-ios-sdk#1548). Some cache data is cleared and so
-  clients may use extra bandwidth the first time they launch with this version
-  of the SDK.
+* [fixed] Fixed an issue where queries returned fewer results than they
+  should. The issue related to
+  [improper caching](https://github.com/firebase/firebase-ios-sdk/issues/1548),
+  so clients may use extra bandwidth the first time they launch with this
+  version of the SDK, as they re-download cleared cached data.
 
 # 17.0.3
-- [changed] The `Timestamp` class now implements `Parcelable` in addition to
-  `Comparable`.
+* [changed] The [`Timestamp`](/docs/reference/android/com/google/firebase/Timestamp) class now implements [`Parcelable`](//developer.android.com/reference/android/os/Parcelable) in addition to [`Comparable`](//developer.android.com/reference/java/lang/Comparable).
+
+# 17.0.2
+* [changed] gRPC requirement updated from 1.8.0 to 1.12.0. This allows quicker
+  failover between Wi-Fi and cellular networks.
+
+# 17.0.1
+* [fixed] Fixed an issue where `set()` didn't correctly respect
+  [`SetOptions.mergeFields()`](/docs/reference/android/com/google/firebase/firestore/SetOptions.html#mergeFields(java.util.List<java.lang.String>))
+  for data containing
+  [`FieldValue.delete()`](/docs/reference/android/com/google/firebase/firestore/FieldValue.html#delete())
+  or
+  [`FieldValue.serverTimestamp()`](/docs/reference/android/com/google/firebase/firestore/FieldValue.html#serverTimestamp())
+  values.
+
diff --git a/firebase-firestore/README.md b/firebase-firestore/README.md
index 96e65172615..65bcaa62520 100644
--- a/firebase-firestore/README.md
+++ b/firebase-firestore/README.md
@@ -87,6 +87,28 @@ Run:
 ./gradlew :firebase-firestore:deviceCheck
 ```
 
+### Testing composite index query against production
+#### Setting Up the Environment:
+1. Create a `google-services.json` file in the root directory. This file should contain your target Firebase project's configuration.
+2. If not already logged in, authenticate with your Google Cloud Platform (GCP) account using
+`gcloud auth application-default login`. You can check your logged-in accounts by running
+`gcloud auth list`.
+3. Navigate to the `firebase-firestore` directory, create composite indexes by running:
+```
+terraform init
+terraform apply -var-file=../google-services.json -auto-approve
+```
+Note: If the index creation encounters issues, such as concurrent operations, consider running the
+index creation process again. Error messages indicating that indexes have already been created can
+be safely disregarded.
+
+#### Adding new composite index query tests
+1. To create a new composite index for local development, click on the provided link in the test
+error message, which will direct you to the Firebase Console.
+2. Add the newly created composite index to the `firestore_index_config.tf` file. The "__name__"
+field is not required to be explicitly added to the file, as the index creation will auto complete
+it on behalf.
+
 ## Code Formatting
 
 Run below to format Java code:
@@ -99,15 +121,10 @@ from within Android Studio.
 
 ## Build Local Jar of Firestore SDK
 
-Run:
 ```bash
-./gradlew publishAllToLocal
+./gradlew -PprojectsToPublish="firebase-firestore" publishReleasingLibrariesToMavenLocal
 ```
 
-This will publish firebase SDK at SNAPSHOT versions. All pom level dependencies
-within the published artifacts will also point to SNAPSHOT versions that are
-co-published. The results will be built into your local maven repo.
-
 Developers may then take a dependency on these locally published versions by adding
 the `mavenLocal()` repository to your [repositories
 block](https://docs.gradle.org/current/userguide/declaring_repositories.html) in
diff --git a/firebase-firestore/api.txt b/firebase-firestore/api.txt
index 7807c380723..174d4b07e4d 100644
--- a/firebase-firestore/api.txt
+++ b/firebase-firestore/api.txt
@@ -1,23 +1,45 @@
 // Signature format: 2.0
-package com.google.firebase {
-
-  public final class Timestamp implements java.lang.Comparable<com.google.firebase.Timestamp> android.os.Parcelable {
-    ctor public Timestamp(long, int);
-    ctor protected Timestamp(@NonNull android.os.Parcel);
-    ctor public Timestamp(@NonNull java.util.Date);
-    method public int compareTo(@NonNull com.google.firebase.Timestamp);
-    method public int describeContents();
-    method public int getNanoseconds();
-    method public long getSeconds();
-    method @NonNull public static com.google.firebase.Timestamp now();
-    method @NonNull public java.util.Date toDate();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<com.google.firebase.Timestamp> CREATOR;
+package com.google.firebase.firestore {
+
+  public abstract class AggregateField {
+    method @NonNull public static com.google.firebase.firestore.AggregateField.AverageAggregateField average(@NonNull String);
+    method @NonNull public static com.google.firebase.firestore.AggregateField.AverageAggregateField average(@NonNull com.google.firebase.firestore.FieldPath);
+    method @NonNull public static com.google.firebase.firestore.AggregateField.CountAggregateField count();
+    method @NonNull @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public String getAlias();
+    method @NonNull @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public String getFieldPath();
+    method @NonNull @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public String getOperator();
+    method @NonNull public static com.google.firebase.firestore.AggregateField.SumAggregateField sum(@NonNull String);
+    method @NonNull public static com.google.firebase.firestore.AggregateField.SumAggregateField sum(@NonNull com.google.firebase.firestore.FieldPath);
   }
 
-}
+  public static class AggregateField.AverageAggregateField extends com.google.firebase.firestore.AggregateField {
+  }
 
-package com.google.firebase.firestore {
+  public static class AggregateField.CountAggregateField extends com.google.firebase.firestore.AggregateField {
+  }
+
+  public static class AggregateField.SumAggregateField extends com.google.firebase.firestore.AggregateField {
+  }
+
+  public class AggregateQuery {
+    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.AggregateQuerySnapshot> get(@NonNull com.google.firebase.firestore.AggregateSource);
+    method @NonNull @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public java.util.List<com.google.firebase.firestore.AggregateField> getAggregateFields();
+    method @NonNull public com.google.firebase.firestore.Query getQuery();
+  }
+
+  public class AggregateQuerySnapshot {
+    method @Nullable public Object get(@NonNull com.google.firebase.firestore.AggregateField);
+    method public long get(@NonNull com.google.firebase.firestore.AggregateField.CountAggregateField);
+    method @Nullable public Double get(@NonNull com.google.firebase.firestore.AggregateField.AverageAggregateField);
+    method public long getCount();
+    method @Nullable public Double getDouble(@NonNull com.google.firebase.firestore.AggregateField);
+    method @Nullable public Long getLong(@NonNull com.google.firebase.firestore.AggregateField);
+    method @NonNull public com.google.firebase.firestore.AggregateQuery getQuery();
+  }
+
+  public enum AggregateSource {
+    enum_constant public static final com.google.firebase.firestore.AggregateSource SERVER;
+  }
 
   public class Blob implements java.lang.Comparable<com.google.firebase.firestore.Blob> {
     method public int compareTo(@NonNull com.google.firebase.firestore.Blob);
@@ -57,6 +79,7 @@ package com.google.firebase.firestore {
     method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener<com.google.firebase.firestore.DocumentSnapshot>);
     method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener<com.google.firebase.firestore.DocumentSnapshot>);
     method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull android.app.Activity, @NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener<com.google.firebase.firestore.DocumentSnapshot>);
+    method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull com.google.firebase.firestore.SnapshotListenOptions, @NonNull com.google.firebase.firestore.EventListener<com.google.firebase.firestore.DocumentSnapshot>);
     method @NonNull public com.google.firebase.firestore.CollectionReference collection(@NonNull String);
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> delete();
     method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.DocumentSnapshot> get();
@@ -131,6 +154,32 @@ package com.google.firebase.firestore {
     method @NonNull public static com.google.firebase.firestore.FieldValue serverTimestamp();
   }
 
+  public class Filter {
+    ctor public Filter();
+    method @NonNull public static com.google.firebase.firestore.Filter and(com.google.firebase.firestore.Filter...);
+    method @NonNull public static com.google.firebase.firestore.Filter arrayContains(@NonNull String, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter arrayContains(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter arrayContainsAny(@NonNull String, @NonNull java.util.List<?>);
+    method @NonNull public static com.google.firebase.firestore.Filter arrayContainsAny(@NonNull com.google.firebase.firestore.FieldPath, @NonNull java.util.List<?>);
+    method @NonNull public static com.google.firebase.firestore.Filter equalTo(@NonNull String, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter equalTo(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter greaterThan(@NonNull String, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter greaterThan(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter greaterThanOrEqualTo(@NonNull String, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter greaterThanOrEqualTo(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter inArray(@NonNull String, @NonNull java.util.List<?>);
+    method @NonNull public static com.google.firebase.firestore.Filter inArray(@NonNull com.google.firebase.firestore.FieldPath, @NonNull java.util.List<?>);
+    method @NonNull public static com.google.firebase.firestore.Filter lessThan(@NonNull String, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter lessThan(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter lessThanOrEqualTo(@NonNull String, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter lessThanOrEqualTo(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter notEqualTo(@NonNull String, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter notEqualTo(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object);
+    method @NonNull public static com.google.firebase.firestore.Filter notInArray(@NonNull String, @NonNull java.util.List<?>);
+    method @NonNull public static com.google.firebase.firestore.Filter notInArray(@NonNull com.google.firebase.firestore.FieldPath, @NonNull java.util.List<?>);
+    method @NonNull public static com.google.firebase.firestore.Filter or(com.google.firebase.firestore.Filter...);
+  }
+
   public class FirebaseFirestore {
     method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotsInSyncListener(@NonNull Runnable);
     method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotsInSyncListener(@NonNull android.app.Activity, @NonNull Runnable);
@@ -146,13 +195,18 @@ package com.google.firebase.firestore {
     method @NonNull public com.google.firebase.firestore.FirebaseFirestoreSettings getFirestoreSettings();
     method @NonNull public static com.google.firebase.firestore.FirebaseFirestore getInstance();
     method @NonNull public static com.google.firebase.firestore.FirebaseFirestore getInstance(@NonNull com.google.firebase.FirebaseApp);
+    method @NonNull public static com.google.firebase.firestore.FirebaseFirestore getInstance(@NonNull String);
+    method @NonNull public static com.google.firebase.firestore.FirebaseFirestore getInstance(@NonNull com.google.firebase.FirebaseApp, @NonNull String);
     method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.firestore.Query> getNamedQuery(@NonNull String);
+    method @Nullable public com.google.firebase.firestore.PersistentCacheIndexManager getPersistentCacheIndexManager();
     method @NonNull public com.google.firebase.firestore.LoadBundleTask loadBundle(@NonNull java.io.InputStream);
     method @NonNull public com.google.firebase.firestore.LoadBundleTask loadBundle(@NonNull byte[]);
     method @NonNull public com.google.firebase.firestore.LoadBundleTask loadBundle(@NonNull java.nio.ByteBuffer);
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> runBatch(@NonNull com.google.firebase.firestore.WriteBatch.Function);
     method @NonNull public <TResult> com.google.android.gms.tasks.Task<TResult> runTransaction(@NonNull com.google.firebase.firestore.Transaction.Function<TResult>);
+    method @NonNull public <TResult> com.google.android.gms.tasks.Task<TResult> runTransaction(@NonNull com.google.firebase.firestore.TransactionOptions, @NonNull com.google.firebase.firestore.Transaction.Function<TResult>);
     method public void setFirestoreSettings(@NonNull com.google.firebase.firestore.FirebaseFirestoreSettings);
+    method @Deprecated @NonNull @com.google.firebase.annotations.PreviewApi public com.google.android.gms.tasks.Task<java.lang.Void> setIndexConfiguration(@NonNull String);
     method public static void setLoggingEnabled(boolean);
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> terminate();
     method public void useEmulator(@NonNull String, int);
@@ -188,9 +242,10 @@ package com.google.firebase.firestore {
   }
 
   public final class FirebaseFirestoreSettings {
-    method public long getCacheSizeBytes();
+    method @Nullable public com.google.firebase.firestore.LocalCacheSettings getCacheSettings();
+    method @Deprecated public long getCacheSizeBytes();
     method @NonNull public String getHost();
-    method public boolean isPersistenceEnabled();
+    method @Deprecated public boolean isPersistenceEnabled();
     method public boolean isSslEnabled();
     field public static final long CACHE_SIZE_UNLIMITED = -1L; // 0xffffffffffffffffL
   }
@@ -199,16 +254,43 @@ package com.google.firebase.firestore {
     ctor public FirebaseFirestoreSettings.Builder();
     ctor public FirebaseFirestoreSettings.Builder(@NonNull com.google.firebase.firestore.FirebaseFirestoreSettings);
     method @NonNull public com.google.firebase.firestore.FirebaseFirestoreSettings build();
-    method public long getCacheSizeBytes();
+    method @Deprecated public long getCacheSizeBytes();
     method @NonNull public String getHost();
-    method public boolean isPersistenceEnabled();
+    method @Deprecated public boolean isPersistenceEnabled();
     method public boolean isSslEnabled();
-    method @NonNull public com.google.firebase.firestore.FirebaseFirestoreSettings.Builder setCacheSizeBytes(long);
+    method @Deprecated @NonNull public com.google.firebase.firestore.FirebaseFirestoreSettings.Builder setCacheSizeBytes(long);
     method @NonNull public com.google.firebase.firestore.FirebaseFirestoreSettings.Builder setHost(@NonNull String);
-    method @NonNull public com.google.firebase.firestore.FirebaseFirestoreSettings.Builder setPersistenceEnabled(boolean);
+    method @NonNull public com.google.firebase.firestore.FirebaseFirestoreSettings.Builder setLocalCacheSettings(@NonNull com.google.firebase.firestore.LocalCacheSettings);
+    method @Deprecated @NonNull public com.google.firebase.firestore.FirebaseFirestoreSettings.Builder setPersistenceEnabled(boolean);
     method @NonNull public com.google.firebase.firestore.FirebaseFirestoreSettings.Builder setSslEnabled(boolean);
   }
 
+  public final class FirestoreKt {
+    method public static inline <reified T> kotlinx.coroutines.flow.Flow<? extends java.util.List<? extends T>> dataObjects(@NonNull com.google.firebase.firestore.Query, @NonNull com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method public static inline <reified T> kotlinx.coroutines.flow.Flow<? extends T> dataObjects(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method @NonNull public static com.google.firebase.firestore.FirebaseFirestore firestore(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @NonNull public static com.google.firebase.firestore.FirebaseFirestore firestore(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String database);
+    method @NonNull public static com.google.firebase.firestore.FirebaseFirestore firestore(@NonNull com.google.firebase.Firebase, @NonNull String database);
+    method @NonNull public static com.google.firebase.firestore.FirebaseFirestoreSettings firestoreSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.FirebaseFirestoreSettings.Builder,kotlin.Unit> init);
+    method public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull String field);
+    method public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull String field, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.FieldPath fieldPath);
+    method public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.FieldPath fieldPath, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method @NonNull public static com.google.firebase.firestore.FirebaseFirestore getFirestore(@NonNull com.google.firebase.Firebase);
+    method @NonNull public static com.google.firebase.firestore.MemoryCacheSettings memoryCacheSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryCacheSettings.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.firebase.firestore.MemoryEagerGcSettings memoryEagerGcSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryEagerGcSettings.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.firebase.firestore.MemoryLruGcSettings memoryLruGcSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryLruGcSettings.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.firebase.firestore.PersistentCacheSettings persistentCacheSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.PersistentCacheSettings.Builder,kotlin.Unit> init);
+    method @NonNull public static kotlinx.coroutines.flow.Flow<com.google.firebase.firestore.DocumentSnapshot> snapshots(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method @NonNull public static kotlinx.coroutines.flow.Flow<com.google.firebase.firestore.QuerySnapshot> snapshots(@NonNull com.google.firebase.firestore.Query, @NonNull com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method public static inline <reified T> T toObject(@NonNull com.google.firebase.firestore.DocumentSnapshot);
+    method public static inline <reified T> T toObject(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method public static inline <reified T> T toObject(@NonNull com.google.firebase.firestore.QueryDocumentSnapshot);
+    method public static inline <reified T> T toObject(@NonNull com.google.firebase.firestore.QueryDocumentSnapshot, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method public static inline <reified T> java.util.List<? extends T> toObjects(@NonNull com.google.firebase.firestore.QuerySnapshot);
+    method public static inline <reified T> java.util.List<? extends T> toObjects(@NonNull com.google.firebase.firestore.QuerySnapshot, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+  }
+
   public class GeoPoint implements java.lang.Comparable<com.google.firebase.firestore.GeoPoint> {
     ctor public GeoPoint(double, double);
     method public int compareTo(@NonNull com.google.firebase.firestore.GeoPoint);
@@ -219,6 +301,11 @@ package com.google.firebase.firestore {
   @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public @interface IgnoreExtraProperties {
   }
 
+  public enum ListenSource {
+    enum_constant public static final com.google.firebase.firestore.ListenSource CACHE;
+    enum_constant public static final com.google.firebase.firestore.ListenSource DEFAULT;
+  }
+
   public interface ListenerRegistration {
     method public void remove();
   }
@@ -268,6 +355,40 @@ package com.google.firebase.firestore {
     enum_constant public static final com.google.firebase.firestore.LoadBundleTaskProgress.TaskState SUCCESS;
   }
 
+  public interface LocalCacheSettings {
+  }
+
+  public final class MemoryCacheSettings implements com.google.firebase.firestore.LocalCacheSettings {
+    method @NonNull public com.google.firebase.firestore.MemoryGarbageCollectorSettings getGarbageCollectorSettings();
+    method @NonNull public static com.google.firebase.firestore.MemoryCacheSettings.Builder newBuilder();
+  }
+
+  public static class MemoryCacheSettings.Builder {
+    method @NonNull public com.google.firebase.firestore.MemoryCacheSettings build();
+    method @NonNull public com.google.firebase.firestore.MemoryCacheSettings.Builder setGcSettings(@NonNull com.google.firebase.firestore.MemoryGarbageCollectorSettings);
+  }
+
+  public final class MemoryEagerGcSettings implements com.google.firebase.firestore.MemoryGarbageCollectorSettings {
+    method @NonNull public static com.google.firebase.firestore.MemoryEagerGcSettings.Builder newBuilder();
+  }
+
+  public static class MemoryEagerGcSettings.Builder {
+    method @NonNull public com.google.firebase.firestore.MemoryEagerGcSettings build();
+  }
+
+  public interface MemoryGarbageCollectorSettings {
+  }
+
+  public final class MemoryLruGcSettings implements com.google.firebase.firestore.MemoryGarbageCollectorSettings {
+    method public long getSizeBytes();
+    method @NonNull public static com.google.firebase.firestore.MemoryLruGcSettings.Builder newBuilder();
+  }
+
+  public static class MemoryLruGcSettings.Builder {
+    method @NonNull public com.google.firebase.firestore.MemoryLruGcSettings build();
+    method @NonNull public com.google.firebase.firestore.MemoryLruGcSettings.Builder setSizeBytes(long);
+  }
+
   public enum MetadataChanges {
     enum_constant public static final com.google.firebase.firestore.MetadataChanges EXCLUDE;
     enum_constant public static final com.google.firebase.firestore.MetadataChanges INCLUDE;
@@ -277,6 +398,22 @@ package com.google.firebase.firestore {
     method public void onProgress(@NonNull ProgressT);
   }
 
+  public final class PersistentCacheIndexManager {
+    method public void deleteAllIndexes();
+    method public void disableIndexAutoCreation();
+    method public void enableIndexAutoCreation();
+  }
+
+  public final class PersistentCacheSettings implements com.google.firebase.firestore.LocalCacheSettings {
+    method public long getSizeBytes();
+    method @NonNull public static com.google.firebase.firestore.PersistentCacheSettings.Builder newBuilder();
+  }
+
+  public static class PersistentCacheSettings.Builder {
+    method @NonNull public com.google.firebase.firestore.PersistentCacheSettings build();
+    method @NonNull public com.google.firebase.firestore.PersistentCacheSettings.Builder setSizeBytes(long);
+  }
+
   @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD}) public @interface PropertyName {
     method public abstract String value();
   }
@@ -288,6 +425,9 @@ package com.google.firebase.firestore {
     method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener<com.google.firebase.firestore.QuerySnapshot>);
     method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener<com.google.firebase.firestore.QuerySnapshot>);
     method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull android.app.Activity, @NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener<com.google.firebase.firestore.QuerySnapshot>);
+    method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull com.google.firebase.firestore.SnapshotListenOptions, @NonNull com.google.firebase.firestore.EventListener<com.google.firebase.firestore.QuerySnapshot>);
+    method @NonNull public com.google.firebase.firestore.AggregateQuery aggregate(@NonNull com.google.firebase.firestore.AggregateField, @NonNull com.google.firebase.firestore.AggregateField...);
+    method @NonNull public com.google.firebase.firestore.AggregateQuery count();
     method @NonNull public com.google.firebase.firestore.Query endAt(@NonNull com.google.firebase.firestore.DocumentSnapshot);
     method @NonNull public com.google.firebase.firestore.Query endAt(java.lang.Object...);
     method @NonNull public com.google.firebase.firestore.Query endBefore(@NonNull com.google.firebase.firestore.DocumentSnapshot);
@@ -305,6 +445,7 @@ package com.google.firebase.firestore {
     method @NonNull public com.google.firebase.firestore.Query startAfter(java.lang.Object...);
     method @NonNull public com.google.firebase.firestore.Query startAt(@NonNull com.google.firebase.firestore.DocumentSnapshot);
     method @NonNull public com.google.firebase.firestore.Query startAt(java.lang.Object...);
+    method @NonNull public com.google.firebase.firestore.Query where(@NonNull com.google.firebase.firestore.Filter);
     method @NonNull public com.google.firebase.firestore.Query whereArrayContains(@NonNull String, @NonNull Object);
     method @NonNull public com.google.firebase.firestore.Query whereArrayContains(@NonNull com.google.firebase.firestore.FieldPath, @NonNull Object);
     method @NonNull public com.google.firebase.firestore.Query whereArrayContainsAny(@NonNull String, @NonNull java.util.List<?>);
@@ -358,6 +499,22 @@ package com.google.firebase.firestore {
     method @NonNull public static com.google.firebase.firestore.SetOptions mergeFields(java.lang.String...);
   }
 
+  public final class SnapshotListenOptions {
+    method @Nullable public android.app.Activity getActivity();
+    method @NonNull public java.util.concurrent.Executor getExecutor();
+    method @NonNull public com.google.firebase.firestore.MetadataChanges getMetadataChanges();
+    method @NonNull public com.google.firebase.firestore.ListenSource getSource();
+  }
+
+  public static class SnapshotListenOptions.Builder {
+    ctor public SnapshotListenOptions.Builder();
+    method @NonNull public com.google.firebase.firestore.SnapshotListenOptions build();
+    method @NonNull public com.google.firebase.firestore.SnapshotListenOptions.Builder setActivity(@NonNull android.app.Activity);
+    method @NonNull public com.google.firebase.firestore.SnapshotListenOptions.Builder setExecutor(@NonNull java.util.concurrent.Executor);
+    method @NonNull public com.google.firebase.firestore.SnapshotListenOptions.Builder setMetadataChanges(@NonNull com.google.firebase.firestore.MetadataChanges);
+    method @NonNull public com.google.firebase.firestore.SnapshotListenOptions.Builder setSource(@NonNull com.google.firebase.firestore.ListenSource);
+  }
+
   public class SnapshotMetadata {
     method public boolean hasPendingWrites();
     method public boolean isFromCache();
@@ -386,6 +543,17 @@ package com.google.firebase.firestore {
     method @Nullable public TResult apply(@NonNull com.google.firebase.firestore.Transaction) throws com.google.firebase.firestore.FirebaseFirestoreException;
   }
 
+  public final class TransactionOptions {
+    method public int getMaxAttempts();
+  }
+
+  public static final class TransactionOptions.Builder {
+    ctor public TransactionOptions.Builder();
+    ctor public TransactionOptions.Builder(@NonNull com.google.firebase.firestore.TransactionOptions);
+    method @NonNull public com.google.firebase.firestore.TransactionOptions build();
+    method @NonNull public com.google.firebase.firestore.TransactionOptions.Builder setMaxAttempts(int);
+  }
+
   public class WriteBatch {
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> commit();
     method @NonNull public com.google.firebase.firestore.WriteBatch delete(@NonNull com.google.firebase.firestore.DocumentReference);
@@ -402,3 +570,33 @@ package com.google.firebase.firestore {
 
 }
 
+package com.google.firebase.firestore.ktx {
+
+  public final class FirestoreKt {
+    method @Deprecated public static inline <reified T> kotlinx.coroutines.flow.Flow<? extends java.util.List<? extends T>> dataObjects(@NonNull com.google.firebase.firestore.Query, @NonNull com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method @Deprecated public static inline <reified T> kotlinx.coroutines.flow.Flow<? extends T> dataObjects(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method @Deprecated @NonNull public static com.google.firebase.firestore.FirebaseFirestore firestore(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @Deprecated @NonNull public static com.google.firebase.firestore.FirebaseFirestore firestore(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String database);
+    method @Deprecated @NonNull public static com.google.firebase.firestore.FirebaseFirestore firestore(@NonNull com.google.firebase.ktx.Firebase, @NonNull String database);
+    method @Deprecated @NonNull public static com.google.firebase.firestore.FirebaseFirestoreSettings firestoreSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.FirebaseFirestoreSettings.Builder,kotlin.Unit> init);
+    method @Deprecated public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull String field);
+    method @Deprecated public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull String field, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method @Deprecated public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.FieldPath fieldPath);
+    method @Deprecated public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.FieldPath fieldPath, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method @Deprecated @NonNull public static com.google.firebase.firestore.FirebaseFirestore getFirestore(@NonNull com.google.firebase.ktx.Firebase);
+    method @NonNull public static com.google.firebase.firestore.MemoryCacheSettings memoryCacheSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryCacheSettings.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.firebase.firestore.MemoryEagerGcSettings memoryEagerGcSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryEagerGcSettings.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.firebase.firestore.MemoryLruGcSettings memoryLruGcSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.MemoryLruGcSettings.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.firebase.firestore.PersistentCacheSettings persistentCacheSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.PersistentCacheSettings.Builder,kotlin.Unit> init);
+    method @Deprecated @NonNull public static kotlinx.coroutines.flow.Flow<com.google.firebase.firestore.DocumentSnapshot> snapshots(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method @Deprecated @NonNull public static kotlinx.coroutines.flow.Flow<com.google.firebase.firestore.QuerySnapshot> snapshots(@NonNull com.google.firebase.firestore.Query, @NonNull com.google.firebase.firestore.MetadataChanges metadataChanges = com.google.firebase.firestore.MetadataChanges.EXCLUDE);
+    method @Deprecated public static inline <reified T> T toObject(@NonNull com.google.firebase.firestore.DocumentSnapshot);
+    method @Deprecated public static inline <reified T> T toObject(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method @Deprecated public static inline <reified T> T toObject(@NonNull com.google.firebase.firestore.QueryDocumentSnapshot);
+    method @Deprecated public static inline <reified T> T toObject(@NonNull com.google.firebase.firestore.QueryDocumentSnapshot, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+    method @Deprecated public static inline <reified T> java.util.List<? extends T> toObjects(@NonNull com.google.firebase.firestore.QuerySnapshot);
+    method @Deprecated public static inline <reified T> java.util.List<? extends T> toObjects(@NonNull com.google.firebase.firestore.QuerySnapshot, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+  }
+
+}
+
diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle
index 6be15dbad61..14cc8ce3786 100644
--- a/firebase-firestore/firebase-firestore.gradle
+++ b/firebase-firestore/firebase-firestore.gradle
@@ -14,10 +14,13 @@
 
 plugins {
     id 'firebase-library'
+    id("kotlin-android")
     id 'com.google.protobuf'
+    id("copy-google-services")
 }
 
 firebaseLibrary {
+    libraryGroup "firestore"
     publishSources = true
     testLab {
         enabled = true
@@ -49,19 +52,35 @@ protobuf {
         }
     }
 }
+
 android {
     adbOptions {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.firestore"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         targetSdkVersion project.targetSdkVersion
-        minSdkVersion 19
+        minSdkVersion project.minSdkVersion
         versionName version
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'proguard.txt'
+
+        // Acceptable values are: 'emulator', 'qa', 'nightly', and 'prod'.
+        def targetBackend = findProperty("targetBackend") ?: "emulator"
+        buildConfigField("String", "TARGET_BACKEND", "\"$targetBackend\"")
+
+        def targetDatabaseId = findProperty('targetDatabaseId') ?: "(default)"
+        buildConfigField("String", "TARGET_DATABASE_ID", "\"$targetDatabaseId\"")
+
+        def localProps = new Properties()
+
+        try {
+            file("local.properties").withInputStream { localProps.load(it) }
+        } catch (FileNotFoundException e) {
+        }
     }
 
     sourceSets {
@@ -69,8 +88,6 @@ android {
             proto {
                 srcDir 'src/proto'
             }
-            java {
-            }
         }
         test {
             java {
@@ -88,92 +105,77 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions { jvmTarget = "1.8" }
     testOptions.unitTests.includeAndroidResources = true
-    ext.useProdBackendForTests = false
-}
-
-android.libraryVariants.all { variant ->
-    if (findProperty("useProdBackendForTests")) {
-        variant.buildConfigField("boolean", "USE_EMULATOR_FOR_TESTS", "false")
-    } else {
-        variant.buildConfigField("boolean", "USE_EMULATOR_FOR_TESTS", "true")
-    }
-
-    def localProps = new Properties()
-
-    try {
-    file("local.properties").withInputStream { localProps.load(it) }
-    } catch (FileNotFoundException e) {
-    }
-}
 
-configurations.all {
-    if(it.name.contains('AndroidTestRuntimeClasspath')) {
-        it.resolutionStrategy {
-            force 'org.checkerframework:checker-compat-qual:2.5.5'
-            force 'com.google.guava:guava:30.1.1-android'
-        }
-    }
-    exclude group: "com.google.protobuf", module: "protobuf-java"
 }
 
-googleJavaFormat {
-    exclude 'src/testUtil/java/com/google/firebase/firestore/testutil/Assert.java'
-    exclude 'src/testUtil/java/com/google/firebase/firestore/testutil/ThrowingRunnable.java'
+tasks.withType(Test) {
+    maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':protolite-well-known-types')
-    implementation project(':firebase-database-collection')
-    implementation project(':firebase-components')
-    implementation project(':appcheck:firebase-appcheck-interop')
-
-
-    //To provide @Generated annotations
-    compileOnly 'javax.annotation:jsr250-api:1.0'
-
     javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
 
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation "io.grpc:grpc-stub:$grpcVersion"
-    implementation "io.grpc:grpc-protobuf-lite:$grpcVersion"
-    implementation "io.grpc:grpc-okhttp:$grpcVersion"
-    implementation "io.grpc:grpc-android:$grpcVersion"
-    implementation 'com.google.android.gms:play-services-basement:18.0.0'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation 'com.google.android.gms:play-services-base:18.0.1'
-
-    implementation 'com.squareup.okhttp:okhttp:2.7.5'
-    implementation('com.google.firebase:firebase-auth-interop:19.0.2') {
+    api project(':protolite-well-known-types')
+    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api 'com.google.firebase:firebase-annotations:16.2.0'
+    api 'com.google.firebase:firebase-appcheck-interop:17.0.0'
+    api('com.google.firebase:firebase-auth-interop:19.0.2') {
+        exclude group: "com.google.firebase", module: "firebase-common"
+    }
+    api(project(":firebase-common"))
+    api("com.google.firebase:firebase-common-ktx:21.0.0") {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
+    api("com.google.firebase:firebase-components:18.0.0") {
+        exclude group: "com.google.firebase", module: "firebase-common"
+    }
+    api('com.google.firebase:firebase-database-collection:18.0.1')
+
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'com.google.android.gms:play-services-base:18.0.1'
+    implementation 'com.google.android.gms:play-services-basement:18.1.0'
+    implementation "io.grpc:grpc-android:$grpcVersion"
+    implementation "io.grpc:grpc-okhttp:$grpcVersion"
+    implementation "io.grpc:grpc-protobuf-lite:$grpcVersion"
+    implementation "io.grpc:grpc-stub:$grpcVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
 
     compileOnly 'com.google.auto.value:auto-value-annotations:1.6.6'
-    androidTestAnnotationProcessor 'com.google.auto.value:auto-value:1.6.5'
+    compileOnly 'javax.annotation:jsr250-api:1.0'
+
     annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
 
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation ("org.robolectric:robolectric:$robolectricVersion") {
-        exclude group: 'com.google.protobuf', module: 'protobuf-java'
-    }
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestAnnotationProcessor 'com.google.auto.value:auto-value:1.6.5'
+
+    testImplementation project(':firebase-database-collection')
+    testImplementation project(':firebase-firestore')
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
+    testImplementation 'com.google.android.gms:play-services-tasks:18.0.1'
     testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "org.hamcrest:hamcrest-junit:2.0.0.0"
+    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+
+    testCompileOnly "com.google.protobuf:protobuf-java:$protocVersion"
 
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation("com.google.truth:truth:$googleTruthVersion"){
+    androidTestImplementation "androidx.annotation:annotation:1.1.0"
+    androidTestImplementation 'androidx.test:rules:1.5.0'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
+    androidTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
+    androidTestImplementation("com.google.truth:truth:$googleTruthVersion") {
         exclude group: "org.codehaus.mojo", module: "animal-sniffer-annotations"
     }
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
+    androidTestImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'org.mockito:mockito-android:2.25.0'
-    androidTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
-    androidTestImplementation "androidx.annotation:annotation:1.1.0"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
 }
 
 gradle.projectsEvaluated {
@@ -184,10 +186,3 @@ gradle.projectsEvaluated {
         options.compilerArgs << "-Xlint:deprecation" // << "-Werror"
     }
 }
-
-// ==========================================================================
-// Copy from here down if you want to use the google-services plugin in your
-// androidTest integration tests.
-// ==========================================================================
-ext.packageName = "com.google.firebase.firestore"
-apply from: '../gradle/googleServices.gradle'
diff --git a/firebase-firestore/firestore_collection_group_index_config.tf b/firebase-firestore/firestore_collection_group_index_config.tf
new file mode 100644
index 00000000000..2d8b98a312e
--- /dev/null
+++ b/firebase-firestore/firestore_collection_group_index_config.tf
@@ -0,0 +1,28 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+locals {
+  collection_group_indexes = {
+    index1 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "a"
+        order      = "ASCENDING"
+      },
+    ]
+  }
+}
\ No newline at end of file
diff --git a/firebase-firestore/firestore_composite_index_config.tf b/firebase-firestore/firestore_composite_index_config.tf
new file mode 100644
index 00000000000..09a5ea47583
--- /dev/null
+++ b/firebase-firestore/firestore_composite_index_config.tf
@@ -0,0 +1,411 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+locals {
+  indexes = {
+    index1 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "a"
+        order      = "ASCENDING"
+      },
+    ]
+    index2 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "b"
+        order      = "ASCENDING"
+      },
+    ]
+    index3 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "b"
+        order      = "DESCENDING"
+      },
+    ]
+    index4 = [
+      {
+        field_path = "a"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "b"
+        order      = "ASCENDING"
+      },
+    ]
+    index5 = [
+      {
+        field_path = "a"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "b"
+        order      = "DESCENDING"
+      },
+    ]
+    index6 = [
+      {
+        field_path = "a"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "a"
+        order      = "DESCENDING"
+      },
+    ]
+    index7 = [
+      {
+        field_path = "b"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "a"
+        order      = "ASCENDING"
+      },
+    ]
+    index8 = [
+      {
+        field_path = "b"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "a"
+        order      = "DESCENDING"
+      },
+    ]
+    index9 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "a"
+        order      = "ASCENDING"
+      },
+
+      {
+        field_path = "b"
+        order      = "ASCENDING"
+      },
+    ]
+    index10 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "b"
+        order      = "DESCENDING"
+      },
+
+      {
+        field_path = "a"
+        order      = "DESCENDING"
+      },
+    ]
+    index11 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "pages"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "year"
+        order      = "ASCENDING"
+      },
+    ]
+    index12 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "pages"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "rating"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "year"
+        order      = "ASCENDING"
+      },
+    ]
+    index13 = [
+      {
+        field_path   = "rating"
+        array_config = "CONTAINS"
+      },
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "pages"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "rating"
+        order      = "ASCENDING"
+      },
+    ]
+    index14 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "key"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "sort"
+        order      = "ASCENDING"
+      }
+    ]
+    index15 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "key"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "sort"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "v"
+        order      = "ASCENDING"
+      }
+    ]
+    index16 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "v"
+        order      = "DESCENDING"
+      },
+      {
+        field_path = "key"
+        order      = "DESCENDING"
+      },
+      {
+        field_path = "sort"
+        order      = "DESCENDING"
+      },
+    ]
+    index17 = [
+      {
+        field_path   = "v"
+        array_config = "CONTAINS"
+      },
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "key"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "sort"
+        order      = "ASCENDING"
+      },
+    ]
+    index18 = [
+      {
+        field_path = "key"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+
+      {
+        field_path = "sort"
+        order      = "DESCENDING"
+      },
+      {
+        field_path = "v"
+        order      = "ASCENDING"
+      },
+    ]
+    index19 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+
+      {
+        field_path = "sort"
+        order      = "DESCENDING"
+      },
+      {
+        field_path = "key"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "v"
+        order      = "ASCENDING"
+      },
+    ]
+    index20 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "v"
+        order      = "ASCENDING"
+      },
+
+      {
+        field_path = "sort"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "key"
+        order      = "ASCENDING"
+      },
+
+    ]
+    index21 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "sort"
+        order      = "DESCENDING"
+      },
+      {
+        field_path = "key"
+        order      = "DESCENDING"
+      },
+
+    ]
+    index22 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "v"
+        order      = "DESCENDING"
+      },
+      {
+        field_path = "sort"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "key"
+        order      = "ASCENDING"
+      },
+    ]
+    index23 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "name"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "metadata.createdAt"
+        order      = "ASCENDING"
+      },
+    ]
+    index24 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "name"
+        order      = "DESCENDING"
+      },
+      {
+        field_path = "field"
+        order      = "DESCENDING"
+      },
+      {
+        field_path = "`field.dot`"
+        order      = "DESCENDING"
+      },
+      {
+        field_path = "`field\\\\slash`"
+        order      = "DESCENDING"
+      },
+    ],
+    index25 = [
+      {
+        field_path = "testId"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "v"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "key"
+        order      = "ASCENDING"
+      },
+      {
+        field_path = "sort"
+        order      = "ASCENDING"
+      },
+    ]
+  }
+}
diff --git a/firebase-firestore/gradle.properties b/firebase-firestore/gradle.properties
index 44d4c0ed574..833aa95e6e3 100644
--- a/firebase-firestore/gradle.properties
+++ b/firebase-firestore/gradle.properties
@@ -1,2 +1,2 @@
-version=24.0.2
-latestReleasedVersion=24.0.1
+version=25.0.1
+latestReleasedVersion=25.0.0
diff --git a/firebase-firestore/ktx/api.txt b/firebase-firestore/ktx/api.txt
index 634bb8923d9..b8472c410b7 100644
--- a/firebase-firestore/ktx/api.txt
+++ b/firebase-firestore/ktx/api.txt
@@ -1,21 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.firestore.ktx {
 
-  public final class FirestoreKt {
-    ctor public FirestoreKt();
-    method @NonNull public static com.google.firebase.firestore.FirebaseFirestore firestore(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
-    method @NonNull public static com.google.firebase.firestore.FirebaseFirestoreSettings firestoreSettings(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.firestore.FirebaseFirestoreSettings.Builder,kotlin.Unit> init);
-    method @Nullable public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull String field);
-    method @Nullable public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull String field, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
-    method @Nullable public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.FieldPath fieldPath);
-    method @Nullable public static inline <reified T> T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.FieldPath fieldPath, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
-    method @NonNull public static com.google.firebase.firestore.FirebaseFirestore getFirestore(@NonNull com.google.firebase.ktx.Firebase);
-    method @Nullable public static inline <reified T> T toObject(@NonNull com.google.firebase.firestore.DocumentSnapshot);
-    method @Nullable public static inline <reified T> T toObject(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
-    method @NonNull public static inline <reified T> T toObject(@NonNull com.google.firebase.firestore.QueryDocumentSnapshot);
-    method @NonNull public static inline <reified T> T toObject(@NonNull com.google.firebase.firestore.QueryDocumentSnapshot, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
-    method @NonNull public static inline <reified T> java.util.List<T> toObjects(@NonNull com.google.firebase.firestore.QuerySnapshot);
-    method @NonNull public static inline <reified T> java.util.List<T> toObjects(@NonNull com.google.firebase.firestore.QuerySnapshot, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-firestore/ktx/ktx.gradle b/firebase-firestore/ktx/ktx.gradle
index 6c3399504d3..b927bace03e 100644
--- a/firebase-firestore/ktx/ktx.gradle
+++ b/firebase-firestore/ktx/ktx.gradle
@@ -14,18 +14,23 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
+group = "com.google.firebase"
+
 firebaseLibrary {
-    releaseWith project(':firebase-firestore')
+    libraryGroup "firestore"
     publishSources = true
+    publishJavadoc = false
+    publishReleaseNotes = false
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.firestore.ktx"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
@@ -44,19 +49,25 @@ android {
     }
 }
 
+tasks.withType(Test) {
+    maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
+}
+
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-firestore')
-    implementation 'androidx.annotation:annotation:1.1.0'
+    api(project(":firebase-firestore"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+
+    implementation("com.google.firebase:firebase-components:18.0.0")
+
     testImplementation project(':firebase-database-collection')
-    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
     testImplementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+
+    testCompileOnly "com.google.protobuf:protobuf-java:$protocVersion"
 }
diff --git a/firebase-firestore/ktx/src/main/AndroidManifest.xml b/firebase-firestore/ktx/src/main/AndroidManifest.xml
index 2f6477f5e12..3abf3a2ca90 100644
--- a/firebase-firestore/ktx/src/main/AndroidManifest.xml
+++ b/firebase-firestore/ktx/src/main/AndroidManifest.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.firestore.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.firestore.ktx.FirebaseFirestoreKtxRegistrar"
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.firestore.ktx.FirebaseFirestoreLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
diff --git a/firebase-firestore/ktx/src/main/kotlin/com/google/firebase/firestore/ktx/Firestore.kt b/firebase-firestore/ktx/src/main/kotlin/com/google/firebase/firestore/ktx/Firestore.kt
deleted file mode 100644
index ec2ee225d41..00000000000
--- a/firebase-firestore/ktx/src/main/kotlin/com/google/firebase/firestore/ktx/Firestore.kt
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.firestore.ktx
-
-import androidx.annotation.Keep
-import com.google.firebase.FirebaseApp
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.firestore.DocumentSnapshot
-import com.google.firebase.firestore.FieldPath
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.firestore.FirebaseFirestoreSettings
-import com.google.firebase.firestore.QueryDocumentSnapshot
-import com.google.firebase.firestore.QuerySnapshot
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.platforminfo.LibraryVersionComponent
-
-/** Returns the [FirebaseFirestore] instance of the default [FirebaseApp]. */
-val Firebase.firestore: FirebaseFirestore
-    get() = FirebaseFirestore.getInstance()
-
-/** Returns the [FirebaseFirestore] instance of a given [FirebaseApp]. */
-fun Firebase.firestore(app: FirebaseApp): FirebaseFirestore = FirebaseFirestore.getInstance(app)
-
-/**
- * Returns the contents of the document converted to a POJO or null if the document doesn't exist.
- *
- * @param T The type of the object to create.
- * @return The contents of the document in an object of type T or null if the document doesn't
- *     exist.
- */
-inline fun <reified T> DocumentSnapshot.toObject(): T? = toObject(T::class.java)
-
-/**
- * Returns the contents of the document converted to a POJO or null if the document doesn't exist.
- *
- * @param T The type of the object to create.
- * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
- *     been set to their final value.
- * @return The contents of the document in an object of type T or null if the document doesn't
- *     exist.
- */
-inline fun <reified T> DocumentSnapshot.toObject(
-    serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
-): T? =
-        toObject(T::class.java, serverTimestampBehavior)
-
-/**
- * Returns the value at the field, converted to a POJO, or null if the field or document doesn't
- * exist.
- *
- * @param field The path to the field.
- * @param T The type to convert the field value to.
- * @return The value at the given field or null.
- */
-inline fun <reified T> DocumentSnapshot.getField(field: String): T? = get(field, T::class.java)
-
-/**
- * Returns the value at the field, converted to a POJO, or null if the field or document doesn't
- * exist.
- *
- * @param field The path to the field.
- * @param T The type to convert the field value to.
- * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
- *     been set to their final value.
- * @return The value at the given field or null.
- */
-inline fun <reified T> DocumentSnapshot.getField(
-    field: String,
-    serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
-): T? =
-        get(field, T::class.java, serverTimestampBehavior)
-
-/**
- * Returns the value at the field, converted to a POJO, or null if the field or document doesn't
- * exist.
- *
- * @param fieldPath The path to the field.
- * @param T The type to convert the field value to.
- * @return The value at the given field or null.
- */
-inline fun <reified T> DocumentSnapshot.getField(fieldPath: FieldPath): T? = get(fieldPath, T::class.java)
-
-/**
- * Returns the value at the field, converted to a POJO, or null if the field or document doesn't
- * exist.
- *
- * @param fieldPath The path to the field.
- * @param T The type to convert the field value to.
- * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
- *     been set to their final value.
- * @return The value at the given field or null.
- */
-inline fun <reified T> DocumentSnapshot.getField(
-    fieldPath: FieldPath,
-    serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
-): T? =
-        get(fieldPath, T::class.java, serverTimestampBehavior)
-
-/**
- * Returns the contents of the document converted to a POJO.
- *
- * @param T The type of the object to create.
- * @return The contents of the document in an object of type T.
- */
-inline fun <reified T : Any> QueryDocumentSnapshot.toObject(): T = toObject(T::class.java)
-
-/**
- * Returns the contents of the document converted to a POJO.
- *
- * @param T The type of the object to create.
- * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
- *     been set to their final value.
- * @return The contents of the document in an object of type T.
- */
-inline fun <reified T : Any> QueryDocumentSnapshot.toObject(serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior): T =
-        toObject(T::class.java, serverTimestampBehavior)
-
-/**
- * Returns the contents of the documents in the QuerySnapshot, converted to the provided class, as
- * a list.
- *
- * @param T The POJO type used to convert the documents in the list.
- */
-inline fun <reified T : Any> QuerySnapshot.toObjects(): List<T> = toObjects(T::class.java)
-
-/**
- * Returns the contents of the documents in the QuerySnapshot, converted to the provided class, as
- * a list.
- *
- * @param T The POJO type used to convert the documents in the list.
- * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
- *     been set to their final value.
- */
-inline fun <reified T : Any> QuerySnapshot.toObjects(serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior): List<T> =
-        toObjects(T::class.java, serverTimestampBehavior)
-
-/** Returns a [FirebaseFirestoreSettings] instance initialized using the [init] function. */
-fun firestoreSettings(init: FirebaseFirestoreSettings.Builder.() -> Unit): FirebaseFirestoreSettings {
-    val builder = FirebaseFirestoreSettings.Builder()
-    builder.init()
-    return builder.build()
-}
-
-internal const val LIBRARY_NAME: String = "fire-fst-ktx"
-
-/** @suppress */
-@Keep
-class FirebaseFirestoreKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-firestore/ktx/src/main/kotlin/com/google/firebase/firestore/ktx/Logging.kt b/firebase-firestore/ktx/src/main/kotlin/com/google/firebase/firestore/ktx/Logging.kt
new file mode 100644
index 00000000000..71af63b65b7
--- /dev/null
+++ b/firebase-firestore/ktx/src/main/kotlin/com/google/firebase/firestore/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.firestore.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.firestore.BuildConfig
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-fst-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseFirestoreLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-firestore/ktx/src/test/java/com/google/firebase/firestore/TestUtil.java b/firebase-firestore/ktx/src/test/java/com/google/firebase/firestore/TestUtil.java
index 37359d5a080..e11c5af1503 100644
--- a/firebase-firestore/ktx/src/test/java/com/google/firebase/firestore/TestUtil.java
+++ b/firebase-firestore/ktx/src/test/java/com/google/firebase/firestore/TestUtil.java
@@ -105,7 +105,8 @@ public static QuerySnapshot querySnapshot(
             isFromCache,
             mutatedKeys,
             /* didSyncStateChange= */ true,
-            /* excludesMetadataChanges= */ false);
+            /* excludesMetadataChanges= */ false,
+            /* hasCachedResults= */ false);
     return new QuerySnapshot(query(path), viewSnapshot, FIRESTORE);
   }
 }
diff --git a/firebase-firestore/ktx/src/test/kotlin/com/google/firebase/firestore/ktx/FirestoreTests.kt b/firebase-firestore/ktx/src/test/kotlin/com/google/firebase/firestore/ktx/FirestoreTests.kt
index 061ab7b3fbd..cb31d0b48cb 100644
--- a/firebase-firestore/ktx/src/test/kotlin/com/google/firebase/firestore/ktx/FirestoreTests.kt
+++ b/firebase-firestore/ktx/src/test/kotlin/com/google/firebase/firestore/ktx/FirestoreTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.firestore.ktx
 
@@ -22,6 +24,7 @@ import com.google.firebase.firestore.DocumentSnapshot
 import com.google.firebase.firestore.FieldPath
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.FirebaseFirestoreSettings
+import com.google.firebase.firestore.PropertyName
 import com.google.firebase.firestore.TestUtil
 import com.google.firebase.firestore.model.ObjectValue
 import com.google.firebase.firestore.testutil.TestUtil.wrap
@@ -42,140 +45,226 @@ const val API_KEY = "API_KEY"
 const val EXISTING_APP = "existing"
 
 abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
-
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build(),
-                EXISTING_APP
-        )
-    }
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
 
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class FirestoreTests : BaseTestCase() {
 
-    @Test
-    fun `firestore should delegate to FirebaseFirestore#getInstance()`() {
-        assertThat(Firebase.firestore).isSameInstanceAs(FirebaseFirestore.getInstance())
+  @Test
+  fun `firestore should delegate to FirebaseFirestore#getInstance()`() {
+    assertThat(Firebase.firestore).isSameInstanceAs(FirebaseFirestore.getInstance())
+  }
+
+  @Test
+  fun `Database#firestore should delegate to FirebaseFirestore#getInstance(Database)`() {
+    assertThat(Firebase.firestore("name")).isSameInstanceAs(FirebaseFirestore.getInstance("name"))
+  }
+
+  @Test
+  fun `FirebaseApp#firestore should delegate to FirebaseFirestore#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.firestore(app)).isSameInstanceAs(FirebaseFirestore.getInstance(app))
+  }
+
+  @Test
+  fun `FirebaseApp#Database#firestore should delegate to FirebaseFirestore#getInstance(FirebaseApp,Database)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.firestore(app, "name"))
+      .isSameInstanceAs(FirebaseFirestore.getInstance(app, "name"))
+  }
+
+  @Test
+  fun `FirebaseFirestoreSettings builder works`() {
+    val host = "http://10.0.2.2:8080"
+    val isSslEnabled = false
+    val isPersistenceEnabled = false
+
+    val settings = firestoreSettings {
+      this.host = host
+      this.isSslEnabled = isSslEnabled
+      this.isPersistenceEnabled = isPersistenceEnabled
     }
 
-    @Test
-    fun `FirebaseApp#firestore should delegate to FirebaseFirestore#getInstance(FirebaseApp)`() {
-        val app = Firebase.app(EXISTING_APP)
-        assertThat(Firebase.firestore(app)).isSameInstanceAs(FirebaseFirestore.getInstance(app))
+    assertThat(host).isEqualTo(settings.host)
+    assertThat(isSslEnabled).isEqualTo(settings.isSslEnabled)
+    assertThat(isPersistenceEnabled).isEqualTo(settings.isPersistenceEnabled)
+  }
+
+  @Test
+  fun `LocalCacheSettings builder works`() {
+    val host = "http://10.0.2.2:8080"
+    val isSslEnabled = false
+
+    val settings = firestoreSettings {
+      this.host = host
+      this.isSslEnabled = isSslEnabled
+      this.setLocalCacheSettings(persistentCacheSettings { setSizeBytes(1_000_000) })
     }
 
-    @Test
-    fun `FirebaseFirestoreSettings builder works`() {
-        val host = "http://10.0.2.2:8080"
-        val isSslEnabled = false
-        val isPersistenceEnabled = false
-
-        val settings = firestoreSettings {
-            this.host = host
-            this.isSslEnabled = isSslEnabled
-            this.isPersistenceEnabled = isPersistenceEnabled
-        }
-
-        assertThat(host).isEqualTo(settings.host)
-        assertThat(isSslEnabled).isEqualTo(settings.isSslEnabled)
-        assertThat(isPersistenceEnabled).isEqualTo(settings.isPersistenceEnabled)
+    assertThat(host).isEqualTo(settings.host)
+    assertThat(isSslEnabled).isEqualTo(settings.isSslEnabled)
+    assertThat(settings.isPersistenceEnabled).isTrue()
+    assertThat(settings.cacheSizeBytes).isEqualTo(1_000_000)
+
+    val otherSettings = firestoreSettings { this.setLocalCacheSettings(memoryCacheSettings {}) }
+
+    assertThat(otherSettings.host).isEqualTo(FirebaseFirestoreSettings.DEFAULT_HOST)
+    assertThat(otherSettings.isSslEnabled).isEqualTo(true)
+    assertThat(otherSettings.isPersistenceEnabled).isFalse()
+  }
+
+  @Test
+  fun `MemoryCacheSettings Garbage Collector builder works`() {
+    val host = "http://10.0.2.2:8080"
+    val isSslEnabled = false
+
+    val settings = firestoreSettings {
+      this.host = host
+      this.isSslEnabled = isSslEnabled
+      this.setLocalCacheSettings(memoryCacheSettings {})
     }
+
+    assertThat(host).isEqualTo(settings.host)
+    assertThat(isSslEnabled).isEqualTo(settings.isSslEnabled)
+    assertThat(settings.isPersistenceEnabled).isFalse()
+    assertThat(settings.cacheSettings)
+      .isEqualTo(memoryCacheSettings { setGcSettings(memoryEagerGcSettings {}) })
+
+    val otherSettings = firestoreSettings {
+      this.setLocalCacheSettings(
+        memoryCacheSettings { setGcSettings(memoryLruGcSettings { setSizeBytes(1_000) }) }
+      )
+    }
+
+    assertThat(otherSettings.host).isEqualTo(FirebaseFirestoreSettings.DEFAULT_HOST)
+    assertThat(otherSettings.isPersistenceEnabled).isFalse()
+    assertThat(otherSettings.cacheSizeBytes).isEqualTo(1_000)
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun `library version should be registered with runtime`() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
 }
 
 data class Room(var a: Int = 0, var b: Int = 0)
 
+// NOTE: When Kotlin properties are annotated with `PropertyName` they need to use @get and @set.
+// Also, the properties need to be mutable; that is, declared with `var` and not `val`.
+// See https://github.com/firebase/firebase-android-sdk/issues/4822
+data class DataClassWithPropertyName(
+  @get:PropertyName("dbName") @set:PropertyName("dbName") var objName: String = "DefaultObjName"
+)
+
 @RunWith(RobolectricTestRunner::class)
 class DocumentSnapshotTests {
-    @Before
-    fun setup() {
-        Mockito.`when`(TestUtil.firestore().firestoreSettings).thenReturn(FirebaseFirestoreSettings.Builder().build())
-    }
+  @Before
+  fun setup() {
+    Mockito.`when`(TestUtil.firestore().firestoreSettings)
+      .thenReturn(FirebaseFirestoreSettings.Builder().build())
+  }
 
-    @After
-    fun cleanup() {
-        Mockito.reset(TestUtil.firestore())
-    }
+  @After
+  fun cleanup() {
+    Mockito.reset(TestUtil.firestore())
+  }
 
-    @Test
-    fun `reified getField delegates to get()`() {
-        val ds = TestUtil.documentSnapshot("rooms/foo", mapOf("a" to 1, "b" to 2), false)
+  @Test
+  fun `reified getField delegates to get()`() {
+    val ds = TestUtil.documentSnapshot("rooms/foo", mapOf("a" to 1, "b" to 2), false)
 
-        assertThat(ds.getField<Int>("a")).isEqualTo(ds.get("a", Int::class.java))
-        assertThat(ds.getField<Int>(FieldPath.of("a")))
-                .isEqualTo(ds.get(FieldPath.of("a"), Int::class.java))
+    assertThat(ds.getField<Int>("a")).isEqualTo(ds.get("a", Int::class.java))
+    assertThat(ds.getField<Int>(FieldPath.of("a")))
+      .isEqualTo(ds.get(FieldPath.of("a"), Int::class.java))
 
-        assertThat(ds.getField<Int>("a", DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
-                .isEqualTo(ds.get("a", Int::class.java, DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
-        assertThat(ds.getField<Int>(FieldPath.of("a"), DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
-                .isEqualTo(ds.get(FieldPath.of("a"), Int::class.java))
-    }
+    assertThat(ds.getField<Int>("a", DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
+      .isEqualTo(ds.get("a", Int::class.java, DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
+    assertThat(
+        ds.getField<Int>(FieldPath.of("a"), DocumentSnapshot.ServerTimestampBehavior.ESTIMATE)
+      )
+      .isEqualTo(ds.get(FieldPath.of("a"), Int::class.java))
+  }
 
-    @Test
-    fun `reified toObject delegates to toObject(Class)`() {
-        val ds = TestUtil.documentSnapshot("rooms/foo", mapOf("a" to 1, "b" to 2), false)
+  @Test
+  fun `reified toObject delegates to toObject(Class)`() {
+    val ds = TestUtil.documentSnapshot("rooms/foo", mapOf("a" to 1, "b" to 2), false)
 
-        var room = ds.toObject<Room>()
-        assertThat(room).isEqualTo(Room(1, 2))
-        assertThat(room).isEqualTo(ds.toObject(Room::class.java))
+    var room = ds.toObject<Room>()
+    assertThat(room).isEqualTo(Room(1, 2))
+    assertThat(room).isEqualTo(ds.toObject(Room::class.java))
 
-        room = ds.toObject<Room>(DocumentSnapshot.ServerTimestampBehavior.ESTIMATE)
-        assertThat(room).isEqualTo(Room(1, 2))
-        assertThat(room)
-                .isEqualTo(ds.toObject(Room::class.java, DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
-    }
+    room = ds.toObject<Room>(DocumentSnapshot.ServerTimestampBehavior.ESTIMATE)
+    assertThat(room).isEqualTo(Room(1, 2))
+    assertThat(room)
+      .isEqualTo(ds.toObject(Room::class.java, DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
+  }
+
+  @Test
+  fun `PropertyName annotation works on data classes`() {
+    val ds = TestUtil.documentSnapshot("foo/bar", mapOf("dbName" to "CustomValue"), false)
+
+    val toObjectReturnValue = ds.toObject<DataClassWithPropertyName>()
+
+    assertThat(toObjectReturnValue).isEqualTo(DataClassWithPropertyName("CustomValue"))
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class QuerySnapshotTests {
-    @Before
-    fun setup() {
-        Mockito.`when`(TestUtil.firestore().firestoreSettings).thenReturn(FirebaseFirestoreSettings.Builder().build())
-    }
+  @Before
+  fun setup() {
+    Mockito.`when`(TestUtil.firestore().firestoreSettings)
+      .thenReturn(FirebaseFirestoreSettings.Builder().build())
+  }
 
-    @After
-    fun cleanup() {
-        Mockito.reset(TestUtil.firestore())
-    }
+  @After
+  fun cleanup() {
+    Mockito.reset(TestUtil.firestore())
+  }
 
-    @Test
-    fun `reified toObjects delegates to toObjects(Class)`() {
-        val qs = TestUtil.querySnapshot(
-                "rooms",
-                mapOf(),
-                mapOf("id" to ObjectValue.fromMap(mapOf("a" to wrap(1), "b" to wrap(2)))),
-                false,
-                false)
-
-        assertThat(qs.toObjects<Room>()).containsExactly(Room(1, 2))
-        assertThat(qs.toObjects<Room>(DocumentSnapshot.ServerTimestampBehavior.ESTIMATE)).containsExactly(Room(1, 2))
-    }
+  @Test
+  fun `reified toObjects delegates to toObjects(Class)`() {
+    val qs =
+      TestUtil.querySnapshot(
+        "rooms",
+        mapOf(),
+        mapOf("id" to ObjectValue.fromMap(mapOf("a" to wrap(1), "b" to wrap(2)))),
+        false,
+        false
+      )
+
+    assertThat(qs.toObjects<Room>()).containsExactly(Room(1, 2))
+    assertThat(qs.toObjects<Room>(DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
+      .containsExactly(Room(1, 2))
+  }
 }
diff --git a/firebase-firestore/main.tf b/firebase-firestore/main.tf
new file mode 100644
index 00000000000..6431eb65a24
--- /dev/null
+++ b/firebase-firestore/main.tf
@@ -0,0 +1,85 @@
+variable "project_info" {}
+
+provider "google" {
+  project = var.project_info.project_id
+}
+
+resource "google_firestore_index" "default_db_index" {
+  collection = "composite-index-test-collection"
+
+  for_each = local.indexes
+  dynamic "fields" {
+    for_each = distinct(flatten([for k, v in local.indexes : [
+      for i in each.value : {
+        field_path   = i.field_path
+        order        = can(i.order) ? i.order : null
+        array_config = can(i.array_config) ? i.array_config : null
+    }]]))
+    content {
+      field_path   = fields.value.field_path
+      order        = fields.value.order
+      array_config = fields.value.array_config
+    }
+  }
+}
+
+resource "google_firestore_index" "default_db_collection_group_index" {
+  collection  = "composite-index-test-collection"
+  query_scope = "COLLECTION_GROUP"
+
+  for_each = local.collection_group_indexes
+  dynamic "fields" {
+    for_each = distinct(flatten([for k, v in local.indexes : [
+      for i in each.value : {
+        field_path   = i.field_path
+        order        = can(i.order) ? i.order : null
+        array_config = can(i.array_config) ? i.array_config : null
+    }]]))
+    content {
+      field_path   = fields.value.field_path
+      order        = fields.value.order
+      array_config = fields.value.array_config
+    }
+  }
+}
+
+resource "google_firestore_index" "named_db_index" {
+  collection = "composite-index-test-collection"
+  database   = "test-db"
+
+  for_each = local.indexes
+  dynamic "fields" {
+    for_each = distinct(flatten([for k, v in local.indexes : [
+      for i in each.value : {
+        field_path   = i.field_path
+        order        = can(i.order) ? i.order : null
+        array_config = can(i.array_config) ? i.array_config : null
+    }]]))
+    content {
+      field_path   = fields.value.field_path
+      order        = fields.value.order
+      array_config = fields.value.array_config
+    }
+  }
+}
+
+resource "google_firestore_index" "named_db_collection_group_index" {
+  collection  = "composite-index-test-collection"
+  database    = "test-db"
+  query_scope = "COLLECTION_GROUP"
+
+  for_each = local.collection_group_indexes
+  dynamic "fields" {
+    for_each = distinct(flatten([for k, v in local.indexes : [
+      for i in each.value : {
+        field_path   = i.field_path
+        order        = can(i.order) ? i.order : null
+        array_config = can(i.array_config) ? i.array_config : null
+    }]]))
+    content {
+      field_path   = fields.value.field_path
+      order        = fields.value.order
+      array_config = fields.value.array_config
+    }
+  }
+}
\ No newline at end of file
diff --git a/firebase-firestore/src/androidTest/AndroidManifest.xml b/firebase-firestore/src/androidTest/AndroidManifest.xml
index 89bee0097c0..1c097f5ce12 100644
--- a/firebase-firestore/src/androidTest/AndroidManifest.xml
+++ b/firebase-firestore/src/androidTest/AndroidManifest.xml
@@ -1,7 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.google.firebase.firestore">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="23" />-->
+  <!--<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />-->
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.INTERNET"/>
   <application>
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/AggregationTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/AggregationTest.java
new file mode 100644
index 00000000000..48cbf19402e
--- /dev/null
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/AggregationTest.java
@@ -0,0 +1,937 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import static com.google.firebase.firestore.AggregateField.average;
+import static com.google.firebase.firestore.AggregateField.count;
+import static com.google.firebase.firestore.AggregateField.sum;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.isRunningAgainstEmulator;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testCollection;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testCollectionWithDocs;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitFor;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitForException;
+import static com.google.firebase.firestore.testutil.TestUtil.map;
+import static java.util.Arrays.asList;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.gms.tasks.Task;
+import com.google.common.truth.Truth;
+import com.google.firebase.firestore.model.DatabaseId;
+import com.google.firebase.firestore.testutil.IntegrationTestUtil;
+import java.util.Collections;
+import java.util.Map;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class AggregationTest {
+
+  @After
+  public void tearDown() {
+    IntegrationTestUtil.tearDown();
+  }
+
+  private static Map<String, Map<String, Object>> testDocs1 =
+      map(
+          "a",
+          map(
+              "author", "authorA", "title", "titleA", "pages", 100, "height", 24.5, "weight", 24.1,
+              "foo", 1, "bar", 2, "baz", 3),
+          "b",
+          map(
+              "author", "authorB", "title", "titleB", "pages", 50, "height", 25.5, "weight", 75.5,
+              "foo", 1, "bar", 2, "baz", 3));
+
+  @Test
+  public void testAggregateCountQueryEquals() {
+    CollectionReference coll1 = testCollection("foo");
+    CollectionReference coll1_same = coll1.firestore.collection(coll1.getPath());
+    AggregateQuery query1 = coll1.aggregate(AggregateField.count());
+    AggregateQuery query1_same = coll1_same.aggregate(AggregateField.count());
+    AggregateQuery query2 =
+        coll1
+            .document("bar")
+            .collection("baz")
+            .whereEqualTo("a", 1)
+            .limit(100)
+            .aggregate(AggregateField.count());
+    AggregateQuery query2_same =
+        coll1
+            .document("bar")
+            .collection("baz")
+            .whereEqualTo("a", 1)
+            .limit(100)
+            .aggregate(AggregateField.count());
+    AggregateQuery query3 =
+        coll1
+            .document("bar")
+            .collection("baz")
+            .whereEqualTo("b", 1)
+            .orderBy("c")
+            .aggregate(AggregateField.count());
+    AggregateQuery query3_same =
+        coll1
+            .document("bar")
+            .collection("baz")
+            .whereEqualTo("b", 1)
+            .orderBy("c")
+            .aggregate(AggregateField.count());
+
+    assertEquals(query1, query1_same);
+    assertEquals(query2, query2_same);
+    assertEquals(query3, query3_same);
+
+    assertEquals(query1.hashCode(), query1_same.hashCode());
+    assertEquals(query2.hashCode(), query2_same.hashCode());
+    assertEquals(query3.hashCode(), query3_same.hashCode());
+
+    assertNotNull(query1);
+    assertNotEquals("string", query1);
+    assertNotEquals(query1, query2);
+    assertNotEquals(query2, query3);
+    assertNotEquals(query1.hashCode(), query2.hashCode());
+    assertNotEquals(query2.hashCode(), query3.hashCode());
+  }
+
+  @Test
+  public void testAggregateSumQueryEquals() {
+    CollectionReference coll1 = testCollection("foo");
+    CollectionReference coll1_same = coll1.firestore.collection(coll1.getPath());
+    AggregateQuery query1 = coll1.aggregate(sum("baz"));
+    AggregateQuery query1_same = coll1_same.aggregate(sum("baz"));
+    AggregateQuery query2 =
+        coll1
+            .document("bar")
+            .collection("baz")
+            .whereEqualTo("a", 1)
+            .limit(100)
+            .aggregate(sum("baz"));
+    AggregateQuery query2_same =
+        coll1
+            .document("bar")
+            .collection("baz")
+            .whereEqualTo("a", 1)
+            .limit(100)
+            .aggregate(sum("baz"));
+    AggregateQuery query3 =
+        coll1
+            .document("bar")
+            .collection("baz")
+            .whereEqualTo("b", 1)
+            .orderBy("c")
+            .aggregate(sum("baz"));
+    AggregateQuery query3_same =
+        coll1
+            .document("bar")
+            .collection("baz")
+            .whereEqualTo("b", 1)
+            .orderBy("c")
+            .aggregate(sum("baz"));
+
+    assertEquals(query1, query1_same);
+    assertEquals(query2, query2_same);
+    assertEquals(query3, query3_same);
+
+    assertEquals(query1.hashCode(), query1_same.hashCode());
+    assertEquals(query2.hashCode(), query2_same.hashCode());
+    assertEquals(query3.hashCode(), query3_same.hashCode());
+
+    assertNotNull(query1);
+    assertNotEquals("string", query1);
+    assertNotEquals(query1, query2);
+    assertNotEquals(query2, query3);
+    assertNotEquals(query1.hashCode(), query2.hashCode());
+    assertNotEquals(query2.hashCode(), query3.hashCode());
+  }
+
+  @Test
+  public void testAggregateAvgQueryEquals() {
+    CollectionReference coll1 = testCollection("foo");
+    CollectionReference coll1_same = coll1.firestore.collection(coll1.getPath());
+    AggregateQuery query1 = coll1.aggregate(average("baz"));
+    AggregateQuery query1_same = coll1_same.aggregate(average("baz"));
+    AggregateQuery query2 =
+        coll1
+            .document("bar")
+            .collection("baz")
+            .whereEqualTo("a", 1)
+            .limit(100)
+            .aggregate(average("baz"));
+    AggregateQuery query2_same =
+        coll1
+            .document("bar")
+            .collection("baz")
+            .whereEqualTo("a", 1)
+            .limit(100)
+            .aggregate(average("baz"));
+    AggregateQuery query3 =
+        coll1
+            .document("bar")
+            .collection("baz")
+            .whereEqualTo("b", 1)
+            .orderBy("c")
+            .aggregate(average("baz"));
+    AggregateQuery query3_same =
+        coll1
+            .document("bar")
+            .collection("baz")
+            .whereEqualTo("b", 1)
+            .orderBy("c")
+            .aggregate(average("baz"));
+
+    assertEquals(query1, query1_same);
+    assertEquals(query2, query2_same);
+    assertEquals(query3, query3_same);
+
+    assertEquals(query1.hashCode(), query1_same.hashCode());
+    assertEquals(query2.hashCode(), query2_same.hashCode());
+    assertEquals(query3.hashCode(), query3_same.hashCode());
+
+    assertNotNull(query1);
+    assertNotEquals("string", query1);
+    assertNotEquals(query1, query2);
+    assertNotEquals(query2, query3);
+    assertNotEquals(query1.hashCode(), query2.hashCode());
+    assertNotEquals(query2.hashCode(), query3.hashCode());
+  }
+
+  @Test
+  public void testAggregateQueryNotEquals() {
+    CollectionReference coll = testCollection("foo");
+
+    AggregateQuery query1 = coll.aggregate(AggregateField.count());
+    AggregateQuery query2 = coll.aggregate(sum("baz"));
+    AggregateQuery query3 = coll.aggregate(average("baz"));
+
+    assertNotEquals(query1, query2);
+    assertNotEquals(query2, query3);
+    assertNotEquals(query3, query1);
+    assertNotEquals(query1.hashCode(), query2.hashCode());
+    assertNotEquals(query2.hashCode(), query3.hashCode());
+    assertNotEquals(query3.hashCode(), query1.hashCode());
+
+    AggregateQuery query4 =
+        coll.document("bar").collection("baz").whereEqualTo("a", 1).limit(100).aggregate(count());
+    AggregateQuery query5 =
+        coll.document("bar")
+            .collection("baz")
+            .whereEqualTo("a", 1)
+            .limit(100)
+            .aggregate(sum("baz"));
+    AggregateQuery query6 =
+        coll.document("bar")
+            .collection("baz")
+            .whereEqualTo("a", 1)
+            .limit(100)
+            .aggregate(average("baz"));
+
+    assertNotEquals(query4, query5);
+    assertNotEquals(query5, query6);
+    assertNotEquals(query6, query4);
+    assertNotEquals(query4.hashCode(), query5.hashCode());
+    assertNotEquals(query5.hashCode(), query6.hashCode());
+    assertNotEquals(query6.hashCode(), query4.hashCode());
+  }
+
+  @Test
+  public void testCanRunCountUsingAggregationMethod() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(AggregateField.count()).get(AggregateSource.SERVER));
+
+    assertEquals(2L, snapshot.get(AggregateField.count()));
+  }
+
+  @Test
+  public void testCanRunSumUsingAggregationMethod() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    AggregateQuerySnapshot snapshotPages =
+        waitFor(collection.aggregate(sum("pages")).get(AggregateSource.SERVER));
+
+    assertEquals(150L, snapshotPages.get(sum("pages")));
+    assertEquals((Long) 150L, snapshotPages.getLong(sum("pages")));
+    assertEquals((Double) 150.0, snapshotPages.getDouble(sum("pages")));
+
+    AggregateQuerySnapshot snapshotWeight =
+        waitFor(collection.aggregate(sum("weight")).get(AggregateSource.SERVER));
+
+    assertEquals(99.6, snapshotWeight.get(sum("weight")));
+    assertEquals((Long) 99L, snapshotWeight.getLong(sum("weight")));
+    assertEquals((Double) 99.6, snapshotWeight.getDouble(sum("weight")));
+  }
+
+  @Test
+  public void testCanRunAvgUsingAggregationMethod() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(average("pages")).get(AggregateSource.SERVER));
+
+    assertEquals((Double) 75.0, snapshot.getDouble(average("pages")));
+
+    AggregateQuerySnapshot snapshotWeight =
+        waitFor(collection.aggregate(average("weight")).get(AggregateSource.SERVER));
+
+    assertEquals((Long) 49L, snapshotWeight.getLong(average("weight")));
+    assertEquals((Double) 49.8, snapshotWeight.getDouble(average("weight")));
+  }
+
+  @Test
+  public void testCanGetDuplicateAggregations() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            collection
+                .aggregate(
+                    AggregateField.count(), AggregateField.count(), sum("pages"), sum("pages"))
+                .get(AggregateSource.SERVER));
+
+    assertEquals(2L, snapshot.get(AggregateField.count()));
+    assertEquals(150L, snapshot.get(sum("pages")));
+  }
+
+  @Test
+  public void testCanGetMultipleAggregationsInTheSameQuery() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            collection
+                .aggregate(AggregateField.count(), sum("pages"), average("pages"))
+                .get(AggregateSource.SERVER));
+
+    assertEquals(2L, snapshot.get(AggregateField.count()));
+    assertEquals(150L, snapshot.get(sum("pages")));
+    assertEquals((Double) 75.0, snapshot.getDouble(average("pages")));
+  }
+
+  @Test
+  public void testTerminateDoesNotCrashWithFlyingAggregateQuery() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    collection
+        .aggregate(AggregateField.count(), sum("pages"), average("pages"))
+        .get(AggregateSource.SERVER);
+
+    waitFor(collection.firestore.terminate());
+  }
+
+  @Test
+  public void testCanGetCorrectDoubleTypeForSum() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(sum("weight")).get(AggregateSource.SERVER));
+
+    Object sumWeight = snapshot.get(sum("weight"));
+    assertTrue(sumWeight instanceof Double);
+  }
+
+  @Test
+  public void testCanGetCorrectDoubleTypeForSumWhenFieldsAddUpToInteger() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(sum("height")).get(AggregateSource.SERVER));
+
+    Object sumWeight = snapshot.get(sum("height"));
+    assertTrue(sumWeight instanceof Double);
+  }
+
+  @Test
+  public void testCanGetCorrectLongTypeForSum() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(sum("pages")).get(AggregateSource.SERVER));
+
+    Object sumPages = snapshot.get(sum("pages"));
+    assertTrue(sumPages instanceof Long);
+  }
+
+  @Test
+  public void testCanGetCorrectTypeForAvg() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(average("pages")).get(AggregateSource.SERVER));
+
+    Object avg = snapshot.get(average("pages"));
+    assertTrue(avg instanceof Double);
+  }
+
+  @Test
+  public void testCannotPerformMoreThanMaxAggregations() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+    AggregateField f1 = sum("pages");
+    AggregateField f2 = average("pages");
+    AggregateField f3 = AggregateField.count();
+    AggregateField f4 = sum("foo");
+    AggregateField f5 = sum("bar");
+    AggregateField f6 = sum("baz");
+
+    Exception e =
+        waitForException(collection.aggregate(f1, f2, f3, f4, f5, f6).get(AggregateSource.SERVER));
+
+    assertThat(e, instanceOf(FirebaseFirestoreException.class));
+    FirebaseFirestoreException firestoreException = (FirebaseFirestoreException) e;
+    assertEquals(FirebaseFirestoreException.Code.INVALID_ARGUMENT, firestoreException.getCode());
+    assertTrue(firestoreException.getMessage().contains("maximum number of aggregations"));
+  }
+
+  @Test
+  public void testPerformsAggregationsWhenNaNExistsForSomeFieldValues() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a",
+            map("author", "authorA", "title", "titleA", "pages", 100, "year", 1980, "rating", 5),
+            "b",
+            map("author", "authorB", "title", "titleB", "pages", 50, "year", 2020, "rating", 4),
+            "c",
+            map(
+                "author",
+                "authorC",
+                "title",
+                "titleC",
+                "pages",
+                100,
+                "year",
+                1980,
+                "rating",
+                Double.NaN),
+            "d",
+            map("author", "authorD", "title", "titleD", "pages", 50, "year", 2020, "rating", 0));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(sum("rating"), average("rating")).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(sum("rating")), Double.NaN);
+    assertEquals(snapshot.get(average("rating")), (Double) Double.NaN);
+  }
+
+  @Test
+  public void testThrowsAnErrorWhenGettingTheResultOfAnUnrequestedAggregation() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            collection
+                .whereGreaterThan("pages", 200)
+                .aggregate(sum("pages"))
+                .get(AggregateSource.SERVER));
+
+    Exception exception = null;
+    try {
+      snapshot.get(average("pages"));
+    } catch (RuntimeException e) {
+      exception = e;
+    }
+    assertNotNull(exception);
+    assertEquals(
+        exception.getMessage(), "'average(pages)' was not requested in the aggregation query.");
+
+    exception = null;
+    try {
+      snapshot.get(sum("foo"));
+    } catch (RuntimeException e) {
+      exception = e;
+    }
+    assertNotNull(exception);
+    assertEquals(exception.getMessage(), "'sum(foo)' was not requested in the aggregation query.");
+  }
+
+  @Test
+  public void testPerformsAggregationWhenUsingInOperator() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a",
+            map("author", "authorA", "title", "titleA", "pages", 100, "year", 1980, "rating", 5),
+            "b",
+            map("author", "authorB", "title", "titleB", "pages", 50, "year", 2020, "rating", 4),
+            "c",
+            map("author", "authorC", "title", "titleC", "pages", 100, "year", 1980, "rating", 3),
+            "d",
+            map("author", "authorD", "title", "titleD", "pages", 50, "year", 2020, "rating", 0));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            collection
+                .whereIn("rating", asList(5, 3))
+                .aggregate(sum("rating"), average("rating"), AggregateField.count())
+                .get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(sum("rating")), 8L);
+    assertEquals(snapshot.get(average("rating")), (Double) 4.0);
+    assertEquals(snapshot.get(AggregateField.count()), 2L);
+  }
+
+  @Test
+  public void testPerformsAggregationsOnNestedMapValues() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a",
+            map(
+                "author",
+                "authorA",
+                "title",
+                "titleA",
+                "metadata",
+                map("pages", 100, "rating", map("critic", 2, "user", 5))),
+            "b",
+            map(
+                "author",
+                "authorB",
+                "title",
+                "titleB",
+                "metadata",
+                map("pages", 50, "rating", map("critic", 4, "user", 4))));
+
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            collection
+                .aggregate(sum("metadata.pages"), average("metadata.pages"), AggregateField.count())
+                .get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(sum("metadata.pages")), 150L);
+    assertEquals(snapshot.get(average("metadata.pages")), (Double) 75.0);
+    assertEquals(snapshot.get(AggregateField.count()), 2L);
+  }
+
+  @Test
+  public void testPerformsSumThatOverflowsMaxLong() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", Long.MAX_VALUE),
+            "b", map("author", "authorB", "title", "titleB", "rating", Long.MAX_VALUE));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(sum("rating")).get(AggregateSource.SERVER));
+
+    Object sum = snapshot.get(sum("rating"));
+    assertTrue(sum instanceof Double);
+    assertEquals(sum, (double) Long.MAX_VALUE + (double) Long.MAX_VALUE);
+  }
+
+  @Test
+  public void testPerformsSumThatCanOverflowIntegerValuesDuringAccumulation() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", Long.MAX_VALUE),
+            "b", map("author", "authorB", "title", "titleB", "rating", 1),
+            "c", map("author", "authorC", "title", "titleC", "rating", -101));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(sum("rating")).get(AggregateSource.SERVER));
+
+    Object sum = snapshot.get(sum("rating"));
+    assertTrue(sum instanceof Long);
+    assertEquals(sum, Long.MAX_VALUE - 100);
+  }
+
+  @Test
+  public void testPerformsSumThatIsNegative() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", Long.MAX_VALUE),
+            "b", map("author", "authorB", "title", "titleB", "rating", -Long.MAX_VALUE),
+            "c", map("author", "authorC", "title", "titleC", "rating", -101),
+            "d", map("author", "authorD", "title", "titleD", "rating", -10000));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(sum("rating")).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(sum("rating")), -10101L);
+  }
+
+  @Test
+  public void testPerformsSumThatIsPositiveInfinity() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", Double.MAX_VALUE),
+            "b", map("author", "authorB", "title", "titleB", "rating", Double.MAX_VALUE));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(sum("rating")).get(AggregateSource.SERVER));
+
+    Object sum = snapshot.get(sum("rating"));
+    assertTrue(sum instanceof Double);
+    assertEquals(sum, Double.POSITIVE_INFINITY);
+    assertEquals(snapshot.getDouble(sum("rating")), (Double) Double.POSITIVE_INFINITY);
+    assertEquals(snapshot.getLong(sum("rating")), (Long) Long.MAX_VALUE);
+  }
+
+  @Test
+  public void testPerformsSumThatIsNegativeInfinity() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", -Double.MAX_VALUE),
+            "b", map("author", "authorB", "title", "titleB", "rating", -Double.MAX_VALUE));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(sum("rating")).get(AggregateSource.SERVER));
+
+    Object sum = snapshot.get(sum("rating"));
+
+    assertTrue(sum instanceof Double);
+    assertEquals(sum, Double.NEGATIVE_INFINITY);
+    assertEquals(snapshot.getDouble(sum("rating")), (Double) Double.NEGATIVE_INFINITY);
+    assertEquals(snapshot.getLong(sum("rating")), (Long) Long.MIN_VALUE);
+  }
+
+  @Test
+  public void testPerformsSumThatIsValidButCouldOverflowDuringAggregation() {
+    // Sum of rating would be 0, but if the accumulation overflow, we expect infinity
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", Double.MAX_VALUE),
+            "b", map("author", "authorB", "title", "titleB", "rating", Double.MAX_VALUE),
+            "c", map("author", "authorC", "title", "titleC", "rating", -Double.MAX_VALUE),
+            "d", map("author", "authorD", "title", "titleD", "rating", -Double.MAX_VALUE));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(sum("rating")).get(AggregateSource.SERVER));
+
+    Object sum = snapshot.get(sum("rating"));
+    assertTrue(sum instanceof Double);
+    assertTrue(
+        sum.equals(0.0)
+            || sum.equals(Double.POSITIVE_INFINITY)
+            || sum.equals(Double.NEGATIVE_INFINITY));
+  }
+
+  @Test
+  public void testPerformsSumOverResultSetOfZeroDocuments() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            collection
+                .whereGreaterThan("pages", 200)
+                .aggregate(sum("pages"))
+                .get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(sum("pages")), 0L);
+  }
+
+  @Test
+  public void testPerformsSumOnlyOnNumericFields() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", 5),
+            "b", map("author", "authorB", "title", "titleB", "rating", 4),
+            "c", map("author", "authorC", "title", "titleC", "rating", "3"),
+            "d", map("author", "authorD", "title", "titleD", "rating", 1));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            collection
+                .aggregate(sum("rating"), AggregateField.count())
+                .get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(sum("rating")), 10L);
+    assertEquals(snapshot.get(AggregateField.count()), 4L);
+  }
+
+  @Test
+  public void testPerformsSumOfMinIEEE754() {
+    Map<String, Map<String, Object>> testDocs =
+        map("a", map("author", "authorA", "title", "titleA", "rating", Double.MIN_VALUE));
+
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(sum("rating")).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(sum("rating")), Double.MIN_VALUE);
+  }
+
+  @Test
+  public void testPerformsAverageOfIntsThatResultsInAnInt() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", 10),
+            "b", map("author", "authorB", "title", "titleB", "rating", 5),
+            "c", map("author", "authorC", "title", "titleC", "rating", 0));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(average("rating")).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(average("rating")), (Double) 5.0);
+    assertEquals(snapshot.getLong(average("rating")), (Long) 5L);
+    assertEquals(snapshot.getDouble(average("rating")), (Double) 5.0);
+  }
+
+  @Test
+  public void testPerformsAverageOfFloatsThatResultsInAnInt() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", 10.5),
+            "b", map("author", "authorB", "title", "titleB", "rating", 9.5));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(average("rating")).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(average("rating")), (Double) 10.0);
+    assertEquals(snapshot.getLong(average("rating")), (Long) 10L);
+    assertEquals(snapshot.getDouble(average("rating")), (Double) 10.0);
+  }
+
+  @Test
+  public void testPerformsAverageOfFloatsAndIntsThatResultsInAnInt() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", 10),
+            "b", map("author", "authorB", "title", "titleB", "rating", 9.5),
+            "c", map("author", "authorC", "title", "titleC", "rating", 10.5));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(average("rating")).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(average("rating")), (Double) 10.0);
+    assertEquals(snapshot.getLong(average("rating")), (Long) 10L);
+    assertEquals(snapshot.getDouble(average("rating")), (Double) 10.0);
+  }
+
+  @Test
+  public void testPerformsAverageOfFloatsThatResultsInAFloat() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", 5.5),
+            "b", map("author", "authorB", "title", "titleB", "rating", 4.5),
+            "c", map("author", "authorC", "title", "titleC", "rating", 3.5));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(average("rating")).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(average("rating")), (Double) 4.5);
+    assertEquals(snapshot.getLong(average("rating")), (Long) 4L);
+    assertEquals(snapshot.getDouble(average("rating")), (Double) 4.5);
+  }
+
+  @Test
+  public void testPerformsAverageOfFloatsAndIntsThatResultsInAFloat() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", 8.6),
+            "b", map("author", "authorB", "title", "titleB", "rating", 9),
+            "c", map("author", "authorC", "title", "titleC", "rating", 10));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(average("rating")).get(AggregateSource.SERVER));
+    assertEquals(snapshot.get(average("rating")), (Double) 9.2, 0.00000000000001);
+    assertEquals(snapshot.getDouble(average("rating")), (Double) 9.2, 0.00000000000001);
+    assertEquals(snapshot.getLong(average("rating")), (Long) 9L);
+  }
+
+  @Test
+  public void testPerformsAverageOfIntsThatResultsInAFloat() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", 10),
+            "b", map("author", "authorB", "title", "titleB", "rating", 9));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(average("rating")).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(average("rating")), (Double) 9.5);
+    assertEquals(snapshot.getDouble(average("rating")), (Double) 9.5);
+    assertEquals(snapshot.getLong(average("rating")), (Long) 9L);
+  }
+
+  @Test
+  public void testPerformsAverageCausingUnderflow() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", Double.MIN_VALUE),
+            "b", map("author", "authorB", "title", "titleB", "rating", 0));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(average("rating")).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(average("rating")), (Double) 0.0);
+    assertEquals(snapshot.getDouble(average("rating")), (Double) 0.0);
+    assertEquals(snapshot.getLong(average("rating")), (Long) 0L);
+  }
+
+  @Test
+  public void testPerformsAverageOfMinIEEE754() {
+    Map<String, Map<String, Object>> testDocs =
+        map("a", map("author", "authorA", "title", "titleA", "rating", Double.MIN_VALUE));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(average("rating")).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(average("rating")), (Double) Double.MIN_VALUE);
+    assertEquals(snapshot.getDouble(average("rating")), (Double) Double.MIN_VALUE);
+    assertEquals(snapshot.getLong(average("rating")), (Long) 0L);
+  }
+
+  @Test
+  public void testPerformsAverageOverflowIEEE754DuringAccumulation() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a",
+            map("author", "authorA", "title", "titleA", "rating", Double.MAX_VALUE),
+            "b",
+            map("author", "authorB", "title", "titleB", "rating", Double.MAX_VALUE));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(average("rating")).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(average("rating")), (Double) Double.POSITIVE_INFINITY);
+    assertEquals(snapshot.getDouble(average("rating")), (Double) Double.POSITIVE_INFINITY);
+    assertEquals(snapshot.getLong(average("rating")), (Long) Long.MAX_VALUE);
+  }
+
+  @Test
+  public void testPerformsAverageThatIncludesNaN() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a",
+            map("author", "authorA", "title", "titleA", "rating", 5),
+            "b",
+            map("author", "authorB", "title", "titleB", "rating", 4),
+            "c",
+            map("author", "authorC", "title", "titleC", "rating", Double.NaN),
+            "d",
+            map("author", "authorD", "title", "titleD", "rating", 0));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(average("rating")).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(average("rating")), (Double) Double.NaN);
+    assertEquals(snapshot.getDouble(average("rating")), (Double) Double.NaN);
+    assertEquals(snapshot.getLong(average("rating")), (Long) 0L);
+  }
+
+  @Test
+  public void testPerformsAverageOverResultSetOfZeroDocuments() {
+    CollectionReference collection = testCollectionWithDocs(testDocs1);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            collection
+                .whereGreaterThan("pages", 200)
+                .aggregate(average("pages"))
+                .get(AggregateSource.SERVER));
+
+    assertNull(snapshot.get(average("pages")));
+    assertNull(snapshot.getDouble(average("pages")));
+    assertNull(snapshot.getLong(average("pages")));
+  }
+
+  @Test
+  public void testPerformsAverageOnlyOnNumericFields() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a", map("author", "authorA", "title", "titleA", "rating", 5),
+            "b", map("author", "authorB", "title", "titleB", "rating", 4),
+            "c", map("author", "authorC", "title", "titleC", "rating", "3"),
+            "d", map("author", "authorD", "title", "titleD", "rating", 6));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            collection
+                .aggregate(average("rating"), AggregateField.count())
+                .get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(average("rating")), (Double) 5.0);
+    assertEquals(snapshot.get(AggregateField.count()), 4L);
+  }
+
+  @Test
+  public void testAggregateErrorMessageShouldContainConsoleLinkIfMissingIndex() {
+    assumeFalse(
+        "Skip this test when running against the Firestore emulator because the "
+            + "Firestore emulator does not use indexes and never fails with a 'missing index'"
+            + " error",
+        isRunningAgainstEmulator());
+
+    CollectionReference collection = testCollectionWithDocs(Collections.emptyMap());
+    Query compositeIndexQuery = collection.whereEqualTo("field1", 42).whereLessThan("field2", 99);
+    AggregateQuery compositeIndexAggregateQuery =
+        compositeIndexQuery.aggregate(AggregateField.count(), sum("pages"), average("pages"));
+    Task<AggregateQuerySnapshot> task = compositeIndexAggregateQuery.get(AggregateSource.SERVER);
+
+    Throwable throwable = assertThrows(Throwable.class, () -> waitFor(task));
+
+    Throwable cause = throwable.getCause();
+    Truth.assertThat(cause).hasMessageThat().ignoringCase().contains("index");
+    // TODO(b/316359394) Remove this check for the default databases once cl/582465034 is rolled
+    // out to production.
+    if (collection
+        .firestore
+        .getDatabaseId()
+        .getDatabaseId()
+        .equals(DatabaseId.DEFAULT_DATABASE_ID)) {
+      Truth.assertThat(cause).hasMessageThat().contains("https://console.firebase.google.com");
+    }
+  }
+
+  @Test
+  public void allowsAliasesLongerThan1500Bytes() {
+    // The longest field name allowed is 1500 bytes, and string sizes are calculated as the number
+    // of UTF-8 encoded bytes + 1 in server. The alias chosen by the client is <op>_<fieldName>.
+    // If the field name is 1500 bytes, the alias will be longer than 1500, which is the limit for
+    // aliases. This is to make sure the client can handle this corner case correctly.
+    StringBuilder builder = new StringBuilder(1499);
+    for (int i = 0; i < 1499; i++) {
+      builder.append("a");
+    }
+    String longField = builder.toString();
+    Map<String, Map<String, Object>> testDocs = map("a", map(longField, 1), "b", map(longField, 2));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.aggregate(sum(longField)).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(sum(longField)), 3L);
+  }
+}
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/BundleTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/BundleTest.java
index 76c3f3e9054..c6005d3d69c 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/BundleTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/BundleTest.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.firestore;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.querySnapshotToValues;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testFirestore;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
@@ -176,7 +177,9 @@ public void testLoadedDocumentsShouldNotBeGarbageCollectedRightAway() throws Exc
     // This test really only makes sense with memory persistence, as SQLite persistence only ever
     // lazily deletes data
     db.setFirestoreSettings(
-        new FirebaseFirestoreSettings.Builder().setPersistenceEnabled(false).build());
+        new FirebaseFirestoreSettings.Builder()
+            .setLocalCacheSettings(MemoryCacheSettings.newBuilder().build())
+            .build());
 
     InputStream bundle = new ByteArrayInputStream(createBundle());
     LoadBundleTask bundleTask = db.loadBundle(bundle); // Test the InputStream overload
@@ -196,7 +199,7 @@ public void testLoadedDocumentsShouldNotBeGarbageCollectedRightAway() throws Exc
   public void testLoadWithDocumentsFromOtherProjectFails() throws Exception {
     List<LoadBundleTaskProgress> progressEvents = new ArrayList<>();
 
-    byte[] bundle = createBundle("other-project");
+    byte[] bundle = createBundle("other-project", db.getDatabaseId().getDatabaseId());
     LoadBundleTask bundleTask = db.loadBundle(bundle);
 
     bundleTask.addOnProgressListener(progressEvents::add);
@@ -205,10 +208,9 @@ public void testLoadWithDocumentsFromOtherProjectFails() throws Exception {
       awaitCompletion(bundleTask);
       fail();
     } catch (RuntimeExecutionException e) {
-      assertEquals(
-          "Resource name is not valid for current instance: "
-              + "projects/other-project/databases/(default)/documents",
-          e.getCause().getCause().getMessage());
+      assertThat(e.getCause().getCause())
+          .hasMessageThat()
+          .contains("Resource name is not valid for current instance");
     }
 
     assertEquals(2, progressEvents.size());
@@ -260,7 +262,8 @@ private int getUTF8ByteCount(String s) {
    * Returns a valid bundle by replacing project id in `BUNDLE_TEMPLATES` with the given db project
    * id (also recalculates length prefixes).
    */
-  private byte[] createBundle(String projectId) throws UnsupportedEncodingException {
+  private byte[] createBundle(String projectId, String databaseId)
+      throws UnsupportedEncodingException {
     StringBuilder bundle = new StringBuilder();
 
     // Prepare non-metadata elements since we need the total length of these elements before
@@ -268,6 +271,7 @@ private byte[] createBundle(String projectId) throws UnsupportedEncodingExceptio
     for (int i = 1; i < BUNDLE_TEMPLATES.length; ++i) {
       // Extract elements from BUNDLE_TEMPLATE and replace the project ID.
       String element = BUNDLE_TEMPLATES[i].replaceAll("\\{projectId\\}", projectId);
+      element = element.replaceAll("\\(default\\)", databaseId);
       bundle.append(getUTF8ByteCount(element));
       bundle.append(element);
     }
@@ -288,7 +292,7 @@ private byte[] createBundle(String projectId) throws UnsupportedEncodingExceptio
    * current test database.
    */
   private byte[] createBundle() throws UnsupportedEncodingException {
-    return createBundle(db.getDatabaseId().getProjectId());
+    return createBundle(db.getDatabaseId().getProjectId(), db.getDatabaseId().getDatabaseId());
   }
 
   private void verifySuccessProgress(LoadBundleTaskProgress progress) {
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CompositeIndexQueryTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CompositeIndexQueryTest.java
new file mode 100644
index 00000000000..f92ab7afd3d
--- /dev/null
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CompositeIndexQueryTest.java
@@ -0,0 +1,838 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import static com.google.firebase.firestore.AggregateField.average;
+import static com.google.firebase.firestore.AggregateField.sum;
+import static com.google.firebase.firestore.Filter.and;
+import static com.google.firebase.firestore.Filter.equalTo;
+import static com.google.firebase.firestore.Filter.greaterThan;
+import static com.google.firebase.firestore.Filter.greaterThanOrEqualTo;
+import static com.google.firebase.firestore.Filter.lessThan;
+import static com.google.firebase.firestore.Filter.lessThanOrEqualTo;
+import static com.google.firebase.firestore.Filter.notEqualTo;
+import static com.google.firebase.firestore.Filter.notInArray;
+import static com.google.firebase.firestore.Filter.or;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.nullList;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testFirestore;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitFor;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitForException;
+import static com.google.firebase.firestore.testutil.TestUtil.map;
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.firestore.Query.Direction;
+import com.google.firebase.firestore.testutil.CompositeIndexTestHelper;
+import com.google.firebase.firestore.testutil.IntegrationTestUtil;
+import java.util.Map;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/*
+ * Guidance for Creating Tests:
+ * ----------------------------
+ * When creating tests that require composite indexes, it is recommended to utilize the
+ * "CompositeIndexTestHelper" class. This utility class provides methods for creating and setting
+ * test documents and running queries with ease, ensuring proper data isolation and query
+ * construction.
+ *
+ * To get started, please refer to the instructions provided in the README file. This will guide
+ * you through setting up your local testing environment and updating the Terraform configuration
+ * with any new composite indexes required for your testing scenarios.
+ *
+ * Note: Whenever feasible, make use of the current document fields (such as 'a,' 'b,' 'author,'
+ * 'title') to avoid introducing new composite indexes and surpassing the limit. Refer to the
+ * guidelines at https://firebase.google.com/docs/firestore/quotas#indexes for further information.
+ */
+@RunWith(AndroidJUnit4.class)
+public class CompositeIndexQueryTest {
+
+  @After
+  public void tearDown() {
+    IntegrationTestUtil.tearDown();
+  }
+
+  private static Map<String, Map<String, Object>> testDocs =
+      map(
+          "a",
+          map("author", "authorA", "title", "titleA", "pages", 100, "year", 1980, "rating", 5.0),
+          "b",
+          map("author", "authorB", "title", "titleB", "pages", 50, "year", 2020, "rating", 4.0));
+
+  @Test
+  public void testOrQueriesWithCompositeIndexes() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "doc1", map("a", 1, "b", 0),
+            "doc2", map("a", 2, "b", 1),
+            "doc3", map("a", 3, "b", 2),
+            "doc4", map("a", 1, "b", 3),
+            "doc5", map("a", 1, "b", 1));
+    CollectionReference collection = testHelper.withTestDocs(testDocs);
+
+    Query query = collection.where(or(greaterThan("a", 2), equalTo("b", 1)));
+    // with one inequality: a>2 || b==1.
+    testHelper.assertOnlineAndOfflineResultsMatch(testHelper.query(query), "doc5", "doc2", "doc3");
+
+    // Test with limits (implicit order by ASC): (a==1) || (b > 0) LIMIT 2
+    query = collection.where(or(equalTo("a", 1), greaterThan("b", 0))).limit(2);
+    testHelper.assertOnlineAndOfflineResultsMatch(testHelper.query(query), "doc1", "doc2");
+
+    // Test with limits (explicit order by): (a==1) || (b > 0) LIMIT_TO_LAST 2
+    // Note: The public query API does not allow implicit ordering when limitToLast is used.
+    query = collection.where(or(equalTo("a", 1), greaterThan("b", 0))).limitToLast(2).orderBy("b");
+    testHelper.assertOnlineAndOfflineResultsMatch(testHelper.query(query), "doc3", "doc4");
+
+    // Test with limits (explicit order by ASC): (a==2) || (b == 1) ORDER BY a LIMIT 1
+    query = collection.where(or(equalTo("a", 2), equalTo("b", 1))).limit(1).orderBy("a");
+    testHelper.assertOnlineAndOfflineResultsMatch(testHelper.query(query), "doc5");
+
+    // Test with limits (explicit order by DESC): (a==2) || (b == 1) ORDER BY a LIMIT_TO_LAST 1
+    query = collection.where(or(equalTo("a", 2), equalTo("b", 1))).limitToLast(1).orderBy("a");
+    testHelper.assertOnlineAndOfflineResultsMatch(testHelper.query(query), "doc2");
+  }
+
+  @Test
+  public void testCanRunAggregateCollectionGroupQuery() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+    String collectionGroup = testHelper.withTestCollection().getId();
+
+    FirebaseFirestore db = testFirestore();
+
+    String[] docPaths =
+        new String[] {
+          "abc/123/${collectionGroup}/cg-doc1",
+          "abc/123/${collectionGroup}/cg-doc2",
+          "${collectionGroup}/cg-doc3",
+          "${collectionGroup}/cg-doc4",
+          "def/456/${collectionGroup}/cg-doc5",
+          "${collectionGroup}/virtual-doc/nested-coll/not-cg-doc",
+          "x${collectionGroup}/not-cg-doc",
+          "${collectionGroup}x/not-cg-doc",
+          "abc/123/${collectionGroup}x/not-cg-doc",
+          "abc/123/x${collectionGroup}/not-cg-doc",
+          "abc/${collectionGroup}"
+        };
+    WriteBatch batch = db.batch();
+    for (String path : docPaths) {
+      batch.set(
+          db.document(path.replace("${collectionGroup}", collectionGroup)),
+          testHelper.addTestSpecificFieldsToDoc(map("a", 2)));
+    }
+    waitFor(batch.commit());
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            testHelper
+                .query(db.collectionGroup(collectionGroup))
+                .aggregate(AggregateField.count(), sum("a"), average("a"))
+                .get(AggregateSource.SERVER));
+    assertEquals(
+        5L, // "cg-doc1", "cg-doc2", "cg-doc3", "cg-doc4", "cg-doc5",
+        snapshot.get(AggregateField.count()));
+    assertEquals(10L, snapshot.get(sum("a")));
+    assertEquals((Double) 2.0, snapshot.get(average("a")));
+  }
+
+  @Test
+  public void testCanPerformMaxAggregations() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+    CollectionReference collection = testHelper.withTestDocs(testDocs);
+
+    AggregateField f1 = sum("pages");
+    AggregateField f2 = average("pages");
+    AggregateField f3 = AggregateField.count();
+    AggregateField f4 = sum("year");
+    AggregateField f5 = average("rating");
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            testHelper.query(collection).aggregate(f1, f2, f3, f4, f5).get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(f1), 150L);
+    assertEquals(snapshot.get(f2), 75.0);
+    assertEquals(snapshot.get(f3), 2L);
+    assertEquals(snapshot.get(f4), 4000L);
+    assertEquals(snapshot.get(f5), 4.5);
+  }
+
+  @Test
+  public void testCanGetCorrectTypeForSum() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+    CollectionReference collection = testHelper.withTestDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .aggregate(sum("pages"), sum("year"), sum("rating"))
+                .get(AggregateSource.SERVER));
+
+    Object sumPages = snapshot.get(sum("pages"));
+    Object sumYear = snapshot.get(sum("year"));
+    Object sumRating = snapshot.get(sum("rating"));
+    assertTrue(sumPages instanceof Long);
+    assertTrue(sumYear instanceof Long);
+    assertTrue(sumRating instanceof Double);
+  }
+
+  @Test
+  public void testPerformsAggregationWhenUsingArrayContainsAnyOperator() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "a",
+            map(
+                "author",
+                "authorA",
+                "title",
+                "titleA",
+                "pages",
+                100,
+                "year",
+                1980,
+                "rating",
+                asList(5, 1000)),
+            "b",
+            map(
+                "author", "authorB", "title", "titleB", "pages", 50, "year", 2020, "rating",
+                asList(4)),
+            "c",
+            map(
+                "author",
+                "authorC",
+                "title",
+                "titleC",
+                "pages",
+                100,
+                "year",
+                1980,
+                "rating",
+                asList(2222, 3)),
+            "d",
+            map(
+                "author", "authorD", "title", "titleD", "pages", 50, "year", 2020, "rating",
+                asList(0)));
+    CollectionReference collection = testHelper.withTestDocs(testDocs);
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(
+            testHelper
+                .query(collection.whereArrayContainsAny("rating", asList(5, 3)))
+                .aggregate(
+                    sum("rating"),
+                    average("rating"),
+                    sum("pages"),
+                    average("pages"),
+                    AggregateField.count())
+                .get(AggregateSource.SERVER));
+
+    assertEquals(snapshot.get(sum("rating")), 0L);
+    assertNull(snapshot.get(average("rating")));
+    assertEquals(snapshot.get(sum("pages")), 200L);
+    assertEquals(snapshot.get(average("pages")), (Double) 100.0);
+    assertEquals(snapshot.get(AggregateField.count()), 2L);
+  }
+
+  /** Multiple Inequality */
+  @Test
+  public void testMultipleInequalityOnDifferentFields() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection =
+        testHelper.withTestDocs(
+            map(
+                "doc1", map("key", "a", "sort", 0, "v", 0),
+                "doc2", map("key", "b", "sort", 3, "v", 1),
+                "doc3", map("key", "c", "sort", 1, "v", 3),
+                "doc4", map("key", "d", "sort", 2, "v", 2)));
+
+    QuerySnapshot snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereNotEqualTo("key", "a")
+                .whereLessThanOrEqualTo("sort", 2)
+                .whereGreaterThan("v", 2)
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc3");
+
+    // Duplicate inequality fields
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereNotEqualTo("key", "a")
+                .whereLessThanOrEqualTo("sort", 2)
+                .whereGreaterThan("sort", 1)
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc4");
+
+    // With multiple IN
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThanOrEqualTo("key", "a")
+                .whereLessThanOrEqualTo("sort", 2)
+                .whereIn("v", asList(2, 3, 4))
+                .whereIn("sort", asList(2, 3))
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc4");
+
+    // With NOT-IN
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThanOrEqualTo("key", "a")
+                .whereLessThanOrEqualTo("sort", 2)
+                .whereNotIn("v", asList(2, 4, 5))
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc1", "doc3");
+
+    // With orderby
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThanOrEqualTo("key", "a")
+                .whereLessThanOrEqualTo("sort", 2)
+                .orderBy("v", Direction.DESCENDING)
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc3", "doc4", "doc1");
+
+    // With limit
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThanOrEqualTo("key", "a")
+                .whereLessThanOrEqualTo("sort", 2)
+                .orderBy("v", Direction.DESCENDING)
+                .limit(2)
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc3", "doc4");
+
+    // With limitToLast
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThanOrEqualTo("key", "a")
+                .whereLessThanOrEqualTo("sort", 2)
+                .orderBy("v", Direction.DESCENDING)
+                .limitToLast(2)
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc4", "doc1");
+  }
+
+  @Test
+  public void testMultipleInequalityOnSpecialValues() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection =
+        testHelper.withTestDocs(
+            map(
+                "doc1", map("key", "a", "sort", 0, "v", 0),
+                "doc2", map("key", "b", "sort", Double.NaN, "v", 1),
+                "doc3", map("key", "c", "sort", null, "v", 3),
+                "doc4", map("key", "d", "v", 2),
+                "doc5", map("key", "e", "sort", 0),
+                "doc6", map("key", "f", "sort", 1, "v", 1)));
+
+    QuerySnapshot snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereNotEqualTo("key", "a")
+                .whereLessThanOrEqualTo("sort", 2)
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc5", "doc6");
+
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereNotEqualTo("key", "a")
+                .whereLessThanOrEqualTo("sort", 2)
+                .whereLessThanOrEqualTo("v", 1)
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc6");
+  }
+
+  @Test
+  public void testMultipleInequalityWithArrayMembership() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection =
+        testHelper.withTestDocs(
+            map(
+                "doc1", map("key", "a", "sort", 0, "v", asList(0)),
+                "doc2", map("key", "b", "sort", 1, "v", asList(0, 1, 3)),
+                "doc3", map("key", "c", "sort", 1, "v", emptyList()),
+                "doc4", map("key", "d", "sort", 2, "v", asList(1)),
+                "doc5", map("key", "e", "sort", 3, "v", asList(2, 4)),
+                "doc6", map("key", "f", "sort", 4, "v", asList(Double.NaN)),
+                "doc7", map("key", "g", "sort", 4, "v", nullList())));
+
+    QuerySnapshot snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereNotEqualTo("key", "a")
+                .whereGreaterThanOrEqualTo("sort", 1)
+                .whereArrayContains("v", 0)
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc2");
+
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereNotEqualTo("key", "a")
+                .whereGreaterThanOrEqualTo("sort", 1)
+                .whereArrayContainsAny("v", asList(0, 1))
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc2", "doc4");
+  }
+
+  private static Map<String, Object> nestedObject(int number) {
+    return map(
+        "name",
+        String.format("room %d", number),
+        "metadata",
+        map("createdAt", number),
+        "field",
+        String.format("field %d", number),
+        "field.dot",
+        number,
+        "field\\slash",
+        number);
+  }
+
+  @Test
+  public void testMultipleInequalityWithNestedField() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection =
+        testHelper.withTestDocs(
+            map(
+                "doc1", nestedObject(400),
+                "doc2", nestedObject(200),
+                "doc3", nestedObject(100),
+                "doc4", nestedObject(300)));
+
+    QuerySnapshot snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereLessThanOrEqualTo("metadata.createdAt", 500)
+                .whereGreaterThan("metadata.createdAt", 100)
+                .whereNotEqualTo("name", "room 200")
+                .orderBy("name")
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc4", "doc1");
+
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThanOrEqualTo("field", "field 100")
+                .whereNotEqualTo(FieldPath.of("field.dot"), 300)
+                .whereLessThan("field\\slash", 400)
+                .orderBy("name", Direction.DESCENDING)
+                .get());
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc2", "doc3");
+  }
+
+  @Test
+  public void testMultipleInequalityWithCompositeFilters() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection =
+        testHelper.withTestDocs(
+            map(
+                "doc1",
+                map("key", "a", "sort", 0, "v", 5),
+                "doc2",
+                map("key", "aa", "sort", 4, "v", 4),
+                "doc3",
+                map("key", "c", "sort", 3, "v", 3),
+                "doc4",
+                map("key", "b", "sort", 2, "v", 2),
+                "doc5",
+                map("key", "b", "sort", 2, "v", 1),
+                "doc6",
+                map("key", "b", "sort", 0, "v", 0)));
+
+    QuerySnapshot snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .where(
+                    or(
+                        and(equalTo("key", "b"), lessThanOrEqualTo("sort", 2)),
+                        and(notEqualTo("key", "b"), greaterThan("v", 4))))
+                .get());
+    // Implicitly ordered by: 'key' asc, 'sort' asc, 'v' asc, __name__ asc
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc1", "doc6", "doc5", "doc4");
+
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .where(
+                    or(
+                        and(equalTo("key", "b"), lessThanOrEqualTo("sort", 2)),
+                        and(notEqualTo("key", "b"), greaterThan("v", 4))))
+                .orderBy("sort", Direction.DESCENDING)
+                .orderBy("key")
+                .get());
+    // Ordered by: 'sort' desc, 'key' asc, 'v' asc, __name__ asc
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc5", "doc4", "doc1", "doc6");
+
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .where(
+                    and(
+                        or(
+                            and(equalTo("key", "b"), lessThanOrEqualTo("sort", 4)),
+                            and(notEqualTo("key", "b"), greaterThanOrEqualTo("v", 4))),
+                        or(
+                            and(greaterThan("key", "b"), greaterThanOrEqualTo("sort", 1)),
+                            and(lessThan("key", "b"), greaterThan("v", 0)))))
+                .get());
+    // Implicitly ordered by: 'key' asc, 'sort' asc, 'v' asc, __name__ asc
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc1", "doc2");
+  }
+
+  @Test
+  public void testMultipleInequalityFieldsWillBeImplicitlyOrderedLexicographically() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection =
+        testHelper.withTestDocs(
+            map(
+                "doc1", map("key", "a", "sort", 0, "v", 5),
+                "doc2", map("key", "aa", "sort", 4, "v", 4),
+                "doc3", map("key", "b", "sort", 3, "v", 3),
+                "doc4", map("key", "b", "sort", 2, "v", 2),
+                "doc5", map("key", "b", "sort", 2, "v", 1),
+                "doc6", map("key", "b", "sort", 0, "v", 0)));
+
+    QuerySnapshot snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereNotEqualTo("key", "a")
+                .whereGreaterThan("sort", 1)
+                .whereIn("v", asList(1, 2, 3, 4))
+                .get());
+    // Implicitly ordered by: 'key' asc, 'sort' asc, __name__ asc
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc2", "doc4", "doc5", "doc3");
+
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThan("sort", 1)
+                .whereNotEqualTo("key", "a")
+                .whereIn("v", asList(1, 2, 3, 4))
+                .get());
+    // Implicitly ordered by: 'key' asc, 'sort' asc, __name__ asc
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc2", "doc4", "doc5", "doc3");
+  }
+
+  @Test
+  public void testMultipleInequalityWithMultipleExplicitOrderBy() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection =
+        testHelper.withTestDocs(
+            map(
+                "doc1",
+                map("key", "a", "sort", 5, "v", 0),
+                "doc2",
+                map("key", "aa", "sort", 4, "v", 0),
+                "doc3",
+                map("key", "b", "sort", 3, "v", 1),
+                "doc4",
+                map("key", "b", "sort", 2, "v", 1),
+                "doc5",
+                map("key", "bb", "sort", 1, "v", 1),
+                "doc6",
+                map("key", "c", "sort", 0, "v", 2)));
+
+    QuerySnapshot snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThan("key", "a")
+                .whereGreaterThanOrEqualTo("sort", 1)
+                .orderBy("v")
+                .get());
+    // Ordered by: 'v' asc, 'key' asc, 'sort' asc, __name__ asc
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc2", "doc4", "doc3", "doc5");
+
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThan("key", "a")
+                .whereGreaterThanOrEqualTo("sort", 1)
+                .orderBy("v")
+                .orderBy("sort")
+                .get());
+    // Ordered by: 'v asc, 'sort' asc, 'key' asc,  __name__ asc
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc2", "doc5", "doc4", "doc3");
+
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThan("key", "a")
+                .whereGreaterThanOrEqualTo("sort", 1)
+                .orderBy("v", Direction.DESCENDING)
+                .get());
+    // Implicit order by matches the direction of last explicit order by.
+    // Ordered by: 'v' desc, 'key' desc, 'sort' desc, __name__ desc
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc5", "doc3", "doc4", "doc2");
+
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThan("key", "a")
+                .whereGreaterThanOrEqualTo("sort", 1)
+                .orderBy("v", Direction.DESCENDING)
+                .orderBy("sort")
+                .get());
+    // Ordered by: 'v desc, 'sort' asc, 'key' asc,  __name__ asc
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc5", "doc4", "doc3", "doc2");
+  }
+
+  @Test
+  public void testMultipleInequalityInAggregateQuery() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection =
+        testHelper.withTestDocs(
+            map(
+                "doc1", map("key", "a", "sort", 5, "v", 0),
+                "doc2", map("key", "aa", "sort", 4, "v", 0),
+                "doc3", map("key", "b", "sort", 3, "v", 1),
+                "doc4", map("key", "b", "sort", 2, "v", 1),
+                "doc5", map("key", "bb", "sort", 1, "v", 1)));
+
+    AggregateQuerySnapshot snapshot1 =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThan("key", "a")
+                .whereGreaterThanOrEqualTo("sort", 1)
+                .orderBy("v")
+                .count()
+                .get(AggregateSource.SERVER));
+    assertEquals(4L, snapshot1.getCount());
+
+    AggregateQuerySnapshot snapshot2 =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThan("key", "a")
+                .whereGreaterThanOrEqualTo("sort", 1)
+                .whereNotEqualTo("v", 0)
+                .aggregate(
+                    AggregateField.count(), AggregateField.sum("sort"), AggregateField.average("v"))
+                .get(AggregateSource.SERVER));
+    assertEquals(3L, snapshot2.get(AggregateField.count()));
+    assertEquals(6L, snapshot2.get(AggregateField.sum("sort")));
+    assertEquals((Double) 1.0, snapshot2.get(AggregateField.average("v")));
+  }
+
+  @Test
+  public void testMultipleInequalityFieldsWithDocumentKey() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection =
+        testHelper.withTestDocs(
+            map(
+                "doc1", map("key", "a", "sort", 5),
+                "doc2", map("key", "aa", "sort", 4),
+                "doc3", map("key", "b", "sort", 3),
+                "doc4", map("key", "b", "sort", 2),
+                "doc5", map("key", "bb", "sort", 1)));
+
+    QuerySnapshot snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereGreaterThan("sort", 1)
+                .whereNotEqualTo("key", "a")
+                .whereLessThan(FieldPath.documentId(), "doc5")
+                .get());
+    // Document Key in inequality field will implicitly ordered to the last.
+    // Implicitly ordered by: 'key' asc, 'sort' asc, __name__ asc
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc2", "doc4", "doc3");
+
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereLessThan(FieldPath.documentId(), "doc5")
+                .whereGreaterThan("sort", 1)
+                .whereNotEqualTo("key", "a")
+                .get());
+    // Changing filters order will not effect implicit order.
+    // Implicitly ordered by: 'key' asc, 'sort' asc, __name__ asc
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc2", "doc4", "doc3");
+
+    snapshot =
+        waitFor(
+            testHelper
+                .query(collection)
+                .whereLessThan(FieldPath.documentId(), "doc5")
+                .whereGreaterThan("sort", 1)
+                .whereNotEqualTo("key", "a")
+                .orderBy("sort", Direction.DESCENDING)
+                .get());
+    // Ordered by: 'sort' desc,'key' desc,  __name__ desc
+    testHelper.assertSnapshotResultIdsMatch(snapshot, "doc2", "doc3", "doc4");
+  }
+
+  @Test
+  public void testMultipleInequalityReadFromCacheWhenOffline() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection =
+        testHelper.withTestDocs(
+            map(
+                "doc1", map("key", "a", "sort", 1),
+                "doc2", map("key", "aa", "sort", 4),
+                "doc3", map("key", "b", "sort", 3),
+                "doc4", map("key", "b", "sort", 2)));
+
+    Query query =
+        testHelper.query(collection).whereNotEqualTo("key", "a").whereLessThanOrEqualTo("sort", 3);
+
+    // populate the cache.
+    QuerySnapshot snapshot1 = waitFor(query.get());
+    assertEquals(2L, snapshot1.size());
+    assertFalse(snapshot1.getMetadata().isFromCache());
+
+    waitFor(collection.firestore.getClient().disableNetwork());
+
+    QuerySnapshot snapshot2 = waitFor(query.get());
+    assertEquals(2L, snapshot2.size());
+    assertTrue(snapshot2.getMetadata().isFromCache());
+    // Implicitly ordered by: 'key' asc, 'sort' asc, __name__ asc
+    testHelper.assertSnapshotResultIdsMatch(snapshot2, "doc4", "doc3");
+  }
+
+  @Test
+  public void testMultipleInequalityFromCacheAndFromServer() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection =
+        testHelper.withTestDocs(
+            map(
+                "doc1",
+                map("a", 1, "b", 0),
+                "doc2",
+                map("a", 2, "b", 1),
+                "doc3",
+                map("a", 3, "b", 2),
+                "doc4",
+                map("a", 1, "b", 3),
+                "doc5",
+                map("a", 1, "b", 1)));
+
+    // implicit AND: a != 1 && b < 2
+    Query query1 = testHelper.query(collection).whereNotEqualTo("a", 1).whereLessThan("b", 2);
+    testHelper.assertOnlineAndOfflineResultsMatch(query1, "doc2");
+
+    // explicit AND: a != 1 && b < 2
+    Query query2 = testHelper.query(collection).where(and(notEqualTo("a", 1), lessThan("b", 2)));
+    testHelper.assertOnlineAndOfflineResultsMatch(query2, "doc2");
+
+    // explicit AND: a < 3 && b not-in [2, 3]
+    // Implicitly ordered by: a asc, b asc, __name__ asc
+    Query query3 =
+        testHelper.query(collection).where(and(lessThan("a", 3), notInArray("b", asList(2, 3))));
+    testHelper.assertOnlineAndOfflineResultsMatch(query3, "doc1", "doc5", "doc2");
+
+    // a <3 && b != 0, ordered by: b desc, a desc, __name__ desc
+    Query query4 =
+        testHelper
+            .query(collection)
+            .whereLessThan("a", 3)
+            .whereNotEqualTo("b", 0)
+            .orderBy("b", Direction.DESCENDING)
+            .limit(2);
+    testHelper.assertOnlineAndOfflineResultsMatch(query4, "doc4", "doc2");
+
+    // explicit OR: a>2 || b<1.
+    Query query5 = testHelper.query(collection).where(or(greaterThan("a", 2), lessThan("b", 1)));
+    testHelper.assertOnlineAndOfflineResultsMatch(query5, "doc1", "doc3");
+  }
+
+  @Test
+  public void testMultipleInequalityRejectsIfDocumentKeyIsNotTheLastOrderByField() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection = testHelper.withTestCollection();
+
+    // Implicitly ordered by:  __name__ asc, 'key' asc,
+    Query query =
+        testHelper.query(collection).whereNotEqualTo("key", 42).orderBy(FieldPath.documentId());
+    Exception e = waitForException(query.get());
+    FirebaseFirestoreException firestoreException = (FirebaseFirestoreException) e;
+    assertTrue(
+        firestoreException
+            .getMessage()
+            .toLowerCase()
+            .contains("order by clause cannot contain more fields after the key"));
+  }
+
+  @Test
+  public void testMultipleInequalityRejectsIfDocumentKeyAppearsOnlyInEqualityFilter() {
+    CompositeIndexTestHelper testHelper = new CompositeIndexTestHelper();
+
+    CollectionReference collection = testHelper.withTestCollection();
+
+    Query query =
+        testHelper
+            .query(collection)
+            .whereNotEqualTo("key", 42)
+            .whereEqualTo(FieldPath.documentId(), "doc1");
+    Exception e = waitForException(query.get());
+    FirebaseFirestoreException firestoreException = (FirebaseFirestoreException) e;
+    assertTrue(
+        firestoreException
+            .getMessage()
+            .contains(
+                "Equality on key is not allowed if there are other inequality fields and key does not appear in inequalities."));
+  }
+}
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CountTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CountTest.java
new file mode 100644
index 00000000000..5fabaf019e3
--- /dev/null
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CountTest.java
@@ -0,0 +1,290 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.isRunningAgainstEmulator;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testCollection;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testCollectionWithDocs;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testFirestore;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitFor;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitForException;
+import static com.google.firebase.firestore.testutil.TestUtil.map;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.firestore.model.DatabaseId;
+import com.google.firebase.firestore.testutil.IntegrationTestUtil;
+import java.util.Collections;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class CountTest {
+
+  @After
+  public void tearDown() {
+    IntegrationTestUtil.tearDown();
+  }
+
+  @Test
+  public void testCountQueryEquals() {
+    CollectionReference coll1 = testCollection("foo");
+    CollectionReference coll1_same = coll1.firestore.collection(coll1.getPath());
+    AggregateQuery query1 = coll1.count();
+    AggregateQuery query1_same = coll1_same.count();
+    AggregateQuery query2 =
+        coll1.document("bar").collection("baz").whereEqualTo("a", 1).limit(100).count();
+    AggregateQuery query2_same =
+        coll1.document("bar").collection("baz").whereEqualTo("a", 1).limit(100).count();
+    AggregateQuery query3 =
+        coll1.document("bar").collection("baz").whereEqualTo("b", 1).orderBy("c").count();
+    AggregateQuery query3_same =
+        coll1.document("bar").collection("baz").whereEqualTo("b", 1).orderBy("c").count();
+
+    assertTrue(query1.equals(query1_same));
+    assertTrue(query2.equals(query2_same));
+    assertTrue(query3.equals(query3_same));
+
+    assertEquals(query1.hashCode(), query1_same.hashCode());
+    assertEquals(query2.hashCode(), query2_same.hashCode());
+    assertEquals(query3.hashCode(), query3_same.hashCode());
+
+    assertFalse(query1.equals(null));
+    assertFalse(query1.equals("string"));
+    assertFalse(query1.equals(query2));
+    assertFalse(query2.equals(query3));
+    assertNotEquals(query1.hashCode(), query2.hashCode());
+    assertNotEquals(query2.hashCode(), query3.hashCode());
+  }
+
+  @Test
+  public void testCanRunCount() {
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("k", "a"),
+                "b", map("k", "b"),
+                "c", map("k", "c")));
+
+    AggregateQuerySnapshot snapshot = waitFor(collection.count().get(AggregateSource.SERVER));
+    assertEquals(3L, snapshot.getCount());
+  }
+
+  @Test
+  public void testCanRunCountWithFilters() {
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("k", "a"),
+                "b", map("k", "b"),
+                "c", map("k", "c")));
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.whereEqualTo("k", "b").count().get(AggregateSource.SERVER));
+    assertEquals(1L, snapshot.getCount());
+  }
+
+  @Test
+  public void testCanRunCountWithOrderBy() {
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("k", "a"),
+                "b", map("k", "b"),
+                "c", map("k", "c"),
+                "d", map("absent", "d")));
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.orderBy("k").count().get(AggregateSource.SERVER));
+    // "d" is filtered out because it is ordered by "k".
+    assertEquals(3L, snapshot.getCount());
+  }
+
+  @Test
+  public void testTerminateDoesNotCrashWithFlyingCountQuery() {
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("k", "a"),
+                "b", map("k", "b"),
+                "c", map("k", "c")));
+
+    collection.orderBy("k").count().get(AggregateSource.SERVER);
+    waitFor(collection.firestore.terminate());
+  }
+
+  @Test
+  public void testCountSnapshotEquals() {
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("k", "a"),
+                "b", map("k", "b"),
+                "c", map("k", "c")));
+
+    AggregateQuerySnapshot snapshot1 =
+        waitFor(collection.whereEqualTo("k", "b").count().get(AggregateSource.SERVER));
+    AggregateQuerySnapshot snapshot1_same =
+        waitFor(collection.whereEqualTo("k", "b").count().get(AggregateSource.SERVER));
+
+    AggregateQuerySnapshot snapshot2 =
+        waitFor(collection.whereEqualTo("k", "a").count().get(AggregateSource.SERVER));
+    waitFor(collection.document("d").set(map("k", "a")));
+    AggregateQuerySnapshot snapshot2_different =
+        waitFor(collection.whereEqualTo("k", "a").count().get(AggregateSource.SERVER));
+
+    assertTrue(snapshot1.equals(snapshot1_same));
+    assertEquals(snapshot1.hashCode(), snapshot1_same.hashCode());
+    assertTrue(snapshot1.getQuery().equals(collection.whereEqualTo("k", "b").count()));
+
+    assertFalse(snapshot1.equals(null));
+    assertFalse(snapshot1.equals("string"));
+    assertFalse(snapshot1.equals(snapshot2));
+    assertNotEquals(snapshot1.hashCode(), snapshot2.hashCode());
+    assertFalse(snapshot2.equals(snapshot2_different));
+    assertNotEquals(snapshot2.hashCode(), snapshot2_different.hashCode());
+  }
+
+  @Test
+  public void testCanRunCountCollectionGroupQuery() {
+    FirebaseFirestore db = testFirestore();
+    // Use .document() to get a random collection group name to use but ensure it starts with 'b'
+    // for predictable ordering.
+    String collectionGroup = "b" + db.collection("foo").document().getId();
+
+    String[] docPaths =
+        new String[] {
+          "abc/123/${collectionGroup}/cg-doc1",
+          "abc/123/${collectionGroup}/cg-doc2",
+          "${collectionGroup}/cg-doc3",
+          "${collectionGroup}/cg-doc4",
+          "def/456/${collectionGroup}/cg-doc5",
+          "${collectionGroup}/virtual-doc/nested-coll/not-cg-doc",
+          "x${collectionGroup}/not-cg-doc",
+          "${collectionGroup}x/not-cg-doc",
+          "abc/123/${collectionGroup}x/not-cg-doc",
+          "abc/123/x${collectionGroup}/not-cg-doc",
+          "abc/${collectionGroup}"
+        };
+    WriteBatch batch = db.batch();
+    for (String path : docPaths) {
+      batch.set(db.document(path.replace("${collectionGroup}", collectionGroup)), map("x", 1));
+    }
+    waitFor(batch.commit());
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(db.collectionGroup(collectionGroup).count().get(AggregateSource.SERVER));
+    assertEquals(
+        5L, // "cg-doc1", "cg-doc2", "cg-doc3", "cg-doc4", "cg-doc5",
+        snapshot.getCount());
+  }
+
+  @Test
+  public void testCanRunCountAggregateWithFiltersAndLimits() {
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("k", "a"),
+                "b", map("k", "a"),
+                "c", map("k", "a"),
+                "d", map("k", "d")));
+
+    AggregateQuerySnapshot snapshot =
+        waitFor(collection.whereEqualTo("k", "a").limit(2).count().get(AggregateSource.SERVER));
+    assertEquals(2L, snapshot.getCount());
+
+    snapshot =
+        waitFor(
+            collection.whereEqualTo("k", "a").limitToLast(2).count().get(AggregateSource.SERVER));
+    assertEquals(2L, snapshot.getCount());
+
+    snapshot =
+        waitFor(
+            collection
+                .whereEqualTo("k", "d")
+                .limitToLast(1000)
+                .count()
+                .get(AggregateSource.SERVER));
+    assertEquals(1L, snapshot.getCount());
+  }
+
+  @Test
+  public void testCanRunCountOnNonExistentCollection() {
+    CollectionReference collection = testFirestore().collection("random-coll");
+
+    AggregateQuerySnapshot snapshot = waitFor(collection.count().get(AggregateSource.SERVER));
+    assertEquals(0L, snapshot.getCount());
+
+    snapshot = waitFor(collection.whereEqualTo("k", 100).count().get(AggregateSource.SERVER));
+    assertEquals(0L, snapshot.getCount());
+  }
+
+  @Test
+  public void testCountFailWithoutNetwork() {
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("k", "a"),
+                "b", map("k", "b"),
+                "c", map("k", "c")));
+    waitFor(collection.getFirestore().disableNetwork());
+
+    Exception e = waitForException(collection.count().get(AggregateSource.SERVER));
+    assertThat(e, instanceOf(FirebaseFirestoreException.class));
+    assertEquals(
+        FirebaseFirestoreException.Code.UNAVAILABLE, ((FirebaseFirestoreException) e).getCode());
+
+    waitFor(collection.getFirestore().enableNetwork());
+    AggregateQuerySnapshot snapshot = waitFor(collection.count().get(AggregateSource.SERVER));
+    assertEquals(3L, snapshot.getCount());
+  }
+
+  @Test
+  public void testCountErrorMessageShouldContainConsoleLinkIfMissingIndex() {
+    assumeFalse(
+        "Skip this test when running against the Firestore emulator because the Firestore emulator "
+            + "does not use indexes and never fails with a 'missing index' error",
+        isRunningAgainstEmulator());
+
+    CollectionReference collection = testCollectionWithDocs(Collections.emptyMap());
+    Query compositeIndexQuery = collection.whereEqualTo("field1", 42).whereLessThan("field2", 99);
+    AggregateQuery compositeIndexCountQuery = compositeIndexQuery.count();
+    Task<AggregateQuerySnapshot> task = compositeIndexCountQuery.get(AggregateSource.SERVER);
+
+    Throwable throwable = assertThrows(Throwable.class, () -> waitFor(task));
+
+    Throwable cause = throwable.getCause();
+    assertThat(cause).hasMessageThat().ignoringCase().contains("index");
+    // TODO(b/316359394) Remove this check for the default databases once cl/582465034 is rolled
+    // out to production.
+    if (collection
+        .firestore
+        .getDatabaseId()
+        .getDatabaseId()
+        .equals(DatabaseId.DEFAULT_DATABASE_ID)) {
+      assertThat(cause).hasMessageThat().contains("https://console.firebase.google.com");
+    }
+  }
+}
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/DocumentSnapshotTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/DocumentSnapshotTest.java
new file mode 100644
index 00000000000..420d2abc18d
--- /dev/null
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/DocumentSnapshotTest.java
@@ -0,0 +1,67 @@
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testCollection;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitFor;
+import static com.google.firebase.firestore.testutil.TestUtil.map;
+import static org.junit.Assert.assertEquals;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.firestore.testutil.IntegrationTestUtil;
+import java.util.Map;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DocumentSnapshotTest {
+  @After
+  public void tearDown() {
+    IntegrationTestUtil.tearDown();
+  }
+
+  @Test
+  public void testCanUpdateAnExistingDocument() {
+    DocumentReference documentReference = testCollection("rooms").document("eros");
+    Map<String, Object> initialValue =
+        map("desc", "Description", "owner", map("name", "Jonny", "email", "abc@xyz.com"));
+    waitFor(documentReference.set(initialValue));
+
+    DocumentSnapshot snapshot1 = waitFor(documentReference.get());
+    DocumentSnapshot snapshot2 = waitFor(documentReference.get());
+    DocumentSnapshot snapshot3 = waitFor(documentReference.get());
+    assertEquals(snapshot1.getMetadata(), snapshot2.getMetadata());
+    assertEquals(snapshot2.getMetadata(), snapshot3.getMetadata());
+
+    assertEquals(snapshot1.getId(), snapshot2.getId());
+    assertEquals(snapshot2.getId(), snapshot3.getId());
+
+    assertEquals(snapshot1.exists(), snapshot2.exists());
+    assertEquals(snapshot2.exists(), snapshot3.exists());
+
+    assertEquals(snapshot1.getReference(), snapshot2.getReference());
+    assertEquals(snapshot2.getReference(), snapshot3.getReference());
+
+    assertEquals(snapshot1.getData(), snapshot2.getData());
+    assertEquals(snapshot2.getData(), snapshot3.getData());
+
+    assertEquals(snapshot1.getData(), snapshot2.getData());
+    assertEquals(snapshot2.getData(), snapshot3.getData());
+
+    assertEquals(snapshot1, snapshot2);
+    assertEquals(snapshot2, snapshot3);
+  }
+}
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
index 365ed0261a7..631dcec4dd8 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java
@@ -15,6 +15,7 @@
 package com.google.firebase.firestore;
 
 import static com.google.firebase.firestore.AccessHelper.getAsyncQueue;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.isRunningAgainstEmulator;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.newTestSettings;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.provider;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testChangeUserTo;
@@ -35,8 +36,10 @@
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
@@ -46,6 +49,7 @@
 import com.google.firebase.firestore.FirebaseFirestoreException.Code;
 import com.google.firebase.firestore.Query.Direction;
 import com.google.firebase.firestore.auth.User;
+import com.google.firebase.firestore.model.DatabaseId;
 import com.google.firebase.firestore.testutil.EventAccumulator;
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
 import com.google.firebase.firestore.util.AsyncQueue.TimerId;
@@ -1131,6 +1135,85 @@ public void testAppDeleteLeadsToFirestoreTerminate() {
     assertTrue(instance.getClient().isTerminated());
   }
 
+  @Test
+  public void testDefaultNamedDbIsSame() {
+    FirebaseApp app = FirebaseApp.getInstance();
+    FirebaseFirestore db1 = FirebaseFirestore.getInstance();
+    FirebaseFirestore db2 = FirebaseFirestore.getInstance(app);
+    FirebaseFirestore db3 = FirebaseFirestore.getInstance(app, "(default)");
+    FirebaseFirestore db4 = FirebaseFirestore.getInstance("(default)");
+
+    assertSame(db1, db2);
+    assertSame(db1, db3);
+    assertSame(db1, db4);
+  }
+
+  @Test
+  public void testSameNamedDbIsSame() {
+    FirebaseApp app = FirebaseApp.getInstance();
+    FirebaseFirestore db1 = FirebaseFirestore.getInstance(app, "myDb");
+    FirebaseFirestore db2 = FirebaseFirestore.getInstance("myDb");
+
+    assertSame(db1, db2);
+  }
+
+  @Test
+  public void testDifferentDbNamesAreDifferent() {
+    FirebaseFirestore db1 = FirebaseFirestore.getInstance();
+    FirebaseFirestore db2 = FirebaseFirestore.getInstance("db1");
+    FirebaseFirestore db3 = FirebaseFirestore.getInstance("db2");
+
+    assertNotSame(db1, db2);
+    assertNotSame(db1, db3);
+    assertNotSame(db2, db3);
+  }
+
+  @Test
+  public void testNamedDbHaveDifferentPersistence() {
+    // TODO: Have backend with named databases created beforehand.
+    // Emulator doesn't care if database was created beforehand.
+    assumeTrue(isRunningAgainstEmulator());
+
+    // FirebaseFirestore db1 = FirebaseFirestore.getInstance();
+    String projectId = provider().projectId();
+    FirebaseFirestore db1 =
+        testFirestore(
+            DatabaseId.forDatabase(projectId, "db1"),
+            Level.DEBUG,
+            newTestSettings(),
+            "dbPersistenceKey");
+    FirebaseFirestore db2 =
+        testFirestore(
+            DatabaseId.forDatabase(projectId, "db2"),
+            Level.DEBUG,
+            newTestSettings(),
+            "dbPersistenceKey");
+
+    DocumentReference docRef = db1.collection("col1").document("doc1");
+    waitFor(docRef.set(Collections.singletonMap("foo", "bar")));
+    assertEquals(waitFor(docRef.get(Source.SERVER)).get("foo"), "bar");
+
+    String path = docRef.getPath();
+    DocumentReference docRef2 = db2.document(path);
+
+    {
+      Exception e = waitForException(docRef2.get(Source.CACHE));
+      assertEquals(Code.UNAVAILABLE, ((FirebaseFirestoreException) e).getCode());
+    }
+
+    {
+      Task<DocumentSnapshot> task = docRef2.get(Source.SERVER);
+      DocumentSnapshot result = waitFor(task);
+      assertNull(result.getDocument());
+    }
+
+    {
+      Task<DocumentSnapshot> task = docRef2.get(Source.DEFAULT);
+      DocumentSnapshot result = waitFor(task);
+      assertNull(result.getDocument());
+    }
+  }
+
   @Test
   public void testNewOperationThrowsAfterFirestoreTerminate() {
     FirebaseFirestore instance = testFirestore();
@@ -1241,4 +1324,172 @@ public void testPendingWriteTaskResolveWhenOfflineIfThereIsNoPending() {
 
     assertTrue(awaitsPendingWrites.isComplete() && awaitsPendingWrites.isSuccessful());
   }
+
+  @Test
+  public void testLegacyCacheConfigForMemoryCache() {
+    FirebaseFirestore instance = testFirestore();
+    instance.setFirestoreSettings(
+        new FirebaseFirestoreSettings.Builder(newTestSettings())
+            .setPersistenceEnabled(false)
+            .build());
+
+    waitFor(instance.document("coll/doc").set(map("foo", "bar")));
+
+    assertThrows(
+        RuntimeException.class, () -> waitFor(instance.document("coll/doc").get(Source.CACHE)));
+  }
+
+  @Test
+  public void testLegacyCacheConfigForPersistentCache() {
+    FirebaseFirestore instance = testFirestore();
+    instance.setFirestoreSettings(
+        new FirebaseFirestoreSettings.Builder(newTestSettings())
+            .setPersistenceEnabled(true)
+            .build());
+
+    waitFor(instance.document("coll/doc").set(map("foo", "bar")));
+
+    DocumentSnapshot snap = waitFor(instance.document("coll/doc").get(Source.CACHE));
+    assertEquals(map("foo", "bar"), snap.getData());
+  }
+
+  @Test
+  public void testNewCacheConfigForMemoryCache() {
+    FirebaseFirestore instance = testFirestore();
+    instance.setFirestoreSettings(
+        new FirebaseFirestoreSettings.Builder(newTestSettings())
+            .setLocalCacheSettings(MemoryCacheSettings.newBuilder().build())
+            .build());
+
+    waitFor(instance.document("coll/doc").set(map("foo", "bar")));
+
+    assertThrows(
+        RuntimeException.class, () -> waitFor(instance.document("coll/doc").get(Source.CACHE)));
+  }
+
+  @Test
+  public void testNewCacheConfigForPersistentCache() {
+    FirebaseFirestore instance = testFirestore();
+    instance.setFirestoreSettings(
+        new FirebaseFirestoreSettings.Builder(newTestSettings())
+            .setLocalCacheSettings(PersistentCacheSettings.newBuilder().build())
+            .build());
+
+    waitFor(instance.document("coll/doc").set(map("foo", "bar")));
+
+    DocumentSnapshot snap = waitFor(instance.document("coll/doc").get(Source.CACHE));
+    assertEquals(map("foo", "bar"), snap.getData());
+  }
+
+  @Test
+  public void testCanGetDocumentWithMemoryLruGCEnabled() {
+    FirebaseFirestore db = testFirestore();
+    db.setFirestoreSettings(
+        new FirebaseFirestoreSettings.Builder(db.getFirestoreSettings())
+            .setLocalCacheSettings(
+                MemoryCacheSettings.newBuilder()
+                    .setGcSettings(MemoryLruGcSettings.newBuilder().build())
+                    .build())
+            .build());
+
+    DocumentReference doc = db.collection("abc").document("123");
+    waitFor(doc.set(map("key", "value")));
+
+    DocumentSnapshot snapshot = waitFor(doc.get(Source.CACHE));
+    assertTrue(snapshot.exists());
+    assertTrue(snapshot.getMetadata().isFromCache());
+    assertEquals(snapshot.getData(), map("key", "value"));
+  }
+
+  @Test
+  public void testCannotGetDocumentWithMemoryEagerGcEnabled() {
+    FirebaseFirestore db = testFirestore();
+    db.setFirestoreSettings(
+        new FirebaseFirestoreSettings.Builder(db.getFirestoreSettings())
+            .setLocalCacheSettings(
+                MemoryCacheSettings.newBuilder()
+                    .setGcSettings(MemoryEagerGcSettings.newBuilder().build())
+                    .build())
+            .build());
+
+    DocumentReference doc = db.collection("abc").document("123");
+    waitFor(doc.set(map("key", "value")));
+
+    Exception e = waitForException(doc.get(Source.CACHE));
+    assertTrue(e instanceof FirebaseFirestoreException);
+    assertEquals(((FirebaseFirestoreException) e).getCode(), Code.UNAVAILABLE);
+  }
+
+  @Test
+  public void testGetPersistentCacheIndexManager() {
+    // Use persistent disk cache (explicit)
+    FirebaseFirestore db1 = testFirestore();
+    FirebaseFirestoreSettings settings1 =
+        new FirebaseFirestoreSettings.Builder(db1.getFirestoreSettings())
+            .setLocalCacheSettings(PersistentCacheSettings.newBuilder().build())
+            .build();
+    db1.setFirestoreSettings(settings1);
+    assertNotNull(db1.getPersistentCacheIndexManager());
+
+    // Use persistent disk cache (default)
+    FirebaseFirestore db2 = testFirestore();
+    assertNotNull(db2.getPersistentCacheIndexManager());
+
+    // Disable persistent disk cache
+    FirebaseFirestore db3 = testFirestore();
+    FirebaseFirestoreSettings settings3 =
+        new FirebaseFirestoreSettings.Builder(db1.getFirestoreSettings())
+            .setLocalCacheSettings(MemoryCacheSettings.newBuilder().build())
+            .build();
+    db3.setFirestoreSettings(settings3);
+    assertNull(db3.getPersistentCacheIndexManager());
+
+    // Disable persistent disk cache (deprecated)
+    FirebaseFirestore db4 = testFirestore();
+    FirebaseFirestoreSettings settings4 =
+        new FirebaseFirestoreSettings.Builder(db4.getFirestoreSettings())
+            .setPersistenceEnabled(false)
+            .build();
+    db4.setFirestoreSettings(settings4);
+    assertNull(db4.getPersistentCacheIndexManager());
+  }
+
+  @Test
+  public void testCanGetSameOrDifferentPersistentCacheIndexManager() {
+    // Use persistent disk cache (explicit)
+    FirebaseFirestore db1 = testFirestore();
+    FirebaseFirestoreSettings settings1 =
+        new FirebaseFirestoreSettings.Builder(db1.getFirestoreSettings())
+            .setLocalCacheSettings(PersistentCacheSettings.newBuilder().build())
+            .build();
+    db1.setFirestoreSettings(settings1);
+    PersistentCacheIndexManager indexManager1 = db1.getPersistentCacheIndexManager();
+    PersistentCacheIndexManager indexManager2 = db1.getPersistentCacheIndexManager();
+    assertSame(indexManager1, indexManager2);
+
+    // Use persistent disk cache (default)
+    FirebaseFirestore db2 = testFirestore();
+    PersistentCacheIndexManager indexManager3 = db2.getPersistentCacheIndexManager();
+    PersistentCacheIndexManager indexManager4 = db2.getPersistentCacheIndexManager();
+    assertSame(indexManager3, indexManager4);
+
+    assertNotSame(indexManager1, indexManager3);
+
+    FirebaseFirestore db3 = testFirestore();
+    FirebaseFirestoreSettings settings3 =
+        new FirebaseFirestoreSettings.Builder(db3.getFirestoreSettings())
+            .setLocalCacheSettings(PersistentCacheSettings.newBuilder().build())
+            .build();
+    db3.setFirestoreSettings(settings3);
+    PersistentCacheIndexManager indexManager5 = db3.getPersistentCacheIndexManager();
+    assertNotSame(indexManager1, indexManager5);
+    assertNotSame(indexManager3, indexManager5);
+
+    // Use persistent disk cache (default)
+    FirebaseFirestore db4 = testFirestore();
+    PersistentCacheIndexManager indexManager6 = db4.getPersistentCacheIndexManager();
+    assertNotSame(indexManager1, indexManager6);
+    assertNotSame(indexManager3, indexManager6);
+    assertNotSame(indexManager5, indexManager6);
+  }
 }
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/IndexingTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/IndexingTest.java
index ce13dfb937a..e6bc9a0a5b3 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/IndexingTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/IndexingTest.java
@@ -14,7 +14,13 @@
 
 package com.google.firebase.firestore;
 
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testCollectionWithDocs;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testFirestore;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitFor;
+import static com.google.firebase.firestore.testutil.TestUtil.assertDoesNotThrow;
+import static com.google.firebase.firestore.testutil.TestUtil.expectError;
+import static com.google.firebase.firestore.testutil.TestUtil.map;
+import static org.junit.Assert.assertEquals;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
@@ -101,4 +107,91 @@ public void testBadIndexDoesNotCrashClient() {
                     + "  \"fieldOverrides\": []\n"
                     + "}"));
   }
+
+  /**
+   * After Auto Index Creation is enabled, through public API there is no way to state of indexes
+   * sitting inside SDK. So this test only checks the API of auto index creation.
+   */
+  @Test
+  public void testAutoIndexCreationSetSuccessfully() {
+    // Use persistent disk cache (explicit)
+    FirebaseFirestore db = testFirestore();
+    FirebaseFirestoreSettings settings =
+        new FirebaseFirestoreSettings.Builder(db.getFirestoreSettings())
+            .setLocalCacheSettings(PersistentCacheSettings.newBuilder().build())
+            .build();
+    db.setFirestoreSettings(settings);
+
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("match", true),
+                "b", map("match", false),
+                "c", map("match", false)));
+    QuerySnapshot results = waitFor(collection.whereEqualTo("match", true).get());
+    assertEquals(1, results.size());
+
+    assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().enableIndexAutoCreation());
+    results = waitFor(collection.whereEqualTo("match", true).get(Source.CACHE));
+    assertEquals(1, results.size());
+
+    assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().disableIndexAutoCreation());
+    results = waitFor(collection.whereEqualTo("match", true).get(Source.CACHE));
+    assertEquals(1, results.size());
+
+    assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().deleteAllIndexes());
+    results = waitFor(collection.whereEqualTo("match", true).get(Source.CACHE));
+    assertEquals(1, results.size());
+  }
+
+  /**
+   * After Auto Index Creation is enabled, through public API there is no way to state of indexes
+   * sitting inside SDK. So this test only checks the API of auto index creation.
+   */
+  @Test
+  public void testAutoIndexCreationSetSuccessfullyUsingDefault() {
+    // Use persistent disk cache (default)
+    FirebaseFirestore db = testFirestore();
+
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("match", true),
+                "b", map("match", false),
+                "c", map("match", false)));
+    QuerySnapshot results = waitFor(collection.whereEqualTo("match", true).get());
+    assertEquals(1, results.size());
+
+    assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().enableIndexAutoCreation());
+    results = waitFor(collection.whereEqualTo("match", true).get(Source.CACHE));
+    assertEquals(1, results.size());
+
+    assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().disableIndexAutoCreation());
+    results = waitFor(collection.whereEqualTo("match", true).get(Source.CACHE));
+    assertEquals(1, results.size());
+
+    assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().deleteAllIndexes());
+    results = waitFor(collection.whereEqualTo("match", true).get(Source.CACHE));
+    assertEquals(1, results.size());
+  }
+
+  @Test
+  public void testAutoIndexCreationAfterFailsTermination() {
+    FirebaseFirestore db = testFirestore();
+    waitFor(db.terminate());
+
+    expectError(
+        () -> db.getPersistentCacheIndexManager().enableIndexAutoCreation(),
+        "The client has already been terminated");
+
+    expectError(
+        () -> db.getPersistentCacheIndexManager().disableIndexAutoCreation(),
+        "The client has already been terminated");
+
+    expectError(
+        () -> db.getPersistentCacheIndexManager().deleteAllIndexes(),
+        "The client has already been terminated");
+  }
+
+  // TODO(b/296100693) Add testing hooks to verify indexes are created as expected.
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/LoadBundleTaskTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/LoadBundleTaskTest.java
similarity index 61%
rename from firebase-firestore/src/test/java/com/google/firebase/firestore/LoadBundleTaskTest.java
rename to firebase-firestore/src/androidTest/java/com/google/firebase/firestore/LoadBundleTaskTest.java
index 7d3e8d69a39..a311333ffdc 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/LoadBundleTaskTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/LoadBundleTaskTest.java
@@ -14,39 +14,50 @@
 
 package com.google.firebase.firestore;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.not;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitFor;
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import android.app.Activity;
+import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.rule.ActivityTestRule;
 import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.android.gms.tasks.Tasks;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ErrorCollector;
 import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.android.controller.ActivityController;
-import org.robolectric.annotation.Config;
 
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
+@RunWith(AndroidJUnit4.class)
 public class LoadBundleTaskTest {
   static final LoadBundleTaskProgress SUCCESS_RESULT =
       new LoadBundleTaskProgress(0, 0, 0, 0, null, LoadBundleTaskProgress.TaskState.SUCCESS);
   static final Exception TEST_EXCEPTION = new Exception("Test Exception");
   static final String TEST_THREAD_NAME = "test-thread";
 
-  @Rule public ErrorCollector collector = new ErrorCollector();
+  static class TestActivity extends Activity {}
+
+  @Rule
+  public ActivityTestRule<ListenerRegistrationTest.TestActivity> activityTestRule =
+      new ActivityTestRule<>(
+          ListenerRegistrationTest.TestActivity.class,
+          /*initialTouchMode=*/ false,
+          /*launchActivity=*/ false);
 
   Executor testExecutor =
       Executors.newSingleThreadExecutor(
@@ -55,9 +66,6 @@ public class LoadBundleTaskTest {
             t.setName(TEST_THREAD_NAME);
             return t;
           });
-  ActivityController<Activity> activityController =
-      Robolectric.buildActivity(Activity.class).create();
-  Activity activity = activityController.get();
 
   @Test
   public void testImplementsAllTaskInterface() {
@@ -86,59 +94,67 @@ public void testImplementsAllTaskInterface() {
   }
 
   @Test
-  public void testSuccessListener() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(3);
+  public void testSuccessListener() {
+    List<TaskCompletionSource> sources = taskSourceOf(3);
 
     LoadBundleTask task = new LoadBundleTask();
-    task.addOnSuccessListener(progress -> latch.countDown());
-    task.addOnSuccessListener(testExecutor, progress -> latch.countDown());
-    task.addOnSuccessListener(activity, progress -> latch.countDown());
+    task.addOnSuccessListener(progress -> sources.get(0).setResult(0));
+    task.addOnSuccessListener(testExecutor, progress -> sources.get(1).setResult(1));
+    ListenerRegistrationTest.TestActivity activity =
+        activityTestRule.launchActivity(/*intent=*/ null);
+    task.addOnSuccessListener(activity, progress -> sources.get(2).setResult(2));
 
     task.setResult(SUCCESS_RESULT);
 
-    latch.await();
+    assertSourcesResolveTo(sources, 0, 1, 2);
   }
 
   @Test
-  public void testFailureListener() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(3);
+  public void testFailureListener() {
+    List<TaskCompletionSource> sources = taskSourceOf(3);
 
     LoadBundleTask task = new LoadBundleTask();
-    task.addOnFailureListener(progress -> latch.countDown());
-    task.addOnFailureListener(testExecutor, progress -> latch.countDown());
-    task.addOnFailureListener(activity, progress -> latch.countDown());
+    task.addOnFailureListener(progress -> sources.get(0).setResult(0));
+    task.addOnFailureListener(testExecutor, progress -> sources.get(1).setResult(1));
+    ListenerRegistrationTest.TestActivity activity =
+        activityTestRule.launchActivity(/*intent=*/ null);
+    task.addOnFailureListener(activity, progress -> sources.get(2).setResult(2));
 
     task.setException(TEST_EXCEPTION);
 
-    latch.await();
+    assertSourcesResolveTo(sources, 0, 1, 2);
   }
 
   @Test
-  public void testCompleteListener() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(3);
+  public void testCompleteListener() {
+    List<TaskCompletionSource> sources = taskSourceOf(3);
 
     LoadBundleTask task = new LoadBundleTask();
-    task.addOnCompleteListener(progress -> latch.countDown());
-    task.addOnCompleteListener(testExecutor, progress -> latch.countDown());
-    task.addOnCompleteListener(activity, progress -> latch.countDown());
+    task.addOnCompleteListener(progress -> sources.get(0).setResult(0));
+    task.addOnCompleteListener(testExecutor, progress -> sources.get(1).setResult(1));
+    ListenerRegistrationTest.TestActivity activity =
+        activityTestRule.launchActivity(/*intent=*/ null);
+    task.addOnCompleteListener(activity, progress -> sources.get(2).setResult(2));
 
     task.setResult(SUCCESS_RESULT);
 
-    latch.await();
+    assertSourcesResolveTo(sources, 0, 1, 2);
   }
 
   @Test
-  public void testProgressListener() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(3);
+  public void testProgressListener() {
+    List<TaskCompletionSource> sources = taskSourceOf(3);
 
     LoadBundleTask task = new LoadBundleTask();
-    task.addOnProgressListener(progress -> latch.countDown());
-    task.addOnProgressListener(testExecutor, progress -> latch.countDown());
-    task.addOnProgressListener(activity, progress -> latch.countDown());
+    task.addOnProgressListener(progress -> sources.get(0).setResult(0));
+    task.addOnProgressListener(testExecutor, progress -> sources.get(1).setResult(1));
+    ListenerRegistrationTest.TestActivity activity =
+        activityTestRule.launchActivity(/*intent=*/ null);
+    task.addOnProgressListener(activity, progress -> sources.get(2).setResult(2));
 
     task.updateProgress(SUCCESS_RESULT);
 
-    latch.await();
+    assertSourcesResolveTo(sources, 0, 1, 2);
   }
 
   @Test
@@ -156,53 +172,56 @@ public void testProgressListenerFiresInOrder() throws InterruptedException {
   }
 
   @Test
-  public void testProgressListenerFireOnSpecifiedExecutor() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(2);
+  public void testProgressListenerFireOnSpecifiedExecutor() {
+    List<TaskCompletionSource> sources = taskSourceOf(2);
 
     LoadBundleTask task = new LoadBundleTask();
     task.addOnProgressListener(
         p -> {
           try {
-            collector.checkThat(Thread.currentThread().getName(), not(equalTo(TEST_THREAD_NAME)));
+            assertNotEquals(Thread.currentThread().getName(), TEST_THREAD_NAME);
           } finally {
-            latch.countDown();
+            sources.get(0).setResult(0);
           }
         });
     task.addOnProgressListener(
         testExecutor,
         p -> {
           try {
-            collector.checkThat(Thread.currentThread().getName(), equalTo(TEST_THREAD_NAME));
+            assertEquals(Thread.currentThread().getName(), TEST_THREAD_NAME);
           } finally {
-            latch.countDown();
+            sources.get(1).setResult(1);
           }
         });
 
     task.updateProgress(SUCCESS_RESULT);
 
-    latch.await();
+    assertSourcesResolveTo(sources, 0, 1);
   }
 
   @Test
-  public void testProgressListenerCanAddProgressListener() throws InterruptedException {
-    BlockingQueue<Integer> blockingQueue = new ArrayBlockingQueue<>(3);
+  public void testProgressListenerCanAddProgressListener() {
+    List<TaskCompletionSource> sources = taskSourceOf(3);
 
+    AtomicInteger outerTaskRun = new AtomicInteger();
     LoadBundleTask task = new LoadBundleTask();
     task.addOnProgressListener(
         p1 -> {
-          blockingQueue.add(1);
+          sources.get(outerTaskRun.getAndIncrement()).setResult(outerTaskRun.get());
           task.addOnProgressListener(
               p2 -> {
-                blockingQueue.add(2);
+                sources.get(2).setResult(3);
               });
         });
 
+    // First update runs the outer listener, and registers the inner listener.
     task.updateProgress(SUCCESS_RESULT);
-    assertEquals(1, (long) blockingQueue.take());
 
+    waitFor(sources.get(0).getTask());
+    // Second update runs the outer listener, then the inner listener.
     task.updateProgress(SUCCESS_RESULT);
-    assertEquals(1, (long) blockingQueue.take());
-    assertEquals(2, (long) blockingQueue.take());
+
+    assertSourcesResolveTo(sources, 1, 2, 3);
   }
 
   @Test
@@ -210,7 +229,7 @@ public void testProgressListenerWithSuccess() throws InterruptedException {
     BlockingQueue<LoadBundleTaskProgress> actualSnapshots = new ArrayBlockingQueue<>(3);
 
     LoadBundleTask task = new LoadBundleTask();
-    task.addOnProgressListener(actualSnapshots::add);
+    task.addOnProgressListener(testExecutor, actualSnapshots::add);
 
     LoadBundleTaskProgress initialProgress =
         new LoadBundleTaskProgress(
@@ -236,7 +255,7 @@ public void testProgressListenerWithException() throws InterruptedException {
     BlockingQueue<LoadBundleTaskProgress> actualSnapshots = new ArrayBlockingQueue<>(3);
 
     LoadBundleTask task = new LoadBundleTask();
-    task.addOnProgressListener(actualSnapshots::add);
+    task.addOnProgressListener(testExecutor, actualSnapshots::add);
 
     LoadBundleTaskProgress initialProgress =
         new LoadBundleTaskProgress(
@@ -262,7 +281,7 @@ public void testProgressListenerWithInitialException() throws InterruptedExcepti
     BlockingQueue<LoadBundleTaskProgress> actualSnapshots = new ArrayBlockingQueue<>(3);
 
     LoadBundleTask task = new LoadBundleTask();
-    task.addOnProgressListener(actualSnapshots::add);
+    task.addOnProgressListener(testExecutor, actualSnapshots::add);
 
     LoadBundleTaskProgress failureProgress =
         new LoadBundleTaskProgress(
@@ -272,47 +291,47 @@ public void testProgressListenerWithInitialException() throws InterruptedExcepti
   }
 
   @Test
-  public void testContinueWith() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(2);
+  public void testContinueWith() {
+    List<TaskCompletionSource> sources = taskSourceOf(2);
 
     LoadBundleTask task = new LoadBundleTask();
     task.continueWith(
         task1 -> {
-          latch.countDown();
+          sources.get(0).setResult(0);
           return null;
         });
     task.continueWith(
         testExecutor,
         task1 -> {
-          latch.countDown();
+          sources.get(1).setResult(1);
           return null;
         });
 
     task.setResult(SUCCESS_RESULT);
 
-    latch.await();
+    assertSourcesResolveTo(sources, 0, 1);
   }
 
   @Test
-  public void testContinueWithTask() throws InterruptedException {
-    CountDownLatch latch = new CountDownLatch(2);
+  public void testContinueWithTask() {
+    List<TaskCompletionSource> sources = taskSourceOf(2);
 
     LoadBundleTask task = new LoadBundleTask();
     task.continueWithTask(
         task1 -> {
-          latch.countDown();
+          sources.get(0).setResult(0);
           return null;
         });
     task.continueWithTask(
         testExecutor,
         task1 -> {
-          latch.countDown();
+          sources.get(1).setResult(1);
           return null;
         });
 
     task.setResult(SUCCESS_RESULT);
 
-    latch.await();
+    assertSourcesResolveTo(sources, 0, 1);
   }
 
   @Test
@@ -352,4 +371,20 @@ public void testGetException() {
     task.setException(TEST_EXCEPTION);
     assertEquals(TEST_EXCEPTION, task.getException());
   }
+
+  private List<TaskCompletionSource> taskSourceOf(int size) {
+    List<TaskCompletionSource> result = new ArrayList<>();
+    for (int i = 0; i < size; i++) {
+      result.add(new TaskCompletionSource());
+    }
+    return result;
+  }
+
+  private void assertSourcesResolveTo(
+      @NonNull List<TaskCompletionSource> sources, Object... expected) {
+    Task<List<Object>> listTask =
+        Tasks.whenAllSuccess(sources.stream().map(s -> s.getTask()).collect(Collectors.toList()));
+    waitFor(listTask);
+    assertArrayEquals(Arrays.stream(expected).toArray(), listTask.getResult().toArray());
+  }
 }
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
index e925ea9d9fe..b6ec3d61a51 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java
@@ -14,6 +14,17 @@
 
 package com.google.firebase.firestore;
 
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+import static com.google.firebase.firestore.Filter.and;
+import static com.google.firebase.firestore.Filter.arrayContains;
+import static com.google.firebase.firestore.Filter.arrayContainsAny;
+import static com.google.firebase.firestore.Filter.equalTo;
+import static com.google.firebase.firestore.Filter.inArray;
+import static com.google.firebase.firestore.Filter.or;
+import static com.google.firebase.firestore.remote.TestingHooksUtil.captureExistenceFilterMismatches;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.checkOnlineAndOfflineResultsMatch;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.isRunningAgainstEmulator;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.nullList;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.querySnapshotToIds;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.querySnapshotToValues;
@@ -29,18 +40,25 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
 import com.google.common.collect.Lists;
 import com.google.firebase.firestore.Query.Direction;
+import com.google.firebase.firestore.remote.TestingHooksUtil.ExistenceFilterBloomFilterInfo;
+import com.google.firebase.firestore.remote.TestingHooksUtil.ExistenceFilterMismatchInfo;
 import com.google.firebase.firestore.testutil.EventAccumulator;
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
+import java.text.Normalizer;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicReference;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -156,6 +174,50 @@ public void testListenUnlistenRelistenSequenceOfMirrorQueries() {
     assertEquals(asList(map("k", "e", "sort", -1L), map("k", "a", "sort", -2L)), data);
   }
 
+  @Test
+  public void testLimitToLastQueriesWithCursors() {
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("k", "a", "sort", 0),
+                "b", map("k", "b", "sort", 1),
+                "c", map("k", "c", "sort", 1),
+                "d", map("k", "d", "sort", 2)));
+
+    Query query = collection.limitToLast(3).orderBy("sort").endBefore(2);
+    QuerySnapshot set = waitFor(query.get());
+    List<Map<String, Object>> data = querySnapshotToValues(set);
+    assertEquals(
+        asList(map("k", "a", "sort", 0L), map("k", "b", "sort", 1L), map("k", "c", "sort", 1L)),
+        data);
+
+    query = collection.limitToLast(3).orderBy("sort").endAt(1);
+    set = waitFor(query.get());
+    data = querySnapshotToValues(set);
+    assertEquals(
+        asList(map("k", "a", "sort", 0L), map("k", "b", "sort", 1L), map("k", "c", "sort", 1L)),
+        data);
+
+    query = collection.limitToLast(3).orderBy("sort").startAt(2);
+    set = waitFor(query.get());
+    data = querySnapshotToValues(set);
+    assertEquals(asList(map("k", "d", "sort", 2L)), data);
+
+    query = collection.limitToLast(3).orderBy("sort").startAfter(0);
+    set = waitFor(query.get());
+    data = querySnapshotToValues(set);
+    assertEquals(
+        asList(map("k", "b", "sort", 1L), map("k", "c", "sort", 1L), map("k", "d", "sort", 2L)),
+        data);
+
+    query = collection.limitToLast(3).orderBy("sort").startAfter(-1);
+    set = waitFor(query.get());
+    data = querySnapshotToValues(set);
+    assertEquals(
+        asList(map("k", "b", "sort", 1L), map("k", "c", "sort", 1L), map("k", "d", "sort", 2L)),
+        data);
+  }
+
   @Test
   public void testKeyOrderIsDescendingForDescendingInequality() {
     CollectionReference collection =
@@ -486,6 +548,50 @@ public void testQueriesFireFromCacheWhenOffline() {
     listener.remove();
   }
 
+  @Test
+  public void testQueriesCanRaiseInitialSnapshotFromCachedEmptyResults() {
+    CollectionReference collectionReference = testCollection();
+
+    // Populate the cache with empty query result.
+    QuerySnapshot querySnapshotA = waitFor(collectionReference.get());
+    assertFalse(querySnapshotA.getMetadata().isFromCache());
+    assertEquals(asList(), querySnapshotToValues(querySnapshotA));
+
+    // Add a snapshot listener whose first event should be raised from cache.
+    EventAccumulator<QuerySnapshot> accum = new EventAccumulator<>();
+    ListenerRegistration listenerRegistration =
+        collectionReference.addSnapshotListener(accum.listener());
+    QuerySnapshot querySnapshotB = accum.await();
+    assertTrue(querySnapshotB.getMetadata().isFromCache());
+    assertEquals(asList(), querySnapshotToValues(querySnapshotB));
+
+    listenerRegistration.remove();
+  }
+
+  @Test
+  public void testQueriesCanRaiseInitialSnapshotFromEmptyDueToDeleteCachedResults() {
+    Map<String, Map<String, Object>> testDocs = map("a", map("foo", 1L));
+    CollectionReference collectionReference = testCollectionWithDocs(testDocs);
+    // Populate the cache with single document.
+    QuerySnapshot querySnapshotA = waitFor(collectionReference.get());
+    assertFalse(querySnapshotA.getMetadata().isFromCache());
+    assertEquals(asList(testDocs.get("a")), querySnapshotToValues(querySnapshotA));
+
+    // delete the document, make cached result empty.
+    DocumentReference docRef = collectionReference.document("a");
+    waitFor(docRef.delete());
+
+    // Add a snapshot listener whose first event should be raised from cache.
+    EventAccumulator<QuerySnapshot> accum = new EventAccumulator<>();
+    ListenerRegistration listenerRegistration =
+        collectionReference.addSnapshotListener(accum.listener());
+    QuerySnapshot querySnapshotB = accum.await();
+    assertTrue(querySnapshotB.getMetadata().isFromCache());
+    assertEquals(asList(), querySnapshotToValues(querySnapshotB));
+
+    listenerRegistration.remove();
+  }
+
   @Test
   public void testQueriesCanUseNotEqualFilters() {
     // These documents are ordered by value in "zip" since the notEquals filter is an inequality,
@@ -884,4 +990,644 @@ public void testCollectionGroupQueriesWithWhereFiltersOnArbitraryDocumentIds() {
                 .get());
     assertEquals(asList("cg-doc2"), querySnapshotToIds(querySnapshot));
   }
+
+  // See: https://github.com/firebase/firebase-android-sdk/issues/3528
+  // TODO(Overlay): These two tests should be part of local store tests instead.
+  @Test
+  public void testAddThenUpdatesWhileOffline() {
+    CollectionReference collection = testCollection();
+    collection.getFirestore().disableNetwork();
+
+    collection.add(map("foo", "zzyzx", "bar", "1"));
+
+    QuerySnapshot snapshot1 = waitFor(collection.get(Source.CACHE));
+    assertEquals(asList(map("foo", "zzyzx", "bar", "1")), querySnapshotToValues(snapshot1));
+    DocumentReference doc = snapshot1.getDocuments().get(0).getReference();
+
+    doc.update(map("bar", "2"));
+
+    QuerySnapshot snapshot2 = waitFor(collection.get(Source.CACHE));
+    assertEquals(asList(map("foo", "zzyzx", "bar", "2")), querySnapshotToValues(snapshot2));
+  }
+
+  @Test
+  public void testMultipleUpdatesWhileOffline() {
+    CollectionReference collection = testCollection();
+    collection.getFirestore().disableNetwork();
+
+    DocumentReference doc = collection.document();
+    doc.set(map("foo", "zzyzx", "bar", "1"), SetOptions.mergeFields("foo", "bar"));
+
+    QuerySnapshot snapshot1 = waitFor(collection.get(Source.CACHE));
+    assertEquals(asList(map("foo", "zzyzx", "bar", "1")), querySnapshotToValues(snapshot1));
+
+    doc.update(map("bar", "2"));
+
+    QuerySnapshot snapshot2 = waitFor(collection.get(Source.CACHE));
+    assertEquals(asList(map("foo", "zzyzx", "bar", "2")), querySnapshotToValues(snapshot2));
+  }
+
+  @Test
+  public void resumingAQueryShouldUseBloomFilterToAvoidFullRequery() throws Exception {
+    // TODO(b/291365820): Stop skipping this test when running against the Firestore emulator once
+    // the emulator is improved to include a bloom filter in the existence filter "messages that it
+    // sends.
+    assumeFalse(
+        "Skip this test when running against the Firestore emulator because the emulator does not "
+            + "include a bloom filter when it sends existence filter messages, making it "
+            + "impossible for this test to verify the correctness of the bloom filter.",
+        isRunningAgainstEmulator());
+
+    // Prepare the names and contents of the 100 documents to create.
+    Map<String, Map<String, Object>> testData = new HashMap<>();
+    for (int i = 0; i < 100; i++) {
+      testData.put("doc" + (1000 + i), map("key", 42));
+    }
+
+    // Each iteration of the "while" loop below runs a single iteration of the test. The test will
+    // be run multiple times only if a bloom filter false positive occurs.
+    int attemptNumber = 0;
+    while (true) {
+      attemptNumber++;
+
+      // Create 100 documents in a new collection.
+      CollectionReference collection = testCollectionWithDocs(testData);
+
+      // Run a query to populate the local cache with the 100 documents and a resume token.
+      List<DocumentReference> createdDocuments = new ArrayList<>();
+      {
+        QuerySnapshot querySnapshot = waitFor(collection.get());
+        assertWithMessage("querySnapshot1").that(querySnapshot.size()).isEqualTo(100);
+        for (DocumentSnapshot documentSnapshot : querySnapshot.getDocuments()) {
+          createdDocuments.add(documentSnapshot.getReference());
+        }
+      }
+      assertWithMessage("createdDocuments").that(createdDocuments).hasSize(100);
+
+      // Delete 50 of the 100 documents. Use a different Firestore instance to avoid affecting the
+      // local cache.
+      HashSet<String> deletedDocumentIds = new HashSet<>();
+      {
+        FirebaseFirestore db2 = testFirestore();
+        WriteBatch batch = db2.batch();
+        for (int i = 0; i < createdDocuments.size(); i += 2) {
+          DocumentReference documentToDelete = db2.document(createdDocuments.get(i).getPath());
+          batch.delete(documentToDelete);
+          deletedDocumentIds.add(documentToDelete.getId());
+        }
+        waitFor(batch.commit());
+      }
+      assertWithMessage("deletedDocumentIds").that(deletedDocumentIds).hasSize(50);
+
+      // Wait for 10 seconds, during which Watch will stop tracking the query and will send an
+      // existence filter rather than "delete" events when the query is resumed.
+      Thread.sleep(10000);
+
+      // Resume the query and save the resulting snapshot for verification. Use some internal
+      // testing hooks to "capture" the existence filter mismatches to verify that Watch sent a
+      // bloom filter, and it was used to avert a full requery.
+      AtomicReference<QuerySnapshot> snapshot2Ref = new AtomicReference<>();
+      ArrayList<ExistenceFilterMismatchInfo> existenceFilterMismatches =
+          captureExistenceFilterMismatches(
+              () -> {
+                QuerySnapshot querySnapshot = waitFor(collection.get());
+                snapshot2Ref.set(querySnapshot);
+              });
+      QuerySnapshot snapshot2 = snapshot2Ref.get();
+
+      // Verify that the snapshot from the resumed query contains the expected documents; that is,
+      // that it contains the 50 documents that were _not_ deleted.
+      HashSet<String> actualDocumentIds = new HashSet<>();
+      for (DocumentSnapshot documentSnapshot : snapshot2.getDocuments()) {
+        actualDocumentIds.add(documentSnapshot.getId());
+      }
+      HashSet<String> expectedDocumentIds = new HashSet<>();
+      for (DocumentReference documentRef : createdDocuments) {
+        if (!deletedDocumentIds.contains(documentRef.getId())) {
+          expectedDocumentIds.add(documentRef.getId());
+        }
+      }
+      assertWithMessage("snapshot2.docs")
+          .that(actualDocumentIds)
+          .containsExactlyElementsIn(expectedDocumentIds);
+
+      // Verify that Watch sent an existence filter with the correct counts when the query was
+      // resumed.
+      assertWithMessage("Watch should have sent exactly 1 existence filter")
+          .that(existenceFilterMismatches)
+          .hasSize(1);
+      ExistenceFilterMismatchInfo existenceFilterMismatchInfo = existenceFilterMismatches.get(0);
+      assertWithMessage("localCacheCount")
+          .that(existenceFilterMismatchInfo.localCacheCount())
+          .isEqualTo(100);
+      assertWithMessage("existenceFilterCount")
+          .that(existenceFilterMismatchInfo.existenceFilterCount())
+          .isEqualTo(50);
+
+      // Verify that Watch sent a valid bloom filter.
+      ExistenceFilterBloomFilterInfo bloomFilter = existenceFilterMismatchInfo.bloomFilter();
+      assertWithMessage("The bloom filter specified in the existence filter")
+          .that(bloomFilter)
+          .isNotNull();
+      assertWithMessage("hashCount").that(bloomFilter.hashCount()).isGreaterThan(0);
+      assertWithMessage("bitmapLength").that(bloomFilter.bitmapLength()).isGreaterThan(0);
+      assertWithMessage("padding").that(bloomFilter.padding()).isGreaterThan(0);
+      assertWithMessage("padding").that(bloomFilter.padding()).isLessThan(8);
+
+      // Verify that the bloom filter was successfully used to avert a full requery. If a false
+      // positive occurred then retry the entire test. Although statistically rare, false positives
+      // are expected to happen occasionally. When a false positive _does_ happen, just retry the
+      // test with a different set of documents. If that retry _also_ experiences a false positive,
+      // then fail the test because that is so improbable that something must have gone wrong.
+      if (attemptNumber == 1 && !bloomFilter.applied()) {
+        continue;
+      }
+
+      assertWithMessage("bloom filter successfully applied with attemptNumber=" + attemptNumber)
+          .that(bloomFilter.applied())
+          .isTrue();
+
+      // Break out of the test loop now that the test passes.
+      break;
+    }
+  }
+
+  @Test
+  public void
+      bloomFilterShouldAvertAFullRequeryWhenDocumentsWereAddedDeletedRemovedUpdatedAndUnchangedSinceTheResumeToken()
+          throws Exception {
+    // TODO(b/291365820): Stop skipping this test when running against the Firestore emulator once
+    // the emulator is improved to include a bloom filter in the existence filter messages that it
+    // sends.
+    assumeFalse(
+        "Skip this test when running against the Firestore emulator because the emulator does not "
+            + "include a bloom filter when it sends existence filter messages, making it "
+            + "impossible for this test to verify the correctness of the bloom filter.",
+        isRunningAgainstEmulator());
+
+    // Prepare the names and contents of the 20 documents to create.
+    Map<String, Map<String, Object>> testData = new HashMap<>();
+    for (int i = 0; i < 20; i++) {
+      testData.put("doc" + (1000 + i), map("key", 42, "removed", false));
+    }
+
+    // Each iteration of the "while" loop below runs a single iteration of the test. The test will
+    // be run multiple times only if a bloom filter false positive occurs.
+    int attemptNumber = 0;
+    while (true) {
+      attemptNumber++;
+
+      // Create 20 documents in a new collection.
+      CollectionReference collection = testCollectionWithDocs(testData);
+      Query query = collection.whereEqualTo("removed", false);
+
+      // Run a query to populate the local cache with the 20 documents and a resume token.
+      List<DocumentReference> createdDocuments = new ArrayList<>();
+      {
+        QuerySnapshot querySnapshot = waitFor(query.get());
+        assertWithMessage("querySnapshot1").that(querySnapshot.size()).isEqualTo(20);
+        for (DocumentSnapshot documentSnapshot : querySnapshot.getDocuments()) {
+          createdDocuments.add(documentSnapshot.getReference());
+        }
+      }
+      assertWithMessage("createdDocuments").that(createdDocuments).hasSize(20);
+
+      // Out of the 20 existing documents, leave 5 docs untouched, delete 5 docs, remove 5 docs,
+      // update 5 docs, and add 15 new docs.
+      HashSet<String> deletedDocumentIds = new HashSet<>();
+      HashSet<String> removedDocumentIds = new HashSet<>();
+      HashSet<String> updatedDocumentIds = new HashSet<>();
+      HashSet<String> addedDocumentIds = new HashSet<>();
+
+      {
+        FirebaseFirestore db2 = testFirestore();
+        WriteBatch batch = db2.batch();
+
+        for (int i = 0; i < createdDocuments.size(); i += 4) {
+          DocumentReference documentToDelete = db2.document(createdDocuments.get(i).getPath());
+          batch.delete(documentToDelete);
+          deletedDocumentIds.add(documentToDelete.getId());
+        }
+        assertWithMessage("deletedDocumentIds").that(deletedDocumentIds).hasSize(5);
+
+        // Update 5 documents to no longer match the query.
+        for (int i = 1; i < createdDocuments.size(); i += 4) {
+          DocumentReference documentToRemove = db2.document(createdDocuments.get(i).getPath());
+          batch.update(documentToRemove, map("removed", true));
+          removedDocumentIds.add(documentToRemove.getId());
+        }
+        assertWithMessage("removedDocumentIds").that(removedDocumentIds).hasSize(5);
+
+        // Update 5 documents, but ensure they still match the query.
+        for (int i = 2; i < createdDocuments.size(); i += 4) {
+          DocumentReference documentToUpdate = db2.document(createdDocuments.get(i).getPath());
+          batch.update(documentToUpdate, map("key", 43));
+          updatedDocumentIds.add(documentToUpdate.getId());
+        }
+        assertWithMessage("updatedDocumentIds").that(updatedDocumentIds).hasSize(5);
+
+        for (int i = 0; i < 15; i += 1) {
+          DocumentReference documentToUpdate =
+              db2.document(collection.getPath() + "/newDoc" + (1000 + i));
+          batch.set(documentToUpdate, map("key", 42, "removed", false));
+          addedDocumentIds.add(documentToUpdate.getId());
+        }
+
+        // Ensure the sets above are disjoint.
+        HashSet<String> mergedSet = new HashSet<>();
+        mergedSet.addAll(deletedDocumentIds);
+        mergedSet.addAll(removedDocumentIds);
+        mergedSet.addAll(updatedDocumentIds);
+        mergedSet.addAll(addedDocumentIds);
+        assertWithMessage("mergedSet").that(mergedSet).hasSize(30);
+
+        waitFor(batch.commit());
+      }
+
+      // Wait for 10 seconds, during which Watch will stop tracking the query and will send an
+      // existence filter rather than "delete" events when the query is resumed.
+      Thread.sleep(10000);
+
+      // Resume the query and save the resulting snapshot for verification. Use some internal
+      // testing hooks to "capture" the existence filter mismatches to verify that Watch sent a
+      // bloom filter, and it was used to avert a full requery.
+      AtomicReference<QuerySnapshot> snapshot2Ref = new AtomicReference<>();
+      ArrayList<ExistenceFilterMismatchInfo> existenceFilterMismatches =
+          captureExistenceFilterMismatches(
+              () -> {
+                QuerySnapshot querySnapshot = waitFor(query.get());
+                snapshot2Ref.set(querySnapshot);
+              });
+      QuerySnapshot snapshot2 = snapshot2Ref.get();
+
+      // Verify that the snapshot from the resumed query contains the expected documents; that is,
+      // 10 existing documents that still match the query, and 15 documents that are newly added.
+      HashSet<String> actualDocumentIds = new HashSet<>();
+      for (DocumentSnapshot documentSnapshot : snapshot2.getDocuments()) {
+        actualDocumentIds.add(documentSnapshot.getId());
+      }
+      HashSet<String> expectedDocumentIds = new HashSet<>();
+      for (DocumentReference documentRef : createdDocuments) {
+        if (!deletedDocumentIds.contains(documentRef.getId())
+            && !removedDocumentIds.contains(documentRef.getId())) {
+          expectedDocumentIds.add(documentRef.getId());
+        }
+      }
+      expectedDocumentIds.addAll(addedDocumentIds);
+      assertWithMessage("snapshot2.docs")
+          .that(actualDocumentIds)
+          .containsExactlyElementsIn(expectedDocumentIds);
+      assertWithMessage("actualDocumentIds").that(actualDocumentIds).hasSize(25);
+
+      // Verify that Watch sent an existence filter with the correct counts when the query was
+      // resumed.
+      assertWithMessage("Watch should have sent exactly 1 existence filter")
+          .that(existenceFilterMismatches)
+          .hasSize(1);
+      ExistenceFilterMismatchInfo existenceFilterMismatchInfo = existenceFilterMismatches.get(0);
+      assertWithMessage("localCacheCount")
+          .that(existenceFilterMismatchInfo.localCacheCount())
+          .isEqualTo(35);
+      assertWithMessage("existenceFilterCount")
+          .that(existenceFilterMismatchInfo.existenceFilterCount())
+          .isEqualTo(25);
+
+      // Verify that Watch sent a valid bloom filter.
+      ExistenceFilterBloomFilterInfo bloomFilter = existenceFilterMismatchInfo.bloomFilter();
+      assertWithMessage("The bloom filter specified in the existence filter")
+          .that(bloomFilter)
+          .isNotNull();
+
+      // Verify that the bloom filter was successfully used to avert a full requery. If a false
+      // positive occurred then retry the entire test. Although statistically rare, false positives
+      // are expected to happen occasionally. When a false positive _does_ happen, just retry the
+      // test with a different set of documents. If that retry _also_ experiences a false positive,
+      // then fail the test because that is so improbable that something must have gone wrong.
+      if (attemptNumber == 1 && !bloomFilter.applied()) {
+        continue;
+      }
+
+      assertWithMessage("bloom filter successfully applied with attemptNumber=" + attemptNumber)
+          .that(bloomFilter.applied())
+          .isTrue();
+
+      // Break out of the test loop now that the test passes.
+      break;
+    }
+  }
+
+  private static String unicodeNormalize(String s) {
+    return Normalizer.normalize(s, Normalizer.Form.NFC);
+  }
+
+  @Test
+  public void bloomFilterShouldCorrectlyEncodeComplexUnicodeCharacters() throws Exception {
+    // TODO(b/291365820): Stop skipping this test when running against the Firestore emulator once
+    // the emulator is improved to include a bloom filter in the existence filter "messages that it
+    // sends.
+    assumeFalse(
+        "Skip this test when running against the Firestore emulator because the emulator does not "
+            + "include a bloom filter when it sends existence filter messages, making it "
+            + "impossible for this test to verify the correctness of the bloom filter.",
+        isRunningAgainstEmulator());
+
+    // Firestore does not do any Unicode normalization on the document IDs. Therefore, two document
+    // IDs that are canonically-equivalent (they visually appear identical) but are represented by a
+    // different sequence of Unicode code points are treated as distinct document IDs.
+    ArrayList<String> testDocIds = new ArrayList<>();
+    testDocIds.add("DocumentToDelete");
+    // The next two strings both end with "e" with an accent: the first uses the dedicated Unicode
+    // code point for this character, while the second uses the standard lowercase "e" followed by
+    // the accent combining character.
+    testDocIds.add("LowercaseEWithAcuteAccent_\u00E9");
+    testDocIds.add("LowercaseEWithAcuteAccent_\u0065\u0301");
+    // The next two strings both end with an "e" with two different accents applied via the
+    // following two combining characters. The combining characters are specified in a different
+    // order and Firestore treats these document IDs as unique, despite the order of the combining
+    // characters being irrelevant.
+    testDocIds.add("LowercaseEWithMultipleAccents_\u0065\u0301\u0327");
+    testDocIds.add("LowercaseEWithMultipleAccents_\u0065\u0327\u0301");
+    // The next string contains a character outside the BMP (the "basic multilingual plane"); that
+    // is, its code point is greater than 0xFFFF. Since "The Java programming language represents
+    // text in sequences of 16-bit code units, using the UTF-16 encoding" (according to the "Java
+    // Language Specification" at https://docs.oracle.com/javase/specs/jls/se11/html/index.html)
+    // this requires a surrogate pair, two 16-bit code units, to represent this character. Make sure
+    // that its presence is correctly tested in the bloom filter, which uses UTF-8 encoding.
+    testDocIds.add("Smiley_\uD83D\uDE00");
+
+    // Verify assumptions about the equivalence of strings in `testDocIds`.
+    assertThat(unicodeNormalize(testDocIds.get(1))).isEqualTo(unicodeNormalize(testDocIds.get(2)));
+    assertThat(unicodeNormalize(testDocIds.get(3))).isEqualTo(unicodeNormalize(testDocIds.get(4)));
+    assertThat(testDocIds.get(5).codePointAt(7)).isEqualTo(0x1F600);
+
+    // Create the mapping from document ID to document data for the document IDs specified in
+    // `testDocIds`.
+    Map<String, Map<String, Object>> testDocs = new HashMap<>();
+    for (String docId : testDocIds) {
+      testDocs.put(docId, map("foo", 42));
+    }
+
+    // Create the documents whose names contain complex Unicode characters in a new collection.
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    // Run a query to populate the local cache with documents that have names with complex Unicode
+    // characters.
+    List<DocumentReference> createdDocuments = new ArrayList<>();
+    {
+      QuerySnapshot querySnapshot1 = waitFor(collection.get());
+      for (DocumentSnapshot documentSnapshot : querySnapshot1.getDocuments()) {
+        createdDocuments.add(documentSnapshot.getReference());
+      }
+      HashSet<String> createdDocumentIds = new HashSet<>();
+      for (DocumentSnapshot documentSnapshot : querySnapshot1.getDocuments()) {
+        createdDocumentIds.add(documentSnapshot.getId());
+      }
+      assertWithMessage("createdDocumentIds")
+          .that(createdDocumentIds)
+          .containsExactlyElementsIn(testDocIds);
+    }
+
+    // Delete one of the documents so that the next call to collection.get() will experience an
+    // existence filter mismatch. Use a different Firestore instance to avoid affecting the local
+    // cache.
+    DocumentReference documentToDelete = collection.document("DocumentToDelete");
+    waitFor(testFirestore().document(documentToDelete.getPath()).delete());
+
+    // Wait for 10 seconds, during which Watch will stop tracking the query and will send an
+    // existence filter rather than "delete" events when the query is resumed.
+    Thread.sleep(10000);
+
+    // Resume the query and save the resulting snapshot for verification. Use some internal testing
+    // hooks to "capture" the existence filter mismatches.
+    AtomicReference<QuerySnapshot> querySnapshot2Ref = new AtomicReference<>();
+    ArrayList<ExistenceFilterMismatchInfo> existenceFilterMismatches =
+        captureExistenceFilterMismatches(
+            () -> {
+              QuerySnapshot querySnapshot = waitFor(collection.get());
+              querySnapshot2Ref.set(querySnapshot);
+            });
+    QuerySnapshot querySnapshot2 = querySnapshot2Ref.get();
+
+    // Verify that the snapshot from the resumed query contains the expected documents; that is,
+    // that it contains the documents whose names contain complex Unicode characters and _not_ the
+    // document that was deleted.
+    HashSet<String> querySnapshot2DocumentIds = new HashSet<>();
+    for (DocumentSnapshot documentSnapshot : querySnapshot2.getDocuments()) {
+      querySnapshot2DocumentIds.add(documentSnapshot.getId());
+    }
+    HashSet<String> querySnapshot2ExpectedDocumentIds = new HashSet<>(testDocIds);
+    querySnapshot2ExpectedDocumentIds.remove("DocumentToDelete");
+    assertWithMessage("querySnapshot2DocumentIds")
+        .that(querySnapshot2DocumentIds)
+        .containsExactlyElementsIn(querySnapshot2ExpectedDocumentIds);
+
+    // Verify that Watch sent an existence filter with the correct counts.
+    assertWithMessage("Watch should have sent exactly 1 existence filter")
+        .that(existenceFilterMismatches)
+        .hasSize(1);
+    ExistenceFilterMismatchInfo existenceFilterMismatchInfo = existenceFilterMismatches.get(0);
+    assertWithMessage("localCacheCount")
+        .that(existenceFilterMismatchInfo.localCacheCount())
+        .isEqualTo(testDocIds.size());
+    assertWithMessage("existenceFilterCount")
+        .that(existenceFilterMismatchInfo.existenceFilterCount())
+        .isEqualTo(testDocIds.size() - 1);
+
+    // Verify that Watch sent a valid bloom filter.
+    ExistenceFilterBloomFilterInfo bloomFilter = existenceFilterMismatchInfo.bloomFilter();
+    assertWithMessage("The bloom filter specified in the existence filter")
+        .that(bloomFilter)
+        .isNotNull();
+
+    // The bloom filter application should statistically be successful almost every time; the _only_
+    // time when it would _not_ be successful is if there is a false positive when testing for
+    // 'DocumentToDelete' in the bloom filter. So verify that the bloom filter application is
+    // successful, unless there was a false positive.
+    boolean isFalsePositive = bloomFilter.mightContain(documentToDelete);
+    assertWithMessage("bloomFilter.applied()")
+        .that(bloomFilter.applied())
+        .isEqualTo(!isFalsePositive);
+
+    // Verify that the bloom filter contains the document paths with complex Unicode characters.
+    for (DocumentSnapshot documentSnapshot : querySnapshot2.getDocuments()) {
+      DocumentReference documentReference = documentSnapshot.getReference();
+      assertWithMessage("bloomFilter.mightContain() for " + documentReference.getPath())
+          .that(bloomFilter.mightContain(documentReference))
+          .isTrue();
+    }
+  }
+
+  @Test
+  public void testOrQueries() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "doc1", map("a", 1, "b", 0),
+            "doc2", map("a", 2, "b", 1),
+            "doc3", map("a", 3, "b", 2),
+            "doc4", map("a", 1, "b", 3),
+            "doc5", map("a", 1, "b", 1));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    // Two equalities: a==1 || b==1.
+    checkOnlineAndOfflineResultsMatch(
+        collection.where(or(equalTo("a", 1), equalTo("b", 1))), "doc1", "doc2", "doc4", "doc5");
+
+    // (a==1 && b==0) || (a==3 && b==2)
+    checkOnlineAndOfflineResultsMatch(
+        collection.where(
+            or(and(equalTo("a", 1), equalTo("b", 0)), and(equalTo("a", 3), equalTo("b", 2)))),
+        "doc1",
+        "doc3");
+
+    // a==1 && (b==0 || b==3).
+    checkOnlineAndOfflineResultsMatch(
+        collection.where(and(equalTo("a", 1), or(equalTo("b", 0), equalTo("b", 3)))),
+        "doc1",
+        "doc4");
+
+    // (a==2 || b==2) && (a==3 || b==3)
+    checkOnlineAndOfflineResultsMatch(
+        collection.where(
+            and(or(equalTo("a", 2), equalTo("b", 2)), or(equalTo("a", 3), equalTo("b", 3)))),
+        "doc3");
+
+    // Test with limits without orderBy (the __name__ ordering is the tie breaker).
+    checkOnlineAndOfflineResultsMatch(
+        collection.where(or(equalTo("a", 2), equalTo("b", 1))).limit(1), "doc2");
+  }
+
+  @Test
+  public void testOrQueriesWithIn() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "doc1", map("a", 1, "b", 0),
+            "doc2", map("b", 1),
+            "doc3", map("a", 3, "b", 2),
+            "doc4", map("a", 1, "b", 3),
+            "doc5", map("a", 1),
+            "doc6", map("a", 2));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    // a==2 || b in [2,3]
+    checkOnlineAndOfflineResultsMatch(
+        collection.where(or(equalTo("a", 2), inArray("b", asList(2, 3)))), "doc3", "doc4", "doc6");
+  }
+
+  @Test
+  public void testOrQueriesWithArrayMembership() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "doc1", map("a", 1, "b", asList(0)),
+            "doc2", map("b", asList(1)),
+            "doc3", map("a", 3, "b", asList(2, 7)),
+            "doc4", map("a", 1, "b", asList(3, 7)),
+            "doc5", map("a", 1),
+            "doc6", map("a", 2));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    // a==2 || b array-contains 7
+    checkOnlineAndOfflineResultsMatch(
+        collection.where(or(equalTo("a", 2), arrayContains("b", 7))), "doc3", "doc4", "doc6");
+
+    // a==2 || b array-contains-any [0, 3]
+    checkOnlineAndOfflineResultsMatch(
+        collection.where(or(equalTo("a", 2), arrayContainsAny("b", asList(0, 3)))),
+        "doc1",
+        "doc4",
+        "doc6");
+  }
+
+  @Test
+  public void testMultipleInOps() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "doc1", map("a", 1, "b", 0),
+            "doc2", map("b", 1),
+            "doc3", map("a", 3, "b", 2),
+            "doc4", map("a", 1, "b", 3),
+            "doc5", map("a", 1),
+            "doc6", map("a", 2));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    // Two IN operations on different fields with disjunction.
+    Query query1 = collection.where(or(inArray("a", asList(2, 3)), inArray("b", asList(0, 2))));
+    checkOnlineAndOfflineResultsMatch(query1, "doc1", "doc3", "doc6");
+
+    // Two IN operations on the same field with disjunction.
+    // a IN [0,3] || a IN [0,2] should union them (similar to: a IN [0,2,3]).
+    Query query2 = collection.where(or(inArray("a", asList(0, 3)), inArray("a", asList(0, 2))));
+    checkOnlineAndOfflineResultsMatch(query2, "doc3", "doc6");
+  }
+
+  @Test
+  public void testUsingInWithArrayContainsAny() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "doc1", map("a", 1, "b", asList(0)),
+            "doc2", map("b", asList(1)),
+            "doc3", map("a", 3, "b", asList(2, 7), "c", 10),
+            "doc4", map("a", 1, "b", asList(3, 7)),
+            "doc5", map("a", 1),
+            "doc6", map("a", 2, "c", 20));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    Query query1 =
+        collection.where(or(inArray("a", asList(2, 3)), arrayContainsAny("b", asList(0, 7))));
+    checkOnlineAndOfflineResultsMatch(query1, "doc1", "doc3", "doc4", "doc6");
+
+    Query query2 =
+        collection.where(
+            or(
+                and(inArray("a", asList(2, 3)), equalTo("c", 10)),
+                arrayContainsAny("b", asList(0, 7))));
+    checkOnlineAndOfflineResultsMatch(query2, "doc1", "doc3", "doc4");
+  }
+
+  @Test
+  public void testUsingInWithArrayContains() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "doc1", map("a", 1, "b", asList(0)),
+            "doc2", map("b", asList(1)),
+            "doc3", map("a", 3, "b", asList(2, 7)),
+            "doc4", map("a", 1, "b", asList(3, 7)),
+            "doc5", map("a", 1),
+            "doc6", map("a", 2));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    Query query1 = collection.where(or(inArray("a", asList(2, 3)), arrayContains("b", 3)));
+    checkOnlineAndOfflineResultsMatch(query1, "doc3", "doc4", "doc6");
+
+    Query query2 = collection.where(and(inArray("a", asList(2, 3)), arrayContains("b", 7)));
+    checkOnlineAndOfflineResultsMatch(query2, "doc3");
+
+    Query query3 =
+        collection.where(
+            or(inArray("a", asList(2, 3)), and(arrayContains("b", 3), equalTo("a", 1))));
+    checkOnlineAndOfflineResultsMatch(query3, "doc3", "doc4", "doc6");
+
+    Query query4 =
+        collection.where(
+            and(inArray("a", asList(2, 3)), or(arrayContains("b", 7), equalTo("a", 1))));
+    checkOnlineAndOfflineResultsMatch(query4, "doc3");
+  }
+
+  @Test
+  public void testOrderByEquality() {
+    Map<String, Map<String, Object>> testDocs =
+        map(
+            "doc1", map("a", 1, "b", asList(0)),
+            "doc2", map("b", asList(1)),
+            "doc3", map("a", 3, "b", asList(2, 7), "c", 10),
+            "doc4", map("a", 1, "b", asList(3, 7)),
+            "doc5", map("a", 1),
+            "doc6", map("a", 2, "c", 20));
+    CollectionReference collection = testCollectionWithDocs(testDocs);
+
+    Query query1 = collection.where(equalTo("a", 1)).orderBy("a");
+    checkOnlineAndOfflineResultsMatch(query1, "doc1", "doc4", "doc5");
+
+    Query query2 = collection.where(inArray("a", asList(2, 3))).orderBy("a");
+    checkOnlineAndOfflineResultsMatch(query2, "doc6", "doc3");
+  }
 }
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SnapshotListenerSourceTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SnapshotListenerSourceTest.java
new file mode 100644
index 00000000000..a0712ecae9a
--- /dev/null
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SnapshotListenerSourceTest.java
@@ -0,0 +1,654 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.querySnapshotToValues;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testCollection;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testCollectionWithDocs;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testDocumentWithData;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitFor;
+import static com.google.firebase.firestore.testutil.TestUtil.map;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.firestore.Query.Direction;
+import com.google.firebase.firestore.testutil.EventAccumulator;
+import com.google.firebase.firestore.testutil.IntegrationTestUtil;
+import java.util.List;
+import java.util.Map;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class SnapshotListenerSourceTest {
+
+  @After
+  public void tearDown() {
+    IntegrationTestUtil.tearDown();
+  }
+
+  public SnapshotListenOptions optionSourceFromCache() {
+    return new SnapshotListenOptions.Builder().setSource(ListenSource.CACHE).build();
+  }
+
+  public SnapshotListenOptions optionSourceFromCacheAndIncludeMetadataChanges() {
+    return new SnapshotListenOptions.Builder()
+        .setMetadataChanges(MetadataChanges.INCLUDE)
+        .setSource(ListenSource.CACHE)
+        .build();
+  }
+
+  @Test
+  public void canRaiseSnapshotFromCacheForQuery() {
+    CollectionReference collection = testCollectionWithDocs(map("a", map("k", "a")));
+
+    waitFor(collection.get()); // Populate the cache.
+
+    EventAccumulator<QuerySnapshot> accumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCache();
+    ListenerRegistration listener = collection.addSnapshotListener(options, accumulator.listener());
+
+    QuerySnapshot snapshot = accumulator.await();
+    assertEquals(asList(map("k", "a")), querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().isFromCache());
+
+    accumulator.assertNoAdditionalEvents();
+    listener.remove();
+  }
+
+  @Test
+  public void canRaiseSnapshotFromCacheForDocumentReference() {
+    DocumentReference docRef = testDocumentWithData(map("k", "a"));
+
+    waitFor(docRef.get()); // Populate the cache.
+
+    EventAccumulator<DocumentSnapshot> accumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCache();
+    ListenerRegistration listener = docRef.addSnapshotListener(options, accumulator.listener());
+
+    DocumentSnapshot snapshot = accumulator.await();
+    assertEquals(map("k", "a"), snapshot.getData());
+    assertTrue(snapshot.getMetadata().isFromCache());
+
+    accumulator.assertNoAdditionalEvents();
+    listener.remove();
+  }
+
+  @Test
+  public void listenToCacheShouldNotBeAffectedByOnlineStatusChange() {
+    CollectionReference collection = testCollectionWithDocs(map("a", map("k", "a")));
+
+    waitFor(collection.get()); // Populate the cache.
+
+    EventAccumulator<QuerySnapshot> accumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCacheAndIncludeMetadataChanges();
+    ListenerRegistration listener = collection.addSnapshotListener(options, accumulator.listener());
+
+    QuerySnapshot snapshot = accumulator.await();
+    assertEquals(asList(map("k", "a")), querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().isFromCache());
+
+    waitFor(collection.firestore.disableNetwork());
+    waitFor(collection.firestore.enableNetwork());
+
+    accumulator.assertNoAdditionalEvents();
+    listener.remove();
+  }
+
+  @Test
+  public void multipleListenersSourcedFromCacheCanWorkIndependently() {
+    CollectionReference collection =
+        testCollectionWithDocs(map("a", map("k", "a", "sort", 0), "b", map("k", "b", "sort", 1)));
+    Query query = collection.whereGreaterThan("sort", 0).orderBy("sort", Direction.ASCENDING);
+
+    waitFor(collection.get()); // Populate the cache.
+
+    EventAccumulator<QuerySnapshot> accumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCache();
+    ListenerRegistration listener1 = query.addSnapshotListener(options, accumulator.listener());
+    ListenerRegistration listener2 = query.addSnapshotListener(options, accumulator.listener());
+
+    List<QuerySnapshot> snapshots = accumulator.await(2);
+    assertEquals(asList(map("k", "b", "sort", 1L)), querySnapshotToValues(snapshots.get(0)));
+    assertEquals(querySnapshotToValues(snapshots.get(0)), querySnapshotToValues(snapshots.get(1)));
+    assertEquals(snapshots.get(0).getMetadata(), snapshots.get(1).getMetadata());
+
+    // Do a local mutation
+    waitFor(collection.add(map("k", "c", "sort", 2)));
+
+    snapshots = accumulator.await(2);
+    assertEquals(
+        asList(map("k", "b", "sort", 1L), map("k", "c", "sort", 2L)),
+        querySnapshotToValues(snapshots.get(0)));
+    assertEquals(querySnapshotToValues(snapshots.get(0)), querySnapshotToValues(snapshots.get(1)));
+    assertEquals(snapshots.get(0).getMetadata(), snapshots.get(1).getMetadata());
+
+    // Detach one listener, and do a local mutation. The other listener
+    // should not be affected.
+    listener1.remove();
+    waitFor(collection.add(map("k", "d", "sort", 3)));
+
+    QuerySnapshot snapshot = accumulator.await();
+    assertEquals(
+        asList(map("k", "b", "sort", 1L), map("k", "c", "sort", 2L), map("k", "d", "sort", 3L)),
+        querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().isFromCache());
+
+    accumulator.assertNoAdditionalEvents();
+    listener2.remove();
+  }
+
+  // Two queries that mapped to the same target ID are referred to as
+  // "mirror queries". An example for a mirror query is a limitToLast()
+  // query and a limit() query that share the same backend Target ID.
+  // Since limitToLast() queries are sent to the backend with a modified
+  // orderBy() clause, they can map to the same target representation as
+  // limit() query, even if both queries appear separate to the user.
+  @Test
+  public void canListenUnlistenRelistenMirrorQueriesFromCache() {
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("k", "a", "sort", 0),
+                "b", map("k", "b", "sort", 1),
+                "c", map("k", "c", "sort", 1)));
+
+    waitFor(collection.get()); // Populate the cache.
+    SnapshotListenOptions options = optionSourceFromCache();
+
+    // Setup `limit` query.
+    Query limit = collection.limit(2).orderBy("sort", Direction.ASCENDING);
+    EventAccumulator<QuerySnapshot> limitAccumulator = new EventAccumulator<>();
+    ListenerRegistration limitRegistration =
+        limit.addSnapshotListener(options, limitAccumulator.listener());
+
+    // Setup mirroring `limitToLast` query.
+    Query limitToLast = collection.limitToLast(2).orderBy("sort", Direction.DESCENDING);
+    EventAccumulator<QuerySnapshot> limitToLastAccumulator = new EventAccumulator<>();
+    ListenerRegistration limitToLastRegistration =
+        limitToLast.addSnapshotListener(options, limitToLastAccumulator.listener());
+
+    // Verify both query get expected result.
+    QuerySnapshot snapshot = limitAccumulator.await();
+    assertEquals(
+        asList(map("k", "a", "sort", 0L), map("k", "b", "sort", 1L)),
+        querySnapshotToValues(snapshot));
+    snapshot = limitToLastAccumulator.await();
+    assertEquals(
+        asList(map("k", "b", "sort", 1L), map("k", "a", "sort", 0L)),
+        querySnapshotToValues(snapshot));
+
+    // Un-listen then re-listen limit query.
+    limitRegistration.remove();
+    limit.addSnapshotListener(options, limitAccumulator.listener());
+
+    // Verify `limit` query still works.
+    snapshot = limitAccumulator.await();
+    assertEquals(
+        asList(map("k", "a", "sort", 0L), map("k", "b", "sort", 1L)),
+        querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().isFromCache());
+
+    // Do a local mutation
+    waitFor(collection.add(map("k", "d", "sort", -1)));
+
+    // Verify both query get expected result.
+    snapshot = limitAccumulator.await();
+    assertEquals(
+        asList(map("k", "d", "sort", -1L), map("k", "a", "sort", 0L)),
+        querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().hasPendingWrites());
+    snapshot = limitToLastAccumulator.await();
+    assertEquals(
+        asList(map("k", "a", "sort", 0L), map("k", "d", "sort", -1L)),
+        querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().hasPendingWrites());
+
+    // Un-listen to limitToLast, update a doc, then re-listen to limitToLast
+    limitToLastRegistration.remove();
+    waitFor(collection.document("a").update(map("k", "a", "sort", -2)));
+    limitToLast.addSnapshotListener(options, limitToLastAccumulator.listener());
+
+    // Verify both query get expected result.
+    snapshot = limitAccumulator.await();
+    assertEquals(
+        asList(map("k", "a", "sort", -2L), map("k", "d", "sort", -1L)),
+        querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().hasPendingWrites());
+    snapshot = limitToLastAccumulator.await();
+    assertEquals(
+        asList(map("k", "d", "sort", -1L), map("k", "a", "sort", -2L)),
+        querySnapshotToValues(snapshot));
+    // We listened to LimitToLast query after the doc update.
+    assertFalse(snapshot.getMetadata().hasPendingWrites());
+
+    limitRegistration.remove();
+    limitToLastRegistration.remove();
+  }
+
+  @Test
+  public void canListenToDefaultSourceFirstAndThenCache() {
+    CollectionReference collection =
+        testCollectionWithDocs(map("a", map("k", "a", "sort", 0), "b", map("k", "b", "sort", 1)));
+    Query query =
+        collection.whereGreaterThanOrEqualTo("sort", 1).orderBy("sort", Direction.ASCENDING);
+
+    // Listen to the query with default options, which will also populates the cache
+    EventAccumulator<QuerySnapshot> defaultAccumulator = new EventAccumulator<>();
+    ListenerRegistration defaultRegistration =
+        query.addSnapshotListener(defaultAccumulator.listener());
+
+    QuerySnapshot snapshot = defaultAccumulator.await();
+    assertEquals(asList(map("k", "b", "sort", 1L)), querySnapshotToValues(snapshot));
+    assertFalse(snapshot.getMetadata().isFromCache());
+
+    // Listen to the same query from cache
+    EventAccumulator<QuerySnapshot> cacheAccumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCache();
+    ListenerRegistration cacheRegistration =
+        query.addSnapshotListener(options, cacheAccumulator.listener());
+
+    snapshot = cacheAccumulator.await();
+    assertEquals(asList(map("k", "b", "sort", 1L)), querySnapshotToValues(snapshot));
+    // The metadata is sync with server due to the default listener
+    assertFalse(snapshot.getMetadata().isFromCache());
+
+    defaultAccumulator.assertNoAdditionalEvents();
+    cacheAccumulator.assertNoAdditionalEvents();
+
+    defaultRegistration.remove();
+    cacheRegistration.remove();
+  }
+
+  @Test
+  public void canListenToCacheSourceFirstAndThenDefault() {
+    CollectionReference collection =
+        testCollectionWithDocs(map("a", map("k", "a", "sort", 0), "b", map("k", "b", "sort", 1)));
+    Query query = collection.whereNotEqualTo("sort", 0).orderBy("sort", Direction.ASCENDING);
+
+    // Listen to the cache
+    EventAccumulator<QuerySnapshot> cacheAccumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCacheAndIncludeMetadataChanges();
+    ListenerRegistration cacheRegistration =
+        query.addSnapshotListener(options, cacheAccumulator.listener());
+
+    QuerySnapshot snapshot = cacheAccumulator.await();
+    // Cache is empty
+    assertEquals(asList(), querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().isFromCache());
+
+    // Listen to the same query from server
+    EventAccumulator<QuerySnapshot> defaultAccumulator = new EventAccumulator<>();
+    ListenerRegistration defaultRegistration =
+        query.addSnapshotListener(MetadataChanges.INCLUDE, defaultAccumulator.listener());
+
+    snapshot = defaultAccumulator.await();
+    assertEquals(asList(map("k", "b", "sort", 1L)), querySnapshotToValues(snapshot));
+    assertFalse(snapshot.getMetadata().isFromCache());
+
+    // Default listener updates the cache, which triggers cache listener to raise snapshot.
+    snapshot = cacheAccumulator.await();
+    assertEquals(asList(map("k", "b", "sort", 1L)), querySnapshotToValues(snapshot));
+    // The metadata is sync with server due to the default listener
+    assertFalse(snapshot.getMetadata().isFromCache());
+
+    defaultAccumulator.assertNoAdditionalEvents();
+    cacheAccumulator.assertNoAdditionalEvents();
+
+    defaultRegistration.remove();
+    cacheRegistration.remove();
+  }
+
+  @Test
+  public void willNotGetMetadataOnlyUpdatesIfListeningToCacheOnly() {
+    CollectionReference collection =
+        testCollectionWithDocs(map("a", map("k", "a", "sort", 0), "b", map("k", "b", "sort", 1)));
+    Query query = collection.whereNotEqualTo("sort", 0).orderBy("sort", Direction.ASCENDING);
+
+    waitFor(collection.get()); // Populate the cache.
+
+    EventAccumulator<QuerySnapshot> accumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCacheAndIncludeMetadataChanges();
+    ListenerRegistration listener = query.addSnapshotListener(options, accumulator.listener());
+
+    QuerySnapshot snapshot = accumulator.await();
+    assertEquals(asList(map("k", "b", "sort", 1L)), querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().isFromCache());
+
+    waitFor(collection.add(map("k", "c", "sort", 2)));
+
+    snapshot = accumulator.await();
+    assertEquals(
+        asList(map("k", "b", "sort", 1L), map("k", "c", "sort", 2L)),
+        querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().isFromCache());
+    assertTrue(snapshot.getMetadata().hasPendingWrites());
+
+    // As we are not listening to server, the listener will not get notified
+    // when local mutation is acknowledged by server.
+    accumulator.assertNoAdditionalEvents();
+    listener.remove();
+  }
+
+  @Test
+  public void willHaveSyncedMetadataUpdatesWhenListeningToBothCacheAndDefaultSource() {
+    CollectionReference collection =
+        testCollectionWithDocs(map("a", map("k", "a", "sort", 0), "b", map("k", "b", "sort", 1)));
+    Query query = collection.whereNotEqualTo("sort", 0).orderBy("sort", Direction.ASCENDING);
+
+    waitFor(collection.get()); // Populate the cache.
+
+    // Listen to the cache
+    EventAccumulator<QuerySnapshot> cacheAccumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCacheAndIncludeMetadataChanges();
+
+    ListenerRegistration cacheRegistration =
+        query.addSnapshotListener(options, cacheAccumulator.listener());
+
+    QuerySnapshot snapshot = cacheAccumulator.await();
+    List<Map<String, Object>> expected = asList(map("k", "b", "sort", 1L));
+    assertEquals(expected, querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().isFromCache());
+
+    // Listen to the same query from server
+    EventAccumulator<QuerySnapshot> defaultAccumulator = new EventAccumulator<>();
+    ListenerRegistration defaultRegistration =
+        query.addSnapshotListener(MetadataChanges.INCLUDE, defaultAccumulator.listener());
+
+    // First snapshot will be raised from cache.
+    snapshot = defaultAccumulator.await();
+    assertEquals(expected, querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().isFromCache());
+    // Second snapshot will be raised from server result
+    snapshot = defaultAccumulator.await();
+    assertEquals(expected, querySnapshotToValues(snapshot));
+    assertFalse(snapshot.getMetadata().isFromCache());
+
+    // As listening to metadata changes, the cache listener also gets triggered and synced
+    // with default listener.
+    snapshot = cacheAccumulator.await();
+    assertEquals(expected, querySnapshotToValues(snapshot));
+    assertFalse(snapshot.getMetadata().isFromCache());
+
+    waitFor(collection.add(map("k", "c", "sort", 2)));
+
+    // snapshot gets triggered by local mutation
+    snapshot = defaultAccumulator.await();
+    expected = asList(map("k", "b", "sort", 1L), map("k", "c", "sort", 2L));
+    assertEquals(expected, querySnapshotToValues(snapshot));
+    assertFalse(snapshot.getMetadata().isFromCache());
+    assertTrue(snapshot.getMetadata().hasPendingWrites());
+    snapshot = cacheAccumulator.await();
+    assertEquals(expected, querySnapshotToValues(snapshot));
+    assertFalse(snapshot.getMetadata().isFromCache());
+    assertTrue(snapshot.getMetadata().hasPendingWrites());
+
+    // Local mutation gets acknowledged by the server
+    snapshot = defaultAccumulator.await();
+    assertFalse(snapshot.getMetadata().isFromCache());
+    assertFalse(snapshot.getMetadata().hasPendingWrites());
+    snapshot = cacheAccumulator.await();
+    assertFalse(snapshot.getMetadata().isFromCache());
+    assertFalse(snapshot.getMetadata().hasPendingWrites());
+
+    defaultAccumulator.assertNoAdditionalEvents();
+    cacheAccumulator.assertNoAdditionalEvents();
+
+    defaultRegistration.remove();
+    cacheRegistration.remove();
+  }
+
+  @Test
+  public void canUnlistenToDefaultSourceWhileStillListeningToCache() {
+    CollectionReference collection =
+        testCollectionWithDocs(map("a", map("k", "a", "sort", 0), "b", map("k", "b", "sort", 1)));
+    Query query = collection.whereNotEqualTo("sort", 0).orderBy("sort", Direction.ASCENDING);
+
+    // Listen to the query with both source options
+    EventAccumulator<QuerySnapshot> defaultAccumulator = new EventAccumulator<>();
+    ListenerRegistration defaultRegistration =
+        query.addSnapshotListener(defaultAccumulator.listener());
+    defaultAccumulator.await();
+
+    EventAccumulator<QuerySnapshot> cacheAccumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCache();
+    ListenerRegistration cacheRegistration =
+        query.addSnapshotListener(options, cacheAccumulator.listener());
+    cacheAccumulator.await();
+
+    // Un-listen to the default listener.
+    defaultRegistration.remove();
+    defaultAccumulator.assertNoAdditionalEvents();
+
+    // Add a document and verify listener to cache works as expected
+    waitFor(collection.add(map("k", "c", "sort", -1)));
+
+    QuerySnapshot snapshot = cacheAccumulator.await();
+    assertEquals(
+        asList(map("k", "c", "sort", -1L), map("k", "b", "sort", 1L)),
+        querySnapshotToValues(snapshot));
+
+    cacheAccumulator.assertNoAdditionalEvents();
+    cacheRegistration.remove();
+  }
+
+  @Test
+  public void canUnlistenToCachetSourceWhileStillListeningToServer() {
+    CollectionReference collection =
+        testCollectionWithDocs(map("a", map("k", "a", "sort", 0), "b", map("k", "b", "sort", 1)));
+    Query query = collection.whereNotEqualTo("sort", 0).orderBy("sort", Direction.ASCENDING);
+
+    // Listen to the query with both source options
+    EventAccumulator<QuerySnapshot> defaultAccumulator = new EventAccumulator<>();
+    ListenerRegistration defaultRegistration =
+        query.addSnapshotListener(defaultAccumulator.listener());
+    defaultAccumulator.await();
+
+    EventAccumulator<QuerySnapshot> cacheAccumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCache();
+    ListenerRegistration cacheRegistration =
+        query.addSnapshotListener(options, cacheAccumulator.listener());
+    cacheAccumulator.await();
+
+    // Un-listen to cache.
+    cacheRegistration.remove();
+    cacheAccumulator.assertNoAdditionalEvents();
+
+    // Add a document and verify listener to server works as expected.
+    waitFor(collection.add(map("k", "c", "sort", -1)));
+
+    QuerySnapshot snapshot = defaultAccumulator.await();
+    assertEquals(
+        asList(map("k", "c", "sort", -1L), map("k", "b", "sort", 1L)),
+        querySnapshotToValues(snapshot));
+
+    defaultAccumulator.assertNoAdditionalEvents();
+    defaultRegistration.remove();
+  }
+
+  @Test
+  public void canListenUnlistenRelistentoSameQueryWithDifferentSourceOptions() {
+    CollectionReference collection =
+        testCollectionWithDocs(map("a", map("k", "a", "sort", 0), "b", map("k", "b", "sort", 1)));
+    Query query = collection.whereGreaterThan("sort", 0).orderBy("sort", Direction.ASCENDING);
+
+    // Listen to the query with default options, which will also populates the cache
+    EventAccumulator<QuerySnapshot> defaultAccumulator = new EventAccumulator<>();
+    ListenerRegistration defaultRegistration =
+        query.addSnapshotListener(defaultAccumulator.listener());
+
+    QuerySnapshot snapshot = defaultAccumulator.await();
+    List<Map<String, Object>> expected = asList(map("k", "b", "sort", 1L));
+    assertEquals(expected, querySnapshotToValues(snapshot));
+
+    // Listen to the same query from cache
+    EventAccumulator<QuerySnapshot> cacheAccumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCache();
+    ListenerRegistration cacheRegistration =
+        query.addSnapshotListener(options, cacheAccumulator.listener());
+
+    snapshot = cacheAccumulator.await();
+    assertEquals(expected, querySnapshotToValues(snapshot));
+
+    // Un-listen to the default listener, add a doc and re-listen.
+    defaultRegistration.remove();
+    waitFor(collection.add(map("k", "c", "sort", 2)));
+
+    snapshot = cacheAccumulator.await();
+    expected = asList(map("k", "b", "sort", 1L), map("k", "c", "sort", 2L));
+    assertEquals(expected, querySnapshotToValues(snapshot));
+
+    defaultRegistration = query.addSnapshotListener(defaultAccumulator.listener());
+    snapshot = defaultAccumulator.await();
+    assertEquals(expected, querySnapshotToValues(snapshot));
+
+    // Un-listen to cache, update a doc, then re-listen to cache.
+    cacheRegistration.remove();
+    waitFor(collection.document("b").update(map("k", "b", "sort", 3)));
+
+    snapshot = defaultAccumulator.await();
+    expected = asList(map("k", "c", "sort", 2L), map("k", "b", "sort", 3L));
+    assertEquals(expected, querySnapshotToValues(snapshot));
+
+    cacheRegistration = query.addSnapshotListener(options, cacheAccumulator.listener());
+    snapshot = cacheAccumulator.await();
+    assertEquals(expected, querySnapshotToValues(snapshot));
+
+    defaultAccumulator.assertNoAdditionalEvents();
+    cacheAccumulator.assertNoAdditionalEvents();
+
+    defaultRegistration.remove();
+    cacheRegistration.remove();
+  }
+
+  @Test
+  public void canListenToCompositeIndexQueriesFromCache() {
+    CollectionReference collection =
+        testCollectionWithDocs(map("a", map("k", "a", "sort", 0), "b", map("k", "b", "sort", 1)));
+    Query query = collection.whereLessThanOrEqualTo("k", "a").whereGreaterThanOrEqualTo("sort", 0);
+
+    waitFor(collection.get()); // Populate the cache.
+
+    EventAccumulator<QuerySnapshot> accumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCache();
+    ListenerRegistration listener = query.addSnapshotListener(options, accumulator.listener());
+
+    QuerySnapshot snapshot = accumulator.await();
+    assertEquals(asList(map("k", "a", "sort", 0L)), querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().isFromCache());
+
+    accumulator.assertNoAdditionalEvents();
+    listener.remove();
+  }
+
+  @Test
+  public void canRaiseInitialSnapshotFromCacheEvenIfItIsEmpty() {
+    CollectionReference collection = testCollection();
+
+    QuerySnapshot snapshot = waitFor(collection.get()); // Populate the cache
+    assertEquals(asList(), querySnapshotToValues(snapshot)); // Precondition check.
+
+    EventAccumulator<QuerySnapshot> accumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCache();
+    ListenerRegistration listener = collection.addSnapshotListener(options, accumulator.listener());
+
+    snapshot = accumulator.await();
+    assertEquals(asList(), querySnapshotToValues(snapshot));
+    assertTrue(snapshot.getMetadata().isFromCache());
+
+    accumulator.assertNoAdditionalEvents();
+    listener.remove();
+  }
+
+  @Test
+  public void willNotBeTriggeredByTransactionsWhileListeningToCache() {
+    CollectionReference collection = testCollection();
+
+    EventAccumulator<QuerySnapshot> accumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCacheAndIncludeMetadataChanges();
+    ListenerRegistration listener = collection.addSnapshotListener(options, accumulator.listener());
+
+    QuerySnapshot snapshot = accumulator.await();
+    assertEquals(asList(), querySnapshotToValues(snapshot));
+
+    DocumentReference docRef = collection.document();
+    // Use a transaction to perform a write without triggering any local events.
+    docRef
+        .getFirestore()
+        .runTransaction(
+            transaction -> {
+              transaction.set(docRef, map("k", "a"));
+              return null;
+            });
+
+    // There should be no events raised
+    accumulator.assertNoAdditionalEvents();
+    listener.remove();
+  }
+
+  @Test
+  public void shareServerSideUpdatesWhenListeningToBothCacheAndDefault() {
+    CollectionReference collection =
+        testCollectionWithDocs(map("a", map("k", "a", "sort", 0), "b", map("k", "b", "sort", 1)));
+    Query query = collection.whereGreaterThan("sort", 0).orderBy("sort", Direction.ASCENDING);
+
+    // Listen to the query with default options, which will also populates the cache
+    EventAccumulator<QuerySnapshot> defaultAccumulator = new EventAccumulator<>();
+    ListenerRegistration defaultRegistration =
+        query.addSnapshotListener(defaultAccumulator.listener());
+    QuerySnapshot snapshot = defaultAccumulator.await();
+    List<Map<String, Object>> expected = asList(map("k", "b", "sort", 1L));
+    assertEquals(expected, querySnapshotToValues(snapshot));
+
+    // Listen to the same query from cache
+    EventAccumulator<QuerySnapshot> cacheAccumulator = new EventAccumulator<>();
+    SnapshotListenOptions options = optionSourceFromCache();
+    ListenerRegistration cacheRegistration =
+        query.addSnapshotListener(options, cacheAccumulator.listener());
+    snapshot = cacheAccumulator.await();
+    assertEquals(expected, querySnapshotToValues(snapshot));
+
+    // Use a transaction to mock server side updates
+    DocumentReference docRef = collection.document();
+    docRef
+        .getFirestore()
+        .runTransaction(
+            transaction -> {
+              transaction.set(docRef, map("k", "c", "sort", 2));
+              return null;
+            });
+
+    // Default listener receives the server update
+    snapshot = defaultAccumulator.await();
+    expected = asList(map("k", "b", "sort", 1L), map("k", "c", "sort", 2L));
+    assertEquals(expected, querySnapshotToValues(snapshot));
+    assertFalse(snapshot.getMetadata().isFromCache());
+
+    // Cache listener raises snapshot as well
+    snapshot = cacheAccumulator.await();
+    assertEquals(expected, querySnapshotToValues(snapshot));
+    assertFalse(snapshot.getMetadata().isFromCache());
+
+    defaultAccumulator.assertNoAdditionalEvents();
+    cacheAccumulator.assertNoAdditionalEvents();
+
+    defaultRegistration.remove();
+    cacheRegistration.remove();
+  }
+}
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java
index 23c74406068..f83289d3d5a 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java
@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -28,8 +29,8 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.firebase.firestore.FirebaseFirestoreException.Code;
-import com.google.firebase.firestore.core.TransactionRunner;
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
 import com.google.firebase.firestore.util.AsyncQueue.TimerId;
 import java.util.ArrayList;
@@ -68,12 +69,21 @@ void runStage(Transaction transaction, DocumentReference docRef)
 
   private static TransactionStage get = Transaction::get;
 
+  private enum FromDocumentType {
+    // The operation will be performed on a document that exists.
+    EXISTING,
+    // The operation will be performed on a document that has never existed.
+    NON_EXISTENT,
+    // The operation will be performed on a document that existed, but was deleted.
+    DELETED,
+  }
+
   /**
    * Used for testing that all possible combinations of executing transactions result in the desired
    * document value or error.
    *
-   * <p>`run()`, `withExistingDoc()`, and `withNonexistentDoc()` don't actually do anything except
-   * assign variables into the TransactionTester.
+   * <p>`run()`, `withExistingDoc()`, `withNonexistentDoc()` and `withDeletedDoc()` don't actually
+   * do anything except assign variables into the TransactionTester.
    *
    * <p>`expectDoc()`, `expectNoDoc()`, and `expectError()` will trigger the transaction to run and
    * assert that the end result matches the input.
@@ -81,23 +91,32 @@ void runStage(Transaction transaction, DocumentReference docRef)
   private static class TransactionTester {
     private FirebaseFirestore db;
     private DocumentReference docRef;
-    private boolean fromExistingDoc = false;
+    private FromDocumentType fromDocumentType = FromDocumentType.NON_EXISTENT;
     private List<TransactionStage> stages = new ArrayList<>();
 
     TransactionTester(FirebaseFirestore inputDb) {
       db = inputDb;
     }
 
+    @CanIgnoreReturnValue
     public TransactionTester withExistingDoc() {
-      fromExistingDoc = true;
+      fromDocumentType = FromDocumentType.EXISTING;
       return this;
     }
 
+    @CanIgnoreReturnValue
     public TransactionTester withNonexistentDoc() {
-      fromExistingDoc = false;
+      fromDocumentType = FromDocumentType.NON_EXISTENT;
+      return this;
+    }
+
+    @CanIgnoreReturnValue
+    public TransactionTester withDeletedDoc() {
+      fromDocumentType = FromDocumentType.DELETED;
       return this;
     }
 
+    @CanIgnoreReturnValue
     public TransactionTester run(TransactionStage... inputStages) {
       stages = Arrays.asList(inputStages);
       return this;
@@ -156,8 +175,20 @@ private void expectError(Code expected) {
 
     private void prepareDoc() {
       docRef = db.collection("tester-docref").document();
-      if (fromExistingDoc) {
-        waitFor(docRef.set(map("foo", "bar0")));
+
+      switch (fromDocumentType) {
+        case EXISTING:
+          waitFor(docRef.set(map("foo", "bar0")));
+          break;
+        case NON_EXISTENT:
+          // Nothing to do; document does not exist.
+          break;
+        case DELETED:
+          waitFor(docRef.set(map("foo", "bar0")));
+          waitFor(docRef.delete());
+          break;
+        default:
+          throw new RuntimeException("invalid fromDocumentType: " + fromDocumentType);
       }
     }
 
@@ -237,6 +268,29 @@ public void testRunsTransactionsAfterGettingNonexistentDoc() {
     tt.withNonexistentDoc().run(get, set1, set2).expectDoc(map("foo", "bar2"));
   }
 
+  // This test is identical to the test above, except that withNonexistentDoc()
+  // is replaced by withDeletedDoc(), to guard against regression of
+  // https://github.com/firebase/firebase-js-sdk/issues/5871, where transactions
+  // would incorrectly fail with FAILED_PRECONDITION when operations were
+  // performed on a deleted document (rather than a non-existent document).
+  @Test
+  public void testRunsTransactionsAfterGettingDeletedDoc() {
+    FirebaseFirestore firestore = testFirestore();
+    TransactionTester tt = new TransactionTester(firestore);
+
+    tt.withDeletedDoc().run(get, delete1, delete1).expectNoDoc();
+    tt.withDeletedDoc().run(get, delete1, update2).expectError(Code.INVALID_ARGUMENT);
+    tt.withDeletedDoc().run(get, delete1, set2).expectDoc(map("foo", "bar2"));
+
+    tt.withDeletedDoc().run(get, update1, delete1).expectError(Code.INVALID_ARGUMENT);
+    tt.withDeletedDoc().run(get, update1, update2).expectError(Code.INVALID_ARGUMENT);
+    tt.withDeletedDoc().run(get, update1, set2).expectError(Code.INVALID_ARGUMENT);
+
+    tt.withDeletedDoc().run(get, set1, delete1).expectNoDoc();
+    tt.withDeletedDoc().run(get, set1, update2).expectDoc(map("foo", "bar2"));
+    tt.withDeletedDoc().run(get, set1, set2).expectDoc(map("foo", "bar2"));
+  }
+
   @Test
   public void testRunsTransactionsOnExistingDoc() {
     FirebaseFirestore firestore = testFirestore();
@@ -273,6 +327,24 @@ public void testRunsTransactionsOnNonexistentDoc() {
     tt.withNonexistentDoc().run(set1, set2).expectDoc(map("foo", "bar2"));
   }
 
+  @Test
+  public void testRunsTransactionsOnDeletedDoc() {
+    FirebaseFirestore firestore = testFirestore();
+    TransactionTester tt = new TransactionTester(firestore);
+
+    tt.withDeletedDoc().run(delete1, delete1).expectNoDoc();
+    tt.withDeletedDoc().run(delete1, update2).expectError(Code.INVALID_ARGUMENT);
+    tt.withDeletedDoc().run(delete1, set2).expectDoc(map("foo", "bar2"));
+
+    tt.withDeletedDoc().run(update1, delete1).expectError(Code.NOT_FOUND);
+    tt.withDeletedDoc().run(update1, update2).expectError(Code.NOT_FOUND);
+    tt.withDeletedDoc().run(update1, set2).expectError(Code.NOT_FOUND);
+
+    tt.withDeletedDoc().run(set1, delete1).expectNoDoc();
+    tt.withDeletedDoc().run(set1, update2).expectDoc(map("foo", "bar2"));
+    tt.withDeletedDoc().run(set1, set2).expectDoc(map("foo", "bar2"));
+  }
+
   @Test
   public void testSetDocumentWithMerge() {
     FirebaseFirestore firestore = testFirestore();
@@ -633,6 +705,29 @@ public void testDoesNotRetryOnPermanentError() {
     assertEquals(1, count.get());
   }
 
+  @Test
+  public void testRetryOnAlreadyExistsError() {
+    final FirebaseFirestore firestore = testFirestore();
+    DocumentReference doc = firestore.collection("foo").document();
+    AtomicInteger transactionCallbackCount = new AtomicInteger(0);
+    waitFor(
+        firestore.runTransaction(
+            transaction -> {
+              int currentCount = transactionCallbackCount.incrementAndGet();
+              transaction.get(doc);
+              // Do a write outside of the transaction.
+              if (currentCount == 1) waitFor(doc.set(map("foo1", "bar1")));
+              // Now try to set the doc within the transaction. This should fail once
+              // with ALREADY_EXISTS error.
+              transaction.set(doc, map("foo2", "bar2"));
+              return null;
+            }));
+    DocumentSnapshot snapshot = waitFor(doc.get());
+    assertEquals(2, transactionCallbackCount.get());
+    assertTrue(snapshot.exists());
+    assertEquals(map("foo2", "bar2"), snapshot.getData());
+  }
+
   @Test
   public void testMakesDefaultMaxAttempts() {
     FirebaseFirestore firestore = testFirestore();
@@ -651,7 +746,38 @@ public void testMakesDefaultMaxAttempts() {
 
     Exception e = waitForException(transactionTask);
     assertEquals(Code.FAILED_PRECONDITION, ((FirebaseFirestoreException) e).getCode());
-    assertEquals(TransactionRunner.DEFAULT_MAX_ATTEMPTS_COUNT, count.get());
+    assertEquals(TransactionOptions.DEFAULT_MAX_ATTEMPTS_COUNT, count.get());
+  }
+
+  @Test
+  public void testMakesOptionSpecifiedMaxAttempts() {
+    TransactionOptions options = new TransactionOptions.Builder().setMaxAttempts(1).build();
+
+    FirebaseFirestore firestore = testFirestore();
+    DocumentReference doc1 = firestore.collection("counters").document();
+    AtomicInteger count = new AtomicInteger(0);
+    waitFor(doc1.set(map("count", 15)));
+    Task<Void> transactionTask =
+        firestore.runTransaction(
+            options,
+            transaction -> {
+              // Get the first doc.
+              transaction.get(doc1);
+              // Do a write outside of the transaction to cause the transaction to fail.
+              waitFor(doc1.set(map("count", 1234 + count.incrementAndGet())));
+              return null;
+            });
+
+    Exception e = waitForException(transactionTask);
+    assertEquals(Code.FAILED_PRECONDITION, ((FirebaseFirestoreException) e).getCode());
+    assertEquals(options.getMaxAttempts(), count.get());
+  }
+
+  @Test
+  public void testTransactionOptionsZeroMaxAttempts_shouldThrowIllegalArgumentException() {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> new TransactionOptions.Builder().setMaxAttempts(0).build());
   }
 
   @Test
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java
index e6ac9139fd7..f8efddd7893 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java
@@ -15,6 +15,14 @@
 package com.google.firebase.firestore;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.firestore.Filter.and;
+import static com.google.firebase.firestore.Filter.equalTo;
+import static com.google.firebase.firestore.Filter.greaterThan;
+import static com.google.firebase.firestore.Filter.inArray;
+import static com.google.firebase.firestore.Filter.lessThan;
+import static com.google.firebase.firestore.Filter.notEqualTo;
+import static com.google.firebase.firestore.Filter.notInArray;
+import static com.google.firebase.firestore.Filter.or;
 import static com.google.firebase.firestore.testutil.Assert.assertThrows;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testAlternateFirestore;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testCollection;
@@ -39,6 +47,7 @@
 import com.google.firebase.firestore.Transaction.Function;
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
 import com.google.firebase.firestore.util.Consumer;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -88,7 +97,16 @@ public void disableSslWithoutSettingHostFails() {
   @Test
   public void firestoreGetInstanceWithNullAppFails() {
     expectError(
-        () -> FirebaseFirestore.getInstance(null), "Provided FirebaseApp must not be null.");
+        () -> FirebaseFirestore.getInstance((FirebaseApp) null),
+        "Provided FirebaseApp must not be null.");
+  }
+
+  @Test
+  public void firestoreGetInstanceWithNullDbNameFails() {
+    FirebaseApp.initializeApp(ApplicationProvider.getApplicationContext());
+    expectError(
+        () -> FirebaseFirestore.getInstance((String) null),
+        "Provided database name must not be null.");
   }
 
   @Test
@@ -233,9 +251,12 @@ public void writesMustNotContainReferencesToADifferentDatabase() {
     expectWriteError(
         data,
         String.format(
-            "Invalid data. Document reference is for database %s/(default) but should be for "
-                + "database %s/(default) (found in field foo)",
-            IntegrationTestUtil.BAD_PROJECT_ID, IntegrationTestUtil.provider().projectId()));
+            "Invalid data. Document reference is for database %s/%s but should be for "
+                + "database %s/%s (found in field foo)",
+            IntegrationTestUtil.BAD_PROJECT_ID,
+            BuildConfig.TARGET_DATABASE_ID,
+            IntegrationTestUtil.provider().projectId(),
+            BuildConfig.TARGET_DATABASE_ID));
   }
 
   @Test
@@ -513,66 +534,11 @@ public void queryOrderByKeyBoundsMustBeStringsWithoutSlashes() {
             + "document path, but 'foo' is not because it contains an odd number of segments.");
   }
 
-  @Test
-  public void queriesWithDifferentInequalityFieldsFail() {
-    expectError(
-        () -> testCollection().whereGreaterThan("x", 32).whereLessThan("y", "cat"),
-        "All where filters with an inequality (notEqualTo, notIn, lessThan, "
-            + "lessThanOrEqualTo, greaterThan, or greaterThanOrEqualTo) must be on the "
-            + "same field. But you have filters on 'x' and 'y'");
-  }
-
-  @Test
-  public void queriesWithInequalityDifferentThanFirstOrderByFail() {
-    CollectionReference collection = testCollection();
-    String reason =
-        "Invalid query. You have an inequality where filter (whereLessThan(), "
-            + "whereGreaterThan(), etc.) on field 'x' and so you must also have 'x' as "
-            + "your first orderBy() field, but your first orderBy() is currently on field 'y' "
-            + "instead.";
-    expectError(() -> collection.whereGreaterThan("x", 32).orderBy("y"), reason);
-    expectError(() -> collection.orderBy("y").whereGreaterThan("x", 32), reason);
-    expectError(() -> collection.whereGreaterThan("x", 32).orderBy("y").orderBy("x"), reason);
-    expectError(() -> collection.orderBy("y").orderBy("x").whereGreaterThan("x", 32), reason);
-    expectError(() -> collection.orderBy("y").orderBy("x").whereNotEqualTo("x", 32), reason);
-  }
-
   @Test
   public void queriesWithMultipleNotEqualAndInequalitiesFail() {
     expectError(
         () -> testCollection().whereNotEqualTo("x", 32).whereNotEqualTo("x", 33),
         "Invalid Query. You cannot use more than one '!=' filter.");
-
-    expectError(
-        () -> testCollection().whereNotEqualTo("x", 32).whereGreaterThan("y", 33),
-        "All where filters with an inequality (notEqualTo, notIn, lessThan, "
-            + "lessThanOrEqualTo, greaterThan, or greaterThanOrEqualTo) must be on the "
-            + "same field. But you have filters on 'x' and 'y'");
-  }
-
-  @Test
-  public void queriesWithMultipleArrayFiltersFail() {
-    expectError(
-        () -> testCollection().whereArrayContains("foo", 1).whereArrayContains("foo", 2),
-        "Invalid Query. You cannot use more than one 'array_contains' filter.");
-
-    expectError(
-        () ->
-            testCollection()
-                .whereArrayContains("foo", 1)
-                .whereArrayContainsAny("foo", asList(1, 2)),
-        "Invalid Query. You cannot use 'array_contains_any' filters with 'array_contains' filters.");
-
-    expectError(
-        () ->
-            testCollection()
-                .whereArrayContainsAny("foo", asList(1, 2))
-                .whereArrayContains("foo", 1),
-        "Invalid Query. You cannot use 'array_contains' filters with 'array_contains_any' filters.");
-
-    expectError(
-        () -> testCollection().whereNotIn("foo", asList(1, 2)).whereArrayContains("foo", 1),
-        "Invalid Query. You cannot use 'array_contains' filters with 'not_in' filters.");
   }
 
   @Test
@@ -588,43 +554,9 @@ public void queriesWithNotEqualAndNotInFiltersFail() {
 
   @Test
   public void queriesWithMultipleDisjunctiveFiltersFail() {
-    expectError(
-        () -> testCollection().whereIn("foo", asList(1, 2)).whereIn("bar", asList(1, 2)),
-        "Invalid Query. You cannot use more than one 'in' filter.");
-
     expectError(
         () -> testCollection().whereNotIn("foo", asList(1, 2)).whereNotIn("bar", asList(1, 2)),
-        "All where filters with an inequality (notEqualTo, notIn, lessThan, "
-            + "lessThanOrEqualTo, greaterThan, or greaterThanOrEqualTo) must be on the "
-            + "same field. But you have filters on 'foo' and 'bar'");
-
-    expectError(
-        () ->
-            testCollection()
-                .whereArrayContainsAny("foo", asList(1, 2))
-                .whereArrayContainsAny("bar", asList(1, 2)),
-        "Invalid Query. You cannot use more than one 'array_contains_any' filter.");
-
-    expectError(
-        () ->
-            testCollection()
-                .whereArrayContainsAny("foo", asList(1, 2))
-                .whereIn("bar", asList(1, 2)),
-        "Invalid Query. You cannot use 'in' filters with 'array_contains_any' filters.");
-
-    expectError(
-        () ->
-            testCollection()
-                .whereIn("bar", asList(1, 2))
-                .whereArrayContainsAny("foo", asList(1, 2)),
-        "Invalid Query. You cannot use 'array_contains_any' filters with 'in' filters.");
-
-    expectError(
-        () ->
-            testCollection()
-                .whereArrayContainsAny("foo", asList(1, 2))
-                .whereNotIn("bar", asList(1, 2)),
-        "Invalid Query. You cannot use 'not_in' filters with 'array_contains_any' filters.");
+        "Invalid Query. You cannot use more than one 'not_in' filter.");
 
     expectError(
         () ->
@@ -640,61 +572,6 @@ public void queriesWithMultipleDisjunctiveFiltersFail() {
     expectError(
         () -> testCollection().whereIn("bar", asList(1, 2)).whereNotIn("foo", asList(1, 2)),
         "Invalid Query. You cannot use 'not_in' filters with 'in' filters.");
-
-    // This is redundant with the above tests, but makes sure our validation doesn't get confused.
-    expectError(
-        () ->
-            testCollection()
-                .whereIn("bar", asList(1, 2))
-                .whereArrayContains("foo", 1)
-                .whereArrayContainsAny("foo", asList(1, 2)),
-        "Invalid Query. You cannot use 'array_contains_any' filters with 'in' filters.");
-
-    expectError(
-        () ->
-            testCollection()
-                .whereArrayContains("foo", 1)
-                .whereIn("bar", asList(1, 2))
-                .whereArrayContainsAny("foo", asList(1, 2)),
-        "Invalid Query. You cannot use 'array_contains_any' filters with 'array_contains' filters.");
-
-    expectError(
-        () ->
-            testCollection()
-                .whereNotIn("bar", asList(1, 2))
-                .whereArrayContains("foo", 1)
-                .whereArrayContainsAny("foo", asList(1, 2)),
-        "Invalid Query. You cannot use 'array_contains' filters with 'not_in' filters.");
-
-    expectError(
-        () ->
-            testCollection()
-                .whereArrayContains("foo", 1)
-                .whereIn("foo", asList(1, 2))
-                .whereNotIn("bar", asList(1, 2)),
-        "Invalid Query. You cannot use 'not_in' filters with 'array_contains' filters.");
-  }
-
-  @Test
-  public void queriesCanUseInWithArrayContains() {
-    testCollection().whereArrayContains("foo", 1).whereIn("bar", asList(1, 2));
-    testCollection().whereIn("bar", asList(1, 2)).whereArrayContains("foo", 1);
-
-    expectError(
-        () ->
-            testCollection()
-                .whereIn("bar", asList(1, 2))
-                .whereArrayContains("foo", 1)
-                .whereArrayContains("foo", 1),
-        "Invalid Query. You cannot use more than one 'array_contains' filter.");
-
-    expectError(
-        () ->
-            testCollection()
-                .whereArrayContains("foo", 1)
-                .whereIn("bar", asList(1, 2))
-                .whereIn("bar", asList(1, 2)),
-        "Invalid Query. You cannot use more than one 'in' filter.");
   }
 
   @Test
@@ -710,22 +587,6 @@ public void queriesInAndArrayContainsAnyArrayRules() {
     expectError(
         () -> testCollection().whereArrayContainsAny("bar", asList()),
         "Invalid Query. A non-empty array is required for 'array_contains_any' filters.");
-
-    expectError(
-        // The 10 element max includes duplicates.
-        () -> testCollection().whereIn("bar", asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 9)),
-        "Invalid Query. 'in' filters support a maximum of 10 elements in the value array.");
-
-    expectError(
-        // The 10 element max includes duplicates.
-        () -> testCollection().whereNotIn("bar", asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 9)),
-        "Invalid Query. 'not_in' filters support a maximum of 10 elements in the value array.");
-
-    expectError(
-        // The 10 element max includes duplicates.
-        () ->
-            testCollection().whereArrayContainsAny("bar", asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 9)),
-        "Invalid Query. 'array_contains_any' filters support a maximum of 10 elements in the value array.");
   }
 
   @Test
@@ -815,6 +676,108 @@ public void queriesUsingInAndDocumentIdMustHaveProperDocumentReferencesInArray()
         reason);
   }
 
+  @Test
+  public void testConflictingOperatorsInCompositeFilters() {
+    CollectionReference collection = testCollection();
+    // Composite queries can validate conflicting operators in multiple inequality.
+    String reason = "Invalid Query. You cannot use more than one '!=' filter.";
+    expectError(
+        () ->
+            collection
+                .where(
+                    or(
+                        and(lessThan("a", "b"), inArray("c", Arrays.asList("d", "e"))),
+                        and(equalTo("e", "f"), notEqualTo("g", "h"))))
+                .where(
+                    or(
+                        and(greaterThan("i", "j"), greaterThan("k", "l")),
+                        and(notEqualTo("o", "p"), lessThan("q", "r")))),
+        reason);
+
+    reason = "Invalid Query. You cannot use more than one 'not_in' filter.";
+    expectError(
+        () ->
+            collection
+                .where(
+                    or(
+                        and(lessThan("a", "b"), notInArray("c", Arrays.asList("d", "e"))),
+                        and(equalTo("e", "f"), lessThan("g", "j"))))
+                .where(
+                    or(
+                        and(greaterThan("i", "j"), greaterThan("k", "l")),
+                        and(notInArray("o", Arrays.asList("p", "q")), lessThan("q", "r")))),
+        reason);
+
+    reason = "Invalid Query. You cannot use 'not_in' filters with '!=' filters.";
+    expectError(
+        () ->
+            collection
+                .where(
+                    or(
+                        and(lessThan("a", "b"), greaterThan("c", "d")),
+                        and(equalTo("e", "f"), notEqualTo("g", "h"))))
+                .where(
+                    or(
+                        and(greaterThan("i", "j"), greaterThan("k", "l")),
+                        and(notInArray("o", Arrays.asList("p", "q")), lessThan("q", "r")))),
+        reason);
+
+    reason = "Invalid Query. You cannot use 'not_in' filters with 'in' filters.";
+    expectError(
+        () ->
+            collection
+                .where(
+                    or(
+                        and(lessThan("a", "b"), inArray("c", Arrays.asList("d", "e"))),
+                        and(equalTo("e", "f"), lessThan("g", "j"))))
+                .where(
+                    or(
+                        and(greaterThan("i", "j"), greaterThan("k", "l")),
+                        and(notInArray("o", Arrays.asList("p", "q")), lessThan("q", "r")))),
+        reason);
+  }
+
+  @Test
+  public void testInvalidQueryFilters() {
+    CollectionReference collection = testCollection();
+    // Conflicting operations within a composite filter.
+    String reason = "Invalid Query. You cannot use 'not_in' filters with 'in' filters.";
+    expectError(
+        () ->
+            collection.where(
+                or(
+                    and(equalTo("a", "b"), inArray("c", Arrays.asList("d", "e"))),
+                    and(equalTo("e", "f"), notInArray("c", Arrays.asList("f", "g"))))),
+        reason);
+
+    // Conflicting operations between a field filter and a composite filter.
+    reason = "Invalid Query. You cannot use 'not_in' filters with 'in' filters.";
+    expectError(
+        () ->
+            collection
+                .where(
+                    or(
+                        and(equalTo("a", "b"), inArray("c", Arrays.asList("d", "e"))),
+                        and(equalTo("e", "f"), equalTo("g", "h"))))
+                .where(notInArray("i", Arrays.asList("j", "k"))),
+        reason);
+
+    // Conflicting operations between two composite filters.
+    reason = "Invalid Query. You cannot use 'not_in' filters with 'in' filters.";
+    expectError(
+        () ->
+            collection
+                .where(
+                    or(
+                        and(equalTo("a", "b"), inArray("c", Arrays.asList("d", "e"))),
+                        and(equalTo("e", "f"), equalTo("g", "h"))))
+                .where(
+                    or(
+                        and(equalTo("i", "j"), notInArray("l", Arrays.asList("m", "n"))),
+                        and(equalTo("o", "p"), equalTo("q", "r")))),
+        reason);
+  }
+
   // Helpers
 
   /** Performs a write using each write API and makes sure it succeeds. */
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/remote/RemoteStoreTest.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/remote/RemoteStoreTest.java
index b4da7050a40..bf2b97219f6 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/remote/RemoteStoreTest.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/remote/RemoteStoreTest.java
@@ -21,7 +21,6 @@
 import com.google.firebase.database.collection.ImmutableSortedSet;
 import com.google.firebase.firestore.auth.User;
 import com.google.firebase.firestore.core.OnlineState;
-import com.google.firebase.firestore.local.IndexBackfiller;
 import com.google.firebase.firestore.local.LocalStore;
 import com.google.firebase.firestore.local.MemoryPersistence;
 import com.google.firebase.firestore.local.Persistence;
@@ -79,9 +78,7 @@ public ImmutableSortedSet<DocumentKey> getRemoteKeysForTarget(int targetId) {
     QueryEngine queryEngine = new QueryEngine();
     Persistence persistence = MemoryPersistence.createEagerGcMemoryPersistence();
     persistence.start();
-    IndexBackfiller indexBackfiller = new IndexBackfiller(persistence, new AsyncQueue());
-    LocalStore localStore =
-        new LocalStore(persistence, indexBackfiller, queryEngine, User.UNAUTHENTICATED);
+    LocalStore localStore = new LocalStore(persistence, queryEngine, User.UNAUTHENTICATED);
     RemoteStore remoteStore =
         new RemoteStore(callback, localStore, datastore, testQueue, connectivityMonitor);
 
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/remote/TestingHooksUtil.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/remote/TestingHooksUtil.java
new file mode 100644
index 00000000000..7f015ab8824
--- /dev/null
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/remote/TestingHooksUtil.java
@@ -0,0 +1,144 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore.remote;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.ListenerRegistration;
+import java.util.ArrayList;
+
+/** Convenience functions for accessing the testing hooks from {@link TestingHooks}. */
+public final class TestingHooksUtil {
+
+  /** Private constructor to prevent instantiation. */
+  private TestingHooksUtil() {}
+
+  /**
+   * Captures all existence filter mismatches in the Watch 'Listen' stream that occur during the
+   * execution of the given callback.
+   *
+   * @param callback The callback to invoke; during the invocation of this callback all existence
+   *     filter mismatches will be captured.
+   * @return the captured existence filter mismatches.
+   */
+  public static ArrayList<ExistenceFilterMismatchInfo> captureExistenceFilterMismatches(
+      Runnable callback) {
+    if (callback == null) {
+      throw new NullPointerException("the given callback must not be null");
+    }
+
+    ArrayList<ExistenceFilterMismatchInfo> existenceFilterMismatches = new ArrayList<>();
+
+    ListenerRegistration listenerRegistration =
+        TestingHooks.getInstance()
+            .addExistenceFilterMismatchListener(
+                info -> {
+                  synchronized (existenceFilterMismatches) {
+                    existenceFilterMismatches.add(new ExistenceFilterMismatchInfo(info));
+                  }
+                });
+
+    try {
+      callback.run();
+    } finally {
+      listenerRegistration.remove();
+    }
+
+    // Return a *copy* of the `existenceFilterMismatches` list because, as documented in
+    // addExistenceFilterMismatchListener(), it could *still* get notifications after it is
+    // unregistered and that would be a race condition with the caller accessing the list.
+    synchronized (existenceFilterMismatches) {
+      return new ArrayList<>(existenceFilterMismatches);
+    }
+  }
+
+  /** @see TestingHooks.ExistenceFilterMismatchInfo */
+  public static final class ExistenceFilterMismatchInfo {
+
+    private final TestingHooks.ExistenceFilterMismatchInfo info;
+
+    ExistenceFilterMismatchInfo(@NonNull TestingHooks.ExistenceFilterMismatchInfo info) {
+      this.info = info;
+    }
+
+    public int localCacheCount() {
+      return info.localCacheCount();
+    }
+
+    public int existenceFilterCount() {
+      return info.existenceFilterCount();
+    }
+
+    @Nullable
+    public ExistenceFilterBloomFilterInfo bloomFilter() {
+      TestingHooks.ExistenceFilterBloomFilterInfo bloomFilterInfo = info.bloomFilter();
+      return bloomFilterInfo == null
+          ? null
+          : new ExistenceFilterBloomFilterInfo(
+              bloomFilterInfo, info.projectId(), info.databaseId());
+    }
+  }
+
+  /** @see TestingHooks.ExistenceFilterBloomFilterInfo */
+  public static final class ExistenceFilterBloomFilterInfo {
+
+    private final TestingHooks.ExistenceFilterBloomFilterInfo info;
+    private final String projectId;
+    private final String databaseId;
+
+    ExistenceFilterBloomFilterInfo(
+        @NonNull TestingHooks.ExistenceFilterBloomFilterInfo info,
+        String projectId,
+        String databaseId) {
+      this.info = info;
+      this.projectId = projectId;
+      this.databaseId = databaseId;
+    }
+
+    public boolean applied() {
+      return info.applied();
+    }
+
+    public int hashCount() {
+      return info.hashCount();
+    }
+
+    public int bitmapLength() {
+      return info.bitmapLength();
+    }
+
+    public int padding() {
+      return info.padding();
+    }
+
+    public boolean mightContain(DocumentReference documentReference) {
+      BloomFilter bloomFilter = info.bloomFilter();
+      if (bloomFilter == null) {
+        return false;
+      }
+      return bloomFilter.mightContain(getBloomFilterEntryFor(documentReference));
+    }
+
+    private String getBloomFilterEntryFor(DocumentReference documentReference) {
+      return "projects/"
+          + projectId
+          + "/databases/"
+          + databaseId
+          + "/documents/"
+          + documentReference.getPath();
+    }
+  }
+}
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/CompositeIndexTestHelper.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/CompositeIndexTestHelper.java
new file mode 100644
index 00000000000..7026b7944ec
--- /dev/null
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/CompositeIndexTestHelper.java
@@ -0,0 +1,196 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore.testutil;
+
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.checkOnlineAndOfflineResultsMatch;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.querySnapshotToIds;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testFirestore;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitFor;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.writeAllDocs;
+import static com.google.firebase.firestore.util.Util.autoId;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+
+import androidx.annotation.NonNull;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.Timestamp;
+import com.google.firebase.firestore.CollectionReference;
+import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.DocumentSnapshot;
+import com.google.firebase.firestore.Query;
+import com.google.firebase.firestore.QuerySnapshot;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This helper class is designed to facilitate integration testing of Firestore queries that require
+ * composite indexes within a controlled testing environment.
+ *
+ * <p>Key Features:
+ *
+ * <ul>
+ *   <li>Runs tests against the dedicated test collection with predefined composite indexes.
+ *   <li>Automatically associates a test ID with documents for data isolation.
+ *   <li>Utilizes TTL policy for automatic test data cleanup.
+ *   <li>Constructs Firestore queries with test ID filters.
+ * </ul>
+ */
+public class CompositeIndexTestHelper {
+  private final String testId;
+  private static final String TEST_ID_FIELD = "testId";
+  private static final String TTL_FIELD = "expireAt";
+  private static final String COMPOSITE_INDEX_TEST_COLLECTION = "composite-index-test-collection";
+
+  // Creates a new instance of the CompositeIndexTestHelper class, with a unique test
+  // identifier for data isolation.
+  public CompositeIndexTestHelper() {
+    this.testId = "test-id-" + autoId();
+  }
+
+  @NonNull
+  public CollectionReference withTestCollection() {
+    return testFirestore().collection(COMPOSITE_INDEX_TEST_COLLECTION);
+  }
+
+  // Runs a test with specified documents in the COMPOSITE_INDEX_TEST_COLLECTION.
+  @NonNull
+  public CollectionReference withTestDocs(@NonNull Map<String, Map<String, Object>> docs) {
+    CollectionReference writer = withTestCollection();
+    writeAllDocs(writer, prepareTestDocuments(docs));
+    CollectionReference reader = testFirestore().collection(writer.getPath());
+    return reader;
+  }
+
+  // Hash the document key with testId.
+  private String toHashedId(String docId) {
+    return docId + '-' + testId;
+  }
+
+  private String[] toHashedIds(String[] docs) {
+    String[] hashedIds = new String[docs.length];
+    for (int i = 0; i < docs.length; i++) {
+      hashedIds[i] = toHashedId(docs[i]);
+    }
+    return hashedIds;
+  }
+
+  // Adds test-specific fields to a document, including the testId and expiration date.
+  public Map<String, Object> addTestSpecificFieldsToDoc(Map<String, Object> doc) {
+    Map<String, Object> updatedDoc = new HashMap<>(doc);
+    updatedDoc.put(TEST_ID_FIELD, testId);
+    updatedDoc.put(
+        TTL_FIELD,
+        new Timestamp( // Expire test data after 24 hours
+            Timestamp.now().getSeconds() + 24 * 60 * 60, Timestamp.now().getNanoseconds()));
+    return updatedDoc;
+  }
+
+  // Remove test-specific fields from a document.
+  private Map<String, Object> removeTestSpecificFieldsFromDoc(Map<String, Object> doc) {
+    doc.remove(TTL_FIELD);
+    doc.remove(TEST_ID_FIELD);
+    return doc;
+  }
+
+  // Helper method to hash document keys and add test-specific fields for the provided documents.
+  private Map<String, Map<String, Object>> prepareTestDocuments(
+      Map<String, Map<String, Object>> docs) {
+    Map<String, Map<String, Object>> result = new HashMap<>();
+    for (String key : docs.keySet()) {
+      Map<String, Object> doc = addTestSpecificFieldsToDoc(docs.get(key));
+      result.put(toHashedId(key), doc);
+    }
+    return result;
+  }
+
+  // Asserts that the result of running the query while online (against the backend/emulator) is
+  // the same as running it while offline. The expected document Ids are hashed to match the
+  // actual document IDs created by the test helper.
+  @NonNull
+  public void assertOnlineAndOfflineResultsMatch(
+      @NonNull Query query, @NonNull String... expectedDocs) {
+    checkOnlineAndOfflineResultsMatch(query, toHashedIds(expectedDocs));
+  }
+
+  // Asserts that the IDs in the query snapshot matches the expected Ids. The expected document
+  // IDs are hashed to match the actual document IDs created by the test helper.
+  @NonNull
+  public void assertSnapshotResultIdsMatch(
+      @NonNull QuerySnapshot snapshot, @NonNull String... expectedIds) {
+    assertEquals(querySnapshotToIds(snapshot), asList(toHashedIds(expectedIds)));
+  }
+
+  // Adds a filter on test id for a query.
+  @NonNull
+  public Query query(@NonNull Query query_) {
+    return query_.whereEqualTo(TEST_ID_FIELD, testId);
+  }
+
+  // Get document reference from a document key.
+  @NonNull
+  public DocumentReference getDocRef(
+      @NonNull CollectionReference collection, @NonNull String docId) {
+    if (!docId.contains("test-id-")) {
+      docId = toHashedId(docId);
+    }
+    return collection.document(docId);
+  }
+
+  // Adds a document to a Firestore collection with test-specific fields.
+  @NonNull
+  public Task<DocumentReference> addDoc(
+      @NonNull CollectionReference collection, @NonNull Map<String, Object> data) {
+    return collection.add(addTestSpecificFieldsToDoc(data));
+  }
+
+  // Sets a document in Firestore with test-specific fields.
+  @NonNull
+  public Task<Void> setDoc(@NonNull DocumentReference document, @NonNull Map<String, Object> data) {
+    return document.set(addTestSpecificFieldsToDoc(data));
+  }
+
+  @NonNull
+  public Task<Void> updateDoc(
+      @NonNull DocumentReference document, @NonNull Map<String, Object> data) {
+    return document.update(data);
+  }
+
+  @NonNull
+  public Task<Void> deleteDoc(@NonNull DocumentReference document) {
+    return document.delete();
+  }
+
+  // Retrieve a single document from Firestore with test-specific fields removed.
+  // TODO(composite-index-testing) Return sanitized DocumentSnapshot instead of its data.
+  @NonNull
+  public Map<String, Object> getSanitizedDocumentData(@NonNull DocumentReference document) {
+    DocumentSnapshot docSnapshot = waitFor(document.get());
+    return removeTestSpecificFieldsFromDoc(docSnapshot.getData());
+  }
+
+  // Retrieve multiple documents from Firestore with test-specific fields removed.
+  // TODO(composite-index-testing) Return sanitized QuerySnapshot instead of its data.
+  @NonNull
+  public List<Map<String, Object>> getSanitizedQueryData(@NonNull Query query_) {
+    QuerySnapshot querySnapshot = waitFor(query(query_).get());
+    List<Map<String, Object>> res = new ArrayList<>();
+    for (DocumentSnapshot doc : querySnapshot) {
+      res.add(removeTestSpecificFieldsFromDoc(doc.getData()));
+    }
+    return res;
+  }
+}
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java
index 819c691051c..0cde1711910 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java
@@ -16,6 +16,8 @@
 
 import static com.google.firebase.firestore.testutil.TestUtil.map;
 import static com.google.firebase.firestore.util.Util.autoId;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import android.content.Context;
@@ -35,7 +37,10 @@
 import com.google.firebase.firestore.FirebaseFirestoreSettings;
 import com.google.firebase.firestore.ListenerRegistration;
 import com.google.firebase.firestore.MetadataChanges;
+import com.google.firebase.firestore.Query;
 import com.google.firebase.firestore.QuerySnapshot;
+import com.google.firebase.firestore.Source;
+import com.google.firebase.firestore.WriteBatch;
 import com.google.firebase.firestore.auth.User;
 import com.google.firebase.firestore.core.DatabaseInfo;
 import com.google.firebase.firestore.model.DatabaseId;
@@ -82,10 +87,18 @@ public void changeUserTo(User user) {
 /** A set of helper methods for tests */
 public class IntegrationTestUtil {
 
-  // Whether the integration tests should run against a local Firestore emulator instead of the
-  // Production environment. Note that the Android Emulator treats "10.0.2.2" as its host machine.
-  // TODO(mrschmidt): Support multiple environments (Emulator, QA, Nightly, Production)
-  private static final boolean CONNECT_TO_EMULATOR = BuildConfig.USE_EMULATOR_FOR_TESTS;
+  public enum TargetBackend {
+    EMULATOR,
+    QA,
+    NIGHTLY,
+    PROD
+  }
+
+  // Set this to the desired enum value to change the target backend when running tests locally.
+  // Note: DO NOT change this variable except for local testing.
+  private static final TargetBackend backendForLocalTesting = null;
+
+  private static final TargetBackend backend = getTargetBackend();
   private static final String EMULATOR_HOST = "10.0.2.2";
   private static final int EMULATOR_PORT = 8080;
 
@@ -120,34 +133,56 @@ public static FirestoreProvider provider() {
     return provider;
   }
 
-  public static DatabaseInfo testEnvDatabaseInfo() {
-    if (CONNECT_TO_EMULATOR) {
-      return new DatabaseInfo(
-          DatabaseId.forProject(provider.projectId()),
-          "test-persistenceKey",
-          String.format("%s:%d", EMULATOR_HOST, EMULATOR_PORT),
-          /*sslEnabled=*/ false);
-    } else {
-      return new DatabaseInfo(
-          DatabaseId.forProject(provider.projectId()),
-          "test-persistenceKey",
-          provider.firestoreHost(),
-          /*sslEnabled=*/ true);
+  private static String getFirestoreHost() {
+    switch (backend) {
+      case EMULATOR:
+        return String.format("%s:%d", EMULATOR_HOST, EMULATOR_PORT);
+      case QA:
+        return "staging-firestore.sandbox.googleapis.com";
+      case NIGHTLY:
+        return "test-firestore.sandbox.googleapis.com";
+      case PROD:
+      default:
+        return "firestore.googleapis.com";
     }
   }
 
-  public static FirebaseFirestoreSettings newTestSettings() {
-    FirebaseFirestoreSettings.Builder settings = new FirebaseFirestoreSettings.Builder();
+  private static boolean getSslEnabled() {
+    // ssl is enabled in all environments except for the emulator.
+    return !isRunningAgainstEmulator();
+  }
 
-    if (CONNECT_TO_EMULATOR) {
-      settings.setHost(String.format("%s:%d", EMULATOR_HOST, EMULATOR_PORT));
-      settings.setSslEnabled(false);
-    } else {
-      settings.setHost(provider.firestoreHost());
+  public static TargetBackend getTargetBackend() {
+    if (backendForLocalTesting != null) {
+      return backendForLocalTesting;
+    }
+    switch (BuildConfig.TARGET_BACKEND) {
+      case "emulator":
+        return TargetBackend.EMULATOR;
+      case "qa":
+        return TargetBackend.QA;
+      case "nightly":
+        return TargetBackend.NIGHTLY;
+      case "prod":
+        return TargetBackend.PROD;
+      default:
+        throw new RuntimeException("Unknown backend configuration used for integration tests.");
     }
+  }
 
-    settings.setPersistenceEnabled(true);
+  public static DatabaseInfo testEnvDatabaseInfo() {
+    return new DatabaseInfo(
+        DatabaseId.forProject(provider.projectId()),
+        "test-persistenceKey",
+        getFirestoreHost(),
+        getSslEnabled());
+  }
 
+  public static FirebaseFirestoreSettings newTestSettings() {
+    Logger.debug("IntegrationTestUtil", "target backend is: %s", backend.name());
+    FirebaseFirestoreSettings.Builder settings = new FirebaseFirestoreSettings.Builder();
+    settings.setHost(getFirestoreHost());
+    settings.setSslEnabled(getSslEnabled());
     return settings.build();
   }
 
@@ -251,11 +286,22 @@ public static FirebaseFirestore testFirestore(
       Logger.Level logLevel,
       FirebaseFirestoreSettings settings,
       String persistenceKey) {
+    return testFirestore(
+        DatabaseId.forDatabase(projectId, BuildConfig.TARGET_DATABASE_ID),
+        logLevel,
+        settings,
+        persistenceKey);
+  }
+
+  public static FirebaseFirestore testFirestore(
+      DatabaseId databaseId,
+      Logger.Level logLevel,
+      FirebaseFirestoreSettings settings,
+      String persistenceKey) {
     // This unfortunately is a global setting that affects existing Firestore clients.
     Logger.setLogLevel(logLevel);
 
     Context context = ApplicationProvider.getApplicationContext();
-    DatabaseId databaseId = DatabaseId.forDatabase(projectId, DatabaseId.DEFAULT_DATABASE_ID);
 
     ensureStrictMode();
 
@@ -316,8 +362,27 @@ public static CollectionReference testCollectionWithDocs(Map<String, Map<String,
 
   public static void writeAllDocs(
       CollectionReference collection, Map<String, Map<String, Object>> docs) {
+    WriteBatch writeBatch = null;
+    int writeBatchSize = 0;
+
     for (Map.Entry<String, Map<String, Object>> doc : docs.entrySet()) {
-      waitFor(collection.document(doc.getKey()).set(doc.getValue()));
+      if (writeBatch == null) {
+        writeBatch = collection.getFirestore().batch();
+      }
+
+      writeBatch.set(collection.document(doc.getKey()), doc.getValue());
+      writeBatchSize++;
+
+      // Write batches are capped at 500 writes. Use 400 just to be safe.
+      if (writeBatchSize == 400) {
+        waitFor(writeBatch.commit());
+        writeBatch = null;
+        writeBatchSize = 0;
+      }
+    }
+
+    if (writeBatch != null) {
+      waitFor(writeBatch.commit());
     }
   }
 
@@ -435,7 +500,7 @@ public static Map<String, Object> toDataMap(QuerySnapshot qrySnap) {
   }
 
   public static boolean isRunningAgainstEmulator() {
-    return CONNECT_TO_EMULATOR;
+    return backend.equals(TargetBackend.EMULATOR);
   }
 
   public static void testChangeUserTo(User user) {
@@ -447,4 +512,23 @@ public static List<Object> nullList() {
     nullArray.add(null);
     return nullArray;
   }
+
+  /**
+   * Checks that running the query while online (against the backend/emulator) results in the same
+   * documents as running the query while offline. If `expectedDocs` is provided, it also checks
+   * that both online and offline query result is equal to the expected documents.
+   *
+   * @param query The query to check
+   * @param expectedDocs Ordered list of document keys that are expected to match the query
+   */
+  public static void checkOnlineAndOfflineResultsMatch(Query query, String... expectedDocs) {
+    QuerySnapshot docsFromServer = waitFor(query.get(Source.SERVER));
+    QuerySnapshot docsFromCache = waitFor(query.get(Source.CACHE));
+
+    assertEquals(querySnapshotToIds(docsFromServer), querySnapshotToIds(docsFromCache));
+    List<String> expected = asList(expectedDocs);
+    if (!expected.isEmpty()) {
+      assertEquals(expected, querySnapshotToIds(docsFromCache));
+    }
+  }
 }
diff --git a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/prod_provider/FirestoreProvider.java b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/prod_provider/FirestoreProvider.java
index a34bfefe8d6..c08fd22e3b3 100644
--- a/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/prod_provider/FirestoreProvider.java
+++ b/firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/prod_provider/FirestoreProvider.java
@@ -35,10 +35,6 @@ public FirestoreProvider(Context context) {
     this.context = context;
   }
 
-  public String firestoreHost() {
-    return "firestore.googleapis.com";
-  }
-
   public String projectId() {
     return context.getString(R.string.project_id);
   }
diff --git a/firebase-firestore/src/main/AndroidManifest.xml b/firebase-firestore/src/main/AndroidManifest.xml
index 8e298470f6f..2734c207298 100644
--- a/firebase-firestore/src/main/AndroidManifest.xml
+++ b/firebase-firestore/src/main/AndroidManifest.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        package="com.google.firebase.firestore">
+        xmlns:tools="http://schemas.android.com/tools">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14" />-->
+    <!--<uses-sdk android:minSdkVersion="21" />-->
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <application>
-        <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
+        <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.firestore.FirebaseFirestoreKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.firestore.FirestoreRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
diff --git a/firebase-firestore/src/main/java/com/google/cloud/datastore/core/number/NumberComparisonHelper.java b/firebase-firestore/src/main/java/com/google/cloud/datastore/core/number/NumberComparisonHelper.java
index b8527594d32..ed5b8afd69f 100644
--- a/firebase-firestore/src/main/java/com/google/cloud/datastore/core/number/NumberComparisonHelper.java
+++ b/firebase-firestore/src/main/java/com/google/cloud/datastore/core/number/NumberComparisonHelper.java
@@ -59,18 +59,9 @@ public static int firestoreCompareDoubleWithLong(double doubleValue, long longVa
     return firestoreCompareDoubles(doubleValue, longAsDouble);
   }
 
-  /**
-   * Compares longs. Note that we can't use Long.compare because it's only available after Android
-   * 19.
-   */
+  /** Compares longs. */
   public static int compareLongs(long leftLong, long rightLong) {
-    if (leftLong < rightLong) {
-      return -1;
-    } else if (leftLong > rightLong) {
-      return 1;
-    } else {
-      return 0;
-    }
+    return Long.compare(leftLong, rightLong);
   }
 
   /**
diff --git a/firebase-firestore/src/main/java/com/google/firebase/Timestamp.java b/firebase-firestore/src/main/java/com/google/firebase/Timestamp.java
deleted file mode 100644
index f0b16987125..00000000000
--- a/firebase-firestore/src/main/java/com/google/firebase/Timestamp.java
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase;
-
-import static com.google.firebase.firestore.util.Preconditions.checkArgument;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import androidx.annotation.NonNull;
-import java.util.Date;
-
-/**
- * A Timestamp represents a point in time independent of any time zone or calendar, represented as
- * seconds and fractions of seconds at nanosecond resolution in UTC Epoch time. It is encoded using
- * the Proleptic Gregorian Calendar which extends the Gregorian calendar backwards to year one. It
- * is encoded assuming all minutes are 60 seconds long, i.e. leap seconds are "smeared" so that no
- * leap second table is needed for interpretation. Range is from 0001-01-01T00:00:00Z to
- * 9999-12-31T23:59:59.999999999Z. By restricting to that range, we ensure that we can convert to
- * and from RFC 3339 date strings.
- *
- * @see <a href="
- *     https://github.com/google/protobuf/blob/master/src/google/protobuf/timestamp.proto">The
- *     reference timestamp definition</a>
- */
-public final class Timestamp implements Comparable<Timestamp>, Parcelable {
-
-  @NonNull
-  public static final Parcelable.Creator<Timestamp> CREATOR =
-      new Parcelable.Creator<Timestamp>() {
-        @Override
-        public Timestamp createFromParcel(Parcel source) {
-          return new Timestamp(source);
-        }
-
-        @Override
-        public Timestamp[] newArray(int size) {
-          return new Timestamp[size];
-        }
-      };
-
-  /**
-   * Creates a new timestamp.
-   *
-   * @param seconds represents seconds of UTC time since Unix epoch 1970-01-01T00:00:00Z. Must be
-   *     from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive.
-   * @param nanoseconds represents non-negative fractions of a second at nanosecond resolution.
-   *     Negative second values with fractions must still have non-negative nanoseconds values that
-   *     count forward in time. Must be from 0 to 999,999,999 inclusive.
-   */
-  public Timestamp(long seconds, int nanoseconds) {
-    validateRange(seconds, nanoseconds);
-    this.seconds = seconds;
-    this.nanoseconds = nanoseconds;
-  }
-
-  protected Timestamp(@NonNull Parcel in) {
-    this.seconds = in.readLong();
-    this.nanoseconds = in.readInt();
-  }
-
-  /** Creates a new timestamp from the given date. */
-  public Timestamp(@NonNull Date date) {
-    long millis = date.getTime();
-    long seconds = millis / 1000;
-    int nanoseconds = (int) (millis % 1000) * 1000000;
-    if (nanoseconds < 0) {
-      seconds -= 1;
-      nanoseconds += 1000000000;
-    }
-    validateRange(seconds, nanoseconds);
-    this.seconds = seconds;
-    this.nanoseconds = nanoseconds;
-  }
-
-  /** Creates a new timestamp with the current date, with millisecond precision. */
-  @NonNull
-  public static Timestamp now() {
-    return new Timestamp(new Date());
-  }
-
-  /** Returns the seconds part of the timestamp. */
-  public long getSeconds() {
-    return seconds;
-  }
-
-  /** Returns the sub-second part of the timestamp, in nanoseconds. */
-  public int getNanoseconds() {
-    return nanoseconds;
-  }
-
-  /** Returns a new Date corresponding to this timestamp. This may lose precision. */
-  @NonNull
-  public Date toDate() {
-    return new Date(seconds * 1000 + (nanoseconds / 1000000));
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  @Override
-  public void writeToParcel(@NonNull Parcel dest, int flags) {
-    dest.writeLong(this.seconds);
-    dest.writeInt(this.nanoseconds);
-  }
-
-  @Override
-  public int compareTo(@NonNull Timestamp other) {
-    if (seconds == other.seconds) {
-      return Integer.signum(nanoseconds - other.nanoseconds);
-    }
-    return Long.signum(seconds - other.seconds);
-  }
-
-  @Override
-  public boolean equals(Object other) {
-    if (other == this) {
-      return true;
-    }
-    if (!(other instanceof Timestamp)) {
-      return false;
-    }
-    return compareTo((Timestamp) other) == 0;
-  }
-
-  @Override
-  public int hashCode() {
-    int prime = 37;
-    int result = prime * (int) seconds;
-    result = prime * result + (int) (seconds >> 32);
-    result = prime * result + nanoseconds;
-    return result;
-  }
-
-  @Override
-  public String toString() {
-    return "Timestamp(seconds=" + seconds + ", nanoseconds=" + nanoseconds + ")";
-  }
-
-  private static void validateRange(long seconds, int nanoseconds) {
-    checkArgument(nanoseconds >= 0, "Timestamp nanoseconds out of range: %s", nanoseconds);
-    checkArgument(nanoseconds < 1e9, "Timestamp nanoseconds out of range: %s", nanoseconds);
-    // Midnight at the beginning of 1/1/1 is the earliest supported timestamp.
-    checkArgument(seconds >= -62135596800L, "Timestamp seconds out of range: %s", seconds);
-    // This will break in the year 10,000.
-    checkArgument(seconds < 253402300800L, "Timestamp seconds out of range: %s", seconds);
-  }
-
-  private final long seconds;
-
-  private final int nanoseconds;
-}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateField.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateField.java
new file mode 100644
index 00000000000..902d515d86f
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateField.java
@@ -0,0 +1,213 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import java.util.Objects;
+
+/** Represents an aggregation that can be performed by Firestore. */
+public abstract class AggregateField {
+  /** The field over which the aggregation is performed. */
+  @Nullable private final FieldPath fieldPath;
+
+  @NonNull private final String operator;
+
+  @NonNull private final String alias;
+
+  private AggregateField(@Nullable FieldPath fieldPath, @NonNull String operator) {
+    this.fieldPath = fieldPath;
+    this.operator = operator;
+
+    // Use $operator_$field format if it's an aggregation of a specific field. For example: sum_foo.
+    // Use $operator format if there's no field. For example: count.
+    this.alias = operator + (fieldPath == null ? "" : "_" + fieldPath);
+  }
+
+  /**
+   * Returns the field on which the aggregation takes place. Returns an empty string if there's no
+   * field (specifically, for count).
+   */
+  @RestrictTo(RestrictTo.Scope.LIBRARY)
+  @NonNull
+  public String getFieldPath() {
+    return fieldPath == null ? "" : fieldPath.toString();
+  }
+
+  /** Returns the alias used internally for this aggregate field. */
+  @RestrictTo(RestrictTo.Scope.LIBRARY)
+  @NonNull
+  public String getAlias() {
+    return alias;
+  }
+
+  /** Returns a string representation of this aggregation's operator. For example: "sum" */
+  @RestrictTo(RestrictTo.Scope.LIBRARY)
+  @NonNull
+  public String getOperator() {
+    return operator;
+  }
+
+  /**
+   * Returns true if the given object is equal to this object. Two `AggregateField` objects are
+   * considered equal if they have the same operator and operate on the same field.
+   */
+  @Override
+  public boolean equals(Object other) {
+    if (this == other) {
+      return true;
+    }
+    if (!(other instanceof AggregateField)) {
+      return false;
+    }
+
+    AggregateField otherAggregateField = (AggregateField) other;
+    if (fieldPath == null || otherAggregateField.fieldPath == null) {
+      return fieldPath == null && otherAggregateField.fieldPath == null;
+    }
+    return operator.equals(otherAggregateField.getOperator())
+        && getFieldPath().equals(otherAggregateField.getFieldPath());
+  }
+
+  /** Calculates and returns the hash code for this object. */
+  @Override
+  public int hashCode() {
+    return Objects.hash(getOperator(), getFieldPath());
+  }
+
+  /**
+   * Create a {@link CountAggregateField} object that can be used to compute the count of documents
+   * in the result set of a query.
+   *
+   * <p>The result of a count operation will always be a 64-bit integer value.
+   *
+   * @return The `CountAggregateField` object that can be used to compute the count of documents in
+   *     the result set of a query.
+   */
+  @NonNull
+  public static CountAggregateField count() {
+    return new CountAggregateField();
+  }
+
+  /**
+   * Create a {@link SumAggregateField} object that can be used to compute the sum of a specified
+   * field over a range of documents in the result set of a query.
+   *
+   * <p>The result of a sum operation will always be a 64-bit integer value, a double, or NaN.
+   *
+   * <ul>
+   *   <li>Summing over zero documents or fields will result in 0L.
+   *   <li>Summing over NaN will result in a double value representing NaN.
+   *   <li>A sum that overflows the maximum representable 64-bit integer value will result in a
+   *       double return value. This may result in lost precision of the result.
+   *   <li>A sum that overflows the maximum representable double value will result in a double
+   *       return value representing infinity.
+   * </ul>
+   *
+   * @param field Specifies the field to sum across the result set.
+   * @return The `SumAggregateField` object that can be used to compute the sum of a specified field
+   *     over a range of documents in the result set of a query.
+   */
+  @NonNull
+  public static SumAggregateField sum(@NonNull String field) {
+    return new SumAggregateField(FieldPath.fromDotSeparatedPath(field));
+  }
+
+  /**
+   * Create a {@link SumAggregateField} object that can be used to compute the sum of a specified
+   * field over a range of documents in the result set of a query.
+   *
+   * <p>The result of a sum operation will always be a 64-bit integer value, a double, or NaN.
+   *
+   * <ul>
+   *   <li>Summing over zero documents or fields will result in 0L.
+   *   <li>Summing over NaN will result in a double value representing NaN.
+   *   <li>A sum that overflows the maximum representable 64-bit integer value will result in a
+   *       double return value. This may result in lost precision of the result.
+   *   <li>A sum that overflows the maximum representable double value will result in a double
+   *       return value representing infinity.
+   * </ul>
+   *
+   * @param fieldPath Specifies the field to sum across the result set.
+   * @return The `SumAggregateField` object that can be used to compute the sum of a specified field
+   *     over a range of documents in the result set of a query.
+   */
+  @NonNull
+  public static SumAggregateField sum(@NonNull FieldPath fieldPath) {
+    return new SumAggregateField(fieldPath);
+  }
+
+  /**
+   * Create an {@link AverageAggregateField} object that can be used to compute the average of a
+   * specified field over a range of documents in the result set of a query.
+   *
+   * <p>The result of an average operation will always be a double or NaN.
+   *
+   * <ul>
+   *   <li>Averaging over zero documents or fields will result in a double value representing NaN.
+   *   <li>Averaging over NaN will result in a double value representing NaN.
+   * </ul>
+   *
+   * @param field Specifies the field to average across the result set.
+   * @return The `AverageAggregateField` object that can be used to compute the average of a
+   *     specified field over a range of documents in the result set of a query.
+   */
+  @NonNull
+  public static AverageAggregateField average(@NonNull String field) {
+    return new AverageAggregateField(FieldPath.fromDotSeparatedPath(field));
+  }
+
+  /**
+   * Create an {@link AverageAggregateField} object that can be used to compute the average of a
+   * specified field over a range of documents in the result set of a query.
+   *
+   * <p>The result of an average operation will always be a double or NaN.
+   *
+   * <ul>
+   *   <li>Averaging over zero documents or fields will result in a double value representing NaN.
+   *   <li>Averaging over NaN will result in a double value representing NaN.
+   * </ul>
+   *
+   * @param fieldPath Specifies the field to average across the result set.
+   * @return The `AverageAggregateField` object that can be used to compute the average of a
+   *     specified field over a range of documents in the result set of a query.
+   */
+  @NonNull
+  public static AverageAggregateField average(@NonNull FieldPath fieldPath) {
+    return new AverageAggregateField(fieldPath);
+  }
+
+  /** Represents a "count" aggregation that can be performed by Firestore. */
+  public static class CountAggregateField extends AggregateField {
+    private CountAggregateField() {
+      super(null, "count");
+    }
+  }
+
+  /** Represents a "sum" aggregation that can be performed by Firestore. */
+  public static class SumAggregateField extends AggregateField {
+    private SumAggregateField(@NonNull FieldPath fieldPath) {
+      super(fieldPath, "sum");
+    }
+  }
+
+  /** Represents an "average" aggregation that can be performed by Firestore. */
+  public static class AverageAggregateField extends AggregateField {
+    private AverageAggregateField(@NonNull FieldPath fieldPath) {
+      super(fieldPath, "average");
+    }
+  }
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateQuery.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateQuery.java
new file mode 100644
index 00000000000..db4015d6386
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateQuery.java
@@ -0,0 +1,118 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.firebase.firestore.util.Executors;
+import com.google.firebase.firestore.util.Preconditions;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A query that calculates aggregations over an underlying query.
+ *
+ * <p><b>Subclassing Note</b>: Cloud Firestore classes are not meant to be subclassed except for use
+ * in test mocks. Subclassing is not supported in production code and new SDK releases may break
+ * code that does so.
+ */
+public class AggregateQuery {
+
+  @NonNull private final Query query;
+
+  @NonNull private final List<AggregateField> aggregateFieldList;
+
+  AggregateQuery(@NonNull Query query, @NonNull List<AggregateField> aggregateFieldList) {
+    this.query = query;
+    this.aggregateFieldList = aggregateFieldList;
+  }
+
+  /** Returns the query whose aggregations will be calculated by this object. */
+  @NonNull
+  public Query getQuery() {
+    return query;
+  }
+
+  /** Returns the AggregateFields included inside this object. */
+  @RestrictTo(RestrictTo.Scope.LIBRARY)
+  @NonNull
+  public List<AggregateField> getAggregateFields() {
+    return aggregateFieldList;
+  }
+
+  /**
+   * Executes this query.
+   *
+   * @param source The source from which to acquire the aggregate results.
+   * @return A {@link Task} that will be resolved with the results of the query.
+   */
+  @NonNull
+  public Task<AggregateQuerySnapshot> get(@NonNull AggregateSource source) {
+    Preconditions.checkNotNull(source, "AggregateSource must not be null");
+    TaskCompletionSource<AggregateQuerySnapshot> tcs = new TaskCompletionSource<>();
+    query
+        .firestore
+        .getClient()
+        .runAggregateQuery(query.query, aggregateFieldList)
+        .continueWith(
+            Executors.DIRECT_EXECUTOR,
+            (task) -> {
+              if (task.isSuccessful()) {
+                tcs.setResult(new AggregateQuerySnapshot(this, task.getResult()));
+              } else {
+                tcs.setException(task.getException());
+              }
+              return null;
+            });
+
+    return tcs.getTask();
+  }
+
+  /**
+   * Compares this object with the given object for equality.
+   *
+   * <p>This object is considered "equal" to the other object if and only if all of the following
+   * conditions are satisfied:
+   *
+   * <ol>
+   *   <li>{@code object} is a non-null instance of {@link AggregateQuery}.
+   *   <li>{@code object} performs the same aggregations as this {@link AggregateQuery}.
+   *   <li>The underlying {@link Query} of {@code object} compares equal to that of this object.
+   * </ol>
+   *
+   * @param object The object to compare to this object for equality.
+   * @return {@code true} if this object is "equal" to the given object, as defined above, or {@code
+   *     false} otherwise.
+   */
+  @Override
+  public boolean equals(Object object) {
+    if (this == object) return true;
+    if (!(object instanceof AggregateQuery)) return false;
+    AggregateQuery other = (AggregateQuery) object;
+    return query.equals(other.query) && aggregateFieldList.equals(other.aggregateFieldList);
+  }
+
+  /**
+   * Calculates and returns the hash code for this object.
+   *
+   * @return the hash code for this object.
+   */
+  @Override
+  public int hashCode() {
+    return Objects.hash(query, aggregateFieldList);
+  }
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateQuerySnapshot.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateQuerySnapshot.java
new file mode 100644
index 00000000000..8f1ce3985c1
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateQuerySnapshot.java
@@ -0,0 +1,207 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import static com.google.firebase.firestore.util.Preconditions.checkNotNull;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.firestore.v1.Value;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+import javax.annotation.Nonnull;
+
+/**
+ * The results of executing an {@link AggregateQuery}.
+ *
+ * <p><b>Subclassing Note</b>: Cloud Firestore classes are not meant to be subclassed except for use
+ * in test mocks. Subclassing is not supported in production code and new SDK releases may break
+ * code that does so.
+ */
+public class AggregateQuerySnapshot {
+
+  @Nonnull private final AggregateQuery query;
+
+  @Nonnull private final Map<String, Value> data;
+
+  AggregateQuerySnapshot(@NonNull AggregateQuery query, @NonNull Map<String, Value> data) {
+    checkNotNull(query);
+    this.query = query;
+    this.data = data;
+  }
+
+  // Convenience function to create an AggregateQuerySnapshot instance whose only aggregation is a
+  // "count" with the given value. This method only exists for use by the CPP SDK; when the CPP SDK
+  // implements generic aggregations and migrates away from this method then it can be removed.
+  static AggregateQuerySnapshot createWithCount(@NonNull AggregateQuery query, long count) {
+    return new AggregateQuerySnapshot(
+        query,
+        Collections.singletonMap(
+            AggregateField.count().getAlias(), Value.newBuilder().setIntegerValue(count).build()));
+  }
+
+  /** Returns the query that was executed to produce this result. */
+  @NonNull
+  public AggregateQuery getQuery() {
+    return query;
+  }
+
+  /** Returns the number of documents in the result set of the underlying query. */
+  public long getCount() {
+    return get(AggregateField.count());
+  }
+
+  /**
+   * Returns the result of the given aggregation from the server without coercion of data types.
+   * Throws java.lang.RuntimeException if the `aggregateField` was not requested when calling
+   * `query.aggregate(...)`.
+   *
+   * @param aggregateField The aggregation for which the value is requested.
+   * @return The result of the given aggregation.
+   */
+  @Nullable
+  public Object get(@Nonnull AggregateField aggregateField) {
+    return getInternal(aggregateField);
+  }
+
+  /**
+   * Returns the number of documents in the result set of the underlying query.
+   *
+   * @param countAggregateField The count aggregation for which the value is requested.
+   * @return The result of the given count aggregation.
+   */
+  public long get(@Nonnull AggregateField.CountAggregateField countAggregateField) {
+    Long value = getLong(countAggregateField);
+    if (value == null) {
+      throw new IllegalArgumentException(
+          "RunAggregationQueryResponse alias " + countAggregateField.getAlias() + " is null");
+    }
+    return value;
+  }
+
+  /**
+   * Returns the result of the given average aggregation. Since the result of an average aggregation
+   * performed by the server is always a double, this convenience overload can be used in lieu of
+   * the above `get` method. Throws java.lang.RuntimeException if the `aggregateField` was not
+   * requested when calling `query.aggregate(...)`.
+   *
+   * @param averageAggregateField The average aggregation for which the value is requested.
+   * @return The result of the given average aggregation.
+   */
+  @Nullable
+  public Double get(@Nonnull AggregateField.AverageAggregateField averageAggregateField) {
+    return getDouble(averageAggregateField);
+  }
+
+  /**
+   * Returns the result of the given aggregation as a double. Coerces all numeric values and throws
+   * a RuntimeException if the result of the aggregate is non-numeric. In the case of coercion of
+   * long to double, uses java.lang.Long.doubleValue to perform the conversion, and may result in a
+   * loss of precision.
+   *
+   * @param aggregateField The aggregation for which the value is requested.
+   * @return The result of the given average aggregation as a double.
+   */
+  @Nullable
+  public Double getDouble(@Nonnull AggregateField aggregateField) {
+    Number val = getTypedValue(aggregateField, Number.class);
+    return val != null ? val.doubleValue() : null;
+  }
+
+  /**
+   * Returns the result of the given aggregation as a long. Coerces all numeric values and throws a
+   * RuntimeException if the result of the aggregate is non-numeric. In case of coercion of double
+   * to long, uses java.lang.Double.longValue to perform the conversion.
+   *
+   * @param aggregateField The aggregation for which the value is requested.
+   * @return The result of the given average aggregation as a long.
+   */
+  @Nullable
+  public Long getLong(@Nonnull AggregateField aggregateField) {
+    Number val = getTypedValue(aggregateField, Number.class);
+    return val != null ? val.longValue() : null;
+  }
+
+  @Nullable
+  private Object getInternal(@Nonnull AggregateField aggregateField) {
+    if (!data.containsKey(aggregateField.getAlias())) {
+      throw new IllegalArgumentException(
+          "'"
+              + aggregateField.getOperator()
+              + "("
+              + aggregateField.getFieldPath()
+              + ")"
+              + "' was not requested in the aggregation query.");
+    }
+    Value value = data.get(aggregateField.getAlias());
+    UserDataWriter userDataWriter =
+        new UserDataWriter(
+            query.getQuery().firestore, DocumentSnapshot.ServerTimestampBehavior.DEFAULT);
+    return userDataWriter.convertValue(value);
+  }
+
+  @Nullable
+  private <T> T getTypedValue(@Nonnull AggregateField aggregateField, Class<T> clazz) {
+    Object value = getInternal(aggregateField);
+    return castTypedValue(value, aggregateField, clazz);
+  }
+
+  @Nullable
+  private <T> T castTypedValue(
+      Object value, @Nonnull AggregateField aggregateField, Class<T> clazz) {
+    if (value == null) {
+      return null;
+    } else if (!clazz.isInstance(value)) {
+      throw new RuntimeException(
+          "AggregateField '" + aggregateField.getAlias() + "' is not a " + clazz.getName());
+    }
+    return clazz.cast(value);
+  }
+
+  /**
+   * Compares this object with the given object for equality.
+   *
+   * <p>This object is considered "equal" to the other object if and only if all of the following
+   * conditions are satisfied:
+   *
+   * <ol>
+   *   <li>{@code object} is a non-null instance of {@link AggregateQuerySnapshot}.
+   *   <li>The {@link AggregateQuery} of {@code object} compares equal to that of this object.
+   *   <li>{@code object} has the same results as this object.
+   * </ol>
+   *
+   * @param object The object to compare to this object for equality.
+   * @return {@code true} if this object is "equal" to the given object, as defined above, or {@code
+   *     false} otherwise.
+   */
+  @Override
+  public boolean equals(Object object) {
+    if (this == object) return true;
+    if (!(object instanceof AggregateQuerySnapshot)) return false;
+    AggregateQuerySnapshot other = (AggregateQuerySnapshot) object;
+    return query.equals(other.query) && data.equals(other.data);
+  }
+
+  /**
+   * Calculates and returns the hash code for this object.
+   *
+   * @return the hash code for this object.
+   */
+  @Override
+  public int hashCode() {
+    return Objects.hash(query, data);
+  }
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateSource.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateSource.java
new file mode 100644
index 00000000000..159451310f3
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateSource.java
@@ -0,0 +1,36 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+/**
+ * The sources from which an {@link AggregateQuery} can retrieve its results.
+ *
+ * @see AggregateQuery#get
+ */
+public enum AggregateSource {
+  /**
+   * Perform the aggregation on the server and download the result.
+   *
+   * <p>The result received from the server is presented, unaltered, without considering any local
+   * state. That is, documents in the local cache are not taken into consideration, neither are
+   * local modifications not yet synchronized with the server. Previously-downloaded results, if
+   * any, are not used. Every request using this source necessarily involves a round trip to the
+   * server.
+   *
+   * <p>The {@link AggregateQuery} will fail if the server cannot be reached, such as if the client
+   * is offline.
+   */
+  SERVER,
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/CollectionReference.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/CollectionReference.java
index c2ed98896e0..d0a358e2233 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/CollectionReference.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/CollectionReference.java
@@ -109,7 +109,7 @@ public DocumentReference document(@NonNull String documentPath) {
    * Adds a new document to this collection with the specified data, assigning it a document ID
    * automatically.
    *
-   * @param data The data to write to the document (e.g. a Map or a POJO containing the desired
+   * @param data The data to write to the document (like a Map or a POJO containing the desired
    *     document contents).
    * @return A Task that will be resolved with the {@code DocumentReference} of the newly created
    *     document.
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentId.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentId.java
index dee32fba801..c1d9a870ab9 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentId.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentId.java
@@ -24,10 +24,11 @@
  * the POJO is created from a Cloud Firestore document (for example, via {@link
  * DocumentSnapshot#toObject(Class)}).
  *
+ * <p>Any of the following will throw a runtime exception:
+ *
  * <ul>
- *   Any of the following will throw a runtime exception:
- *   <li>This annotation is applied to a property of a type other than String or {@link
- *       DocumentReference}.
+ *   <li>This annotation is applied to a property of a type other than String or <br>
+ *       {@link DocumentReference}.
  *   <li>This annotation is applied to a property that is not writable (for example, a Java Bean
  *       getter without a backing field).
  *   <li>This annotation is applied to a property with a name that conflicts with a read document
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentReference.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentReference.java
index 9b5901c3f6a..3b32b84b383 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentReference.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentReference.java
@@ -50,8 +50,8 @@
 /**
  * A {@code DocumentReference} refers to a document location in a Cloud Firestore database and can
  * be used to write, read, or listen to the location. There may or may not exist a document at the
- * referenced location. A {@code DocumentReference} can also be used to create a {@link
- * CollectionReference} to a subcollection.
+ * referenced location. A {@code DocumentReference} can also be used to create a <br>
+ * {@link CollectionReference} to a subcollection.
  *
  * <p><b>Subclassing Note</b>: Cloud Firestore classes are not meant to be subclassed except for use
  * in test mocks. Subclassing is not supported in production code and new SDK releases may break
@@ -138,7 +138,7 @@ public CollectionReference collection(@NonNull String collectionPath) {
    * Overwrites the document referred to by this {@code DocumentReference}. If the document does not
    * yet exist, it will be created. If a document already exists, it will be overwritten.
    *
-   * @param data The data to write to the document (e.g. a Map or a POJO containing the desired
+   * @param data The data to write to the document (like a Map or a POJO containing the desired
    *     document contents).
    * @return A Task that will be resolved when the write finishes.
    */
@@ -152,7 +152,7 @@ public Task<Void> set(@NonNull Object data) {
    * yet exist, it will be created. If you pass {@code SetOptions}, the provided data can be merged
    * into an existing document.
    *
-   * @param data The data to write to the document (e.g. a Map or a POJO containing the desired
+   * @param data The data to write to the document (like a Map or a POJO containing the desired
    *     document contents).
    * @param options An object to configure the set behavior.
    * @return A Task that will be resolved when the write finishes.
@@ -402,7 +402,7 @@ public ListenerRegistration addSnapshotListener(
    * Starts listening to the document referenced by this {@code DocumentReference} with the given
    * options.
    *
-   * @param metadataChanges Indicates whether metadata-only changes (i.e. only {@code
+   * @param metadataChanges Indicates whether metadata-only changes (specifically, only {@code
    *     DocumentSnapshot.getMetadata()} changed) should trigger snapshot events.
    * @param listener The event listener that will be called with the snapshots.
    * @return A registration object that can be used to remove the listener.
@@ -418,7 +418,7 @@ public ListenerRegistration addSnapshotListener(
    * options.
    *
    * @param executor The executor to use to call the listener.
-   * @param metadataChanges Indicates whether metadata-only changes (i.e. only {@code
+   * @param metadataChanges Indicates whether metadata-only changes (specifically, only {@code
    *     DocumentSnapshot.getMetadata()} changed) should trigger snapshot events.
    * @param listener The event listener that will be called with the snapshots.
    * @return A registration object that can be used to remove the listener.
@@ -441,7 +441,7 @@ public ListenerRegistration addSnapshotListener(
    * <p>The listener will be automatically removed during {@link Activity#onStop}.
    *
    * @param activity The activity to scope the listener to.
-   * @param metadataChanges Indicates whether metadata-only changes (i.e. only {@code
+   * @param metadataChanges Indicates whether metadata-only changes (specifically, only {@code
    *     DocumentSnapshot.getMetadata()} changed) should trigger snapshot events.
    * @param listener The event listener that will be called with the snapshots.
    * @return A registration object that can be used to remove the listener.
@@ -458,6 +458,28 @@ public ListenerRegistration addSnapshotListener(
         Executors.DEFAULT_CALLBACK_EXECUTOR, internalOptions(metadataChanges), activity, listener);
   }
 
+  /**
+   * Starts listening to the document referenced by this {@code DocumentReference} with the given
+   * options.
+   *
+   * @param options Sets snapshot listener options, including whether metadata-only changes should
+   *     trigger snapshot events, the source to listen to, the executor to use to call the listener,
+   *     or the activity to scope the listener to.
+   * @param listener The event listener that will be called with the snapshots.
+   * @return A registration object that can be used to remove the listener.
+   */
+  @NonNull
+  public ListenerRegistration addSnapshotListener(
+      @NonNull SnapshotListenOptions options, @NonNull EventListener<DocumentSnapshot> listener) {
+    checkNotNull(options, "Provided options value must not be null.");
+    checkNotNull(listener, "Provided EventListener must not be null.");
+    return addSnapshotListenerInternal(
+        options.getExecutor(),
+        internalOptions(options.getMetadataChanges(), options.getSource()),
+        options.getActivity(),
+        listener);
+  }
+
   /**
    * Internal helper method to create add a snapshot listener.
    *
@@ -541,12 +563,18 @@ private com.google.firebase.firestore.core.Query asQuery() {
     return com.google.firebase.firestore.core.Query.atPath(key.getPath());
   }
 
-  /** Converts the public API MetadataChanges object to the internal options object. */
+  /** Converts the public API options object to the internal options object. */
   private static ListenOptions internalOptions(MetadataChanges metadataChanges) {
+    return internalOptions(metadataChanges, ListenSource.DEFAULT);
+  }
+
+  private static ListenOptions internalOptions(
+      MetadataChanges metadataChanges, ListenSource source) {
     ListenOptions internalOptions = new ListenOptions();
     internalOptions.includeDocumentMetadataChanges = (metadataChanges == MetadataChanges.INCLUDE);
     internalOptions.includeQueryMetadataChanges = (metadataChanges == MetadataChanges.INCLUDE);
     internalOptions.waitForSyncWhenOnline = false;
+    internalOptions.source = source;
     return internalOptions;
   }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentSnapshot.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentSnapshot.java
index 26e9094fdfc..eddc041768b 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentSnapshot.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentSnapshot.java
@@ -526,8 +526,10 @@ public boolean equals(@Nullable Object obj) {
     DocumentSnapshot other = (DocumentSnapshot) obj;
     return firestore.equals(other.firestore)
         && key.equals(other.key)
-        && (doc == null ? other.doc == null : doc.equals(other.doc))
-        && metadata.equals(other.metadata);
+        && metadata.equals(other.metadata)
+        && (doc == null
+            ? other.doc == null
+            : other.doc != null && doc.getData().equals(other.doc.getData()));
   }
 
   @Override
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/Filter.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/Filter.java
index 4843259e4a0..a412213df73 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/Filter.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/Filter.java
@@ -16,14 +16,15 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
 import com.google.firebase.firestore.core.FieldFilter.Operator;
-import com.google.firestore.v1.StructuredQuery;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
-/** @hide */
-@RestrictTo(RestrictTo.Scope.LIBRARY)
+/**
+ * A {@code Filter} represents a restriction on one or more field values and can be used to refine
+ * the results of a {@code Query}.
+ */
 public class Filter {
   static class UnaryFilter extends Filter {
     private final FieldPath field;
@@ -48,14 +49,35 @@ public Operator getOperator() {
     public Object getValue() {
       return value;
     }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+
+      UnaryFilter that = (UnaryFilter) o;
+
+      return this.operator == that.operator
+          && Objects.equals(this.field, that.field)
+          && Objects.equals(this.value, that.value);
+    }
+
+    @Override
+    public int hashCode() {
+      int result = field != null ? field.hashCode() : 0;
+      result = 31 * result + (operator != null ? operator.hashCode() : 0);
+      result = 31 * result + (value != null ? value.hashCode() : 0);
+      return result;
+    }
   }
 
   static class CompositeFilter extends Filter {
     private final List<Filter> filters;
-    private final StructuredQuery.CompositeFilter.Operator operator;
+    private final com.google.firebase.firestore.core.CompositeFilter.Operator operator;
 
     public CompositeFilter(
-        @NonNull List<Filter> filters, StructuredQuery.CompositeFilter.Operator operator) {
+        @NonNull List<Filter> filters,
+        com.google.firebase.firestore.core.CompositeFilter.Operator operator) {
       this.filters = filters;
       this.operator = operator;
     }
@@ -64,121 +86,299 @@ public List<Filter> getFilters() {
       return filters;
     }
 
-    public StructuredQuery.CompositeFilter.Operator getOperator() {
+    public com.google.firebase.firestore.core.CompositeFilter.Operator getOperator() {
       return operator;
     }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+
+      CompositeFilter that = (CompositeFilter) o;
+
+      return this.operator == that.operator && Objects.equals(this.filters, that.filters);
+    }
+
+    @Override
+    public int hashCode() {
+      int result = filters != null ? filters.hashCode() : 0;
+      result = 31 * result + (operator != null ? operator.hashCode() : 0);
+      return result;
+    }
   }
 
+  /**
+   * Creates a new filter for checking that the given field is equal to the given value.
+   *
+   * @param field The field used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter equalTo(@NonNull String field, @Nullable Object value) {
     return equalTo(FieldPath.fromDotSeparatedPath(field), value);
   }
 
+  /**
+   * Creates a new filter for checking that the given field is equal to the given value.
+   *
+   * @param fieldPath The field path used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter equalTo(@NonNull FieldPath fieldPath, @Nullable Object value) {
     return new UnaryFilter(fieldPath, Operator.EQUAL, value);
   }
 
+  /**
+   * Creates a new filter for checking that the given field is not equal to the given value.
+   *
+   * @param field The field used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter notEqualTo(@NonNull String field, @Nullable Object value) {
     return notEqualTo(FieldPath.fromDotSeparatedPath(field), value);
   }
 
+  /**
+   * Creates a new filter for checking that the given field is not equal to the given value.
+   *
+   * @param fieldPath The field path used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter notEqualTo(@NonNull FieldPath fieldPath, @Nullable Object value) {
     return new UnaryFilter(fieldPath, Operator.NOT_EQUAL, value);
   }
 
+  /**
+   * Creates a new filter for checking that the given field is greater than the given value.
+   *
+   * @param field The field used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter greaterThan(@NonNull String field, @Nullable Object value) {
     return greaterThan(FieldPath.fromDotSeparatedPath(field), value);
   }
 
+  /**
+   * Creates a new filter for checking that the given field is greater than the given value.
+   *
+   * @param fieldPath The field path used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter greaterThan(@NonNull FieldPath fieldPath, @Nullable Object value) {
     return new UnaryFilter(fieldPath, Operator.GREATER_THAN, value);
   }
 
+  /**
+   * Creates a new filter for checking that the given field is greater than or equal to the given
+   * value.
+   *
+   * @param field The field used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter greaterThanOrEqualTo(@NonNull String field, @Nullable Object value) {
     return greaterThanOrEqualTo(FieldPath.fromDotSeparatedPath(field), value);
   }
 
+  /**
+   * Creates a new filter for checking that the given field is greater than or equal to the given
+   * value.
+   *
+   * @param fieldPath The field path used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter greaterThanOrEqualTo(@NonNull FieldPath fieldPath, @Nullable Object value) {
     return new UnaryFilter(fieldPath, Operator.GREATER_THAN_OR_EQUAL, value);
   }
 
+  /**
+   * Creates a new filter for checking that the given field is less than the given value.
+   *
+   * @param field The field used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter lessThan(@NonNull String field, @Nullable Object value) {
     return lessThan(FieldPath.fromDotSeparatedPath(field), value);
   }
 
+  /**
+   * Creates a new filter for checking that the given field is less than the given value.
+   *
+   * @param fieldPath The field path used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter lessThan(@NonNull FieldPath fieldPath, @Nullable Object value) {
     return new UnaryFilter(fieldPath, Operator.LESS_THAN, value);
   }
 
+  /**
+   * Creates a new filter for checking that the given field is less than or equal to the given
+   * value.
+   *
+   * @param field The field used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter lessThanOrEqualTo(@NonNull String field, @Nullable Object value) {
     return lessThanOrEqualTo(FieldPath.fromDotSeparatedPath(field), value);
   }
 
+  /**
+   * Creates a new filter for checking that the given field is less than or equal to the given
+   * value.
+   *
+   * @param fieldPath The field path used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter lessThanOrEqualTo(@NonNull FieldPath fieldPath, @Nullable Object value) {
     return new UnaryFilter(fieldPath, Operator.LESS_THAN_OR_EQUAL, value);
   }
 
+  /**
+   * Creates a new filter for checking that the given array field contains the given value.
+   *
+   * @param field The field used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter arrayContains(@NonNull String field, @Nullable Object value) {
     return arrayContains(FieldPath.fromDotSeparatedPath(field), value);
   }
 
+  /**
+   * Creates a new filter for checking that the given array field contains the given value.
+   *
+   * @param fieldPath The field path used for the filter.
+   * @param value The value used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter arrayContains(@NonNull FieldPath fieldPath, @Nullable Object value) {
     return new UnaryFilter(fieldPath, Operator.ARRAY_CONTAINS, value);
   }
 
+  /**
+   * Creates a new filter for checking that the given array field contains any of the given values.
+   *
+   * @param field The field used for the filter.
+   * @param values The list of values used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
-  public static Filter arrayContainsAny(@NonNull String field, @Nullable Object value) {
-    return arrayContainsAny(FieldPath.fromDotSeparatedPath(field), value);
+  public static Filter arrayContainsAny(
+      @NonNull String field, @NonNull List<? extends Object> values) {
+    return arrayContainsAny(FieldPath.fromDotSeparatedPath(field), values);
   }
 
+  /**
+   * Creates a new filter for checking that the given array field contains any of the given values.
+   *
+   * @param fieldPath The field path used for the filter.
+   * @param values The list of values used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
-  public static Filter arrayContainsAny(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new UnaryFilter(fieldPath, Operator.ARRAY_CONTAINS_ANY, value);
+  public static Filter arrayContainsAny(
+      @NonNull FieldPath fieldPath, @NonNull List<? extends Object> values) {
+    return new UnaryFilter(fieldPath, Operator.ARRAY_CONTAINS_ANY, values);
   }
 
+  /**
+   * Creates a new filter for checking that the given field equals any of the given values.
+   *
+   * @param field The field used for the filter.
+   * @param values The list of values used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
-  public static Filter inArray(@NonNull String field, @Nullable Object value) {
-    return inArray(FieldPath.fromDotSeparatedPath(field), value);
+  public static Filter inArray(@NonNull String field, @NonNull List<? extends Object> values) {
+    return inArray(FieldPath.fromDotSeparatedPath(field), values);
   }
 
+  /**
+   * Creates a new filter for checking that the given field equals any of the given values.
+   *
+   * @param fieldPath The field path used for the filter.
+   * @param values The list of values used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
-  public static Filter inArray(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new UnaryFilter(fieldPath, Operator.IN, value);
+  public static Filter inArray(
+      @NonNull FieldPath fieldPath, @NonNull List<? extends Object> values) {
+    return new UnaryFilter(fieldPath, Operator.IN, values);
   }
 
+  /**
+   * Creates a new filter for checking that the given field does not equal any of the given values.
+   *
+   * @param field The field path used for the filter.
+   * @param values The list of values used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
-  public static Filter notInArray(@NonNull String field, @Nullable Object value) {
-    return notInArray(FieldPath.fromDotSeparatedPath(field), value);
+  public static Filter notInArray(@NonNull String field, @NonNull List<? extends Object> values) {
+    return notInArray(FieldPath.fromDotSeparatedPath(field), values);
   }
 
+  /**
+   * Creates a new filter for checking that the given field does not equal any of the given values.
+   *
+   * @param fieldPath The field path used for the filter.
+   * @param values The list of values used for the filter.
+   * @return The newly created filter.
+   */
   @NonNull
-  public static Filter notInArray(@NonNull FieldPath fieldPath, @Nullable Object value) {
-    return new UnaryFilter(fieldPath, Operator.NOT_IN, value);
+  public static Filter notInArray(
+      @NonNull FieldPath fieldPath, @NonNull List<? extends Object> values) {
+    return new UnaryFilter(fieldPath, Operator.NOT_IN, values);
   }
 
+  /**
+   * Creates a new filter that is a disjunction of the given filters. A disjunction filter includes
+   * a document if it satisfies <em>any</em> of the given filters.
+   *
+   * @param filters The list of filters to perform a disjunction for.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter or(Filter... filters) {
-    // TODO(orquery): Change this to Operator.OR once it is available.
     return new CompositeFilter(
-        Arrays.asList(filters), StructuredQuery.CompositeFilter.Operator.OPERATOR_UNSPECIFIED);
+        Arrays.asList(filters), com.google.firebase.firestore.core.CompositeFilter.Operator.OR);
   }
 
+  /**
+   * Creates a new filter that is a conjunction of the given filters. A conjunction filter includes
+   * a document if it satisfies <em>all</em> of the given filters.
+   *
+   * @param filters The list of filters to perform a conjunction for.
+   * @return The newly created filter.
+   */
   @NonNull
   public static Filter and(Filter... filters) {
     return new CompositeFilter(
-        Arrays.asList(filters), StructuredQuery.CompositeFilter.Operator.AND);
+        Arrays.asList(filters), com.google.firebase.firestore.core.CompositeFilter.Operator.AND);
   }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestore.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestore.java
index c13574e243e..3af05a167ab 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestore.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestore.java
@@ -17,6 +17,7 @@
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 import static com.google.firebase.firestore.util.Preconditions.checkNotNull;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import androidx.annotation.Keep;
@@ -27,7 +28,8 @@
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.annotations.PreviewApi;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.emulators.EmulatedServiceSettings;
 import com.google.firebase.firestore.FirebaseFirestoreException.Code;
@@ -102,24 +104,74 @@ public interface InstanceRegistry {
   private volatile FirestoreClient client;
   private final GrpcMetadataProvider metadataProvider;
 
+  @Nullable private PersistentCacheIndexManager persistentCacheIndexManager;
+
   @NonNull
-  public static FirebaseFirestore getInstance() {
+  private static FirebaseApp getDefaultFirebaseApp() {
     FirebaseApp app = FirebaseApp.getInstance();
     if (app == null) {
       throw new IllegalStateException("You must call FirebaseApp.initializeApp first.");
     }
-    return getInstance(app, DatabaseId.DEFAULT_DATABASE_ID);
+    return app;
   }
 
+  /**
+   * Returns the default {@link FirebaseFirestore} instance for the default {@link FirebaseApp}.
+   *
+   * <p>Returns the same instance for all invocations. If no instance exists, initializes a new
+   * instance.
+   *
+   * @returns The {@link FirebaseFirestore} instance.
+   */
+  @NonNull
+  public static FirebaseFirestore getInstance() {
+    return getInstance(getDefaultFirebaseApp(), DatabaseId.DEFAULT_DATABASE_ID);
+  }
+
+  /**
+   * Returns the default {@link FirebaseFirestore} instance for the provided {@link FirebaseApp}.
+   *
+   * <p>For a given {@link FirebaseApp}, invocation always returns the same instance. If no instance
+   * exists, initializes a new instance.
+   *
+   * @param app The {@link FirebaseApp} instance that the returned {@link FirebaseFirestore}
+   *     instance is associated with.
+   * @returns The {@link FirebaseFirestore} instance.
+   */
   @NonNull
   public static FirebaseFirestore getInstance(@NonNull FirebaseApp app) {
     return getInstance(app, DatabaseId.DEFAULT_DATABASE_ID);
   }
 
-  // TODO: make this public
+  /**
+   * Returns the {@link FirebaseFirestore} instance for the default {@link FirebaseApp}.
+   *
+   * <p>Returns the same instance for all invocations given the same database parameter. If no
+   * instance exists, initializes a new instance.
+   *
+   * @param database The database ID.
+   * @returns The {@link FirebaseFirestore} instance.
+   */
+  @NonNull
+  public static FirebaseFirestore getInstance(@NonNull String database) {
+    return getInstance(getDefaultFirebaseApp(), database);
+  }
+
+  /**
+   * Returns the {@link FirebaseFirestore} instance for the provided {@link FirebaseApp}.
+   *
+   * <p>Returns the same instance for all invocations given the same {@link FirebaseApp} and
+   * database parameter. If no instance exists, initializes a new instance.
+   *
+   * @param app The {@link FirebaseApp} instance that the returned {@link FirebaseFirestore}
+   *     instance is associated with.
+   * @param database The database ID.
+   * @returns The {@link FirebaseFirestore} instance.
+   */
   @NonNull
-  private static FirebaseFirestore getInstance(@NonNull FirebaseApp app, @NonNull String database) {
+  public static FirebaseFirestore getInstance(@NonNull FirebaseApp app, @NonNull String database) {
     checkNotNull(app, "Provided FirebaseApp must not be null.");
+    checkNotNull(database, "Provided database name must not be null.");
     FirestoreMultiDbComponent component = app.get(FirestoreMultiDbComponent.class);
     checkNotNull(component, "Firestore component is not present.");
     return component.get(database);
@@ -130,7 +182,7 @@ static FirebaseFirestore newInstance(
       @NonNull Context context,
       @NonNull FirebaseApp app,
       @NonNull Deferred<InternalAuthProvider> deferredAuthProvider,
-      @NonNull Deferred<InternalAppCheckTokenProvider> deferredAppCheckTokenProvider,
+      @NonNull Deferred<InteropAppCheckTokenProvider> deferredAppCheckTokenProvider,
       @NonNull String database,
       @NonNull InstanceRegistry instanceRegistry,
       @Nullable GrpcMetadataProvider metadataProvider) {
@@ -303,9 +355,14 @@ public FirebaseApp getApp() {
    * @param json The JSON format exported by the Firebase CLI.
    * @return A task that resolves once all indices are successfully configured.
    * @throws IllegalArgumentException if the JSON format is invalid
+   * @deprecated Instead of creating cache indexes manually, consider using {@link
+   *     PersistentCacheIndexManager#enableIndexAutoCreation()} to let the SDK decide whether to
+   *     create cache indexes for queries running locally.
    */
-  @VisibleForTesting
-  Task<Void> setIndexConfiguration(String json) {
+  @Deprecated
+  @PreviewApi
+  @NonNull
+  public Task<Void> setIndexConfiguration(@NonNull String json) {
     ensureClientConfigured();
     Preconditions.checkState(
         settings.isPersistenceEnabled(), "Cannot enable indexes when persistence is disabled");
@@ -352,6 +409,27 @@ Task<Void> setIndexConfiguration(String json) {
     return client.configureFieldIndexes(parsedIndexes);
   }
 
+  /**
+   * Gets the {@code PersistentCacheIndexManager} instance used by this {@code FirebaseFirestore}
+   * object.
+   *
+   * <p>This is not the same as Cloud Firestore Indexes. Persistent cache indexes are optional
+   * indexes that only exist within the SDK to assist in local query execution.
+   *
+   * @return The {@code PersistentCacheIndexManager} instance or null if local persistent storage is
+   *     not in use.
+   */
+  @Nullable
+  public synchronized PersistentCacheIndexManager getPersistentCacheIndexManager() {
+    ensureClientConfigured();
+    if (persistentCacheIndexManager == null
+        && (settings.isPersistenceEnabled()
+            || settings.getCacheSettings() instanceof PersistentCacheSettings)) {
+      persistentCacheIndexManager = new PersistentCacheIndexManager(client);
+    }
+    return persistentCacheIndexManager;
+  }
+
   /**
    * Gets a {@code CollectionReference} instance that refers to the collection at the specified path
    * within the database.
@@ -403,9 +481,10 @@ public Query collectionGroup(@NonNull String collectionId) {
   }
 
   /**
-   * Executes the given updateFunction and then attempts to commit the changes applied within the
-   * transaction. If any document read within the transaction has changed, the updateFunction will
-   * be retried. If it fails to commit after 5 attempts, the transaction will fail.
+   * Executes the given {@code updateFunction} and then attempts to commit the changes applied
+   * within the transaction. If any document read within the transaction has changed, the
+   * updateFunction will be retried. If it fails to commit after 5 attempts (the default failure
+   * limit), the transaction will fail.
    *
    * <p>The maximum number of writes allowed in a single transaction is 500, but note that each
    * usage of {@link FieldValue#serverTimestamp()}, {@link FieldValue#arrayUnion(Object...)}, {@link
@@ -417,7 +496,7 @@ public Query collectionGroup(@NonNull String collectionId) {
    * @return The task returned from the updateFunction.
    */
   private <ResultT> Task<ResultT> runTransaction(
-      Transaction.Function<ResultT> updateFunction, Executor executor) {
+      TransactionOptions options, Transaction.Function<ResultT> updateFunction, Executor executor) {
     ensureClientConfigured();
 
     // We wrap the function they provide in order to
@@ -432,13 +511,15 @@ private <ResultT> Task<ResultT> runTransaction(
                     updateFunction.apply(
                         new Transaction(internalTransaction, FirebaseFirestore.this)));
 
-    return client.transaction(wrappedUpdateFunction);
+    return client.transaction(options, wrappedUpdateFunction);
   }
 
   /**
-   * Executes the given updateFunction and then attempts to commit the changes applied within the
-   * transaction. If any document read within the transaction has changed, the updateFunction will
-   * be retried. If it fails to commit after 5 attempts, the transaction will fail.
+   * Executes the given {@code updateFunction} and then attempts to commit the changes applied
+   * within the transaction. If any document read within the transaction has changed, the
+   * updateFunction will be retried. If it fails to commit after 5 attempts (the default failure
+   * limit), the transaction will fail. To have a different number of retries, use the {@link
+   * FirebaseFirestore#runTransaction(TransactionOptions, Transaction.Function)} method instead.
    *
    * @param updateFunction The function to execute within the transaction context.
    * @return The task returned from the updateFunction.
@@ -446,9 +527,27 @@ private <ResultT> Task<ResultT> runTransaction(
   @NonNull
   public <TResult> Task<TResult> runTransaction(
       @NonNull Transaction.Function<TResult> updateFunction) {
+    return runTransaction(TransactionOptions.DEFAULT, updateFunction);
+  }
+
+  /**
+   * Executes the given {@code updateFunction} and then attempts to commit the changes applied
+   * within the transaction. If any document read within the transaction has changed, the
+   * updateFunction will be retried. If it fails to commit after the maxmimum number of attempts
+   * specified in transactionOptions, the transaction will fail.
+   *
+   * @param options The transaction options for controlling execution.
+   * @param updateFunction The function to execute within the transaction context.
+   * @return The task returned from the updateFunction.
+   */
+  @NonNull
+  public <TResult> Task<TResult> runTransaction(
+      @NonNull TransactionOptions options, @NonNull Transaction.Function<TResult> updateFunction) {
     checkNotNull(updateFunction, "Provided transaction update function must not be null.");
     return runTransaction(
-        updateFunction, com.google.firebase.firestore.core.Transaction.getDefaultExecutor());
+        options,
+        updateFunction,
+        com.google.firebase.firestore.core.Transaction.getDefaultExecutor());
   }
 
   /**
@@ -527,6 +626,7 @@ public Task<Void> terminate() {
    */
   @NonNull
   public Task<Void> waitForPendingWrites() {
+    ensureClientConfigured();
     return client.waitForPendingWrites();
   }
 
@@ -713,6 +813,8 @@ public LoadBundleTask loadBundle(@NonNull ByteBuffer bundleData) {
    * documents) and loaded to local cache using {@link #loadBundle(byte[])}. Once in local cache,
    * you can use this method to extract a query by name.
    */
+  // TODO(b/261013682): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   public @NonNull Task<Query> getNamedQuery(@NonNull String name) {
     ensureClientConfigured();
     return client
@@ -784,7 +886,7 @@ void validateReference(DocumentReference docRef) {
 
   /**
    * Sets the language of the public API in the format of "gl-<language>/<version>" where version
-   * might be blank, e.g. `gl-cpp/`. The provided string is used as is.
+   * might be blank, for example `gl-cpp/`. The provided string is used as is.
    *
    * <p>Note: this method is package-private because it is expected to only be called via JNI (which
    * ignores access modifiers).
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestoreException.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestoreException.java
index 0210f12c6c7..59b7750cab0 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestoreException.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestoreException.java
@@ -44,7 +44,7 @@ public enum Code {
     /**
      * Client specified an invalid argument. Note that this differs from {@link
      * #FAILED_PRECONDITION}. {@code INVALID_ARGUMENT} indicates arguments that are problematic
-     * regardless of the state of the system (e.g., an invalid field name).
+     * regardless of the state of the system (like an invalid field name).
      */
     INVALID_ARGUMENT(3),
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestoreSettings.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestoreSettings.java
index 84981f903b9..59c830ea4b3 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestoreSettings.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestoreSettings.java
@@ -14,10 +14,12 @@
 
 package com.google.firebase.firestore;
 
+import static com.google.firebase.firestore.util.Assert.hardAssert;
 import static com.google.firebase.firestore.util.Preconditions.checkNotNull;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import java.util.Objects;
+import javax.annotation.Nullable;
 
 /** Settings used to configure a {@link FirebaseFirestore} instance. */
 public final class FirebaseFirestoreSettings {
@@ -30,15 +32,19 @@ public final class FirebaseFirestoreSettings {
   /** @hide */
   public static final String DEFAULT_HOST = "firestore.googleapis.com";
 
-  private static final long MINIMUM_CACHE_BYTES = 1 * 1024 * 1024; // 1 MB
-  private static final long DEFAULT_CACHE_SIZE_BYTES = 100 * 1024 * 1024; // 100 MB
+  static final long MINIMUM_CACHE_BYTES = 1 * 1024 * 1024; // 1 MB
+  static final long DEFAULT_CACHE_SIZE_BYTES = 100 * 1024 * 1024; // 100 MB
 
   /** A Builder for creating {@code FirebaseFirestoreSettings}. */
   public static final class Builder {
     private String host;
     private boolean sslEnabled;
     private boolean persistenceEnabled;
+
     private long cacheSizeBytes;
+    private LocalCacheSettings cacheSettings;
+
+    private boolean usedLegacyCacheSettings = false;
 
     /** Constructs a new {@code FirebaseFirestoreSettings} Builder object. */
     public Builder() {
@@ -58,6 +64,17 @@ public Builder(@NonNull FirebaseFirestoreSettings settings) {
       sslEnabled = settings.sslEnabled;
       persistenceEnabled = settings.persistenceEnabled;
       cacheSizeBytes = settings.cacheSizeBytes;
+      if (!persistenceEnabled || cacheSizeBytes != DEFAULT_CACHE_SIZE_BYTES) {
+        usedLegacyCacheSettings = true;
+      }
+
+      if (!usedLegacyCacheSettings) {
+        cacheSettings = settings.cacheSettings;
+      } else {
+        hardAssert(
+            settings.cacheSettings == null,
+            "Given settings object mixes both cache config APIs, which is impossible.");
+      }
     }
 
     /**
@@ -88,10 +105,19 @@ public Builder setSslEnabled(boolean value) {
      *
      * @return A settings object that uses local persistent storage as specified by the given
      *     <tt>value</tt>.
+     * @deprecated Instead, use {@link
+     *     FirebaseFirestoreSettings.Builder#setLocalCacheSettings(LocalCacheSettings)} to configure
+     *     SDK cache.
      */
     @NonNull
+    @Deprecated
     public Builder setPersistenceEnabled(boolean value) {
+      if (cacheSettings != null) {
+        throw new IllegalStateException(
+            "New cache config API setLocalCacheSettings() is already used.");
+      }
       this.persistenceEnabled = value;
+      this.usedLegacyCacheSettings = true;
       return this;
     }
 
@@ -105,14 +131,55 @@ public Builder setPersistenceEnabled(boolean value) {
      *
      * @return A settings object on which the cache size is configured as specified by the given
      *     {@code value}.
+     * @deprecated Instead, use {@link
+     *     FirebaseFirestoreSettings.Builder#setLocalCacheSettings(LocalCacheSettings)} to configure
+     *     SDK cache.
      */
     @NonNull
+    @Deprecated
     public Builder setCacheSizeBytes(long value) {
+      if (cacheSettings != null) {
+        throw new IllegalStateException(
+            "New cache config API setLocalCacheSettings() is already used.");
+      }
       if (value != CACHE_SIZE_UNLIMITED && value < MINIMUM_CACHE_BYTES) {
         throw new IllegalArgumentException(
             "Cache size must be set to at least " + MINIMUM_CACHE_BYTES + " bytes");
       }
       this.cacheSizeBytes = value;
+      this.usedLegacyCacheSettings = true;
+      return this;
+    }
+
+    /**
+     * Specifies the cache used by the SDK. Available options are {@link PersistentCacheSettings}
+     * and {@link MemoryCacheSettings}, each with different configuration options.
+     *
+     * <p>When unspecified, {@link PersistentCacheSettings} will be used by default.
+     *
+     * <p>NOTE: Calling this setter and {@code setPersistenceEnabled()} or {@code
+     * setCacheSizeBytes()} at the same time will throw an exception during SDK initialization.
+     * Instead, use the configuration in the {@link PersistentCacheSettings} object to specify the
+     * cache size.
+     *
+     * @return A settings object on which the cache settings is configured as specified by the given
+     *     {@code settings}.
+     */
+    @NonNull
+    public Builder setLocalCacheSettings(@NonNull LocalCacheSettings settings) {
+      if (usedLegacyCacheSettings) {
+        throw new IllegalStateException(
+            "Deprecated setPersistenceEnabled() or setCacheSizeBytes() is already used,"
+                + " remove those first.");
+      }
+
+      if (!(settings instanceof MemoryCacheSettings)
+          && !(settings instanceof PersistentCacheSettings)) {
+        throw new IllegalArgumentException(
+            "Only MemoryCacheSettings and PersistentCacheSettings are accepted");
+      }
+
+      this.cacheSettings = settings;
       return this;
     }
 
@@ -127,12 +194,22 @@ public boolean isSslEnabled() {
       return sslEnabled;
     }
 
-    /** @return boolean indicating whether local persistent storage is enabled or not. */
+    /**
+     * @return boolean indicating whether local persistent storage is enabled or not.
+     * @deprecated Instead, build the {@link FirebaseFirestoreSettings} instance to check the SDK
+     *     cache configurations.
+     */
+    @Deprecated
     public boolean isPersistenceEnabled() {
       return persistenceEnabled;
     }
 
-    /** @return cache size for on-disk data. */
+    /**
+     * @return cache size for on-disk data.
+     * @deprecated Instead, build the {@link FirebaseFirestoreSettings} instance to check the SDK
+     *     cache configurations.
+     */
+    @Deprecated
     public long getCacheSizeBytes() {
       return cacheSizeBytes;
     }
@@ -152,28 +229,29 @@ public FirebaseFirestoreSettings build() {
   private final boolean persistenceEnabled;
   private final long cacheSizeBytes;
 
+  private LocalCacheSettings cacheSettings;
+
   /** Constructs a {@code FirebaseFirestoreSettings} object based on the values in the Builder. */
   private FirebaseFirestoreSettings(Builder builder) {
     host = builder.host;
     sslEnabled = builder.sslEnabled;
     persistenceEnabled = builder.persistenceEnabled;
     cacheSizeBytes = builder.cacheSizeBytes;
+    cacheSettings = builder.cacheSettings;
   }
 
   @Override
-  public boolean equals(@Nullable Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
 
     FirebaseFirestoreSettings that = (FirebaseFirestoreSettings) o;
-    return host.equals(that.host)
-        && sslEnabled == that.sslEnabled
-        && persistenceEnabled == that.persistenceEnabled
-        && cacheSizeBytes == that.cacheSizeBytes;
+
+    if (sslEnabled != that.sslEnabled) return false;
+    if (persistenceEnabled != that.persistenceEnabled) return false;
+    if (cacheSizeBytes != that.cacheSizeBytes) return false;
+    if (!host.equals(that.host)) return false;
+    return Objects.equals(cacheSettings, that.cacheSettings);
   }
 
   @Override
@@ -181,7 +259,8 @@ public int hashCode() {
     int result = host.hashCode();
     result = 31 * result + (sslEnabled ? 1 : 0);
     result = 31 * result + (persistenceEnabled ? 1 : 0);
-    result = 31 * result + (int) cacheSizeBytes;
+    result = 31 * result + (int) (cacheSizeBytes ^ (cacheSizeBytes >>> 32));
+    result = 31 * result + (cacheSettings != null ? cacheSettings.hashCode() : 0);
     return result;
   }
 
@@ -189,15 +268,19 @@ public int hashCode() {
   @NonNull
   public String toString() {
     return "FirebaseFirestoreSettings{"
-        + "host="
-        + host
-        + ", sslEnabled="
-        + sslEnabled
-        + ", persistenceEnabled="
-        + persistenceEnabled
-        + ", cacheSizeBytes="
-        + cacheSizeBytes
-        + "}";
+                + "host="
+                + host
+                + ", sslEnabled="
+                + sslEnabled
+                + ", persistenceEnabled="
+                + persistenceEnabled
+                + ", cacheSizeBytes="
+                + cacheSizeBytes
+                + ", cacheSettings="
+                + cacheSettings
+            == null
+        ? "null"
+        : cacheSettings.toString() + "}";
   }
 
   /** Returns the host of the Cloud Firestore backend. */
@@ -211,16 +294,53 @@ public boolean isSslEnabled() {
     return sslEnabled;
   }
 
-  /** Returns whether or not to use local persistent storage. */
+  /**
+   * Returns whether or not to use local persistent storage.
+   *
+   * @deprecated Instead, use {@link FirebaseFirestoreSettings#getCacheSettings()} to check which
+   *     cache is used.
+   */
+  @Deprecated
   public boolean isPersistenceEnabled() {
+    if (cacheSettings != null) {
+      return cacheSettings instanceof PersistentCacheSettings;
+    }
+
     return persistenceEnabled;
   }
 
   /**
    * Returns the threshold for the cache size above which the SDK will attempt to collect the least
    * recently used documents.
+   *
+   * @deprecated Instead, use {@link FirebaseFirestoreSettings#getCacheSettings()} to check cache
+   *     size.
    */
+  @Deprecated
   public long getCacheSizeBytes() {
+    if (cacheSettings != null) {
+      if (cacheSettings instanceof PersistentCacheSettings) {
+        return ((PersistentCacheSettings) cacheSettings).getSizeBytes();
+      } else {
+        MemoryCacheSettings memorySettings = (MemoryCacheSettings) cacheSettings;
+        if (memorySettings.getGarbageCollectorSettings() instanceof MemoryLruGcSettings) {
+          return ((MemoryLruGcSettings) memorySettings.getGarbageCollectorSettings())
+              .getSizeBytes();
+        }
+
+        return CACHE_SIZE_UNLIMITED;
+      }
+    }
+
     return cacheSizeBytes;
   }
+
+  /**
+   * Returns the cache settings configured for the SDK. Returns null if it is not configured, in
+   * which case a default {@link PersistentCacheSettings} instance is used.
+   */
+  @Nullable
+  public LocalCacheSettings getCacheSettings() {
+    return cacheSettings;
+  }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/Firestore.kt b/firebase-firestore/src/main/java/com/google/firebase/firestore/Firestore.kt
new file mode 100644
index 00000000000..9f5027b5e29
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/Firestore.kt
@@ -0,0 +1,297 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.firestore
+
+import androidx.annotation.Keep
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.firestore.*
+import com.google.firebase.firestore.util.Executors.BACKGROUND_EXECUTOR
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.trySendBlocking
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.map
+
+/** Returns the [FirebaseFirestore] instance of the default [FirebaseApp]. */
+val Firebase.firestore: FirebaseFirestore
+  get() = FirebaseFirestore.getInstance()
+
+/** Returns the [FirebaseFirestore] instance of a given [FirebaseApp]. */
+fun Firebase.firestore(app: FirebaseApp): FirebaseFirestore = FirebaseFirestore.getInstance(app)
+
+/** Returns the [FirebaseFirestore] instance of a given [FirebaseApp] and database name. */
+fun Firebase.firestore(app: FirebaseApp, database: String): FirebaseFirestore =
+  FirebaseFirestore.getInstance(app, database)
+
+/**
+ * Returns the [FirebaseFirestore] instance of the default [FirebaseApp], given the database name.
+ */
+fun Firebase.firestore(database: String): FirebaseFirestore =
+  FirebaseFirestore.getInstance(database)
+
+/**
+ * Returns the contents of the document converted to a POJO or null if the document doesn't exist.
+ *
+ * @param T The type of the object to create.
+ * @return The contents of the document in an object of type T or null if the document doesn't
+ * ```
+ *     exist.
+ * ```
+ */
+inline fun <reified T> DocumentSnapshot.toObject(): T? = toObject(T::class.java)
+
+/**
+ * Returns the contents of the document converted to a POJO or null if the document doesn't exist.
+ *
+ * @param T The type of the object to create.
+ * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
+ * ```
+ *     been set to their final value.
+ * @return
+ * ```
+ * The contents of the document in an object of type T or null if the document doesn't
+ * ```
+ *     exist.
+ * ```
+ */
+inline fun <reified T> DocumentSnapshot.toObject(
+  serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
+): T? = toObject(T::class.java, serverTimestampBehavior)
+
+/**
+ * Returns the value at the field, converted to a POJO, or null if the field or document doesn't
+ * exist.
+ *
+ * @param field The path to the field.
+ * @param T The type to convert the field value to.
+ * @return The value at the given field or null.
+ */
+inline fun <reified T> DocumentSnapshot.getField(field: String): T? = get(field, T::class.java)
+
+/**
+ * Returns the value at the field, converted to a POJO, or null if the field or document doesn't
+ * exist.
+ *
+ * @param field The path to the field.
+ * @param T The type to convert the field value to.
+ * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
+ * ```
+ *     been set to their final value.
+ * @return
+ * ```
+ * The value at the given field or null.
+ */
+inline fun <reified T> DocumentSnapshot.getField(
+  field: String,
+  serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
+): T? = get(field, T::class.java, serverTimestampBehavior)
+
+/**
+ * Returns the value at the field, converted to a POJO, or null if the field or document doesn't
+ * exist.
+ *
+ * @param fieldPath The path to the field.
+ * @param T The type to convert the field value to.
+ * @return The value at the given field or null.
+ */
+inline fun <reified T> DocumentSnapshot.getField(fieldPath: FieldPath): T? =
+  get(fieldPath, T::class.java)
+
+/**
+ * Returns the value at the field, converted to a POJO, or null if the field or document doesn't
+ * exist.
+ *
+ * @param fieldPath The path to the field.
+ * @param T The type to convert the field value to.
+ * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
+ * ```
+ *     been set to their final value.
+ * @return
+ * ```
+ * The value at the given field or null.
+ */
+inline fun <reified T> DocumentSnapshot.getField(
+  fieldPath: FieldPath,
+  serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
+): T? = get(fieldPath, T::class.java, serverTimestampBehavior)
+
+/**
+ * Returns the contents of the document converted to a POJO.
+ *
+ * @param T The type of the object to create.
+ * @return The contents of the document in an object of type T.
+ */
+inline fun <reified T : Any> QueryDocumentSnapshot.toObject(): T = toObject(T::class.java)
+
+/**
+ * Returns the contents of the document converted to a POJO.
+ *
+ * @param T The type of the object to create.
+ * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
+ * ```
+ *     been set to their final value.
+ * @return
+ * ```
+ * The contents of the document in an object of type T.
+ */
+inline fun <reified T : Any> QueryDocumentSnapshot.toObject(
+  serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
+): T = toObject(T::class.java, serverTimestampBehavior)
+
+/**
+ * Returns the contents of the documents in the QuerySnapshot, converted to the provided class, as a
+ * list.
+ *
+ * @param T The POJO type used to convert the documents in the list.
+ */
+inline fun <reified T : Any> QuerySnapshot.toObjects(): List<T> = toObjects(T::class.java)
+
+/**
+ * Returns the contents of the documents in the QuerySnapshot, converted to the provided class, as a
+ * list.
+ *
+ * @param T The POJO type used to convert the documents in the list.
+ * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
+ * ```
+ *     been set to their final value.
+ * ```
+ */
+inline fun <reified T : Any> QuerySnapshot.toObjects(
+  serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
+): List<T> = toObjects(T::class.java, serverTimestampBehavior)
+
+/** Returns a [FirebaseFirestoreSettings] instance initialized using the [init] function. */
+fun firestoreSettings(
+  init: FirebaseFirestoreSettings.Builder.() -> Unit
+): FirebaseFirestoreSettings {
+  val builder = FirebaseFirestoreSettings.Builder()
+  builder.init()
+  return builder.build()
+}
+
+fun memoryCacheSettings(init: MemoryCacheSettings.Builder.() -> Unit): MemoryCacheSettings {
+  val builder = MemoryCacheSettings.newBuilder()
+  builder.init()
+  return builder.build()
+}
+
+fun memoryEagerGcSettings(init: MemoryEagerGcSettings.Builder.() -> Unit): MemoryEagerGcSettings {
+  val builder = MemoryEagerGcSettings.newBuilder()
+  builder.init()
+  return builder.build()
+}
+
+fun memoryLruGcSettings(init: MemoryLruGcSettings.Builder.() -> Unit): MemoryLruGcSettings {
+  val builder = MemoryLruGcSettings.newBuilder()
+  builder.init()
+  return builder.build()
+}
+
+fun persistentCacheSettings(
+  init: PersistentCacheSettings.Builder.() -> Unit
+): PersistentCacheSettings {
+  val builder = PersistentCacheSettings.newBuilder()
+  builder.init()
+  return builder.build()
+}
+
+/** @suppress */
+@Keep
+class FirebaseFirestoreKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
+
+/**
+ * Starts listening to the document referenced by this `DocumentReference` with the given options
+ * and emits its values via a [Flow].
+ *
+ * - When the returned flow starts being collected, an [EventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ *
+ * @param metadataChanges controls metadata-only changes. Default: [MetadataChanges.EXCLUDE]
+ */
+fun DocumentReference.snapshots(
+  metadataChanges: MetadataChanges = MetadataChanges.EXCLUDE
+): Flow<DocumentSnapshot> {
+  return callbackFlow {
+    val registration =
+      addSnapshotListener(BACKGROUND_EXECUTOR, metadataChanges) { snapshot, exception ->
+        if (exception != null) {
+          cancel(message = "Error getting DocumentReference snapshot", cause = exception)
+        } else if (snapshot != null) {
+          trySendBlocking(snapshot)
+        }
+      }
+    awaitClose { registration.remove() }
+  }
+}
+
+/**
+ * Starts listening to this query with the given options and emits its values via a [Flow].
+ *
+ * - When the returned flow starts being collected, an [EventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ *
+ * @param metadataChanges controls metadata-only changes. Default: [MetadataChanges.EXCLUDE]
+ */
+fun Query.snapshots(
+  metadataChanges: MetadataChanges = MetadataChanges.EXCLUDE
+): Flow<QuerySnapshot> {
+  return callbackFlow {
+    val registration =
+      addSnapshotListener(BACKGROUND_EXECUTOR, metadataChanges) { snapshot, exception ->
+        if (exception != null) {
+          cancel(message = "Error getting Query snapshot", cause = exception)
+        } else if (snapshot != null) {
+          trySendBlocking(snapshot)
+        }
+      }
+    awaitClose { registration.remove() }
+  }
+}
+
+/**
+ * Starts listening to this query with the given options and emits its values converted to a POJO
+ * via a [Flow].
+ *
+ * - When the returned flow starts being collected, an [EventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ *
+ * @param metadataChanges controls metadata-only changes. Default: [MetadataChanges.EXCLUDE]
+ * @param T The type of the object to convert to.
+ */
+inline fun <reified T : Any> Query.dataObjects(
+  metadataChanges: MetadataChanges = MetadataChanges.EXCLUDE
+): Flow<List<T>> = snapshots(metadataChanges).map { it.toObjects(T::class.java) }
+
+/**
+ * Starts listening to the document referenced by this `DocumentReference` with the given options
+ * and emits its values converted to a POJO via a [Flow].
+ *
+ * - When the returned flow starts being collected, an [EventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ *
+ * @param metadataChanges controls metadata-only changes. Default: [MetadataChanges.EXCLUDE]
+ * @param T The type of the object to convert to.
+ */
+inline fun <reified T : Any> DocumentReference.dataObjects(
+  metadataChanges: MetadataChanges = MetadataChanges.EXCLUDE
+): Flow<T?> = snapshots(metadataChanges).map { it.toObject(T::class.java) }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreMultiDbComponent.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreMultiDbComponent.java
index 2c0868d06fb..449bebde941 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreMultiDbComponent.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreMultiDbComponent.java
@@ -22,7 +22,7 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseAppLifecycleListener;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.firestore.remote.GrpcMetadataProvider;
 import com.google.firebase.inject.Deferred;
@@ -43,14 +43,14 @@ class FirestoreMultiDbComponent
   private final FirebaseApp app;
   private final Context context;
   private final Deferred<InternalAuthProvider> authProvider;
-  private final Deferred<InternalAppCheckTokenProvider> appCheckProvider;
+  private final Deferred<InteropAppCheckTokenProvider> appCheckProvider;
   private final GrpcMetadataProvider metadataProvider;
 
   FirestoreMultiDbComponent(
       @NonNull Context context,
       @NonNull FirebaseApp app,
       @NonNull Deferred<InternalAuthProvider> authProvider,
-      @NonNull Deferred<InternalAppCheckTokenProvider> appCheckProvider,
+      @NonNull Deferred<InteropAppCheckTokenProvider> appCheckProvider,
       @Nullable GrpcMetadataProvider metadataProvider) {
     this.context = context;
     this.app = app;
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreRegistrar.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreRegistrar.java
index 7d7b9d12e1c..bf9a3cf2ba2 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreRegistrar.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreRegistrar.java
@@ -19,7 +19,7 @@
 import androidx.annotation.RestrictTo;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
@@ -39,17 +39,20 @@
 @Keep
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class FirestoreRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-fst";
+
   @Override
   @Keep
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(FirestoreMultiDbComponent.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(Context.class))
             .add(Dependency.optionalProvider(HeartBeatInfo.class))
             .add(Dependency.optionalProvider(UserAgentPublisher.class))
             .add(Dependency.deferred(InternalAuthProvider.class))
-            .add(Dependency.deferred(InternalAppCheckTokenProvider.class))
+            .add(Dependency.deferred(InteropAppCheckTokenProvider.class))
             .add(Dependency.optional(FirebaseOptions.class))
             .factory(
                 c ->
@@ -57,12 +60,12 @@ public List<Component<?>> getComponents() {
                         c.get(Context.class),
                         c.get(FirebaseApp.class),
                         c.getDeferred(InternalAuthProvider.class),
-                        c.getDeferred(InternalAppCheckTokenProvider.class),
+                        c.getDeferred(InteropAppCheckTokenProvider.class),
                         new FirebaseClientGrpcMetadataProvider(
                             c.getProvider(UserAgentPublisher.class),
                             c.getProvider(HeartBeatInfo.class),
                             c.get(FirebaseOptions.class))))
             .build(),
-        LibraryVersionComponent.create("fire-fst", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/ListenSource.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/ListenSource.java
new file mode 100644
index 00000000000..9642a01ca28
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/ListenSource.java
@@ -0,0 +1,38 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+/**
+ * Configures the source option of {@code addSnapshotListener()} calls on {@link DocumentReference}
+ * and {@link Query}. This controls how a listener retrieves data updates.
+ */
+public enum ListenSource {
+  /**
+   * The default behavior. The listener attempts to return initial snapshot from cache and retrieve
+   * up-to-date snapshots from the Firestore server. Snapshot events will be triggered on local
+   * mutations and server side updates.
+   */
+  DEFAULT,
+
+  /**
+   * The listener retrieves data and listens to updates from the local Firestore cache only. If the
+   * cache is empty, an empty snapshot will be returned. Snapshot events will be triggered on cache
+   * updates, like local mutations or load bundles.
+   *
+   * <p>Note that the data might be stale if the cache hasn't synchronized with recent server-side
+   * changes.
+   */
+  CACHE
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/LoadBundleTask.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/LoadBundleTask.java
index 410b485ca9b..bc352e3b2f9 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/LoadBundleTask.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/LoadBundleTask.java
@@ -48,7 +48,7 @@ public class LoadBundleTask extends Task<LoadBundleTaskProgress> {
   private LoadBundleTaskProgress snapshot;
 
   /**
-   * A TaskCompletionSource that is used to deliver all standard Task API events (e.g.
+   * A TaskCompletionSource that is used to deliver all standard Task API events (such as,
    * `onComplete`).
    */
   private final TaskCompletionSource<LoadBundleTaskProgress> completionSource;
diff --git a/health-metrics/macrobenchmark/template/app/src/main/java/com/google/firebase/benchmark/MainActivity.kt b/firebase-firestore/src/main/java/com/google/firebase/firestore/LocalCacheSettings.java
similarity index 56%
rename from health-metrics/macrobenchmark/template/app/src/main/java/com/google/firebase/benchmark/MainActivity.kt
rename to firebase-firestore/src/main/java/com/google/firebase/firestore/LocalCacheSettings.java
index 0c23af1f54e..f9112c07ab0 100644
--- a/health-metrics/macrobenchmark/template/app/src/main/java/com/google/firebase/benchmark/MainActivity.kt
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/LocalCacheSettings.java
@@ -1,10 +1,10 @@
-// Copyright 2021 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//      http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -12,14 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.benchmark
+package com.google.firebase.firestore;
 
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-
-class MainActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-    }
-}
+/**
+ * Marker interface implemented by all supported cache settings.
+ *
+ * <p>{@link PersistentCacheSettings} and {@link MemoryCacheSettings} are the two only cache types
+ * supported by the SDK. Custom implementation is not supported.
+ */
+public interface LocalCacheSettings {}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryCacheSettings.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryCacheSettings.java
new file mode 100644
index 00000000000..3582557cefa
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryCacheSettings.java
@@ -0,0 +1,86 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * Configures the SDK to use a memory cache. Firestore documents and mutations are NOT persisted
+ * across App restart.
+ *
+ * <p>To use, create an instance using {@link MemoryCacheSettings#newBuilder().build()}, then set
+ * the instance to {@link
+ * FirebaseFirestoreSettings.Builder#setLocalCacheSettings(LocalCacheSettings)}, and use the built
+ * {@code FirebaseFirestoreSettings} instance to configure the Firestore SDK.
+ */
+public final class MemoryCacheSettings implements LocalCacheSettings {
+  private MemoryGarbageCollectorSettings gcSettings;
+
+  /** Returns a new instance of {@link MemoryCacheSettings.Builder} with default configurations. */
+  @NonNull
+  public static MemoryCacheSettings.Builder newBuilder() {
+    return new MemoryCacheSettings.Builder();
+  }
+
+  private MemoryCacheSettings(MemoryGarbageCollectorSettings settings) {
+    gcSettings = settings;
+  }
+
+  @Override
+  public int hashCode() {
+    return gcSettings.hashCode();
+  }
+
+  @Override
+  public boolean equals(@Nullable Object obj) {
+    if (this == obj) return true;
+    if (obj == null || getClass() != obj.getClass()) return false;
+
+    return getGarbageCollectorSettings()
+        .equals(((MemoryCacheSettings) obj).getGarbageCollectorSettings());
+  }
+
+  @Override
+  public String toString() {
+    return "MemoryCacheSettings{gcSettings=" + getGarbageCollectorSettings() + "}";
+  }
+
+  /** Returns the {@link MemoryGarbageCollectorSettings} object used to configure the SDK cache. */
+  @NonNull
+  public MemoryGarbageCollectorSettings getGarbageCollectorSettings() {
+    return gcSettings;
+  }
+
+  /** A Builder for creating {@code MemoryCacheSettings} instance. */
+  public static class Builder {
+    private MemoryGarbageCollectorSettings gcSettings = MemoryEagerGcSettings.newBuilder().build();
+
+    private Builder() {}
+
+    /** Creates a {@code MemoryCacheSettings} instance. */
+    @NonNull
+    public MemoryCacheSettings build() {
+      return new MemoryCacheSettings(gcSettings);
+    }
+
+    /** Uses the given garbage collector settings to configure memory cache. */
+    @NonNull
+    public Builder setGcSettings(@NonNull MemoryGarbageCollectorSettings gcSettings) {
+      this.gcSettings = gcSettings;
+      return this;
+    }
+  }
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryEagerGcSettings.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryEagerGcSettings.java
new file mode 100644
index 00000000000..efe801167b9
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryEagerGcSettings.java
@@ -0,0 +1,66 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * Configures the SDK to use an eager garbage collector for memory cache. The eager garbage
+ * collector will attempt to remove any documents from SDK's memory cache as soon as it is no longer
+ * used.
+ *
+ * <p>This is the default garbage collector unless specified explicitly otherwise.
+ *
+ * <p>To use, create an instance using {@code MemoryEagerGcSettings#newBuilder().build()}, then set
+ * the instance to {@code MemoryCacheSettings.Builder#setGcSettings}, and use the built {@code
+ * MemoryCacheSettings} instance to configure the Firestore SDK.
+ */
+public final class MemoryEagerGcSettings implements MemoryGarbageCollectorSettings {
+  private MemoryEagerGcSettings() {}
+
+  public static class Builder {
+    private Builder() {}
+
+    @NonNull
+    public MemoryEagerGcSettings build() {
+      return new MemoryEagerGcSettings();
+    }
+  }
+
+  @Override
+  public int hashCode() {
+    return super.hashCode();
+  }
+
+  @Override
+  public boolean equals(@Nullable Object obj) {
+    if (this == obj) return true;
+    if (obj == null || getClass() != obj.getClass()) return false;
+
+    return true;
+  }
+
+  @NonNull
+  @Override
+  public String toString() {
+    return "MemoryEagerGcSettings{}";
+  }
+
+  @NonNull
+  public static MemoryEagerGcSettings.Builder newBuilder() {
+    return new Builder();
+  }
+}
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/network/package-info.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryGarbageCollectorSettings.java
similarity index 75%
rename from firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/network/package-info.java
rename to firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryGarbageCollectorSettings.java
index c2a58e031aa..eade845bfcf 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/network/package-info.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryGarbageCollectorSettings.java
@@ -1,10 +1,10 @@
-// Copyright 2019 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//      http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -12,5 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/** @hide */
-package com.google.firebase.crashlytics.internal.settings.network;
+package com.google.firebase.firestore;
+
+public interface MemoryGarbageCollectorSettings {}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryLruGcSettings.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryLruGcSettings.java
new file mode 100644
index 00000000000..2568fc81bfd
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/MemoryLruGcSettings.java
@@ -0,0 +1,101 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Configures the SDK to use a Least-Recently-Used garbage collector for memory cache.
+ *
+ * <p>To use, create an instance using {@code MemoryLruGcSettings#newBuilder().build()}, then set
+ * the instance to {@code MemoryCacheSettings.Builder#setGcSettings}, and use the built {@code
+ * MemoryCacheSettings} instance to configure the Firestore SDK.
+ */
+public final class MemoryLruGcSettings implements MemoryGarbageCollectorSettings {
+
+  private long sizeBytes;
+
+  public static class Builder {
+    private long sizeBytes = FirebaseFirestoreSettings.DEFAULT_CACHE_SIZE_BYTES;
+
+    private Builder() {}
+
+    @NonNull
+    public MemoryLruGcSettings build() {
+      return new MemoryLruGcSettings(sizeBytes);
+    }
+
+    /**
+     * Sets an approximate cache size threshold for the memory cache. If the cache grows beyond this
+     * size, Firestore SDK will start removing data that hasn't been recently used. The size is not
+     * a guarantee that the cache will stay below that size, only that if the cache exceeds the
+     * given size, cleanup will be attempted.
+     *
+     * <p>A default size of 100MB (100 * 1024 * 1024) is used if unset. The minimum value to set is
+     * 1 MB (1024 * 1024).
+     *
+     * @return this {@code Builder} instance.
+     */
+    @NonNull
+    public Builder setSizeBytes(long size) {
+      sizeBytes = size;
+      return this;
+    }
+  }
+
+  private MemoryLruGcSettings(long size) {
+    sizeBytes = size;
+  }
+
+  /** Returns a new instance of {@link MemoryLruGcSettings.Builder} with default configurations. */
+  @NonNull
+  public static MemoryLruGcSettings.Builder newBuilder() {
+    return new Builder();
+  }
+
+  /**
+   * Returns cache size threshold for the memory cache. If the cache grows beyond this size,
+   * Firestore SDK will start removing data that hasn't been recently used. The size is not a
+   * guarantee that the cache will stay below that size, only that if the cache exceeds the given
+   * size, cleanup will be attempted.
+   *
+   * <p>By default, memory LRU cache is enabled with a cache size of 100MB (100 * 1024 * 1024). The
+   * minimum value is 1 MB (1024 * 1024).
+   */
+  public long getSizeBytes() {
+    return sizeBytes;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    MemoryLruGcSettings that = (MemoryLruGcSettings) o;
+
+    return sizeBytes == that.sizeBytes;
+  }
+
+  @Override
+  public int hashCode() {
+    return (int) (sizeBytes ^ (sizeBytes >>> 32));
+  }
+
+  @NonNull
+  @Override
+  public String toString() {
+    return "MemoryLruGcSettings{cacheSize=" + getSizeBytes() + "}";
+  }
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/PersistentCacheIndexManager.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/PersistentCacheIndexManager.java
new file mode 100644
index 00000000000..a529acbc8bc
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/PersistentCacheIndexManager.java
@@ -0,0 +1,64 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import com.google.firebase.firestore.core.FirestoreClient;
+
+/**
+ * Persistent cache indexes can improve performance of local query execution. The {@code
+ * PersistentCacheIndexManager} controls index creation and lifecycle.
+ *
+ * <p>This is not the same as Cloud Firestore Indexes. Persistent cache indexes are optional indexes
+ * that only exist within the SDK to assist in local query execution.
+ *
+ * <p>To get an instance, call {@link FirebaseFirestore#getPersistentCacheIndexManager()}.
+ */
+public final class PersistentCacheIndexManager {
+  @NonNull private FirestoreClient client;
+
+  /** @hide */
+  @RestrictTo(RestrictTo.Scope.LIBRARY)
+  PersistentCacheIndexManager(FirestoreClient client) {
+    this.client = client;
+  }
+
+  /**
+   * Enables the SDK to create persistent cache indexes automatically for local query execution when
+   * the SDK believes cache indexes can help improves performance.
+   *
+   * <p>This feature is disabled by default.
+   */
+  public void enableIndexAutoCreation() {
+    client.setIndexAutoCreationEnabled(true);
+  }
+
+  /**
+   * Stops creating persistent cache indexes automatically for local query execution. The indexes
+   * which have been created by calling {@link #enableIndexAutoCreation()} still take effect.
+   */
+  public void disableIndexAutoCreation() {
+    client.setIndexAutoCreationEnabled(false);
+  }
+
+  /**
+   * Removes all persistent cache indexes. Note this function also deletes indexes generated by
+   * {@link FirebaseFirestore#setIndexConfiguration(String)}, which is deprecated.
+   */
+  public void deleteAllIndexes() {
+    client.deleteAllFieldIndexes();
+  }
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/PersistentCacheSettings.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/PersistentCacheSettings.java
new file mode 100644
index 00000000000..5f23df46707
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/PersistentCacheSettings.java
@@ -0,0 +1,107 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Configures the SDK to use a persistent cache. Firestore documents and mutations are persisted
+ * across App restart.
+ *
+ * <p>This is the default cache type unless explicitly specified otherwise.
+ *
+ * <p>To use, create an instance using {@link PersistentCacheSettings#newBuilder().build()}, then
+ * set the instance to {@link
+ * FirebaseFirestoreSettings.Builder#setLocalCacheSettings(LocalCacheSettings)}, and use the built
+ * {@code FirebaseFirestoreSettings} instance to configure the Firestore SDK.
+ */
+public final class PersistentCacheSettings implements LocalCacheSettings {
+  /**
+   * Returns a new instance of {@link PersistentCacheSettings.Builder} with default configurations.
+   */
+  @NonNull
+  public static PersistentCacheSettings.Builder newBuilder() {
+    return new Builder();
+  }
+
+  private final long sizeBytes;
+
+  private PersistentCacheSettings(long sizeBytes) {
+    this.sizeBytes = sizeBytes;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    PersistentCacheSettings that = (PersistentCacheSettings) o;
+
+    return sizeBytes == that.sizeBytes;
+  }
+
+  @Override
+  public int hashCode() {
+    return (int) (sizeBytes ^ (sizeBytes >>> 32));
+  }
+
+  @Override
+  public String toString() {
+    return "PersistentCacheSettings{" + "sizeBytes=" + sizeBytes + '}';
+  }
+
+  /**
+   * Returns cache size threshold for the on-disk data. If the cache grows beyond this size,
+   * Firestore SDK will start removing data that hasn't been recently used. The size is not a
+   * guarantee that the cache will stay below that size, only that if the cache exceeds the given
+   * size, cleanup will be attempted.
+   *
+   * <p>By default, persistent cache is enabled with a cache size of 100 MB. The minimum value is 1
+   * MB.
+   */
+  public long getSizeBytes() {
+    return sizeBytes;
+  }
+
+  /** A Builder for creating {@code PersistentCacheSettings} instance. */
+  public static class Builder {
+
+    private long sizeBytes = FirebaseFirestoreSettings.DEFAULT_CACHE_SIZE_BYTES;
+
+    private Builder() {}
+
+    /**
+     * Sets an approximate cache size threshold for the on-disk data. If the cache grows beyond this
+     * size, Firestore SDK will start removing data that hasn't been recently used. The size is not
+     * a guarantee that the cache will stay below that size, only that if the cache exceeds the
+     * given size, cleanup will be attempted.
+     *
+     * <p>By default, collection is enabled with a cache size of 100 MB. The minimum value is 1 MB.
+     *
+     * @return A settings object on which the cache size is configured as specified by the given
+     *     {@code value}.
+     */
+    @NonNull
+    public Builder setSizeBytes(long sizeBytes) {
+      this.sizeBytes = sizeBytes;
+      return this;
+    }
+
+    /** Creates a {@code PersistentCacheSettings} instance from this builder instance. */
+    @NonNull
+    public PersistentCacheSettings build() {
+      return new PersistentCacheSettings(sizeBytes);
+    }
+  }
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/Query.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/Query.java
index 7c8f863a3b4..a0e709a54e0 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/Query.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/Query.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.firestore;
 
+import static com.google.firebase.firestore.core.Query.LimitType.LIMIT_TO_LAST;
 import static com.google.firebase.firestore.util.Assert.fail;
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 import static com.google.firebase.firestore.util.Preconditions.checkNotNull;
@@ -47,6 +48,7 @@
 import com.google.firestore.v1.Value;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
@@ -387,6 +389,24 @@ public Query whereNotIn(@NonNull FieldPath fieldPath, @NonNull List<? extends Ob
     return where(Filter.notInArray(fieldPath, values));
   }
 
+  /**
+   * Creates and returns a new {@code Query} with the additional filter.
+   *
+   * @param filter The new filter to apply to the existing query.
+   * @return The newly created {@code Query}.
+   */
+  @NonNull
+  public Query where(@NonNull Filter filter) {
+    com.google.firebase.firestore.core.Filter parsedFilter = parseFilter(filter);
+    if (parsedFilter.getFilters().isEmpty()) {
+      // Return the existing query if not adding any more filters (because composite filter is
+      // empty).
+      return this;
+    }
+    validateNewFilter(parsedFilter);
+    return new Query(query.filter(parsedFilter), firestore);
+  }
+
   /**
    * Takes a {@link Filter.UnaryFilter} object, parses the value object and returns a new {@link
    * FieldFilter} for the field, operator, and parsed value.
@@ -467,25 +487,6 @@ private com.google.firebase.firestore.core.Filter parseFilter(Filter filter) {
     return parseCompositeFilter((Filter.CompositeFilter) filter);
   }
 
-  // TODO(orquery): This method will become public API. Change visibility and add documentation.
-  private Query where(Filter filter) {
-    com.google.firebase.firestore.core.Filter parsedFilter = parseFilter(filter);
-    if (parsedFilter.getFilters().isEmpty()) {
-      // Return the existing query if not adding any more filters (e.g. an empty composite filter).
-      return this;
-    }
-    validateNewFilter(parsedFilter);
-    return new Query(query.filter(parsedFilter), firestore);
-  }
-
-  private void validateOrderByField(com.google.firebase.firestore.model.FieldPath field) {
-    com.google.firebase.firestore.model.FieldPath inequalityField = query.inequalityField();
-    if (query.getFirstOrderByField() == null && inequalityField != null) {
-
-      validateOrderByFieldMatchesInequality(field, inequalityField);
-    }
-  }
-
   /**
    * Parses the given documentIdValue into a ReferenceValue, throwing appropriate errors if the
    * value is anything other than a DocumentReference or String, or if the string is malformed.
@@ -533,62 +534,31 @@ private void validateDisjunctiveFilterElements(Object value, Operator op) {
       throw new IllegalArgumentException(
           "Invalid Query. A non-empty array is required for '" + op.toString() + "' filters.");
     }
-    if (((List) value).size() > 10) {
-      throw new IllegalArgumentException(
-          "Invalid Query. '"
-              + op.toString()
-              + "' filters support a maximum of 10 elements in the value array.");
-    }
-  }
-
-  private void validateOrderByFieldMatchesInequality(
-      com.google.firebase.firestore.model.FieldPath orderBy,
-      com.google.firebase.firestore.model.FieldPath inequality) {
-    if (!orderBy.equals(inequality)) {
-      String inequalityString = inequality.canonicalString();
-      throw new IllegalArgumentException(
-          String.format(
-              "Invalid query. You have an inequality where filter (whereLessThan(), "
-                  + "whereGreaterThan(), etc.) on field '%s' and so you must also have '%s' as "
-                  + "your first orderBy() field, but your first orderBy() is currently on field "
-                  + "'%s' instead.",
-              inequalityString, inequalityString, orderBy.canonicalString()));
-    }
   }
 
   /**
    * Given an operator, returns the set of operators that cannot be used with it.
    *
+   * <p>This is not a comprehensive check, and this function should be removed in the long term.
+   * Validations should occur in the Firestore backend.
+   *
    * <p>Operators in a query must adhere to the following set of rules:
    *
    * <ol>
-   *   <li>Only one array operator is allowed.
-   *   <li>Only one disjunctive operator is allowed.
-   *   <li>NOT_EQUAL cannot be used with another NOT_EQUAL operator.
+   *   <li>Only one inequality per query.
    *   <li>NOT_IN cannot be used with array, disjunctive, or NOT_EQUAL operators.
    * </ol>
-   *
-   * <p>Array operators: ARRAY_CONTAINS, ARRAY_CONTAINS_ANY Disjunctive operators: IN,
-   * ARRAY_CONTAINS_ANY, NOT_IN
    */
   private List<Operator> conflictingOps(Operator op) {
     switch (op) {
       case NOT_EQUAL:
         return Arrays.asList(Operator.NOT_EQUAL, Operator.NOT_IN);
-      case ARRAY_CONTAINS:
-        return Arrays.asList(Operator.ARRAY_CONTAINS, Operator.ARRAY_CONTAINS_ANY, Operator.NOT_IN);
-      case IN:
-        return Arrays.asList(Operator.ARRAY_CONTAINS_ANY, Operator.IN, Operator.NOT_IN);
       case ARRAY_CONTAINS_ANY:
-        return Arrays.asList(
-            Operator.ARRAY_CONTAINS, Operator.ARRAY_CONTAINS_ANY, Operator.IN, Operator.NOT_IN);
+      case IN:
+        return Arrays.asList(Operator.NOT_IN);
       case NOT_IN:
         return Arrays.asList(
-            Operator.ARRAY_CONTAINS,
-            Operator.ARRAY_CONTAINS_ANY,
-            Operator.IN,
-            Operator.NOT_IN,
-            Operator.NOT_EQUAL);
+            Operator.ARRAY_CONTAINS_ANY, Operator.IN, Operator.NOT_IN, Operator.NOT_EQUAL);
       default:
         return new ArrayList<>();
     }
@@ -599,25 +569,8 @@ private void validateNewFieldFilter(
       com.google.firebase.firestore.core.Query query,
       com.google.firebase.firestore.core.FieldFilter fieldFilter) {
     Operator filterOp = fieldFilter.getOperator();
-    if (fieldFilter.isInequality()) {
-      com.google.firebase.firestore.model.FieldPath existingInequality = query.inequalityField();
-      com.google.firebase.firestore.model.FieldPath newInequality = fieldFilter.getField();
 
-      if (existingInequality != null && !existingInequality.equals(newInequality)) {
-        throw new IllegalArgumentException(
-            String.format(
-                "All where filters with an inequality (notEqualTo, notIn, lessThan, "
-                    + "lessThanOrEqualTo, greaterThan, or greaterThanOrEqualTo) must be on the "
-                    + "same field. But you have filters on '%s' and '%s'",
-                existingInequality.canonicalString(), newInequality.canonicalString()));
-      }
-      com.google.firebase.firestore.model.FieldPath firstOrderByField =
-          query.getFirstOrderByField();
-      if (firstOrderByField != null) {
-        validateOrderByFieldMatchesInequality(firstOrderByField, newInequality);
-      }
-    }
-    Operator conflictingOp = findFilterWithOperator(query.getFilters(), conflictingOps(filterOp));
+    Operator conflictingOp = findOpInsideFilters(query.getFilters(), conflictingOps(filterOp));
     if (conflictingOp != null) {
       // We special case when it's a duplicate op to give a slightly clearer error message.
       if (conflictingOp == filterOp) {
@@ -639,7 +592,7 @@ private void validateNewFilter(com.google.firebase.firestore.core.Filter filter)
     com.google.firebase.firestore.core.Query testQuery = query;
     for (FieldFilter subfilter : filter.getFlattenedFilters()) {
       validateNewFieldFilter(testQuery, subfilter);
-      testQuery = query.filter(subfilter);
+      testQuery = testQuery.filter(subfilter);
     }
   }
 
@@ -648,13 +601,12 @@ private void validateNewFilter(com.google.firebase.firestore.core.Filter filter)
    * returns the first one that is, or null if none are.
    */
   @Nullable
-  private Operator findFilterWithOperator(
+  private Operator findOpInsideFilters(
       List<com.google.firebase.firestore.core.Filter> filters, List<Operator> operators) {
     for (com.google.firebase.firestore.core.Filter filter : filters) {
-      if (filter instanceof FieldFilter) {
-        Operator filterOp = ((FieldFilter) filter).getOperator();
-        if (operators.contains(filterOp)) {
-          return filterOp;
+      for (FieldFilter fieldFilter : filter.getFlattenedFilters()) {
+        if (operators.contains(fieldFilter.getOperator())) {
+          return fieldFilter.getOperator();
         }
       }
     }
@@ -725,7 +677,6 @@ private Query orderBy(
           "Invalid query. You must not call Query.endAt() or Query.endBefore() before "
               + "calling Query.orderBy().");
     }
-    validateOrderByField(fieldPath);
     OrderBy.Direction dir =
         direction == Direction.ASCENDING
             ? OrderBy.Direction.ASCENDING
@@ -907,7 +858,7 @@ private Bound boundFromDocumentSnapshot(
     // contain the document key. That way the position becomes unambiguous and the query
     // continues/ends exactly at the provided document. Without the key (by using the explicit sort
     // orders), multiple documents could match the position, yielding duplicate results.
-    for (OrderBy orderBy : query.getOrderBy()) {
+    for (OrderBy orderBy : query.getNormalizedOrderBy()) {
       if (orderBy.getField().equals(com.google.firebase.firestore.model.FieldPath.KEY_PATH)) {
         components.add(Values.refValue(firestore.getDatabaseId(), document.getKey()));
       } else {
@@ -1120,7 +1071,7 @@ public ListenerRegistration addSnapshotListener(
   /**
    * Starts listening to this query with the given options.
    *
-   * @param metadataChanges Indicates whether metadata-only changes (i.e. only {@code
+   * @param metadataChanges Indicates whether metadata-only changes (specifically, only {@code
    *     QuerySnapshot.getMetadata()} changed) should trigger snapshot events.
    * @param listener The event listener that will be called with the snapshots.
    * @return A registration object that can be used to remove the listener.
@@ -1135,7 +1086,7 @@ public ListenerRegistration addSnapshotListener(
    * Starts listening to this query with the given options.
    *
    * @param executor The executor to use to call the listener.
-   * @param metadataChanges Indicates whether metadata-only changes (i.e. only {@code
+   * @param metadataChanges Indicates whether metadata-only changes (specifically, only {@code
    *     QuerySnapshot.getMetadata()} changed) should trigger snapshot events.
    * @param listener The event listener that will be called with the snapshots.
    * @return A registration object that can be used to remove the listener.
@@ -1157,7 +1108,7 @@ public ListenerRegistration addSnapshotListener(
    * <p>The listener will be automatically removed during {@link Activity#onStop}.
    *
    * @param activity The activity to scope the listener to.
-   * @param metadataChanges Indicates whether metadata-only changes (i.e. only {@code
+   * @param metadataChanges Indicates whether metadata-only changes (specifically, only {@code
    *     QuerySnapshot.getMetadata()} changed) should trigger snapshot events.
    * @param listener The event listener that will be called with the snapshots.
    * @return A registration object that can be used to remove the listener.
@@ -1174,6 +1125,27 @@ public ListenerRegistration addSnapshotListener(
         Executors.DEFAULT_CALLBACK_EXECUTOR, internalOptions(metadataChanges), activity, listener);
   }
 
+  /**
+   * Starts listening to this query with the given options.
+   *
+   * @param options Sets snapshot listener options, including whether metadata-only changes should
+   *     trigger snapshot events, the source to listen to, the executor to use to call the listener,
+   *     or the activity to scope the listener to.
+   * @param listener The event listener that will be called with the snapshots.
+   * @return A registration object that can be used to remove the listener.
+   */
+  @NonNull
+  public ListenerRegistration addSnapshotListener(
+      @NonNull SnapshotListenOptions options, @NonNull EventListener<QuerySnapshot> listener) {
+    checkNotNull(options, "Provided options value must not be null.");
+    checkNotNull(listener, "Provided EventListener must not be null.");
+    return addSnapshotListenerInternal(
+        options.getExecutor(),
+        internalOptions(options.getMetadataChanges(), options.getSource()),
+        options.getActivity(),
+        listener);
+  }
+
   /**
    * Internal helper method to create add a snapshot listener.
    *
@@ -1217,12 +1189,54 @@ private ListenerRegistration addSnapshotListenerInternal(
   }
 
   private void validateHasExplicitOrderByForLimitToLast() {
-    if (query.hasLimitToLast() && query.getExplicitOrderBy().isEmpty()) {
+    if (query.getLimitType().equals(LIMIT_TO_LAST) && query.getExplicitOrderBy().isEmpty()) {
       throw new IllegalStateException(
           "limitToLast() queries require specifying at least one orderBy() clause");
     }
   }
 
+  /**
+   * Returns a query that counts the documents in the result set of this query.
+   *
+   * <p>The returned query, when executed, counts the documents in the result set of this query
+   * <em>without actually downloading the documents</em>.
+   *
+   * <p>Using the returned query to count the documents is efficient because only the final count,
+   * not the documents' data, is downloaded. The returned query can count the documents in cases
+   * where the result set is prohibitively large to download entirely (thousands of documents).
+   *
+   * @return The {@code AggregateQuery} that counts the documents in the result set of this query.
+   */
+  @NonNull
+  public AggregateQuery count() {
+    return new AggregateQuery(this, Collections.singletonList(AggregateField.count()));
+  }
+
+  /**
+   * Calculates the specified aggregations over the documents in the result set of the given query
+   * without actually downloading the documents.
+   *
+   * <p>Using the returned query to perform aggregations is efficient because only the final
+   * aggregation values, not the documents' data, is downloaded. The returned query can perform
+   * aggregations of the documents in cases where the result set is prohibitively large to download
+   * entirely (thousands of documents).
+   *
+   * @return The {@code AggregateQuery} that performs aggregations on the documents in the result
+   *     set of this query.
+   */
+  @NonNull
+  public AggregateQuery aggregate(
+      @NonNull AggregateField aggregateField, @NonNull AggregateField... aggregateFields) {
+    List<AggregateField> fields =
+        new ArrayList<AggregateField>() {
+          {
+            add(aggregateField);
+          }
+        };
+    fields.addAll(Arrays.asList(aggregateFields));
+    return new AggregateQuery(this, fields);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -1246,10 +1260,16 @@ public int hashCode() {
 
   /** Converts the public API options object to the internal options object. */
   private static ListenOptions internalOptions(MetadataChanges metadataChanges) {
+    return internalOptions(metadataChanges, ListenSource.DEFAULT);
+  }
+
+  private static ListenOptions internalOptions(
+      MetadataChanges metadataChanges, ListenSource source) {
     ListenOptions internalOptions = new ListenOptions();
     internalOptions.includeDocumentMetadataChanges = (metadataChanges == MetadataChanges.INCLUDE);
     internalOptions.includeQueryMetadataChanges = (metadataChanges == MetadataChanges.INCLUDE);
     internalOptions.waitForSyncWhenOnline = false;
+    internalOptions.source = source;
     return internalOptions;
   }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/QuerySnapshot.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/QuerySnapshot.java
index eea04c869e0..e85868943c3 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/QuerySnapshot.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/QuerySnapshot.java
@@ -26,8 +26,8 @@
 import java.util.List;
 
 /**
- * A {@code QuerySnapshot} contains the results of a query. It can contain zero or more {@link
- * DocumentSnapshot} objects.
+ * A {@code QuerySnapshot} contains the results of a query. <br>
+ * It can contain zero or more {@link DocumentSnapshot} objects.
  *
  * <p><b>Subclassing Note</b>: Cloud Firestore classes are not meant to be subclassed except for use
  * in test mocks. Subclassing is not supported in production code and new SDK releases may break
@@ -105,7 +105,7 @@ public List<DocumentChange> getDocumentChanges() {
    * Returns the list of documents that changed since the last snapshot. If it's the first snapshot
    * all documents will be in the list as added changes.
    *
-   * @param metadataChanges Indicates whether metadata-only changes (i.e. only {@code
+   * @param metadataChanges Indicates whether metadata-only changes (specifically, only {@code
    *     DocumentSnapshot.getMetadata()} changed) should be included.
    * @return The list of document changes since the last snapshot.
    */
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/SnapshotListenOptions.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/SnapshotListenOptions.java
new file mode 100644
index 00000000000..b68d0004749
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/SnapshotListenOptions.java
@@ -0,0 +1,195 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import static com.google.firebase.firestore.util.Preconditions.checkNotNull;
+
+import android.app.Activity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.firebase.firestore.util.Executors;
+import java.util.concurrent.Executor;
+
+/**
+ * An options object that configures the behavior of {@code addSnapshotListener()} calls. Instances
+ * of this class control settings such as whether metadata-only changes trigger events, the
+ * preferred data source (server or cache), and the executor for listener callbacks.
+ */
+public final class SnapshotListenOptions {
+  /** Indicates whether metadata-only changes should trigger snapshot events. */
+  private final MetadataChanges metadataChanges;
+  /** Specifies the data source for the listener. */
+  private final ListenSource source;
+  /** The executor to use to call the listener. */
+  private final Executor executor;
+  /** The activity to scope the listener to. */
+  private final Activity activity;
+
+  private SnapshotListenOptions(Builder builder) {
+    this.metadataChanges = builder.metadataChanges;
+    this.source = builder.source;
+    this.executor = builder.executor;
+    this.activity = builder.activity;
+  }
+
+  /**
+   * Returns the setting for whether metadata-only changes should trigger snapshot events.
+   *
+   * @return The setting object for metadata-only changes.
+   */
+  @NonNull
+  public MetadataChanges getMetadataChanges() {
+    return metadataChanges;
+  }
+
+  /**
+   * Returns the preferred source for retrieving data in snapshot listeners.
+   *
+   * @return The listen source for retrieving data.
+   */
+  @NonNull
+  public ListenSource getSource() {
+    return source;
+  }
+
+  /**
+   * Returns the executor that will be used to execute the snapshot listener's callback.
+   *
+   * @return The executor for snapshot listener callbacks.
+   */
+  @NonNull
+  public Executor getExecutor() {
+    return executor;
+  }
+
+  /**
+   * Returns the optional Activity that scopes this snapshot listener's lifespan. If provided, the
+   * listener will automatically stop receiving events when the activity is destroyed.
+   *
+   * @return The Activity associated with this listener, or null if no activity is set.
+   */
+  @Nullable
+  public Activity getActivity() {
+    return activity;
+  }
+
+  /** Builder for constructing {@link SnapshotListenOptions} instances. */
+  public static class Builder {
+    private MetadataChanges metadataChanges = MetadataChanges.EXCLUDE;
+    private ListenSource source = ListenSource.DEFAULT;
+    private Executor executor = Executors.DEFAULT_CALLBACK_EXECUTOR;
+    private Activity activity = null;
+
+    public Builder() {}
+
+    /**
+     * Sets whether metadata-only changes should trigger snapshot events.
+     *
+     * @param metadataChanges The setting for metadata-only changes.
+     * @return This Builder instance to allow chaining of method calls.
+     */
+    @NonNull
+    public Builder setMetadataChanges(@NonNull MetadataChanges metadataChanges) {
+      checkNotNull(metadataChanges, "metadataChanges must not be null.");
+      this.metadataChanges = metadataChanges;
+      return this;
+    }
+
+    /**
+     * Sets the preferred source for retrieving data in snapshot listeners.
+     *
+     * @param source The preferred source for data retrieval.
+     * @return This Builder instance to allow chaining of method calls.
+     */
+    @NonNull
+    public Builder setSource(@NonNull ListenSource source) {
+      checkNotNull(source, "listen source must not be null.");
+      this.source = source;
+      return this;
+    }
+
+    /**
+     * Sets the executor to be used for snapshot listener callbacks.
+     *
+     * @param executor The executor to be used.
+     * @return This Builder instance to allow chaining of method calls.
+     */
+    @NonNull
+    public Builder setExecutor(@NonNull Executor executor) {
+      checkNotNull(executor, "executor must not be null.");
+      this.executor = executor;
+      return this;
+    }
+
+    /**
+     * Associates an Activity with this snapshot listener's lifecycle. If set, the listener will
+     * automatically stop when the Activity is destroyed.
+     *
+     * @param activity The Activity to associate with the listener.
+     * @return This Builder instance to allow chaining of method calls.
+     */
+    @NonNull
+    public Builder setActivity(@NonNull Activity activity) {
+      checkNotNull(activity, "activity must not be null.");
+      this.activity = activity;
+      return this;
+    }
+
+    /**
+     * Constructs a {@link SnapshotListenOptions} instance using the current settings in this
+     * Builder.
+     *
+     * @return The constructed SnapshotListenOptions instance.
+     */
+    @NonNull
+    public SnapshotListenOptions build() {
+      return new SnapshotListenOptions(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    SnapshotListenOptions that = (SnapshotListenOptions) o;
+    return metadataChanges == that.metadataChanges
+        && source == that.source
+        && executor.equals(that.executor)
+        && activity.equals(that.activity);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = metadataChanges.hashCode();
+    result = 31 * result + source.hashCode();
+    result = 31 * result + executor.hashCode();
+    result = 31 * result + (activity != null ? activity.hashCode() : 0);
+    return result;
+  }
+
+  @Override
+  public String toString() {
+    return "SnapshotListenOptions{"
+        + "metadataChanges="
+        + metadataChanges
+        + ", source="
+        + source
+        + ", executor="
+        + executor
+        + ", activity="
+        + activity
+        + '}';
+  }
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/Transaction.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/Transaction.java
index bd924213e6c..edd08aa14e8 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/Transaction.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/Transaction.java
@@ -56,7 +56,7 @@ public class Transaction {
    * does not yet exist, it will be created. If a document already exists, it will be overwritten.
    *
    * @param documentRef The {@code DocumentReference} to overwrite.
-   * @param data The data to write to the document (e.g. a Map or a POJO containing the desired
+   * @param data The data to write to the document (like a Map or a POJO containing the desired
    *     document contents).
    * @return This {@code Transaction} instance. Used for chaining method calls.
    */
@@ -71,7 +71,7 @@ public Transaction set(@NonNull DocumentReference documentRef, @NonNull Object d
    * into an existing document.
    *
    * @param documentRef The {@code DocumentReference} to overwrite.
-   * @param data The data to write to the document (e.g. a Map or a POJO containing the desired
+   * @param data The data to write to the document (like a Map or a POJO containing the desired
    *     document contents).
    * @param options An object to configure the set behavior.
    * @return This {@code Transaction} instance. Used for chaining method calls.
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/TransactionOptions.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/TransactionOptions.java
new file mode 100644
index 00000000000..0536aa35029
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/TransactionOptions.java
@@ -0,0 +1,103 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Options to customize transaction behavior for {@link
+ * FirebaseFirestore#runTransaction(TransactionOptions, Transaction.Function)}.
+ */
+public final class TransactionOptions {
+
+  static final TransactionOptions DEFAULT = new TransactionOptions.Builder().build();
+  static final int DEFAULT_MAX_ATTEMPTS_COUNT = 5;
+
+  private final int maxAttempts;
+
+  private TransactionOptions(int maxAttempts) {
+    this.maxAttempts = maxAttempts;
+  }
+
+  /** A Builder for creating {@code TransactionOptions}. */
+  public static final class Builder {
+    private int maxAttempts = DEFAULT_MAX_ATTEMPTS_COUNT;
+
+    /** Constructs a new {@code TransactionOptions} Builder object. */
+    public Builder() {}
+
+    /**
+     * Constructs a new {@code TransactionOptions} Builder based on an existing {@code
+     * TransactionOptions} object.
+     */
+    public Builder(@NonNull TransactionOptions options) {
+      maxAttempts = options.maxAttempts;
+    }
+
+    /**
+     * Set maximum number of attempts to commit, after which transaction fails.
+     *
+     * <p>The default value is 5. Setting the value to less than 1 will result in an <br>
+     * {@link IllegalArgumentException}.
+     *
+     * @return This builder
+     */
+    @NonNull
+    public Builder setMaxAttempts(int maxAttempts) {
+      if (maxAttempts < 1) throw new IllegalArgumentException("Max attempts must be at least 1");
+      this.maxAttempts = maxAttempts;
+      return this;
+    }
+
+    /**
+     * Build the {@code TransactionOptions} object.
+     *
+     * @return The built {@code TransactionOptions} object
+     */
+    @NonNull
+    public TransactionOptions build() {
+      return new TransactionOptions(maxAttempts);
+    }
+  }
+
+  /**
+   * Get maximum number of attempts to commit, after which transaction fails. Default is 5.
+   *
+   * @return The maximum number of attempts
+   */
+  public int getMaxAttempts() {
+    return maxAttempts;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    TransactionOptions that = (TransactionOptions) o;
+
+    return maxAttempts == that.maxAttempts;
+  }
+
+  @Override
+  public int hashCode() {
+    return maxAttempts;
+  }
+
+  @Override
+  public String toString() {
+    return "TransactionOptions{" + "maxAttempts=" + maxAttempts + '}';
+  }
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/UserDataReader.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/UserDataReader.java
index af2b0b487e4..c7c399be117 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/UserDataReader.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/UserDataReader.java
@@ -183,16 +183,16 @@ public ParsedUpdateData parseUpdateData(List<Object> fieldsAndValues) {
     return accumulator.toUpdateData(updateData);
   }
 
-  /** Parse a "query value" (e.g. value in a where filter or a value in a cursor bound). */
+  /** Parse a "query value" (like a value in a where filter or a value in a cursor bound). */
   public Value parseQueryValue(Object input) {
     return parseQueryValue(input, false);
   }
 
   /**
-   * Parse a "query value" (e.g. value in a where filter or a value in a cursor bound).
+   * Parse a "query value" (like a value in a where filter or a value in a cursor bound).
    *
    * @param allowArrays Whether the query value is an array that may directly contain additional
-   *     arrays (e.g. the operand of a `whereIn` query).
+   *     arrays (for example, the operand of a `whereIn` query).
    */
   public Value parseQueryValue(Object input, boolean allowArrays) {
     ParseAccumulator accumulator =
@@ -215,8 +215,8 @@ public Value convertAndParseFieldData(Object input, ParseContext context) {
 
   /**
    * Converts a POJO to native types and then parses it into model types. It expects the input to
-   * conform to document data (i.e. it must parse into an ObjectValue model type) and will throw an
-   * appropriate error otherwise.
+   * conform to document data (specifically, it must parse into an ObjectValue model type) and will
+   * throw an appropriate error otherwise.
    */
   private ObjectValue convertAndParseDocumentData(Object input, ParseContext context) {
     String badDocReason =
@@ -381,7 +381,7 @@ private void parseSentinelFieldValue(
   }
 
   /**
-   * Helper to parse a scalar value (i.e. not a Map or List)
+   * Helper to parse a scalar value (specifically, not a Map or a List)
    *
    * @return The parsed value, or {@code null} if the value was a FieldValue sentinel that should
    *     not be included in the resulting parsed data.
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/UserDataWriter.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/UserDataWriter.java
index 9d26ae35884..ab831aca914 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/UserDataWriter.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/UserDataWriter.java
@@ -31,7 +31,6 @@
 import static com.google.firebase.firestore.util.Assert.fail;
 
 import androidx.annotation.RestrictTo;
-import androidx.annotation.VisibleForTesting;
 import com.google.firebase.Timestamp;
 import com.google.firebase.firestore.model.DatabaseId;
 import com.google.firebase.firestore.model.DocumentKey;
@@ -53,7 +52,6 @@ public class UserDataWriter {
   private final FirebaseFirestore firestore;
   private final DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior;
 
-  @VisibleForTesting
   public UserDataWriter(
       FirebaseFirestore firestore,
       DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior) {
@@ -61,7 +59,6 @@ public UserDataWriter(
     this.serverTimestampBehavior = serverTimestampBehavior;
   }
 
-  @VisibleForTesting
   public Object convertValue(Value value) {
     switch (typeOrder(value)) {
       case TYPE_ORDER_MAP:
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/WriteBatch.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/WriteBatch.java
index d2d28d4a606..b8c6e9d1651 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/WriteBatch.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/WriteBatch.java
@@ -57,7 +57,7 @@ public class WriteBatch {
    * does not yet exist, it will be created. If a document already exists, it will be overwritten.
    *
    * @param documentRef The {@code DocumentReference} to overwrite.
-   * @param data The data to write to the document (e.g. a Map or a POJO containing the desired
+   * @param data The data to write to the document (like a Map or a POJO containing the desired
    *     document contents).
    * @return This {@code WriteBatch} instance. Used for chaining method calls.
    */
@@ -72,7 +72,7 @@ public WriteBatch set(@NonNull DocumentReference documentRef, @NonNull Object da
    * be merged into an existing document.
    *
    * @param documentRef The {@code DocumentReference} to overwrite.
-   * @param data The data to write to the document (e.g. a Map or a POJO containing the desired
+   * @param data The data to write to the document (like a Map or a POJO containing the desired
    *     document contents).
    * @param options An object to configure the set behavior.
    * @return This {@code WriteBatch} instance. Used for chaining method calls.
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/auth/FirebaseAppCheckTokenProvider.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/auth/FirebaseAppCheckTokenProvider.java
index 018a7391a9b..5ea849d09ef 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/auth/FirebaseAppCheckTokenProvider.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/auth/FirebaseAppCheckTokenProvider.java
@@ -23,7 +23,7 @@
 import com.google.firebase.FirebaseApiNotAvailableException;
 import com.google.firebase.appcheck.AppCheckTokenResult;
 import com.google.firebase.appcheck.interop.AppCheckTokenListener;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.firestore.util.Executors;
 import com.google.firebase.firestore.util.Listener;
 import com.google.firebase.firestore.util.Logger;
@@ -41,11 +41,11 @@ public final class FirebaseAppCheckTokenProvider extends CredentialsProvider<Str
   private Listener<String> changeListener;
 
   /**
-   * The {@link Provider} that gives access to the {@link InternalAppCheckTokenProvider} instance.
+   * The {@link Provider} that gives access to the {@link InteropAppCheckTokenProvider} instance.
    */
   @Nullable
   @GuardedBy("this")
-  private InternalAppCheckTokenProvider internalAppCheckTokenProvider;
+  private InteropAppCheckTokenProvider interopAppCheckTokenProvider;
 
   @GuardedBy("this")
   private boolean forceRefresh;
@@ -58,14 +58,14 @@ public final class FirebaseAppCheckTokenProvider extends CredentialsProvider<Str
   /** Creates a new FirebaseAppCheckTokenProvider. */
   @SuppressLint("ProviderAssignment") // TODO: Remove this @SuppressLint once b/181014061 is fixed.
   public FirebaseAppCheckTokenProvider(
-      Deferred<InternalAppCheckTokenProvider> deferredAppCheckTokenProvider) {
+      Deferred<InteropAppCheckTokenProvider> deferredAppCheckTokenProvider) {
     deferredAppCheckTokenProvider.whenAvailable(
         provider -> {
           synchronized (this) {
-            internalAppCheckTokenProvider = provider.get();
+            interopAppCheckTokenProvider = provider.get();
             // Get notified when AppCheck token changes to a new value in the future.
-            if (internalAppCheckTokenProvider != null) {
-              internalAppCheckTokenProvider.addAppCheckTokenListener(tokenListener);
+            if (interopAppCheckTokenProvider != null) {
+              interopAppCheckTokenProvider.addAppCheckTokenListener(tokenListener);
             }
           }
         });
@@ -89,11 +89,11 @@ private synchronized void onTokenChanged(@NonNull AppCheckTokenResult result) {
    */
   @Override
   public synchronized Task<String> getToken() {
-    if (internalAppCheckTokenProvider == null) {
+    if (interopAppCheckTokenProvider == null) {
       return Tasks.forException(new FirebaseApiNotAvailableException("AppCheck is not available"));
     }
 
-    Task<AppCheckTokenResult> res = internalAppCheckTokenProvider.getToken(forceRefresh);
+    Task<AppCheckTokenResult> res = interopAppCheckTokenProvider.getToken(forceRefresh);
     forceRefresh = false;
 
     return res.continueWithTask(
@@ -121,8 +121,8 @@ public synchronized void invalidateToken() {
   public synchronized void removeChangeListener() {
     changeListener = null;
 
-    if (internalAppCheckTokenProvider != null) {
-      internalAppCheckTokenProvider.removeAppCheckTokenListener(tokenListener);
+    if (interopAppCheckTokenProvider != null) {
+      interopAppCheckTokenProvider.removeAppCheckTokenListener(tokenListener);
     }
   }
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/bundle/BundleSerializer.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/bundle/BundleSerializer.java
index 8e92b2134f5..f3ea30e3df6 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/bundle/BundleSerializer.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/bundle/BundleSerializer.java
@@ -22,7 +22,6 @@
 import com.google.firebase.firestore.core.Filter;
 import com.google.firebase.firestore.core.OrderBy;
 import com.google.firebase.firestore.core.Query;
-import com.google.firebase.firestore.core.Target;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.FieldPath;
 import com.google.firebase.firestore.model.MutableDocument;
@@ -63,8 +62,8 @@ public BundleSerializer(RemoteSerializer remoteSerializer) {
 
     timestampFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ENGLISH);
     GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
-    // We use Proleptic Gregorian Calendar (i.e., Gregorian calendar extends backwards to year one)
-    // for timestamp formatting.
+    // We use Proleptic Gregorian Calendar (specifically, Gregorian calendar extends backwards to
+    // year one) for timestamp formatting.
     calendar.setGregorianChange(new Date(Long.MIN_VALUE));
     timestampFormat.setCalendar(calendar);
   }
@@ -154,7 +153,20 @@ private BundledQuery decodeBundledQuery(JSONObject bundledQuery) throws JSONExce
     Query.LimitType limitType = decodeLimitType(bundledQuery);
 
     return new BundledQuery(
-        new Target(parent, collectionGroup, filters, orderBys, limit, startAt, endAt), limitType);
+        new Query(
+                parent,
+                collectionGroup,
+                filters,
+                orderBys,
+                limit,
+                // Not using `limitType` because bundled queries are what the backend sees,
+                // and there is no limit_to_last for the backend.
+                // Limit type is applied when the query is read back instead.
+                Query.LimitType.LIMIT_TO_FIRST,
+                startAt,
+                endAt)
+            .toTarget(),
+        limitType);
   }
 
   private int decodeLimit(JSONObject structuredQuery) {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/ActivityScope.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/ActivityScope.java
index f18e15c27b6..e5765780df2 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/ActivityScope.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/ActivityScope.java
@@ -27,11 +27,11 @@
 /**
  * Scopes the lifetime of a ListenerRegistration to an Activity.
  *
- * <p>Regarding activity-scoped listeners, Android provides lifecycle callbacks (eg onStop()) that
- * custom `Activity`s can implement via subclassing. But we can't take advantage of that, since we
- * need to be usable with a generic Activity. So instead, we create a custom Fragment, and add that
- * Fragment to the given Activity. When the Activity stops, it will automatically stop the attached
- * Fragments too.
+ * <p>Regarding activity-scoped listeners, Android provides lifecycle callbacks (for example,
+ * onStop()) that custom `Activity`s can implement via subclassing. But we can't take advantage of
+ * that, since we need to be usable with a generic Activity. So instead, we create a custom
+ * Fragment, and add that Fragment to the given Activity. When the Activity stops, it will
+ * automatically stop the attached Fragments too.
  *
  * <p>One difficulty with this approach is that how you get a Fragment and attach it to an Activity
  * differs based on the type of Activity. If the Activity is actually a FragmentActivity, then you
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Bound.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Bound.java
index 0e886f399ab..229a79bba49 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Bound.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Bound.java
@@ -39,8 +39,8 @@
 public final class Bound {
 
   /**
-   * Whether this bound includes the provided position (e.g. for {#code startAt()} or {#code
-   * endAt()})
+   * Whether this bound includes the provided position (for example, {#code startAt()} or {#code
+   * endAt()} is inclusive)
    */
   private final boolean inclusive;
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/ComponentProvider.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/ComponentProvider.java
index 38da7d70afa..e63af145978 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/ComponentProvider.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/ComponentProvider.java
@@ -14,6 +14,8 @@
 
 package com.google.firebase.firestore.core;
 
+import static com.google.firebase.firestore.util.Assert.hardAssertNonNull;
+
 import android.content.Context;
 import androidx.annotation.Nullable;
 import com.google.firebase.firestore.FirebaseFirestoreSettings;
@@ -101,7 +103,7 @@ Context getContext() {
   }
 
   public Persistence getPersistence() {
-    return persistence;
+    return hardAssertNonNull(persistence, "persistence not initialized yet");
   }
 
   @Nullable
@@ -115,29 +117,37 @@ public IndexBackfiller getIndexBackfiller() {
   }
 
   public LocalStore getLocalStore() {
-    return localStore;
+    return hardAssertNonNull(localStore, "localStore not initialized yet");
   }
 
   public SyncEngine getSyncEngine() {
-    return syncEngine;
+    return hardAssertNonNull(syncEngine, "syncEngine not initialized yet");
   }
 
   public RemoteStore getRemoteStore() {
-    return remoteStore;
+    return hardAssertNonNull(remoteStore, "remoteStore not initialized yet");
   }
 
   public EventManager getEventManager() {
-    return eventManager;
+    return hardAssertNonNull(eventManager, "eventManager not initialized yet");
   }
 
   protected ConnectivityMonitor getConnectivityMonitor() {
-    return connectivityMonitor;
+    return hardAssertNonNull(connectivityMonitor, "connectivityMonitor not initialized yet");
   }
 
   public void initialize(Configuration configuration) {
+    /**
+     * The order in which components are created is important.
+     *
+     * <p>The implementation of abstract createX methods (for example createRemoteStore) will call
+     * the getX methods (for example getLocalStore). Consequently, creating components out of order
+     * will cause createX method to fail because a dependency is null.
+     *
+     * <p>To catch incorrect order, all getX methods have runtime check for null.
+     */
     persistence = createPersistence(configuration);
     persistence.start();
-    indexBackfiller = createIndexBackfiller(configuration);
     localStore = createLocalStore(configuration);
     connectivityMonitor = createConnectivityMonitor(configuration);
     remoteStore = createRemoteStore(configuration);
@@ -146,6 +156,7 @@ public void initialize(Configuration configuration) {
     localStore.start();
     remoteStore.start();
     garbageCollectionScheduler = createGarbageCollectionScheduler(configuration);
+    indexBackfiller = createIndexBackfiller(configuration);
   }
 
   protected abstract Scheduler createGarbageCollectionScheduler(Configuration configuration);
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/CompositeFilter.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/CompositeFilter.java
index 2aba7fcf219..26654f7a1ba 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/CompositeFilter.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/CompositeFilter.java
@@ -17,25 +17,44 @@
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import com.google.firebase.firestore.model.Document;
-import com.google.firebase.firestore.model.FieldPath;
 import com.google.firebase.firestore.util.Function;
-import com.google.firestore.v1.StructuredQuery.CompositeFilter.Operator;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /** Represents a filter that is the conjunction or disjunction of other filters. */
 public class CompositeFilter extends Filter {
+  public enum Operator {
+    AND("and"),
+    OR("or");
+
+    private final String text;
+
+    Operator(String text) {
+      this.text = text;
+    }
+
+    @Override
+    public String toString() {
+      return text;
+    }
+  }
+
   private final List<Filter> filters;
   private final Operator operator;
 
+  // Memoized list of all field filters that can be found by traversing the tree of filters
+  // contained in this composite filter.
+  private List<FieldFilter> memoizedFlattenedFilters;
+
   public CompositeFilter(List<Filter> filters, Operator operator) {
-    this.filters = filters;
+    this.filters = new ArrayList<>(filters);
     this.operator = operator;
   }
 
   @Override
   public List<Filter> getFilters() {
-    return filters;
+    return Collections.unmodifiableList(filters);
   }
 
   public Operator getOperator() {
@@ -44,25 +63,14 @@ public Operator getOperator() {
 
   @Override
   public List<FieldFilter> getFlattenedFilters() {
-    // TODO(orquery): memoize this result if this method is used more than once.
-    List<FieldFilter> result = new ArrayList<>();
-    for (Filter subfilter : filters) {
-      result.addAll(subfilter.getFlattenedFilters());
+    if (memoizedFlattenedFilters != null) {
+      return Collections.unmodifiableList(memoizedFlattenedFilters);
     }
-    return result;
-  }
-
-  /**
-   * Returns the first inequality filter contained within this composite filter. Returns {@code
-   * null} if it does not contain any inequalities.
-   */
-  @Override
-  public FieldPath getFirstInequalityField() {
-    FieldFilter found = findFirstMatchingFilter(f -> f.isInequality());
-    if (found != null) {
-      return found.getField();
+    memoizedFlattenedFilters = new ArrayList<>();
+    for (Filter subfilter : filters) {
+      memoizedFlattenedFilters.addAll(subfilter.getFlattenedFilters());
     }
-    return null;
+    return Collections.unmodifiableList(memoizedFlattenedFilters);
   }
 
   public boolean isConjunction() {
@@ -70,17 +78,20 @@ public boolean isConjunction() {
   }
 
   public boolean isDisjunction() {
-    // TODO(orquery): Replace with Operator.OR.
-    return operator == Operator.OPERATOR_UNSPECIFIED;
+    return operator == Operator.OR;
   }
 
   /**
    * Returns true if this filter is a conjunction of field filters only. Returns false otherwise.
    */
   public boolean isFlatConjunction() {
-    if (operator != Operator.AND) {
-      return false;
-    }
+    return isFlat() && isConjunction();
+  }
+
+  /**
+   * Returns true if this filter does not contain any composite filters. Returns false otherwise.
+   */
+  public boolean isFlat() {
     for (Filter filter : filters) {
       if (filter instanceof CompositeFilter) {
         return false;
@@ -89,6 +100,15 @@ public boolean isFlatConjunction() {
     return true;
   }
 
+  /**
+   * Returns a new composite filter that contains all filter from `this` plus all the given filters.
+   */
+  public CompositeFilter withAddedFilters(List<Filter> otherFilters) {
+    List<Filter> mergedFilters = new ArrayList<>(filters);
+    mergedFilters.addAll(otherFilters);
+    return new CompositeFilter(mergedFilters, operator);
+  }
+
   /**
    * Performs a depth-first search to find and return the first FieldFilter in the composite filter
    * that satisfies the condition. Returns {@code null} if none of the FieldFilters satisfy the
@@ -96,14 +116,9 @@ public boolean isFlatConjunction() {
    */
   @Nullable
   private FieldFilter findFirstMatchingFilter(Function<FieldFilter, Boolean> condition) {
-    for (Filter filter : filters) {
-      if (filter instanceof FieldFilter && condition.apply(((FieldFilter) filter))) {
-        return (FieldFilter) filter;
-      } else if (filter instanceof CompositeFilter) {
-        FieldFilter found = ((CompositeFilter) filter).findFirstMatchingFilter(condition);
-        if (found != null) {
-          return found;
-        }
+    for (FieldFilter filter : getFlattenedFilters()) {
+      if (condition.apply(filter)) {
+        return filter;
       }
     }
     return null;
@@ -132,13 +147,22 @@ public boolean matches(Document doc) {
 
   @Override
   public String getCanonicalId() {
-    // TODO(orquery): Add special case for flat AND filters.
-
-    List<String> canonicalIds = new ArrayList<>();
-    for (Filter filter : filters) canonicalIds.add(filter.getCanonicalId());
     StringBuilder builder = new StringBuilder();
-    builder.append(isConjunction() ? "and(" : "or(");
-    TextUtils.join(",", canonicalIds);
+
+    // Older SDK versions use an implicit AND operation between their filters. In the new SDK
+    // versions, the developer may use an explicit AND filter. To stay consistent with the old
+    // usages, we add a special case to ensure the canonical ID for these two are the same.
+    // For example: `col.whereEquals("a", 1).whereEquals("b", 2)` should have the same canonical ID
+    // as `col.where(and(equals("a",1), equals("b",2)))`.
+    if (isFlatConjunction()) {
+      for (Filter filter : filters) {
+        builder.append(filter.getCanonicalId());
+      }
+      return builder.toString();
+    }
+
+    builder.append(operator.toString() + "(");
+    builder.append(TextUtils.join(",", filters));
     builder.append(")");
     return builder.toString();
   }
@@ -156,7 +180,6 @@ public boolean equals(Object o) {
     CompositeFilter other = (CompositeFilter) o;
     // Note: This comparison requires order of filters in the list to be the same, and it does not
     // remove duplicate subfilters from each composite filter. It is therefore way less expensive.
-    // TODO(orquery): Consider removing duplicates and ignoring order of filters in the list.
     return operator == other.operator && filters.equals(other.filters);
   }
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/EventManager.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/EventManager.java
index 09c77c42d34..afb8c66278a 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/EventManager.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/EventManager.java
@@ -17,6 +17,7 @@
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
 import com.google.firebase.firestore.EventListener;
+import com.google.firebase.firestore.ListenSource;
 import com.google.firebase.firestore.core.SyncEngine.SyncEngineCallback;
 import com.google.firebase.firestore.util.Util;
 import io.grpc.Status;
@@ -41,6 +42,16 @@ private static class QueryListenersInfo {
     QueryListenersInfo() {
       listeners = new ArrayList<>();
     }
+
+    // Helper methods that checks if the query has listeners that listening to remote store
+    boolean hasRemoteListeners() {
+      for (QueryListener listener : listeners) {
+        if (listener.listensToRemoteStore()) {
+          return true;
+        }
+      }
+      return false;
+    }
   }
 
   /** Holds (internal) options for listening */
@@ -53,6 +64,9 @@ public static class ListenOptions {
 
     /** Wait for a sync with the server when online, but still raise events while offline. */
     public boolean waitForSyncWhenOnline;
+
+    /** Sets the source the query listens to. */
+    public ListenSource source = ListenSource.DEFAULT;
   }
 
   private final SyncEngine syncEngine;
@@ -69,6 +83,20 @@ public EventManager(SyncEngine syncEngine) {
     syncEngine.setCallback(this);
   }
 
+  private enum ListenerSetupAction {
+    INITIALIZE_LOCAL_LISTEN_AND_REQUIRE_WATCH_CONNECTION,
+    INITIALIZE_LOCAL_LISTEN_ONLY,
+    REQUIRE_WATCH_CONNECTION_ONLY,
+    NO_ACTION_REQUIRED
+  }
+
+  private enum ListenerRemovalAction {
+    TERMINATE_LOCAL_LISTEN_AND_REQUIRE_WATCH_DISCONNECTION,
+    TERMINATE_LOCAL_LISTEN_ONLY,
+    REQUIRE_WATCH_DISCONNECTION_ONLY,
+    NO_ACTION_REQUIRED
+  }
+
   /**
    * Adds a query listener that will be called with new snapshots for the query. The EventManager is
    * responsible for multiplexing many listeners to a single listen in the SyncEngine and will
@@ -78,12 +106,20 @@ public EventManager(SyncEngine syncEngine) {
    */
   public int addQueryListener(QueryListener queryListener) {
     Query query = queryListener.getQuery();
+    ListenerSetupAction listenerAction = ListenerSetupAction.NO_ACTION_REQUIRED;
 
     QueryListenersInfo queryInfo = queries.get(query);
-    boolean firstListen = queryInfo == null;
-    if (firstListen) {
+    if (queryInfo == null) {
       queryInfo = new QueryListenersInfo();
       queries.put(query, queryInfo);
+      listenerAction =
+          queryListener.listensToRemoteStore()
+              ? ListenerSetupAction.INITIALIZE_LOCAL_LISTEN_AND_REQUIRE_WATCH_CONNECTION
+              : ListenerSetupAction.INITIALIZE_LOCAL_LISTEN_ONLY;
+    } else if (!queryInfo.hasRemoteListeners() && queryListener.listensToRemoteStore()) {
+      // Query has been listening to local cache, and tries to add a new listener sourced from
+      // watch.
+      listenerAction = ListenerSetupAction.REQUIRE_WATCH_CONNECTION_ONLY;
     }
 
     queryInfo.listeners.add(queryListener);
@@ -100,9 +136,28 @@ public int addQueryListener(QueryListener queryListener) {
       }
     }
 
-    if (firstListen) {
-      queryInfo.targetId = syncEngine.listen(query);
+    switch (listenerAction) {
+      case INITIALIZE_LOCAL_LISTEN_AND_REQUIRE_WATCH_CONNECTION:
+        queryInfo.targetId =
+            syncEngine.listen(
+                query,
+                /** shouldListenToRemote= */
+                true);
+        break;
+      case INITIALIZE_LOCAL_LISTEN_ONLY:
+        queryInfo.targetId =
+            syncEngine.listen(
+                query,
+                /** shouldListenToRemote= */
+                false);
+        break;
+      case REQUIRE_WATCH_CONNECTION_ONLY:
+        syncEngine.listenToRemoteStore(query);
+        break;
+      default:
+        break;
     }
+
     return queryInfo.targetId;
   }
 
@@ -110,15 +165,41 @@ public int addQueryListener(QueryListener queryListener) {
   public void removeQueryListener(QueryListener listener) {
     Query query = listener.getQuery();
     QueryListenersInfo queryInfo = queries.get(query);
-    boolean lastListen = false;
-    if (queryInfo != null) {
-      queryInfo.listeners.remove(listener);
-      lastListen = queryInfo.listeners.isEmpty();
+    ListenerRemovalAction listenerAction = ListenerRemovalAction.NO_ACTION_REQUIRED;
+    if (queryInfo == null) return;
+
+    queryInfo.listeners.remove(listener);
+    if (queryInfo.listeners.isEmpty()) {
+      listenerAction =
+          listener.listensToRemoteStore()
+              ? ListenerRemovalAction.TERMINATE_LOCAL_LISTEN_AND_REQUIRE_WATCH_DISCONNECTION
+              : ListenerRemovalAction.TERMINATE_LOCAL_LISTEN_ONLY;
+
+    } else if (!queryInfo.hasRemoteListeners() && listener.listensToRemoteStore()) {
+      // The removed listener is the last one that sourced from watch.
+      listenerAction = ListenerRemovalAction.REQUIRE_WATCH_DISCONNECTION_ONLY;
     }
 
-    if (lastListen) {
-      queries.remove(query);
-      syncEngine.stopListening(query);
+    switch (listenerAction) {
+      case TERMINATE_LOCAL_LISTEN_AND_REQUIRE_WATCH_DISCONNECTION:
+        queries.remove(query);
+        syncEngine.stopListening(
+            query,
+            /** shouldUnlistenToRemote= */
+            true);
+        break;
+      case TERMINATE_LOCAL_LISTEN_ONLY:
+        queries.remove(query);
+        syncEngine.stopListening(
+            query,
+            /** shouldUnlistenToRemote= */
+            false);
+        break;
+      case REQUIRE_WATCH_DISCONNECTION_ONLY:
+        syncEngine.stopListeningToRemoteStore(query);
+        break;
+      default:
+        break;
     }
   }
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/FieldFilter.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/FieldFilter.java
index e57a5369dd7..6ebf26d0718 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/FieldFilter.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/FieldFilter.java
@@ -172,17 +172,9 @@ public List<Filter> getFilters() {
     return Collections.singletonList(this);
   }
 
-  @Override
-  public FieldPath getFirstInequalityField() {
-    if (isInequality()) {
-      return getField();
-    }
-    return null;
-  }
-
   @Override
   public String toString() {
-    return field.canonicalString() + " " + operator + " " + Values.canonicalId(value);
+    return getCanonicalId();
   }
 
   @Override
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Filter.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Filter.java
index b69708f5245..063b994f7a8 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Filter.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Filter.java
@@ -14,9 +14,7 @@
 
 package com.google.firebase.firestore.core;
 
-import androidx.annotation.Nullable;
 import com.google.firebase.firestore.model.Document;
-import com.google.firebase.firestore.model.FieldPath;
 import java.util.List;
 
 public abstract class Filter {
@@ -31,8 +29,4 @@ public abstract class Filter {
 
   /** Returns a list of all filters that are contained within this filter */
   public abstract List<Filter> getFilters();
-
-  /** Returns the field of the first filter that's an inequality, or null if none. */
-  @Nullable
-  public abstract FieldPath getFirstInequalityField();
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/FirestoreClient.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/FirestoreClient.java
index 5554d4f0b43..38b0adef065 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/FirestoreClient.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/FirestoreClient.java
@@ -16,16 +16,19 @@
 
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.firestore.AggregateField;
 import com.google.firebase.firestore.EventListener;
 import com.google.firebase.firestore.FirebaseFirestoreException;
 import com.google.firebase.firestore.FirebaseFirestoreException.Code;
 import com.google.firebase.firestore.FirebaseFirestoreSettings;
 import com.google.firebase.firestore.LoadBundleTask;
+import com.google.firebase.firestore.TransactionOptions;
 import com.google.firebase.firestore.auth.CredentialsProvider;
 import com.google.firebase.firestore.auth.User;
 import com.google.firebase.firestore.bundle.BundleReader;
@@ -48,8 +51,10 @@
 import com.google.firebase.firestore.util.AsyncQueue;
 import com.google.firebase.firestore.util.Function;
 import com.google.firebase.firestore.util.Logger;
+import com.google.firestore.v1.Value;
 import java.io.InputStream;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -187,6 +192,8 @@ public void stopListening(QueryListener listener) {
     asyncQueue.enqueueAndForget(() -> eventManager.removeQueryListener(listener));
   }
 
+  // TODO(b/261013682): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   public Task<Document> getDocumentFromLocalCache(DocumentKey docKey) {
     this.verifyNotTerminated();
     return asyncQueue
@@ -228,10 +235,27 @@ public Task<Void> write(final List<Mutation> mutations) {
   }
 
   /** Tries to execute the transaction in updateFunction. */
-  public <TResult> Task<TResult> transaction(Function<Transaction, Task<TResult>> updateFunction) {
+  public <TResult> Task<TResult> transaction(
+      TransactionOptions options, Function<Transaction, Task<TResult>> updateFunction) {
     this.verifyNotTerminated();
     return AsyncQueue.callTask(
-        asyncQueue.getExecutor(), () -> syncEngine.transaction(asyncQueue, updateFunction));
+        asyncQueue.getExecutor(),
+        () -> syncEngine.transaction(asyncQueue, options, updateFunction));
+  }
+
+  // TODO(b/261013682): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
+  public Task<Map<String, Value>> runAggregateQuery(
+      Query query, List<AggregateField> aggregateFields) {
+    this.verifyNotTerminated();
+    final TaskCompletionSource<Map<String, Value>> result = new TaskCompletionSource<>();
+    asyncQueue.enqueueAndForget(
+        () ->
+            syncEngine
+                .runAggregateQuery(query, aggregateFields)
+                .addOnSuccessListener(data -> result.setResult(data))
+                .addOnFailureListener(e -> result.setException(e)));
+    return result.getTask();
   }
 
   /**
@@ -329,6 +353,16 @@ public Task<Void> configureFieldIndexes(List<FieldIndex> fieldIndices) {
     return asyncQueue.enqueue(() -> localStore.configureFieldIndexes(fieldIndices));
   }
 
+  public void setIndexAutoCreationEnabled(boolean isEnabled) {
+    verifyNotTerminated();
+    asyncQueue.enqueueAndForget(() -> localStore.setIndexAutoCreationEnabled(isEnabled));
+  }
+
+  public void deleteAllFieldIndexes() {
+    verifyNotTerminated();
+    asyncQueue.enqueueAndForget(() -> localStore.deleteAllFieldIndexes());
+  }
+
   public void removeSnapshotsInSyncListener(EventListener<Void> listener) {
     // Checks for shutdown but does not raise error, allowing remove after shutdown to be a no-op.
     if (isTerminated()) {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/KeyFieldFilter.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/KeyFieldFilter.java
index b832533515d..a76072d83a6 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/KeyFieldFilter.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/KeyFieldFilter.java
@@ -22,7 +22,7 @@
 import com.google.firebase.firestore.model.Values;
 import com.google.firestore.v1.Value;
 
-/** Filter that matches on key fields (i.e. '__name__'). */
+/** Filter that matches on key fields (specifically, '__name__'). */
 public class KeyFieldFilter extends FieldFilter {
   private final DocumentKey key;
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/MemoryComponentProvider.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/MemoryComponentProvider.java
index 29de7912e86..fc8180b6937 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/MemoryComponentProvider.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/MemoryComponentProvider.java
@@ -16,8 +16,13 @@
 
 import androidx.annotation.Nullable;
 import com.google.firebase.database.collection.ImmutableSortedSet;
+import com.google.firebase.firestore.FirebaseFirestoreSettings;
+import com.google.firebase.firestore.MemoryCacheSettings;
+import com.google.firebase.firestore.MemoryLruGcSettings;
 import com.google.firebase.firestore.local.IndexBackfiller;
+import com.google.firebase.firestore.local.LocalSerializer;
 import com.google.firebase.firestore.local.LocalStore;
+import com.google.firebase.firestore.local.LruGarbageCollector;
 import com.google.firebase.firestore.local.MemoryPersistence;
 import com.google.firebase.firestore.local.Persistence;
 import com.google.firebase.firestore.local.QueryEngine;
@@ -26,6 +31,7 @@
 import com.google.firebase.firestore.model.mutation.MutationBatchResult;
 import com.google.firebase.firestore.remote.AndroidConnectivityMonitor;
 import com.google.firebase.firestore.remote.RemoteEvent;
+import com.google.firebase.firestore.remote.RemoteSerializer;
 import com.google.firebase.firestore.remote.RemoteStore;
 import io.grpc.Status;
 
@@ -54,8 +60,7 @@ protected EventManager createEventManager(Configuration configuration) {
 
   @Override
   protected LocalStore createLocalStore(Configuration configuration) {
-    return new LocalStore(
-        getPersistence(), getIndexBackfiller(), new QueryEngine(), configuration.getInitialUser());
+    return new LocalStore(getPersistence(), new QueryEngine(), configuration.getInitialUser());
   }
 
   @Override
@@ -63,8 +68,28 @@ protected AndroidConnectivityMonitor createConnectivityMonitor(Configuration con
     return new AndroidConnectivityMonitor(configuration.getContext());
   }
 
+  private boolean isMemoryLruGcEnabled(FirebaseFirestoreSettings settings) {
+    if (settings.getCacheSettings() != null
+        && settings.getCacheSettings() instanceof MemoryCacheSettings) {
+      MemoryCacheSettings memorySettings = (MemoryCacheSettings) settings.getCacheSettings();
+      return memorySettings.getGarbageCollectorSettings() instanceof MemoryLruGcSettings;
+    }
+
+    return false;
+  }
+
   @Override
   protected Persistence createPersistence(Configuration configuration) {
+    if (isMemoryLruGcEnabled(configuration.getSettings())) {
+      LocalSerializer serializer =
+          new LocalSerializer(
+              new RemoteSerializer(configuration.getDatabaseInfo().getDatabaseId()));
+      LruGarbageCollector.Params params =
+          LruGarbageCollector.Params.WithCacheSizeBytes(
+              configuration.getSettings().getCacheSizeBytes());
+      return MemoryPersistence.createLruGcMemoryPersistence(params, serializer);
+    }
+
     return MemoryPersistence.createEagerGcMemoryPersistence();
   }
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/OnlineState.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/OnlineState.java
index 1ae75ea31af..bfc60361d97 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/OnlineState.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/OnlineState.java
@@ -17,14 +17,14 @@
 /**
  * Describes the online state of the Firestore client. Note that this does not indicate whether or
  * not the remote store is trying to connect or not. This is primarily used by the View /
- * EventManager code to change their behavior while offline (e.g. get() calls shouldn't wait for
- * data from the server and snapshot events should set metadata.isFromCache=true).
+ * EventManager code to change their behavior while offline (for example get() calls shouldn't wait
+ * for data from the server and snapshot events should set metadata.isFromCache=true).
  */
 public enum OnlineState {
   /**
    * The Firestore client is in an unknown online state. This means the client is either not
    * actively trying to establish a connection or it is currently trying to establish a connection,
-   * but it has not succeeded or failed yet. Higher-level components (e.g. Views and the
+   * but it has not succeeded or failed yet. Higher-level components (for example Views and the
    * EventManager) should likely operate in online mode, waiting until they receive a definitive
    * OFFLINE notification before reverting to cache data, etc.
    */
@@ -39,8 +39,8 @@ public enum OnlineState {
 
   /**
    * The client is either trying to establish a connection but failing, or it has been explicitly
-   * marked offline via a call to disableNetwork(). Higher-level components (e.g. Views and the
-   * EventManager) should operate in offline mode.
+   * marked offline via a call to disableNetwork(). Higher-level components (for example Views and
+   * the EventManager) should operate in offline mode.
    */
   OFFLINE
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Query.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Query.java
index 896e8292cdb..52be465b0ba 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Query.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Query.java
@@ -22,12 +22,13 @@
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.FieldPath;
 import com.google.firebase.firestore.model.ResourcePath;
-import com.google.firebase.firestore.util.Assert;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 /**
  * Encapsulates all the query attributes we support in the SDK. It can be run against the
@@ -57,11 +58,18 @@ public static Query atPath(ResourcePath path) {
 
   private final List<OrderBy> explicitSortOrder;
 
-  private List<OrderBy> memoizedOrderBy;
+  private List<OrderBy> memoizedNormalizedOrderBys;
 
-  // The corresponding Target of this Query instance.
+  /** The corresponding `Target` of this `Query` instance, for use with non-aggregate queries. */
   private @Nullable Target memoizedTarget;
 
+  /**
+   * The corresponding `Target` of this `Query` instance, for use with aggregate queries. Unlike
+   * targets for non-aggregate queries, aggregate query targets do not contain normalized order-bys,
+   * they only contain explicit order-bys.
+   */
+  private @Nullable Target memoizedAggregateTarget;
+
   private final List<Filter> filters;
 
   private final ResourcePath path;
@@ -139,7 +147,8 @@ public boolean matchesAllDocuments() {
         && startAt == null
         && endAt == null
         && (getExplicitOrderBy().isEmpty()
-            || (getExplicitOrderBy().size() == 1 && getFirstOrderByField().isKeyField()));
+            || (getExplicitOrderBy().size() == 1
+                && getExplicitOrderBy().get(0).field.isKeyField()));
   }
 
   /** The filters on the documents returned by the query. */
@@ -147,34 +156,16 @@ public List<Filter> getFilters() {
     return filters;
   }
 
-  /**
-   * The maximum number of results to return. If there is no limit on the query, then this will
-   * cause an assertion failure.
-   */
-  public long getLimitToFirst() {
-    hardAssert(hasLimitToFirst(), "Called getLimitToFirst when no limit was set");
-    return limit;
-  }
-
-  public boolean hasLimitToFirst() {
-    return limitType == LimitType.LIMIT_TO_FIRST && limit != Target.NO_LIMIT;
-  }
-
-  /**
-   * The maximum number of last-matching results to return. If there is no limit on the query, then
-   * this will cause an assertion failure.
-   */
-  public long getLimitToLast() {
-    hardAssert(hasLimitToLast(), "Called getLimitToLast when no limit was set");
+  /** The maximum number of results to return or {@link Target#NO_LIMIT} if there is no limit. */
+  public long getLimit() {
     return limit;
   }
 
-  public boolean hasLimitToLast() {
-    return limitType == LimitType.LIMIT_TO_LAST && limit != Target.NO_LIMIT;
+  public boolean hasLimit() {
+    return limit != Target.NO_LIMIT;
   }
 
   public LimitType getLimitType() {
-    hardAssert(hasLimitToLast() || hasLimitToFirst(), "Called getLimitType when no limit was set");
     return limitType;
   }
 
@@ -188,24 +179,19 @@ public LimitType getLimitType() {
     return endAt;
   }
 
-  /** Returns the first field in an order-by constraint, or null if none. */
-  public FieldPath getFirstOrderByField() {
-    if (explicitSortOrder.isEmpty()) {
-      return null;
-    }
-    return explicitSortOrder.get(0).getField();
-  }
+  /** Returns the sorted set of inequality filter fields used in this query. */
+  public SortedSet<FieldPath> getInequalityFilterFields() {
+    SortedSet<FieldPath> result = new TreeSet<FieldPath>();
 
-  /** Returns the field of the first filter on this Query that's an inequality, or null if none. */
-  @Nullable
-  public FieldPath inequalityField() {
-    for (Filter filter : filters) {
-      FieldPath result = filter.getFirstInequalityField();
-      if (result != null) {
-        return result;
+    for (Filter filter : getFilters()) {
+      for (FieldFilter subFilter : filter.getFlattenedFilters()) {
+        if (subFilter.isInequality()) {
+          result.add(subFilter.getField());
+        }
       }
     }
-    return null;
+
+    return result;
   }
 
   /**
@@ -216,19 +202,6 @@ public FieldPath inequalityField() {
    */
   public Query filter(Filter filter) {
     hardAssert(!isDocumentQuery(), "No filter is allowed for document query");
-    FieldPath newInequalityField = filter.getFirstInequalityField();
-    FieldPath queryInequalityField = inequalityField();
-    Assert.hardAssert(
-        queryInequalityField == null
-            || newInequalityField == null
-            || queryInequalityField.equals(newInequalityField),
-        "Query must only have one inequality field");
-
-    Assert.hardAssert(
-        explicitSortOrder.isEmpty()
-            || newInequalityField == null
-            || explicitSortOrder.get(0).field.equals(newInequalityField),
-        "First orderBy must match inequality field");
 
     List<Filter> updatedFilter = new ArrayList<>(filters);
     updatedFilter.add(filter);
@@ -244,12 +217,7 @@ public Query filter(Filter filter) {
    */
   public Query orderBy(OrderBy order) {
     hardAssert(!isDocumentQuery(), "No ordering is allowed for document query");
-    if (explicitSortOrder.isEmpty()) {
-      FieldPath inequality = inequalityField();
-      if (inequality != null && !inequality.equals(order.field)) {
-        throw Assert.fail("First orderBy must match inequality field");
-      }
-    }
+
     List<OrderBy> updatedSortOrder = new ArrayList<>(explicitSortOrder);
     updatedSortOrder.add(order);
     return new Query(
@@ -343,47 +311,52 @@ public List<OrderBy> getExplicitOrderBy() {
   }
 
   /**
-   * Returns the full list of ordering constraints on the query.
+   * Returns the full list of ordering constraints on the query. This might include additional sort
+   * orders added implicitly to match the backend behavior.
    *
-   * <p>This might include additional sort orders added implicitly to match the backend behavior.
+   * <p>This method is marked as synchronized because it modifies the internal state in some cases.
+   *
+   * <p>The returned list is unmodifiable, to prevent ConcurrentModificationExceptions, if one
+   * thread is iterating the list and one thread is modifying the list.
    */
-  public List<OrderBy> getOrderBy() {
-    if (memoizedOrderBy == null) {
-      FieldPath inequalityField = inequalityField();
-      FieldPath firstOrderByField = getFirstOrderByField();
-      if (inequalityField != null && firstOrderByField == null) {
-        // In order to implicitly add key ordering, we must also add the inequality filter field for
-        // it to be a valid query. Note that the default inequality field and key ordering is
-        // ascending.
-        if (inequalityField.isKeyField()) {
-          this.memoizedOrderBy = Collections.singletonList(KEY_ORDERING_ASC);
-        } else {
-          memoizedOrderBy =
-              Arrays.asList(
-                  OrderBy.getInstance(Direction.ASCENDING, inequalityField), KEY_ORDERING_ASC);
-        }
-      } else {
-        List<OrderBy> res = new ArrayList<>();
-        boolean foundKeyOrdering = false;
-        for (OrderBy explicit : explicitSortOrder) {
-          res.add(explicit);
-          if (explicit.getField().equals(FieldPath.KEY_PATH)) {
-            foundKeyOrdering = true;
-          }
-        }
-        if (!foundKeyOrdering) {
-          // The direction of the implicit key ordering always matches the direction of the last
-          // explicit sort order
-          Direction lastDirection =
-              explicitSortOrder.size() > 0
-                  ? explicitSortOrder.get(explicitSortOrder.size() - 1).getDirection()
-                  : Direction.ASCENDING;
-          res.add(lastDirection.equals(Direction.ASCENDING) ? KEY_ORDERING_ASC : KEY_ORDERING_DESC);
+  public synchronized List<OrderBy> getNormalizedOrderBy() {
+    if (memoizedNormalizedOrderBys == null) {
+      List<OrderBy> res = new ArrayList<>();
+      HashSet<String> fieldsNormalized = new HashSet<String>();
+
+      /** Any explicit order by fields should be added as is. */
+      for (OrderBy explicit : explicitSortOrder) {
+        res.add(explicit);
+        fieldsNormalized.add(explicit.field.canonicalString());
+      }
+
+      /** The order of the implicit ordering always matches the last explicit order by. */
+      Direction lastDirection =
+          explicitSortOrder.size() > 0
+              ? explicitSortOrder.get(explicitSortOrder.size() - 1).getDirection()
+              : Direction.ASCENDING;
+
+      /**
+       * Any inequality fields not explicitly ordered should be implicitly ordered in a
+       * lexicographical order. When there are multiple inequality filters on the same field, the
+       * field should be added only once. Note: `SortedSet<FieldPath>` sorts the key field before
+       * other fields. However, we want the key field to be sorted last.
+       */
+      SortedSet<FieldPath> inequalityFields = getInequalityFilterFields();
+      for (FieldPath field : inequalityFields) {
+        if (!fieldsNormalized.contains(field.canonicalString()) && !field.isKeyField()) {
+          res.add(OrderBy.getInstance(lastDirection, field));
         }
-        memoizedOrderBy = res;
       }
+
+      /** Add the document key field to the last if it is not explicitly ordered. */
+      if (!fieldsNormalized.contains(FieldPath.KEY_PATH.canonicalString())) {
+        res.add(lastDirection.equals(Direction.ASCENDING) ? KEY_ORDERING_ASC : KEY_ORDERING_DESC);
+      }
+
+      memoizedNormalizedOrderBys = Collections.unmodifiableList(res);
     }
-    return memoizedOrderBy;
+    return memoizedNormalizedOrderBys;
   }
 
   private boolean matchesPathAndCollectionGroup(Document doc) {
@@ -410,7 +383,14 @@ private boolean matchesFilters(Document doc) {
 
   /** A document must have a value for every ordering clause in order to show up in the results. */
   private boolean matchesOrderBy(Document doc) {
-    for (OrderBy order : explicitSortOrder) {
+    // We must use `getNormalizedOrderBy()` to get the list of all orderBys (both implicit and
+    // explicit).
+    // Note that for OR queries, orderBy applies to all disjunction terms and implicit orderBys must
+    // be taken into account. For example, the query "a > 1 || b==1" has an implicit "orderBy a" due
+    // to the inequality, and is evaluated as "a > 1 orderBy a || b==1 orderBy a".
+    // A document with content of {b:1} matches the filters, but does not match the orderBy because
+    // it's missing the field 'a'.
+    for (OrderBy order : getNormalizedOrderBy()) {
       // order by key always matches
       if (!order.getField().equals(FieldPath.KEY_PATH) && (doc.getField(order.field) == null)) {
         return false;
@@ -421,10 +401,10 @@ private boolean matchesOrderBy(Document doc) {
 
   /** Makes sure a document is within the bounds, if provided. */
   private boolean matchesBounds(Document doc) {
-    if (startAt != null && !startAt.sortsBeforeDocument(getOrderBy(), doc)) {
+    if (startAt != null && !startAt.sortsBeforeDocument(getNormalizedOrderBy(), doc)) {
       return false;
     }
-    if (endAt != null && !endAt.sortsAfterDocument(getOrderBy(), doc)) {
+    if (endAt != null && !endAt.sortsAfterDocument(getNormalizedOrderBy(), doc)) {
       return false;
     }
     return true;
@@ -441,7 +421,7 @@ && matchesFilters(doc)
 
   /** Returns a comparator that will sort documents according to this Query's sort order. */
   public Comparator<Document> comparator() {
-    return new QueryComparator(getOrderBy());
+    return new QueryComparator(getNormalizedOrderBy());
   }
 
   private static class QueryComparator implements Comparator<Document> {
@@ -470,63 +450,69 @@ public int compare(Document doc1, Document doc2) {
     }
   }
 
-  /** @return A {@code Target} instance this query will be mapped to in backend and local store. */
-  public Target toTarget() {
+  /**
+   * This method is marked as synchronized because it modifies the internal state in some cases.
+   *
+   * @return A {@code Target} instance this query will be mapped to in backend and local store.
+   */
+  public synchronized Target toTarget() {
     if (this.memoizedTarget == null) {
-      if (this.limitType == LimitType.LIMIT_TO_FIRST) {
-        this.memoizedTarget =
-            new Target(
-                this.getPath(),
-                this.getCollectionGroup(),
-                this.getFilters(),
-                this.getOrderBy(),
-                this.limit,
-                this.getStartAt(),
-                this.getEndAt());
-      } else {
-        // Flip the orderBy directions since we want the last results
-        ArrayList<OrderBy> newOrderBy = new ArrayList<>();
-        for (OrderBy orderBy : this.getOrderBy()) {
-          Direction dir =
-              orderBy.getDirection() == Direction.DESCENDING
-                  ? Direction.ASCENDING
-                  : Direction.DESCENDING;
-          newOrderBy.add(OrderBy.getInstance(dir, orderBy.getField()));
-        }
-
-        // We need to swap the cursors to match the now-flipped query ordering.
-        Bound newStartAt =
-            this.endAt != null
-                ? new Bound(this.endAt.getPosition(), !this.endAt.isInclusive())
-                : null;
-        Bound newEndAt =
-            this.startAt != null
-                ? new Bound(this.startAt.getPosition(), !this.startAt.isInclusive())
-                : null;
-
-        this.memoizedTarget =
-            new Target(
-                this.getPath(),
-                this.getCollectionGroup(),
-                this.getFilters(),
-                newOrderBy,
-                this.limit,
-                newStartAt,
-                newEndAt);
-      }
+      memoizedTarget = toTarget(getNormalizedOrderBy());
     }
-
     return this.memoizedTarget;
   }
 
-  /** Returns true if the query contains any composite filters (AND/OR). Returns false otherwise. */
-  public boolean containsCompositeFilters() {
-    for (Filter filter : filters) {
-      if (filter instanceof CompositeFilter) {
-        return true;
+  private synchronized Target toTarget(List<OrderBy> orderBys) {
+    if (this.limitType == LimitType.LIMIT_TO_FIRST) {
+      return new Target(
+          this.getPath(),
+          this.getCollectionGroup(),
+          this.getFilters(),
+          orderBys,
+          this.limit,
+          this.getStartAt(),
+          this.getEndAt());
+    } else {
+      // Flip the orderBy directions since we want the last results
+      ArrayList<OrderBy> newOrderBy = new ArrayList<>();
+      for (OrderBy orderBy : orderBys) {
+        Direction dir =
+            orderBy.getDirection() == Direction.DESCENDING
+                ? Direction.ASCENDING
+                : Direction.DESCENDING;
+        newOrderBy.add(OrderBy.getInstance(dir, orderBy.getField()));
       }
+
+      // We need to swap the cursors to match the now-flipped query ordering.
+      Bound newStartAt =
+          this.endAt != null ? new Bound(this.endAt.getPosition(), this.endAt.isInclusive()) : null;
+      Bound newEndAt =
+          this.startAt != null
+              ? new Bound(this.startAt.getPosition(), this.startAt.isInclusive())
+              : null;
+
+      return new Target(
+          this.getPath(),
+          this.getCollectionGroup(),
+          this.getFilters(),
+          newOrderBy,
+          this.limit,
+          newStartAt,
+          newEndAt);
+    }
+  }
+
+  /**
+   * This method is marked as synchronized because it modifies the internal state in some cases.
+   *
+   * @return A {@code Target} instance this query will be mapped to in backend and local store, for
+   *     use within an aggregate query.
+   */
+  public synchronized Target toAggregateTarget() {
+    if (this.memoizedAggregateTarget == null) {
+      memoizedAggregateTarget = toTarget(explicitSortOrder);
     }
-    return false;
+    return this.memoizedAggregateTarget;
   }
 
   /**
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/QueryListener.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/QueryListener.java
index b5201cfda43..045fe43119c 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/QueryListener.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/QueryListener.java
@@ -19,6 +19,7 @@
 import androidx.annotation.Nullable;
 import com.google.firebase.firestore.EventListener;
 import com.google.firebase.firestore.FirebaseFirestoreException;
+import com.google.firebase.firestore.ListenSource;
 import com.google.firebase.firestore.core.DocumentViewChange.Type;
 import java.util.ArrayList;
 import java.util.List;
@@ -39,8 +40,8 @@ public class QueryListener {
   private final EventListener<ViewSnapshot> listener;
 
   /**
-   * Initial snapshots (e.g. from cache) may not be propagated to the wrapped observer. This flag is
-   * set to true once we've actually raised an event.
+   * Initial snapshots (from cache for example) may not be propagated to the wrapped observer. This
+   * flag is set to true once we've actually raised an event.
    */
   private boolean raisedInitialEvent = false;
 
@@ -59,6 +60,15 @@ public Query getQuery() {
     return query;
   }
 
+  public boolean listensToRemoteStore() {
+    if (options != null) {
+      return !options.source.equals(ListenSource.CACHE);
+    }
+    // While not set, source should be default to ListenSource.DEFAULT, which listens to remote
+    // store.
+    return true;
+  }
+
   /**
    * Applies the new ViewSnapshot to this listener, raising a user-facing event if applicable
    * (depending on what changed, whether the user has opted into metadata-only changes, etc.).
@@ -87,7 +97,8 @@ public boolean onViewSnapshot(ViewSnapshot newSnapshot) {
               newSnapshot.isFromCache(),
               newSnapshot.getMutatedKeys(),
               newSnapshot.didSyncStateChange(),
-              /* excludesMetadataChanges= */ true);
+              /* excludesMetadataChanges= */ true,
+              newSnapshot.hasCachedResults());
     }
 
     if (!raisedInitialEvent) {
@@ -129,6 +140,11 @@ private boolean shouldRaiseInitialEvent(ViewSnapshot snapshot, OnlineState onlin
       return true;
     }
 
+    // Always raise event if listening to cache
+    if (!this.listensToRemoteStore()) {
+      return true;
+    }
+
     // NOTE: We consider OnlineState.UNKNOWN as online (it should become OFFLINE
     // or ONLINE if we wait long enough).
     boolean maybeOnline = !onlineState.equals(OnlineState.OFFLINE);
@@ -139,8 +155,11 @@ private boolean shouldRaiseInitialEvent(ViewSnapshot snapshot, OnlineState onlin
       return false;
     }
 
-    // Raise data from cache if we have any documents or we are offline
-    return !snapshot.getDocuments().isEmpty() || onlineState.equals(OnlineState.OFFLINE);
+    // Raise data from cache if we have any documents, have cached results before,
+    // or we are offline.
+    return (!snapshot.getDocuments().isEmpty()
+        || snapshot.hasCachedResults()
+        || onlineState.equals(OnlineState.OFFLINE));
   }
 
   private boolean shouldRaiseEvent(ViewSnapshot snapshot) {
@@ -171,7 +190,8 @@ private void raiseInitialEvent(ViewSnapshot snapshot) {
             snapshot.getDocuments(),
             snapshot.getMutatedKeys(),
             snapshot.isFromCache(),
-            snapshot.excludesMetadataChanges());
+            snapshot.excludesMetadataChanges(),
+            snapshot.hasCachedResults());
     raisedInitialEvent = true;
     listener.onEvent(snapshot, null);
   }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/SQLiteComponentProvider.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/SQLiteComponentProvider.java
index 02eccc63776..e77d3a64a29 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/SQLiteComponentProvider.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/SQLiteComponentProvider.java
@@ -35,7 +35,7 @@ protected Scheduler createGarbageCollectionScheduler(Configuration configuration
 
   @Override
   protected IndexBackfiller createIndexBackfiller(Configuration configuration) {
-    return new IndexBackfiller(getPersistence(), configuration.getAsyncQueue());
+    return new IndexBackfiller(getPersistence(), configuration.getAsyncQueue(), getLocalStore());
   }
 
   @Override
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/SyncEngine.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/SyncEngine.java
index f51d1e88062..e113cc06c8d 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/SyncEngine.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/SyncEngine.java
@@ -23,9 +23,11 @@
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.database.collection.ImmutableSortedMap;
 import com.google.firebase.database.collection.ImmutableSortedSet;
+import com.google.firebase.firestore.AggregateField;
 import com.google.firebase.firestore.FirebaseFirestoreException;
 import com.google.firebase.firestore.LoadBundleTask;
 import com.google.firebase.firestore.LoadBundleTaskProgress;
+import com.google.firebase.firestore.TransactionOptions;
 import com.google.firebase.firestore.auth.User;
 import com.google.firebase.firestore.bundle.BundleElement;
 import com.google.firebase.firestore.bundle.BundleLoader;
@@ -53,6 +55,8 @@
 import com.google.firebase.firestore.util.Function;
 import com.google.firebase.firestore.util.Logger;
 import com.google.firebase.firestore.util.Util;
+import com.google.firestore.v1.Value;
+import com.google.protobuf.ByteString;
 import io.grpc.Status;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -191,25 +195,31 @@ private void assertCallback(String method) {
 
   /**
    * Initiates a new listen. The LocalStore will be queried for initial data and the listen will be
-   * sent to the RemoteStore to get remote data. The registered SyncEngineCallback will be notified
-   * of resulting view snapshots and/or listen errors.
+   * sent to the RemoteStore if the query is listening to watch. The registered SyncEngineCallback
+   * will be notified of resulting view snapshots and/or listen errors.
    *
    * @return the target ID assigned to the query.
    */
-  public int listen(Query query) {
+  public int listen(Query query, boolean shouldListenToRemote) {
     assertCallback("listen");
     hardAssert(!queryViewsByQuery.containsKey(query), "We already listen to query: %s", query);
 
     TargetData targetData = localStore.allocateTarget(query.toTarget());
-    remoteStore.listen(targetData);
 
-    ViewSnapshot viewSnapshot = initializeViewAndComputeSnapshot(query, targetData.getTargetId());
+    ViewSnapshot viewSnapshot =
+        initializeViewAndComputeSnapshot(
+            query, targetData.getTargetId(), targetData.getResumeToken());
     syncEngineListener.onViewSnapshots(Collections.singletonList(viewSnapshot));
 
+    if (shouldListenToRemote) {
+      remoteStore.listen(targetData);
+    }
+
     return targetData.getTargetId();
   }
 
-  private ViewSnapshot initializeViewAndComputeSnapshot(Query query, int targetId) {
+  private ViewSnapshot initializeViewAndComputeSnapshot(
+      Query query, int targetId, ByteString resumeToken) {
     QueryResult queryResult = localStore.executeQuery(query, /* usePreviousResults= */ true);
 
     SyncState currentTargetSyncState = SyncState.NONE;
@@ -220,10 +230,10 @@ private ViewSnapshot initializeViewAndComputeSnapshot(Query query, int targetId)
     if (this.queriesByTarget.get(targetId) != null) {
       Query mirrorQuery = this.queriesByTarget.get(targetId).get(0);
       currentTargetSyncState = this.queryViewsByQuery.get(mirrorQuery).getView().getSyncState();
-      synthesizedCurrentChange =
-          TargetChange.createSynthesizedTargetChangeForCurrentChange(
-              currentTargetSyncState == SyncState.SYNCED);
     }
+    synthesizedCurrentChange =
+        TargetChange.createSynthesizedTargetChangeForCurrentChange(
+            currentTargetSyncState == SyncState.SYNCED, resumeToken);
 
     // TODO(wuandy): Investigate if we can extract the logic of view change computation and
     // update tracked limbo in one place, and have both emitNewSnapsAndNotifyLocalStore
@@ -246,8 +256,24 @@ private ViewSnapshot initializeViewAndComputeSnapshot(Query query, int targetId)
     return viewChange.getSnapshot();
   }
 
-  /** Stops listening to a query previously listened to via listen. */
-  void stopListening(Query query) {
+  /**
+   * Sends the listen to the RemoteStore to get remote data. Invoked when a Query starts listening
+   * to the remote store, while already listening to the cache.
+   */
+  public void listenToRemoteStore(Query query) {
+    assertCallback("listenToRemoteStore");
+    hardAssert(
+        queryViewsByQuery.containsKey(query), "This is the first listen to query: %s", query);
+
+    TargetData targetData = localStore.allocateTarget(query.toTarget());
+    remoteStore.listen(targetData);
+  }
+
+  /**
+   * Stops listening to a query previously listened. Un-listen to remote store if there is a watch
+   * connection established and stayed open.
+   */
+  void stopListening(Query query, boolean shouldUnlistenToRemote) {
     assertCallback("stopListening");
 
     QueryView queryView = queryViewsByQuery.get(query);
@@ -261,11 +287,31 @@ void stopListening(Query query) {
 
     if (targetQueries.isEmpty()) {
       localStore.releaseTarget(targetId);
-      remoteStore.stopListening(targetId);
+      if (shouldUnlistenToRemote) {
+        remoteStore.stopListening(targetId);
+      }
       removeAndCleanupTarget(targetId, Status.OK);
     }
   }
 
+  /**
+   * Stops listening to a query from watch. Invoked when a Query stops listening to the remote
+   * store, while still listening to the cache.
+   */
+  void stopListeningToRemoteStore(Query query) {
+    assertCallback("stopListeningToRemoteStore");
+    QueryView queryView = queryViewsByQuery.get(query);
+    hardAssert(queryView != null, "Trying to stop listening to a query not found");
+
+    int targetId = queryView.getTargetId();
+    List<Query> targetQueries = queriesByTarget.get(targetId);
+    targetQueries.remove(query);
+
+    if (targetQueries.isEmpty()) {
+      remoteStore.stopListening(targetId);
+    }
+  }
+
   /**
    * Initiates the write of local mutation batch which involves adding the writes to the mutation
    * queue, notifying the remote store about new mutations, and raising events for any changes this
@@ -307,8 +353,15 @@ private void addUserCallback(int batchId, TaskCompletionSource<Void> userTask) {
    * <p>The Task returned is resolved when the transaction is fully committed.
    */
   public <TResult> Task<TResult> transaction(
-      AsyncQueue asyncQueue, Function<Transaction, Task<TResult>> updateFunction) {
-    return new TransactionRunner<TResult>(asyncQueue, remoteStore, updateFunction).run();
+      AsyncQueue asyncQueue,
+      TransactionOptions options,
+      Function<Transaction, Task<TResult>> updateFunction) {
+    return new TransactionRunner<TResult>(asyncQueue, remoteStore, options, updateFunction).run();
+  }
+
+  public Task<Map<String, Value>> runAggregateQuery(
+      Query query, List<AggregateField> aggregateFields) {
+    return remoteStore.runAggregateQuery(query, aggregateFields);
   }
 
   /** Called by FirestoreClient to notify us of a new remote event. */
@@ -416,7 +469,7 @@ public void handleRejectedListen(int targetId, Status error) {
           new RemoteEvent(
               SnapshotVersion.NONE,
               /* targetChanges= */ Collections.emptyMap(),
-              /* targetMismatches= */ Collections.emptySet(),
+              /* targetMismatches= */ Collections.emptyMap(),
               documentUpdates,
               limboDocuments);
       handleRemoteEvent(event);
@@ -638,7 +691,13 @@ private void emitNewSnapsAndNotifyLocalStore(
       }
       TargetChange targetChange =
           remoteEvent == null ? null : remoteEvent.getTargetChanges().get(queryView.getTargetId());
-      ViewChange viewChange = queryView.getView().applyChanges(viewDocChanges, targetChange);
+
+      boolean targetIsPendingReset =
+          remoteEvent != null
+              && remoteEvent.getTargetMismatches().get(queryView.getTargetId()) != null;
+
+      ViewChange viewChange =
+          queryView.getView().applyChanges(viewDocChanges, targetChange, targetIsPendingReset);
       updateTrackedLimboDocuments(viewChange.getLimboChanges(), queryView.getTargetId());
 
       if (viewChange.getSnapshot() != null) {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Target.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Target.java
index 40d2ba9188a..6554380f659 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Target.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Target.java
@@ -14,10 +14,16 @@
 
 package com.google.firebase.firestore.core;
 
-import static com.google.firebase.firestore.model.Values.max;
-import static com.google.firebase.firestore.model.Values.min;
-
+import static com.google.firebase.firestore.core.FieldFilter.Operator.ARRAY_CONTAINS;
+import static com.google.firebase.firestore.core.FieldFilter.Operator.ARRAY_CONTAINS_ANY;
+import static com.google.firebase.firestore.model.Values.MAX_VALUE;
+import static com.google.firebase.firestore.model.Values.MIN_VALUE;
+import static com.google.firebase.firestore.model.Values.lowerBoundCompare;
+import static com.google.firebase.firestore.model.Values.upperBoundCompare;
+
+import android.util.Pair;
 import androidx.annotation.Nullable;
+import com.google.firebase.firestore.core.OrderBy.Direction;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.FieldIndex;
 import com.google.firebase.firestore.model.FieldPath;
@@ -27,8 +33,10 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Set;
 
 /**
  * A Target represents the WatchTarget representation of a Query, which is used by the LocalStore
@@ -160,7 +168,7 @@ private List<FieldFilter> getFieldFiltersForPath(FieldPath path) {
           case EQUAL:
           case IN:
             // Encode equality prefix, which is encoded in the index value before the inequality
-            // (e.g. `a == 'a' && b != 'b'` is encoded to `value != 'ab'`).
+            // (for example `a == 'a' && b != 'b'` is encoded to `value != 'ab'`).
             values.put(segment.getFieldPath(), fieldFilter.getValue());
             break;
           case NOT_IN:
@@ -176,74 +184,21 @@ private List<FieldFilter> getFieldFiltersForPath(FieldPath path) {
 
   /**
    * Returns a lower bound of field values that can be used as a starting point to scan the index
-   * defined by {@code fieldIndex}. Returns {@code null} if no lower bound exists.
+   * defined by {@code fieldIndex}. Returns {@link Values#MIN_VALUE} if no lower bound exists.
    */
-  @Nullable
   public Bound getLowerBound(FieldIndex fieldIndex) {
     List<Value> values = new ArrayList<>();
     boolean inclusive = true;
 
     // For each segment, retrieve a lower bound if there is a suitable filter or startAt.
     for (FieldIndex.Segment segment : fieldIndex.getDirectionalSegments()) {
-      Value segmentValue = null;
-      boolean segmentInclusive = true;
-
-      // Process all filters to find a value for the current field segment
-      for (FieldFilter fieldFilter : getFieldFiltersForPath(segment.getFieldPath())) {
-        Value filterValue = null;
-        boolean filterInclusive = true;
-
-        switch (fieldFilter.getOperator()) {
-          case LESS_THAN:
-          case LESS_THAN_OR_EQUAL:
-            filterValue = Values.getLowerBound(fieldFilter.getValue().getValueTypeCase());
-            break;
-          case EQUAL:
-          case IN:
-          case GREATER_THAN_OR_EQUAL:
-            filterValue = fieldFilter.getValue();
-            break;
-          case GREATER_THAN:
-            filterValue = fieldFilter.getValue();
-            filterInclusive = false;
-            break;
-          case NOT_EQUAL:
-          case NOT_IN:
-            filterValue = Values.MIN_VALUE;
-            break;
-          default:
-            // Remaining filters cannot be used as lower bounds.
-        }
-
-        if (max(segmentValue, filterValue) == filterValue) {
-          segmentValue = filterValue;
-          segmentInclusive = filterInclusive;
-        }
-      }
-
-      // If there is a startAt bound, compare the values against the existing boundary to see
-      // if we can narrow the scope.
-      if (startAt != null) {
-        for (int i = 0; i < orderBys.size(); ++i) {
-          OrderBy orderBy = this.orderBys.get(i);
-          if (orderBy.getField().equals(segment.getFieldPath())) {
-            Value cursorValue = startAt.getPosition().get(i);
-            if (max(segmentValue, cursorValue) == cursorValue) {
-              segmentValue = cursorValue;
-              segmentInclusive = startAt.isInclusive();
-            }
-            break;
-          }
-        }
-      }
+      Pair<Value, Boolean> segmentBound =
+          segment.getKind().equals(FieldIndex.Segment.Kind.ASCENDING)
+              ? getAscendingBound(segment, startAt)
+              : getDescendingBound(segment, startAt);
 
-      if (segmentValue == null) {
-        // No lower bound exists
-        return null;
-      }
-
-      values.add(segmentValue);
-      inclusive &= segmentInclusive;
+      values.add(segmentBound.first);
+      inclusive &= segmentBound.second;
     }
 
     return new Bound(values, inclusive);
@@ -251,83 +206,197 @@ public Bound getLowerBound(FieldIndex fieldIndex) {
 
   /**
    * Returns an upper bound of field values that can be used as an ending point when scanning the
-   * index defined by {@code fieldIndex}. Returns {@code null} if no upper bound exists.
+   * index defined by {@code fieldIndex}. Returns {@link Values#MAX_VALUE} if no upper bound exists.
    */
-  public @Nullable Bound getUpperBound(FieldIndex fieldIndex) {
+  public Bound getUpperBound(FieldIndex fieldIndex) {
     List<Value> values = new ArrayList<>();
     boolean inclusive = true;
 
     // For each segment, retrieve an upper bound if there is a suitable filter or endAt.
     for (FieldIndex.Segment segment : fieldIndex.getDirectionalSegments()) {
-      @Nullable Value segmentValue = null;
-      boolean segmentInclusive = true;
+      Pair<Value, Boolean> segmentBound =
+          segment.getKind().equals(FieldIndex.Segment.Kind.ASCENDING)
+              ? getDescendingBound(segment, endAt)
+              : getAscendingBound(segment, endAt);
 
-      // Process all filters to find a value for the current field segment
-      for (FieldFilter fieldFilter : getFieldFiltersForPath(segment.getFieldPath())) {
-        Value filterValue = null;
-        boolean filterInclusive = true;
+      values.add(segmentBound.first);
+      inclusive &= segmentBound.second;
+    }
 
-        switch (fieldFilter.getOperator()) {
-          case GREATER_THAN_OR_EQUAL:
-          case GREATER_THAN:
-            filterValue = Values.getUpperBound(fieldFilter.getValue().getValueTypeCase());
-            filterInclusive = false;
-            break;
-          case EQUAL:
-          case IN:
-          case LESS_THAN_OR_EQUAL:
-            filterValue = fieldFilter.getValue();
-            break;
-          case LESS_THAN:
-            filterValue = fieldFilter.getValue();
-            filterInclusive = false;
-            break;
-          case NOT_EQUAL:
-          case NOT_IN:
-            filterValue = Values.MAX_VALUE;
-            break;
-          default:
-            // Remaining filters cannot be used as upper bounds.
-        }
+    return new Bound(values, inclusive);
+  }
 
-        if (min(segmentValue, filterValue) == filterValue) {
-          segmentValue = filterValue;
-          segmentInclusive = filterInclusive;
-        }
+  /**
+   * Returns the value for an ascending bound of `segment`.
+   *
+   * @param segment The segment to get the value for.
+   * @param bound A bound to restrict the index range.
+   * @return a Pair with a nullable Value and a boolean indicating whether the bound is inclusive
+   */
+  private Pair<Value, Boolean> getAscendingBound(
+      FieldIndex.Segment segment, @Nullable Bound bound) {
+    Value segmentValue = MIN_VALUE;
+    boolean segmentInclusive = true;
+
+    // Process all filters to find a value for the current field segment
+    for (FieldFilter fieldFilter : getFieldFiltersForPath(segment.getFieldPath())) {
+      Value filterValue = MIN_VALUE;
+      boolean filterInclusive = true;
+
+      switch (fieldFilter.getOperator()) {
+        case LESS_THAN:
+        case LESS_THAN_OR_EQUAL:
+          filterValue = Values.getLowerBound(fieldFilter.getValue().getValueTypeCase());
+          break;
+        case EQUAL:
+        case IN:
+        case GREATER_THAN_OR_EQUAL:
+          filterValue = fieldFilter.getValue();
+          break;
+        case GREATER_THAN:
+          filterValue = fieldFilter.getValue();
+          filterInclusive = false;
+          break;
+        case NOT_EQUAL:
+        case NOT_IN:
+          filterValue = Values.MIN_VALUE;
+          break;
+        default:
+          // Remaining filters cannot be used as bound.
       }
 
-      // If there is an endAt bound, compare the values against the existing boundary to see
-      // if we can narrow the scope.
-      if (endAt != null) {
-        for (int i = 0; i < orderBys.size(); ++i) {
-          OrderBy orderBy = this.orderBys.get(i);
-          if (orderBy.getField().equals(segment.getFieldPath())) {
-            Value cursorValue = endAt.getPosition().get(i);
-            if (min(segmentValue, cursorValue) == cursorValue) {
-              segmentValue = cursorValue;
-              segmentInclusive = endAt.isInclusive();
-            }
-            break;
+      if (lowerBoundCompare(segmentValue, segmentInclusive, filterValue, filterInclusive) < 0) {
+        segmentValue = filterValue;
+        segmentInclusive = filterInclusive;
+      }
+    }
+
+    // If there is an additional bound, compare the values against the existing range to see if we
+    // can narrow the scope.
+    if (bound != null) {
+      for (int i = 0; i < orderBys.size(); ++i) {
+        OrderBy orderBy = this.orderBys.get(i);
+        if (orderBy.getField().equals(segment.getFieldPath())) {
+          Value cursorValue = bound.getPosition().get(i);
+          if (lowerBoundCompare(segmentValue, segmentInclusive, cursorValue, bound.isInclusive())
+              < 0) {
+            segmentValue = cursorValue;
+            segmentInclusive = bound.isInclusive();
           }
+          break;
         }
       }
+    }
+
+    return new Pair<>(segmentValue, segmentInclusive);
+  }
+
+  /**
+   * Returns the value for a descending bound of `segment`.
+   *
+   * @param segment The segment to get the value for.
+   * @param bound A bound to restrict the index range.
+   * @return a Pair with a nullable Value and a boolean indicating whether the bound is inclusive
+   */
+  private Pair<Value, Boolean> getDescendingBound(
+      FieldIndex.Segment segment, @Nullable Bound bound) {
+    Value segmentValue = MAX_VALUE;
+    boolean segmentInclusive = true;
 
-      if (segmentValue == null) {
-        // No upper bound exists
-        return null;
+    // Process all filters to find a value for the current field segment
+    for (FieldFilter fieldFilter : getFieldFiltersForPath(segment.getFieldPath())) {
+      Value filterValue = MAX_VALUE;
+      boolean filterInclusive = true;
+
+      switch (fieldFilter.getOperator()) {
+        case GREATER_THAN_OR_EQUAL:
+        case GREATER_THAN:
+          filterValue = Values.getUpperBound(fieldFilter.getValue().getValueTypeCase());
+          filterInclusive = false;
+          break;
+        case EQUAL:
+        case IN:
+        case LESS_THAN_OR_EQUAL:
+          filterValue = fieldFilter.getValue();
+          break;
+        case LESS_THAN:
+          filterValue = fieldFilter.getValue();
+          filterInclusive = false;
+          break;
+        case NOT_EQUAL:
+        case NOT_IN:
+          filterValue = Values.MAX_VALUE;
+          break;
+        default:
+          // Remaining filters cannot be used as bound.
       }
 
-      values.add(segmentValue);
-      inclusive &= segmentInclusive;
+      if (upperBoundCompare(segmentValue, segmentInclusive, filterValue, filterInclusive) > 0) {
+        segmentValue = filterValue;
+        segmentInclusive = filterInclusive;
+      }
     }
 
-    return new Bound(values, inclusive);
+    // If there is an additional bound, compare the values against the existing range to see if we
+    // can narrow the scope.
+    if (bound != null) {
+      for (int i = 0; i < orderBys.size(); ++i) {
+        OrderBy orderBy = this.orderBys.get(i);
+        if (orderBy.getField().equals(segment.getFieldPath())) {
+          Value cursorValue = bound.getPosition().get(i);
+          if (upperBoundCompare(segmentValue, segmentInclusive, cursorValue, bound.isInclusive())
+              > 0) {
+            segmentValue = cursorValue;
+            segmentInclusive = bound.isInclusive();
+          }
+          break;
+        }
+      }
+    }
+
+    return new Pair<>(segmentValue, segmentInclusive);
   }
 
   public List<OrderBy> getOrderBy() {
     return this.orderBys;
   }
 
+  /** Returns the order of the document key component. */
+  public Direction getKeyOrder() {
+    return this.orderBys.get(this.orderBys.size() - 1).getDirection();
+  }
+
+  /** Returns the number of segments of a perfect index for this target. */
+  public int getSegmentCount() {
+    Set<FieldPath> fields = new HashSet<>();
+    boolean hasArraySegment = false;
+    for (Filter filter : filters) {
+      for (FieldFilter subFilter : filter.getFlattenedFilters()) {
+        // __name__ is not an explicit segment of any index, so we don't need to count it.
+        if (subFilter.getField().isKeyField()) {
+          continue;
+        }
+
+        // ARRAY_CONTAINS or ARRAY_CONTAINS_ANY filters must be counted separately. For instance,
+        // it is possible to have an index for "a ARRAY a ASC". Even though these are on the same
+        // field, they should be counted as two separate segments in an index.
+        if (subFilter.getOperator().equals(ARRAY_CONTAINS)
+            || subFilter.getOperator().equals(ARRAY_CONTAINS_ANY)) {
+          hasArraySegment = true;
+        } else {
+          fields.add(subFilter.getField());
+        }
+      }
+    }
+    for (OrderBy orderBy : orderBys) {
+      // __name__ is not an explicit segment of any index, so we don't need to count it.
+      if (!orderBy.getField().isKeyField()) {
+        fields.add(orderBy.getField());
+      }
+    }
+    return fields.size() + (hasArraySegment ? 1 : 0);
+  }
+
   /** Returns a canonical string representing this target. */
   public String getCanonicalId() {
     if (memoizedCanonicalId != null) {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Transaction.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Transaction.java
index 4a2cdbc3321..42c62125dd1 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Transaction.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/Transaction.java
@@ -17,6 +17,7 @@
 import static com.google.firebase.firestore.util.Assert.fail;
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
+import android.annotation.SuppressLint;
 import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
@@ -162,6 +163,9 @@ private static Executor createDefaultExecutor() {
     int maxPoolSize = corePoolSize;
     int keepAliveSeconds = 1;
     LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
+
+    // TODO(b/258277574): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     ThreadPoolExecutor executor =
         new ThreadPoolExecutor(
             corePoolSize, maxPoolSize, keepAliveSeconds, TimeUnit.SECONDS, queue);
@@ -199,7 +203,11 @@ private void recordVersion(MutableDocument doc) throws FirebaseFirestoreExceptio
   private Precondition precondition(DocumentKey key) {
     @Nullable SnapshotVersion version = readVersions.get(key);
     if (!writtenDocs.contains(key) && version != null) {
-      return Precondition.updateTime(version);
+      if (version.equals(SnapshotVersion.NONE)) {
+        return Precondition.exists(false);
+      } else {
+        return Precondition.updateTime(version);
+      }
     } else {
       return Precondition.NONE;
     }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/TransactionRunner.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/TransactionRunner.java
index 7dd50b36ca4..28db0e6902e 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/TransactionRunner.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/TransactionRunner.java
@@ -18,6 +18,7 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.firestore.FirebaseFirestoreException;
+import com.google.firebase.firestore.TransactionOptions;
 import com.google.firebase.firestore.remote.Datastore;
 import com.google.firebase.firestore.remote.RemoteStore;
 import com.google.firebase.firestore.util.AsyncQueue;
@@ -27,7 +28,6 @@
 
 /** TransactionRunner encapsulates the logic needed to run and retry transactions with backoff. */
 public class TransactionRunner<TResult> {
-  public static final int DEFAULT_MAX_ATTEMPTS_COUNT = 5;
   private AsyncQueue asyncQueue;
   private RemoteStore remoteStore;
   private Function<Transaction, Task<TResult>> updateFunction;
@@ -39,12 +39,13 @@ public class TransactionRunner<TResult> {
   public TransactionRunner(
       AsyncQueue asyncQueue,
       RemoteStore remoteStore,
+      TransactionOptions options,
       Function<Transaction, Task<TResult>> updateFunction) {
 
     this.asyncQueue = asyncQueue;
     this.remoteStore = remoteStore;
     this.updateFunction = updateFunction;
-    this.attemptsRemaining = DEFAULT_MAX_ATTEMPTS_COUNT;
+    this.attemptsRemaining = options.getMaxAttempts();
 
     backoff = new ExponentialBackoff(asyncQueue, TimerId.RETRY_TRANSACTION);
   }
@@ -94,10 +95,12 @@ private void handleTransactionError(Task task) {
 
   private static boolean isRetryableTransactionError(Exception e) {
     if (e instanceof FirebaseFirestoreException) {
-      // In transactions, the backend will fail outdated reads with FAILED_PRECONDITION and
-      // non-matching document versions with ABORTED. These errors should be retried.
+      // In transactions, the backend will fail outdated reads with FAILED_PRECONDITION,
+      // non-matching document versions with ABORTED, and attempts to create already exists with
+      // ALREADY_EXISTS. These errors should be retried.
       FirebaseFirestoreException.Code code = ((FirebaseFirestoreException) e).getCode();
       return code == FirebaseFirestoreException.Code.ABORTED
+          || code == FirebaseFirestoreException.Code.ALREADY_EXISTS
           || code == FirebaseFirestoreException.Code.FAILED_PRECONDITION
           || !Datastore.isPermanentError(((FirebaseFirestoreException) e).getCode());
     }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/UserData.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/UserData.java
index 187d0087cb6..ee8a5c97b85 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/UserData.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/UserData.java
@@ -53,8 +53,8 @@ public enum Source {
      */
     Argument,
     /**
-     * Indicates that the source is an Argument that may directly contain nested arrays (e.g. the
-     * operand of a `whereIn` query).
+     * Indicates that the source is an Argument that may directly contain nested arrays (for example
+     * the operand of a `whereIn` query).
      */
     ArrayArgument
   }
@@ -321,7 +321,7 @@ private void validatePathSegment(String segment) {
     }
   }
 
-  /** The result of parsing document data (e.g. for a setData call). */
+  /** The result of parsing document data (like from a setData call). */
   public static class ParsedSetData {
     private final ObjectValue data;
     @Nullable private final FieldMask fieldMask;
@@ -356,7 +356,7 @@ public Mutation toMutation(DocumentKey key, Precondition precondition) {
     }
   }
 
-  /** The result of parsing "update" data (i.e. for an updateData call). */
+  /** The result of parsing "update" data (specifically, for an updateData call). */
   public static class ParsedUpdateData {
     private final ObjectValue data;
     // The fieldMask does not include document transforms.
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/View.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/View.java
index 07469903a60..cd5db8495f5 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/View.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/View.java
@@ -14,6 +14,8 @@
 
 package com.google.firebase.firestore.core;
 
+import static com.google.firebase.firestore.core.Query.LimitType.LIMIT_TO_FIRST;
+import static com.google.firebase.firestore.core.Query.LimitType.LIMIT_TO_LAST;
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 import static com.google.firebase.firestore.util.Util.compareIntegers;
 
@@ -76,7 +78,7 @@ public boolean needsRefill() {
   /**
    * A flag whether the view is current with the backend. A view is considered current after it has
    * seen the current flag from the backend and did not lose consistency within the watch stream
-   * (e.g. because of an existence filter mismatch).
+   * (for example because of an existence filter mismatch).
    */
   private boolean current;
 
@@ -147,11 +149,11 @@ public DocumentChanges computeDocChanges(
     // Note that this should never get used in a refill (when previousChanges is set), because there
     // will only be adds -- no deletes or updates.
     Document lastDocInLimit =
-        (query.hasLimitToFirst() && oldDocumentSet.size() == query.getLimitToFirst())
+        (query.getLimitType().equals(LIMIT_TO_FIRST) && oldDocumentSet.size() == query.getLimit())
             ? oldDocumentSet.getLastDocument()
             : null;
     Document firstDocInLimit =
-        (query.hasLimitToLast() && oldDocumentSet.size() == query.getLimitToLast())
+        (query.getLimitType().equals(LIMIT_TO_LAST) && oldDocumentSet.size() == query.getLimit())
             ? oldDocumentSet.getFirstDocument()
             : null;
 
@@ -222,11 +224,10 @@ public DocumentChanges computeDocChanges(
     }
 
     // Drop documents out to meet limitToFirst/limitToLast requirement.
-    if (query.hasLimitToFirst() || query.hasLimitToLast()) {
-      long limit = query.hasLimitToFirst() ? query.getLimitToFirst() : query.getLimitToLast();
-      for (long i = newDocumentSet.size() - limit; i > 0; --i) {
+    if (query.hasLimit()) {
+      for (long i = newDocumentSet.size() - query.getLimit(); i > 0; --i) {
         Document oldDoc =
-            query.hasLimitToFirst()
+            query.getLimitType().equals(LIMIT_TO_FIRST)
                 ? newDocumentSet.getLastDocument()
                 : newDocumentSet.getFirstDocument();
         newDocumentSet = newDocumentSet.remove(oldDoc.getKey());
@@ -244,11 +245,11 @@ public DocumentChanges computeDocChanges(
 
   private boolean shouldWaitForSyncedDocument(Document oldDoc, Document newDoc) {
     // We suppress the initial change event for documents that were modified as part of a write
-    // acknowledgment (e.g. when the value of a server transform is applied) as Watch will send us
-    // the same document again. By suppressing the event, we only raise two user visible events (one
-    // with `hasPendingWrites` and the final state of the document) instead of three (one with
-    // `hasPendingWrites`, the modified document with `hasPendingWrites` and the final state of the
-    // document).
+    // acknowledgment (for example when the value of a server transform is applied) as Watch will
+    // send us the same document again. By suppressing the event, we only raise two user visible
+    // events (one with `hasPendingWrites` and the final state of the document) instead of three
+    // (one with `hasPendingWrites`, the modified document with `hasPendingWrites` and the final
+    // state of the document).
     return (oldDoc.hasLocalMutations()
         && newDoc.hasCommittedMutations()
         && !newDoc.hasLocalMutations());
@@ -274,6 +275,21 @@ public ViewChange applyChanges(DocumentChanges docChanges) {
    * @return A new ViewChange with the given docs, changes, and sync state.
    */
   public ViewChange applyChanges(DocumentChanges docChanges, TargetChange targetChange) {
+    return applyChanges(docChanges, targetChange, false);
+  }
+
+  /**
+   * Updates the view with the given ViewDocumentChanges and updates limbo docs and sync state from
+   * the given (optional) target change.
+   *
+   * @param docChanges The set of changes to make to the view's docs.
+   * @param targetChange A target change to apply for computing limbo docs and sync state.
+   * @param targetIsPendingReset - Whether the target is pending to reset due to existence filter
+   *     mismatch. If not explicitly specified, it is treated equivalently to `false`.
+   * @return A new ViewChange with the given docs, changes, and sync state.
+   */
+  public ViewChange applyChanges(
+      DocumentChanges docChanges, TargetChange targetChange, boolean targetIsPendingReset) {
     hardAssert(!docChanges.needsRefill, "Cannot apply changes that need a refill");
 
     DocumentSet oldDocumentSet = documentSet;
@@ -286,21 +302,27 @@ public ViewChange applyChanges(DocumentChanges docChanges, TargetChange targetCh
         viewChanges,
         (DocumentViewChange o1, DocumentViewChange o2) -> {
           int typeComp = compareIntegers(View.changeTypeOrder(o1), View.changeTypeOrder(o2));
-          o1.getType().compareTo(o2.getType());
           if (typeComp != 0) {
             return typeComp;
           }
           return query.comparator().compare(o1.getDocument(), o2.getDocument());
         });
     applyTargetChange(targetChange);
-    List<LimboDocumentChange> limboDocumentChanges = updateLimboDocuments();
-    boolean synced = limboDocuments.size() == 0 && current;
+    List<LimboDocumentChange> limboDocumentChanges =
+        targetIsPendingReset ? Collections.emptyList() : updateLimboDocuments();
+
+    // We are at synced state if there is no limbo docs are waiting to be resolved, view is current
+    // with the backend, and the query is not pending to reset due to existence filter mismatch.
+    boolean synced = limboDocuments.size() == 0 && current && !targetIsPendingReset;
     SyncState newSyncState = synced ? SyncState.SYNCED : SyncState.LOCAL;
     boolean syncStatedChanged = newSyncState != syncState;
     syncState = newSyncState;
     ViewSnapshot snapshot = null;
+
     if (viewChanges.size() != 0 || syncStatedChanged) {
       boolean fromCache = newSyncState == SyncState.LOCAL;
+      boolean hasCachedResults =
+          targetChange == null ? false : !targetChange.getResumeToken().isEmpty();
       snapshot =
           new ViewSnapshot(
               query,
@@ -310,7 +332,8 @@ public ViewChange applyChanges(DocumentChanges docChanges, TargetChange targetCh
               fromCache,
               docChanges.mutatedKeys,
               syncStatedChanged,
-              /* excludesMetadataChanges= */ false);
+              /* excludesMetadataChanges= */ false,
+              hasCachedResults);
     }
     return new ViewChange(snapshot, limboDocumentChanges);
   }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/ViewSnapshot.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/ViewSnapshot.java
index 1e05a3d8e98..2741815c1d4 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/ViewSnapshot.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/ViewSnapshot.java
@@ -39,6 +39,7 @@ public enum SyncState {
   private final ImmutableSortedSet<DocumentKey> mutatedKeys;
   private final boolean didSyncStateChange;
   private boolean excludesMetadataChanges;
+  private boolean hasCachedResults;
 
   public ViewSnapshot(
       Query query,
@@ -48,7 +49,8 @@ public ViewSnapshot(
       boolean isFromCache,
       ImmutableSortedSet<DocumentKey> mutatedKeys,
       boolean didSyncStateChange,
-      boolean excludesMetadataChanges) {
+      boolean excludesMetadataChanges,
+      boolean hasCachedResults) {
     this.query = query;
     this.documents = documents;
     this.oldDocuments = oldDocuments;
@@ -57,6 +59,7 @@ public ViewSnapshot(
     this.mutatedKeys = mutatedKeys;
     this.didSyncStateChange = didSyncStateChange;
     this.excludesMetadataChanges = excludesMetadataChanges;
+    this.hasCachedResults = hasCachedResults;
   }
 
   /** Returns a view snapshot as if all documents in the snapshot were added. */
@@ -65,7 +68,8 @@ public static ViewSnapshot fromInitialDocuments(
       DocumentSet documents,
       ImmutableSortedSet<DocumentKey> mutatedKeys,
       boolean fromCache,
-      boolean excludesMetadataChanges) {
+      boolean excludesMetadataChanges,
+      boolean hasCachedResults) {
     List<DocumentViewChange> viewChanges = new ArrayList<>();
     for (Document doc : documents) {
       viewChanges.add(DocumentViewChange.create(DocumentViewChange.Type.ADDED, doc));
@@ -78,7 +82,8 @@ public static ViewSnapshot fromInitialDocuments(
         fromCache,
         mutatedKeys,
         /* didSyncStateChange= */ true,
-        excludesMetadataChanges);
+        excludesMetadataChanges,
+        hasCachedResults);
   }
 
   public Query getQuery() {
@@ -117,6 +122,10 @@ public boolean excludesMetadataChanges() {
     return excludesMetadataChanges;
   }
 
+  public boolean hasCachedResults() {
+    return hasCachedResults;
+  }
+
   @Override
   public final boolean equals(Object o) {
     if (this == o) {
@@ -149,6 +158,9 @@ public final boolean equals(Object o) {
     if (!oldDocuments.equals(that.oldDocuments)) {
       return false;
     }
+    if (hasCachedResults != that.hasCachedResults) {
+      return false;
+    }
     return changes.equals(that.changes);
   }
 
@@ -162,6 +174,7 @@ public int hashCode() {
     result = 31 * result + (isFromCache ? 1 : 0);
     result = 31 * result + (didSyncStateChange ? 1 : 0);
     result = 31 * result + (excludesMetadataChanges ? 1 : 0);
+    result = 31 * result + (hasCachedResults ? 1 : 0);
     return result;
   }
 
@@ -183,6 +196,8 @@ public String toString() {
         + didSyncStateChange
         + ", excludesMetadataChanges="
         + excludesMetadataChanges
+        + ", hasCachedResults="
+        + hasCachedResults
         + ")";
   }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/ktx/Firestore.kt b/firebase-firestore/src/main/java/com/google/firebase/firestore/ktx/Firestore.kt
new file mode 100644
index 00000000000..b27ecda6764
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/ktx/Firestore.kt
@@ -0,0 +1,493 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.firestore.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.firestore.DocumentReference
+import com.google.firebase.firestore.DocumentSnapshot
+import com.google.firebase.firestore.EventListener
+import com.google.firebase.firestore.FieldPath
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.FirebaseFirestoreSettings
+import com.google.firebase.firestore.MemoryCacheSettings
+import com.google.firebase.firestore.MemoryEagerGcSettings
+import com.google.firebase.firestore.MemoryLruGcSettings
+import com.google.firebase.firestore.MetadataChanges
+import com.google.firebase.firestore.PersistentCacheSettings
+import com.google.firebase.firestore.Query
+import com.google.firebase.firestore.QueryDocumentSnapshot
+import com.google.firebase.firestore.QuerySnapshot
+import com.google.firebase.firestore.util.Executors.BACKGROUND_EXECUTOR
+import com.google.firebase.ktx.Firebase
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.trySendBlocking
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.map
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseFirestore] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.firestore: FirebaseFirestore
+  get() = FirebaseFirestore.getInstance()
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseFirestore] instance of a given [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.firestore(app: FirebaseApp): FirebaseFirestore = FirebaseFirestore.getInstance(app)
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseFirestore] instance of a given [FirebaseApp] and database name.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.firestore(app: FirebaseApp, database: String): FirebaseFirestore =
+  FirebaseFirestore.getInstance(app, database)
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseFirestore] instance of the default [FirebaseApp], given the database name.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.firestore(database: String): FirebaseFirestore =
+  FirebaseFirestore.getInstance(database)
+
+/**
+ * Returns the contents of the document converted to a POJO or null if the document doesn't exist.
+ *
+ * @param T The type of the object to create.
+ * @return The contents of the document in an object of type T or null if the document doesn't
+ * ```
+ *     exist.
+ * ```
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T> DocumentSnapshot.toObject(): T? = toObject(T::class.java)
+
+/**
+ * Returns the contents of the document converted to a POJO or null if the document doesn't exist.
+ *
+ * @param T The type of the object to create.
+ * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
+ * ```
+ *     been set to their final value.
+ * @return
+ * ```
+ * The contents of the document in an object of type T or null if the document doesn't
+ * ```
+ *     exist.
+ * ```
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T> DocumentSnapshot.toObject(
+  serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
+): T? = toObject(T::class.java, serverTimestampBehavior)
+
+/**
+ * Returns the value at the field, converted to a POJO, or null if the field or document doesn't
+ * exist.
+ *
+ * @param field The path to the field.
+ * @param T The type to convert the field value to.
+ * @return The value at the given field or null.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T> DocumentSnapshot.getField(field: String): T? = get(field, T::class.java)
+
+/**
+ * Returns the value at the field, converted to a POJO, or null if the field or document doesn't
+ * exist.
+ *
+ * @param field The path to the field.
+ * @param T The type to convert the field value to.
+ * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
+ * ```
+ *     been set to their final value.
+ * @return
+ * ```
+ * The value at the given field or null.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T> DocumentSnapshot.getField(
+  field: String,
+  serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
+): T? = get(field, T::class.java, serverTimestampBehavior)
+
+/**
+ * Returns the value at the field, converted to a POJO, or null if the field or document doesn't
+ * exist.
+ *
+ * @param fieldPath The path to the field.
+ * @param T The type to convert the field value to.
+ * @return The value at the given field or null.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T> DocumentSnapshot.getField(fieldPath: FieldPath): T? =
+  get(fieldPath, T::class.java)
+
+/**
+ * Returns the value at the field, converted to a POJO, or null if the field or document doesn't
+ * exist.
+ *
+ * @param fieldPath The path to the field.
+ * @param T The type to convert the field value to.
+ * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
+ * ```
+ *     been set to their final value.
+ * @return
+ * ```
+ * The value at the given field or null.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T> DocumentSnapshot.getField(
+  fieldPath: FieldPath,
+  serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
+): T? = get(fieldPath, T::class.java, serverTimestampBehavior)
+
+/**
+ * Returns the contents of the document converted to a POJO.
+ *
+ * @param T The type of the object to create.
+ * @return The contents of the document in an object of type T.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T : Any> QueryDocumentSnapshot.toObject(): T = toObject(T::class.java)
+
+/**
+ * Returns the contents of the document converted to a POJO.
+ *
+ * @param T The type of the object to create.
+ * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
+ * ```
+ *     been set to their final value.
+ * @return
+ * ```
+ * The contents of the document in an object of type T.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T : Any> QueryDocumentSnapshot.toObject(
+  serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
+): T = toObject(T::class.java, serverTimestampBehavior)
+
+/**
+ * Returns the contents of the documents in the QuerySnapshot, converted to the provided class, as a
+ * list.
+ *
+ * @param T The POJO type used to convert the documents in the list.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T : Any> QuerySnapshot.toObjects(): List<T> = toObjects(T::class.java)
+
+/**
+ * Returns the contents of the documents in the QuerySnapshot, converted to the provided class, as a
+ * list.
+ *
+ * @param T The POJO type used to convert the documents in the list.
+ * @param serverTimestampBehavior Configures the behavior for server timestamps that have not yet
+ * ```
+ *     been set to their final value.
+ * ```
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T : Any> QuerySnapshot.toObjects(
+  serverTimestampBehavior: DocumentSnapshot.ServerTimestampBehavior
+): List<T> = toObjects(T::class.java, serverTimestampBehavior)
+
+/**
+ * Returns a [FirebaseFirestoreSettings] instance initialized using the [init] function.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun firestoreSettings(
+  init: FirebaseFirestoreSettings.Builder.() -> Unit
+): FirebaseFirestoreSettings {
+  val builder = FirebaseFirestoreSettings.Builder()
+  builder.init()
+  return builder.build()
+}
+
+fun memoryCacheSettings(init: MemoryCacheSettings.Builder.() -> Unit): MemoryCacheSettings {
+  val builder = MemoryCacheSettings.newBuilder()
+  builder.init()
+  return builder.build()
+}
+
+fun memoryEagerGcSettings(init: MemoryEagerGcSettings.Builder.() -> Unit): MemoryEagerGcSettings {
+  val builder = MemoryEagerGcSettings.newBuilder()
+  builder.init()
+  return builder.build()
+}
+
+fun memoryLruGcSettings(init: MemoryLruGcSettings.Builder.() -> Unit): MemoryLruGcSettings {
+  val builder = MemoryLruGcSettings.newBuilder()
+  builder.init()
+  return builder.build()
+}
+
+fun persistentCacheSettings(
+  init: PersistentCacheSettings.Builder.() -> Unit
+): PersistentCacheSettings {
+  val builder = PersistentCacheSettings.newBuilder()
+  builder.init()
+  return builder.build()
+}
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+@Keep
+class FirebaseFirestoreKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
+
+/**
+ * Starts listening to the document referenced by this `DocumentReference` with the given options
+ * and emits its values via a [Flow].
+ *
+ * - When the returned flow starts being collected, an [EventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ *
+ * @param metadataChanges controls metadata-only changes. Default: [MetadataChanges.EXCLUDE]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated("com.google.firebase.fires", ReplaceWith(""))
+fun DocumentReference.snapshots(
+  metadataChanges: MetadataChanges = MetadataChanges.EXCLUDE
+): Flow<DocumentSnapshot> {
+  return callbackFlow {
+    val registration =
+      addSnapshotListener(BACKGROUND_EXECUTOR, metadataChanges) { snapshot, exception ->
+        if (exception != null) {
+          cancel(message = "Error getting DocumentReference snapshot", cause = exception)
+        } else if (snapshot != null) {
+          trySendBlocking(snapshot)
+        }
+      }
+    awaitClose { registration.remove() }
+  }
+}
+
+/**
+ * Starts listening to this query with the given options and emits its values via a [Flow].
+ *
+ * - When the returned flow starts being collected, an [EventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ *
+ * @param metadataChanges controls metadata-only changes. Default: [MetadataChanges.EXCLUDE]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun Query.snapshots(
+  metadataChanges: MetadataChanges = MetadataChanges.EXCLUDE
+): Flow<QuerySnapshot> {
+  return callbackFlow {
+    val registration =
+      addSnapshotListener(BACKGROUND_EXECUTOR, metadataChanges) { snapshot, exception ->
+        if (exception != null) {
+          cancel(message = "Error getting Query snapshot", cause = exception)
+        } else if (snapshot != null) {
+          trySendBlocking(snapshot)
+        }
+      }
+    awaitClose { registration.remove() }
+  }
+}
+
+/**
+ * Starts listening to this query with the given options and emits its values converted to a POJO
+ * via a [Flow].
+ *
+ * - When the returned flow starts being collected, an [EventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ *
+ * @param metadataChanges controls metadata-only changes. Default: [MetadataChanges.EXCLUDE]
+ * @param T The type of the object to convert to.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T : Any> Query.dataObjects(
+  metadataChanges: MetadataChanges = MetadataChanges.EXCLUDE
+): Flow<List<T>> = snapshots(metadataChanges).map { it.toObjects(T::class.java) }
+
+/**
+ * Starts listening to the document referenced by this `DocumentReference` with the given options
+ * and emits its values converted to a POJO via a [Flow].
+ *
+ * - When the returned flow starts being collected, an [EventListener] will be attached.
+ * - When the flow completes, the listener will be removed.
+ *
+ * @param metadataChanges controls metadata-only changes. Default: [MetadataChanges.EXCLUDE]
+ * @param T The type of the object to convert to.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-database-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <reified T : Any> DocumentReference.dataObjects(
+  metadataChanges: MetadataChanges = MetadataChanges.EXCLUDE
+): Flow<T?> = snapshots(metadataChanges).map { it.toObject(T::class.java) }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/EncodedPath.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/EncodedPath.java
index 59b66905b9e..e88dcc5e099 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/EncodedPath.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/EncodedPath.java
@@ -62,9 +62,9 @@
  * <p>This encoding leaves some room between path separators and the NUL byte just in case we decide
  * to support integer document ids after all.
  *
- * <p>Note that characters treated specially by the backend (e.g. '.', '/', and '~') are not treated
- * specially here. This class assumes that any unescaping of path strings into actual Path objects
- * will handle these characters there.
+ * <p>Note that characters treated specially by the backend (for example '.', '/', and '~') are not
+ * treated specially here. This class assumes that any unescaping of path strings into actual Path
+ * objects will handle these characters there.
  */
 final class EncodedPath {
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/IndexBackfiller.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/IndexBackfiller.java
index 49b8155a891..b4e499b0e2f 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/IndexBackfiller.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/IndexBackfiller.java
@@ -14,10 +14,9 @@
 
 package com.google.firebase.firestore.local;
 
-import static com.google.firebase.firestore.util.Assert.hardAssert;
-
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import com.google.common.base.Supplier;
 import com.google.firebase.firestore.model.Document;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.FieldIndex.IndexOffset;
@@ -41,25 +40,30 @@ public class IndexBackfiller {
 
   private final Scheduler scheduler;
   private final Persistence persistence;
-  private LocalDocumentsView localDocumentsView;
-  private IndexManager indexManager;
+  private final Supplier<IndexManager> indexManagerOfCurrentUser;
+  private final Supplier<LocalDocumentsView> localDocumentsViewOfCurrentUser;
   private int maxDocumentsToProcess = MAX_DOCUMENTS_TO_PROCESS;
 
-  public IndexBackfiller(Persistence persistence, AsyncQueue asyncQueue) {
-    this.persistence = persistence;
-    this.scheduler = new Scheduler(asyncQueue);
+  public IndexBackfiller(Persistence persistence, AsyncQueue asyncQueue, LocalStore localStore) {
+    this(
+        persistence,
+        asyncQueue,
+        localStore::getIndexManagerForCurrentUser,
+        localStore::getLocalDocumentsForCurrentUser);
   }
 
-  public void setLocalDocumentsView(LocalDocumentsView localDocumentsView) {
-    this.localDocumentsView = localDocumentsView;
-  }
-
-  public void setIndexManager(IndexManager indexManager) {
-    this.indexManager = indexManager;
+  public IndexBackfiller(
+      Persistence persistence,
+      AsyncQueue asyncQueue,
+      Supplier<IndexManager> indexManagerOfCurrentUser,
+      Supplier<LocalDocumentsView> localDocumentsViewOfCurrentUser) {
+    this.persistence = persistence;
+    this.scheduler = new Scheduler(asyncQueue);
+    this.indexManagerOfCurrentUser = indexManagerOfCurrentUser;
+    this.localDocumentsViewOfCurrentUser = localDocumentsViewOfCurrentUser;
   }
 
   public class Scheduler implements com.google.firebase.firestore.local.Scheduler {
-    private boolean hasRun = false;
     @Nullable private AsyncQueue.DelayedTask backfillTask;
     private final AsyncQueue asyncQueue;
 
@@ -69,7 +73,7 @@ public Scheduler(AsyncQueue asyncQueue) {
 
     @Override
     public void start() {
-      scheduleBackfill();
+      scheduleBackfill(INITIAL_BACKFILL_DELAY_MS);
     }
 
     @Override
@@ -79,8 +83,7 @@ public void stop() {
       }
     }
 
-    private void scheduleBackfill() {
-      long delay = hasRun ? REGULAR_BACKFILL_DELAY_MS : INITIAL_BACKFILL_DELAY_MS;
+    private void scheduleBackfill(long delay) {
       backfillTask =
           asyncQueue.enqueueAfterDelay(
               AsyncQueue.TimerId.INDEX_BACKFILL,
@@ -88,8 +91,7 @@ private void scheduleBackfill() {
               () -> {
                 int documentsProcessed = backfill();
                 Logger.debug(LOG_TAG, "Documents written: %s", documentsProcessed);
-                hasRun = true;
-                scheduleBackfill();
+                scheduleBackfill(REGULAR_BACKFILL_DELAY_MS);
               });
     }
   }
@@ -100,13 +102,12 @@ public Scheduler getScheduler() {
 
   /** Runs a single backfill operation and returns the number of documents processed. */
   public int backfill() {
-    hardAssert(localDocumentsView != null, "setLocalDocumentsView() not called");
-    hardAssert(indexManager != null, "setIndexManager() not called");
     return persistence.runTransaction("Backfill Indexes", () -> this.writeIndexEntries());
   }
 
   /** Writes index entries until the cap is reached. Returns the number of documents processed. */
   private int writeIndexEntries() {
+    IndexManager indexManager = indexManagerOfCurrentUser.get();
     Set<String> processedCollectionGroups = new HashSet<>();
     int documentsRemaining = maxDocumentsToProcess;
     while (documentsRemaining > 0) {
@@ -126,6 +127,8 @@ private int writeIndexEntries() {
    */
   private int writeEntriesForCollectionGroup(
       String collectionGroup, int documentsRemainingUnderCap) {
+    IndexManager indexManager = indexManagerOfCurrentUser.get();
+    LocalDocumentsView localDocumentsView = localDocumentsViewOfCurrentUser.get();
     // Use the earliest offset of all field indexes to query the local cache.
     IndexOffset existingOffset = indexManager.getMinOffset(collectionGroup);
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/IndexManager.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/IndexManager.java
index 3735a912053..4751ae6e208 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/IndexManager.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/IndexManager.java
@@ -24,7 +24,6 @@
 import com.google.firebase.firestore.model.ResourcePath;
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Represents a set of indexes that are used to execute queries efficiently.
@@ -33,6 +32,21 @@
  * Collection Group queries.
  */
 public interface IndexManager {
+  /** Represents the index state as it relates to a particular target. */
+  enum IndexType {
+    /** Indicates that no index could be found for serving the target. */
+    NONE,
+    /**
+     * Indicates that only a "partial index" could be found for serving the target. A partial index
+     * is one which does not have a segment for every filter/orderBy in the target.
+     */
+    PARTIAL,
+    /**
+     * Indicates that a "full index" could be found for serving the target. A full index is one
+     * which has a segment for every filter/orderBy in the target.
+     */
+    FULL
+  }
 
   /** Initializes the IndexManager. */
   void start();
@@ -64,6 +78,12 @@ public interface IndexManager {
   /** Removes the given field index and deletes all index values. */
   void deleteFieldIndex(FieldIndex index);
 
+  /** Removes all field indexes and deletes all index values. */
+  void deleteAllFieldIndexes();
+
+  /** Creates a full matched field index which serves the given target. */
+  void createTargetIndexes(Target target);
+
   /**
    * Returns a list of field indexes that correspond to the specified collection group.
    *
@@ -84,18 +104,14 @@ public interface IndexManager {
   /** Returns the minimum offset for the given collection group. */
   IndexOffset getMinOffset(String collectionGroup);
 
-  /**
-   * Returns an index that can be used to serve the provided target. Returns {@code null} if no
-   * index is configured.
-   */
-  @Nullable
-  FieldIndex getFieldIndex(Target target);
+  /** Returns the type of index (if any) that can be used to serve the given target */
+  IndexType getIndexType(Target target);
 
   /**
    * Returns the documents that match the given target based on the provided index or {@code null}
    * if the query cannot be served from an index.
    */
-  Set<DocumentKey> getDocumentsMatchingTarget(Target target);
+  List<DocumentKey> getDocumentsMatchingTarget(Target target);
 
   /** Returns the next collection group to update. Returns {@code null} if no group exists. */
   @Nullable
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalDocumentsResult.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalDocumentsResult.java
index f3b91589516..382bf558b98 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalDocumentsResult.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalDocumentsResult.java
@@ -14,9 +14,12 @@
 
 package com.google.firebase.firestore.local;
 
+import static com.google.firebase.firestore.model.DocumentCollections.emptyDocumentMap;
+
 import com.google.firebase.database.collection.ImmutableSortedMap;
 import com.google.firebase.firestore.model.Document;
 import com.google.firebase.firestore.model.DocumentKey;
+import java.util.Map;
 
 /**
  * Represents a set of document along with their mutation batch ID.
@@ -33,6 +36,16 @@ public final class LocalDocumentsResult {
     this.documents = documents;
   }
 
+  public static LocalDocumentsResult fromOverlayedDocuments(
+      int batchId, Map<DocumentKey, OverlayedDocument> overlays) {
+    ImmutableSortedMap<DocumentKey, Document> documents = emptyDocumentMap();
+    for (Map.Entry<DocumentKey, OverlayedDocument> entry : overlays.entrySet()) {
+      documents = documents.insert(entry.getKey(), entry.getValue().getDocument());
+    }
+
+    return new LocalDocumentsResult(batchId, documents);
+  }
+
   public int getBatchId() {
     return batchId;
   }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalDocumentsView.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalDocumentsView.java
index 4d0d7552e09..04955f4f0c2 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalDocumentsView.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalDocumentsView.java
@@ -44,9 +44,9 @@
 import java.util.TreeSet;
 
 /**
- * A readonly view of the local state of all documents we're tracking (i.e. we have a cached version
- * in remoteDocumentCache or local mutations for the document). The view is computed by applying the
- * mutations in the MutationQueue to the RemoteDocumentCache.
+ * A readonly view of the local state of all documents we're tracking (specifically, we have a
+ * cached version in remoteDocumentCache or local mutations for the document). The view is computed
+ * by applying the mutations in the MutationQueue to the RemoteDocumentCache.
  */
 class LocalDocumentsView {
 
@@ -91,7 +91,7 @@ Document getDocument(DocumentKey key) {
     Overlay overlay = documentOverlayCache.getOverlay(key);
     MutableDocument document = getBaseDocument(key, overlay);
     if (overlay != null) {
-      overlay.getMutation().applyToLocalView(document, null, Timestamp.now());
+      overlay.getMutation().applyToLocalView(document, FieldMask.EMPTY, Timestamp.now());
     }
     return document;
   }
@@ -119,18 +119,48 @@ ImmutableSortedMap<DocumentKey, Document> getLocalViewOfDocuments(
       Map<DocumentKey, MutableDocument> docs, Set<DocumentKey> existenceStateChanged) {
     Map<DocumentKey, Overlay> overlays = new HashMap<>();
     populateOverlays(overlays, docs.keySet());
-    return computeViews(docs, overlays, existenceStateChanged);
+    ImmutableSortedMap<DocumentKey, Document> result = emptyDocumentMap();
+    for (Map.Entry<DocumentKey, OverlayedDocument> entry :
+        computeViews(docs, overlays, existenceStateChanged).entrySet()) {
+      result = result.insert(entry.getKey(), entry.getValue().getDocument());
+    }
+
+    return result;
+  }
+
+  /**
+   * Gets the overlayed documents for the given document map, which will include the local view of
+   * those documents and a {@code FieldMask} indicating which fields are mutated locally, null if
+   * overlay is a Set or Delete mutation.
+   *
+   * @param docs The documents to apply local mutations to get the local views.
+   */
+  Map<DocumentKey, OverlayedDocument> getOverlayedDocuments(
+      Map<DocumentKey, MutableDocument> docs) {
+    Map<DocumentKey, Overlay> overlays = new HashMap<>();
+    populateOverlays(overlays, docs.keySet());
+    return computeViews(docs, overlays, new HashSet<>());
   }
 
-  /*Computes the local view for doc */
-  private ImmutableSortedMap<DocumentKey, Document> computeViews(
+  /**
+   * Computes the local view for the given documents.
+   *
+   * @param docs The documents to compute views for. It also has the base version of the documents.
+   * @param overlays The overlays that need to be applied to the given base version of the
+   *     documents.
+   * @param existenceStateChanged A set of documents whose existence states might have changed. This
+   *     is used to determine if we need to re-calculate overlays from mutation queues.
+   * @return A map represents the local documents view.
+   */
+  private Map<DocumentKey, OverlayedDocument> computeViews(
       Map<DocumentKey, MutableDocument> docs,
       Map<DocumentKey, Overlay> overlays,
       Set<DocumentKey> existenceStateChanged) {
-    ImmutableSortedMap<DocumentKey, Document> results = emptyDocumentMap();
     Map<DocumentKey, MutableDocument> recalculateDocuments = new HashMap<>();
+    Map<DocumentKey, FieldMask> mutatedFields = new HashMap<>();
     for (MutableDocument doc : docs.values()) {
       Overlay overlay = overlays.get(doc.getKey());
+
       // Recalculate an overlay if the document's existence state is changed due to a remote
       // event *and* the overlay is a PatchMutation. This is because document existence state
       // can change if some patch mutation's preconditions are met.
@@ -141,19 +171,31 @@ private ImmutableSortedMap<DocumentKey, Document> computeViews(
           && (overlay == null || overlay.getMutation() instanceof PatchMutation)) {
         recalculateDocuments.put(doc.getKey(), doc);
       } else if (overlay != null) {
-        overlay.getMutation().applyToLocalView(doc, null, Timestamp.now());
+        mutatedFields.put(doc.getKey(), overlay.getMutation().getFieldMask());
+        overlay
+            .getMutation()
+            .applyToLocalView(doc, overlay.getMutation().getFieldMask(), Timestamp.now());
+      } else { // overlay == null
+        // Using EMPTY to indicate there is no overlay for the document.
+        mutatedFields.put(doc.getKey(), FieldMask.EMPTY);
       }
     }
 
-    recalculateAndSaveOverlays(recalculateDocuments);
+    Map<DocumentKey, FieldMask> recalculatedFields =
+        recalculateAndSaveOverlays(recalculateDocuments);
+    mutatedFields.putAll(recalculatedFields);
 
+    Map<DocumentKey, OverlayedDocument> result = new HashMap<>();
     for (Map.Entry<DocumentKey, MutableDocument> entry : docs.entrySet()) {
-      results = results.insert(entry.getKey(), entry.getValue());
+      result.put(
+          entry.getKey(),
+          new OverlayedDocument(entry.getValue(), mutatedFields.get(entry.getKey())));
     }
-    return results;
+    return result;
   }
 
-  private void recalculateAndSaveOverlays(Map<DocumentKey, MutableDocument> docs) {
+  private Map<DocumentKey, FieldMask> recalculateAndSaveOverlays(
+      Map<DocumentKey, MutableDocument> docs) {
     List<MutationBatch> batches =
         mutationQueue.getAllMutationBatchesAffectingDocumentKeys(docs.keySet());
 
@@ -189,12 +231,17 @@ private void recalculateAndSaveOverlays(Map<DocumentKey, MutableDocument> docs)
       Map<DocumentKey, Mutation> overlays = new HashMap<>();
       for (DocumentKey key : entry.getValue()) {
         if (!processed.contains(key)) {
-          overlays.put(key, Mutation.calculateOverlayMutation(docs.get(key), masks.get(key)));
+          Mutation mutation = Mutation.calculateOverlayMutation(docs.get(key), masks.get(key));
+          if (mutation != null) {
+            overlays.put(key, mutation);
+          }
           processed.add(key);
         }
       }
       documentOverlayCache.saveOverlays(entry.getKey(), overlays);
     }
+
+    return masks;
   }
 
   /**
@@ -211,19 +258,32 @@ void recalculateAndSaveOverlays(Set<DocumentKey> documentKeys) {
    *
    * @param query The query to match documents against.
    * @param offset Read time and key to start scanning by (exclusive).
+   * @param context A optional tracker to keep a record of important details during database local
+   *     query execution.
    */
   ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingQuery(
-      Query query, IndexOffset offset) {
+      Query query, IndexOffset offset, @Nullable QueryContext context) {
     ResourcePath path = query.getPath();
     if (query.isDocumentQuery()) {
       return getDocumentsMatchingDocumentQuery(path);
     } else if (query.isCollectionGroupQuery()) {
-      return getDocumentsMatchingCollectionGroupQuery(query, offset);
+      return getDocumentsMatchingCollectionGroupQuery(query, offset, context);
     } else {
-      return getDocumentsMatchingCollectionQuery(query, offset);
+      return getDocumentsMatchingCollectionQuery(query, offset, context);
     }
   }
 
+  /**
+   * Performs a query against the local view of all documents.
+   *
+   * @param query The query to match documents against.
+   * @param offset Read time and key to start scanning by (exclusive).
+   */
+  ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingQuery(
+      Query query, IndexOffset offset) {
+    return getDocumentsMatchingQuery(query, offset, /*context*/ null);
+  }
+
   /** Performs a simple document lookup for the given path. */
   private ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingDocumentQuery(
       ResourcePath path) {
@@ -237,7 +297,7 @@ private ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingDocumentQu
   }
 
   private ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingCollectionGroupQuery(
-      Query query, IndexOffset offset) {
+      Query query, IndexOffset offset, @Nullable QueryContext context) {
     hardAssert(
         query.getPath().isEmpty(),
         "Currently we only support collection group queries at the root.");
@@ -250,7 +310,7 @@ private ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingCollection
     for (ResourcePath parent : parents) {
       Query collectionQuery = query.asCollectionQueryAtPath(parent.append(collectionId));
       ImmutableSortedMap<DocumentKey, Document> collectionResults =
-          getDocumentsMatchingCollectionQuery(collectionQuery, offset);
+          getDocumentsMatchingCollectionQuery(collectionQuery, offset, context);
       for (Map.Entry<DocumentKey, Document> docEntry : collectionResults) {
         results = results.insert(docEntry.getKey(), docEntry.getValue());
       }
@@ -280,7 +340,7 @@ LocalDocumentsResult getNextDocuments(String collectionGroup, IndexOffset offset
         count - docs.size() > 0
             ? documentOverlayCache.getOverlays(
                 collectionGroup, offset.getLargestBatchId(), count - docs.size())
-            : Collections.emptyMap();
+            : new HashMap<>();
 
     int largestBatchId = FieldIndex.INITIAL_LARGEST_BATCH_ID;
     for (Overlay overlay : overlays.values()) {
@@ -295,9 +355,9 @@ LocalDocumentsResult getNextDocuments(String collectionGroup, IndexOffset offset
     }
 
     populateOverlays(overlays, docs.keySet());
-    ImmutableSortedMap<DocumentKey, Document> localDocs =
+    Map<DocumentKey, OverlayedDocument> localDocs =
         computeViews(docs, overlays, Collections.emptySet());
-    return new LocalDocumentsResult(largestBatchId, localDocs);
+    return LocalDocumentsResult.fromOverlayedDocuments(largestBatchId, localDocs);
   }
 
   /**
@@ -315,11 +375,11 @@ private void populateOverlays(Map<DocumentKey, Overlay> overlays, Set<DocumentKe
   }
 
   private ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingCollectionQuery(
-      Query query, IndexOffset offset) {
-    Map<DocumentKey, MutableDocument> remoteDocuments =
-        remoteDocumentCache.getAll(query.getPath(), offset);
+      Query query, IndexOffset offset, @Nullable QueryContext context) {
     Map<DocumentKey, Overlay> overlays =
         documentOverlayCache.getOverlays(query.getPath(), offset.getLargestBatchId());
+    Map<DocumentKey, MutableDocument> remoteDocuments =
+        remoteDocumentCache.getDocumentsMatchingQuery(query, offset, overlays.keySet(), context);
 
     // As documents might match the query because of their overlay we need to include documents
     // for all overlays in the initial document set.
@@ -334,7 +394,9 @@ private ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingCollection
     for (Map.Entry<DocumentKey, MutableDocument> docEntry : remoteDocuments.entrySet()) {
       Overlay overlay = overlays.get(docEntry.getKey());
       if (overlay != null) {
-        overlay.getMutation().applyToLocalView(docEntry.getValue(), null, Timestamp.now());
+        overlay
+            .getMutation()
+            .applyToLocalView(docEntry.getValue(), FieldMask.EMPTY, Timestamp.now());
       }
       // Finally, insert the documents that still match the query
       if (query.matches(docEntry.getValue())) {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalSerializer.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalSerializer.java
index fb4e476b411..98fb7230821 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalSerializer.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalSerializer.java
@@ -260,7 +260,8 @@ TargetData decodeTargetData(com.google.firebase.firestore.proto.Target targetPro
         QueryPurpose.LISTEN,
         version,
         lastLimboFreeSnapshotVersion,
-        resumeToken);
+        resumeToken,
+        null);
   }
 
   public com.google.firestore.bundle.BundledQuery encodeBundledQuery(BundledQuery bundledQuery) {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalStore.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalStore.java
index 613d6ac2f67..443803386e4 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalStore.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalStore.java
@@ -114,9 +114,6 @@ public final class LocalStore implements BundleCallback {
   /** Manages the list of active field and collection indices. */
   private IndexManager indexManager;
 
-  /** Manages field index backfill. */
-  private final @Nullable IndexBackfiller indexBackfiller;
-
   /** The set of all mutations that have been sent but not yet been applied to the backend. */
   private MutationQueue mutationQueue;
 
@@ -150,16 +147,11 @@ public final class LocalStore implements BundleCallback {
   /** Used to generate targetIds for queries tracked locally. */
   private final TargetIdGenerator targetIdGenerator;
 
-  public LocalStore(
-      Persistence persistence,
-      @Nullable IndexBackfiller indexBackfiller,
-      QueryEngine queryEngine,
-      User initialUser) {
+  public LocalStore(Persistence persistence, QueryEngine queryEngine, User initialUser) {
     hardAssert(
         persistence.isStarted(), "LocalStore was passed an unstarted persistence implementation");
     this.persistence = persistence;
     this.queryEngine = queryEngine;
-    this.indexBackfiller = indexBackfiller;
 
     targetCache = persistence.getTargetCache();
     bundleCache = persistence.getBundleCache();
@@ -178,16 +170,12 @@ private void initializeUserComponents(User user) {
     // TODO(indexing): Add spec tests that test these components change after a user change
     indexManager = persistence.getIndexManager(user);
     mutationQueue = persistence.getMutationQueue(user, indexManager);
-    documentOverlayCache = persistence.getDocumentOverlay(user);
+    documentOverlayCache = persistence.getDocumentOverlayCache(user);
     localDocuments =
         new LocalDocumentsView(remoteDocuments, mutationQueue, documentOverlayCache, indexManager);
 
     remoteDocuments.setIndexManager(indexManager);
     queryEngine.initialize(localDocuments, indexManager);
-    if (indexBackfiller != null) {
-      indexBackfiller.setIndexManager(indexManager);
-      indexBackfiller.setLocalDocumentsView(localDocuments);
-    }
   }
 
   public void start() {
@@ -204,6 +192,14 @@ private void startMutationQueue() {
     persistence.runTransaction("Start MutationQueue", () -> mutationQueue.start());
   }
 
+  public IndexManager getIndexManagerForCurrentUser() {
+    return indexManager;
+  }
+
+  public LocalDocumentsView getLocalDocumentsForCurrentUser() {
+    return localDocuments;
+  }
+
   // PORTING NOTE: no shutdown for LocalStore or persistence components on Android.
 
   public ImmutableSortedMap<DocumentKey, Document> handleUserChange(User user) {
@@ -244,9 +240,22 @@ public LocalDocumentsResult writeLocally(List<Mutation> mutations) {
     return persistence.runTransaction(
         "Locally write mutations",
         () -> {
+          // Figure out which keys do not have a remote version in the cache, this is needed to
+          // create the right overlay mutation: if no remote version presents, we do not need to
+          // create overlays as patch mutations.
+          // TODO(Overlay): Is there a better way to determine this? Document version does not work
+          // because local mutations set them back to 0.
+          Map<DocumentKey, MutableDocument> remoteDocs = remoteDocuments.getAll(keys);
+          Set<DocumentKey> docsWithoutRemoteVersion = new HashSet<>();
+          for (Map.Entry<DocumentKey, MutableDocument> entry : remoteDocs.entrySet()) {
+            if (!entry.getValue().isValidDocument()) {
+              docsWithoutRemoteVersion.add(entry.getKey());
+            }
+          }
           // Load and apply all existing mutations. This lets us compute the current base state for
           // all non-idempotent transforms before applying any additional user-provided writes.
-          ImmutableSortedMap<DocumentKey, Document> documents = localDocuments.getDocuments(keys);
+          Map<DocumentKey, OverlayedDocument> overlayedDocuments =
+              localDocuments.getOverlayedDocuments(remoteDocs);
 
           // For non-idempotent mutations (such as `FieldValue.increment()`), we record the base
           // state in a separate patch mutation. This is later used to guarantee consistent values
@@ -255,7 +264,8 @@ public LocalDocumentsResult writeLocally(List<Mutation> mutations) {
           List<Mutation> baseMutations = new ArrayList<>();
           for (Mutation mutation : mutations) {
             ObjectValue baseValue =
-                mutation.extractTransformBaseValue(documents.get(mutation.getKey()));
+                mutation.extractTransformBaseValue(
+                    overlayedDocuments.get(mutation.getKey()).getDocument());
             if (baseValue != null) {
               // NOTE: The base state should only be applied if there's some existing
               // document to override, so use a Precondition of exists=true
@@ -270,9 +280,11 @@ public LocalDocumentsResult writeLocally(List<Mutation> mutations) {
 
           MutationBatch batch =
               mutationQueue.addMutationBatch(localWriteTime, baseMutations, mutations);
-          Map<DocumentKey, Mutation> overlays = batch.applyToLocalDocumentSet(documents);
+          Map<DocumentKey, Mutation> overlays =
+              batch.applyToLocalDocumentSet(overlayedDocuments, docsWithoutRemoteVersion);
           documentOverlayCache.saveOverlays(batch.getBatchId(), overlays);
-          return new LocalDocumentsResult(batch.getBatchId(), documents);
+          return LocalDocumentsResult.fromOverlayedDocuments(
+              batch.getBatchId(), overlayedDocuments);
         });
   }
 
@@ -382,8 +394,8 @@ public SnapshotVersion getLastRemoteSnapshotVersion() {
 
   /**
    * Updates the "ground-state" (remote) documents. We assume that the remote event reflects any
-   * write batches that have been acknowledged or rejected (i.e. we do not re-apply local mutations
-   * to updates from this event).
+   * write batches that have been acknowledged or rejected (specifically, we do not re-apply local
+   * mutations to updates from this event).
    *
    * <p>LocalDocuments are re-calculated if there are remaining mutations in the queue.
    */
@@ -413,7 +425,7 @@ public ImmutableSortedMap<DocumentKey, Document> applyRemoteEvent(RemoteEvent re
             targetCache.addMatchingKeys(change.getAddedDocuments(), targetId);
 
             TargetData newTargetData = oldTargetData.withSequenceNumber(sequenceNumber);
-            if (remoteEvent.getTargetMismatches().contains(targetId)) {
+            if (remoteEvent.getTargetMismatches().containsKey(targetId)) {
               newTargetData =
                   newTargetData
                       .withResumeToken(ByteString.EMPTY, SnapshotVersion.NONE)
@@ -543,7 +555,7 @@ private DocumentChangeResult populateDocumentChanges(
    * have to be too frequent.
    */
   private static boolean shouldPersistTargetData(
-      TargetData oldTargetData, TargetData newTargetData, TargetChange change) {
+      TargetData oldTargetData, TargetData newTargetData, @Nullable TargetChange change) {
     // Always persist query data if we don't already have a resume token.
     if (oldTargetData.getResumeToken().isEmpty()) return true;
 
@@ -556,10 +568,20 @@ private static boolean shouldPersistTargetData(
     long timeDelta = newSeconds - oldSeconds;
     if (timeDelta >= RESUME_TOKEN_MAX_AGE_SECONDS) return true;
 
+    // Update the target cache if sufficient time has passed since the last
+    // LastLimboFreeSnapshotVersion
+    long newLimboFreeSeconds =
+        newTargetData.getLastLimboFreeSnapshotVersion().getTimestamp().getSeconds();
+    long oldLimboFreeSeconds =
+        oldTargetData.getLastLimboFreeSnapshotVersion().getTimestamp().getSeconds();
+    long limboFreeTimeDelta = newLimboFreeSeconds - oldLimboFreeSeconds;
+    if (limboFreeTimeDelta >= RESUME_TOKEN_MAX_AGE_SECONDS) return true;
+
     // Otherwise if the only thing that has changed about a target is its resume token it's not
     // worth persisting. Note that the RemoteStore keeps an in-memory view of the currently active
     // targets which includes the current resume token, so stream failure or user changes will still
     // use an up-to-date resume token regardless of what we do here.
+    if (change == null) return false;
     int changes =
         change.getAddedDocuments().size()
             + change.getModifiedDocuments().size()
@@ -594,6 +616,10 @@ public void notifyLocalViewChanges(List<LocalViewChanges> viewChanges) {
               TargetData updatedTargetData =
                   targetData.withLastLimboFreeSnapshotVersion(lastLimboFreeSnapshotVersion);
               queryDataByTarget.put(targetId, updatedTargetData);
+
+              if (shouldPersistTargetData(targetData, updatedTargetData, /*change*/ null)) {
+                targetCache.updateTargetData(updatedTargetData);
+              }
             }
           }
         });
@@ -776,6 +802,14 @@ public void configureFieldIndexes(List<FieldIndex> newFieldIndexes) {
         });
   }
 
+  public void deleteAllFieldIndexes() {
+    persistence.runTransaction("Delete All Indexes", () -> indexManager.deleteAllFieldIndexes());
+  }
+
+  public void setIndexAutoCreationEnabled(boolean isEnabled) {
+    queryEngine.setIndexAutoCreationEnabled(isEnabled);
+  }
+
   /** Mutable state for the transaction in allocateQuery. */
   private static class AllocateQueryHolder {
     TargetData cached;
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LruGarbageCollector.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LruGarbageCollector.java
index bc8f18669de..f64404a901c 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LruGarbageCollector.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/LruGarbageCollector.java
@@ -61,8 +61,10 @@ public static Params WithCacheSizeBytes(long cacheSizeBytes) {
       return new Params(cacheSizeBytes, 10, 1000);
     }
 
-    final long minBytesThreshold;
-    final int percentileToCollect;
+    // Not final for testing purposes.
+    long minBytesThreshold;
+    // Not final for testing purposes.
+    int percentileToCollect;
     final int maximumSequenceNumbersToCollect;
 
     Params(long minBytesThreshold, int percentileToCollect, int maximumSequenceNumbersToCollect) {
@@ -163,6 +165,13 @@ public GCScheduler newScheduler(AsyncQueue asyncQueue, LocalStore localStore) {
     return new GCScheduler(asyncQueue, localStore);
   }
 
+  // Visible for testing purposes only.
+  public LruGarbageCollector withNewThreshold(long cacheThreshold) {
+    this.params.minBytesThreshold = cacheThreshold;
+    this.params.percentileToCollect = 100;
+    return this;
+  }
+
   /** Given a percentile of target to collect, returns the number of targets to collect. */
   int calculateQueryCount(int percentile) {
     long targetCount = delegate.getSequenceNumberCount();
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryDocumentOverlayCache.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryDocumentOverlayCache.java
index 52471f49d6e..0731591c5d2 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryDocumentOverlayCache.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryDocumentOverlayCache.java
@@ -14,6 +14,8 @@
 
 package com.google.firebase.firestore.local;
 
+import static com.google.firebase.firestore.util.Preconditions.checkNotNull;
+
 import androidx.annotation.Nullable;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.ResourcePath;
@@ -50,11 +52,7 @@ public Map<DocumentKey, Overlay> getOverlays(SortedSet<DocumentKey> keys) {
     return result;
   }
 
-  private void saveOverlay(int largestBatchId, @Nullable Mutation mutation) {
-    if (mutation == null) {
-      return;
-    }
-
+  private void saveOverlay(int largestBatchId, Mutation mutation) {
     // Remove the association of the overlay to its batch id.
     Overlay existing = this.overlays.get(mutation.getKey());
     if (existing != null) {
@@ -73,7 +71,8 @@ private void saveOverlay(int largestBatchId, @Nullable Mutation mutation) {
   @Override
   public void saveOverlays(int largestBatchId, Map<DocumentKey, Mutation> overlays) {
     for (Map.Entry<DocumentKey, Mutation> entry : overlays.entrySet()) {
-      saveOverlay(largestBatchId, entry.getValue());
+      Mutation overlay = checkNotNull(entry.getValue(), "null value for key: %s", entry.getKey());
+      saveOverlay(largestBatchId, overlay);
     }
   }
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryIndexManager.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryIndexManager.java
index d4a28b04887..a55734b3859 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryIndexManager.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryIndexManager.java
@@ -29,7 +29,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /** An in-memory implementation of IndexManager. */
 class MemoryIndexManager implements IndexManager {
@@ -61,16 +60,17 @@ public void deleteFieldIndex(FieldIndex index) {
     // Field indices are not supported with memory persistence.
   }
 
-  @Nullable
   @Override
-  public FieldIndex getFieldIndex(Target target) {
+  public void deleteAllFieldIndexes() {
     // Field indices are not supported with memory persistence.
-    return null;
   }
 
+  @Override
+  public void createTargetIndexes(Target target) {}
+
   @Override
   @Nullable
-  public Set<DocumentKey> getDocumentsMatchingTarget(Target target) {
+  public List<DocumentKey> getDocumentsMatchingTarget(Target target) {
     // Field indices are not supported with memory persistence.
     return null;
   }
@@ -109,6 +109,11 @@ public IndexOffset getMinOffset(String collectionGroup) {
     return IndexOffset.NONE;
   }
 
+  @Override
+  public IndexType getIndexType(Target target) {
+    return IndexType.NONE;
+  }
+
   @Override
   public void updateIndexEntries(ImmutableSortedMap<DocumentKey, Document> documents) {
     // Field indices are not supported with memory persistence.
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryMutationQueue.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryMutationQueue.java
index 3f980390cae..7a238dd20c1 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryMutationQueue.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryMutationQueue.java
@@ -363,7 +363,7 @@ private int indexOfBatchId(int batchId) {
    * is within the bounds of the queue.
    *
    * @param batchId The batchId to search for
-   * @param action A description of what the caller is doing, phrased in passive form (e.g.
+   * @param action A description of what the caller is doing, phrased in passive form (for example
    *     "acknowledged" in a routine that acknowledges batches).
    */
   private int indexOfExistingBatchId(int batchId, String action) {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryPersistence.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryPersistence.java
index c1f574f47ff..2f3fce2c638 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryPersistence.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryPersistence.java
@@ -85,7 +85,7 @@ public boolean isStarted() {
   }
 
   @Override
-  ReferenceDelegate getReferenceDelegate() {
+  public ReferenceDelegate getReferenceDelegate() {
     return referenceDelegate;
   }
 
@@ -130,7 +130,7 @@ BundleCache getBundleCache() {
   }
 
   @Override
-  DocumentOverlayCache getDocumentOverlay(User user) {
+  DocumentOverlayCache getDocumentOverlayCache(User user) {
     MemoryDocumentOverlayCache overlay = overlays.get(user);
     if (overlay == null) {
       overlay = new MemoryDocumentOverlayCache();
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryRemoteDocumentCache.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryRemoteDocumentCache.java
index 6ecd4d9aa30..3b4fa1048b2 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryRemoteDocumentCache.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryRemoteDocumentCache.java
@@ -18,17 +18,20 @@
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.firebase.database.collection.ImmutableSortedMap;
+import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.model.Document;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.FieldIndex.IndexOffset;
 import com.google.firebase.firestore.model.MutableDocument;
-import com.google.firebase.firestore.model.ResourcePath;
 import com.google.firebase.firestore.model.SnapshotVersion;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nonnull;
 
 /** In-memory cache of remote documents. */
 final class MemoryRemoteDocumentCache implements RemoteDocumentCache {
@@ -94,12 +97,16 @@ public Map<DocumentKey, MutableDocument> getAll(
   }
 
   @Override
-  public Map<DocumentKey, MutableDocument> getAll(ResourcePath collection, IndexOffset offset) {
+  public Map<DocumentKey, MutableDocument> getDocumentsMatchingQuery(
+      Query query,
+      IndexOffset offset,
+      @Nonnull Set<DocumentKey> mutatedKeys,
+      @Nullable QueryContext context) {
     Map<DocumentKey, MutableDocument> result = new HashMap<>();
 
     // Documents are ordered by key, so we can use a prefix scan to narrow down the documents
     // we need to match the query against.
-    DocumentKey prefix = DocumentKey.fromPath(collection.append(""));
+    DocumentKey prefix = DocumentKey.fromPath(query.getPath().append(""));
     Iterator<Map.Entry<DocumentKey, Document>> iterator = docs.iteratorFrom(prefix);
 
     while (iterator.hasNext()) {
@@ -107,12 +114,12 @@ public Map<DocumentKey, MutableDocument> getAll(ResourcePath collection, IndexOf
       Document doc = entry.getValue();
 
       DocumentKey key = entry.getKey();
-      if (!collection.isPrefixOf(key.getPath())) {
+      if (!query.getPath().isPrefixOf(key.getPath())) {
         // We are now scanning the next collection. Abort.
         break;
       }
 
-      if (key.getPath().length() > collection.length() + 1) {
+      if (key.getPath().length() > query.getPath().length() + 1) {
         // Exclude entries from subcollections.
         continue;
       }
@@ -122,12 +129,22 @@ public Map<DocumentKey, MutableDocument> getAll(ResourcePath collection, IndexOf
         continue;
       }
 
+      if (!mutatedKeys.contains(doc.getKey()) && !query.matches(doc)) {
+        continue;
+      }
+
       result.put(doc.getKey(), doc.mutableCopy());
     }
 
     return result;
   }
 
+  @Override
+  public Map<DocumentKey, MutableDocument> getDocumentsMatchingQuery(
+      Query query, IndexOffset offset, @Nonnull Set<DocumentKey> mutatedKeys) {
+    return getDocumentsMatchingQuery(query, offset, mutatedKeys, /*context*/ null);
+  }
+
   Iterable<Document> getDocuments() {
     return new DocumentIterable();
   }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/OverlayedDocument.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/OverlayedDocument.java
new file mode 100644
index 00000000000..e2b791bce06
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/OverlayedDocument.java
@@ -0,0 +1,45 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore.local;
+
+import com.google.firebase.firestore.model.Document;
+import com.google.firebase.firestore.model.mutation.FieldMask;
+import javax.annotation.Nullable;
+
+/** Represents a local view (overlay) of a document, and the fields that are locally mutated. */
+public class OverlayedDocument {
+  private Document overlayedDocument;
+  @Nullable private FieldMask mutatedFields;
+
+  OverlayedDocument(Document overlayedDocument, FieldMask mutatedFields) {
+    this.overlayedDocument = overlayedDocument;
+    this.mutatedFields = mutatedFields;
+  }
+
+  public Document getDocument() {
+    return overlayedDocument;
+  }
+
+  /**
+   * The fields that are locally mutated by patch mutations.
+   *
+   * <p>If the overlayed document is from set or delete mutations, returns null.
+   *
+   * <p>If there is no overlay (mutation) for the document, returns FieldMask.EMPTY.
+   */
+  public @Nullable FieldMask getMutatedFields() {
+    return mutatedFields;
+  }
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/Persistence.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/Persistence.java
index ca02a9adb43..3c266493aa0 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/Persistence.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/Persistence.java
@@ -67,14 +67,15 @@ public abstract class Persistence {
 
   public abstract boolean isStarted();
 
-  abstract ReferenceDelegate getReferenceDelegate();
+  // Visible for testing purposes.
+  public abstract ReferenceDelegate getReferenceDelegate();
 
   /**
    * Returns a MutationQueue representing the persisted mutations for the given user.
    *
    * <p>Note: The implementation is free to return the same instance every time this is called for a
    * given user. In particular, the memory-backed implementation does this to emulate the persisted
-   * implementation to the extent possible (e.g. in the case of uid switching from
+   * implementation to the extent possible (for example, in the case of uid switching from
    * sally=>jack=>sally, sally's mutation queue will be preserved).
    */
   abstract MutationQueue getMutationQueue(User user, IndexManager indexManager);
@@ -92,7 +93,7 @@ public abstract class Persistence {
   abstract BundleCache getBundleCache();
 
   /** Returns a DocumentOverlayCache representing the documents that are mutated locally. */
-  abstract DocumentOverlayCache getDocumentOverlay(User user);
+  abstract DocumentOverlayCache getDocumentOverlayCache(User user);
 
   /** Returns a OverlayMigrationManager that runs any pending data migration required by SDK. */
   abstract OverlayMigrationManager getOverlayMigrationManager();
diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/FeaturesSettingsData.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/QueryContext.java
similarity index 55%
rename from firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/FeaturesSettingsData.java
rename to firebase-firestore/src/main/java/com/google/firebase/firestore/local/QueryContext.java
index ab7ead444d8..ed25b1fa07a 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/FeaturesSettingsData.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/QueryContext.java
@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,15 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.crashlytics.internal.settings.model;
+package com.google.firebase.firestore.local;
 
-/** Immutable value object for storing feature switch settings */
-public class FeaturesSettingsData {
-  public final boolean collectReports;
-  public final boolean collectAnrs;
+/** A tracker to keep a record of important details during database local query execution. */
+public class QueryContext {
+  /** Counts the number of documents passed through during local query execution. */
+  private int documentReadCount = 0;
 
-  public FeaturesSettingsData(boolean collectReports, boolean collectAnrs) {
-    this.collectReports = collectReports;
-    this.collectAnrs = collectAnrs;
+  public int getDocumentReadCount() {
+    return documentReadCount;
+  }
+
+  public void incrementDocumentReadCount() {
+    documentReadCount++;
   }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/QueryEngine.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/QueryEngine.java
index bba66e80c93..e12dc86209a 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/QueryEngine.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/QueryEngine.java
@@ -15,12 +15,13 @@
 package com.google.firebase.firestore.local;
 
 import static com.google.firebase.firestore.util.Assert.hardAssert;
-import static com.google.firebase.firestore.util.Util.values;
 
+import androidx.annotation.VisibleForTesting;
 import com.google.firebase.database.collection.ImmutableSortedMap;
 import com.google.firebase.database.collection.ImmutableSortedSet;
 import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.core.Target;
+import com.google.firebase.firestore.local.IndexManager.IndexType;
 import com.google.firebase.firestore.model.Document;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.FieldIndex;
@@ -28,8 +29,8 @@
 import com.google.firebase.firestore.model.SnapshotVersion;
 import com.google.firebase.firestore.util.Logger;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import javax.annotation.Nullable;
 
 /**
@@ -40,7 +41,7 @@
  * the result set is equivalent across all implementations.
  *
  * <p>The Query engine will use indexed-based execution if a user has configured any index that can
- * be used to execute query (via {@link FirebaseFirestore#setIndexConfiguation}). Otherwise, the
+ * be used to execute query (via {@link FirebaseFirestore#setIndexConfiguration}). Otherwise, the
  * engine will try to optimize the query by re-using a previously persisted query result. If that is
  * not possible, the query will be executed via a full collection scan.
  *
@@ -54,39 +55,50 @@
  * least once and allow the query engine to only read documents that previously matched a query plus
  * any documents that were edited after the query was last listened to.
  *
- * <p>There are some cases where this specific optimization is not guaranteed to produce the same
- * results as full collection scans. In these cases, query processing falls back to full scans.
- * These cases are:
- *
- * <ol>
- *   <li>Limit queries where a document that matched the query previously no longer matches the
- *       query.
- *   <li>Limit queries where a document edit may cause the document to sort below another document
- *       that is in the local cache.
- *   <li>Queries that have never been CURRENT or free of limbo documents.
- * </ol>
+ * <p>For queries that have never been CURRENT or free of limbo documents, this specific
+ * optimization is not guaranteed to produce the same results as full collection scans. So in these
+ * cases, query processing falls back to full scans.
  */
 public class QueryEngine {
   private static final String LOG_TAG = "QueryEngine";
 
+  private static final int DEFAULT_INDEX_AUTO_CREATION_MIN_COLLECTION_SIZE = 100;
+
+  /**
+   * This cost represents the evaluation result of (([index, docKey] + [docKey, docContent]) per
+   * document in the result set) / ([docKey, docContent] per documents in full collection scan)
+   * coming from experiment https://github.com/firebase/firebase-android-sdk/pull/5064.
+   */
+  private static final double DEFAULT_RELATIVE_INDEX_READ_COST_PER_DOCUMENT = 2;
+
   private LocalDocumentsView localDocumentsView;
   private IndexManager indexManager;
   private boolean initialized;
 
+  private boolean indexAutoCreationEnabled = false;
+
+  /** SDK only decides whether it should create index when collection size is larger than this. */
+  private int indexAutoCreationMinCollectionSize = DEFAULT_INDEX_AUTO_CREATION_MIN_COLLECTION_SIZE;
+
+  private double relativeIndexReadCostPerDocument = DEFAULT_RELATIVE_INDEX_READ_COST_PER_DOCUMENT;
+
   public void initialize(LocalDocumentsView localDocumentsView, IndexManager indexManager) {
     this.localDocumentsView = localDocumentsView;
     this.indexManager = indexManager;
     this.initialized = true;
   }
 
+  public void setIndexAutoCreationEnabled(boolean isEnabled) {
+    this.indexAutoCreationEnabled = isEnabled;
+  }
+
   public ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingQuery(
       Query query,
       SnapshotVersion lastLimboFreeSnapshotVersion,
       ImmutableSortedSet<DocumentKey> remoteKeys) {
     hardAssert(initialized, "initialize() not called");
 
-    ImmutableSortedMap<DocumentKey, Document> result =
-        performQueryUsingIndex(query, query.toTarget());
+    ImmutableSortedMap<DocumentKey, Document> result = performQueryUsingIndex(query);
     if (result != null) {
       return result;
     }
@@ -96,29 +108,91 @@ public ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingQuery(
       return result;
     }
 
-    return executeFullCollectionScan(query);
+    QueryContext context = new QueryContext();
+    result = executeFullCollectionScan(query, context);
+    if (result != null && indexAutoCreationEnabled) {
+      createCacheIndexes(query, context, result.size());
+    }
+    return result;
+  }
+
+  /**
+   * Decides whether SDK should create a full matched field index for this query based on query
+   * context and query result size.
+   */
+  private void createCacheIndexes(Query query, QueryContext context, int resultSize) {
+    if (context.getDocumentReadCount() < indexAutoCreationMinCollectionSize) {
+      Logger.debug(
+          LOG_TAG,
+          "SDK will not create cache indexes for query: %s, since it only creates cache indexes "
+              + "for collection contains more than or equal to %s documents.",
+          query.toString(),
+          indexAutoCreationMinCollectionSize);
+      return;
+    }
+
+    Logger.debug(
+        LOG_TAG,
+        "Query: %s, scans %s local documents and returns %s documents as results.",
+        query.toString(),
+        context.getDocumentReadCount(),
+        resultSize);
+
+    if (context.getDocumentReadCount() > relativeIndexReadCostPerDocument * resultSize) {
+      indexManager.createTargetIndexes(query.toTarget());
+      Logger.debug(
+          LOG_TAG,
+          "The SDK decides to create cache indexes for query: %s, as using cache indexes "
+              + "may help improve performance.",
+          query.toString());
+    }
   }
 
   /**
    * Performs an indexed query that evaluates the query based on a collection's persisted index
    * values. Returns {@code null} if an index is not available.
    */
-  private @Nullable ImmutableSortedMap<DocumentKey, Document> performQueryUsingIndex(
-      Query query, Target target) {
+  private @Nullable ImmutableSortedMap<DocumentKey, Document> performQueryUsingIndex(Query query) {
     if (query.matchesAllDocuments()) {
-      // Don't use index queries that can be executed by scanning the collection.
+      // Don't use indexes for queries that can be executed by scanning the collection.
       return null;
     }
 
-    Set<DocumentKey> keys = indexManager.getDocumentsMatchingTarget(target);
-    if (keys == null) {
+    Target target = query.toTarget();
+    IndexType indexType = indexManager.getIndexType(target);
+
+    if (indexType.equals(IndexType.NONE)) {
+      // The target cannot be served from any index.
       return null;
     }
 
+    if (query.hasLimit() && indexType.equals(IndexType.PARTIAL)) {
+      // We cannot apply a limit for targets that are served using a partial index.
+      // If a partial index will be used to serve the target, the query may return a superset of
+      // documents that match the target (for example, if the index doesn't include all the target's
+      // filters), or may return the correct set of documents in the wrong order (for example, if
+      // the index doesn't include a segment for one of the orderBys). Therefore a limit should not
+      // be applied in such cases.
+      return performQueryUsingIndex(query.limitToFirst(Target.NO_LIMIT));
+    }
+
+    List<DocumentKey> keys = indexManager.getDocumentsMatchingTarget(target);
+    hardAssert(keys != null, "index manager must return results for partial and full indexes.");
+
     ImmutableSortedMap<DocumentKey, Document> indexedDocuments =
         localDocumentsView.getDocuments(keys);
-    return appendRemainingResults(
-        values(indexedDocuments), query, indexManager.getMinOffset(target));
+    IndexOffset offset = indexManager.getMinOffset(target);
+
+    ImmutableSortedSet<Document> previousResults = applyQuery(query, indexedDocuments);
+    if (needsRefill(query, keys.size(), previousResults, offset.getReadTime())) {
+      // A limit query whose boundaries change due to local edits can be re-run against the cache
+      // by excluding the limit. This ensures that all documents that match the query's filters are
+      // included in the result set. The SDK can then apply the limit once all local edits are
+      // incorporated.
+      return performQueryUsingIndex(query.limitToFirst(Target.NO_LIMIT));
+    }
+
+    return appendRemainingResults(previousResults, query, offset);
   }
 
   /**
@@ -130,7 +204,7 @@ public ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingQuery(
       ImmutableSortedSet<DocumentKey> remoteKeys,
       SnapshotVersion lastLimboFreeSnapshotVersion) {
     if (query.matchesAllDocuments()) {
-      // Don't use index queries that can be executed by scanning the collection.
+      // Don't use indexes for queries that can be executed by scanning the collection.
       return null;
     }
 
@@ -144,9 +218,7 @@ public ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingQuery(
         localDocumentsView.getDocuments(remoteKeys);
     ImmutableSortedSet<Document> previousResults = applyQuery(query, documents);
 
-    if ((query.hasLimitToFirst() || query.hasLimitToLast())
-        && needsRefill(
-            query.getLimitType(), previousResults, remoteKeys, lastLimboFreeSnapshotVersion)) {
+    if (needsRefill(query, remoteKeys.size(), previousResults, lastLimboFreeSnapshotVersion)) {
       return null;
     }
 
@@ -185,20 +257,27 @@ private ImmutableSortedSet<Document> applyQuery(
    * Determines if a limit query needs to be refilled from cache, making it ineligible for
    * index-free execution.
    *
-   * @param limitType The type of limit query for refill calculation.
-   * @param sortedPreviousResults The documents that matched the query when it was last
-   *     synchronized, sorted by the query's comparator.
-   * @param remoteKeys The document keys that matched the query at the last snapshot.
+   * @param query The query.
+   * @param expectedDocumentCount The number of documents keys that matched the query at the last
+   *     snapshot.
+   * @param sortedPreviousResults The documents that match the query based on the previous result,
+   *     sorted by the query's comparator. The size of the result set may be different from
+   *     `expectedDocumentCount` if documents cease to match the query.
    * @param limboFreeSnapshotVersion The version of the snapshot when the query was last
    *     synchronized.
    */
   private boolean needsRefill(
-      Query.LimitType limitType,
+      Query query,
+      int expectedDocumentCount,
       ImmutableSortedSet<Document> sortedPreviousResults,
-      ImmutableSortedSet<DocumentKey> remoteKeys,
       SnapshotVersion limboFreeSnapshotVersion) {
-    // The query needs to be refilled if a previously matching document no longer matches.
-    if (remoteKeys.size() != sortedPreviousResults.size()) {
+    if (!query.hasLimit()) {
+      // Queries without limits do not need to be refilled.
+      return false;
+    }
+
+    if (expectedDocumentCount != sortedPreviousResults.size()) {
+      // The query needs to be refilled if a previously matching document no longer matches.
       return true;
     }
 
@@ -209,7 +288,7 @@ private boolean needsRefill(
     // did not change and documents from cache will continue to be "rejected" by this boundary.
     // Therefore, we can ignore any modifications that don't affect the last document.
     Document documentAtLimitEdge =
-        limitType == Query.LimitType.LIMIT_TO_FIRST
+        query.getLimitType() == Query.LimitType.LIMIT_TO_FIRST
             ? sortedPreviousResults.getMaxEntry()
             : sortedPreviousResults.getMinEntry();
     if (documentAtLimitEdge == null) {
@@ -220,11 +299,12 @@ private boolean needsRefill(
         || documentAtLimitEdge.getVersion().compareTo(limboFreeSnapshotVersion) > 0;
   }
 
-  private ImmutableSortedMap<DocumentKey, Document> executeFullCollectionScan(Query query) {
+  private ImmutableSortedMap<DocumentKey, Document> executeFullCollectionScan(
+      Query query, QueryContext context) {
     if (Logger.isDebugEnabled()) {
       Logger.debug(LOG_TAG, "Using full collection scan to execute query: %s", query.toString());
     }
-    return localDocumentsView.getDocumentsMatchingQuery(query, IndexOffset.NONE);
+    return localDocumentsView.getDocumentsMatchingQuery(query, IndexOffset.NONE, context);
   }
 
   /**
@@ -241,4 +321,14 @@ private ImmutableSortedMap<DocumentKey, Document> appendRemainingResults(
     }
     return remainingResults;
   }
+
+  @VisibleForTesting
+  void setIndexAutoCreationMinCollectionSize(int newMin) {
+    indexAutoCreationMinCollectionSize = newMin;
+  }
+
+  @VisibleForTesting
+  void setRelativeIndexReadCostPerDocument(double newCost) {
+    relativeIndexReadCostPerDocument = newCost;
+  }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/QueryPurpose.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/QueryPurpose.java
index e56f0cf4e66..7595592ba8e 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/QueryPurpose.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/QueryPurpose.java
@@ -22,6 +22,11 @@ public enum QueryPurpose {
   /** The query was used to refill a query after an existence filter mismatch. */
   EXISTENCE_FILTER_MISMATCH,
 
+  /**
+   * The query target was used if the query is the result of a false positive in the bloom filter.
+   */
+  EXISTENCE_FILTER_MISMATCH_BLOOM,
+
   /** The query was used to resolve a limbo document. */
   LIMBO_RESOLUTION,
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/RemoteDocumentCache.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/RemoteDocumentCache.java
index ad2efd7eeb8..8ff90864342 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/RemoteDocumentCache.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/RemoteDocumentCache.java
@@ -14,13 +14,16 @@
 
 package com.google.firebase.firestore.local;
 
+import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.FieldIndex.IndexOffset;
 import com.google.firebase.firestore.model.MutableDocument;
-import com.google.firebase.firestore.model.ResourcePath;
 import com.google.firebase.firestore.model.SnapshotVersion;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Represents cached documents received from the remote backend.
@@ -77,11 +80,31 @@ interface RemoteDocumentCache {
   Map<DocumentKey, MutableDocument> getAll(String collectionGroup, IndexOffset offset, int limit);
 
   /**
-   * Returns the documents from the provided collection.
+   * Returns the documents that match the given query.
    *
-   * @param collection The collection to read.
+   * @param query The query to match against remote documents.
    * @param offset The read time and document key to start scanning at (exclusive).
+   * @param mutatedKeys The keys of documents who have mutations attached, they should be read
+   *     regardless whether they match the given query.
    * @return A newly created map with the set of documents in the collection.
    */
-  Map<DocumentKey, MutableDocument> getAll(ResourcePath collection, IndexOffset offset);
+  Map<DocumentKey, MutableDocument> getDocumentsMatchingQuery(
+      Query query, IndexOffset offset, @Nonnull Set<DocumentKey> mutatedKeys);
+
+  /**
+   * Returns the documents that match the given query.
+   *
+   * @param query The query to match against remote documents.
+   * @param offset The read time and document key to start scanning at (exclusive).
+   * @param mutatedKeys The keys of documents who have mutations attached, they should be read
+   *     regardless whether they match the given query.
+   * @param context A optional tracker to keep a record of important details during database local
+   *     query execution.
+   * @return A newly created map with the set of documents in the collection.
+   */
+  Map<DocumentKey, MutableDocument> getDocumentsMatchingQuery(
+      Query query,
+      IndexOffset offset,
+      @Nonnull Set<DocumentKey> mutatedKeys,
+      @Nullable QueryContext context);
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteDocumentOverlayCache.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteDocumentOverlayCache.java
index 03a8f726a23..84628edd4a2 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteDocumentOverlayCache.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteDocumentOverlayCache.java
@@ -16,6 +16,7 @@
 
 import static com.google.firebase.firestore.util.Assert.fail;
 import static com.google.firebase.firestore.util.Assert.hardAssert;
+import static com.google.firebase.firestore.util.Preconditions.checkNotNull;
 
 import android.database.Cursor;
 import androidx.annotation.Nullable;
@@ -106,7 +107,7 @@ private void processSingleCollection(
     }
   }
 
-  private void saveOverlay(int largestBatchId, DocumentKey key, @Nullable Mutation mutation) {
+  private void saveOverlay(int largestBatchId, DocumentKey key, Mutation mutation) {
     String group = key.getCollectionGroup();
     String collectionPath = EncodedPath.encode(key.getPath().popLast());
     String documentId = key.getPath().getLastSegment();
@@ -125,9 +126,9 @@ private void saveOverlay(int largestBatchId, DocumentKey key, @Nullable Mutation
   @Override
   public void saveOverlays(int largestBatchId, Map<DocumentKey, Mutation> overlays) {
     for (Map.Entry<DocumentKey, Mutation> entry : overlays.entrySet()) {
-      if (entry.getValue() != null) {
-        saveOverlay(largestBatchId, entry.getKey(), entry.getValue());
-      }
+      DocumentKey key = entry.getKey();
+      Mutation overlay = checkNotNull(entry.getValue(), "null value for key: %s", key);
+      saveOverlay(largestBatchId, key, overlay);
     }
   }
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteIndexManager.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteIndexManager.java
index abd0ff792bb..4a060d2fe02 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteIndexManager.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteIndexManager.java
@@ -17,11 +17,14 @@
 import static com.google.firebase.firestore.model.Values.isArray;
 import static com.google.firebase.firestore.util.Assert.fail;
 import static com.google.firebase.firestore.util.Assert.hardAssert;
+import static com.google.firebase.firestore.util.LogicUtils.getDnfTerms;
 import static com.google.firebase.firestore.util.Util.diffCollections;
 import static com.google.firebase.firestore.util.Util.repeatSequence;
 import static java.lang.Math.max;
 
 import android.text.TextUtils;
+import android.util.Pair;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.firebase.Timestamp;
 import com.google.firebase.database.collection.ImmutableSortedMap;
@@ -30,6 +33,7 @@
 import com.google.firebase.firestore.core.CompositeFilter;
 import com.google.firebase.firestore.core.FieldFilter;
 import com.google.firebase.firestore.core.Filter;
+import com.google.firebase.firestore.core.OrderBy.Direction;
 import com.google.firebase.firestore.core.Target;
 import com.google.firebase.firestore.index.DirectionalIndexByteEncoder;
 import com.google.firebase.firestore.index.FirestoreIndexValueWriter;
@@ -44,9 +48,7 @@
 import com.google.firebase.firestore.model.SnapshotVersion;
 import com.google.firebase.firestore.model.TargetIndexMatcher;
 import com.google.firebase.firestore.util.Logger;
-import com.google.firebase.firestore.util.LogicUtils;
 import com.google.firestore.admin.v1.Index;
-import com.google.firestore.v1.StructuredQuery;
 import com.google.firestore.v1.Value;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.ArrayList;
@@ -54,13 +56,11 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.PriorityQueue;
 import java.util.Queue;
-import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
@@ -150,8 +150,8 @@ public void start() {
                     serializer.decodeFieldIndexSegments(Index.parseFrom(row.getBlob(2)));
 
                 // If we fetched an index state for the user above, combine it with this index.
-                // We use the default state if we don't have an index state (e.g. the index was
-                // created while a different user as logged in).
+                // We use the default state if we don't have an index state (for example, if the
+                // index was created while a different user as logged in).
                 FieldIndex.IndexState indexState =
                     indexStates.containsKey(indexId)
                         ? indexStates.get(indexId)
@@ -233,6 +233,32 @@ public void deleteFieldIndex(FieldIndex index) {
     }
   }
 
+  @Override
+  public void deleteAllFieldIndexes() {
+    db.execute("DELETE FROM index_configuration");
+    db.execute("DELETE FROM index_entries");
+    db.execute("DELETE FROM index_state");
+
+    nextIndexToUpdate.clear();
+    memoizedIndexes.clear();
+  }
+
+  @Override
+  public void createTargetIndexes(Target target) {
+    hardAssert(started, "IndexManager not started");
+
+    for (Target subTarget : getSubTargets(target)) {
+      IndexType type = getIndexType(subTarget);
+      if (type == IndexType.NONE || type == IndexType.PARTIAL) {
+        TargetIndexMatcher targetIndexMatcher = new TargetIndexMatcher(subTarget);
+        FieldIndex fieldIndex = targetIndexMatcher.buildTargetIndex();
+        if (fieldIndex != null) {
+          addFieldIndex(fieldIndex);
+        }
+      }
+    }
+  }
+
   @Override
   public @Nullable String getNextCollectionGroupToUpdate() {
     hardAssert(started, "IndexManager not started");
@@ -293,16 +319,16 @@ private IndexOffset getMinOffset(Collection<FieldIndex> fieldIndexes) {
 
     Iterator<FieldIndex> it = fieldIndexes.iterator();
     IndexOffset minOffset = it.next().getIndexState().getOffset();
-    int minBatchId = minOffset.getLargestBatchId();
+    int maxBatchId = minOffset.getLargestBatchId();
     while (it.hasNext()) {
       IndexOffset newOffset = it.next().getIndexState().getOffset();
       if (newOffset.compareTo(minOffset) < 0) {
         minOffset = newOffset;
       }
-      minBatchId = Math.max(newOffset.getLargestBatchId(), minBatchId);
+      maxBatchId = Math.max(newOffset.getLargestBatchId(), maxBatchId);
     }
 
-    return IndexOffset.create(minOffset.getReadTime(), minOffset.getDocumentKey(), minBatchId);
+    return IndexOffset.create(minOffset.getReadTime(), minOffset.getDocumentKey(), maxBatchId);
   }
 
   @Override
@@ -312,11 +338,44 @@ public IndexOffset getMinOffset(String collectionGroup) {
     return getMinOffset(fieldIndexes);
   }
 
+  @Override
+  public IndexType getIndexType(Target target) {
+    IndexType result = IndexType.FULL;
+    List<Target> subTargets = getSubTargets(target);
+
+    for (Target subTarget : subTargets) {
+      FieldIndex index = getFieldIndex(subTarget);
+      if (index == null) {
+        result = IndexType.NONE;
+        break;
+      }
+
+      if (index.getSegments().size() < subTarget.getSegmentCount()) {
+        result = IndexType.PARTIAL;
+      }
+    }
+
+    // OR queries have more than one sub-target (one sub-target per DNF term). We currently consider
+    // OR queries that have a `limit` to have a partial index. For such queries we perform sorting
+    // and apply the limit in memory as a post-processing step.
+    // TODO(orquery): If we have a FULL index *and* we have the index that can be used for sorting
+    //  all DNF branches on the same value, we can improve performance by performing a JOIN in SQL.
+    //  See b/235224019 for more information.
+    if (target.hasLimit() && subTargets.size() > 1 && result == IndexType.FULL) {
+      return IndexType.PARTIAL;
+    }
+
+    return result;
+  }
+
   @Override
   public IndexOffset getMinOffset(Target target) {
     List<FieldIndex> fieldIndexes = new ArrayList<>();
     for (Target subTarget : getSubTargets(target)) {
-      fieldIndexes.add(getFieldIndex(subTarget));
+      FieldIndex index = getFieldIndex(subTarget);
+      if (index != null) {
+        fieldIndexes.add(index);
+      }
     }
     return getMinOffset(fieldIndexes);
   }
@@ -331,9 +390,7 @@ private List<Target> getSubTargets(Target target) {
     } else {
       // There is an implicit AND operation between all the filters stored in the target.
       List<Filter> dnf =
-          LogicUtils.DnfTransform(
-              new CompositeFilter(
-                  target.getFilters(), StructuredQuery.CompositeFilter.Operator.AND));
+          getDnfTerms(new CompositeFilter(target.getFilters(), CompositeFilter.Operator.AND));
       for (Filter term : dnf) {
         subTargets.add(
             new Target(
@@ -442,22 +499,28 @@ private SortedSet<IndexEntry> getExistingIndexEntries(
   }
 
   @Override
-  public Set<DocumentKey> getDocumentsMatchingTarget(Target target) {
+  public List<DocumentKey> getDocumentsMatchingTarget(Target target) {
     hardAssert(started, "IndexManager not started");
 
     List<String> subQueries = new ArrayList<>();
     List<Object> bindings = new ArrayList<>();
+    List<Pair<Target, FieldIndex>> indexes = new ArrayList<>();
 
     for (Target subTarget : getSubTargets(target)) {
       FieldIndex fieldIndex = getFieldIndex(subTarget);
       if (fieldIndex == null) {
         return null;
       }
+      indexes.add(Pair.create(subTarget, fieldIndex));
+    }
 
+    for (Pair<Target, FieldIndex> pair : indexes) {
+      Target subTarget = pair.first;
+      @NonNull FieldIndex fieldIndex = pair.second;
       @Nullable List<Value> arrayValues = subTarget.getArrayValues(fieldIndex);
       @Nullable Collection<Value> notInValues = subTarget.getNotInValues(fieldIndex);
-      @Nullable Bound lowerBound = subTarget.getLowerBound(fieldIndex);
-      @Nullable Bound upperBound = subTarget.getUpperBound(fieldIndex);
+      Bound lowerBound = subTarget.getLowerBound(fieldIndex);
+      Bound upperBound = subTarget.getUpperBound(fieldIndex);
 
       if (Logger.isDebugEnabled()) {
         Logger.debug(
@@ -471,9 +534,9 @@ public Set<DocumentKey> getDocumentsMatchingTarget(Target target) {
       }
 
       Object[] lowerBoundEncoded = encodeBound(fieldIndex, subTarget, lowerBound);
-      String lowerBoundOp = lowerBound != null && lowerBound.isInclusive() ? ">=" : ">";
+      String lowerBoundOp = lowerBound.isInclusive() ? ">=" : ">";
       Object[] upperBoundEncoded = encodeBound(fieldIndex, subTarget, upperBound);
-      String upperBoundOp = upperBound != null && upperBound.isInclusive() ? "<=" : "<";
+      String upperBoundOp = upperBound.isInclusive() ? "<=" : "<";
       Object[] notInEncoded = encodeValues(fieldIndex, subTarget, notInValues);
 
       Object[] subQueryAndBindings =
@@ -490,23 +553,32 @@ public Set<DocumentKey> getDocumentsMatchingTarget(Target target) {
       bindings.addAll(Arrays.asList(subQueryAndBindings).subList(1, subQueryAndBindings.length));
     }
 
-    String queryString;
-    if (subQueries.size() == 1) {
-      // If there's only one subQuery, just execute the one subQuery.
-      queryString = subQueries.get(0);
-    } else {
-      // Construct "SELECT * FROM (subQuery1 UNION subQuery2 UNION ...) LIMIT N"
-      queryString = "SELECT * FROM (" + TextUtils.join(" UNION ", subQueries) + ")";
-      if (target.getLimit() != -1) {
-        queryString = queryString + " LIMIT " + target.getLimit();
-      }
+    // We are constructing:
+    // SELECT DISTINCT document_key FROM (
+    //   (SELECT ...) UNION (SELECT ...) UNION (SELECT ...)
+    //   ORDER BY ...
+    // )
+    // LIMIT ...
+    //
+    // Note: SQLite does not allow performing ORDER BY on each union clause. The ORDER BY must come
+    // after the last union clause. Also note that LIMIT must be applied *after* the DISTINCT
+    // operator has been performed. When dealing with multiple sub-targets, it's possible that the
+    // same document_key appears multiple times.
+    String unionSubTargets =
+        TextUtils.join(" UNION ", subQueries)
+            + "ORDER BY directional_value, document_key "
+            + (target.getKeyOrder().equals(Direction.ASCENDING) ? "asc " : "desc ");
+
+    String queryString = "SELECT DISTINCT document_key FROM (" + unionSubTargets + ")";
+    if (target.hasLimit()) {
+      queryString = queryString + " LIMIT " + target.getLimit();
     }
 
     hardAssert(bindings.size() < 1000, "Cannot perform query with more than 999 bind elements");
 
     SQLitePersistence.Query query = db.query(queryString).binding(bindings.toArray());
 
-    Set<DocumentKey> result = new HashSet<>();
+    List<DocumentKey> result = new ArrayList<>();
     query.forEach(
         row -> result.add(DocumentKey.fromPath(ResourcePath.fromString(row.getString(0)))));
 
@@ -522,9 +594,9 @@ private Object[] generateQueryAndBindings(
       Target target,
       int indexId,
       @Nullable List<Value> arrayValues,
-      @Nullable Object[] lowerBounds,
+      Object[] lowerBounds,
       String lowerBoundOp,
-      @Nullable Object[] upperBounds,
+      Object[] upperBounds,
       String upperBoundOp,
       @Nullable Object[] notIn) {
     // The number of total statements we union together. This is similar to a distributed normal
@@ -532,9 +604,7 @@ private Object[] generateQueryAndBindings(
     // ARRAY_CONTAINS or ARRAY_CONTAINS_ANY filter combined with the values from the query bounds.
     int statementCount =
         (arrayValues != null ? arrayValues.size() : 1)
-            * max(
-                lowerBounds != null ? lowerBounds.length : 1,
-                upperBounds != null ? upperBounds.length : 1);
+            * max(lowerBounds.length, upperBounds.length);
 
     // Build the statement. We always include the lower bound, and optionally include an array value
     // and an upper bound.
@@ -542,20 +612,11 @@ private Object[] generateQueryAndBindings(
     statement.append("SELECT document_key, directional_value FROM index_entries ");
     statement.append("WHERE index_id = ? AND uid = ? ");
     statement.append("AND array_value = ? ");
-    if (lowerBounds != null) {
-      statement.append("AND directional_value ").append(lowerBoundOp).append(" ? ");
-    }
-    if (upperBounds != null) {
-      statement.append("AND directional_value ").append(upperBoundOp).append(" ? ");
-    }
+    statement.append("AND directional_value ").append(lowerBoundOp).append(" ? ");
+    statement.append("AND directional_value ").append(upperBoundOp).append(" ? ");
 
-    // Create the UNION statement by repeating the above generated statement. We can then add
-    // ordering and a limit clause.
+    // Create the UNION statement by repeating the above generated statement.
     StringBuilder sql = repeatSequence(statement, statementCount, " UNION ");
-    sql.append(" ORDER BY directional_value, document_key ");
-    if (target.getLimit() != -1) {
-      sql.append("LIMIT ").append(target.getLimit()).append(" ");
-    }
 
     if (notIn != null) {
       // Wrap the statement in a NOT-IN call.
@@ -580,10 +641,11 @@ private Object[] fillBounds(
       int statementCount,
       int indexId,
       @Nullable List<Value> arrayValues,
-      @Nullable Object[] lowerBounds,
-      @Nullable Object[] upperBounds,
+      Object[] lowerBounds,
+      Object[] upperBounds,
       @Nullable Object[] notInValues) {
-    int bindsPerStatement = 3 + (lowerBounds != null ? 1 : 0) + (upperBounds != null ? 1 : 0);
+    // Every SQL statement we union together have 5 binds, see generateQueryAndBindings.
+    int bindsPerStatement = 5;
     int statementsPerArrayValue = statementCount / (arrayValues != null ? arrayValues.size() : 1);
 
     Object[] bindArgs =
@@ -598,12 +660,8 @@ private Object[] fillBounds(
               ? encodeSingleElement(arrayValues.get(i / statementsPerArrayValue))
               : EMPTY_BYTES_VALUE;
 
-      if (lowerBounds != null) {
-        bindArgs[offset++] = lowerBounds[i % statementsPerArrayValue];
-      }
-      if (upperBounds != null) {
-        bindArgs[offset++] = upperBounds[i % statementsPerArrayValue];
-      }
+      bindArgs[offset++] = lowerBounds[i % statementsPerArrayValue];
+      bindArgs[offset++] = upperBounds[i % statementsPerArrayValue];
     }
     if (notInValues != null) {
       for (Object notInValue : notInValues) {
@@ -613,9 +671,12 @@ private Object[] fillBounds(
     return bindArgs;
   }
 
+  /**
+   * Returns an index that can be used to serve the provided target. Returns {@code null} if no
+   * index is configured.
+   */
   @Nullable
-  @Override
-  public FieldIndex getFieldIndex(Target target) {
+  private FieldIndex getFieldIndex(Target target) {
     hardAssert(started, "IndexManager not started");
 
     TargetIndexMatcher targetIndexMatcher = new TargetIndexMatcher(target);
@@ -629,21 +690,17 @@ public FieldIndex getFieldIndex(Target target) {
       return null;
     }
 
-    List<FieldIndex> matchingIndexes = new ArrayList<>();
+    // Return the index with the most number of segments.
+    FieldIndex matchingIndex = null;
     for (FieldIndex fieldIndex : collectionIndexes) {
       boolean matches = targetIndexMatcher.servedByIndex(fieldIndex);
-      if (matches) {
-        matchingIndexes.add(fieldIndex);
+      if (matches
+          && (matchingIndex == null
+              || fieldIndex.getSegments().size() > matchingIndex.getSegments().size())) {
+        matchingIndex = fieldIndex;
       }
     }
-
-    if (matchingIndexes.isEmpty()) {
-      return null;
-    }
-
-    // Return the index with the most number of segments
-    return Collections.max(
-        matchingIndexes, (l, r) -> Integer.compare(l.getSegments().size(), r.getSegments().size()));
+    return matchingIndex;
   }
 
   /**
@@ -701,9 +758,7 @@ private byte[] encodeSingleElement(Value value) {
    * Encodes the given bounds according to the specification in {@code target}. For IN queries, a
    * list of possible values is returned.
    */
-  private @Nullable Object[] encodeBound(
-      FieldIndex fieldIndex, Target target, @Nullable Bound bound) {
-    if (bound == null) return null;
+  private Object[] encodeBound(FieldIndex fieldIndex, Target target, Bound bound) {
     return encodeValues(fieldIndex, target, bound.getPosition());
   }
 
@@ -719,7 +774,7 @@ private Object[] getEncodedBytes(List<IndexByteEncoder> encoders) {
   /**
    * Creates a separate encoder for each element of an array.
    *
-   * <p>The method appends each value to all existing encoders (e.g. filter("a", "==",
+   * <p>The method appends each value to all existing encoders (for example, filter("a", "==",
    * "a1").filter("b", "in", ["b1", "b2"]) becomes ["a1,b1", "a1,b2"]). A list of new encoders is
    * returned.
    */
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteLruReferenceDelegate.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteLruReferenceDelegate.java
index f1fc3d3c465..968d2b8031c 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteLruReferenceDelegate.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteLruReferenceDelegate.java
@@ -162,12 +162,17 @@ public int removeOrphanedDocuments(long upperBound) {
     boolean resultsRemaining = true;
 
     List<DocumentKey> docsToRemove = new ArrayList<>();
+    final ResourcePath[] startPath = {ResourcePath.EMPTY};
     while (resultsRemaining) {
       int rowsProccessed =
           persistence
               .query(
-                  "select path from target_documents group by path having COUNT(*) = 1 AND target_id = 0 AND sequence_number <= ? LIMIT ?")
-              .binding(upperBound, REMOVE_ORPHANED_DOCUMENTS_BATCH_SIZE)
+                  "select path from target_documents group by path having COUNT(*) = 1 "
+                      + "AND target_id = 0 AND sequence_number <= ? AND path > ? LIMIT ?")
+              .binding(
+                  upperBound,
+                  EncodedPath.encode(startPath[0]),
+                  REMOVE_ORPHANED_DOCUMENTS_BATCH_SIZE)
               .forEach(
                   row -> {
                     ResourcePath path = EncodedPath.decodeResourcePath(row.getString(0));
@@ -177,6 +182,9 @@ public int removeOrphanedDocuments(long upperBound) {
                       docsToRemove.add(key);
                       removeSentinel(key);
                     }
+
+                    // Set startPath so next batch (if necessary) will pick up from where it's left.
+                    startPath[0] = path;
                   });
 
       resultsRemaining = (rowsProccessed == REMOVE_ORPHANED_DOCUMENTS_BATCH_SIZE);
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteMutationQueue.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteMutationQueue.java
index 4fdc611b5d5..dd70a58d02b 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteMutationQueue.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteMutationQueue.java
@@ -60,7 +60,7 @@ final class SQLiteMutationQueue implements MutationQueue {
   private final LocalSerializer serializer;
   private final IndexManager indexManager;
 
-  /** The normalized uid (e.g. null => "") used in the uid column. */
+  /** The normalized uid (for example, null => "") used in the uid column. */
   private final String uid;
 
   /**
@@ -341,10 +341,10 @@ public List<MutationBatch> getAllMutationBatchesAffectingQuery(Query query) {
     // Scan the document_mutations table looking for documents whose path has a prefix that matches
     // the query path.
     //
-    // The most obvious way to do this would be with a LIKE query with a trailing wildcard (e.g.
-    // path LIKE 'foo/%'). Unfortunately SQLite does not convert a trailing wildcard like that into
-    // the equivalent range scan so a LIKE query ends up being a table scan. The query below is
-    // equivalent but hits the index on both uid and path, so it's much faster.
+    // The most obvious way to do this would be with a LIKE query with a trailing wildcard (for
+    // example, path LIKE 'foo/%'). Unfortunately SQLite does not convert a trailing wildcard like
+    // that into the equivalent range scan so a LIKE query ends up being a table scan. The query
+    // below is equivalent but hits the index on both uid and path, so it's much faster.
 
     // TODO: Actually implement a single-collection query
     //
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteOverlayMigrationManager.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteOverlayMigrationManager.java
index 2ceb7cd3fde..58ea1a60456 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteOverlayMigrationManager.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteOverlayMigrationManager.java
@@ -46,6 +46,10 @@ private void buildOverlays() {
     db.runTransaction(
         "build overlays",
         () -> {
+          if (!hasPendingOverlayMigration()) {
+            return;
+          }
+
           Set<String> userIds = getAllUserIds();
           RemoteDocumentCache remoteDocumentCache = db.getRemoteDocumentCache();
           for (String uid : userIds) {
@@ -60,7 +64,7 @@ private void buildOverlays() {
             }
 
             // Recalculate and save overlays
-            DocumentOverlayCache documentOverlayCache = db.getDocumentOverlay(user);
+            DocumentOverlayCache documentOverlayCache = db.getDocumentOverlayCache(user);
             LocalDocumentsView localView =
                 new LocalDocumentsView(
                     remoteDocumentCache,
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLitePersistence.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLitePersistence.java
index 323383b4c18..b9fe1f19aa6 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLitePersistence.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLitePersistence.java
@@ -191,7 +191,7 @@ BundleCache getBundleCache() {
   }
 
   @Override
-  DocumentOverlayCache getDocumentOverlay(User user) {
+  DocumentOverlayCache getDocumentOverlayCache(User user) {
     return new SQLiteDocumentOverlayCache(this, this.serializer, user);
   }
 
@@ -635,7 +635,8 @@ static class LongQuery {
 
     /**
      * The longer version of the constructor additionally takes {@code argsHead} parameter that
-     * contains parameters that will be reissued in each subquery, i.e. subqueries take the form:
+     * contains parameters that will be reissued in each subquery, specifically, subqueries take the
+     * form:
      *
      * <p>[head][argsHead][an auto-generated comma-separated list of '?' placeholders][tail]
      */
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteRemoteDocumentCache.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteRemoteDocumentCache.java
index d967385e155..b26f9601a81 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteRemoteDocumentCache.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteRemoteDocumentCache.java
@@ -24,6 +24,7 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.Timestamp;
 import com.google.firebase.database.collection.ImmutableSortedMap;
+import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.model.Document;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.FieldIndex.IndexOffset;
@@ -32,6 +33,7 @@
 import com.google.firebase.firestore.model.SnapshotVersion;
 import com.google.firebase.firestore.util.BackgroundQueue;
 import com.google.firebase.firestore.util.Executors;
+import com.google.firebase.firestore.util.Function;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.MessageLite;
 import java.util.ArrayList;
@@ -40,7 +42,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Executor;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 final class SQLiteRemoteDocumentCache implements RemoteDocumentCache {
   /** The number of bind args per collection group in {@link #getAll(String, IndexOffset, int)} */
@@ -135,7 +140,7 @@ public Map<DocumentKey, MutableDocument> getAll(Iterable<DocumentKey> documentKe
     while (longQuery.hasMoreSubqueries()) {
       longQuery
           .performNextSubquery()
-          .forEach(row -> processRowInBackground(backgroundQueue, results, row));
+          .forEach(row -> processRowInBackground(backgroundQueue, results, row, /*filter*/ null));
     }
     backgroundQueue.drain();
     return results;
@@ -153,7 +158,7 @@ public Map<DocumentKey, MutableDocument> getAll(
     if (collections.isEmpty()) {
       return Collections.emptyMap();
     } else if (BINDS_PER_STATEMENT * collections.size() < SQLitePersistence.MAX_ARGS) {
-      return getAll(collections, offset, limit);
+      return getAll(collections, offset, limit, /*filter*/ null);
     } else {
       // We need to fan out our collection scan since SQLite only supports 999 binds per statement.
       Map<DocumentKey, MutableDocument> results = new HashMap<>();
@@ -161,7 +166,10 @@ public Map<DocumentKey, MutableDocument> getAll(
       for (int i = 0; i < collections.size(); i += pageSize) {
         results.putAll(
             getAll(
-                collections.subList(i, Math.min(collections.size(), i + pageSize)), offset, limit));
+                collections.subList(i, Math.min(collections.size(), i + pageSize)),
+                offset,
+                limit,
+                /*filter*/ null));
       }
       return firstNEntries(results, limit, IndexOffset.DOCUMENT_COMPARATOR);
     }
@@ -171,7 +179,11 @@ public Map<DocumentKey, MutableDocument> getAll(
    * Returns the next {@code count} documents from the provided collections, ordered by read time.
    */
   private Map<DocumentKey, MutableDocument> getAll(
-      List<ResourcePath> collections, IndexOffset offset, int count) {
+      List<ResourcePath> collections,
+      IndexOffset offset,
+      int count,
+      @Nullable Function<MutableDocument, Boolean> filter,
+      @Nullable QueryContext context) {
     Timestamp readTime = offset.getReadTime().getTimestamp();
     DocumentKey documentKey = offset.getDocumentKey();
 
@@ -207,13 +219,30 @@ private Map<DocumentKey, MutableDocument> getAll(
     Map<DocumentKey, MutableDocument> results = new HashMap<>();
     db.query(sql.toString())
         .binding(bindVars)
-        .forEach(row -> processRowInBackground(backgroundQueue, results, row));
+        .forEach(
+            row -> {
+              processRowInBackground(backgroundQueue, results, row, filter);
+              if (context != null) {
+                context.incrementDocumentReadCount();
+              }
+            });
     backgroundQueue.drain();
     return results;
   }
 
+  private Map<DocumentKey, MutableDocument> getAll(
+      List<ResourcePath> collections,
+      IndexOffset offset,
+      int count,
+      @Nullable Function<MutableDocument, Boolean> filter) {
+    return getAll(collections, offset, count, filter, /*context*/ null);
+  }
+
   private void processRowInBackground(
-      BackgroundQueue backgroundQueue, Map<DocumentKey, MutableDocument> results, Cursor row) {
+      BackgroundQueue backgroundQueue,
+      Map<DocumentKey, MutableDocument> results,
+      Cursor row,
+      @Nullable Function<MutableDocument, Boolean> filter) {
     byte[] rawDocument = row.getBlob(0);
     int readTimeSeconds = row.getInt(1);
     int readTimeNanos = row.getInt(2);
@@ -225,15 +254,32 @@ private void processRowInBackground(
         () -> {
           MutableDocument document =
               decodeMaybeDocument(rawDocument, readTimeSeconds, readTimeNanos);
-          synchronized (results) {
-            results.put(document.getKey(), document);
+          if (filter == null || filter.apply(document)) {
+            synchronized (results) {
+              results.put(document.getKey(), document);
+            }
           }
         });
   }
 
   @Override
-  public Map<DocumentKey, MutableDocument> getAll(ResourcePath collection, IndexOffset offset) {
-    return getAll(Collections.singletonList(collection), offset, Integer.MAX_VALUE);
+  public Map<DocumentKey, MutableDocument> getDocumentsMatchingQuery(
+      Query query, IndexOffset offset, @Nonnull Set<DocumentKey> mutatedKeys) {
+    return getDocumentsMatchingQuery(query, offset, mutatedKeys, /*context*/ null);
+  }
+
+  @Override
+  public Map<DocumentKey, MutableDocument> getDocumentsMatchingQuery(
+      Query query,
+      IndexOffset offset,
+      @Nonnull Set<DocumentKey> mutatedKeys,
+      @Nullable QueryContext context) {
+    return getAll(
+        Collections.singletonList(query.getPath()),
+        offset,
+        Integer.MAX_VALUE,
+        (MutableDocument doc) -> query.matches(doc) || mutatedKeys.contains(doc.getKey()),
+        context);
   }
 
   private MutableDocument decodeMaybeDocument(
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteSchema.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteSchema.java
index 06489763e48..b0c8ac2dabd 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteSchema.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteSchema.java
@@ -526,10 +526,11 @@ private void createV8CollectionParentsIndex() {
     ifTablesDontExist(
         new String[] {"collection_parents"},
         () -> {
-          // A table storing associations between a Collection ID (e.g. 'messages') to a parent path
-          // (e.g. '/chats/123') that contains it as a (sub)collection. This is used to efficiently
-          // find all collections to query when performing a Collection Group query. Note that the
-          // parent path will be an empty path in the case of root-level collections.
+          // A table storing associations between a Collection ID (for example, 'messages') to a
+          // parent path (for example, '/chats/123') that contains it as a (sub)collection. This is
+          // used to efficiently find all collections to query when performing a Collection Group
+          // query. Note that the parent path will be an empty path in the case of root-level
+          // collections.
           db.execSQL(
               "CREATE TABLE collection_parents ("
                   + "collection_id TEXT, "
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/TargetCache.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/TargetCache.java
index 3a6bf7cfd93..0b39babfb5f 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/TargetCache.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/TargetCache.java
@@ -52,9 +52,9 @@ interface TargetCache {
   /**
    * A global snapshot version representing the last consistent snapshot we received from the
    * backend. This is monotonically increasing and any snapshots received from the backend prior to
-   * this version (e.g. for targets resumed with a resume_token) should be suppressed (buffered)
-   * until the backend has caught up to this snapshot version again. This prevents our cache from
-   * ever going backwards in time.
+   * this version (for example, for targets resumed with a resume_token) should be suppressed
+   * (buffered) until the backend has caught up to this snapshot version again. This prevents our
+   * cache from ever going backwards in time.
    *
    * <p>This is updated whenever our we get a TargetChange with a read_time and empty target_ids.
    */
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/TargetData.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/TargetData.java
index 18375731fe0..6d0dda95678 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/TargetData.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/TargetData.java
@@ -16,10 +16,12 @@
 
 import static com.google.firebase.firestore.util.Preconditions.checkNotNull;
 
+import androidx.annotation.Nullable;
 import com.google.firebase.firestore.core.Target;
 import com.google.firebase.firestore.model.SnapshotVersion;
 import com.google.firebase.firestore.remote.WatchStream;
 import com.google.protobuf.ByteString;
+import java.util.Objects;
 
 /** An immutable set of metadata that the store will need to keep track of for each target. */
 public final class TargetData {
@@ -30,6 +32,7 @@ public final class TargetData {
   private final SnapshotVersion snapshotVersion;
   private final SnapshotVersion lastLimboFreeSnapshotVersion;
   private final ByteString resumeToken;
+  private final @Nullable Integer expectedCount;
 
   /**
    * Creates a new TargetData with the given values.
@@ -45,6 +48,9 @@ public final class TargetData {
    * @param resumeToken An opaque, server-assigned token that allows watching a target to be resumed
    *     after disconnecting without retransmitting all the data that matches the target. The resume
    *     token essentially identifies a point in time from which the server should resume sending
+   * @param expectedCount The number of documents that last matched the query at the resume token or
+   *     read time. Documents are counted only when making a listen request with resume token or
+   *     read time, otherwise, keep it null.
    */
   TargetData(
       Target target,
@@ -53,7 +59,8 @@ public final class TargetData {
       QueryPurpose purpose,
       SnapshotVersion snapshotVersion,
       SnapshotVersion lastLimboFreeSnapshotVersion,
-      ByteString resumeToken) {
+      ByteString resumeToken,
+      @Nullable Integer expectedCount) {
     this.target = checkNotNull(target);
     this.targetId = targetId;
     this.sequenceNumber = sequenceNumber;
@@ -61,6 +68,7 @@ public final class TargetData {
     this.purpose = purpose;
     this.snapshotVersion = checkNotNull(snapshotVersion);
     this.resumeToken = checkNotNull(resumeToken);
+    this.expectedCount = expectedCount;
   }
 
   /** Convenience constructor for use when creating a TargetData for the first time. */
@@ -72,7 +80,8 @@ public TargetData(Target target, int targetId, long sequenceNumber, QueryPurpose
         purpose,
         SnapshotVersion.NONE,
         SnapshotVersion.NONE,
-        WatchStream.EMPTY_RESUME_TOKEN);
+        WatchStream.EMPTY_RESUME_TOKEN,
+        null);
   }
 
   /** Creates a new target data instance with an updated sequence number. */
@@ -84,7 +93,8 @@ public TargetData withSequenceNumber(long sequenceNumber) {
         purpose,
         snapshotVersion,
         lastLimboFreeSnapshotVersion,
-        resumeToken);
+        resumeToken,
+        expectedCount);
   }
 
   /** Creates a new target data instance with an updated resume token and snapshot version. */
@@ -96,7 +106,21 @@ public TargetData withResumeToken(ByteString resumeToken, SnapshotVersion snapsh
         purpose,
         snapshotVersion,
         lastLimboFreeSnapshotVersion,
-        resumeToken);
+        resumeToken,
+        /* expectedCount= */ null);
+  }
+
+  /** Creates a new target data instance with an updated expected count. */
+  public TargetData withExpectedCount(@Nullable Integer expectedCount) {
+    return new TargetData(
+        target,
+        targetId,
+        sequenceNumber,
+        purpose,
+        snapshotVersion,
+        lastLimboFreeSnapshotVersion,
+        resumeToken,
+        expectedCount);
   }
 
   /** Creates a new target data instance with an updated last limbo free snapshot version number. */
@@ -108,7 +132,8 @@ public TargetData withLastLimboFreeSnapshotVersion(SnapshotVersion lastLimboFree
         purpose,
         snapshotVersion,
         lastLimboFreeSnapshotVersion,
-        resumeToken);
+        resumeToken,
+        expectedCount);
   }
 
   public Target getTarget() {
@@ -135,6 +160,11 @@ public ByteString getResumeToken() {
     return resumeToken;
   }
 
+  @Nullable
+  public Integer getExpectedCount() {
+    return expectedCount;
+  }
+
   /**
    * Returns the last snapshot version for which the associated view contained no limbo documents.
    */
@@ -158,7 +188,8 @@ public boolean equals(Object o) {
         && purpose.equals(targetData.purpose)
         && snapshotVersion.equals(targetData.snapshotVersion)
         && lastLimboFreeSnapshotVersion.equals(targetData.lastLimboFreeSnapshotVersion)
-        && resumeToken.equals(targetData.resumeToken);
+        && resumeToken.equals(targetData.resumeToken)
+        && Objects.equals(expectedCount, targetData.expectedCount);
   }
 
   @Override
@@ -170,6 +201,7 @@ public int hashCode() {
     result = 31 * result + snapshotVersion.hashCode();
     result = 31 * result + lastLimboFreeSnapshotVersion.hashCode();
     result = 31 * result + resumeToken.hashCode();
+    result = 31 * result + Objects.hashCode(expectedCount);
     return result;
   }
 
@@ -190,6 +222,8 @@ public String toString() {
         + lastLimboFreeSnapshotVersion
         + ", resumeToken="
         + resumeToken
+        + ", expectedCount="
+        + expectedCount
         + '}';
   }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/Document.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/Document.java
index 1740168281f..75b7dc3dbb4 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/Document.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/Document.java
@@ -42,8 +42,8 @@ public interface Document {
   SnapshotVersion getReadTime();
 
   /**
-   * Returns whether this document is valid (i.e. it is an entry in the RemoteDocumentCache, was
-   * created by a mutation or read from the backend).
+   * Returns whether this document is valid (specifically, it is an entry in the
+   * RemoteDocumentCache, was created by a mutation or read from the backend).
    */
   boolean isValidDocument();
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/DocumentKey.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/DocumentKey.java
index c1cfcce3a05..d0f2b203af7 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/DocumentKey.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/DocumentKey.java
@@ -108,7 +108,7 @@ public ResourcePath getPath() {
     return path;
   }
 
-  /** Returns the collection group (i.e. the name of the parent collection) for this key. */
+  /** Returns the collection group (that is, the name of the parent collection) for this key. */
   public String getCollectionGroup() {
     return path.getSegment(path.length() - 2);
   }
@@ -118,7 +118,7 @@ public ResourcePath getCollectionPath() {
     return path.popLast();
   }
 
-  /** Returns the ID for this document key (i.e. the last path segment). */
+  /** Returns the ID for this document key (that is, the last path segment). */
   public String getDocumentId() {
     return path.getLastSegment();
   }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/FieldIndex.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/FieldIndex.java
index 14e95c5ae67..af319b81fc4 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/FieldIndex.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/FieldIndex.java
@@ -67,7 +67,7 @@ public abstract class FieldIndex {
   /** An index component consisting of field path and index type. */
   @AutoValue
   public abstract static class Segment implements Comparable<Segment> {
-    /** The type of the index, e.g. for which type of query it can be used. */
+    /** The type of the index. For which type of query it can be used. */
     public enum Kind {
       /** Ordered index. Can be used for <, <=, ==, >=, >, !=, IN and NOT IN queries. */
       ASCENDING,
@@ -193,8 +193,8 @@ public static FieldIndex create(
   }
 
   /**
-   * The index ID. Returns -1 if the index ID is not available (e.g. the index has not yet been
-   * persisted).
+   * The index ID. Returns -1 if the index ID is not available (for example, the index has not yet
+   * been persisted).
    */
   public abstract int getIndexId();
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/MutableDocument.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/MutableDocument.java
index 923fb08b90d..96ed610fd79 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/MutableDocument.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/MutableDocument.java
@@ -43,8 +43,8 @@ private enum DocumentType {
     /** Represents that no documents exists for the key at the given version. */
     NO_DOCUMENT,
     /**
-     * Represents an existing document whose data is unknown (e.g. a document that was updated
-     * without a known base document).
+     * Represents an existing document whose data is unknown (for example, a document that was
+     * updated without a known base document).
      */
     UNKNOWN_DOCUMENT;
   }
@@ -113,7 +113,7 @@ public static MutableDocument newNoDocument(DocumentKey documentKey, SnapshotVer
 
   /**
    * Creates a new document that is known to exist at the given version but whose data is not known
-   * (e.g. a document that was updated without a known base document).
+   * (for example, a document that was updated without a known base document).
    */
   public static MutableDocument newUnknownDocument(
       DocumentKey documentKey, SnapshotVersion version) {
@@ -142,7 +142,7 @@ public MutableDocument convertToNoDocument(SnapshotVersion version) {
 
   /**
    * Changes the document type to indicate that it exists at a given version but that its data is
-   * not known (e.g. a document that was updated without a known base document).
+   * not known (for example, a document that was updated without a known base document).
    */
   public MutableDocument convertToUnknownDocument(SnapshotVersion version) {
     this.version = version;
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/ResourcePath.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/ResourcePath.java
index 4bf0714b034..c96fcbdc3ee 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/ResourcePath.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/ResourcePath.java
@@ -38,7 +38,7 @@ public static ResourcePath fromSegments(List<String> segments) {
 
   public static ResourcePath fromString(String path) {
     // NOTE: The client is ignorant of any path segments containing escape
-    // sequences (e.g. __id123__) and just passes them through raw (they exist
+    // sequences (for example, __id123__) and just passes them through raw (they exist
     // for legacy reasons and should not be used frequently).
 
     if (path.contains("//")) {
@@ -63,7 +63,7 @@ public static ResourcePath fromString(String path) {
   @Override
   public String canonicalString() {
     // NOTE: The client is ignorant of any path segments containing escape
-    // sequences (e.g. __id123__) and just passes them through raw (they exist
+    // sequences (for example, __id123__) and just passes them through raw (they exist
     // for legacy reasons and should not be used frequently).
     StringBuilder builder = new StringBuilder();
     for (int i = 0; i < segments.size(); i++) {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/ServerTimestamps.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/ServerTimestamps.java
index 7ae19eadcca..d8a6a1805d8 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/ServerTimestamps.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/ServerTimestamps.java
@@ -30,7 +30,7 @@
  * <p>Notes:
  * <li>ServerTimestamp Values are created as the result of applying a transform. They can only exist
  *     in the local view of a document. Therefore they do not need to be parsed or serialized.
- * <li>When evaluated locally (e.g. via DocumentSnapshot data), they evaluate to null.
+ * <li>When evaluated locally (for example, via DocumentSnapshot data), they evaluate to null.
  * <li>They sort after all Timestamp Values. With respect to other ServerTimestamp Values, they sort
  *     by their localWriteTime.
  */
@@ -62,6 +62,16 @@ public static Value valueOf(Timestamp localWriteTime, @Nullable Value previousVa
             .putFields(TYPE_KEY, encodedType)
             .putFields(LOCAL_WRITE_TIME_KEY, encodeWriteTime);
 
+    // We should avoid storing deeply nested server timestamp map values, because we never use the
+    // intermediate "previous values".
+    // For example:
+    // previous: 42L, add: t1, result: t1 -> 42L
+    // previous: t1,  add: t2, result: t2 -> 42L (NOT t2 -> t1 -> 42L)
+    // previous: t2,  add: t3, result: t3 -> 42L (NOT t3 -> t2 -> t1 -> 42L)
+    // previous: t3,  add: t4, result: t4 -> 42L (NOT t4 -> t3 -> t2 -> t1 -> 42L)
+    // `getPreviousValue` recursively traverses server timestamps to find the least recent Value.
+    previousValue =
+        isServerTimestamp(previousValue) ? getPreviousValue(previousValue) : previousValue;
     if (previousValue != null) {
       mapRepresentation.putFields(PREVIOUS_VALUE_KEY, previousValue);
     }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/TargetIndexMatcher.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/TargetIndexMatcher.java
index 92fe3490a6e..ecfe043aaeb 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/TargetIndexMatcher.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/TargetIndexMatcher.java
@@ -22,8 +22,12 @@
 import com.google.firebase.firestore.core.OrderBy;
 import com.google.firebase.firestore.core.Target;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 /**
  * A light query planner for Firestore.
@@ -84,7 +88,11 @@ public class TargetIndexMatcher {
   // The collection ID (or collection group) of the query target.
   private final String collectionId;
 
-  private @Nullable FieldFilter inequalityFilter;
+  // The inequality filters of the target (if it exists).
+  // Note: The sort on FieldFilters is not required. Using SortedSet here just to utilize
+  // the custom comparator.
+  private final SortedSet<FieldFilter> inequalityFilters;
+
   private final List<FieldFilter> equalityFilters;
   private final List<OrderBy> orderBys;
 
@@ -94,22 +102,23 @@ public TargetIndexMatcher(Target target) {
             ? target.getCollectionGroup()
             : target.getPath().getLastSegment();
     orderBys = target.getOrderBy();
-    inequalityFilter = null;
+    inequalityFilters = new TreeSet<>((lhs, rhs) -> lhs.getField().compareTo(rhs.getField()));
     equalityFilters = new ArrayList<>();
 
     for (Filter filter : target.getFilters()) {
       FieldFilter fieldFilter = (FieldFilter) filter;
       if (fieldFilter.isInequality()) {
-        hardAssert(
-            inequalityFilter == null || inequalityFilter.getField().equals(fieldFilter.getField()),
-            "Only a single inequality is supported");
-        inequalityFilter = fieldFilter;
+        inequalityFilters.add(fieldFilter);
       } else {
         equalityFilters.add(fieldFilter);
       }
     }
   }
 
+  public boolean hasMultipleInequality() {
+    return inequalityFilters.size() > 1;
+  }
+
   /**
    * Returns whether the index can be used to serve the TargetIndexMatcher's target.
    *
@@ -134,6 +143,12 @@ public TargetIndexMatcher(Target target) {
   public boolean servedByIndex(FieldIndex index) {
     hardAssert(index.getCollectionGroup().equals(collectionId), "Collection IDs do not match");
 
+    if (hasMultipleInequality()) {
+      // Only single inequality is supported for now.
+      // TODO(Add support for multiple inequality query): b/298441043
+      return false;
+    }
+
     // If there is an array element, find a matching filter.
     FieldIndex.Segment arraySegment = index.getArraySegment();
     if (arraySegment != null && !hasMatchingEqualityFilter(arraySegment)) {
@@ -144,14 +159,14 @@ public boolean servedByIndex(FieldIndex index) {
     List<FieldIndex.Segment> segments = index.getDirectionalSegments();
     int segmentIndex = 0;
 
+    Set<String> equalitySegments = new HashSet<>();
     // Process all equalities first. Equalities can appear out of order.
     for (; segmentIndex < segments.size(); ++segmentIndex) {
       // We attempt to greedily match all segments to equality filters. If a filter matches an
-      // index segment, we can mark the segment as used. Since it is not possible to use the same
-      // field path in both an equality and inequality/oderBy clause, we do not have to consider the
-      // possibility that a matching equality segment should instead be used to map to an inequality
-      // filter or orderBy clause.
-      if (!hasMatchingEqualityFilter(segments.get(segmentIndex))) {
+      // index segment, we can mark the segment as used.
+      if (hasMatchingEqualityFilter(segments.get(segmentIndex))) {
+        equalitySegments.add(segments.get(segmentIndex).getFieldPath().canonicalString());
+      } else {
         // If we cannot find a matching filter, we need to verify whether the remaining segments map
         // to the target's inequality and its orderBy clauses.
         break;
@@ -165,13 +180,20 @@ public boolean servedByIndex(FieldIndex index) {
       return true;
     }
 
-    // If there is an inequality filter, the next segment must match both the filter and the first
-    // orderBy clause.
-    if (inequalityFilter != null) {
-      FieldIndex.Segment segment = segments.get(segmentIndex);
-      if (!matchesFilter(inequalityFilter, segment) || !matchesOrderBy(orderBys.next(), segment)) {
-        return false;
+    if (inequalityFilters.size() > 0) {
+      // Only a single inequality is currently supported. Get the only entry in the set.
+      FieldFilter inequalityFilter = this.inequalityFilters.first();
+
+      // If there is an inequality filter and the field was not in one of the equality filters
+      // above, the next segment must match both the filter and the first orderBy clause.
+      if (!equalitySegments.contains(inequalityFilter.getField().canonicalString())) {
+        FieldIndex.Segment segment = segments.get(segmentIndex);
+        if (!matchesFilter(inequalityFilter, segment)
+            || !matchesOrderBy(orderBys.next(), segment)) {
+          return false;
+        }
       }
+
       ++segmentIndex;
     }
 
@@ -186,6 +208,70 @@ public boolean servedByIndex(FieldIndex index) {
     return true;
   }
 
+  /**
+   * Returns a full matched field index for this target. Currently multiple inequality query is not
+   * supported so function returns null.
+   */
+  @Nullable
+  public FieldIndex buildTargetIndex() {
+    if (hasMultipleInequality()) {
+      return null;
+    }
+
+    // We want to make sure only one segment created for one field. For example, in case like
+    // a == 3 and a > 2, Index: {a ASCENDING} will only be created once.
+    Set<FieldPath> uniqueFields = new HashSet<>();
+    List<FieldIndex.Segment> segments = new ArrayList<>();
+
+    for (FieldFilter filter : equalityFilters) {
+      if (filter.getField().isKeyField()) {
+        continue;
+      }
+      boolean isArrayOperator =
+          filter.getOperator().equals(FieldFilter.Operator.ARRAY_CONTAINS)
+              || filter.getOperator().equals(FieldFilter.Operator.ARRAY_CONTAINS_ANY);
+      if (isArrayOperator) {
+        segments.add(
+            FieldIndex.Segment.create(filter.getField(), FieldIndex.Segment.Kind.CONTAINS));
+      } else {
+        if (uniqueFields.contains(filter.getField())) {
+          continue;
+        }
+        uniqueFields.add(filter.getField());
+        segments.add(
+            FieldIndex.Segment.create(filter.getField(), FieldIndex.Segment.Kind.ASCENDING));
+      }
+    }
+
+    // Note: We do not explicitly check `inequalityFilter` but rather rely on the target defining an
+    // appropriate `orderBys` to ensure that the required index segment is added. The query engine
+    // would reject a query with an inequality filter that lacks the required order-by clause.
+    for (OrderBy orderBy : orderBys) {
+      // Stop adding more segments if we see a order-by on key. Typically this is the default
+      // implicit order-by which is covered in the index_entry table as a separate column.
+      // If it is not the default order-by, the generated index will be missing some segments
+      // optimized for order-bys, which is probably fine.
+      if (orderBy.getField().isKeyField()) {
+        continue;
+      }
+
+      if (uniqueFields.contains(orderBy.getField())) {
+        continue;
+      }
+      uniqueFields.add(orderBy.getField());
+
+      segments.add(
+          FieldIndex.Segment.create(
+              orderBy.getField(),
+              orderBy.getDirection() == OrderBy.Direction.ASCENDING
+                  ? FieldIndex.Segment.Kind.ASCENDING
+                  : FieldIndex.Segment.Kind.DESCENDING));
+    }
+
+    return FieldIndex.create(
+        FieldIndex.UNKNOWN_ID, collectionId, segments, FieldIndex.INITIAL_STATE);
+  }
+
   private boolean hasMatchingEqualityFilter(FieldIndex.Segment segment) {
     for (FieldFilter filter : equalityFilters) {
       if (matchesFilter(filter, segment)) {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/Values.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/Values.java
index d0d75daee00..2830f810e42 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/Values.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/Values.java
@@ -228,28 +228,36 @@ public static int compare(Value left, Value right) {
     }
   }
 
-  public static @Nullable Value max(@Nullable Value left, @Nullable Value right) {
-    if (left == null && right == null) {
-      return null;
-    } else if (left == null) {
-      return right;
-    } else if (right == null) {
-      return left;
-    } else {
-      return compare(left, right) > 0 ? left : right;
+  public static int lowerBoundCompare(
+      Value left, boolean leftInclusive, Value right, boolean rightInclusive) {
+    int cmp = compare(left, right);
+    if (cmp != 0) {
+      return cmp;
     }
+
+    if (leftInclusive && !rightInclusive) {
+      return -1;
+    } else if (!leftInclusive && rightInclusive) {
+      return 1;
+    }
+
+    return 0;
   }
 
-  public static @Nullable Value min(@Nullable Value left, @Nullable Value right) {
-    if (left == null && right == null) {
-      return null;
-    } else if (left == null) {
-      return right;
-    } else if (right == null) {
-      return left;
-    } else {
-      return compare(left, right) < 0 ? left : right;
+  public static int upperBoundCompare(
+      Value left, boolean leftInclusive, Value right, boolean rightInclusive) {
+    int cmp = compare(left, right);
+    if (cmp != 0) {
+      return cmp;
     }
+
+    if (leftInclusive && !rightInclusive) {
+      return 1;
+    } else if (!leftInclusive && rightInclusive) {
+      return -1;
+    }
+
+    return 0;
   }
 
   private static int compareNumbers(Value left, Value right) {
@@ -396,9 +404,9 @@ private static void canonifyReference(StringBuilder builder, Value value) {
   }
 
   private static void canonifyObject(StringBuilder builder, MapValue mapValue) {
-    // Even though MapValue are likely sorted correctly based on their insertion order (e.g. when
-    // received from the backend), local modifications can bring elements out of order. We need to
-    // re-sort the elements to ensure that canonical IDs are independent of insertion order.
+    // Even though MapValue are likely sorted correctly based on their insertion order (for example,
+    // when received from the backend), local modifications can bring elements out of order. We need
+    // to re-sort the elements to ensure that canonical IDs are independent of insertion order.
     List<String> keys = new ArrayList<>(mapValue.getFieldsMap().keySet());
     Collections.sort(keys);
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/DeleteMutation.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/DeleteMutation.java
index ffae5ab8063..89a0c3f38e8 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/DeleteMutation.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/DeleteMutation.java
@@ -79,4 +79,9 @@ public void applyToRemoteDocument(MutableDocument document, MutationResult mutat
 
     return previousMask;
   }
+
+  @Override
+  public @Nullable FieldMask getFieldMask() {
+    return null;
+  }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/Mutation.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/Mutation.java
index bf5e337d040..dd0fe4eaf94 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/Mutation.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/Mutation.java
@@ -87,6 +87,7 @@ public abstract class Mutation {
    * of the document, and a {@link FieldMask} representing the fields that are mutated by the local
    * mutations.
    */
+  @Nullable
   public static Mutation calculateOverlayMutation(MutableDocument doc, @Nullable FieldMask mask) {
     if ((!doc.hasLocalMutations()) || (mask != null && mask.getMask().isEmpty())) {
       return null;
@@ -140,8 +141,8 @@ public List<FieldTransform> getFieldTransforms() {
 
   /**
    * Applies this mutation to the given Document for the purposes of computing a new remote document
-   * If the input document doesn't match the expected state (e.g. it is invalid or outdated), the
-   * document state may transition to unknown.
+   * If the input document doesn't match the expected state (for example, the document is invalid or
+   * outdated), the document state may transition to unknown.
    *
    * @param document The document to mutate.
    * @param mutationResult The result of applying the mutation from the backend.
@@ -163,6 +164,12 @@ public abstract void applyToRemoteDocument(
   public abstract @Nullable FieldMask applyToLocalView(
       MutableDocument document, @Nullable FieldMask previousMask, Timestamp localWriteTime);
 
+  /**
+   * Returns a {@code FieldMask} representing the fields that will be changed by applying this
+   * mutation. Returns {@code null} if the mutation will overwrite the entire document.
+   */
+  public abstract @Nullable FieldMask getFieldMask();
+
   /** Helper for derived classes to implement .equals(). */
   boolean hasSameKeyAndPrecondition(Mutation other) {
     return key.equals(other.key) && precondition.equals(other.precondition);
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/MutationBatch.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/MutationBatch.java
index e234b3a7fc5..1b18b2090f4 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/MutationBatch.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/MutationBatch.java
@@ -18,8 +18,7 @@
 
 import androidx.annotation.Nullable;
 import com.google.firebase.Timestamp;
-import com.google.firebase.database.collection.ImmutableSortedMap;
-import com.google.firebase.firestore.model.Document;
+import com.google.firebase.firestore.local.OverlayedDocument;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.MutableDocument;
 import com.google.firebase.firestore.model.SnapshotVersion;
@@ -101,14 +100,12 @@ public void applyToRemoteDocument(MutableDocument document, MutationBatchResult
   }
 
   /**
-   * Computes the local view of a document given all the mutations in this batch. Returns an {@link
-   * FieldMask} representing all the fields that are mutated.
+   * Computes the local view of a document given all the mutations in this batch.
+   *
+   * @param mutatedFields The document to be mutated.
+   * @param mutatedFields Fields that are already mutated before applying the current one.
+   * @return An {@link FieldMask} representing all the fields that are mutated.
    */
-  public FieldMask applyToLocalView(MutableDocument document) {
-    FieldMask mutatedFields = FieldMask.fromSet(new HashSet<>());
-    return applyToLocalView(document, mutatedFields);
-  }
-
   public FieldMask applyToLocalView(MutableDocument document, @Nullable FieldMask mutatedFields) {
     // First, apply the base state. This allows us to apply non-idempotent transform against a
     // consistent set of values.
@@ -136,7 +133,8 @@ public FieldMask applyToLocalView(MutableDocument document, @Nullable FieldMask
    * applications.
    */
   public Map<DocumentKey, Mutation> applyToLocalDocumentSet(
-      ImmutableSortedMap<DocumentKey, Document> documentMap) {
+      Map<DocumentKey, OverlayedDocument> documentMap,
+      Set<DocumentKey> documentsWithoutRemoteVersion) {
     // TODO(mrschmidt): This implementation is O(n^2). If we iterate through the mutations first
     // (as done in `applyToLocalView(MutableDocument d)`), we can reduce the complexity to
     // O(n).
@@ -144,10 +142,17 @@ public Map<DocumentKey, Mutation> applyToLocalDocumentSet(
     for (DocumentKey key : getKeys()) {
       // TODO(mutabledocuments): This method should take a map of MutableDocuments and we should
       // remove this cast.
-      MutableDocument document = (MutableDocument) documentMap.get(key);
-      FieldMask mutatedFields = applyToLocalView(document);
+      OverlayedDocument overlayedDocument = documentMap.get(key);
+      MutableDocument document = (MutableDocument) overlayedDocument.getDocument();
+      FieldMask mutatedFields = applyToLocalView(document, documentMap.get(key).getMutatedFields());
+      // Set mutationFields to null if the document is only from local mutations, this creates
+      // a Set(or Delete) mutation, instead of trying to create a patch mutation as the overlay.
+      mutatedFields = documentsWithoutRemoteVersion.contains(key) ? null : mutatedFields;
       Mutation overlay = Mutation.calculateOverlayMutation(document, mutatedFields);
-      overlays.put(key, overlay);
+      if (overlay != null) {
+        overlays.put(key, overlay);
+      }
+
       if (!document.isValidDocument()) {
         document.convertToNoDocument(SnapshotVersion.NONE);
       }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/PatchMutation.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/PatchMutation.java
index 2ee6b9e0404..c35eb66ffb0 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/PatchMutation.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/PatchMutation.java
@@ -101,7 +101,8 @@ public ObjectValue getValue() {
    * Returns the mask to apply to {@link #getValue}, where only fields that are in both the
    * fieldMask and the value will be updated.
    */
-  public FieldMask getMask() {
+  @Override
+  public FieldMask getFieldMask() {
     return mask;
   }
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/SetMutation.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/SetMutation.java
index cd5643b13da..d377781c931 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/SetMutation.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/SetMutation.java
@@ -103,6 +103,11 @@ public FieldMask applyToLocalView(
     return null;
   }
 
+  @Override
+  public @Nullable FieldMask getFieldMask() {
+    return null;
+  }
+
   /** Returns the object value to use when setting the document. */
   public ObjectValue getValue() {
     return value;
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/VerifyMutation.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/VerifyMutation.java
index 98029b5fe31..941b0f8dceb 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/VerifyMutation.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/model/mutation/VerifyMutation.java
@@ -66,4 +66,9 @@ public FieldMask applyToLocalView(
       MutableDocument document, @Nullable FieldMask previousMask, Timestamp localWriteTime) {
     throw Assert.fail("VerifyMutation should only be used in Transactions.");
   }
+
+  @Override
+  public @Nullable FieldMask getFieldMask() {
+    return null;
+  }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/AbstractStream.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/AbstractStream.java
index d4c2e740453..30123f6bdc2 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/AbstractStream.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/AbstractStream.java
@@ -296,7 +296,7 @@ private void close(State finalState, Status status) {
     cancelHealthCheck();
     this.backoff.cancel();
 
-    // Invalidates any stream-related callbacks (e.g. from auth or the underlying stream),
+    // Invalidates any stream-related callbacks (for example, from auth or the underlying stream),
     // guaranteeing they won't execute.
     this.closeCount++;
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/BloomFilter.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/BloomFilter.java
new file mode 100644
index 00000000000..1fd69684f3a
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/BloomFilter.java
@@ -0,0 +1,203 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore.remote;
+
+import android.util.Base64;
+import androidx.annotation.NonNull;
+import com.google.protobuf.ByteString;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public final class BloomFilter {
+  private final int bitCount;
+  private final ByteString bitmap;
+  private final int hashCount;
+  private final MessageDigest md5HashMessageDigest;
+
+  /**
+   * Creates a new {@link BloomFilter} with the given parameters.
+   *
+   * @param bitmap the bitmap of the bloom filter; must not be null.
+   * @param padding the padding, in bits, of the last byte of the bloom filter; must be between 0
+   *     (zero) and 7, inclusive; must be 0 (zero) if {@code bitmap.length==0}.
+   * @param hashCount The number of hash functions to use; must be strictly greater than zero; may
+   *     be 0 (zero) if and only if {@code bitmap.length==0}.
+   */
+  public BloomFilter(@NonNull ByteString bitmap, int padding, int hashCount) {
+    if (padding < 0 || padding >= 8) {
+      throw new IllegalArgumentException("Invalid padding: " + padding);
+    }
+    if (hashCount < 0) {
+      throw new IllegalArgumentException("Invalid hash count: " + hashCount);
+    }
+    if (bitmap.size() > 0 && hashCount == 0) {
+      // Only empty bloom filter can have 0 hash count.
+      throw new IllegalArgumentException("Invalid hash count: " + hashCount);
+    }
+    if (bitmap.size() == 0 && padding != 0) {
+      // Empty bloom filter should have 0 padding.
+      throw new IllegalArgumentException(
+          "Expected padding of 0 when bitmap length is 0, but got " + padding);
+    }
+
+    this.bitmap = bitmap;
+    this.hashCount = hashCount;
+    this.bitCount = bitmap.size() * 8 - padding;
+    this.md5HashMessageDigest = createMd5HashMessageDigest();
+  }
+
+  /**
+   * Creates an instance of {@link BloomFilter} with the given arguments, throwing a well-defined
+   * exception if the given arguments do not satisfy the requirements documented in the {@link
+   * BloomFilter} constructor.
+   */
+  public static BloomFilter create(@NonNull ByteString bitmap, int padding, int hashCount)
+      throws BloomFilterCreateException {
+    if (padding < 0 || padding >= 8) {
+      throw new BloomFilterCreateException("Invalid padding: " + padding);
+    }
+    if (hashCount < 0) {
+      throw new BloomFilterCreateException("Invalid hash count: " + hashCount);
+    }
+    if (bitmap.size() > 0 && hashCount == 0) {
+      // Only empty bloom filter can have 0 hash count.
+      throw new BloomFilterCreateException("Invalid hash count: " + hashCount);
+    }
+    if (bitmap.size() == 0 && padding != 0) {
+      // Empty bloom filter should have 0 padding.
+      throw new BloomFilterCreateException(
+          "Expected padding of 0 when bitmap length is 0, but got " + padding);
+    }
+
+    return new BloomFilter(bitmap, padding, hashCount);
+  }
+
+  /** Exception thrown by {@link #create} if the given arguments are not valid. */
+  public static final class BloomFilterCreateException extends Exception {
+    public BloomFilterCreateException(String message) {
+      super(message);
+    }
+  }
+
+  int getBitCount() {
+    return this.bitCount;
+  }
+
+  /**
+   * Check whether the given string is a possible member of the bloom filter. It might return false
+   * positive result, ie, the given string is not a member of the bloom filter, but the method
+   * returned true.
+   *
+   * @param value the string to be tested for membership.
+   * @return true if the given string might be contained in the bloom filter, or false if the given
+   *     string is definitely not contained in the bloom filter.
+   */
+  public boolean mightContain(@NonNull String value) {
+    // Empty bitmap should return false on membership check.
+    if (this.bitCount == 0) {
+      return false;
+    }
+
+    byte[] hashedValue = md5HashDigest(value);
+    if (hashedValue.length != 16) {
+      throw new RuntimeException(
+          "Invalid md5 hash array length: " + hashedValue.length + " (expected 16)");
+    }
+
+    long hash1 = getLongLittleEndian(hashedValue, 0);
+    long hash2 = getLongLittleEndian(hashedValue, 8);
+
+    for (int i = 0; i < this.hashCount; i++) {
+      int index = this.getBitIndex(hash1, hash2, i);
+      if (!this.isBitSet(index)) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /** Hash a string using md5 hashing algorithm, and return an array of 16 bytes. */
+  @NonNull
+  private byte[] md5HashDigest(@NonNull String value) {
+    return md5HashMessageDigest.digest(value.getBytes(StandardCharsets.UTF_8));
+  }
+
+  @NonNull
+  private static MessageDigest createMd5HashMessageDigest() {
+    try {
+      return MessageDigest.getInstance("MD5");
+    } catch (NoSuchAlgorithmException e) {
+      throw new RuntimeException("Missing MD5 MessageDigest provider: ", e);
+    }
+  }
+
+  /** Interpret 8 bytes into a long, using little endian 2’s complement. */
+  private static long getLongLittleEndian(@NonNull byte[] bytes, int offset) {
+    long result = 0;
+    for (int i = 0; i < 8; i++) {
+      result |= (bytes[offset + i] & 0xFFL) << (i * 8);
+    }
+    return result;
+  }
+
+  /**
+   * Calculate the ith hash value based on the hashed 64 bit unsigned integers, and calculate its
+   * corresponding bit index in the bitmap to be checked.
+   */
+  private int getBitIndex(long hash1, long hash2, int hashIndex) {
+    // Calculate hashed value h(i) = h1 + (i * h2).
+    // Even though we are interpreting hash1 and hash2 as unsigned, the addition and multiplication
+    // operators still perform the correct operation and give the desired overflow behavior.
+    long combinedHash = hash1 + (hash2 * hashIndex);
+    long modulo = unsignedRemainder(combinedHash, this.bitCount);
+    return (int) modulo;
+  }
+
+  /**
+   * Calculate modulo, where the dividend and divisor are treated as unsigned 64-bit longs.
+   *
+   * <p>The implementation is taken from <a href=
+   * "https://github.com/google/guava/blob/553037486901cc60820ab7dcb38a25b6f34eba43/android/guava/src/com/google/common/primitives/UnsignedLongs.java">Guava</a>,
+   * simplified to our needs.
+   *
+   * <p>
+   */
+  private static long unsignedRemainder(long dividend, long divisor) {
+    long quotient = ((dividend >>> 1) / divisor) << 1;
+    long remainder = dividend - quotient * divisor;
+    return remainder - (remainder >= divisor ? divisor : 0);
+  }
+
+  /** Return whether the bit at the given index in the bitmap is set to 1. */
+  private boolean isBitSet(int index) {
+    // To retrieve bit n, calculate: (bitmap[n / 8] & (0x01 << (n % 8))).
+    byte byteAtIndex = this.bitmap.byteAt(index / 8);
+    int offset = index % 8;
+    return (byteAtIndex & (0x01 << offset)) != 0;
+  }
+
+  @Override
+  public String toString() {
+    return "BloomFilter{"
+        + "hashCount="
+        + hashCount
+        + ", size="
+        + bitCount
+        + ", bitmap=\""
+        + Base64.encodeToString(bitmap.toByteArray(), Base64.NO_WRAP)
+        + "\"}";
+  }
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/Datastore.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/Datastore.java
index 524b84c3906..fe8ddfa06e0 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/Datastore.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/Datastore.java
@@ -14,14 +14,20 @@
 
 package com.google.firebase.firestore.remote;
 
+import static com.google.firebase.firestore.util.Assert.hardAssert;
+import static com.google.firebase.firestore.util.Util.exceptionFromStatus;
+
 import android.content.Context;
 import android.os.Build;
 import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.firebase.firestore.AggregateField;
 import com.google.firebase.firestore.FirebaseFirestoreException;
 import com.google.firebase.firestore.auth.CredentialsProvider;
 import com.google.firebase.firestore.auth.User;
 import com.google.firebase.firestore.core.DatabaseInfo;
+import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.MutableDocument;
 import com.google.firebase.firestore.model.SnapshotVersion;
@@ -33,9 +39,14 @@
 import com.google.firestore.v1.CommitRequest;
 import com.google.firestore.v1.CommitResponse;
 import com.google.firestore.v1.FirestoreGrpc;
+import com.google.firestore.v1.RunAggregationQueryRequest;
+import com.google.firestore.v1.RunAggregationQueryResponse;
+import com.google.firestore.v1.StructuredAggregationQuery;
+import com.google.firestore.v1.Value;
 import io.grpc.Status;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -170,8 +181,61 @@ public Task<List<MutableDocument>> lookup(List<DocumentKey> keys) {
     for (DocumentKey key : keys) {
       builder.addDocuments(serializer.encodeKey(key));
     }
+    List<BatchGetDocumentsResponse> responses = new ArrayList<>();
+    TaskCompletionSource<List<MutableDocument>> completionSource = new TaskCompletionSource<>();
+
+    channel.runStreamingResponseRpc(
+        FirestoreGrpc.getBatchGetDocumentsMethod(),
+        builder.build(),
+        new FirestoreChannel.StreamingListener<BatchGetDocumentsResponse>() {
+          @Override
+          public void onMessage(BatchGetDocumentsResponse message) {
+            responses.add(message);
+            if (responses.size() == keys.size()) {
+              Map<DocumentKey, MutableDocument> resultMap = new HashMap<>();
+              for (BatchGetDocumentsResponse response : responses) {
+                MutableDocument doc = serializer.decodeMaybeDocument(response);
+                resultMap.put(doc.getKey(), doc);
+              }
+              List<MutableDocument> results = new ArrayList<>();
+              for (DocumentKey key : keys) {
+                results.add(resultMap.get(key));
+              }
+              completionSource.trySetResult(results);
+            }
+          }
+
+          @Override
+          public void onClose(Status status) {
+            if (status.isOk()) {
+              completionSource.trySetResult(Collections.emptyList());
+            } else {
+              FirebaseFirestoreException exception = exceptionFromStatus(status);
+              if (exception.getCode() == FirebaseFirestoreException.Code.UNAUTHENTICATED) {
+                channel.invalidateToken();
+              }
+              completionSource.trySetException(exception);
+            }
+          }
+        });
+
+    return completionSource.getTask();
+  }
+
+  public Task<Map<String, Value>> runAggregateQuery(
+      Query query, List<AggregateField> aggregateFields) {
+    com.google.firestore.v1.Target.QueryTarget encodedQueryTarget =
+        serializer.encodeQueryTarget(query.toAggregateTarget());
+    HashMap<String, String> aliasMap = new HashMap<>();
+    StructuredAggregationQuery structuredAggregationQuery =
+        serializer.encodeStructuredAggregationQuery(encodedQueryTarget, aggregateFields, aliasMap);
+
+    RunAggregationQueryRequest.Builder request = RunAggregationQueryRequest.newBuilder();
+    request.setParent(encodedQueryTarget.getParent());
+    request.setStructuredAggregationQuery(structuredAggregationQuery);
+
     return channel
-        .runStreamingResponseRpc(FirestoreGrpc.getBatchGetDocumentsMethod(), builder.build())
+        .runRpc(FirestoreGrpc.getRunAggregationQueryMethod(), request.build())
         .continueWith(
             workerQueue.getExecutor(),
             task -> {
@@ -181,19 +245,23 @@ public Task<List<MutableDocument>> lookup(List<DocumentKey> keys) {
                         == FirebaseFirestoreException.Code.UNAUTHENTICATED) {
                   channel.invalidateToken();
                 }
+                throw task.getException();
               }
 
-              Map<DocumentKey, MutableDocument> resultMap = new HashMap<>();
-              List<BatchGetDocumentsResponse> responses = task.getResult();
-              for (BatchGetDocumentsResponse response : responses) {
-                MutableDocument doc = serializer.decodeMaybeDocument(response);
-                resultMap.put(doc.getKey(), doc);
-              }
-              List<MutableDocument> results = new ArrayList<>();
-              for (DocumentKey key : keys) {
-                results.add(resultMap.get(key));
+              Map<String, Value> result = new HashMap<>();
+              RunAggregationQueryResponse response = task.getResult();
+
+              // Remap the short-form aliases that were sent to the server to the client-side
+              // aliases. Users will access the results using the client-side alias.
+              for (Map.Entry<String, Value> entry :
+                  response.getResult().getAggregateFieldsMap().entrySet()) {
+                hardAssert(
+                    aliasMap.containsKey(entry.getKey()),
+                    "%s not present in aliasMap",
+                    entry.getKey());
+                result.put(aliasMap.get(entry.getKey()), entry.getValue());
               }
-              return results;
+              return result;
             });
   }
 
@@ -276,8 +344,8 @@ public static boolean isMissingSslCiphers(Status status) {
    * write stream should be retried too (even though ABORTED errors are not generally retryable).
    *
    * <p>Note that during the initial handshake on the write stream an ABORTED error signals that we
-   * should discard our stream token (i.e. it is permanent). This means a handshake error should be
-   * classified with isPermanentError, above.
+   * should discard our stream token (because it is permanent). This means a handshake error should
+   * be classified with isPermanentError, above.
    */
   public static boolean isPermanentWriteError(Status status) {
     return isPermanentError(status) && !status.getCode().equals(Status.Code.ABORTED);
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/ExistenceFilter.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/ExistenceFilter.java
index 7be1ca4744a..06d2d5f924e 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/ExistenceFilter.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/ExistenceFilter.java
@@ -14,20 +14,34 @@
 
 package com.google.firebase.firestore.remote;
 
+import androidx.annotation.Nullable;
+import com.google.firestore.v1.BloomFilter;
+
 /** Simplest form of existence filter */
 public final class ExistenceFilter {
   private final int count;
+  private BloomFilter unchangedNames;
 
   public ExistenceFilter(int count) {
     this.count = count;
   }
 
+  public ExistenceFilter(int count, @Nullable BloomFilter unchangedNames) {
+    this.count = count;
+    this.unchangedNames = unchangedNames;
+  }
+
   public int getCount() {
     return count;
   }
 
+  @Nullable
+  public BloomFilter getUnchangedNames() {
+    return unchangedNames;
+  }
+
   @Override
   public String toString() {
-    return "ExistenceFilter{count=" + count + '}';
+    return "ExistenceFilter{count=" + count + ", unchangedNames=" + unchangedNames + '}';
   }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/FirestoreChannel.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/FirestoreChannel.java
index 0057aefc1ca..ec138e72976 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/FirestoreChannel.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/FirestoreChannel.java
@@ -33,8 +33,6 @@
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.Status;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Wrapper class around io.grpc.Channel that adds headers, exception handling and simplifies
@@ -44,6 +42,15 @@
  */
 public class FirestoreChannel {
 
+  /** Listen to changes inside runStreamingResponseRpc */
+  public abstract static class StreamingListener<T> {
+    public StreamingListener() {}
+
+    public void onMessage(T message) {}
+
+    public void onClose(Status status) {}
+  }
+
   private static final Metadata.Key<String> X_GOOG_API_CLIENT_HEADER =
       Metadata.Key.of("x-goog-api-client", Metadata.ASCII_STRING_MARSHALLER);
 
@@ -184,36 +191,28 @@ public void halfClose() {
   }
 
   /** Creates and starts a streaming response RPC. */
-  <ReqT, RespT> Task<List<RespT>> runStreamingResponseRpc(
-      MethodDescriptor<ReqT, RespT> method, ReqT request) {
-    TaskCompletionSource<List<RespT>> tcs = new TaskCompletionSource<>();
-
+  <ReqT, RespT> void runStreamingResponseRpc(
+      MethodDescriptor<ReqT, RespT> method,
+      ReqT request,
+      FirestoreChannel.StreamingListener<RespT> callback) {
     callProvider
         .createClientCall(method)
         .addOnCompleteListener(
             asyncQueue.getExecutor(),
             result -> {
               ClientCall<ReqT, RespT> call = result.getResult();
-
-              List<RespT> results = new ArrayList<>();
-
               call.start(
                   new ClientCall.Listener<RespT>() {
                     @Override
                     public void onMessage(RespT message) {
-                      results.add(message);
-
+                      callback.onMessage(message);
                       // Make sure next message can be delivered
                       call.request(1);
                     }
 
                     @Override
                     public void onClose(Status status, Metadata trailers) {
-                      if (status.isOk()) {
-                        tcs.setResult(results);
-                      } else {
-                        tcs.setException(exceptionFromStatus(status));
-                      }
+                      callback.onClose(status);
                     }
                   },
                   requestHeaders());
@@ -224,8 +223,6 @@ public void onClose(Status status, Metadata trailers) {
               call.sendMessage(request);
               call.halfClose();
             });
-
-    return tcs.getTask();
   }
 
   /** Creates and starts a single response RPC. */
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteEvent.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteEvent.java
index e890574ba8a..443ee13ecea 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteEvent.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteEvent.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.firestore.remote;
 
+import com.google.firebase.firestore.local.QueryPurpose;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.MutableDocument;
 import com.google.firebase.firestore.model.SnapshotVersion;
@@ -27,14 +28,14 @@
 public final class RemoteEvent {
   private final SnapshotVersion snapshotVersion;
   private final Map<Integer, TargetChange> targetChanges;
-  private final Set<Integer> targetMismatches;
+  private final Map<Integer, QueryPurpose> targetMismatches;
   private final Map<DocumentKey, MutableDocument> documentUpdates;
   private final Set<DocumentKey> resolvedLimboDocuments;
 
   public RemoteEvent(
       SnapshotVersion snapshotVersion,
       Map<Integer, TargetChange> targetChanges,
-      Set<Integer> targetMismatches,
+      Map<Integer, QueryPurpose> targetMismatches,
       Map<DocumentKey, MutableDocument> documentUpdates,
       Set<DocumentKey> resolvedLimboDocuments) {
     this.snapshotVersion = snapshotVersion;
@@ -55,10 +56,10 @@ public Map<Integer, TargetChange> getTargetChanges() {
   }
 
   /**
-   * Returns a set of targets that is known to be inconsistent. Listens for these targets should be
-   * re-established without resume tokens.
+   * Returns a map of targets that is known to be inconsistent, and the purpose for re-listening.
+   * Listens for these targets should be re-established without resume tokens.
    */
-  public Set<Integer> getTargetMismatches() {
+  public Map<Integer, QueryPurpose> getTargetMismatches() {
     return targetMismatches;
   }
 
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteSerializer.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteSerializer.java
index cc95d4270a3..bb7d291c165 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteSerializer.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteSerializer.java
@@ -20,6 +20,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.Timestamp;
+import com.google.firebase.firestore.AggregateField;
 import com.google.firebase.firestore.core.Bound;
 import com.google.firebase.firestore.core.FieldFilter;
 import com.google.firebase.firestore.core.Filter;
@@ -64,6 +65,7 @@
 import com.google.firestore.v1.DocumentTransform;
 import com.google.firestore.v1.ListenResponse;
 import com.google.firestore.v1.ListenResponse.ResponseTypeCase;
+import com.google.firestore.v1.StructuredAggregationQuery;
 import com.google.firestore.v1.StructuredQuery;
 import com.google.firestore.v1.StructuredQuery.CollectionSelector;
 import com.google.firestore.v1.StructuredQuery.CompositeFilter;
@@ -200,7 +202,7 @@ private static ResourcePath extractLocalPathFromResourceName(ResourcePath resour
   /** Validates that a path has a prefix that looks like a valid encoded databaseId. */
   private static boolean isValidResourceName(ResourcePath path) {
     // Resource names have at least 4 components (project ID, database ID)
-    // and commonly the (root) resource type, e.g. documents
+    // and commonly the (root) resource type (for example, documents).
     return path.length() >= 4
         && path.getSegment(0).equals("projects")
         && path.getSegment(2).equals("databases");
@@ -269,7 +271,7 @@ public com.google.firestore.v1.Write encodeMutation(Mutation mutation) {
       builder.setUpdate(encodeDocument(mutation.getKey(), ((SetMutation) mutation).getValue()));
     } else if (mutation instanceof PatchMutation) {
       builder.setUpdate(encodeDocument(mutation.getKey(), ((PatchMutation) mutation).getValue()));
-      builder.setUpdateMask(encodeDocumentMask(((PatchMutation) mutation).getMask()));
+      builder.setUpdateMask(encodeDocumentMask((mutation.getFieldMask())));
     } else if (mutation instanceof DeleteMutation) {
       builder.setDelete(encodeKey(mutation.getKey()));
     } else if (mutation instanceof VerifyMutation) {
@@ -471,6 +473,8 @@ private String encodeLabel(QueryPurpose purpose) {
         return null;
       case EXISTENCE_FILTER_MISMATCH:
         return "existence-filter-mismatch";
+      case EXISTENCE_FILTER_MISMATCH_BLOOM:
+        return "existence-filter-mismatch-bloom";
       case LIMBO_RESOLUTION:
         return "limbo-document";
       default:
@@ -499,6 +503,12 @@ public Target encodeTarget(TargetData targetData) {
       builder.setResumeToken(targetData.getResumeToken());
     }
 
+    if (targetData.getExpectedCount() != null
+        && (!targetData.getResumeToken().isEmpty()
+            || targetData.getSnapshotVersion().compareTo(SnapshotVersion.NONE) > 0)) {
+      builder.setExpectedCount(Int32Value.newBuilder().setValue(targetData.getExpectedCount()));
+    }
+
     return builder.build();
   }
 
@@ -630,22 +640,68 @@ public com.google.firebase.firestore.core.Target decodeQueryTarget(QueryTarget t
     return decodeQueryTarget(target.getParent(), target.getStructuredQuery());
   }
 
+  StructuredAggregationQuery encodeStructuredAggregationQuery(
+      QueryTarget encodedQueryTarget,
+      List<AggregateField> aggregateFields,
+      HashMap<String, String> aliasMap) {
+    StructuredAggregationQuery.Builder structuredAggregationQuery =
+        StructuredAggregationQuery.newBuilder();
+    structuredAggregationQuery.setStructuredQuery(encodedQueryTarget.getStructuredQuery());
+
+    List<StructuredAggregationQuery.Aggregation> aggregations = new ArrayList<>();
+
+    HashSet<String> uniqueFields = new HashSet<>();
+    int aliasID = 1;
+    for (AggregateField aggregateField : aggregateFields) {
+      // The code block below is used to deduplicate the same aggregate fields.
+      if (uniqueFields.contains(aggregateField.getAlias())) {
+        continue;
+      }
+      uniqueFields.add(aggregateField.getAlias());
+
+      String serverAlias = "aggregate_" + aliasID++;
+      aliasMap.put(serverAlias, aggregateField.getAlias());
+
+      StructuredAggregationQuery.Aggregation.Builder aggregation =
+          StructuredAggregationQuery.Aggregation.newBuilder();
+      StructuredQuery.FieldReference fieldPath =
+          StructuredQuery.FieldReference.newBuilder()
+              .setFieldPath(aggregateField.getFieldPath())
+              .build();
+
+      if (aggregateField instanceof AggregateField.CountAggregateField) {
+        aggregation.setCount(StructuredAggregationQuery.Aggregation.Count.getDefaultInstance());
+      } else if (aggregateField instanceof AggregateField.SumAggregateField) {
+        aggregation.setSum(
+            StructuredAggregationQuery.Aggregation.Sum.newBuilder().setField(fieldPath).build());
+      } else if (aggregateField instanceof AggregateField.AverageAggregateField) {
+        aggregation.setAvg(
+            StructuredAggregationQuery.Aggregation.Avg.newBuilder().setField(fieldPath).build());
+      } else {
+        throw new RuntimeException("Unsupported aggregation");
+      }
+
+      aggregation.setAlias(serverAlias);
+      aggregations.add(aggregation.build());
+    }
+    structuredAggregationQuery.addAllAggregations(aggregations);
+    return structuredAggregationQuery.build();
+  }
+
   // Filters
 
   private StructuredQuery.Filter encodeFilters(List<Filter> filters) {
     // A target's filter list is implicitly a composite AND filter.
     return encodeFilter(
         new com.google.firebase.firestore.core.CompositeFilter(
-            filters, CompositeFilter.Operator.AND));
+            filters, com.google.firebase.firestore.core.CompositeFilter.Operator.AND));
   }
 
   private List<Filter> decodeFilters(StructuredQuery.Filter proto) {
     Filter result = decodeFilter(proto);
 
     // Instead of a singletonList containing AND(F1, F2, ...), we can return a list containing F1,
-    // F2, ...
-    // TODO(orquery): Once proper support for composite filters has been completed, we can remove
-    // this flattening from here.
+    // F2, ... to stay consistent with the older SDK versions.
     if (result instanceof com.google.firebase.firestore.core.CompositeFilter) {
       com.google.firebase.firestore.core.CompositeFilter compositeFilter =
           (com.google.firebase.firestore.core.CompositeFilter) result;
@@ -695,6 +751,30 @@ StructuredQuery.Filter encodeUnaryOrFieldFilter(FieldFilter filter) {
     return StructuredQuery.Filter.newBuilder().setFieldFilter(proto).build();
   }
 
+  StructuredQuery.CompositeFilter.Operator encodeCompositeFilterOperator(
+      com.google.firebase.firestore.core.CompositeFilter.Operator op) {
+    switch (op) {
+      case AND:
+        return StructuredQuery.CompositeFilter.Operator.AND;
+      case OR:
+        return StructuredQuery.CompositeFilter.Operator.OR;
+      default:
+        throw fail("Unrecognized composite filter type.");
+    }
+  }
+
+  com.google.firebase.firestore.core.CompositeFilter.Operator decodeCompositeFilterOperator(
+      StructuredQuery.CompositeFilter.Operator op) {
+    switch (op) {
+      case AND:
+        return com.google.firebase.firestore.core.CompositeFilter.Operator.AND;
+      case OR:
+        return com.google.firebase.firestore.core.CompositeFilter.Operator.OR;
+      default:
+        throw fail("Only AND and OR composite filter types are supported.");
+    }
+  }
+
   @VisibleForTesting
   StructuredQuery.Filter encodeCompositeFilter(
       com.google.firebase.firestore.core.CompositeFilter compositeFilter) {
@@ -709,7 +789,7 @@ StructuredQuery.Filter encodeCompositeFilter(
     }
 
     CompositeFilter.Builder composite = CompositeFilter.newBuilder();
-    composite.setOp(compositeFilter.getOperator());
+    composite.setOp(encodeCompositeFilterOperator(compositeFilter.getOperator()));
     composite.addAllFilters(protos);
     return StructuredQuery.Filter.newBuilder().setCompositeFilter(composite).build();
   }
@@ -758,7 +838,8 @@ com.google.firebase.firestore.core.CompositeFilter decodeCompositeFilter(
     for (StructuredQuery.Filter filter : compositeFilter.getFiltersList()) {
       filters.add(decodeFilter(filter));
     }
-    return new com.google.firebase.firestore.core.CompositeFilter(filters, compositeFilter.getOp());
+    return new com.google.firebase.firestore.core.CompositeFilter(
+        filters, decodeCompositeFilterOperator(compositeFilter.getOp()));
   }
 
   private FieldReference encodeFieldPath(FieldPath field) {
@@ -915,8 +996,8 @@ public WatchChange decodeWatchChange(ListenResponse protoChange) {
         break;
       case FILTER:
         com.google.firestore.v1.ExistenceFilter protoFilter = protoChange.getFilter();
-        // TODO: implement existence filter parsing (see b/33076578)
-        ExistenceFilter filter = new ExistenceFilter(protoFilter.getCount());
+        ExistenceFilter filter =
+            new ExistenceFilter(protoFilter.getCount(), protoFilter.getUnchangedNames());
         int targetId = protoFilter.getTargetId();
         watchChange = new ExistenceFilterWatchChange(targetId, filter);
         break;
@@ -930,8 +1011,8 @@ public WatchChange decodeWatchChange(ListenResponse protoChange) {
 
   public SnapshotVersion decodeVersionFromListenResponse(ListenResponse watchChange) {
     // We have only reached a consistent snapshot for the entire stream if there is a read_time set
-    // and it applies to all targets (i.e. the list of targets is empty). The backend is guaranteed
-    // to send such responses.
+    // and it applies to all targets (specifically, the list of targets is empty). The backend is
+    // guaranteed to send such responses.
     if (watchChange.getResponseTypeCase() != ResponseTypeCase.TARGET_CHANGE) {
       return SnapshotVersion.NONE;
     }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteStore.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteStore.java
index 2af8508957d..eda25fa2792 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteStore.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteStore.java
@@ -18,12 +18,18 @@
 
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.database.collection.ImmutableSortedSet;
+import com.google.firebase.firestore.AggregateField;
+import com.google.firebase.firestore.FirebaseFirestoreException;
 import com.google.firebase.firestore.core.OnlineState;
+import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.core.Transaction;
 import com.google.firebase.firestore.local.LocalStore;
 import com.google.firebase.firestore.local.QueryPurpose;
 import com.google.firebase.firestore.local.TargetData;
+import com.google.firebase.firestore.model.DatabaseId;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.SnapshotVersion;
 import com.google.firebase.firestore.model.mutation.MutationBatch;
@@ -37,6 +43,7 @@
 import com.google.firebase.firestore.util.AsyncQueue;
 import com.google.firebase.firestore.util.Logger;
 import com.google.firebase.firestore.util.Util;
+import com.google.firestore.v1.Value;
 import com.google.protobuf.ByteString;
 import io.grpc.Status;
 import java.util.ArrayDeque;
@@ -365,6 +372,12 @@ public void listen(TargetData targetData) {
 
   private void sendWatchRequest(TargetData targetData) {
     watchChangeAggregator.recordPendingTargetRequest(targetData.getTargetId());
+    if (!targetData.getResumeToken().isEmpty()
+        || targetData.getSnapshotVersion().compareTo(SnapshotVersion.NONE) > 0) {
+      int expectedCount = this.getRemoteKeysForTarget(targetData.getTargetId()).size();
+      targetData = targetData.withExpectedCount(expectedCount);
+    }
+
     watchStream.watchQuery(targetData);
   }
 
@@ -536,7 +549,8 @@ private void raiseWatchSnapshot(SnapshotVersion snapshotVersion) {
 
     // Re-establish listens for the targets that have been invalidated by existence filter
     // mismatches.
-    for (int targetId : remoteEvent.getTargetMismatches()) {
+    for (Map.Entry<Integer, QueryPurpose> entry : remoteEvent.getTargetMismatches().entrySet()) {
+      int targetId = entry.getKey();
       TargetData targetData = this.listenTargets.get(targetId);
       // A watched target might have been removed already.
       if (targetData != null) {
@@ -551,14 +565,14 @@ private void raiseWatchSnapshot(SnapshotVersion snapshotVersion) {
 
         // Mark the query we send as being on behalf of an existence filter  mismatch, but don't
         // actually retain that in listenTargets. This ensures that we flag the first re-listen this
-        // way without impacting future listens of this target (that might happen e.g. on
+        // way without impacting future listens of this target (that might happen for example on
         // reconnect).
         TargetData requestTargetData =
             new TargetData(
                 targetData.getTarget(),
                 targetId,
                 targetData.getSequenceNumber(),
-                QueryPurpose.EXISTENCE_FILTER_MISMATCH);
+                /*purpose=*/ entry.getValue());
         this.sendWatchRequest(requestTargetData);
       }
     }
@@ -610,7 +624,7 @@ public void fillWritePipeline() {
   }
 
   /**
-   * Returns true if we can add to the write pipeline (i.e. it is not full and the network is
+   * Returns true if we can add to the write pipeline (because it is not full and the network is
    * enabled).
    */
   private boolean canAddToWritePipeline() {
@@ -747,4 +761,20 @@ public ImmutableSortedSet<DocumentKey> getRemoteKeysForTarget(int targetId) {
   public TargetData getTargetDataForTarget(int targetId) {
     return this.listenTargets.get(targetId);
   }
+
+  @Override
+  public DatabaseId getDatabaseId() {
+    return this.datastore.getDatabaseInfo().getDatabaseId();
+  }
+
+  public Task<Map<String, Value>> runAggregateQuery(
+      Query query, List<AggregateField> aggregateFields) {
+    if (canUseNetwork()) {
+      return datastore.runAggregateQuery(query, aggregateFields);
+    } else {
+      return Tasks.forException(
+          new FirebaseFirestoreException(
+              "Failed to get result from server.", FirebaseFirestoreException.Code.UNAVAILABLE));
+    }
+  }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TargetChange.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TargetChange.java
index 30cd7954cd0..9c8dad77ab5 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TargetChange.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TargetChange.java
@@ -31,9 +31,10 @@ public final class TargetChange {
   private final ImmutableSortedSet<DocumentKey> modifiedDocuments;
   private final ImmutableSortedSet<DocumentKey> removedDocuments;
 
-  public static TargetChange createSynthesizedTargetChangeForCurrentChange(boolean isCurrent) {
+  public static TargetChange createSynthesizedTargetChangeForCurrentChange(
+      boolean isCurrent, ByteString resumeToken) {
     return new TargetChange(
-        ByteString.EMPTY,
+        resumeToken,
         isCurrent,
         DocumentKey.emptyKeySet(),
         DocumentKey.emptyKeySet(),
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TestingHooks.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TestingHooks.java
new file mode 100644
index 00000000000..b888521b6f2
--- /dev/null
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/TestingHooks.java
@@ -0,0 +1,232 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore.remote;
+
+import static com.google.firebase.firestore.util.Preconditions.checkNotNull;
+
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import com.google.auto.value.AutoValue;
+import com.google.firebase.firestore.ListenerRegistration;
+import com.google.firebase.firestore.model.DatabaseId;
+import com.google.firebase.firestore.remote.WatchChangeAggregator.BloomFilterApplicationStatus;
+import com.google.firestore.v1.BloomFilter;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Manages "testing hooks", hooks into the internals of the SDK to verify internal state and events
+ * during integration tests.
+ *
+ * <p>Do not use this class except for testing purposes.
+ */
+@VisibleForTesting
+final class TestingHooks {
+
+  private static final TestingHooks instance = new TestingHooks();
+
+  // Use CopyOnWriteArrayList to store the listeners so that we don't need to worry about
+  // synchronizing adds, removes, and traversals.
+  private final CopyOnWriteArrayList<AtomicReference<ExistenceFilterMismatchListener>>
+      existenceFilterMismatchListeners = new CopyOnWriteArrayList<>();
+
+  private TestingHooks() {}
+
+  /** Returns the singleton instance of this class. */
+  @NonNull
+  static TestingHooks getInstance() {
+    return instance;
+  }
+
+  /**
+   * Synchronously notifies all registered {@link ExistenceFilterMismatchListener}` listeners
+   * registered via {@link #addExistenceFilterMismatchListener}.
+   *
+   * @param info Information about the existence filter mismatch to deliver to the listeners.
+   */
+  void notifyOnExistenceFilterMismatch(@NonNull ExistenceFilterMismatchInfo info) {
+    for (AtomicReference<ExistenceFilterMismatchListener> listenerRef :
+        existenceFilterMismatchListeners) {
+      ExistenceFilterMismatchListener listener = listenerRef.get();
+      if (listener != null) {
+        listener.onExistenceFilterMismatch(info);
+      }
+    }
+  }
+
+  /**
+   * Registers a {@link ExistenceFilterMismatchListener} to be notified when an existence filter
+   * mismatch occurs in the Watch listen stream.
+   *
+   * <p>The relative order in which callbacks are notified is unspecified; do not rely on any
+   * particular ordering. If a given callback is registered multiple times then it will be notified
+   * multiple times, once per registration.
+   *
+   * <p>The listener callbacks are performed synchronously in `NotifyOnExistenceFilterMismatch()`;
+   * therefore, listeners should perform their work as quickly as possible and return to avoid
+   * blocking any critical work. In particular, the listener callbacks should <em>not</em> block or
+   * perform long-running operations.
+   *
+   * @param listener the listener to register.
+   * @return an object that unregisters the given listener via its {@link
+   *     ListenerRegistration#remove} method; only the first unregistration request does anything;
+   *     all subsequent requests do nothing. Note that due to inherent race conditions it is
+   *     technically possible, although unlikely, that callbacks could still occur <em>after</em>
+   *     unregistering.
+   */
+  ListenerRegistration addExistenceFilterMismatchListener(
+      @NonNull ExistenceFilterMismatchListener listener) {
+    checkNotNull(listener, "a null listener is not allowed");
+
+    AtomicReference<ExistenceFilterMismatchListener> listenerRef = new AtomicReference<>(listener);
+    existenceFilterMismatchListeners.add(listenerRef);
+
+    return () -> {
+      listenerRef.set(null);
+      existenceFilterMismatchListeners.remove(listenerRef);
+    };
+  }
+
+  /**
+   * Implementations of this interface can be registered with {@link
+   * #addExistenceFilterMismatchListener}.
+   */
+  interface ExistenceFilterMismatchListener {
+
+    /**
+     * Invoked when an existence filter mismatch occurs.
+     *
+     * @param info information about the existence filter mismatch.
+     */
+    @AnyThread
+    void onExistenceFilterMismatch(@NonNull ExistenceFilterMismatchInfo info);
+  }
+
+  /**
+   * Information about an existence filter mismatch, as specified to listeners registered with
+   * {@link #addExistenceFilterMismatchListener}.
+   */
+  @AutoValue
+  abstract static class ExistenceFilterMismatchInfo {
+
+    /**
+     * Creates and returns a new instance of {@link ExistenceFilterMismatchInfo} with the given
+     * values.
+     */
+    static ExistenceFilterMismatchInfo create(
+        int localCacheCount,
+        int existenceFilterCount,
+        String projectId,
+        String databaseId,
+        @Nullable ExistenceFilterBloomFilterInfo bloomFilter) {
+      return new AutoValue_TestingHooks_ExistenceFilterMismatchInfo(
+          localCacheCount, existenceFilterCount, projectId, databaseId, bloomFilter);
+    }
+
+    /** Returns the number of documents that matched the query in the local cache. */
+    abstract int localCacheCount();
+
+    /**
+     * Returns the number of documents that matched the query on the server, as specified in the
+     * ExistenceFilter message's `count` field.
+     */
+    abstract int existenceFilterCount();
+
+    /** The projectId used when checking documents for membership in the bloom filter. */
+    abstract String projectId();
+
+    /** The databaseId used when checking documents for membership in the bloom filter. */
+    abstract String databaseId();
+
+    /**
+     * Returns information about the bloom filter provided by Watch in the ExistenceFilter message's
+     * `unchangedNames` field. A `null` return value means that Watch did _not_ provide a bloom
+     * filter.
+     */
+    @Nullable
+    abstract ExistenceFilterBloomFilterInfo bloomFilter();
+
+    /**
+     * Convenience method to create and return a new instance of {@link ExistenceFilterMismatchInfo}
+     * with the values taken from the given arguments.
+     */
+    static ExistenceFilterMismatchInfo from(
+        int localCacheCount,
+        ExistenceFilter existenceFilter,
+        DatabaseId databaseId,
+        @Nullable com.google.firebase.firestore.remote.BloomFilter bloomFilter,
+        BloomFilterApplicationStatus bloomFilterStatus) {
+      return create(
+          localCacheCount,
+          existenceFilter.getCount(),
+          databaseId.getProjectId(),
+          databaseId.getDatabaseId(),
+          ExistenceFilterBloomFilterInfo.from(bloomFilter, bloomFilterStatus, existenceFilter));
+    }
+  }
+
+  @AutoValue
+  abstract static class ExistenceFilterBloomFilterInfo {
+
+    static ExistenceFilterBloomFilterInfo create(
+        @Nullable com.google.firebase.firestore.remote.BloomFilter bloomFilter,
+        boolean applied,
+        int hashCount,
+        int bitmapLength,
+        int padding) {
+      return new AutoValue_TestingHooks_ExistenceFilterBloomFilterInfo(
+          bloomFilter, applied, hashCount, bitmapLength, padding);
+    }
+
+    /** The BloomFilter created from the existence filter; may be null if creating it failed. */
+    @Nullable
+    abstract com.google.firebase.firestore.remote.BloomFilter bloomFilter();
+
+    /**
+     * Returns whether a full requery was averted by using the bloom filter. If false, then
+     * something happened, such as a false positive, to prevent using the bloom filter to avoid a
+     * full requery.
+     */
+    abstract boolean applied();
+
+    /** Returns the number of hash functions used in the bloom filter. */
+    abstract int hashCount();
+
+    /** Returns the number of bytes in the bloom filter's bitmask. */
+    abstract int bitmapLength();
+
+    /** Returns the number of bits of padding in the last byte of the bloom filter. */
+    abstract int padding();
+
+    @Nullable
+    static ExistenceFilterBloomFilterInfo from(
+        @Nullable com.google.firebase.firestore.remote.BloomFilter bloomFilter,
+        BloomFilterApplicationStatus bloomFilterStatus,
+        ExistenceFilter existenceFilter) {
+      BloomFilter unchangedNames = existenceFilter.getUnchangedNames();
+      if (unchangedNames == null) {
+        return null;
+      }
+      return create(
+          bloomFilter,
+          /*bloomFilterApplied=*/ bloomFilterStatus == BloomFilterApplicationStatus.SUCCESS,
+          unchangedNames.getHashCount(),
+          unchangedNames.getBits().getBitmap().size(),
+          unchangedNames.getBits().getPadding());
+    }
+  }
+}
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/WatchChangeAggregator.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/WatchChangeAggregator.java
index 1086af504db..d5064fa3d8e 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/WatchChangeAggregator.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/WatchChangeAggregator.java
@@ -23,12 +23,15 @@
 import com.google.firebase.firestore.core.Target;
 import com.google.firebase.firestore.local.QueryPurpose;
 import com.google.firebase.firestore.local.TargetData;
+import com.google.firebase.firestore.model.DatabaseId;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.MutableDocument;
 import com.google.firebase.firestore.model.SnapshotVersion;
 import com.google.firebase.firestore.remote.WatchChange.DocumentChange;
 import com.google.firebase.firestore.remote.WatchChange.ExistenceFilterWatchChange;
 import com.google.firebase.firestore.remote.WatchChange.WatchTargetChange;
+import com.google.firebase.firestore.util.Logger;
+import com.google.protobuf.ByteString;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -56,6 +59,9 @@ public interface TargetMetadataProvider {
      */
     @Nullable
     TargetData getTargetDataForTarget(int targetId);
+
+    /** Returns the database ID of the Firestore instance. */
+    DatabaseId getDatabaseId();
   }
 
   private final TargetMetadataProvider targetMetadataProvider;
@@ -70,10 +76,20 @@ public interface TargetMetadataProvider {
   private Map<DocumentKey, Set<Integer>> pendingDocumentTargetMapping = new HashMap<>();
 
   /**
-   * A list of targets with existence filter mismatches. These targets are known to be inconsistent
+   * A map of targets with existence filter mismatches. These targets are known to be inconsistent
    * and their listens needs to be re-established by RemoteStore.
    */
-  private Set<Integer> pendingTargetResets = new HashSet<>();
+  private Map<Integer, QueryPurpose> pendingTargetResets = new HashMap<>();
+
+  /** The log tag to use for this class. */
+  private static final String LOG_TAG = "WatchChangeAggregator";
+
+  /** The bloom filter application status while handling existence filter mismatch. */
+  enum BloomFilterApplicationStatus {
+    SUCCESS,
+    SKIPPED,
+    FALSE_POSITIVE
+  }
 
   public WatchChangeAggregator(TargetMetadataProvider targetMetadataProvider) {
     this.targetMetadataProvider = targetMetadataProvider;
@@ -113,7 +129,7 @@ public void handleTargetChange(WatchTargetChange targetChange) {
           targetState.recordTargetResponse();
           if (!targetState.isPending()) {
             // We have a freshly added target, so we need to reset any state that we had previously.
-            // This can happen e.g. when remove and add back a target for existence filter
+            // This can happen when, for example, remove and add back a target for existence filter
             // mismatches.
             targetState.clearChanges();
           }
@@ -196,17 +212,109 @@ public void handleExistenceFilter(ExistenceFilterWatchChange watchChange) {
               expectedCount == 1, "Single document existence filter with count: %d", expectedCount);
         }
       } else {
-        long currentSize = getCurrentDocumentCountForTarget(targetId);
+        int currentSize = getCurrentDocumentCountForTarget(targetId);
         if (currentSize != expectedCount) {
-          // Existence filter mismatch: We reset the mapping and raise a new snapshot with
-          // `isFromCache:true`.
-          resetTarget(targetId);
-          pendingTargetResets.add(targetId);
+
+          // Apply bloom filter to identify and mark removed documents.
+          BloomFilter bloomFilter = this.parseBloomFilter(watchChange);
+          BloomFilterApplicationStatus status =
+              bloomFilter != null
+                  ? this.applyBloomFilter(bloomFilter, watchChange, currentSize)
+                  : BloomFilterApplicationStatus.SKIPPED;
+
+          if (status != BloomFilterApplicationStatus.SUCCESS) {
+            // If bloom filter application fails, we reset the mapping and
+            // trigger re-run of the query.
+            resetTarget(targetId);
+
+            QueryPurpose purpose =
+                status == BloomFilterApplicationStatus.FALSE_POSITIVE
+                    ? QueryPurpose.EXISTENCE_FILTER_MISMATCH_BLOOM
+                    : QueryPurpose.EXISTENCE_FILTER_MISMATCH;
+
+            pendingTargetResets.put(targetId, purpose);
+          }
+
+          TestingHooks.getInstance()
+              .notifyOnExistenceFilterMismatch(
+                  TestingHooks.ExistenceFilterMismatchInfo.from(
+                      currentSize,
+                      watchChange.getExistenceFilter(),
+                      targetMetadataProvider.getDatabaseId(),
+                      bloomFilter,
+                      status));
         }
       }
     }
   }
 
+  /** Parse the bloom filter from the "unchanged_names" field of an existence filter. */
+  @Nullable
+  private BloomFilter parseBloomFilter(ExistenceFilterWatchChange watchChange) {
+    com.google.firestore.v1.BloomFilter unchangedNames =
+        watchChange.getExistenceFilter().getUnchangedNames();
+    if (unchangedNames == null || !unchangedNames.hasBits()) {
+      return null;
+    }
+
+    ByteString bitmap = unchangedNames.getBits().getBitmap();
+    BloomFilter bloomFilter;
+    try {
+      bloomFilter =
+          BloomFilter.create(
+              bitmap, unchangedNames.getBits().getPadding(), unchangedNames.getHashCount());
+    } catch (BloomFilter.BloomFilterCreateException e) {
+      Logger.warn(
+          LOG_TAG,
+          "Applying bloom filter failed: ("
+              + e.getMessage()
+              + "); ignoring the bloom filter and falling back to full re-query.");
+      return null;
+    }
+
+    if (bloomFilter.getBitCount() == 0) {
+      return null;
+    }
+
+    return bloomFilter;
+  }
+
+  /** Apply bloom filter to remove the deleted documents, and return the application status. */
+  private BloomFilterApplicationStatus applyBloomFilter(
+      BloomFilter bloomFilter, ExistenceFilterWatchChange watchChange, int currentCount) {
+    int expectedCount = watchChange.getExistenceFilter().getCount();
+
+    int removedDocumentCount = this.filterRemovedDocuments(bloomFilter, watchChange.getTargetId());
+
+    return (expectedCount == (currentCount - removedDocumentCount))
+        ? BloomFilterApplicationStatus.SUCCESS
+        : BloomFilterApplicationStatus.FALSE_POSITIVE;
+  }
+
+  /**
+   * Filter out removed documents based on bloom filter membership result and return number of
+   * documents removed.
+   */
+  private int filterRemovedDocuments(BloomFilter bloomFilter, int targetId) {
+    ImmutableSortedSet<DocumentKey> existingKeys =
+        targetMetadataProvider.getRemoteKeysForTarget(targetId);
+    int removalCount = 0;
+    for (DocumentKey key : existingKeys) {
+      DatabaseId databaseId = targetMetadataProvider.getDatabaseId();
+      String documentPath =
+          "projects/"
+              + databaseId.getProjectId()
+              + "/databases/"
+              + databaseId.getDatabaseId()
+              + "/documents/"
+              + key.getPath().canonicalString();
+      if (!bloomFilter.mightContain(documentPath)) {
+        this.removeDocumentFromTarget(targetId, key, /*updatedDocument=*/ null);
+        removalCount++;
+      }
+    }
+    return removalCount;
+  }
   /**
    * Converts the currently accumulated state into a remote event at the provided snapshot version.
    * Resets the accumulated changes before returning.
@@ -272,14 +380,14 @@ public RemoteEvent createRemoteEvent(SnapshotVersion snapshotVersion) {
         new RemoteEvent(
             snapshotVersion,
             Collections.unmodifiableMap(targetChanges),
-            Collections.unmodifiableSet(pendingTargetResets),
+            Collections.unmodifiableMap(pendingTargetResets),
             Collections.unmodifiableMap(pendingDocumentUpdates),
             Collections.unmodifiableSet(resolvedLimboDocuments));
 
     // Re-initialize the current state to ensure that we do not modify the generated RemoteEvent.
     pendingDocumentUpdates = new HashMap<>();
     pendingDocumentTargetMapping = new HashMap<>();
-    pendingTargetResets = new HashSet<>();
+    pendingTargetResets = new HashMap<>();
 
     return remoteEvent;
   }
@@ -308,9 +416,9 @@ private void addDocumentToTarget(int targetId, MutableDocument document) {
 
   /**
    * Removes the provided document from the target mapping. If the document no longer matches the
-   * target, but the document's state is still known (e.g. we know that the document was deleted or
-   * we received the change that caused the filter mismatch), the new document can be provided to
-   * update the remote document cache.
+   * target, but the document's state is still known (for example. we know that the document was
+   * deleted or we received the change that caused the filter mismatch), the new document can be
+   * provided to update the remote document cache.
    */
   private void removeDocumentFromTarget(
       int targetId, DocumentKey key, @Nullable MutableDocument updatedDocument) {
@@ -391,8 +499,8 @@ private boolean isActiveTarget(int targetId) {
   }
 
   /**
-   * Returns the TargetData for an active target (i.e. a target that the user is still interested in
-   * that has no outstanding target change requests).
+   * Returns the TargetData for an active target (specifically, a target that the user is still
+   * interested in that has no outstanding target change requests).
    */
   @Nullable
   private TargetData queryDataForActiveTarget(int targetId) {
@@ -403,8 +511,8 @@ private TargetData queryDataForActiveTarget(int targetId) {
   }
 
   /**
-   * Resets the state of a Watch target to its initial state (e.g. sets 'current' to false, clears
-   * the resume token and removes its target mapping from all documents).
+   * Resets the state of a Watch target to its initial state (sets 'current' to false, clears the
+   * resume token and removes its target mapping from all documents).
    */
   private void resetTarget(int targetId) {
     hardAssert(
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/Assert.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/Assert.java
index 76571452286..80ee480f4fb 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/Assert.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/Assert.java
@@ -32,6 +32,23 @@ public static void hardAssert(boolean condition, String messageFormat, Object...
     }
   }
 
+  /**
+   * Triggers a hard assertion. The null check is guaranteed to be checked at runtime. If the object
+   * is null an AssertionError will be thrown. The string messageFormat will be formatted with the
+   * provided args using {@link String#format(String, Object...)}.
+   *
+   * @param obj The object to be compared with null
+   * @param messageFormat The message to throw if the condition is false, formatted using {@link
+   *     String#format(String, Object...)}.
+   * @param args The args to pass to String.format
+   */
+  public static <T> T hardAssertNonNull(T obj, String messageFormat, Object... args) {
+    if (obj == null) {
+      throw fail(messageFormat, args);
+    }
+    return obj;
+  }
+
   /**
    * Throws an AssertionError with the provided message. The string messageFormat will be formatted
    * with the provided args using {@link String#format(String, Object...)}. The method returns an
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/AsyncQueue.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/AsyncQueue.java
index c368022f07a..0333a04adf1 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/AsyncQueue.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/AsyncQueue.java
@@ -17,6 +17,7 @@
 import static com.google.firebase.firestore.util.Assert.fail;
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
+import android.annotation.SuppressLint;
 import android.os.Handler;
 import android.os.Looper;
 import androidx.annotation.NonNull;
@@ -243,6 +244,8 @@ public Thread newThread(@NonNull Runnable runnable) {
       }
     }
 
+    // TODO(b/258277574): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     SynchronizedShutdownAwareExecutor() {
       DelayedStartFactory threadFactory = new DelayedStartFactory();
 
@@ -259,7 +262,7 @@ protected void afterExecute(Runnable r, Throwable t) {
               if (t == null && r instanceof Future<?>) {
                 Future<?> future = (Future<?>) r;
                 try {
-                  // Not all Futures will be done, e.g. when used with scheduledAtFixedRate
+                  // Not all Futures will be done, for example when used with scheduledAtFixedRate.
                   if (future.isDone()) {
                     future.get();
                   }
@@ -519,6 +522,9 @@ public void skipDelaysForTimerId(TimerId timerId) {
    */
   public void panic(Throwable t) {
     executor.shutdownNow();
+
+    // TODO(b/258277574): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     Handler handler = new Handler(Looper.getMainLooper());
     handler.post(
         () -> {
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java
index 6c4388419d6..9852524f51b 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java
@@ -17,6 +17,7 @@
 import static com.google.firebase.firestore.util.ApiUtil.invoke;
 import static com.google.firebase.firestore.util.ApiUtil.newInstance;
 
+import android.net.Uri;
 import com.google.firebase.Timestamp;
 import com.google.firebase.firestore.Blob;
 import com.google.firebase.firestore.DocumentId;
@@ -38,6 +39,8 @@
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.lang.reflect.WildcardType;
+import java.net.URI;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -172,6 +175,8 @@ private static <T> Object serialize(T o, ErrorPath path) {
         || o instanceof DocumentReference
         || o instanceof FieldValue) {
       return o;
+    } else if (o instanceof Uri || o instanceof URI || o instanceof URL) {
+      return o.toString();
     } else {
       Class<T> clazz = (Class<T>) o.getClass();
       BeanMapper<T> mapper = loadOrCreateBeanMapperForClass(clazz);
@@ -241,10 +246,7 @@ private static <T> T deserializeToClass(Object o, Class<T> clazz, DeserializeCon
           context.errorPath, "Converting to Arrays is not supported, please use Lists instead");
     } else if (clazz.getTypeParameters().length > 0) {
       throw deserializeError(
-          context.errorPath,
-          "Class "
-              + clazz.getName()
-              + " has generic type parameters, please use GenericTypeIndicator instead");
+          context.errorPath, "Class " + clazz.getName() + " has generic type parameters");
     } else if (clazz.equals(Object.class)) {
       return (T) o;
     } else if (clazz.isEnum()) {
@@ -646,6 +648,7 @@ private static class BeanMapper<T> {
       // getMethods/getFields only returns public methods/fields we need to traverse the
       // class hierarchy to find the appropriate setter or field.
       Class<? super T> currentClass = clazz;
+      Map<String, Method> bridgeMethods = new HashMap<>();
       do {
         // Add any setters
         for (Method method : currentClass.getDeclaredMethods()) {
@@ -659,13 +662,20 @@ private static class BeanMapper<T> {
                         + currentClass.getName()
                         + " with invalid case-sensitive name: "
                         + method.getName());
+              } else if (method.isBridge()) {
+                // We ignore bridge setters when creating a bean, but include them in the map
+                // for the purpose of the `isSetterOverride()` check
+                bridgeMethods.put(propertyName, method);
               } else {
                 Method existingSetter = setters.get(propertyName);
+                Method correspondingBridgeMethod = bridgeMethods.get(propertyName);
                 if (existingSetter == null) {
                   method.setAccessible(true);
                   setters.put(propertyName, method);
                   applySetterAnnotations(method);
-                } else if (!isSetterOverride(method, existingSetter)) {
+                } else if (!isSetterOverride(method, existingSetter)
+                    && !(correspondingBridgeMethod != null
+                        && isSetterOverride(method, correspondingBridgeMethod))) {
                   // We require that setters with conflicting property names are
                   // overrides from a base class
                   if (currentClass == clazz) {
@@ -1001,6 +1011,10 @@ private static boolean shouldIncludeGetter(Method method) {
       if (method.getParameterTypes().length != 0) {
         return false;
       }
+      // Bridge methods
+      if (method.isBridge()) {
+        return false;
+      }
       // Excluded methods
       if (method.isAnnotationPresent(Exclude.class)) {
         return false;
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/ExponentialBackoff.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/ExponentialBackoff.java
index b98ec152006..d57c9da2ed0 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/ExponentialBackoff.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/ExponentialBackoff.java
@@ -96,17 +96,15 @@ public ExponentialBackoff(AsyncQueue queue, AsyncQueue.TimerId timerId) {
   /**
    * Resets the backoff delay.
    *
-   * <p>The very next backoffAndRun() will have no delay. If it is called again (i.e. due to an
-   * error), initialDelayMs (plus jitter) will be used, and subsequent ones will increase according
-   * to the backoffFactor.
+   * <p>The very next backoffAndRun() will have no delay. If it is called again (due to an error),
+   * initialDelayMs (plus jitter) will be used, and subsequent ones will increase according to the
+   * backoffFactor.
    */
   public void reset() {
     currentBaseMs = 0;
   }
 
-  /**
-   * Resets the backoff delay to the maximum delay (e.g. for use after a RESOURCE_EXHAUSTED error).
-   */
+  /** Resets the backoff delay to the maximum delay (for use after a RESOURCE_EXHAUSTED error). */
   public void resetToMax() {
     currentBaseMs = nextMaxDelayMs;
   }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/LogicUtils.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/LogicUtils.java
index f823966fa8d..e6c4fc5bb8f 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/LogicUtils.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/LogicUtils.java
@@ -14,8 +14,15 @@
 
 package com.google.firebase.firestore.util;
 
+import static com.google.firebase.firestore.util.Assert.hardAssert;
+
 import com.google.firebase.firestore.core.CompositeFilter;
+import com.google.firebase.firestore.core.FieldFilter;
 import com.google.firebase.firestore.core.Filter;
+import com.google.firebase.firestore.core.InFilter;
+import com.google.firestore.v1.Value;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -24,6 +31,296 @@
  * complex filters used in queries.
  */
 public class LogicUtils {
+
+  /** Asserts that the given filter is a FieldFilter or CompositeFilter. */
+  private static void assertFieldFilterOrCompositeFilter(Filter filter) {
+    hardAssert(
+        filter instanceof FieldFilter || filter instanceof CompositeFilter,
+        "Only field filters and composite filters are accepted.");
+  }
+
+  /** Returns true if the given filter is a single field filter. For example, (a == 10). */
+  private static boolean isSingleFieldFilter(Filter filter) {
+    return filter instanceof FieldFilter;
+  }
+
+  /**
+   * Returns true if the given filter is the conjunction of one or more field filters. For example,
+   * (a == 10 && b == 20)
+   */
+  private static boolean isFlatConjunction(Filter filter) {
+    return filter instanceof CompositeFilter && ((CompositeFilter) filter).isFlatConjunction();
+  }
+
+  /**
+   * Returns true if the given filter is the disjunction of one or more "flat conjunctions" and
+   * field filters. For example, (a == 10) || (b==20 && c==30)
+   */
+  private static boolean isDisjunctionOfFieldFiltersAndFlatConjunctions(Filter filter) {
+    if (filter instanceof CompositeFilter) {
+      CompositeFilter compositeFilter = (CompositeFilter) filter;
+      if (compositeFilter.isDisjunction()) {
+        for (Filter subfilter : compositeFilter.getFilters()) {
+          if (!isSingleFieldFilter(subfilter) && !isFlatConjunction(subfilter)) {
+            return false;
+          }
+        }
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Returns whether or not the given filter is in disjunctive normal form (DNF).
+   *
+   * <p>In boolean logic, a disjunctive normal form (DNF) is a canonical normal form of a logical
+   * formula consisting of a disjunction of conjunctions; it can also be described as an OR of ANDs.
+   *
+   * <p>For more info, visit: https://en.wikipedia.org/wiki/Disjunctive_normal_form
+   */
+  private static boolean isDisjunctiveNormalForm(Filter filter) {
+    // A single field filter is always in DNF form.
+    // An AND of several field filters ("Flat AND") is in DNF form. Example: (A && B).
+    // An OR of field filters and "Flat AND"s is in DNF form. Example: A || (B && C) || (D && F).
+    // Everything else is not in DNF form.
+    return isSingleFieldFilter(filter)
+        || isFlatConjunction(filter)
+        || isDisjunctionOfFieldFiltersAndFlatConjunctions(filter);
+  }
+
+  /**
+   * Applies the associativity property to the given filter and returns the resulting filter.
+   *
+   * <ul>
+   *   <li>A | (B | C) == (A | B) | C == (A | B | C)
+   *   <li>A & (B & C) == (A & B) & C == (A & B & C)
+   * </ul>
+   *
+   * <p>For more info, visit: https://en.wikipedia.org/wiki/Associative_property#Propositional_logic
+   */
+  protected static Filter applyAssociation(Filter filter) {
+    assertFieldFilterOrCompositeFilter(filter);
+
+    if (isSingleFieldFilter(filter)) {
+      return filter;
+    }
+
+    CompositeFilter compositeFilter = (CompositeFilter) filter;
+
+    // Example: (A | (((B)) | (C | D) | (E & F & (G | H)) --> (A | B | C | D | (E & F & (G | H))
+    List<Filter> filters = compositeFilter.getFilters();
+
+    // If the composite filter only contains 1 filter, apply associativity to it.
+    if (filters.size() == 1) {
+      return applyAssociation(filters.get(0));
+    }
+
+    // Associativity applied to a flat composite filter results in itself.
+    if (compositeFilter.isFlat()) {
+      return compositeFilter;
+    }
+
+    // First apply associativity to all subfilters. This will in turn recursively apply
+    // associativity to all nested composite filters and field filters.
+    List<Filter> updatedFilters = new ArrayList<>();
+    for (Filter subfilter : filters) {
+      updatedFilters.add(applyAssociation(subfilter));
+    }
+
+    // For composite subfilters that perform the same kind of logical operation as `compositeFilter`
+    // take out their filters and add them to `compositeFilter`. For example:
+    // compositeFilter = (A | (B | C | D))
+    // compositeSubfilter = (B | C | D)
+    // Result: (A | B | C | D)
+    // Note that the `compositeSubfilter` has been eliminated, and its filters (B, C, D) have been
+    // added to the top-level "compositeFilter".
+    List<Filter> newSubfilters = new ArrayList<>();
+    for (Filter subfilter : updatedFilters) {
+      if (subfilter instanceof FieldFilter) {
+        newSubfilters.add(subfilter);
+      } else if (subfilter instanceof CompositeFilter) {
+        CompositeFilter compositeSubfilter = (CompositeFilter) subfilter;
+        if (compositeSubfilter.getOperator().equals(compositeFilter.getOperator())) {
+          // compositeFilter: (A | (B | C))
+          // compositeSubfilter: (B | C)
+          // Result: (A | B | C)
+          newSubfilters.addAll(compositeSubfilter.getFilters());
+        } else {
+          // compositeFilter: (A | (B & C))
+          // compositeSubfilter: (B & C)
+          // Result: (A | (B & C))
+          newSubfilters.add(compositeSubfilter);
+        }
+      }
+    }
+    if (newSubfilters.size() == 1) {
+      return newSubfilters.get(0);
+    }
+    return new CompositeFilter(newSubfilters, compositeFilter.getOperator());
+  }
+
+  /**
+   * Performs conjunction distribution for the given filters.
+   *
+   * <p>There are generally four types of distributions:
+   *
+   * <ul>
+   *   <li>Distribution of conjunction over disjunction: P & (Q | R) == (P & Q) | (P & R)
+   *   <li>Distribution of disjunction over conjunction: P | (Q & R) == (P | Q) & (P | R)
+   *   <li>Distribution of conjunction over conjunction: P & (Q & R) == (P & Q) & (P & R)
+   *   <li>Distribution of disjunction over disjunction: P | (Q | R) == (P | Q) | (P | R)
+   * </ul>
+   *
+   * <p>This function ONLY performs the first type (distributing conjunction over disjunction) as it
+   * is meant to be used towards arriving at a DNF form.
+   *
+   * <p>For more info, visit:
+   * https://en.wikipedia.org/wiki/Distributive_property#Propositional_logic
+   */
+  protected static Filter applyDistribution(Filter lhs, Filter rhs) {
+    assertFieldFilterOrCompositeFilter(lhs);
+    assertFieldFilterOrCompositeFilter(rhs);
+    Filter result;
+    if (lhs instanceof FieldFilter && rhs instanceof FieldFilter) {
+      result = applyDistribution((FieldFilter) lhs, (FieldFilter) rhs);
+    } else if (lhs instanceof FieldFilter && rhs instanceof CompositeFilter) {
+      result = applyDistribution((FieldFilter) lhs, (CompositeFilter) rhs);
+    } else if (lhs instanceof CompositeFilter && rhs instanceof FieldFilter) {
+      result = applyDistribution((FieldFilter) rhs, (CompositeFilter) lhs);
+    } else {
+      result = applyDistribution((CompositeFilter) lhs, (CompositeFilter) rhs);
+    }
+    // Since `applyDistribution` is recursive, we must apply association at the end of each
+    // distribution in order to ensure the result is as flat as possible for the next round of
+    // distributions.
+    return applyAssociation(result);
+  }
+
+  private static Filter applyDistribution(FieldFilter lhs, FieldFilter rhs) {
+    // Conjunction distribution for two field filters is the conjunction of them.
+    return new CompositeFilter(Arrays.asList(lhs, rhs), CompositeFilter.Operator.AND);
+  }
+
+  private static Filter applyDistribution(
+      FieldFilter fieldFilter, CompositeFilter compositeFilter) {
+    // There are two cases:
+    // A & (B & C) --> (A & B & C)
+    // A & (B | C) --> (A & B) | (A & C)
+    if (compositeFilter.isConjunction()) {
+      // Case 1
+      return compositeFilter.withAddedFilters(Collections.singletonList(fieldFilter));
+    } else {
+      // Case 2
+      List<Filter> newFilters = new ArrayList<>();
+      for (Filter subfilter : compositeFilter.getFilters()) {
+        newFilters.add(applyDistribution(fieldFilter, subfilter));
+      }
+      return new CompositeFilter(newFilters, CompositeFilter.Operator.OR);
+    }
+  }
+
+  private static Filter applyDistribution(CompositeFilter lhs, CompositeFilter rhs) {
+    hardAssert(
+        !lhs.getFilters().isEmpty() && !rhs.getFilters().isEmpty(),
+        "Found an empty composite filter");
+
+    // There are four cases:
+    // (A & B) & (C & D) --> (A & B & C & D)
+    // (A & B) & (C | D) --> (A & B & C) | (A & B & D)
+    // (A | B) & (C & D) --> (C & D & A) | (C & D & B)
+    // (A | B) & (C | D) --> (A & C) | (A & D) | (B & C) | (B & D)
+
+    // Case 1 is a merge.
+    if (lhs.isConjunction() && rhs.isConjunction()) {
+      return lhs.withAddedFilters(rhs.getFilters());
+    }
+
+    // Case 2,3,4 all have at least one side (lhs or rhs) that is a disjunction. In all three cases
+    // we should take each element of the disjunction and distribute it over the other side, and
+    // return the disjunction of the distribution results.
+    CompositeFilter disjunctionSide = lhs.isDisjunction() ? lhs : rhs;
+    CompositeFilter otherSide = lhs.isDisjunction() ? rhs : lhs;
+    List<Filter> results = new ArrayList<>();
+    for (Filter subfilter : disjunctionSide.getFilters()) {
+      results.add(applyDistribution(subfilter, otherSide));
+    }
+    return new CompositeFilter(results, CompositeFilter.Operator.OR);
+  }
+
+  protected static Filter computeDistributedNormalForm(Filter filter) {
+    assertFieldFilterOrCompositeFilter(filter);
+
+    if (filter instanceof FieldFilter) {
+      return filter;
+    }
+
+    CompositeFilter compositeFilter = (CompositeFilter) filter;
+
+    if (compositeFilter.getFilters().size() == 1) {
+      return computeDistributedNormalForm(filter.getFilters().get(0));
+    }
+
+    // Compute the DNF for each of the subfilters first.
+    List<Filter> result = new ArrayList<>();
+    for (Filter subfilter : compositeFilter.getFilters()) {
+      result.add(computeDistributedNormalForm(subfilter));
+    }
+    Filter newFilter = new CompositeFilter(result, compositeFilter.getOperator());
+    newFilter = applyAssociation(newFilter);
+
+    if (isDisjunctiveNormalForm(newFilter)) {
+      return newFilter;
+    }
+
+    hardAssert(newFilter instanceof CompositeFilter, "field filters are already in DNF form.");
+    CompositeFilter newCompositeFilter = (CompositeFilter) newFilter;
+    hardAssert(
+        newCompositeFilter.isConjunction(),
+        "Disjunction of filters all of which are already in DNF form is itself in DNF form.");
+    hardAssert(
+        newCompositeFilter.getFilters().size() > 1,
+        "Single-filter composite filters are already in DNF form.");
+    Filter runningResult = newCompositeFilter.getFilters().get(0);
+    for (int i = 1; i < newCompositeFilter.getFilters().size(); ++i) {
+      runningResult = applyDistribution(runningResult, newCompositeFilter.getFilters().get(i));
+    }
+    return runningResult;
+  }
+
+  /**
+   * The `in` filter is only a syntactic sugar over a disjunction of equalities. For instance: `a in
+   * [1,2,3]` is in fact `a==1 || a==2 || a==3`. This method expands any `in` filter in the given
+   * input into a disjunction of equality filters and returns the expanded filter.
+   */
+  protected static Filter computeInExpansion(Filter filter) {
+    assertFieldFilterOrCompositeFilter(filter);
+
+    List<Filter> expandedFilters = new ArrayList<>();
+
+    if (filter instanceof FieldFilter) {
+      if (filter instanceof InFilter) {
+        // We have reached a field filter with `in` operator.
+        for (Value value : ((InFilter) filter).getValue().getArrayValue().getValuesList()) {
+          expandedFilters.add(
+              FieldFilter.create(
+                  ((InFilter) filter).getField(), FieldFilter.Operator.EQUAL, value));
+        }
+        return new CompositeFilter(expandedFilters, CompositeFilter.Operator.OR);
+      } else {
+        // We have reached other kinds of field filters.
+        return filter;
+      }
+    }
+
+    // We have a composite filter.
+    CompositeFilter compositeFilter = (CompositeFilter) filter;
+    for (Filter subfilter : compositeFilter.getFilters()) {
+      expandedFilters.add(computeInExpansion(subfilter));
+    }
+    return new CompositeFilter(expandedFilters, compositeFilter.getOperator());
+  }
+
   /**
    * Given a composite filter, returns the list of terms in its disjunctive normal form.
    *
@@ -35,13 +332,23 @@ public class LogicUtils {
    * @param filter the composite filter to calculate DNF transform for.
    * @return the terms in the DNF transform.
    */
-  public static List<Filter> DnfTransform(CompositeFilter filter) {
-    // TODO(orquery): write the DNF transform algorithm here.
-    // For now, assume all inputs are of the form AND(A, B, ...). Therefore the resulting DNF form
-    // is the same as the input.
+  public static List<Filter> getDnfTerms(CompositeFilter filter) {
     if (filter.getFilters().isEmpty()) {
       return Collections.emptyList();
     }
-    return Collections.singletonList(filter);
+
+    // The `in` operator is a syntactic sugar over a disjunction of equalities. We should first
+    // replace such filters with equality filters before running the DNF transform.
+    Filter result = computeDistributedNormalForm(computeInExpansion(filter));
+
+    hardAssert(
+        isDisjunctiveNormalForm(result),
+        "computeDistributedNormalForm did not result in disjunctive normal form");
+
+    if (isSingleFieldFilter(result) || isFlatConjunction(result)) {
+      return Collections.singletonList(result);
+    }
+
+    return result.getFilters();
   }
 }
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/Preconditions.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/Preconditions.java
index 5270808795e..15dd0e6fee2 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/Preconditions.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/Preconditions.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.firestore.util;
 
+import java.util.Locale;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -149,6 +150,24 @@ public static <T extends Object> T checkNotNull(
     return reference;
   }
 
+  /**
+   * Ensures that an object reference passed as a parameter to the calling method is not null.
+   *
+   * @param reference an object reference
+   * @param errorFormatString the exception message to use if the check fails; will be formatted
+   *     using {@link String#format}.
+   * @param formatArgs the args to specify when formatting the given {@code errorFormatString}.
+   * @return the non-null reference that was validated
+   * @throws NullPointerException if {@code reference} is null
+   */
+  public static <T extends Object> T checkNotNull(
+      @Nonnull T reference, String errorFormatString, @Nullable Object... formatArgs) {
+    if (reference == null) {
+      throw new NullPointerException(String.format(Locale.US, errorFormatString, formatArgs));
+    }
+    return reference;
+  }
+
   /**
    * Ensures the truth of an expression involving the state of the calling instance, but not
    * involving any parameters to the calling method.
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/Util.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/Util.java
index 6591db805c1..eba5e4e5500 100644
--- a/firebase-firestore/src/main/java/com/google/firebase/firestore/util/Util.java
+++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/util/Util.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.firestore.util;
 
+import android.annotation.SuppressLint;
 import android.os.Handler;
 import android.os.Looper;
 import androidx.annotation.Nullable;
@@ -206,6 +207,8 @@ public static String typeName(@Nullable Object obj) {
   }
 
   /** Raises an exception on Android's UI Thread and crashes the end user's app. */
+  // TODO(b/258277574): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   public static void crashMainThread(RuntimeException exception) {
     new Handler(Looper.getMainLooper())
         .post(
diff --git a/firebase-firestore/src/proto/google/firestore/v1/aggregation_result.proto b/firebase-firestore/src/proto/google/firestore/v1/aggregation_result.proto
new file mode 100644
index 00000000000..538e3fef5e4
--- /dev/null
+++ b/firebase-firestore/src/proto/google/firestore/v1/aggregation_result.proto
@@ -0,0 +1,42 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 google.firestore.v1;
+
+import "google/firestore/v1/document.proto";
+
+option csharp_namespace = "Google.Cloud.Firestore.V1";
+option go_package = "google.golang.org/genproto/googleapis/firestore/v1;firestore";
+option java_multiple_files = true;
+option java_outer_classname = "AggregationResultProto";
+option java_package = "com.google.firestore.v1";
+option objc_class_prefix = "GCFS";
+option php_namespace = "Google\\Cloud\\Firestore\\V1";
+option ruby_package = "Google::Cloud::Firestore::V1";
+
+// The result of a single bucket from a Firestore aggregation query.
+//
+// The keys of `aggregate_fields` are the same for all results in an aggregation
+// query, unlike document queries which can have different fields present for
+// each result.
+message AggregationResult {
+  // The result of the aggregation functions, ex: `COUNT(*) AS total_docs`.
+  //
+  // The key is the [alias][google.firestore.v1.StructuredAggregationQuery.Aggregation.alias]
+  // assigned to the aggregation function on input and the size of this map
+  // equals the number of aggregation functions in the query.
+  map<string, Value> aggregate_fields = 2;
+}
diff --git a/firebase-firestore/src/proto/google/firestore/v1/bloom_filter.proto b/firebase-firestore/src/proto/google/firestore/v1/bloom_filter.proto
new file mode 100644
index 00000000000..9487e3036fe
--- /dev/null
+++ b/firebase-firestore/src/proto/google/firestore/v1/bloom_filter.proto
@@ -0,0 +1,73 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 google.firestore.v1;
+
+option csharp_namespace = "Google.Cloud.Firestore.V1";
+option go_package = "google.golang.org/genproto/googleapis/firestore/v1;firestore";
+option java_multiple_files = true;
+option java_outer_classname = "BloomFilterProto";
+option java_package = "com.google.firestore.v1";
+option objc_class_prefix = "GCFS";
+option php_namespace = "Google\\Cloud\\Firestore\\V1";
+option ruby_package = "Google::Cloud::Firestore::V1";
+
+// A sequence of bits, encoded in a byte array.
+//
+// Each byte in the `bitmap` byte array stores 8 bits of the sequence. The only
+// exception is the last byte, which may store 8 _or fewer_ bits. The `padding`
+// defines the number of bits of the last byte to be ignored as "padding". The
+// values of these "padding" bits are unspecified and must be ignored.
+//
+// To retrieve the first bit, bit 0, calculate: (bitmap[0] & 0x01) != 0.
+// To retrieve the second bit, bit 1, calculate: (bitmap[0] & 0x02) != 0.
+// To retrieve the third bit, bit 2, calculate: (bitmap[0] & 0x04) != 0.
+// To retrieve the fourth bit, bit 3, calculate: (bitmap[0] & 0x08) != 0.
+// To retrieve bit n, calculate: (bitmap[n / 8] & (0x01 << (n % 8))) != 0.
+//
+// The "size" of a `BitSequence` (the number of bits it contains) is calculated
+// by this formula: (bitmap.length * 8) - padding.
+message BitSequence {
+  // The bytes that encode the bit sequence.
+  // May have a length of zero.
+  bytes bitmap = 1;
+
+  // The number of bits of the last byte in `bitmap` to ignore as "padding".
+  // If the length of `bitmap` is zero, then this value must be 0.
+  // Otherwise, this value must be between 0 and 7, inclusive.
+  int32 padding = 2;
+}
+
+// A bloom filter (https://en.wikipedia.org/wiki/Bloom_filter).
+//
+// The bloom filter hashes the entries with MD5 and treats the resulting 128-bit
+// hash as 2 distinct 64-bit hash values, interpreted as unsigned integers
+// using 2's complement encoding.
+//
+// These two hash values, named h1 and h2, are then used to compute the
+// `hash_count` hash values using the formula, starting at i=0:
+//
+//   h(i) = h1 + (i * h2)
+//
+// These resulting values are then taken modulo the number of bits in the bloom
+// filter to get the bits of the bloom filter to test for the given entry.
+message BloomFilter {
+  // The bloom filter data.
+  BitSequence bits = 1;
+
+  // The number of hashes used by the algorithm.
+  int32 hash_count = 2;
+}
\ No newline at end of file
diff --git a/firebase-firestore/src/proto/google/firestore/v1/firestore.proto b/firebase-firestore/src/proto/google/firestore/v1/firestore.proto
index d425edf9e0f..1bf75ea3c15 100644
--- a/firebase-firestore/src/proto/google/firestore/v1/firestore.proto
+++ b/firebase-firestore/src/proto/google/firestore/v1/firestore.proto
@@ -18,12 +18,14 @@ syntax = "proto3";
 package google.firestore.v1;
 
 import "google/api/annotations.proto";
+import "google/firestore/v1/aggregation_result.proto";
 import "google/firestore/v1/common.proto";
 import "google/firestore/v1/document.proto";
 import "google/firestore/v1/query.proto";
 import "google/firestore/v1/write.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
+import "google/protobuf/wrappers.proto";
 import "google/rpc/status.proto";
 
 option csharp_namespace = "Google.Cloud.Firestore.V1";
@@ -136,6 +138,29 @@ service Firestore {
     };
   }
 
+  // Runs an aggregation query.
+  //
+  // Rather than producing [Document][google.firestore.v1.Document] results like [Firestore.RunQuery][google.firestore.v1.Firestore.RunQuery],
+  // this API allows running an aggregation to produce a series of
+  // [AggregationResult][google.firestore.v1.AggregationResult] server-side.
+  //
+  // High-Level Example:
+  //
+  // ```
+  // -- Return the number of documents in table given a filter.
+  // SELECT COUNT(*) FROM ( SELECT * FROM k where a = true );
+  // ```
+  rpc RunAggregationQuery(RunAggregationQueryRequest) returns (stream RunAggregationQueryResponse) {
+    option (google.api.http) = {
+      post: "/v1/{parent=projects/*/databases/*/documents}:runAggregationQuery"
+      body: "*"
+      additional_bindings {
+        post: "/v1/{parent=projects/*/databases/*/documents/*/**}:runAggregationQuery"
+        body: "*"
+      }
+    };
+  }
+
   // Streams batches of document updates and deletes, in order.
   rpc Write(stream WriteRequest) returns (stream WriteResponse) {
     option (google.api.http) = {
@@ -485,6 +510,62 @@ message RunQueryResponse {
   int32 skipped_results = 4;
 }
 
+// The request for [Firestore.RunAggregationQuery][google.firestore.v1.Firestore.RunAggregationQuery].
+message RunAggregationQueryRequest {
+  // Required. The parent resource name. In the format:
+  // `projects/{project_id}/databases/{database_id}/documents` or
+  // `projects/{project_id}/databases/{database_id}/documents/{document_path}`.
+  // For example:
+  // `projects/my-project/databases/my-database/documents` or
+  // `projects/my-project/databases/my-database/documents/chatrooms/my-chatroom`
+  string parent = 1;
+
+  // The query to run.
+  oneof query_type {
+    // An aggregation query.
+    StructuredAggregationQuery structured_aggregation_query = 2;
+  }
+
+  // The consistency mode for the query, defaults to strong consistency.
+  oneof consistency_selector {
+    // Run the aggregation within an already active transaction.
+    //
+    // The value here is the opaque transaction ID to execute the query in.
+    bytes transaction = 4;
+
+    // Starts a new transaction as part of the query, defaulting to read-only.
+    //
+    // The new transaction ID will be returned as the first response in the
+    // stream.
+    TransactionOptions new_transaction = 5;
+
+    // Executes the query at the given timestamp.
+    //
+    // Requires:
+    //
+    // * Cannot be more than 270 seconds in the past.
+    google.protobuf.Timestamp read_time = 6;
+  }
+}
+
+// The response for [Firestore.RunAggregationQuery][google.firestore.v1.Firestore.RunAggregationQuery].
+message RunAggregationQueryResponse {
+  // A single aggregation result.
+  //
+  // Not present when reporting partial progress or when the query produced
+  // zero results.
+  AggregationResult result = 1;
+
+  // The transaction that was started as part of this request.
+  //
+  // Only present on the first response when the request requested to start
+  // a new transaction.
+  bytes transaction = 2;
+
+  // The time at which the aggregate value is valid for.
+  google.protobuf.Timestamp read_time = 3;
+}
+
 // The request for [Firestore.Write][google.firestore.v1.Firestore.Write].
 //
 // The first request creates a stream, or resumes an existing one from a token.
@@ -666,6 +747,15 @@ message Target {
 
   // If the target should be removed once it is current and consistent.
   bool once = 6;
+
+  // The number of documents that last matched the query at the resume token or
+  // read time.
+  //
+  // This value is only relevant when a `resume_type` is provided. This value
+  // being present and greater than zero signals that the client wants
+  // `ExistenceFilter.unchanged_names` to be included in the response.
+  //
+  google.protobuf.Int32Value expected_count = 12;
 }
 
 // Targets being watched have changed.
diff --git a/firebase-firestore/src/proto/google/firestore/v1/query.proto b/firebase-firestore/src/proto/google/firestore/v1/query.proto
index 25d53238130..b6139c305f5 100644
--- a/firebase-firestore/src/proto/google/firestore/v1/query.proto
+++ b/firebase-firestore/src/proto/google/firestore/v1/query.proto
@@ -66,8 +66,11 @@ message StructuredQuery {
       // Unspecified. This value must not be used.
       OPERATOR_UNSPECIFIED = 0;
 
-      // The results are required to satisfy each of the combined filters.
+      // Documents are required to satisfy all of the combined filters.
       AND = 1;
+
+      // Documents are required to satisfy at least one of the combined filters.
+      OR = 2;
     }
 
     // The operator for combining multiple filters.
@@ -288,6 +291,94 @@ message StructuredQuery {
   google.protobuf.Int32Value limit = 5;
 }
 
+message StructuredAggregationQuery {
+  // Defines a aggregation that produces a single result.
+  message Aggregation {
+    // Count of documents that match the query.
+    //
+    // The `COUNT(*)` aggregation function operates on the entire document
+    // so it does not require a field reference.
+    message Count {
+      // Optional. Optional constraint on the maximum number of documents to count.
+      //
+      // This provides a way to set an upper bound on the number of documents
+      // to scan, limiting latency and cost.
+      //
+      // High-Level Example:
+      //
+      // ```
+      // SELECT COUNT_UP_TO(1000) FROM ( SELECT * FROM k );
+      // ```
+      //
+      // Requires:
+      //
+      // * Must be greater than zero when present.
+      google.protobuf.Int64Value up_to = 1;
+    }
+
+    // Sum of the values of the requested field.
+    //
+    // * Only numeric values will be aggregated. All non-numeric values
+    // including `NULL` are skipped.
+    //
+    // * If the aggregated values contain `NaN`, returns `NaN`.
+    //
+    // * If the aggregated value set is empty, returns 0.
+    //
+    // * Returns a 64-bit integer if the sum result is an integer value and does
+    // not overflow or underflow. Otherwise, the result is returned as a double.
+    message Sum {
+      // The field to aggregate on.
+      StructuredQuery.FieldReference field = 1;
+    }
+
+    // Average of the values of the requested field.
+    //
+    // * Only numeric values will be aggregated. All non-numeric values
+    // including `NULL` are skipped.
+    //
+    // * If the aggregated values contain `NaN`, returns `NaN`.
+    //
+    // * If the aggregated value set is empty, returns `NULL`.
+    //
+    // * Always returns the result as a double.
+    message Avg {
+      // The field to aggregate on.
+      StructuredQuery.FieldReference field = 1;
+    }
+
+    // The type of aggregation to perform, required.
+    oneof operator {
+      // Count aggregator.
+      Count count = 1;
+
+      // Sum aggregator.
+      Sum sum = 2;
+
+      // Average aggregator.
+      Avg avg = 3;
+    }
+
+    // Required. The name of the field to store the result of the aggregation into.
+    //
+    // Requires:
+    //
+    // * Must be present.
+    // * Must be unique across all aggregation aliases.
+    // * Conform to existing [document field name][google.firestore.v1.Document.fields] limitations.
+    string alias = 7;
+  }
+
+  // The base query to aggregate over.
+  oneof query_type {
+    // Nested structured query.
+    StructuredQuery structured_query = 1;
+  }
+
+  // Optional. Series of aggregations to apply on top of the `structured_query`.
+  repeated Aggregation aggregations = 3;
+}
+
 // A position in a query result set.
 message Cursor {
   // The values that represent a position, in the order they appear in
diff --git a/firebase-firestore/src/proto/google/firestore/v1/write.proto b/firebase-firestore/src/proto/google/firestore/v1/write.proto
index 59b2dafe4fd..49acae6ebf6 100644
--- a/firebase-firestore/src/proto/google/firestore/v1/write.proto
+++ b/firebase-firestore/src/proto/google/firestore/v1/write.proto
@@ -18,6 +18,7 @@ syntax = "proto3";
 package google.firestore.v1;
 
 import "google/api/annotations.proto";
+import "google/firestore/v1/bloom_filter.proto";
 import "google/firestore/v1/common.proto";
 import "google/firestore/v1/document.proto";
 import "google/protobuf/timestamp.proto";
@@ -261,4 +262,18 @@ message ExistenceFilter {
   // If different from the count of documents in the client that match, the
   // client must manually determine which documents no longer match the target.
   int32 count = 2;
+
+  // A bloom filter that contains the UTF-8 byte encodings of the resource names
+  // of the documents that match [target_id][google.firestore.v1.ExistenceFilter.target_id], in the
+  // form `projects/{project_id}/databases/{database_id}/documents/{document_path}`
+  // that have NOT changed since the query results indicated by the resume token
+  // or timestamp given in `Target.resume_type`.
+  //
+  // This bloom filter may be omitted at the server's discretion, such as if it
+  // is deemed that the client will not make use of it or if it is too
+  // computationally expensive to calculate or transmit. Clients must gracefully
+  // handle this field being absent by falling back to the logic used before
+  // this field existed; that is, re-add the target without a resume token to
+  // figure out which documents in the client's cache are out of sync.
+  BloomFilter unchanged_names = 3;
 }
diff --git a/firebase-firestore/src/roboUtil/java/com/google/firebase/firestore/TestUtil.java b/firebase-firestore/src/roboUtil/java/com/google/firebase/firestore/TestUtil.java
index a4bf3f7f3dd..d8a33a4f72b 100644
--- a/firebase-firestore/src/roboUtil/java/com/google/firebase/firestore/TestUtil.java
+++ b/firebase-firestore/src/roboUtil/java/com/google/firebase/firestore/TestUtil.java
@@ -83,7 +83,8 @@ public static QuerySnapshot querySnapshot(
       Map<String, ObjectValue> oldDocs,
       Map<String, ObjectValue> docsToAdd,
       boolean hasPendingWrites,
-      boolean isFromCache) {
+      boolean isFromCache,
+      boolean hasCachedResults) {
     DocumentSet oldDocuments = docSet(Document.KEY_COMPARATOR);
     ImmutableSortedSet<DocumentKey> mutatedKeys = DocumentKey.emptyKeySet();
     for (Map.Entry<String, ObjectValue> pair : oldDocs.entrySet()) {
@@ -116,7 +117,8 @@ public static QuerySnapshot querySnapshot(
             isFromCache,
             mutatedKeys,
             /* didSyncStateChange= */ true,
-            /* excludesMetadataChanges= */ false);
+            /* excludesMetadataChanges= */ false,
+            hasCachedResults);
     return new QuerySnapshot(query(path), viewSnapshot, FIRESTORE);
   }
 
diff --git a/firebase-firestore/src/test/AndroidManifest.xml b/firebase-firestore/src/test/AndroidManifest.xml
index 4132e11c353..ed80bef12cb 100644
--- a/firebase-firestore/src/test/AndroidManifest.xml
+++ b/firebase-firestore/src/test/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.firestore.model">
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application
         android:label="FirebaseCommonTests" >
         <uses-library android:name="android.test.runner" />
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/AggregateQuerySnapshotTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/AggregateQuerySnapshotTest.java
new file mode 100644
index 00000000000..dc33eb0d11b
--- /dev/null
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/AggregateQuerySnapshotTest.java
@@ -0,0 +1,36 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.firestore.TestUtil.collectionReference;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class AggregateQuerySnapshotTest {
+
+  @Test
+  public void createWithCountShouldReturnInstanceWithTheGivenQueryAndCount() {
+    AggregateQuery query = collectionReference("foo/bar/baz").count();
+    AggregateQuerySnapshot snapshot = AggregateQuerySnapshot.createWithCount(query, 42);
+    assertThat(snapshot.getQuery()).isSameInstanceAs(query);
+    assertThat(snapshot.getCount()).isEqualTo(42);
+  }
+}
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/AggregateQueryTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/AggregateQueryTest.java
new file mode 100644
index 00000000000..fd7c9764517
--- /dev/null
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/AggregateQueryTest.java
@@ -0,0 +1,34 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import static com.google.firebase.firestore.testutil.Assert.assertThrows;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class AggregateQueryTest {
+
+  @Test
+  public void testSourceMustNotBeNull() {
+    assertThrows(
+        NullPointerException.class,
+        () -> TestUtil.collectionReference("foo/bar/baz").count().get(null));
+  }
+}
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/FieldPathTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/FieldPathTest.java
index ad9b3e4dc18..edf6214c583 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/FieldPathTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/FieldPathTest.java
@@ -16,6 +16,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThrows;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,24 +33,24 @@ public void pathWithArray() {
     assertEquals("a.b.c", fieldPath.toString());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void emptyPathIsInvalid() {
-    FieldPath.fromDotSeparatedPath("");
+    assertThrows(IllegalArgumentException.class, () -> FieldPath.fromDotSeparatedPath(""));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void emptyFirstSegmentIsInvalid() {
-    FieldPath.fromDotSeparatedPath(".a");
+    assertThrows(IllegalArgumentException.class, () -> FieldPath.fromDotSeparatedPath(".a"));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void emptyLastSegmentIsInvalid() {
-    FieldPath.fromDotSeparatedPath("a.");
+    assertThrows(IllegalArgumentException.class, () -> FieldPath.fromDotSeparatedPath("a."));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void emptyMiddleSegmentIsInvalid() {
-    FieldPath.fromDotSeparatedPath("a..b");
+    assertThrows(IllegalArgumentException.class, () -> FieldPath.fromDotSeparatedPath("a..b"));
   }
 
   @Test
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/FilterTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/FilterTest.java
new file mode 100644
index 00000000000..4d8e1fe9b0a
--- /dev/null
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/FilterTest.java
@@ -0,0 +1,178 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import com.google.common.collect.ImmutableList;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class FilterTest {
+
+  @Test
+  public void equalTo() {
+    Filter filter = Filter.equalTo("x", "v");
+    assertEquals(filter, filter);
+    assertEquals(filter, Filter.equalTo(FieldPath.of("x"), "v"));
+    assertNotEquals(filter, Filter.equalTo("x", "z"));
+    assertNotEquals(filter, Filter.equalTo("y", "v"));
+    assertNotEquals(filter, Filter.notEqualTo("x", "v"));
+  }
+
+  @Test
+  public void notEqualTo() {
+    Filter filter = Filter.notEqualTo("x", "v");
+    assertEquals(filter, filter);
+    assertEquals(filter, Filter.notEqualTo(FieldPath.of("x"), "v"));
+    assertNotEquals(filter, Filter.notEqualTo("x", "z"));
+    assertNotEquals(filter, Filter.notEqualTo("y", "v"));
+    assertNotEquals(filter, Filter.equalTo("x", "v"));
+  }
+
+  @Test
+  public void greaterThan() {
+    Filter filter = Filter.greaterThan("x", "v");
+    assertEquals(filter, filter);
+    assertEquals(filter, Filter.greaterThan(FieldPath.of("x"), "v"));
+    assertNotEquals(filter, Filter.greaterThan("x", "z"));
+    assertNotEquals(filter, Filter.greaterThan("y", "v"));
+    assertNotEquals(filter, Filter.lessThan("x", "v"));
+  }
+
+  @Test
+  public void greaterThanOrEqualTo() {
+    Filter filter = Filter.greaterThanOrEqualTo("x", "v");
+    assertEquals(filter, filter);
+    assertEquals(filter, Filter.greaterThanOrEqualTo(FieldPath.of("x"), "v"));
+    assertNotEquals(filter, Filter.greaterThanOrEqualTo("x", "z"));
+    assertNotEquals(filter, Filter.greaterThanOrEqualTo("y", "v"));
+    assertNotEquals(filter, Filter.lessThanOrEqualTo("x", "v"));
+  }
+
+  @Test
+  public void lessThan() {
+    Filter filter = Filter.lessThan("x", "v");
+    assertEquals(filter, filter);
+    assertEquals(filter, Filter.lessThan(FieldPath.of("x"), "v"));
+    assertNotEquals(filter, Filter.lessThan("x", "z"));
+    assertNotEquals(filter, Filter.lessThan("y", "v"));
+    assertNotEquals(filter, Filter.greaterThan("x", "v"));
+  }
+
+  @Test
+  public void lessThanOrEqualTo() {
+    Filter filter = Filter.lessThanOrEqualTo("x", "v");
+    assertEquals(filter, filter);
+    assertEquals(filter, Filter.lessThanOrEqualTo(FieldPath.of("x"), "v"));
+    assertNotEquals(filter, Filter.lessThanOrEqualTo("x", "z"));
+    assertNotEquals(filter, Filter.lessThanOrEqualTo("y", "v"));
+    assertNotEquals(filter, Filter.greaterThanOrEqualTo("x", "v"));
+  }
+
+  @Test
+  public void arrayContains() {
+    Filter filter = Filter.arrayContains("x", "v");
+    assertEquals(filter, filter);
+    assertEquals(filter, Filter.arrayContains(FieldPath.of("x"), "v"));
+    assertNotEquals(filter, Filter.arrayContains("x", "z"));
+    assertNotEquals(filter, Filter.arrayContains("y", "v"));
+    assertNotEquals(filter, Filter.equalTo("x", "v"));
+  }
+
+  @Test
+  public void arrayContainsAny() {
+    Filter filter = Filter.arrayContainsAny("x", ImmutableList.of("v1", "v2"));
+    assertEquals(filter, filter);
+    assertEquals(filter, Filter.arrayContainsAny(FieldPath.of("x"), ImmutableList.of("v1", "v2")));
+    assertNotEquals(filter, Filter.arrayContainsAny("x", ImmutableList.of("v2", "v1")));
+    assertNotEquals(filter, Filter.arrayContainsAny("x", ImmutableList.of("v2", "v3")));
+    assertNotEquals(filter, Filter.arrayContainsAny("y", ImmutableList.of("v1", "v2")));
+    assertNotEquals(filter, Filter.equalTo("x", "v"));
+  }
+
+  @Test
+  public void inArray() {
+    Filter filter = Filter.inArray("x", ImmutableList.of("v1", "v2"));
+    assertEquals(filter, filter);
+    assertEquals(filter, Filter.inArray(FieldPath.of("x"), ImmutableList.of("v1", "v2")));
+    assertNotEquals(filter, Filter.inArray("x", ImmutableList.of("v2", "v1")));
+    assertNotEquals(filter, Filter.inArray("x", ImmutableList.of("v2", "v3")));
+    assertNotEquals(filter, Filter.inArray("y", ImmutableList.of("v1", "v2")));
+    assertNotEquals(filter, Filter.notInArray("x", ImmutableList.of("v1", "v2")));
+  }
+
+  @Test
+  public void notInArray() {
+    Filter filter = Filter.notInArray("x", ImmutableList.of("v1", "v2"));
+    assertEquals(filter, filter);
+    assertEquals(filter, Filter.notInArray(FieldPath.of("x"), ImmutableList.of("v1", "v2")));
+    assertNotEquals(filter, Filter.notInArray("x", ImmutableList.of("v2", "v1")));
+    assertNotEquals(filter, Filter.notInArray("x", ImmutableList.of("v2", "v3")));
+    assertNotEquals(filter, Filter.notInArray("y", ImmutableList.of("v1", "v2")));
+    assertNotEquals(filter, Filter.inArray("x", ImmutableList.of("v1", "v2")));
+  }
+
+  @Test
+  public void or() {
+    Filter filter =
+        Filter.or(
+            Filter.inArray("x", ImmutableList.of("v1", "v2")),
+            Filter.inArray("y", ImmutableList.of("v3", "v4")));
+    assertEquals(
+        filter,
+        Filter.or(
+            Filter.inArray(FieldPath.of("x"), ImmutableList.of("v1", "v2")),
+            Filter.inArray(FieldPath.of("y"), ImmutableList.of("v3", "v4"))));
+    assertNotEquals(
+        filter,
+        Filter.and(
+            Filter.inArray("x", ImmutableList.of("v1", "v2")),
+            Filter.inArray("y", ImmutableList.of("v3", "v4"))));
+    assertNotEquals(
+        filter,
+        Filter.or(
+            Filter.inArray("y", ImmutableList.of("v3", "v4")),
+            Filter.inArray("x", ImmutableList.of("v1", "v2"))));
+  }
+
+  @Test
+  public void and() {
+    Filter filter =
+        Filter.and(
+            Filter.inArray("x", ImmutableList.of("v1", "v2")),
+            Filter.inArray("y", ImmutableList.of("v3", "v4")));
+    assertEquals(
+        filter,
+        Filter.and(
+            Filter.inArray(FieldPath.of("x"), ImmutableList.of("v1", "v2")),
+            Filter.inArray(FieldPath.of("y"), ImmutableList.of("v3", "v4"))));
+    assertNotEquals(
+        filter,
+        Filter.or(
+            Filter.inArray("x", ImmutableList.of("v1", "v2")),
+            Filter.inArray("y", ImmutableList.of("v3", "v4"))));
+    assertNotEquals(
+        filter,
+        Filter.and(
+            Filter.inArray("y", ImmutableList.of("v3", "v4")),
+            Filter.inArray("x", ImmutableList.of("v1", "v2"))));
+  }
+}
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/FirebaseFirestoreSettingsTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/FirebaseFirestoreSettingsTest.java
index 759c90ab447..afff447e99f 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/FirebaseFirestoreSettingsTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/FirebaseFirestoreSettingsTest.java
@@ -15,6 +15,7 @@
 package com.google.firebase.firestore;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -40,12 +41,12 @@ public void builderWithAllValuesCustomizedShouldProduceSettingsWithThoseCustomVa
         new FirebaseFirestoreSettings.Builder()
             .setHost("a.b.c")
             .setSslEnabled(false)
-            .setPersistenceEnabled(false)
-            .setCacheSizeBytes(2000000L)
+            .setLocalCacheSettings(
+                PersistentCacheSettings.newBuilder().setSizeBytes(2000000L).build())
             .build();
     assertEquals(settings.getHost(), "a.b.c");
     assertEquals(settings.isSslEnabled(), false);
-    assertEquals(settings.isPersistenceEnabled(), false);
+    assertEquals(settings.isPersistenceEnabled(), true);
     assertEquals(settings.getCacheSizeBytes(), 2000000L);
   }
 
@@ -55,13 +56,48 @@ public void builderConstructorShouldCopyAllValuesFromTheGivenSettings() {
         new FirebaseFirestoreSettings.Builder()
             .setHost("a.b.c")
             .setSslEnabled(false)
-            .setPersistenceEnabled(false)
-            .setCacheSizeBytes(2000000L)
+            .setLocalCacheSettings(MemoryCacheSettings.newBuilder().build())
             .build();
     FirebaseFirestoreSettings settings2 = new FirebaseFirestoreSettings.Builder(settings1).build();
     assertEquals(settings2.getHost(), "a.b.c");
     assertEquals(settings2.isSslEnabled(), false);
     assertEquals(settings2.isPersistenceEnabled(), false);
-    assertEquals(settings2.getCacheSizeBytes(), 2000000L);
+    assertEquals(settings2.getCacheSizeBytes(), FirebaseFirestoreSettings.CACHE_SIZE_UNLIMITED);
+  }
+
+  @Test
+  public void cannotMixLegacyAndNewCacheConfig() {
+    FirebaseFirestoreSettings.Builder builder =
+        new FirebaseFirestoreSettings.Builder()
+            .setHost("a.b.c")
+            .setSslEnabled(false)
+            .setLocalCacheSettings(MemoryCacheSettings.newBuilder().build());
+    assertThrows(
+        IllegalStateException.class,
+        () -> {
+          builder.setPersistenceEnabled(false);
+        });
+
+    FirebaseFirestoreSettings.Builder builder1 =
+        new FirebaseFirestoreSettings.Builder()
+            .setHost("a.b.c")
+            .setSslEnabled(false)
+            .setCacheSizeBytes(2_000_000);
+    assertThrows(
+        IllegalStateException.class,
+        () -> {
+          builder1.setLocalCacheSettings(PersistentCacheSettings.newBuilder().build());
+        });
+  }
+
+  @Test
+  public void cannotCustomizeCacheConfig() {
+    FirebaseFirestoreSettings.Builder builder =
+        new FirebaseFirestoreSettings.Builder().setHost("a.b.c").setSslEnabled(false);
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          builder.setLocalCacheSettings(new LocalCacheSettings() {});
+        });
   }
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/FirebaseFirestoreTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/FirebaseFirestoreTest.java
index f8ac17500e5..660a636574e 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/FirebaseFirestoreTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/FirebaseFirestoreTest.java
@@ -51,7 +51,9 @@ public void getInstance_withEmulator_mergeSettingsSuccess() {
     FirebaseFirestore firestore = FirebaseFirestore.getInstance(app);
     firestore.useEmulator("10.0.2.2", 8080);
     firestore.setFirestoreSettings(
-        new FirebaseFirestoreSettings.Builder().setPersistenceEnabled(false).build());
+        new FirebaseFirestoreSettings.Builder()
+            .setLocalCacheSettings(MemoryCacheSettings.newBuilder().build())
+            .build());
 
     FirebaseFirestoreSettings settings = firestore.getFirestoreSettings();
 
@@ -101,7 +103,9 @@ public void setSettings_repeatedSuccess_withEmulator() {
     firestore.useEmulator("10.0.2.2", 8080);
 
     FirebaseFirestoreSettings settings =
-        new FirebaseFirestoreSettings.Builder().setPersistenceEnabled(false).build();
+        new FirebaseFirestoreSettings.Builder()
+            .setLocalCacheSettings(MemoryCacheSettings.newBuilder().build())
+            .build();
     firestore.setFirestoreSettings(settings);
 
     // This should 'start' Firestore
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/FirestoreMultiDbComponentTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/FirestoreMultiDbComponentTest.java
index 52c82435367..b705b28c6a2 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/FirestoreMultiDbComponentTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/FirestoreMultiDbComponentTest.java
@@ -26,7 +26,7 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.appcheck.AppCheckTokenResult;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.firestore.remote.GrpcMetadataProvider;
 import com.google.firebase.firestore.testutil.ImmediateDeferred;
@@ -66,14 +66,14 @@ private static FirestoreMultiDbComponent createComponent(FirebaseApp firebaseApp
     Context context = InstrumentationRegistry.getInstrumentation().getContext();
     InternalAuthProvider authProvider = mock(InternalAuthProvider.class);
     Deferred<InternalAuthProvider> deferredAuthProvider = new ImmediateDeferred<>(authProvider);
-    InternalAppCheckTokenProvider mockInternalAppCheckProvider =
-        mock(InternalAppCheckTokenProvider.class);
+    InteropAppCheckTokenProvider mockInternalAppCheckProvider =
+        mock(InteropAppCheckTokenProvider.class);
     AppCheckTokenResult mockAppCheckTokenResult = mock(AppCheckTokenResult.class);
     when(mockAppCheckTokenResult.getToken()).thenReturn("TestAppCheckToken");
     doReturn(Tasks.forResult(mockAppCheckTokenResult))
         .when(mockInternalAppCheckProvider)
         .getToken(anyBoolean());
-    Deferred<InternalAppCheckTokenProvider> deferredAppCheckTokenProvider =
+    Deferred<InteropAppCheckTokenProvider> deferredAppCheckTokenProvider =
         new ImmediateDeferred<>(mockInternalAppCheckProvider);
     GrpcMetadataProvider metadataProvider = mock(GrpcMetadataProvider.class);
     return new FirestoreMultiDbComponent(
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/FirestoreTests.kt b/firebase-firestore/src/test/java/com/google/firebase/firestore/FirestoreTests.kt
new file mode 100644
index 00000000000..35987d94f3f
--- /dev/null
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/FirestoreTests.kt
@@ -0,0 +1,263 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.firestore
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.firestore.model.ObjectValue
+import com.google.firebase.firestore.testutil.TestUtilKtx.wrap
+import com.google.firebase.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class FirestoreTests : BaseTestCase() {
+
+  @Test
+  fun `firestore should delegate to FirebaseFirestore#getInstance()`() {
+    assertThat(Firebase.firestore).isSameInstanceAs(FirebaseFirestore.getInstance())
+  }
+
+  @Test
+  fun `Database#firestore should delegate to FirebaseFirestore#getInstance(Database)`() {
+    assertThat(Firebase.firestore("name")).isSameInstanceAs(FirebaseFirestore.getInstance("name"))
+  }
+
+  @Test
+  fun `FirebaseApp#firestore should delegate to FirebaseFirestore#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.firestore(app)).isSameInstanceAs(FirebaseFirestore.getInstance(app))
+  }
+
+  @Test
+  fun `FirebaseApp#Database#firestore should delegate to FirebaseFirestore#getInstance(FirebaseApp,Database)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.firestore(app, "name"))
+      .isSameInstanceAs(FirebaseFirestore.getInstance(app, "name"))
+  }
+
+  @Test
+  fun `FirebaseFirestoreSettings builder works`() {
+    val host = "http://10.0.2.2:8080"
+    val isSslEnabled = false
+    val isPersistenceEnabled = false
+
+    val settings = firestoreSettings {
+      this.host = host
+      this.isSslEnabled = isSslEnabled
+      this.isPersistenceEnabled = isPersistenceEnabled
+    }
+
+    assertThat(host).isEqualTo(settings.host)
+    assertThat(isSslEnabled).isEqualTo(settings.isSslEnabled)
+    assertThat(isPersistenceEnabled).isEqualTo(settings.isPersistenceEnabled)
+  }
+
+  @Test
+  fun `LocalCacheSettings builder works`() {
+    val host = "http://10.0.2.2:8080"
+    val isSslEnabled = false
+
+    val settings = firestoreSettings {
+      this.host = host
+      this.isSslEnabled = isSslEnabled
+      this.setLocalCacheSettings(persistentCacheSettings { setSizeBytes(1_000_000) })
+    }
+
+    assertThat(host).isEqualTo(settings.host)
+    assertThat(isSslEnabled).isEqualTo(settings.isSslEnabled)
+    assertThat(settings.isPersistenceEnabled).isTrue()
+    assertThat(settings.cacheSizeBytes).isEqualTo(1_000_000)
+
+    val otherSettings = firestoreSettings { this.setLocalCacheSettings(memoryCacheSettings {}) }
+
+    assertThat(otherSettings.host).isEqualTo(FirebaseFirestoreSettings.DEFAULT_HOST)
+    assertThat(otherSettings.isSslEnabled).isEqualTo(true)
+    assertThat(otherSettings.isPersistenceEnabled).isFalse()
+  }
+
+  @Test
+  fun `MemoryCacheSettings Garbage Collector builder works`() {
+    val host = "http://10.0.2.2:8080"
+    val isSslEnabled = false
+
+    val settings = firestoreSettings {
+      this.host = host
+      this.isSslEnabled = isSslEnabled
+      this.setLocalCacheSettings(memoryCacheSettings {})
+    }
+
+    assertThat(host).isEqualTo(settings.host)
+    assertThat(isSslEnabled).isEqualTo(settings.isSslEnabled)
+    assertThat(settings.isPersistenceEnabled).isFalse()
+    assertThat(settings.cacheSettings)
+      .isEqualTo(memoryCacheSettings { setGcSettings(memoryEagerGcSettings {}) })
+
+    val otherSettings = firestoreSettings {
+      this.setLocalCacheSettings(
+        memoryCacheSettings { setGcSettings(memoryLruGcSettings { setSizeBytes(1_000) }) }
+      )
+    }
+
+    assertThat(otherSettings.host).isEqualTo(FirebaseFirestoreSettings.DEFAULT_HOST)
+    assertThat(otherSettings.isPersistenceEnabled).isFalse()
+    assertThat(otherSettings.cacheSizeBytes).isEqualTo(1_000)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
+
+data class Room(var a: Int = 0, var b: Int = 0)
+
+// NOTE: When Kotlin properties are annotated with `PropertyName` they need to use @get and @set.
+// Also, the properties need to be mutable; that is, declared with `var` and not `val`.
+// See https://github.com/firebase/firebase-android-sdk/issues/4822
+data class DataClassWithPropertyName(
+  @get:PropertyName("dbName") @set:PropertyName("dbName") var objName: String = "DefaultObjName"
+)
+
+@RunWith(RobolectricTestRunner::class)
+class DocumentSnapshotTests {
+  @Before
+  fun setup() {
+    Mockito.`when`(TestUtilKtx.firestore().firestoreSettings)
+      .thenReturn(FirebaseFirestoreSettings.Builder().build())
+  }
+
+  @After
+  fun cleanup() {
+    Mockito.reset(TestUtilKtx.firestore())
+  }
+
+  @Test
+  fun `reified getField delegates to get()`() {
+    val ds = TestUtilKtx.documentSnapshot("rooms/foo", mapOf("a" to 1, "b" to 2), false)
+
+    assertThat(ds.getField<Int>("a")).isEqualTo(ds.get("a", Int::class.java))
+    assertThat(ds.getField<Int>(FieldPath.of("a")))
+      .isEqualTo(ds.get(FieldPath.of("a"), Int::class.java))
+
+    assertThat(ds.getField<Int>("a", DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
+      .isEqualTo(ds.get("a", Int::class.java, DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
+    assertThat(
+        ds.getField<Int>(FieldPath.of("a"), DocumentSnapshot.ServerTimestampBehavior.ESTIMATE)
+      )
+      .isEqualTo(ds.get(FieldPath.of("a"), Int::class.java))
+  }
+
+  @Test
+  fun `reified toObject delegates to toObject(Class)`() {
+    val ds = TestUtilKtx.documentSnapshot("rooms/foo", mapOf("a" to 1, "b" to 2), false)
+
+    var room = ds.toObject<Room>()
+    assertThat(room).isEqualTo(Room(1, 2))
+    assertThat(room).isEqualTo(ds.toObject(Room::class.java))
+
+    room = ds.toObject<Room>(DocumentSnapshot.ServerTimestampBehavior.ESTIMATE)
+    assertThat(room).isEqualTo(Room(1, 2))
+    assertThat(room)
+      .isEqualTo(ds.toObject(Room::class.java, DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
+  }
+
+  @Test
+  fun `PropertyName annotation works on data classes`() {
+    val ds = TestUtilKtx.documentSnapshot("foo/bar", mapOf("dbName" to "CustomValue"), false)
+
+    val toObjectReturnValue = ds.toObject<DataClassWithPropertyName>()
+
+    assertThat(toObjectReturnValue).isEqualTo(DataClassWithPropertyName("CustomValue"))
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class QuerySnapshotTests {
+  @Before
+  fun setup() {
+    Mockito.`when`(TestUtilKtx.firestore().firestoreSettings)
+      .thenReturn(FirebaseFirestoreSettings.Builder().build())
+  }
+
+  @After
+  fun cleanup() {
+    Mockito.reset(TestUtilKtx.firestore())
+  }
+
+  @Test
+  fun `reified toObjects delegates to toObjects(Class)`() {
+    val qs =
+      TestUtilKtx.querySnapshot(
+        "rooms",
+        mapOf(),
+        mapOf("id" to ObjectValue.fromMap(mapOf("a" to wrap(1), "b" to wrap(2)))),
+        false,
+        false
+      )
+
+    assertThat(qs.toObjects<Room>()).containsExactly(Room(1, 2))
+    assertThat(qs.toObjects<Room>(DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
+      .containsExactly(Room(1, 2))
+  }
+}
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/QuerySnapshotTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/QuerySnapshotTest.java
index 4ce018def3e..649fa35bf59 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/QuerySnapshotTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/QuerySnapshotTest.java
@@ -56,21 +56,26 @@ public void testEquals() {
     ObjectValue firstValue = wrapObject("a", 1);
     ObjectValue secondValue = wrapObject("b", 1);
 
-    QuerySnapshot foo = TestUtil.querySnapshot("foo", map(), map("a", firstValue), true, false);
-    QuerySnapshot fooDup = TestUtil.querySnapshot("foo", map(), map("a", firstValue), true, false);
+    QuerySnapshot foo =
+        TestUtil.querySnapshot("foo", map(), map("a", firstValue), true, false, false);
+    QuerySnapshot fooDup =
+        TestUtil.querySnapshot("foo", map(), map("a", firstValue), true, false, false);
     QuerySnapshot differentPath =
-        TestUtil.querySnapshot("bar", map(), map("a", firstValue), true, false);
+        TestUtil.querySnapshot("bar", map(), map("a", firstValue), true, false, false);
     QuerySnapshot differentDoc =
-        TestUtil.querySnapshot("foo", map(), map("a", secondValue), true, false);
+        TestUtil.querySnapshot("foo", map(), map("a", secondValue), true, false, false);
     QuerySnapshot noPendingWrites =
-        TestUtil.querySnapshot("foo", map(), map("a", firstValue), false, false);
+        TestUtil.querySnapshot("foo", map(), map("a", firstValue), false, false, false);
     QuerySnapshot fromCache =
-        TestUtil.querySnapshot("foo", map(), map("a", firstValue), true, true);
+        TestUtil.querySnapshot("foo", map(), map("a", firstValue), true, true, false);
+    QuerySnapshot hasCachedResults =
+        TestUtil.querySnapshot("foo", map(), map("a", firstValue), true, false, true);
     assertEquals(foo, fooDup);
     assertNotEquals(foo, differentPath);
     assertNotEquals(foo, differentDoc);
     assertNotEquals(foo, noPendingWrites);
     assertNotEquals(foo, fromCache);
+    assertNotEquals(foo, hasCachedResults);
 
     // Note: `foo` and `differentDoc` have the same hash code since we no longer take document
     // contents into account.
@@ -88,7 +93,8 @@ public void testToObjects() {
 
     ObjectValue objectData =
         ObjectValue.fromMap(map("timestamp", ServerTimestamps.valueOf(Timestamp.now(), null)));
-    QuerySnapshot foo = TestUtil.querySnapshot("foo", map(), map("a", objectData), true, false);
+    QuerySnapshot foo =
+        TestUtil.querySnapshot("foo", map(), map("a", objectData), true, false, false);
 
     List<POJO> docs = foo.toObjects(POJO.class);
     assertEquals(1, docs.size());
@@ -126,7 +132,8 @@ public void testIncludeMetadataChanges() {
             /*isFromCache=*/ false,
             /*mutatedKeys=*/ keySet(),
             /*didSyncStateChange=*/ true,
-            /* excludesMetadataChanges= */ false);
+            /* excludesMetadataChanges= */ false,
+            /* hasCachedResults= */ false);
 
     QuerySnapshot snapshot =
         new QuerySnapshot(new Query(fooQuery, firestore), viewSnapshot, firestore);
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/TestUtilKtx.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/TestUtilKtx.java
new file mode 100644
index 00000000000..3cbfb74fc3d
--- /dev/null
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/TestUtilKtx.java
@@ -0,0 +1,112 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore;
+
+import static com.google.firebase.firestore.testutil.TestUtil.doc;
+import static com.google.firebase.firestore.testutil.TestUtil.docSet;
+import static com.google.firebase.firestore.testutil.TestUtil.key;
+import static org.mockito.Mockito.mock;
+
+import com.google.firebase.database.collection.ImmutableSortedSet;
+import com.google.firebase.firestore.core.DocumentViewChange;
+import com.google.firebase.firestore.core.DocumentViewChange.Type;
+import com.google.firebase.firestore.core.ViewSnapshot;
+import com.google.firebase.firestore.model.Document;
+import com.google.firebase.firestore.model.DocumentKey;
+import com.google.firebase.firestore.model.DocumentSet;
+import com.google.firebase.firestore.model.MutableDocument;
+import com.google.firebase.firestore.model.ObjectValue;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class TestUtilKtx {
+
+  private static final FirebaseFirestore FIRESTORE = mock(FirebaseFirestore.class);
+
+  public static FirebaseFirestore firestore() {
+    return FIRESTORE;
+  }
+
+  public static DocumentSnapshot documentSnapshot(
+      String path, Map<String, Object> data, boolean isFromCache) {
+    if (data == null) {
+      return DocumentSnapshot.fromNoDocument(FIRESTORE, key(path), isFromCache);
+    } else {
+      return DocumentSnapshot.fromDocument(
+          FIRESTORE, doc(path, 1L, data), isFromCache, /*hasPendingWrites=*/ false);
+    }
+  }
+
+  public static Query query(String path) {
+    return new Query(com.google.firebase.firestore.testutil.TestUtil.query(path), FIRESTORE);
+  }
+
+  /**
+   * A convenience method for creating a particular query snapshot for tests.
+   *
+   * @param path To be used in constructing the query.
+   * @param oldDocs Provides the prior set of documents in the QuerySnapshot. Each entry maps to a
+   *     document, with the key being the document id, and the value being the document contents.
+   * @param docsToAdd Specifies data to be added into the query snapshot as of now. Each entry maps
+   *     to a document, with the key being the document id, and the value being the document
+   *     contents.
+   * @param isFromCache Whether the query snapshot is cache result.
+   * @return A query snapshot that consists of both sets of documents.
+   */
+  public static QuerySnapshot querySnapshot(
+      String path,
+      Map<String, ObjectValue> oldDocs,
+      Map<String, ObjectValue> docsToAdd,
+      boolean hasPendingWrites,
+      boolean isFromCache) {
+    DocumentSet oldDocuments = docSet(Document.KEY_COMPARATOR);
+    ImmutableSortedSet<DocumentKey> mutatedKeys = DocumentKey.emptyKeySet();
+    for (Map.Entry<String, ObjectValue> pair : oldDocs.entrySet()) {
+      String docKey = path + "/" + pair.getKey();
+      MutableDocument doc = doc(docKey, 1L, pair.getValue());
+      if (hasPendingWrites) doc.setHasLocalMutations();
+      oldDocuments = oldDocuments.add(doc);
+      if (hasPendingWrites) {
+        mutatedKeys = mutatedKeys.insert(key(docKey));
+      }
+    }
+    DocumentSet newDocuments = docSet(Document.KEY_COMPARATOR);
+    List<DocumentViewChange> documentChanges = new ArrayList<>();
+    for (Map.Entry<String, ObjectValue> pair : docsToAdd.entrySet()) {
+      String docKey = path + "/" + pair.getKey();
+      MutableDocument docToAdd = doc(docKey, 1L, pair.getValue());
+      if (hasPendingWrites) docToAdd.setHasLocalMutations();
+      newDocuments = newDocuments.add(docToAdd);
+      documentChanges.add(DocumentViewChange.create(Type.ADDED, docToAdd));
+
+      if (hasPendingWrites) {
+        mutatedKeys = mutatedKeys.insert(key(docKey));
+      }
+    }
+    ViewSnapshot viewSnapshot =
+        new ViewSnapshot(
+            com.google.firebase.firestore.testutil.TestUtil.query(path),
+            newDocuments,
+            oldDocuments,
+            documentChanges,
+            isFromCache,
+            mutatedKeys,
+            /* didSyncStateChange= */ true,
+            /* excludesMetadataChanges= */ false,
+            /* hasCachedResults= */ false);
+    return new QuerySnapshot(query(path), viewSnapshot, FIRESTORE);
+  }
+}
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/auth/FirebaseAppCheckTokenProviderTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/auth/FirebaseAppCheckTokenProviderTest.java
index 681fffd2b25..ef429bdf076 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/auth/FirebaseAppCheckTokenProviderTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/auth/FirebaseAppCheckTokenProviderTest.java
@@ -25,7 +25,7 @@
 import com.google.firebase.FirebaseApiNotAvailableException;
 import com.google.firebase.appcheck.AppCheckTokenResult;
 import com.google.firebase.appcheck.interop.AppCheckTokenListener;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.firestore.testutil.ImmediateDeferred;
 import com.google.firebase.firestore.util.Listener;
 import com.google.firebase.inject.Deferred;
@@ -43,7 +43,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-class TestListenersInternalAppCheckTokenProvider implements InternalAppCheckTokenProvider {
+class TestListenersInteropAppCheckTokenProvider implements InteropAppCheckTokenProvider {
   public ArrayList<AppCheckTokenListener> listeners = new ArrayList<>();
 
   @NonNull
@@ -75,20 +75,20 @@ public class FirebaseAppCheckTokenProviderTest {
 
   @Rule public final MockitoRule mocks = MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS);
 
-  @Mock InternalAppCheckTokenProvider mockInternalAppCheckTokenProvider;
+  @Mock InteropAppCheckTokenProvider mockInteropAppCheckTokenProvider;
   @Mock Listener<String> mockAppCheckTokenListener;
   @Mock AppCheckTokenResult mockAppCheckTokenResult;
   @Captor ArgumentCaptor<AppCheckTokenListener> idTokenListenerCaptor;
 
-  Deferred<InternalAppCheckTokenProvider> getDeferredProvider(
-      InternalAppCheckTokenProvider internal) {
+  Deferred<InteropAppCheckTokenProvider> getDeferredProvider(
+      InteropAppCheckTokenProvider internal) {
     return new ImmediateDeferred<>(internal);
   }
 
   @Test
   public void setChangeListenerShouldBeCalledWhenIdTokenChanges() {
-    TestListenersInternalAppCheckTokenProvider internalAppCheckTokenProvider =
-        new TestListenersInternalAppCheckTokenProvider();
+    TestListenersInteropAppCheckTokenProvider internalAppCheckTokenProvider =
+        new TestListenersInteropAppCheckTokenProvider();
     FirebaseAppCheckTokenProvider firebaseAppCheckTokenProvider =
         new FirebaseAppCheckTokenProvider(getDeferredProvider(internalAppCheckTokenProvider));
     AtomicReference<String> receivedToken = new AtomicReference<String>();
@@ -104,8 +104,8 @@ public void setChangeListenerShouldBeCalledWhenIdTokenChanges() {
 
   @Test
   public void removeChangeListenerShouldStopNotifyingTheListener() {
-    TestListenersInternalAppCheckTokenProvider internalAppCheckTokenProvider =
-        new TestListenersInternalAppCheckTokenProvider();
+    TestListenersInteropAppCheckTokenProvider internalAppCheckTokenProvider =
+        new TestListenersInteropAppCheckTokenProvider();
     FirebaseAppCheckTokenProvider firebaseAppCheckTokenProvider =
         new FirebaseAppCheckTokenProvider(getDeferredProvider(internalAppCheckTokenProvider));
     firebaseAppCheckTokenProvider.setChangeListener(mockAppCheckTokenListener);
@@ -124,11 +124,11 @@ public void removeChangeListenerShouldNotThrowIfProviderIsNotAvailable() {
   @Test
   public void removeChangeListenerShouldUnregisterTheIdTokenListener() {
     FirebaseAppCheckTokenProvider firebaseAppCheckTokenProvider =
-        new FirebaseAppCheckTokenProvider(getDeferredProvider(mockInternalAppCheckTokenProvider));
-    verify(mockInternalAppCheckTokenProvider)
+        new FirebaseAppCheckTokenProvider(getDeferredProvider(mockInteropAppCheckTokenProvider));
+    verify(mockInteropAppCheckTokenProvider)
         .addAppCheckTokenListener(idTokenListenerCaptor.capture());
     firebaseAppCheckTokenProvider.removeChangeListener();
-    verify(mockInternalAppCheckTokenProvider)
+    verify(mockInteropAppCheckTokenProvider)
         .removeAppCheckTokenListener(idTokenListenerCaptor.getValue());
   }
 
@@ -145,11 +145,11 @@ public void getTokenShouldReturnAFailedTaskIfProviderIsNotAvailable() {
   @Test
   public void getTokenShouldReturnAFailedTaskIfAppCheckGetTokenFails() {
     Exception getTokenException = new Exception();
-    when(mockInternalAppCheckTokenProvider.getToken(anyBoolean()))
+    when(mockInteropAppCheckTokenProvider.getToken(anyBoolean()))
         .thenReturn(Tasks.forException(getTokenException));
 
     FirebaseAppCheckTokenProvider firebaseAppCheckTokenProvider =
-        new FirebaseAppCheckTokenProvider(getDeferredProvider(mockInternalAppCheckTokenProvider));
+        new FirebaseAppCheckTokenProvider(getDeferredProvider(mockInteropAppCheckTokenProvider));
 
     Task<String> task = firebaseAppCheckTokenProvider.getToken();
     assertThat(task.isComplete()).isTrue();
@@ -160,11 +160,11 @@ public void getTokenShouldReturnAFailedTaskIfAppCheckGetTokenFails() {
   @Test
   public void getTokenShouldReturnASuccessfulTaskIfAppCheckGetTokenSucceeds() {
     when(mockAppCheckTokenResult.getToken()).thenReturn("TestToken");
-    when(mockInternalAppCheckTokenProvider.getToken(anyBoolean()))
+    when(mockInteropAppCheckTokenProvider.getToken(anyBoolean()))
         .thenReturn(Tasks.forResult(mockAppCheckTokenResult));
 
     FirebaseAppCheckTokenProvider firebaseAppCheckTokenProvider =
-        new FirebaseAppCheckTokenProvider(getDeferredProvider(mockInternalAppCheckTokenProvider));
+        new FirebaseAppCheckTokenProvider(getDeferredProvider(mockInteropAppCheckTokenProvider));
     Task<String> task = firebaseAppCheckTokenProvider.getToken();
 
     assertThat(task.isComplete()).isTrue();
@@ -175,42 +175,42 @@ public void getTokenShouldReturnASuccessfulTaskIfAppCheckGetTokenSucceeds() {
   @Test
   public void getTokenShouldNotForceRefreshTheTokenIfInvalidateTokenIsNotCalled() {
     when(mockAppCheckTokenResult.getToken()).thenReturn("TestToken");
-    when(mockInternalAppCheckTokenProvider.getToken(anyBoolean()))
+    when(mockInteropAppCheckTokenProvider.getToken(anyBoolean()))
         .thenReturn(Tasks.forResult(mockAppCheckTokenResult));
 
     FirebaseAppCheckTokenProvider firebaseAppCheckTokenProvider =
-        new FirebaseAppCheckTokenProvider(getDeferredProvider(mockInternalAppCheckTokenProvider));
+        new FirebaseAppCheckTokenProvider(getDeferredProvider(mockInteropAppCheckTokenProvider));
     firebaseAppCheckTokenProvider.getToken();
-    verify(mockInternalAppCheckTokenProvider).getToken(false);
+    verify(mockInteropAppCheckTokenProvider).getToken(false);
   }
 
   @Test
   public void invalidateTokenShouldCauseGetTokenToForceRefresh() {
     when(mockAppCheckTokenResult.getToken()).thenReturn("TestToken");
-    when(mockInternalAppCheckTokenProvider.getToken(anyBoolean()))
+    when(mockInteropAppCheckTokenProvider.getToken(anyBoolean()))
         .thenReturn(Tasks.forResult(mockAppCheckTokenResult));
 
     FirebaseAppCheckTokenProvider firebaseAppCheckTokenProvider =
-        new FirebaseAppCheckTokenProvider(getDeferredProvider(mockInternalAppCheckTokenProvider));
+        new FirebaseAppCheckTokenProvider(getDeferredProvider(mockInteropAppCheckTokenProvider));
     firebaseAppCheckTokenProvider.invalidateToken();
     firebaseAppCheckTokenProvider.getToken();
-    verify(mockInternalAppCheckTokenProvider).getToken(true);
+    verify(mockInteropAppCheckTokenProvider).getToken(true);
   }
 
   @Test
   public void invalidateTokenShouldOnlyForceRefreshOnTheImmediatelyFollowingGetTokenInvocation() {
     when(mockAppCheckTokenResult.getToken()).thenReturn("TestToken");
-    when(mockInternalAppCheckTokenProvider.getToken(anyBoolean()))
+    when(mockInteropAppCheckTokenProvider.getToken(anyBoolean()))
         .thenReturn(Tasks.forResult(mockAppCheckTokenResult));
 
     FirebaseAppCheckTokenProvider firebaseAppCheckTokenProvider =
-        new FirebaseAppCheckTokenProvider(getDeferredProvider(mockInternalAppCheckTokenProvider));
+        new FirebaseAppCheckTokenProvider(getDeferredProvider(mockInteropAppCheckTokenProvider));
 
     firebaseAppCheckTokenProvider.invalidateToken();
     firebaseAppCheckTokenProvider.getToken();
     firebaseAppCheckTokenProvider.getToken();
 
-    verify(mockInternalAppCheckTokenProvider).getToken(true);
-    verify(mockInternalAppCheckTokenProvider).getToken(false);
+    verify(mockInteropAppCheckTokenProvider).getToken(true);
+    verify(mockInteropAppCheckTokenProvider).getToken(false);
   }
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/bundle/BundleReaderTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/bundle/BundleReaderTest.java
index 626a4b97e14..0d09d89f0f9 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/bundle/BundleReaderTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/bundle/BundleReaderTest.java
@@ -21,14 +21,16 @@
 import static com.google.firebase.firestore.testutil.TestUtil.version;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
 
 import com.google.firebase.firestore.core.Query;
-import com.google.firebase.firestore.core.Target;
 import com.google.firebase.firestore.model.DatabaseId;
 import com.google.firebase.firestore.model.ObjectValue;
 import com.google.firebase.firestore.model.ResourcePath;
 import com.google.firebase.firestore.model.SnapshotVersion;
 import com.google.firebase.firestore.remote.RemoteSerializer;
+import com.google.firestore.v1.ArrayValue;
+import com.google.firestore.v1.MapValue;
 import com.google.firestore.v1.Value;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -56,28 +58,34 @@ public class BundleReaderTest {
       new NamedQuery(
           "limitQuery",
           new BundledQuery(
-              new Target(
-                  ResourcePath.fromString("foo"),
-                  null,
-                  Collections.emptyList(),
-                  Collections.singletonList(orderBy("sort")),
-                  1,
-                  null,
-                  null),
+              new Query(
+                      ResourcePath.fromString("foo"),
+                      null,
+                      Collections.emptyList(),
+                      Collections.singletonList(orderBy("sort")),
+                      1,
+                      Query.LimitType.LIMIT_TO_FIRST,
+                      null,
+                      null)
+                  .toTarget(),
               Query.LimitType.LIMIT_TO_FIRST),
           version(1590011379000001L));
   public static final NamedQuery LIMIT_TO_LAST_QUERY =
       new NamedQuery(
           "limitToLastQuery",
           new BundledQuery(
-              new Target(
-                  ResourcePath.fromString("foo"),
-                  null,
-                  Collections.emptyList(),
-                  Collections.singletonList(orderBy("sort")),
-                  1,
-                  null,
-                  null),
+              new Query(
+                      ResourcePath.fromString("foo"),
+                      null,
+                      Collections.emptyList(),
+                      Collections.singletonList(orderBy("sort")),
+                      1,
+                      // Note this is LIMIT_TO_FIRST because it is the expected
+                      // limit type in bundle files.
+                      Query.LimitType.LIMIT_TO_FIRST,
+                      null,
+                      null)
+                  .toTarget(),
               Query.LimitType.LIMIT_TO_LAST),
           version(1590011379000002L));
   public static final BundledDocumentMetadata DELETED_DOC_METADATA =
@@ -110,7 +118,11 @@ public class BundleReaderTest {
                       "foo",
                       Value.newBuilder().setStringValue("value2").build(),
                       "bar",
-                      Value.newBuilder().setIntegerValue(42).build()))));
+                      Value.newBuilder().setIntegerValue(42).build(),
+                      "emptyArray",
+                      Value.newBuilder().setArrayValue(ArrayValue.getDefaultInstance()).build(),
+                      "emptyMap",
+                      Value.newBuilder().setMapValue(MapValue.getDefaultInstance()).build()))));
   public static final BundledDocumentMetadata DOC3_METADATA =
       new BundledDocumentMetadata(
           key("coll/doc3"), version(5600002L), /* exists= */ true, Collections.emptyList());
@@ -219,35 +231,37 @@ public void testReadsWithoutDocumentOrQuery() throws IOException, JSONException
     verifyAllElements(bundleReader);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testThrowsWithoutLengthPrefix() throws IOException, JSONException {
     String bundle = "{metadata: 'no length prefix' }";
 
     BundleReader bundleReader =
         new BundleReader(SERIALIZER, new ByteArrayInputStream(bundle.getBytes(UTF8_CHARSET)));
 
-    bundleReader.getBundleMetadata();
+    assertThrows(IllegalArgumentException.class, () -> bundleReader.getBundleMetadata());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testThrowsWithMissingBrackets() throws IOException, JSONException {
     String bundle = "3abc";
 
     BundleReader bundleReader =
         new BundleReader(SERIALIZER, new ByteArrayInputStream(bundle.getBytes(UTF8_CHARSET)));
-    bundleReader.getBundleMetadata();
+
+    assertThrows(IllegalArgumentException.class, () -> bundleReader.getBundleMetadata());
   }
 
-  @Test(expected = JSONException.class)
+  @Test
   public void testThrowsWithInvalidJSON() throws IOException, JSONException {
     String bundle = "3{abc}";
 
     BundleReader bundleReader =
         new BundleReader(SERIALIZER, new ByteArrayInputStream(bundle.getBytes(UTF8_CHARSET)));
-    bundleReader.getBundleMetadata();
+
+    assertThrows(JSONException.class, () -> bundleReader.getBundleMetadata());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testThrowsWhenSecondElementIsMissing() throws IOException, JSONException {
     TestBundleBuilder bundleBuilder = new TestBundleBuilder(TEST_PROJECT);
     String bundle =
@@ -255,19 +269,21 @@ public void testThrowsWhenSecondElementIsMissing() throws IOException, JSONExcep
 
     BundleReader bundleReader =
         new BundleReader(SERIALIZER, new ByteArrayInputStream(bundle.getBytes(UTF8_CHARSET)));
-    bundleReader.getNextElement();
+
+    assertThrows(IllegalArgumentException.class, () -> bundleReader.getNextElement());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testThrowsWhenBundleDoesNotContainEnoughData() throws IOException, JSONException {
     String bundle = "3{}";
 
     BundleReader bundleReader =
         new BundleReader(SERIALIZER, new ByteArrayInputStream(bundle.getBytes(UTF8_CHARSET)));
-    bundleReader.getBundleMetadata();
+
+    assertThrows(IllegalArgumentException.class, () -> bundleReader.getBundleMetadata());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testWhenFirstElementIsNotBundleMetadata() throws IOException, JSONException {
     String json =
         String.format(
@@ -283,7 +299,7 @@ public void testWhenFirstElementIsNotBundleMetadata() throws IOException, JSONEx
     BundleReader bundleReader =
         new BundleReader(SERIALIZER, new ByteArrayInputStream(bundle.getBytes(UTF8_CHARSET)));
 
-    bundleReader.getBundleMetadata();
+    assertThrows(IllegalArgumentException.class, () -> bundleReader.getBundleMetadata());
   }
 
   @Test
@@ -347,7 +363,8 @@ private String addDoc2(TestBundleBuilder bundleBuilder) {
         "coll/doc2",
         /* createTimeMicros= */ 1200001L,
         /* updateTimeMicros= */ 30004001L,
-        "{ foo: { stringValue: 'value2' }, bar: { integerValue: 42 } }");
+        "{ foo: { stringValue: 'value2' }, bar: { integerValue: 42 }, "
+            + "emptyArray: { arrayValue: {} }, emptyMap: { mapValue: {} } }");
   }
 
   private String addDoc3Metadata(TestBundleBuilder bundleBuilder) {
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/bundle/BundleSerializerTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/bundle/BundleSerializerTest.java
index 388a27cef04..355833a6586 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/bundle/BundleSerializerTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/bundle/BundleSerializerTest.java
@@ -20,6 +20,7 @@
 import static com.google.firebase.firestore.testutil.TestUtil.orderBy;
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 
 import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.core.Target;
@@ -50,8 +51,10 @@
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class BundleSerializerTest {
-  // Note: This tests uses single-quoted JSON strings, which are accepted by org.json.JSONObject.
-  // While they are invalid JSON, they allow us to no use non-escaped quotes in the test file.
+  // Note: This tests uses single-quoted JSON strings, which are accepted by
+  // org.json.JSONObject.
+  // While they are invalid JSON, they allow us to no use non-escaped quotes in
+  // the test file.
 
   private static String TEST_PROJECT = "projects/project/databases/(default)/documents";
   private static String TEST_DOCUMENT = TEST_PROJECT + "/coll/doc";
@@ -567,9 +570,34 @@ public void testDecodesLimitQuery() throws JSONException {
 
   @Test
   public void testDecodesLimitToLastQuery() throws JSONException {
-    String json = "{ from: [ { collectionId: 'coll' } ], limit: {value: 5 } }";
-    Query query = TestUtil.query("coll").limitToLast(5);
-    assertDecodesNamedQuery(json, query);
+    String queryJson =
+        "{\n"
+            + "  name: 'query-1',\n"
+            + "  bundledQuery: {\n"
+            + "    parent: '"
+            + TEST_PROJECT
+            + "',\n"
+            + "    structuredQuery:\n"
+            + "{ from: [ { collectionId: 'coll' } ], limit: {value: 5 } }"
+            + ",\n"
+            + "    limitType: 'LAST'\n"
+            + "   },\n"
+            + " readTime: '2020-01-01T00:00:01.000000001Z'\n"
+            + "}";
+    NamedQuery actualNamedQuery = serializer.decodeNamedQuery(new JSONObject(queryJson));
+
+    // Note we use limitToFirst instead of limitToLast to avoid order reverse.
+    // Because this is what is saved in bundle files.
+    Query query = TestUtil.query("coll").limitToFirst(5);
+    Target target = query.toTarget();
+    BundledQuery bundledQuery = new BundledQuery(target, Query.LimitType.LIMIT_TO_LAST);
+    NamedQuery expectedNamedQuery =
+        new NamedQuery(
+            "query-1",
+            bundledQuery,
+            new SnapshotVersion(new com.google.firebase.Timestamp(1577836801, 1)));
+
+    assertEquals(expectedNamedQuery, actualNamedQuery);
   }
 
   @Test
@@ -596,32 +624,32 @@ public void testDecodesEndBeforeQuery() throws JSONException {
     assertDecodesNamedQuery(json, query);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testDoesNotDecodeOffset() throws JSONException {
     String json = "{ from: [ { collectionId: 'coll' } ], offset: 5 }";
     Query query = TestUtil.query("coll");
-    assertDecodesNamedQuery(json, query);
+    assertThrows(IllegalArgumentException.class, () -> assertDecodesNamedQuery(json, query));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testDoesNotDecodeSelect() throws JSONException {
     String json = "{ from: [ { collectionId: 'coll' } ], select: [] }";
     Query query = TestUtil.query("coll");
-    assertDecodesNamedQuery(json, query);
+    assertThrows(IllegalArgumentException.class, () -> assertDecodesNamedQuery(json, query));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testDoesNotDecodeMissingCollection() throws JSONException {
     String json = "{ from: [ ] }";
     Query query = TestUtil.query("coll");
-    assertDecodesNamedQuery(json, query);
+    assertThrows(IllegalArgumentException.class, () -> assertDecodesNamedQuery(json, query));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testDoesNotDecodeMultipleCollections() throws JSONException {
     String json = "{ from: [ { collectionId: 'c1' }, { collectionId: 'c2' } ] }";
     Query query = TestUtil.query("coll");
-    assertDecodesNamedQuery(json, query);
+    assertThrows(IllegalArgumentException.class, () -> assertDecodesNamedQuery(json, query));
   }
 
   // BundleMetadata tests
@@ -671,6 +699,33 @@ public void testDecodesBundledDocumentMetadata() throws JSONException {
     assertEquals(expectedMetadata, actualMetadata);
   }
 
+  @Test
+  public void testDecodesTargetWithoutImplicitOrderByOnName() throws JSONException {
+    String json =
+        "{\"name\":\"myNamedQuery\",\"bundledQuery\":{\"parent\":\"projects/project/databases"
+            + "/(default)/documents\",\"structuredQuery\":{\"from\":[{\"collectionId\":\"foo\"}],"
+            + "\"limit\":{\"value\":10}},\"limitType\":\"FIRST\"},"
+            + "\"readTime\":{\"seconds\":\"1679674432\",\"nanos\":579934000}}";
+    NamedQuery query = serializer.decodeNamedQuery(new JSONObject(json));
+    assertEquals(
+        TestUtil.query("foo").limitToFirst(10).toTarget(), query.getBundledQuery().getTarget());
+    assertEquals(Query.LimitType.LIMIT_TO_FIRST, query.getBundledQuery().getLimitType());
+  }
+
+  @Test
+  public void testDecodesLimitToLastTargetWithoutImplicitOrderByOnName() throws JSONException {
+    String json =
+        "{\"name\":\"myNamedQuery\",\"bundledQuery\":{\"parent\":\"projects/project/databases"
+            + "/(default)/documents\",\"structuredQuery\":{\"from\":[{\"collectionId\":\"foo\"}],"
+            + "\"limit\":{\"value\":10}},\"limitType\":\"LAST\"},"
+            + "\"readTime\":{\"seconds\":\"1679674432\",\"nanos\":579934000}}";
+    NamedQuery query = serializer.decodeNamedQuery(new JSONObject(json));
+    assertEquals(
+        // Note that `limitToFirst(10)` is expected.
+        TestUtil.query("foo").limitToFirst(10).toTarget(), query.getBundledQuery().getTarget());
+    assertEquals(Query.LimitType.LIMIT_TO_LAST, query.getBundledQuery().getLimitType());
+  }
+
   private void assertDecodesValue(String json, Value proto) throws JSONException {
     String documentJson =
         "{\n"
@@ -711,30 +766,18 @@ private void assertDecodesNamedQuery(String json, Query query) throws JSONExcept
             + json
             + ",\n"
             + "    limitType: '"
-            + (query.hasLimitToLast() ? "LAST" : "FIRST")
+            + (query.getLimitType().equals(Query.LimitType.LIMIT_TO_LAST) ? "LAST" : "FIRST")
             + "'\n"
             + "   },\n"
             + " readTime: '2020-01-01T00:00:01.000000001Z'\n"
             + "}";
     NamedQuery actualNamedQuery = serializer.decodeNamedQuery(new JSONObject(queryJson));
 
-    long limit =
-        query.hasLimitToFirst()
-            ? query.getLimitToFirst()
-            : (query.hasLimitToLast() ? query.getLimitToLast() : Target.NO_LIMIT);
-    Target target =
-        new Target(
-            query.getPath(),
-            query.getCollectionGroup(),
-            query.getFilters(),
-            query.getExplicitOrderBy(),
-            limit,
-            query.getStartAt(),
-            query.getEndAt());
+    Target target = query.toTarget();
     BundledQuery bundledQuery =
         new BundledQuery(
             target,
-            query.hasLimitToLast()
+            query.getLimitType().equals(Query.LimitType.LIMIT_TO_LAST)
                 ? Query.LimitType.LIMIT_TO_LAST
                 : Query.LimitType.LIMIT_TO_FIRST);
     NamedQuery expectedNamedQuery =
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/core/EventManagerTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/EventManagerTest.java
index 3d8c28b80ec..5531033a272 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/core/EventManagerTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/EventManagerTest.java
@@ -17,6 +17,8 @@
 import static com.google.firebase.firestore.testutil.TestUtil.path;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
@@ -58,8 +60,16 @@ public void testMultipleListensPerQuery() {
 
     manager.removeQueryListener(listener1);
     manager.removeQueryListener(listener2);
-    verify(syncSpy, times(1)).listen(query);
-    verify(syncSpy, times(1)).stopListening(query);
+    verify(syncSpy, times(1))
+        .listen(
+            query,
+            /** shouldListenToRemote= */
+            true);
+    verify(syncSpy, times(1))
+        .stopListening(
+            query,
+            /** shouldUnlistenToRemote= */
+            true);
   }
 
   @Test
@@ -70,7 +80,7 @@ public void testUnlistensOnUnknownListeners() {
 
     EventManager manager = new EventManager(syncSpy);
     manager.removeQueryListener(queryListener(query));
-    verify(syncSpy, never()).stopListening(query);
+    verify(syncSpy, never()).stopListening(eq(query), anyBoolean());
   }
 
   @Test
@@ -91,8 +101,8 @@ public void testListenCalledInOrder() {
     eventManager.addQueryListener(spy2);
     eventManager.addQueryListener(spy3);
 
-    verify(syncSpy, times(1)).listen(query1);
-    verify(syncSpy, times(1)).listen(query2);
+    verify(syncSpy, times(1)).listen(eq(query1), anyBoolean());
+    verify(syncSpy, times(1)).listen(eq(query2), anyBoolean());
 
     ViewSnapshot snap1 = mock(ViewSnapshot.class);
     when(snap1.getQuery()).thenReturn(query1);
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/core/FilterTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/FilterTest.java
new file mode 100644
index 00000000000..e45d249657e
--- /dev/null
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/FilterTest.java
@@ -0,0 +1,96 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore.core;
+
+import static com.google.firebase.firestore.testutil.TestUtil.andFilters;
+import static com.google.firebase.firestore.testutil.TestUtil.filter;
+import static com.google.firebase.firestore.testutil.TestUtil.orFilters;
+import static com.google.firebase.firestore.testutil.TestUtil.query;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class FilterTest {
+  /** Helper method to get unique filters */
+  FieldFilter nameFilter(String name) {
+    return filter("name", "==", name);
+  }
+
+  private final FieldFilter A = nameFilter("A");
+  private final FieldFilter B = nameFilter("B");
+  private final FieldFilter C = nameFilter("C");
+  private final FieldFilter D = nameFilter("D");
+
+  @Test
+  public void testFieldFilterMembers() {
+    FieldFilter f = filter("foo", "==", "bar");
+    assertEquals("foo", f.getField().toString());
+    assertEquals("bar", f.getValue().getStringValue());
+    assertEquals(FieldFilter.Operator.EQUAL, f.getOperator());
+  }
+
+  @Test
+  public void testCompositeFilterMembers() {
+    CompositeFilter andFilter = andFilters(A, B, C);
+    assertTrue(andFilter.isConjunction());
+    assertEquals(andFilter.getFilters(), Arrays.asList(A, B, C));
+
+    CompositeFilter orFilter = orFilters(A, B, C);
+    assertTrue(orFilter.isDisjunction());
+    assertEquals(orFilter.getFilters(), Arrays.asList(A, B, C));
+  }
+
+  @Test
+  public void testCompositeFilterNestedChecks() {
+    CompositeFilter andFilter1 = andFilters(A, B, C);
+    assertTrue(andFilter1.isFlat());
+    assertTrue(andFilter1.isConjunction());
+    assertFalse(andFilter1.isDisjunction());
+    assertTrue(andFilter1.isFlatConjunction());
+
+    CompositeFilter orFilter1 = orFilters(A, B, C);
+    assertFalse(orFilter1.isConjunction());
+    assertTrue(orFilter1.isDisjunction());
+    assertTrue(orFilter1.isFlat());
+    assertFalse(orFilter1.isFlatConjunction());
+
+    CompositeFilter andFilter2 = andFilters(D, andFilter1);
+    assertTrue(andFilter2.isConjunction());
+    assertFalse(andFilter2.isDisjunction());
+    assertFalse(andFilter2.isFlat());
+    assertFalse(andFilter2.isFlatConjunction());
+
+    CompositeFilter orFilter2 = orFilters(D, andFilter1);
+    assertFalse(orFilter2.isConjunction());
+    assertTrue(orFilter2.isDisjunction());
+    assertFalse(orFilter2.isFlat());
+    assertFalse(orFilter2.isFlatConjunction());
+  }
+
+  @Test
+  public void testCanonicalIdOfFlatConjunctions() {
+    Query q1 = query("col").filter(A).filter(B).filter(C);
+    Query q2 = query("col").filter(andFilters(A, B, C));
+    assertEquals(q1.getCanonicalId(), q2.getCanonicalId());
+  }
+}
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/core/QueryListenerTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/QueryListenerTest.java
index dbc6e3ddc6a..31c1e9b0712 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/core/QueryListenerTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/QueryListenerTest.java
@@ -108,7 +108,8 @@ public void testRaisesCollectionEvents() {
             snap2.isFromCache(),
             snap2.getMutatedKeys(),
             /* didSyncStateChange= */ true,
-            /* excludesMetadataChanges= */ false);
+            /* excludesMetadataChanges= */ false,
+            /* hasCachedResults= */ false);
     assertEquals(asList(snap2Prime), otherAccum);
   }
 
@@ -262,7 +263,8 @@ public void testRaisesQueryMetadataEventsOnlyWhenHasPendingWritesOnTheQueryChang
             snap4.isFromCache(),
             snap4.getMutatedKeys(),
             snap4.didSyncStateChange(),
-            /* excludeMetadataChanges= */ true); // This test excludes document metadata changes
+            /* excludeMetadataChanges= */ true,
+            /* hasCachedResults= */ false); // This test excludes document metadata changes
 
     assertEquals(
         asList(
@@ -302,7 +304,9 @@ public void testMetadataOnlyDocumentChangesAreFilteredOut() {
             snap2.isFromCache(),
             snap2.getMutatedKeys(),
             snap2.didSyncStateChange(),
-            /* excludesMetadataChanges= */ true);
+            /* excludesMetadataChanges= */ true,
+            /* hasCachedResults= */ false);
+
     assertEquals(
         asList(applyExpectedMetadata(snap1, MetadataChanges.EXCLUDE), expectedSnapshot2),
         filteredAccum);
@@ -344,7 +348,8 @@ public void testWillWaitForSyncIfOnline() {
             /* isFromCache= */ false,
             snap3.getMutatedKeys(),
             /* didSyncStateChange= */ true,
-            /* excludesMetadataChanges= */ true);
+            /* excludesMetadataChanges= */ true,
+            /* hasCachedResults= */ false);
     assertEquals(asList(expectedSnapshot), events);
   }
 
@@ -382,7 +387,9 @@ public void testWillRaiseInitialEventWhenGoingOffline() {
             /* isFromCache= */ true,
             snap1.getMutatedKeys(),
             /* didSyncStateChange= */ true,
-            /* excludesMetadataChanges= */ true);
+            /* excludesMetadataChanges= */ true,
+            /* hasCachedResults= */ false);
+
     ViewSnapshot expectedSnapshot2 =
         new ViewSnapshot(
             snap2.getQuery(),
@@ -392,7 +399,8 @@ public void testWillRaiseInitialEventWhenGoingOffline() {
             /* isFromCache= */ true,
             snap2.getMutatedKeys(),
             /* didSyncStateChange= */ false,
-            /* excludesMetadataChanges= */ true);
+            /* excludesMetadataChanges= */ true,
+            /* hasCachedResults= */ false);
     assertEquals(asList(expectedSnapshot1, expectedSnapshot2), events);
   }
 
@@ -419,7 +427,8 @@ public void testWillRaiseInitialEventWhenGoingOfflineAndThereAreNoDocs() {
             /* isFromCache= */ true,
             snap1.getMutatedKeys(),
             /* didSyncStateChange= */ true,
-            /* excludesMetadataChanges= */ true);
+            /* excludesMetadataChanges= */ true,
+            /* hasCachedResults= */ false);
     assertEquals(asList(expectedSnapshot), events);
   }
 
@@ -445,7 +454,8 @@ public void testWillRaiseInitialEventWhenStartingOfflineAndThereAreNoDocs() {
             /* isFromCache= */ true,
             snap1.getMutatedKeys(),
             /* didSyncStateChange= */ true,
-            /* excludesMetadataChanges= */ true);
+            /* excludesMetadataChanges= */ true,
+            /* hasCachedResults= */ false);
     assertEquals(asList(expectedSnapshot), events);
   }
 
@@ -458,6 +468,7 @@ private ViewSnapshot applyExpectedMetadata(ViewSnapshot snap, MetadataChanges me
         snap.isFromCache(),
         snap.getMutatedKeys(),
         snap.didSyncStateChange(),
-        MetadataChanges.EXCLUDE.equals(metadata));
+        MetadataChanges.EXCLUDE.equals(metadata),
+        snap.hasCachedResults());
   }
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/core/QueryTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/QueryTest.java
index 3d1fa975cb1..de3de67463c 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/core/QueryTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/QueryTest.java
@@ -15,27 +15,40 @@
 package com.google.firebase.firestore.core;
 
 import static com.google.firebase.firestore.model.DocumentKey.KEY_FIELD_NAME;
+import static com.google.firebase.firestore.testutil.TestUtil.andFilters;
 import static com.google.firebase.firestore.testutil.TestUtil.bound;
 import static com.google.firebase.firestore.testutil.TestUtil.doc;
 import static com.google.firebase.firestore.testutil.TestUtil.filter;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
+import static com.google.firebase.firestore.testutil.TestUtil.orFilters;
 import static com.google.firebase.firestore.testutil.TestUtil.orderBy;
 import static com.google.firebase.firestore.testutil.TestUtil.path;
+import static com.google.firebase.firestore.testutil.TestUtil.query;
 import static com.google.firebase.firestore.testutil.TestUtil.ref;
 import static com.google.firebase.firestore.testutil.TestUtil.testEquality;
 import static java.util.Arrays.asList;
 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 com.google.firebase.Timestamp;
 import com.google.firebase.firestore.Blob;
 import com.google.firebase.firestore.GeoPoint;
+import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.MutableDocument;
 import com.google.firebase.firestore.model.ResourcePath;
 import com.google.firebase.firestore.testutil.ComparatorTester;
+import com.google.firebase.firestore.util.BackgroundQueue;
+import com.google.firebase.firestore.util.Executors;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executor;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -569,37 +582,179 @@ public void testHashCode() {
   public void testImplicitOrderBy() {
     Query baseQuery = Query.atPath(path("foo"));
     // Default is ascending
-    assertEquals(asList(orderBy(KEY_FIELD_NAME, "asc")), baseQuery.getOrderBy());
+    assertEquals(asList(orderBy(KEY_FIELD_NAME, "asc")), baseQuery.getNormalizedOrderBy());
 
     // Explicit key ordering is respected
     assertEquals(
         asList(orderBy(KEY_FIELD_NAME, "asc")),
-        baseQuery.orderBy(orderBy(KEY_FIELD_NAME, "asc")).getOrderBy());
+        baseQuery.orderBy(orderBy(KEY_FIELD_NAME, "asc")).getNormalizedOrderBy());
     assertEquals(
         asList(orderBy(KEY_FIELD_NAME, "desc")),
-        baseQuery.orderBy(orderBy(KEY_FIELD_NAME, "desc")).getOrderBy());
+        baseQuery.orderBy(orderBy(KEY_FIELD_NAME, "desc")).getNormalizedOrderBy());
     assertEquals(
         asList(orderBy("foo"), orderBy(KEY_FIELD_NAME, "asc")),
-        baseQuery.orderBy(orderBy("foo")).orderBy(orderBy(KEY_FIELD_NAME, "asc")).getOrderBy());
+        baseQuery
+            .orderBy(orderBy("foo"))
+            .orderBy(orderBy(KEY_FIELD_NAME, "asc"))
+            .getNormalizedOrderBy());
     assertEquals(
         asList(orderBy("foo"), orderBy(KEY_FIELD_NAME, "desc")),
-        baseQuery.orderBy(orderBy("foo")).orderBy(orderBy(KEY_FIELD_NAME, "desc")).getOrderBy());
+        baseQuery
+            .orderBy(orderBy("foo"))
+            .orderBy(orderBy(KEY_FIELD_NAME, "desc"))
+            .getNormalizedOrderBy());
 
     // Inequality filters add order bys
     assertEquals(
         asList(orderBy("foo"), orderBy(KEY_FIELD_NAME, "asc")),
-        baseQuery.filter(filter("foo", "<", 5)).getOrderBy());
+        baseQuery.filter(filter("foo", "<", 5)).getNormalizedOrderBy());
 
     // Descending order by applies to implicit key ordering
     assertEquals(
         asList(orderBy("foo", "desc"), orderBy(KEY_FIELD_NAME, "desc")),
-        baseQuery.orderBy(orderBy("foo", "desc")).getOrderBy());
+        baseQuery.orderBy(orderBy("foo", "desc")).getNormalizedOrderBy());
     assertEquals(
         asList(orderBy("foo", "asc"), orderBy("bar", "desc"), orderBy(KEY_FIELD_NAME, "desc")),
-        baseQuery.orderBy(orderBy("foo", "asc")).orderBy(orderBy("bar", "desc")).getOrderBy());
+        baseQuery
+            .orderBy(orderBy("foo", "asc"))
+            .orderBy(orderBy("bar", "desc"))
+            .getNormalizedOrderBy());
     assertEquals(
         asList(orderBy("foo", "desc"), orderBy("bar", "asc"), orderBy(KEY_FIELD_NAME, "asc")),
-        baseQuery.orderBy(orderBy("foo", "desc")).orderBy(orderBy("bar", "asc")).getOrderBy());
+        baseQuery
+            .orderBy(orderBy("foo", "desc"))
+            .orderBy(orderBy("bar", "asc"))
+            .getNormalizedOrderBy());
+  }
+
+  @Test
+  public void testImplicitOrderByInMultipleInequality() {
+    Query baseQuery = Query.atPath(path("foo"));
+    assertEquals(
+        asList(
+            orderBy("A", "asc"),
+            orderBy("a", "asc"),
+            orderBy("aa", "asc"),
+            orderBy("b", "asc"),
+            orderBy(KEY_FIELD_NAME, "asc")),
+        baseQuery
+            .filter(filter("a", "<", 5))
+            .filter(filter("a", ">=", 5))
+            .filter(filter("aa", "<", 5))
+            .filter(filter("b", "<", 5))
+            .filter(filter("A", "<", 5))
+            .getNormalizedOrderBy());
+
+    // numbers
+    assertEquals(
+        asList(
+            orderBy("1", "asc"),
+            orderBy("19", "asc"),
+            orderBy("2", "asc"),
+            orderBy("a", "asc"),
+            orderBy(KEY_FIELD_NAME, "asc")),
+        baseQuery
+            .filter(filter("a", "<", 5))
+            .filter(filter("1", "<", 5))
+            .filter(filter("2", "<", 5))
+            .filter(filter("19", "<", 5))
+            .getNormalizedOrderBy());
+
+    // nested fields
+    assertEquals(
+        asList(
+            orderBy("a", "asc"),
+            orderBy("a.a", "asc"),
+            orderBy("aa", "asc"),
+            orderBy(KEY_FIELD_NAME, "asc")),
+        baseQuery
+            .filter(filter("a", "<", 5))
+            .filter(filter("aa", "<", 5))
+            .filter(filter("a.a", "<", 5))
+            .getNormalizedOrderBy());
+
+    // special characters
+    assertEquals(
+        asList(
+            orderBy("_a", "asc"),
+            orderBy("a", "asc"),
+            orderBy("a.a", "asc"),
+            orderBy(KEY_FIELD_NAME, "asc")),
+        baseQuery
+            .filter(filter("a", "<", 5))
+            .filter(filter("_a", "<", 5))
+            .filter(filter("a.a", "<", 5))
+            .getNormalizedOrderBy());
+
+    // field name with dot
+    assertEquals(
+        asList(
+            orderBy("a", "asc"),
+            orderBy("a.z", "asc"),
+            orderBy("`a.a`", "asc"),
+            orderBy(KEY_FIELD_NAME, "asc")),
+        baseQuery
+            .filter(filter("a", "<", 5))
+            .filter(filter("`a.a`", "<", 5)) // Field name with dot
+            .filter(filter("a.z", "<", 5)) // Nested field
+            .getNormalizedOrderBy());
+
+    // composite filter
+    assertEquals(
+        asList(
+            orderBy("a", "asc"),
+            orderBy("b", "asc"),
+            orderBy("c", "asc"),
+            orderBy("d", "asc"),
+            orderBy(KEY_FIELD_NAME, "asc")),
+        baseQuery
+            .filter(filter("a", "<", 5))
+            .filter(
+                andFilters(
+                    orFilters(filter("b", ">=", 1), filter("c", "<=", 1)),
+                    orFilters(filter("d", "<=", 1), filter("e", "==", 1))))
+            .getNormalizedOrderBy());
+
+    // OrderBy
+    assertEquals(
+        asList(
+            orderBy("z", "asc"),
+            orderBy("a", "asc"),
+            orderBy("b", "asc"),
+            orderBy(KEY_FIELD_NAME, "asc")),
+        baseQuery
+            .filter(filter("b", "<", 5))
+            .filter(filter("a", "<", 5))
+            .filter(filter("z", "<", 5))
+            .orderBy(orderBy("z"))
+            .getNormalizedOrderBy());
+
+    // last explicit order by direction
+    assertEquals(
+        asList(
+            orderBy("z", "desc"),
+            orderBy("a", "desc"),
+            orderBy("b", "desc"),
+            orderBy(KEY_FIELD_NAME, "desc")),
+        baseQuery
+            .filter(filter("b", "<", 5))
+            .filter(filter("a", "<", 5))
+            .orderBy(orderBy("z", "desc"))
+            .getNormalizedOrderBy());
+
+    assertEquals(
+        asList(
+            orderBy("z", "desc"),
+            orderBy("c", "asc"),
+            orderBy("a", "asc"),
+            orderBy("b", "asc"),
+            orderBy(KEY_FIELD_NAME, "asc")),
+        baseQuery
+            .filter(filter("b", "<", 5))
+            .filter(filter("a", "<", 5))
+            .orderBy(orderBy("z", "desc"))
+            .orderBy(orderBy("c"))
+            .getNormalizedOrderBy());
   }
 
   @Test
@@ -689,4 +844,261 @@ public void testCanonicalIdsAreStable() {
   private void assertCanonicalId(Query query, String expectedCanonicalId) {
     assertEquals(expectedCanonicalId, query.toTarget().getCanonicalId());
   }
+
+  @Test
+  public void testOrQuery() {
+    MutableDocument doc1 = doc("collection/1", 0, map("a", 1, "b", 0));
+    MutableDocument doc2 = doc("collection/2", 0, map("a", 2, "b", 1));
+    MutableDocument doc3 = doc("collection/3", 0, map("a", 3, "b", 2));
+    MutableDocument doc4 = doc("collection/4", 0, map("a", 1, "b", 3));
+    MutableDocument doc5 = doc("collection/5", 0, map("a", 1, "b", 1));
+
+    // Two equalities: a==1 || b==1.
+    Query query1 =
+        query("collection").filter(orFilters(filter("a", "==", 1), filter("b", "==", 1)));
+    assertQueryMatches(
+        query1,
+        /* match */ Arrays.asList(doc1, doc2, doc4, doc5),
+        /* not match */ Arrays.asList(doc3));
+
+    // with one inequality: a>2 || b==1.
+    Query query2 = query("collection").filter(orFilters(filter("a", ">", 2), filter("b", "==", 1)));
+    assertQueryMatches(
+        query2,
+        /* match */ Arrays.asList(doc2, doc3, doc5),
+        /* not match */ Arrays.asList(doc1, doc4));
+
+    // (a==1 && b==0) || (a==3 && b==2)
+    Query query3 =
+        query("collection")
+            .filter(
+                orFilters(
+                    andFilters(filter("a", "==", 1), filter("b", "==", 0)),
+                    andFilters(filter("a", "==", 3), filter("b", "==", 2))));
+    assertQueryMatches(
+        query3,
+        /* match */ Arrays.asList(doc1, doc3),
+        /* not match */ Arrays.asList(doc2, doc4, doc5));
+
+    // a==1 && (b==0 || b==3).
+    Query query4 =
+        query("collection")
+            .filter(
+                andFilters(
+                    filter("a", "==", 1), orFilters(filter("b", "==", 0), filter("b", "==", 3))));
+    assertQueryMatches(
+        query4,
+        /* match */ Arrays.asList(doc1, doc4),
+        /* not match */ Arrays.asList(doc2, doc3, doc5));
+
+    // (a==2 || b==2) && (a==3 || b==3)
+    Query query5 =
+        query("collection")
+            .filter(
+                andFilters(
+                    orFilters(filter("a", "==", 2), filter("b", "==", 2)),
+                    orFilters(filter("a", "==", 3), filter("b", "==", 3))));
+    assertQueryMatches(
+        query5,
+        /* match */ Arrays.asList(doc3),
+        /* not match */ Arrays.asList(doc1, doc2, doc4, doc5));
+  }
+
+  @Test
+  public void testSynchronousMatchesOrderBy() {
+    List<MutableDocument> docs = new ArrayList<>();
+
+    // Add one hundred documents to the collection, each with many fields (26).
+    // These will match the query and order by
+    for (int i = 0; i < 100; i++) {
+      docs.add(
+          doc(
+              "collection/" + i,
+              0,
+              map(
+                  "a", 2,
+                  "b", 2,
+                  "c", 2,
+                  "d", 2,
+                  "e", 2,
+                  "f", 2,
+                  "g", 2,
+                  "h", 2,
+                  "i", 2,
+                  "j", 2,
+                  "k", 2,
+                  "l", 2,
+                  "m", 2,
+                  "n", 2,
+                  "o", 2,
+                  "p", 2,
+                  "q", 2,
+                  "r", 2,
+                  "s", 2,
+                  "t", 2,
+                  "u", 2,
+                  "v", 2,
+                  "w", 2,
+                  "x", 2,
+                  "y", 2,
+                  "z", 2)));
+    }
+
+    // Add the an additional document to the collection, which
+    // will match the query but not the order by.
+    docs.add(doc("collection/100", 0, map("a", 2)));
+
+    // Create a query that orders by many fields (26).
+    // We are testing matching on order by in parallel
+    // and we want to have a large set of order bys to
+    // force more concurrency.
+    Query query =
+        query("collection")
+            .filter(filter("a", ">", 1))
+            .orderBy(orderBy("a"))
+            .orderBy(orderBy("b"))
+            .orderBy(orderBy("c"))
+            .orderBy(orderBy("d"))
+            .orderBy(orderBy("e"))
+            .orderBy(orderBy("f"))
+            .orderBy(orderBy("g"))
+            .orderBy(orderBy("h"))
+            .orderBy(orderBy("i"))
+            .orderBy(orderBy("j"))
+            .orderBy(orderBy("k"))
+            .orderBy(orderBy("l"))
+            .orderBy(orderBy("m"))
+            .orderBy(orderBy("n"))
+            .orderBy(orderBy("o"))
+            .orderBy(orderBy("p"))
+            .orderBy(orderBy("q"))
+            .orderBy(orderBy("r"))
+            .orderBy(orderBy("s"))
+            .orderBy(orderBy("t"))
+            .orderBy(orderBy("u"))
+            .orderBy(orderBy("v"))
+            .orderBy(orderBy("w"))
+            .orderBy(orderBy("x"))
+            .orderBy(orderBy("y"))
+            .orderBy(orderBy("z"));
+
+    // We're going to emulate the multi-threaded document matching performed in
+    // SQLiteRemoteDocumentCache.getAll(...), where `query.matches(doc)` is performed
+    // for many different docs concurrently on the BackgroundQueue.
+    Iterator<MutableDocument> iterator = docs.iterator();
+    BackgroundQueue backgroundQueue = new BackgroundQueue();
+    Map<DocumentKey, Boolean> results = new HashMap<>();
+
+    while (iterator.hasNext()) {
+      MutableDocument doc = iterator.next();
+      // Only put the processing in the backgroundQueue if there are more documents
+      // in the list. This behavior matches SQLiteRemoteDocumentCache.getAll(...)
+      Executor executor = iterator.hasNext() ? backgroundQueue : Executors.DIRECT_EXECUTOR;
+      executor.execute(
+          () -> {
+            // We call query.matches() to indirectly test query.matchesOrderBy()
+            boolean result = query.matches(doc);
+
+            // We will include a synchronized block in our command to simulate
+            // the implementation in SQLiteRemoteDocumentCache.getAll(...)
+            synchronized (results) {
+              results.put(doc.getKey(), result);
+            }
+          });
+    }
+
+    backgroundQueue.drain();
+
+    Assert.assertEquals(101, results.keySet().size());
+    for (DocumentKey key : results.keySet()) {
+      // Only for document 100 do we expect the match to be false
+      // otherwise it will be true.
+      if (key.compareTo(DocumentKey.fromPathString("collection/100")) == 0) {
+        Assert.assertEquals(false, results.get(key));
+      } else {
+        Assert.assertEquals(true, results.get(key));
+      }
+    }
+  }
+
+  @Test
+  public void testGetOrderByReturnsUnmodifiableList() {
+    Query query =
+        query("collection")
+            .filter(filter("a", ">", 1))
+            .orderBy(orderBy("a"))
+            .orderBy(orderBy("b"))
+            .orderBy(orderBy("c"))
+            .orderBy(orderBy("d"))
+            .orderBy(orderBy("e"))
+            .orderBy(orderBy("f"));
+
+    List<OrderBy> orderByList = query.getNormalizedOrderBy();
+
+    assertThrows(UnsupportedOperationException.class, () -> orderByList.add(orderBy("g")));
+  }
+
+  @Test
+  public void testOrderByForAggregateAndNonAggregate() {
+    Query col = query("collection");
+
+    // Build two identical queries
+    Query query1 = col.filter(filter("foo", ">", 1));
+    Query query2 = col.filter(filter("foo", ">", 1));
+
+    // Compute an aggregate and non-aggregate target from the queries
+    Target aggregateTarget = query1.toAggregateTarget();
+    Target target = query2.toTarget();
+
+    assertEquals(aggregateTarget.getOrderBy().size(), 0);
+
+    assertEquals(target.getOrderBy().size(), 2);
+    assertEquals(target.getOrderBy().get(0).getDirection(), OrderBy.Direction.ASCENDING);
+    assertEquals(target.getOrderBy().get(0).getField().toString(), "foo");
+    assertEquals(target.getOrderBy().get(1).getDirection(), OrderBy.Direction.ASCENDING);
+    assertEquals(target.getOrderBy().get(1).getField().toString(), "__name__");
+  }
+
+  @Test
+  public void testGeneratedOrderBysNotAffectedByPreviouslyMemoizedTargets() {
+    Query col = query("collection");
+
+    // Build two identical queries
+    Query query1 = col.filter(filter("foo", ">", 1));
+    Query query2 = col.filter(filter("foo", ">", 1));
+
+    // query1 - first to aggregate target, then to non-aggregate target
+    Target aggregateTarget1 = query1.toAggregateTarget();
+    Target target1 = query1.toTarget();
+
+    // query2 - first to non-aggregate target, then to aggregate target
+    Target target2 = query2.toTarget();
+    Target aggregateTarget2 = query2.toAggregateTarget();
+
+    assertEquals(aggregateTarget1.getOrderBy().size(), 0);
+
+    assertEquals(aggregateTarget2.getOrderBy().size(), 0);
+
+    assertEquals(target1.getOrderBy().size(), 2);
+    assertEquals(target1.getOrderBy().get(0).getDirection(), OrderBy.Direction.ASCENDING);
+    assertEquals(target1.getOrderBy().get(0).getField().toString(), "foo");
+    assertEquals(target1.getOrderBy().get(1).getDirection(), OrderBy.Direction.ASCENDING);
+    assertEquals(target1.getOrderBy().get(1).getField().toString(), "__name__");
+
+    assertEquals(target2.getOrderBy().size(), 2);
+    assertEquals(target2.getOrderBy().get(0).getDirection(), OrderBy.Direction.ASCENDING);
+    assertEquals(target2.getOrderBy().get(0).getField().toString(), "foo");
+    assertEquals(target2.getOrderBy().get(1).getDirection(), OrderBy.Direction.ASCENDING);
+    assertEquals(target2.getOrderBy().get(1).getField().toString(), "__name__");
+  }
+
+  private void assertQueryMatches(
+      Query query, List<MutableDocument> matching, List<MutableDocument> nonMatching) {
+    for (MutableDocument doc : matching) {
+      assertTrue(query.matches(doc));
+    }
+    for (MutableDocument doc : nonMatching) {
+      assertFalse(query.matches(doc));
+    }
+  }
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/core/TargetTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/TargetTest.java
index 709c06ba08b..bad5ee427fa 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/core/TargetTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/TargetTest.java
@@ -23,7 +23,6 @@
 import static com.google.firebase.firestore.testutil.TestUtil.query;
 import static com.google.firebase.firestore.testutil.TestUtil.wrap;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import com.google.firebase.firestore.model.FieldIndex;
@@ -70,10 +69,10 @@ public void lessThanQueryBound() {
     FieldIndex index = fieldIndex("c", "foo", FieldIndex.Segment.Kind.DESCENDING);
 
     Bound lowerBound = target.getLowerBound(index);
-    verifyBound(lowerBound, true, "");
+    verifyBound(lowerBound, false, "bar");
 
     Bound upperBound = target.getUpperBound(index);
-    verifyBound(upperBound, false, "bar");
+    verifyBound(upperBound, true, "");
   }
 
   @Test
@@ -106,10 +105,10 @@ public void greaterThanOrEqualsQueryBound() {
     FieldIndex index = fieldIndex("c", "foo", FieldIndex.Segment.Kind.DESCENDING);
 
     Bound lowerBound = target.getLowerBound(index);
-    verifyBound(lowerBound, true, "bar");
+    verifyBound(lowerBound, false, blob());
 
     Bound upperBound = target.getUpperBound(index);
-    verifyBound(upperBound, false, blob());
+    verifyBound(upperBound, true, "bar");
   }
 
   @Test
@@ -151,10 +150,14 @@ public void orderByQueryBound() {
     FieldIndex index = fieldIndex("c", "foo", FieldIndex.Segment.Kind.ASCENDING);
 
     Bound lowerBound = target.getLowerBound(index);
-    assertNull(lowerBound);
+    assertEquals(1, lowerBound.getPosition().size());
+    assertTrue(Values.equals(lowerBound.getPosition().get(0), Values.MIN_VALUE));
+    assertTrue(lowerBound.isInclusive());
 
     Bound upperBound = target.getUpperBound(index);
-    assertNull(upperBound);
+    assertEquals(1, upperBound.getPosition().size());
+    assertTrue(Values.equals(upperBound.getPosition().get(0), Values.MAX_VALUE));
+    assertTrue(upperBound.isInclusive());
   }
 
   @Test
@@ -179,7 +182,9 @@ public void startAtQueryBound() {
     verifyBound(lowerBound, true, "bar");
 
     Bound upperBound = target.getUpperBound(index);
-    assertNull(upperBound);
+    assertEquals(1, upperBound.getPosition().size());
+    assertTrue(Values.equals(upperBound.getPosition().get(0), Values.MAX_VALUE));
+    assertTrue(upperBound.isInclusive());
   }
 
   @Test
@@ -253,7 +258,9 @@ public void endAtQueryBound() {
     FieldIndex index = fieldIndex("c", "foo", FieldIndex.Segment.Kind.ASCENDING);
 
     Bound lowerBound = target.getLowerBound(index);
-    assertNull(lowerBound);
+    assertEquals(1, lowerBound.getPosition().size());
+    assertTrue(Values.equals(lowerBound.getPosition().get(0), Values.MIN_VALUE));
+    assertTrue(lowerBound.isInclusive());
 
     Bound upperBound = target.getUpperBound(index);
     verifyBound(upperBound, true, "bar");
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/core/ViewSnapshotTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/ViewSnapshotTest.java
index 647601030ac..ee3920d3658 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/core/ViewSnapshotTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/core/ViewSnapshotTest.java
@@ -49,6 +49,7 @@ public void testConstructor() {
     boolean hasPendingWrites = true;
     boolean syncStateChanges = true;
     boolean excludesMetadataChanges = true;
+    boolean hasCachedResults = true;
 
     ViewSnapshot snapshot =
         new ViewSnapshot(
@@ -59,7 +60,8 @@ public void testConstructor() {
             fromCache,
             mutatedKeys,
             syncStateChanges,
-            excludesMetadataChanges);
+            excludesMetadataChanges,
+            hasCachedResults);
 
     assertEquals(query, snapshot.getQuery());
     assertEquals(docs, snapshot.getDocuments());
@@ -70,5 +72,6 @@ public void testConstructor() {
     assertEquals(hasPendingWrites, snapshot.hasPendingWrites());
     assertEquals(syncStateChanges, snapshot.didSyncStateChange());
     assertEquals(excludesMetadataChanges, snapshot.excludesMetadataChanges());
+    assertEquals(hasCachedResults, snapshot.hasCachedResults());
   }
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/ktx/FirestoreTests.kt b/firebase-firestore/src/test/java/com/google/firebase/firestore/ktx/FirestoreTests.kt
new file mode 100644
index 00000000000..74ea542b22d
--- /dev/null
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/ktx/FirestoreTests.kt
@@ -0,0 +1,269 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.firestore.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.firestore.DocumentSnapshot
+import com.google.firebase.firestore.FieldPath
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.FirebaseFirestoreSettings
+import com.google.firebase.firestore.PropertyName
+import com.google.firebase.firestore.TestUtilKtx
+import com.google.firebase.firestore.model.ObjectValue
+import com.google.firebase.firestore.testutil.TestUtilKtx.wrap
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class FirestoreTests : BaseTestCase() {
+
+  @Test
+  fun `firestore should delegate to FirebaseFirestore#getInstance()`() {
+    assertThat(Firebase.firestore).isSameInstanceAs(FirebaseFirestore.getInstance())
+  }
+
+  @Test
+  fun `Database#firestore should delegate to FirebaseFirestore#getInstance(Database)`() {
+    assertThat(Firebase.firestore("name")).isSameInstanceAs(FirebaseFirestore.getInstance("name"))
+  }
+
+  @Test
+  fun `FirebaseApp#firestore should delegate to FirebaseFirestore#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.firestore(app)).isSameInstanceAs(FirebaseFirestore.getInstance(app))
+  }
+
+  @Test
+  fun `FirebaseApp#Database#firestore should delegate to FirebaseFirestore#getInstance(FirebaseApp,Database)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.firestore(app, "name"))
+      .isSameInstanceAs(FirebaseFirestore.getInstance(app, "name"))
+  }
+
+  @Test
+  fun `FirebaseFirestoreSettings builder works`() {
+    val host = "http://10.0.2.2:8080"
+    val isSslEnabled = false
+    val isPersistenceEnabled = false
+
+    val settings = firestoreSettings {
+      this.host = host
+      this.isSslEnabled = isSslEnabled
+      this.isPersistenceEnabled = isPersistenceEnabled
+    }
+
+    assertThat(host).isEqualTo(settings.host)
+    assertThat(isSslEnabled).isEqualTo(settings.isSslEnabled)
+    assertThat(isPersistenceEnabled).isEqualTo(settings.isPersistenceEnabled)
+  }
+
+  @Test
+  fun `LocalCacheSettings builder works`() {
+    val host = "http://10.0.2.2:8080"
+    val isSslEnabled = false
+
+    val settings = firestoreSettings {
+      this.host = host
+      this.isSslEnabled = isSslEnabled
+      this.setLocalCacheSettings(persistentCacheSettings { setSizeBytes(1_000_000) })
+    }
+
+    assertThat(host).isEqualTo(settings.host)
+    assertThat(isSslEnabled).isEqualTo(settings.isSslEnabled)
+    assertThat(settings.isPersistenceEnabled).isTrue()
+    assertThat(settings.cacheSizeBytes).isEqualTo(1_000_000)
+
+    val otherSettings = firestoreSettings { this.setLocalCacheSettings(memoryCacheSettings {}) }
+
+    assertThat(otherSettings.host).isEqualTo(FirebaseFirestoreSettings.DEFAULT_HOST)
+    assertThat(otherSettings.isSslEnabled).isEqualTo(true)
+    assertThat(otherSettings.isPersistenceEnabled).isFalse()
+  }
+
+  @Test
+  fun `MemoryCacheSettings Garbage Collector builder works`() {
+    val host = "http://10.0.2.2:8080"
+    val isSslEnabled = false
+
+    val settings = firestoreSettings {
+      this.host = host
+      this.isSslEnabled = isSslEnabled
+      this.setLocalCacheSettings(memoryCacheSettings {})
+    }
+
+    assertThat(host).isEqualTo(settings.host)
+    assertThat(isSslEnabled).isEqualTo(settings.isSslEnabled)
+    assertThat(settings.isPersistenceEnabled).isFalse()
+    assertThat(settings.cacheSettings)
+      .isEqualTo(memoryCacheSettings { setGcSettings(memoryEagerGcSettings {}) })
+
+    val otherSettings = firestoreSettings {
+      this.setLocalCacheSettings(
+        memoryCacheSettings { setGcSettings(memoryLruGcSettings { setSizeBytes(1_000) }) }
+      )
+    }
+
+    assertThat(otherSettings.host).isEqualTo(FirebaseFirestoreSettings.DEFAULT_HOST)
+    assertThat(otherSettings.isPersistenceEnabled).isFalse()
+    assertThat(otherSettings.cacheSizeBytes).isEqualTo(1_000)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
+
+data class Room(var a: Int = 0, var b: Int = 0)
+
+// NOTE: When Kotlin properties are annotated with `PropertyName` they need to use @get and @set.
+// Also, the properties need to be mutable; that is, declared with `var` and not `val`.
+// See https://github.com/firebase/firebase-android-sdk/issues/4822
+data class DataClassWithPropertyName(
+  @get:PropertyName("dbName") @set:PropertyName("dbName") var objName: String = "DefaultObjName"
+)
+
+@RunWith(RobolectricTestRunner::class)
+class DocumentSnapshotTests {
+  @Before
+  fun setup() {
+    Mockito.`when`(TestUtilKtx.firestore().firestoreSettings)
+      .thenReturn(FirebaseFirestoreSettings.Builder().build())
+  }
+
+  @After
+  fun cleanup() {
+    Mockito.reset(TestUtilKtx.firestore())
+  }
+
+  @Test
+  fun `reified getField delegates to get()`() {
+    val ds = TestUtilKtx.documentSnapshot("rooms/foo", mapOf("a" to 1, "b" to 2), false)
+
+    assertThat(ds.getField<Int>("a")).isEqualTo(ds.get("a", Int::class.java))
+    assertThat(ds.getField<Int>(FieldPath.of("a")))
+      .isEqualTo(ds.get(FieldPath.of("a"), Int::class.java))
+
+    assertThat(ds.getField<Int>("a", DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
+      .isEqualTo(ds.get("a", Int::class.java, DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
+    assertThat(
+        ds.getField<Int>(FieldPath.of("a"), DocumentSnapshot.ServerTimestampBehavior.ESTIMATE)
+      )
+      .isEqualTo(ds.get(FieldPath.of("a"), Int::class.java))
+  }
+
+  @Test
+  fun `reified toObject delegates to toObject(Class)`() {
+    val ds = TestUtilKtx.documentSnapshot("rooms/foo", mapOf("a" to 1, "b" to 2), false)
+
+    var room = ds.toObject<Room>()
+    assertThat(room).isEqualTo(Room(1, 2))
+    assertThat(room).isEqualTo(ds.toObject(Room::class.java))
+
+    room = ds.toObject<Room>(DocumentSnapshot.ServerTimestampBehavior.ESTIMATE)
+    assertThat(room).isEqualTo(Room(1, 2))
+    assertThat(room)
+      .isEqualTo(ds.toObject(Room::class.java, DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
+  }
+
+  @Test
+  fun `PropertyName annotation works on data classes`() {
+    val ds = TestUtilKtx.documentSnapshot("foo/bar", mapOf("dbName" to "CustomValue"), false)
+
+    val toObjectReturnValue = ds.toObject<DataClassWithPropertyName>()
+
+    assertThat(toObjectReturnValue).isEqualTo(DataClassWithPropertyName("CustomValue"))
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class QuerySnapshotTests {
+  @Before
+  fun setup() {
+    Mockito.`when`(TestUtilKtx.firestore().firestoreSettings)
+      .thenReturn(FirebaseFirestoreSettings.Builder().build())
+  }
+
+  @After
+  fun cleanup() {
+    Mockito.reset(TestUtilKtx.firestore())
+  }
+
+  @Test
+  fun `reified toObjects delegates to toObjects(Class)`() {
+    val qs =
+      TestUtilKtx.querySnapshot(
+        "rooms",
+        mapOf(),
+        mapOf("id" to ObjectValue.fromMap(mapOf("a" to wrap(1), "b" to wrap(2)))),
+        false,
+        false
+      )
+
+    assertThat(qs.toObjects<Room>()).containsExactly(Room(1, 2))
+    assertThat(qs.toObjects<Room>(DocumentSnapshot.ServerTimestampBehavior.ESTIMATE))
+      .containsExactly(Room(1, 2))
+  }
+}
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/CountingQueryEngine.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/CountingQueryEngine.java
index 204e2dfc8d5..d93231ad215 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/CountingQueryEngine.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/CountingQueryEngine.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.firestore.local;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.firebase.database.collection.ImmutableSortedMap;
 import com.google.firebase.database.collection.ImmutableSortedSet;
@@ -24,10 +25,16 @@
 import com.google.firebase.firestore.model.MutableDocument;
 import com.google.firebase.firestore.model.ResourcePath;
 import com.google.firebase.firestore.model.SnapshotVersion;
+import com.google.firebase.firestore.model.mutation.DeleteMutation;
 import com.google.firebase.firestore.model.mutation.Mutation;
 import com.google.firebase.firestore.model.mutation.Overlay;
+import com.google.firebase.firestore.model.mutation.PatchMutation;
+import com.google.firebase.firestore.model.mutation.SetMutation;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.SortedSet;
 
 /**
@@ -35,10 +42,17 @@
  * mutations read.
  */
 class CountingQueryEngine extends QueryEngine {
+  enum OverlayType {
+    Patch,
+    Set,
+    Delete
+  }
+
   private final QueryEngine queryEngine;
 
   private final int[] overlaysReadByCollection = new int[] {0};
   private final int[] overlaysReadByKey = new int[] {0};
+  private final Map<DocumentKey, OverlayType> overlayTypes = new HashMap();
   private final int[] documentsReadByCollection = new int[] {0};
   private final int[] documentsReadByKey = new int[] {0};
 
@@ -49,6 +63,7 @@ class CountingQueryEngine extends QueryEngine {
   void resetCounts() {
     overlaysReadByCollection[0] = 0;
     overlaysReadByKey[0] = 0;
+    overlayTypes.clear();
     documentsReadByCollection[0] = 0;
     documentsReadByKey[0] = 0;
   }
@@ -72,9 +87,19 @@ public ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingQuery(
     return queryEngine.getDocumentsMatchingQuery(query, lastLimboFreeSnapshotVersion, remoteKeys);
   }
 
-  /** Returns the query engine that is used as the backing implementation. */
-  QueryEngine getSubject() {
-    return queryEngine;
+  @Override
+  public void setIndexAutoCreationEnabled(boolean isEnabled) {
+    queryEngine.setIndexAutoCreationEnabled(isEnabled);
+  }
+
+  @Override
+  public void setIndexAutoCreationMinCollectionSize(int newMin) {
+    queryEngine.setIndexAutoCreationMinCollectionSize(newMin);
+  }
+
+  @Override
+  public void setRelativeIndexReadCostPerDocument(double newCost) {
+    queryEngine.setRelativeIndexReadCostPerDocument(newCost);
   }
 
   /**
@@ -109,6 +134,14 @@ int getOverlaysReadByKey() {
     return overlaysReadByKey[0];
   }
 
+  /**
+   * Returns the types of overlay returned by the OverlayCahce's `getOverlays()` API (since the last
+   * call to `resetCounts()`)
+   */
+  Map<DocumentKey, OverlayType> getOverlayTypes() {
+    return Collections.unmodifiableMap(overlayTypes);
+  }
+
   private RemoteDocumentCache wrapRemoteDocumentCache(RemoteDocumentCache subject) {
     return new RemoteDocumentCache() {
       @Override
@@ -147,13 +180,23 @@ public Map<DocumentKey, MutableDocument> getAll(
           String collectionGroup, IndexOffset offset, int limit) {
         Map<DocumentKey, MutableDocument> result = subject.getAll(collectionGroup, offset, limit);
         documentsReadByCollection[0] += result.size();
-
         return result;
       }
 
       @Override
-      public Map<DocumentKey, MutableDocument> getAll(ResourcePath collection, IndexOffset offset) {
-        Map<DocumentKey, MutableDocument> result = subject.getAll(collection, offset);
+      public Map<DocumentKey, MutableDocument> getDocumentsMatchingQuery(
+          Query query, IndexOffset offset, @NonNull Set<DocumentKey> mutatedKeys) {
+        return getDocumentsMatchingQuery(query, offset, mutatedKeys, /*context*/ null);
+      }
+
+      @Override
+      public Map<DocumentKey, MutableDocument> getDocumentsMatchingQuery(
+          Query query,
+          IndexOffset offset,
+          @NonNull Set<DocumentKey> mutatedKeys,
+          @Nullable QueryContext context) {
+        Map<DocumentKey, MutableDocument> result =
+            subject.getDocumentsMatchingQuery(query, offset, mutatedKeys, context);
         documentsReadByCollection[0] += result.size();
         return result;
       }
@@ -166,12 +209,19 @@ private DocumentOverlayCache wrapOverlayCache(DocumentOverlayCache subject) {
       @Override
       public Overlay getOverlay(DocumentKey key) {
         ++overlaysReadByKey[0];
-        return subject.getOverlay(key);
+        Overlay overlay = subject.getOverlay(key);
+        overlayTypes.put(key, getOverlayType(overlay));
+        return overlay;
       }
 
       public Map<DocumentKey, Overlay> getOverlays(SortedSet<DocumentKey> keys) {
         overlaysReadByKey[0] += keys.size();
-        return subject.getOverlays(keys);
+        Map<DocumentKey, Overlay> overlays = subject.getOverlays(keys);
+        for (Map.Entry<DocumentKey, Overlay> entry : overlays.entrySet()) {
+          overlayTypes.put(entry.getKey(), getOverlayType(entry.getValue()));
+        }
+
+        return overlays;
       }
 
       @Override
@@ -188,6 +238,9 @@ public void removeOverlaysForBatchId(int batchId) {
       public Map<DocumentKey, Overlay> getOverlays(ResourcePath collection, int sinceBatchId) {
         Map<DocumentKey, Overlay> result = subject.getOverlays(collection, sinceBatchId);
         overlaysReadByCollection[0] += result.size();
+        for (Map.Entry<DocumentKey, Overlay> entry : result.entrySet()) {
+          overlayTypes.put(entry.getKey(), getOverlayType(entry.getValue()));
+        }
         return result;
       }
 
@@ -197,8 +250,23 @@ public Map<DocumentKey, Overlay> getOverlays(
         Map<DocumentKey, Overlay> result =
             subject.getOverlays(collectionGroup, sinceBatchId, count);
         overlaysReadByCollection[0] += result.size();
+        for (Map.Entry<DocumentKey, Overlay> entry : result.entrySet()) {
+          overlayTypes.put(entry.getKey(), getOverlayType(entry.getValue()));
+        }
         return result;
       }
+
+      private OverlayType getOverlayType(Overlay overlay) {
+        if (overlay.getMutation() instanceof SetMutation) {
+          return OverlayType.Set;
+        } else if (overlay.getMutation() instanceof PatchMutation) {
+          return OverlayType.Patch;
+        } else if (overlay.getMutation() instanceof DeleteMutation) {
+          return OverlayType.Delete;
+        } else {
+          throw new IllegalStateException("Overlay is a unrecognizable mutation.");
+        }
+      }
     };
   }
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/DocumentOverlayCacheTestCase.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/DocumentOverlayCacheTestCase.java
index ced5e67c8e3..2872dc12423 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/DocumentOverlayCacheTestCase.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/DocumentOverlayCacheTestCase.java
@@ -23,6 +23,7 @@
 import static com.google.firebase.firestore.testutil.TestUtil.setMutation;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 import com.google.firebase.firestore.auth.User;
@@ -41,6 +42,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
 
 /**
  * These are tests for any implementation of the DocumentOverlayCache interface.
@@ -59,7 +61,7 @@ public abstract class DocumentOverlayCacheTestCase {
   @Before
   public void setUp() {
     persistence = getPersistence();
-    cache = persistence.getDocumentOverlay(User.UNAUTHENTICATED);
+    cache = persistence.getDocumentOverlayCache(User.UNAUTHENTICATED);
   }
 
   @After
@@ -252,6 +254,24 @@ public void testUpdateDocumentOverlay() {
     assertNull(cache.getOverlay(DocumentKey.fromPathString("coll/doc")));
   }
 
+  @Test
+  public void testSaveOverlaysThrowsNullPointerExceptionOnNullMapValue() {
+    Map<DocumentKey, Mutation> data = new HashMap<>();
+    data.put(key("coll/doc"), null);
+
+    NullPointerException e =
+        assertThrows(
+            NullPointerException.class,
+            new ThrowingRunnable() {
+              @Override
+              public void run() {
+                cache.saveOverlays(1, data);
+              }
+            });
+
+    assertThat(e.getMessage()).contains("coll/doc");
+  }
+
   void verifyOverlayContains(Map<DocumentKey, Overlay> overlays, String... keys) {
     Set<DocumentKey> expected = Arrays.stream(keys).map(TestUtil::key).collect(Collectors.toSet());
     assertThat(overlays.keySet()).containsExactlyElementsIn(expected);
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/IndexBackfillerTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/IndexBackfillerTest.java
index c7199e74dd1..fdc312ae073 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/IndexBackfillerTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/IndexBackfillerTest.java
@@ -44,8 +44,8 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -71,7 +71,7 @@ public class IndexBackfillerTest {
   public void setUp() {
     persistence = PersistenceTestHelpers.createSQLitePersistence();
     remoteDocumentCache = persistence.getRemoteDocumentCache();
-    documentOverlayCache = persistence.getDocumentOverlay(User.UNAUTHENTICATED);
+    documentOverlayCache = persistence.getDocumentOverlayCache(User.UNAUTHENTICATED);
     indexManager = persistence.getIndexManager(User.UNAUTHENTICATED);
     indexManager.start();
 
@@ -83,9 +83,9 @@ public void setUp() {
             persistence.getMutationQueue(User.UNAUTHENTICATED, indexManager),
             documentOverlayCache,
             indexManager);
-    backfiller = new IndexBackfiller(persistence, new AsyncQueue());
-    backfiller.setIndexManager(indexManager);
-    backfiller.setLocalDocumentsView(localDocumentsView);
+    backfiller =
+        new IndexBackfiller(
+            persistence, new AsyncQueue(), () -> indexManager, () -> localDocumentsView);
   }
 
   @After
@@ -165,7 +165,6 @@ public void testBackfillWritesOldestDocumentFirst() {
     backfiller.setMaxDocumentsToProcess(2);
 
     addFieldIndex("coll1", "foo");
-    Target target = query("coll1").orderBy(orderBy("foo")).toTarget();
     addDoc("coll1/docA", version(5), "foo", 1);
     addDoc("coll1/docB", version(3), "foo", 1);
     addDoc("coll1/docC", version(10), "foo", 1);
@@ -186,7 +185,6 @@ public void testBackfillUsesDocumentKeyOffsetForLargeSnapshots() {
     backfiller.setMaxDocumentsToProcess(2);
 
     addFieldIndex("coll1", "foo");
-    Target target = query("coll1").orderBy(orderBy("foo")).toTarget();
     addDoc("coll1/docA", version(1), "foo", 1);
     addDoc("coll1/docB", version(1), "foo", 1);
     addDoc("coll1/docC", version(1), "foo", 1);
@@ -363,7 +361,7 @@ public void testBackfillUpdatesExistingDocToNewValue() {
 
     // Update doc to new remote version with new value.
     addDoc("coll/doc", version(40), "foo", 2);
-    documentsProcessed = backfiller.backfill();
+    backfiller.backfill();
 
     verifyQueryResults(queryA, "coll/doc");
   }
@@ -454,7 +452,7 @@ public void testBackfillAppliesDeleteToRemoteDoc() {
     assertEquals(1, documentsProcessed);
 
     Target target = query("coll").filter(filter("foo", "==", 2)).toTarget();
-    Set<DocumentKey> matching = indexManager.getDocumentsMatchingTarget(target);
+    List<DocumentKey> matching = indexManager.getDocumentsMatchingTarget(target);
     assertTrue(matching.isEmpty());
   }
 
@@ -510,7 +508,7 @@ private void addFieldIndex(String collectionGroup, String fieldName, long sequen
 
   private void verifyQueryResults(Query query, String... expectedKeys) {
     Target target = query.toTarget();
-    Set<DocumentKey> actualKeys = indexManager.getDocumentsMatchingTarget(target);
+    List<DocumentKey> actualKeys = indexManager.getDocumentsMatchingTarget(target);
     if (actualKeys == null) {
       assertEquals(0, expectedKeys.length);
     } else {
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalSerializerTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalSerializerTest.java
index 282d6aec376..df345f1e6c0 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalSerializerTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalSerializerTest.java
@@ -29,6 +29,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.firebase.Timestamp;
 import com.google.firebase.firestore.bundle.BundledQuery;
 import com.google.firebase.firestore.core.Query;
@@ -81,6 +82,7 @@ static class TestWriteBuilder {
       this.builder = Write.newBuilder();
     }
 
+    @CanIgnoreReturnValue
     TestWriteBuilder addSet() {
       builder.setUpdate(
           com.google.firestore.v1.Document.newBuilder()
@@ -90,6 +92,7 @@ TestWriteBuilder addSet() {
       return this;
     }
 
+    @CanIgnoreReturnValue
     TestWriteBuilder addPatch() {
       builder
           .setUpdate(
@@ -102,11 +105,13 @@ TestWriteBuilder addPatch() {
       return this;
     }
 
+    @CanIgnoreReturnValue
     TestWriteBuilder addDelete() {
       builder.setDelete("projects/p/databases/d/documents/baz/quux");
       return this;
     }
 
+    @CanIgnoreReturnValue
     TestWriteBuilder addUpdateTransforms() {
       builder
           .addUpdateTransforms(
@@ -120,6 +125,7 @@ TestWriteBuilder addUpdateTransforms() {
       return this;
     }
 
+    @CanIgnoreReturnValue
     TestWriteBuilder addLegacyTransform() {
       builder
           .setTransform(
@@ -372,7 +378,8 @@ public void testEncodesTargetData() {
             QueryPurpose.LISTEN,
             snapshotVersion,
             limboFreeVersion,
-            resumeToken);
+            resumeToken,
+            null);
 
     // Let the RPC serializer test various permutations of query serialization.
     com.google.firestore.v1.Target.QueryTarget queryTarget =
@@ -397,6 +404,51 @@ public void testEncodesTargetData() {
     assertEquals(targetData, decoded);
   }
 
+  @Test
+  public void localSerializerShouldDropExpectedCountInTargetData() {
+    Query query = TestUtil.query("room");
+    int targetId = 42;
+    long sequenceNumber = 10;
+    SnapshotVersion snapshotVersion = TestUtil.version(1039);
+    SnapshotVersion limboFreeVersion = TestUtil.version(1000);
+    ByteString resumeToken = TestUtil.resumeToken(1039);
+
+    TargetData targetData =
+        new TargetData(
+            query.toTarget(),
+            targetId,
+            sequenceNumber,
+            QueryPurpose.LISTEN,
+            snapshotVersion,
+            limboFreeVersion,
+            resumeToken,
+            /* expectedCount= */ 1234);
+
+    com.google.firestore.v1.Target.QueryTarget queryTarget =
+        remoteSerializer.encodeQueryTarget(query.toTarget());
+
+    com.google.firebase.firestore.proto.Target expected =
+        com.google.firebase.firestore.proto.Target.newBuilder()
+            .setTargetId(targetId)
+            .setLastListenSequenceNumber(sequenceNumber)
+            .setSnapshotVersion(com.google.protobuf.Timestamp.newBuilder().setNanos(1039000))
+            .setResumeToken(ByteString.copyFrom(resumeToken.toByteArray()))
+            .setQuery(
+                com.google.firestore.v1.Target.QueryTarget.newBuilder()
+                    .setParent(queryTarget.getParent())
+                    .setStructuredQuery(queryTarget.getStructuredQuery()))
+            .setLastLimboFreeSnapshotVersion(
+                com.google.protobuf.Timestamp.newBuilder().setNanos(1000000))
+            .build();
+
+    assertEquals(expected, serializer.encodeTargetData(targetData));
+    TargetData decoded = serializer.decodeTargetData(expected);
+    // Set the expected_count in TargetData to null, as serializing a TargetData into local Target
+    // proto will drop the expected_count and the deserialized TargetData will not include the
+    // expected_count.
+    assertEquals(targetData.withExpectedCount(null), decoded);
+  }
+
   @Test
   public void testEncodesQuery() {
     Target target =
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalStoreTestCase.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalStoreTestCase.java
index 104e73d84d0..2b2fef7159f 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalStoreTestCase.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalStoreTestCase.java
@@ -24,6 +24,7 @@
 import static com.google.firebase.firestore.testutil.TestUtil.existenceFilterEvent;
 import static com.google.firebase.firestore.testutil.TestUtil.filter;
 import static com.google.firebase.firestore.testutil.TestUtil.key;
+import static com.google.firebase.firestore.testutil.TestUtil.keyMap;
 import static com.google.firebase.firestore.testutil.TestUtil.keySet;
 import static com.google.firebase.firestore.testutil.TestUtil.keys;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
@@ -82,6 +83,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -125,10 +127,9 @@ public void setUp() {
 
     localStorePersistence = getPersistence();
     queryEngine = new CountingQueryEngine(new QueryEngine());
-    indexBackfiller = new IndexBackfiller(localStorePersistence, new AsyncQueue());
-    localStore =
-        new LocalStore(localStorePersistence, indexBackfiller, queryEngine, User.UNAUTHENTICATED);
+    localStore = new LocalStore(localStorePersistence, queryEngine, User.UNAUTHENTICATED);
     localStore.start();
+    indexBackfiller = new IndexBackfiller(localStorePersistence, new AsyncQueue(), localStore);
   }
 
   @After
@@ -160,6 +161,10 @@ protected void backfillIndexes() {
     indexBackfiller.backfill();
   }
 
+  protected void setBackfillerMaxDocumentsToProcess(int newMax) {
+    indexBackfiller.setMaxDocumentsToProcess(newMax);
+  }
+
   private void updateViews(int targetId, boolean fromCache) {
     notifyLocalViewChanges(viewChanges(targetId, fromCache, asList(), asList()));
   }
@@ -212,6 +217,27 @@ protected void executeQuery(Query query) {
     lastQueryResult = localStore.executeQuery(query, /* usePreviousResults= */ true);
   }
 
+  protected void setIndexAutoCreationEnabled(boolean isEnabled) {
+    // Noted: there are two queryEngines here, the first one is extended by CountingQueryEngine,
+    // which is set by localStore function; The second one a pointer inside CountingQueryEngine,
+    // which is set by queryEngine function.
+    // Only the second function takes effect in the tests. Adding first one here for compatibility.
+    localStore.setIndexAutoCreationEnabled(isEnabled);
+    queryEngine.setIndexAutoCreationEnabled(isEnabled);
+  }
+
+  protected void setMinCollectionSizeToAutoCreateIndex(int newMin) {
+    queryEngine.setIndexAutoCreationMinCollectionSize(newMin);
+  }
+
+  protected void setRelativeIndexReadCostPerDocument(double newCost) {
+    queryEngine.setRelativeIndexReadCostPerDocument(newCost);
+  }
+
+  protected void deleteAllIndexes() {
+    localStore.deleteAllFieldIndexes();
+  }
+
   private void releaseTarget(int targetId) {
     localStore.releaseTarget(targetId);
   }
@@ -333,6 +359,11 @@ protected void assertOverlaysRead(int byKey, int byCollection) {
         "Overlays read (by collection)", byCollection, queryEngine.getOverlaysReadByCollection());
   }
 
+  /** Asserts the expected overlay types. */
+  protected void assertOverlayTypes(Map<DocumentKey, CountingQueryEngine.OverlayType> expected) {
+    assertEquals("Overlays types", expected, queryEngine.getOverlayTypes());
+  }
+
   /**
    * Asserts the expected numbers of documents read by the RemoteDocumentCache since the last call
    * to `resetPersistenceStats()`.
@@ -759,7 +790,7 @@ public void testHandlesDeleteMutationThenPatchMutationThenAckThenAck() {
 
     acknowledgeMutation(2); // delete mutation
     assertRemoved("foo/bar");
-    assertContains(deletedDoc("foo/bar", 2).setHasCommittedMutations());
+    assertContains(deletedDoc("foo/bar", 0).setHasLocalMutations());
 
     acknowledgeMutation(3); // patch mutation
     assertChanged(unknownDoc("foo/bar", 3));
@@ -976,6 +1007,7 @@ public void testReadsAllDocumentsForInitialCollectionQueries() {
     localStore.executeQuery(query, /* usePreviousResults= */ true);
     assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
     assertOverlaysRead(/* byKey= */ 0, /* byCollection= */ 1);
+    assertOverlayTypes(keyMap("foo/bonk", CountingQueryEngine.OverlayType.Set));
   }
 
   @Test
@@ -1098,7 +1130,7 @@ public void testUsesTargetMappingToExecuteQueries() {
     // Execute the query, but note that we read all existing documents from the RemoteDocumentCache
     // since we do not yet have target mapping.
     executeQuery(query);
-    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 3);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
 
     // Issue a RemoteEvent to persist the target mapping.
     applyRemoteEvent(
@@ -1337,16 +1369,17 @@ public void testHoldsBackTransforms() {
             emptyList()));
     assertChanged(doc("foo/bar", 1, map("sum", 0, "array_union", new ArrayList<>())));
 
-    writeMutations(
-        asList(
-            patchMutation("foo/bar", map("sum", FieldValue.increment(1))),
-            patchMutation("foo/bar", map("array_union", FieldValue.arrayUnion("foo")))));
+    writeMutation(patchMutation("foo/bar", map("sum", FieldValue.increment(1))));
+    assertChanged(
+        doc("foo/bar", 1, map("sum", 1, "array_union", new ArrayList<>())).setHasLocalMutations());
+
+    writeMutation(patchMutation("foo/bar", map("array_union", FieldValue.arrayUnion("foo"))));
     assertChanged(
         doc("foo/bar", 1, map("sum", 1, "array_union", Collections.singletonList("foo")))
             .setHasLocalMutations());
 
-    // The sum transform is not idempotent and the backend's updated value is ignored. The
-    // ArrayUnion transform is recomputed and includes the backend value.
+    // The sum transform and array union transform make the SDK ignore the
+    // backend's updated value.
     applyRemoteEvent(
         addedRemoteEvent(
             doc("foo/bar", 2, map("sum", 1337, "array_union", Collections.singletonList("bar"))),
@@ -1355,10 +1388,18 @@ public void testHoldsBackTransforms() {
     assertChanged(
         doc("foo/bar", 2, map("sum", 1, "array_union", asList("foo"))).setHasLocalMutations());
 
-    acknowledgeMutationWithTransformResults(3, 1338, asList("bar", "foo"));
+    // With a field transform acknowledgement, the overlay is recalculated with
+    // remaining local mutations.
+    acknowledgeMutationWithTransformResults(3, 1338);
     assertChanged(
         doc("foo/bar", 3, map("sum", 1338, "array_union", asList("bar", "foo")))
             .setReadTime(new SnapshotVersion(new Timestamp(0, 3000)))
+            .setHasLocalMutations());
+
+    acknowledgeMutationWithTransformResults(4, asList("bar", "foo"));
+    assertChanged(
+        doc("foo/bar", 4, map("sum", 1338, "array_union", asList("bar", "foo")))
+            .setReadTime(new SnapshotVersion(new Timestamp(0, 4000)))
             .setHasCommittedMutations());
   }
 
@@ -1616,4 +1657,86 @@ public void testCanHandleBatchAckWhenPendingBatchesHaveOtherDocs() {
     assertContains(doc("foo/bar", 0, map("foo", "bar-set")).setHasLocalMutations());
     assertContains(doc("foo/another", 0, map("foo", "another")).setHasLocalMutations());
   }
+
+  @Test
+  public void testMultipleFieldPatchesOnRemoteDocs() {
+    Query query = query("foo");
+    allocateQuery(query);
+    assertTargetId(2);
+
+    applyRemoteEvent(
+        addedRemoteEvent(doc("foo/bar", 1, map("likes", 0, "stars", 0)), asList(2), emptyList()));
+    assertChanged(doc("foo/bar", 1, map("likes", 0, "stars", 0)));
+    assertContains(doc("foo/bar", 1, map("likes", 0, "stars", 0)));
+
+    writeMutation(patchMutation("foo/bar", map("likes", 1)));
+    assertChanged(doc("foo/bar", 1, map("likes", 1, "stars", 0)).setHasLocalMutations());
+    assertContains(doc("foo/bar", 1, map("likes", 1, "stars", 0)).setHasLocalMutations());
+
+    writeMutation(patchMutation("foo/bar", map("stars", 1)));
+    assertChanged(doc("foo/bar", 1, map("likes", 1, "stars", 1)).setHasLocalMutations());
+    assertContains(doc("foo/bar", 1, map("likes", 1, "stars", 1)).setHasLocalMutations());
+
+    writeMutation(patchMutation("foo/bar", map("stars", 2)));
+    assertChanged(doc("foo/bar", 1, map("likes", 1, "stars", 2)).setHasLocalMutations());
+    assertContains(doc("foo/bar", 1, map("likes", 1, "stars", 2)).setHasLocalMutations());
+  }
+
+  @Test
+  public void testMultipleFieldPatchesInOneBatchOnRemoteDocs() {
+    Query query = query("foo");
+    allocateQuery(query);
+    assertTargetId(2);
+
+    applyRemoteEvent(
+        addedRemoteEvent(doc("foo/bar", 1, map("likes", 0, "stars", 0)), asList(2), emptyList()));
+    assertChanged(doc("foo/bar", 1, map("likes", 0, "stars", 0)));
+    assertContains(doc("foo/bar", 1, map("likes", 0, "stars", 0)));
+
+    writeMutations(
+        Lists.newArrayList(
+            patchMutation("foo/bar", map("likes", 1)), patchMutation("foo/bar", map("stars", 1))));
+    assertChanged(doc("foo/bar", 1, map("likes", 1, "stars", 1)).setHasLocalMutations());
+    assertContains(doc("foo/bar", 1, map("likes", 1, "stars", 1)).setHasLocalMutations());
+
+    writeMutation(patchMutation("foo/bar", map("stars", 2)));
+    assertChanged(doc("foo/bar", 1, map("likes", 1, "stars", 2)).setHasLocalMutations());
+    assertContains(doc("foo/bar", 1, map("likes", 1, "stars", 2)).setHasLocalMutations());
+  }
+
+  @Test
+  public void testMultipleFieldPatchesOnLocalDocs() {
+    writeMutation(setMutation("foo/bar", map("likes", 0, "stars", 0)));
+    assertChanged(doc("foo/bar", 0, map("likes", 0, "stars", 0)).setHasLocalMutations());
+    assertContains(doc("foo/bar", 0, map("likes", 0, "stars", 0)).setHasLocalMutations());
+
+    writeMutation(patchMutation("foo/bar", map("likes", 1)));
+    assertChanged(doc("foo/bar", 0, map("likes", 1, "stars", 0)).setHasLocalMutations());
+    assertContains(doc("foo/bar", 0, map("likes", 1, "stars", 0)).setHasLocalMutations());
+
+    writeMutation(patchMutation("foo/bar", map("stars", 1)));
+    assertChanged(doc("foo/bar", 0, map("likes", 1, "stars", 1)).setHasLocalMutations());
+    assertContains(doc("foo/bar", 0, map("likes", 1, "stars", 1)).setHasLocalMutations());
+
+    writeMutation(patchMutation("foo/bar", map("stars", 2)));
+    assertChanged(doc("foo/bar", 0, map("likes", 1, "stars", 2)).setHasLocalMutations());
+    assertContains(doc("foo/bar", 0, map("likes", 1, "stars", 2)).setHasLocalMutations());
+  }
+
+  @Test
+  public void testUpdateOnRemoteDocLeadsToUpdateOverlay() {
+    Query query = query("foo");
+    allocateQuery(query);
+
+    applyRemoteEvent(updateRemoteEvent(doc("foo/baz", 10, map("a", 1)), asList(2), emptyList()));
+    applyRemoteEvent(updateRemoteEvent(doc("foo/bar", 20, map()), asList(2), emptyList()));
+    writeMutation(patchMutation("foo/baz", map("b", 2)));
+
+    resetPersistenceStats();
+
+    localStore.executeQuery(query, /* usePreviousResults= */ true);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertOverlaysRead(/* byKey= */ 0, /* byCollection= */ 1);
+    assertOverlayTypes(keyMap("foo/baz", CountingQueryEngine.OverlayType.Patch));
+  }
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/LruGarbageCollectorTestCase.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/LruGarbageCollectorTestCase.java
index 51c63dded74..cf9ced51c3d 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/LruGarbageCollectorTestCase.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/LruGarbageCollectorTestCase.java
@@ -427,6 +427,56 @@ public void testRemoveOrphanedDocumentsWithLargeNumberOfDocuments() {
     assertEquals(orphanedDocumentCount, removed);
   }
 
+  // This is a test for https://github.com/firebase/firebase-android-sdk/issues/5417
+  @Test
+  public void testRemoveRunToCompleteWhenNoDocumentsIsRemovedWithLargeNumberOfDocs() {
+    int orphanedDocumentCount =
+        SQLiteLruReferenceDelegate.REMOVE_ORPHANED_DOCUMENTS_BATCH_SIZE * 2 + 1;
+
+    persistence.runTransaction(
+        "add orphaned docs",
+        () -> {
+          for (int i = 0; i < orphanedDocumentCount; i++) {
+            MutableDocument doc = cacheADocumentInTransaction();
+            markDocumentEligibleForGcInTransaction(doc.getKey());
+            Timestamp writeTime = Timestamp.now();
+            mutationQueue.addMutationBatch(
+                writeTime,
+                Collections.emptyList(),
+                Collections.singletonList(mutation(doc.getKey())));
+          }
+        });
+
+    int removed = garbageCollector.removeOrphanedDocuments(1000);
+    assertEquals(0, removed);
+  }
+
+  @Test
+  public void testRemoveWhatCanBeRemovedWithLargeNumberOfDocs() {
+    int orphanedDocumentCount =
+        SQLiteLruReferenceDelegate.REMOVE_ORPHANED_DOCUMENTS_BATCH_SIZE * 2 + 1;
+
+    persistence.runTransaction(
+        "add orphaned docs",
+        () -> {
+          for (int i = 0; i < orphanedDocumentCount; i++) {
+            MutableDocument doc = cacheADocumentInTransaction();
+            markDocumentEligibleForGcInTransaction(doc.getKey());
+
+            if (i % 10 != 0) {
+              Timestamp writeTime = Timestamp.now();
+              mutationQueue.addMutationBatch(
+                  writeTime,
+                  Collections.emptyList(),
+                  Collections.singletonList(mutation(doc.getKey())));
+            }
+          }
+        });
+
+    int removed = garbageCollector.removeOrphanedDocuments(1000);
+    assertEquals(21, removed);
+  }
+
   @Test
   public void testRemoveTargetsThenGC() {
     // Create 3 targets, add docs to all of them
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/QueryEngineTestCase.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/QueryEngineTestCase.java
index c49f3037c2e..aedd1401c74 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/QueryEngineTestCase.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/QueryEngineTestCase.java
@@ -15,11 +15,13 @@
 package com.google.firebase.firestore.local;
 
 import static com.google.firebase.firestore.model.DocumentCollections.emptyMutableDocumentMap;
+import static com.google.firebase.firestore.testutil.TestUtil.andFilters;
 import static com.google.firebase.firestore.testutil.TestUtil.doc;
 import static com.google.firebase.firestore.testutil.TestUtil.docSet;
 import static com.google.firebase.firestore.testutil.TestUtil.filter;
 import static com.google.firebase.firestore.testutil.TestUtil.key;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
+import static com.google.firebase.firestore.testutil.TestUtil.orFilters;
 import static com.google.firebase.firestore.testutil.TestUtil.orderBy;
 import static com.google.firebase.firestore.testutil.TestUtil.query;
 import static com.google.firebase.firestore.testutil.TestUtil.version;
@@ -45,6 +47,7 @@
 import com.google.firebase.firestore.model.mutation.MutationBatch;
 import com.google.firebase.firestore.model.mutation.PatchMutation;
 import com.google.firebase.firestore.model.mutation.Precondition;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -65,6 +68,10 @@ public abstract class QueryEngineTestCase {
       doc("coll/a", 1, map("matches", true, "order", 1));
   private static final MutableDocument NON_MATCHING_DOC_A =
       doc("coll/a", 1, map("matches", false, "order", 1));
+  private static final MutableDocument PENDING_MATCHING_DOC_A =
+      doc("coll/a", 1, map("matches", true, "order", 1)).setHasLocalMutations();
+  private static final MutableDocument PENDING_NON_MATCHING_DOC_A =
+      doc("coll/a", 1, map("matches", false, "order", 1)).setHasLocalMutations();
   private static final MutableDocument UPDATED_DOC_A =
       doc("coll/a", 11, map("matches", true, "order", 1));
   private static final MutableDocument MATCHING_DOC_B =
@@ -95,7 +102,7 @@ public void setUp() {
 
     indexManager = persistence.getIndexManager(User.UNAUTHENTICATED);
     mutationQueue = persistence.getMutationQueue(User.UNAUTHENTICATED, indexManager);
-    documentOverlayCache = persistence.getDocumentOverlay(User.UNAUTHENTICATED);
+    documentOverlayCache = persistence.getDocumentOverlayCache(User.UNAUTHENTICATED);
     remoteDocumentCache = persistence.getRemoteDocumentCache();
     targetCache = persistence.getTargetCache();
     queryEngine = new QueryEngine();
@@ -193,7 +200,7 @@ private <T> T expectFullCollectionScan(Callable<T> c) throws Exception {
     }
   }
 
-  private DocumentSet runQuery(Query query, SnapshotVersion lastLimboFreeSnapshotVersion) {
+  protected DocumentSet runQuery(Query query, SnapshotVersion lastLimboFreeSnapshotVersion) {
     Preconditions.checkNotNull(
         expectFullCollectionScan,
         "Encountered runQuery() call not wrapped in expectOptimizedCollectionQuery()/expectFullCollectionQuery()");
@@ -228,7 +235,7 @@ public void filtersNonMatchingInitialResults() throws Exception {
     persistQueryMapping(MATCHING_DOC_A.getKey(), MATCHING_DOC_B.getKey());
 
     // Add a mutated document that is not yet part of query's set of remote keys.
-    addDocumentWithEventVersion(version(1), NON_MATCHING_DOC_A);
+    addDocumentWithEventVersion(version(1), PENDING_NON_MATCHING_DOC_A);
 
     DocumentSet docs =
         expectOptimizedCollectionScan(() -> runQuery(query, LAST_LIMBO_FREE_SNAPSHOT));
@@ -312,9 +319,9 @@ public void doesNotUseInitialResultsForLimitQueryWhenLastDocumentHasPendingWrite
 
     // Add a query mapping for a document that matches, but that sorts below another document due to
     // a pending write.
-    addDocumentWithEventVersion(version(1), MATCHING_DOC_A);
+    addDocumentWithEventVersion(version(1), PENDING_MATCHING_DOC_A);
     addMutation(DOC_A_EMPTY_PATCH);
-    persistQueryMapping(MATCHING_DOC_A.getKey());
+    persistQueryMapping(PENDING_MATCHING_DOC_A.getKey());
 
     addDocument(MATCHING_DOC_B);
 
@@ -333,9 +340,9 @@ public void doesNotUseInitialResultsForLimitToLastQueryWhenLastDocumentHasPendin
 
     // Add a query mapping for a document that matches, but that sorts below another document due to
     // a pending write.
-    addDocumentWithEventVersion(version(1), MATCHING_DOC_A);
+    addDocumentWithEventVersion(version(1), PENDING_MATCHING_DOC_A);
     addMutation(DOC_A_EMPTY_PATCH);
-    persistQueryMapping(MATCHING_DOC_A.getKey());
+    persistQueryMapping(PENDING_MATCHING_DOC_A.getKey());
 
     addDocument(MATCHING_DOC_B);
 
@@ -344,7 +351,7 @@ public void doesNotUseInitialResultsForLimitToLastQueryWhenLastDocumentHasPendin
   }
 
   @Test
-  public void doesNotUseInitialResultsForLimitQueryWhenLastDocumentHasBeenUpdatedOutOfBand()
+  public void doesNotUseInitialResultsForLimitQueryWhenLastDocumentUpdatedOutOfBand()
       throws Exception {
     Query query =
         query("coll")
@@ -364,7 +371,7 @@ public void doesNotUseInitialResultsForLimitQueryWhenLastDocumentHasBeenUpdatedO
   }
 
   @Test
-  public void doesNotUseInitialResultsForLimitToLastQueryWhenFirstDocumentHasBeenUpdatedOutOfBand()
+  public void doesNotUseInitialResultsForLimitToLastWhenLastDocumentUpdatedOutOfBand()
       throws Exception {
     Query query =
         query("coll")
@@ -427,4 +434,412 @@ public void doesNotIncludeDocumentsDeletedByMutation() throws Exception {
                     targetCache.getMatchingKeysForTargetId(TEST_TARGET_ID)));
     assertEquals(emptyMutableDocumentMap().insert(MATCHING_DOC_A.getKey(), MATCHING_DOC_A), docs);
   }
+
+  @Test
+  public void canPerformOrQueriesUsingFullCollectionScan() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", 0));
+    MutableDocument doc2 = doc("coll/2", 1, map("a", 2, "b", 1));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", 2));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", 3));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1, "b", 1));
+    addDocument(doc1, doc2, doc3, doc4, doc5);
+
+    // Two equalities: a==1 || b==1.
+    Query query1 = query("coll").filter(orFilters(filter("a", "==", 1), filter("b", "==", 1)));
+    DocumentSet result1 =
+        expectFullCollectionScan(() -> runQuery(query1, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query1.comparator(), doc1, doc2, doc4, doc5), result1);
+
+    // with one inequality: a>2 || b==1.
+    Query query2 = query("coll").filter(orFilters(filter("a", ">", 2), filter("b", "==", 1)));
+    DocumentSet result2 =
+        expectFullCollectionScan(() -> runQuery(query2, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query2.comparator(), doc2, doc3, doc5), result2);
+
+    // (a==1 && b==0) || (a==3 && b==2)
+    Query query3 =
+        query("coll")
+            .filter(
+                orFilters(
+                    andFilters(filter("a", "==", 1), filter("b", "==", 0)),
+                    andFilters(filter("a", "==", 3), filter("b", "==", 2))));
+    DocumentSet result3 =
+        expectFullCollectionScan(() -> runQuery(query3, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query3.comparator(), doc1, doc3), result3);
+
+    // a==1 && (b==0 || b==3).
+    Query query4 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "==", 1), orFilters(filter("b", "==", 0), filter("b", "==", 3))));
+    DocumentSet result4 =
+        expectFullCollectionScan(() -> runQuery(query4, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query4.comparator(), doc1, doc4), result4);
+
+    // (a==2 || b==2) && (a==3 || b==3)
+    Query query5 =
+        query("coll")
+            .filter(
+                andFilters(
+                    orFilters(filter("a", "==", 2), filter("b", "==", 2)),
+                    orFilters(filter("a", "==", 3), filter("b", "==", 3))));
+    DocumentSet result5 =
+        expectFullCollectionScan(() -> runQuery(query5, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query5.comparator(), doc3), result5);
+
+    // Test with limits (implicit order by ASC): (a==1) || (b > 0) LIMIT 2
+    Query query6 =
+        query("coll").filter(orFilters(filter("a", "==", 1), filter("b", ">", 0))).limitToFirst(2);
+    DocumentSet result6 =
+        expectFullCollectionScan(() -> runQuery(query6, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query6.comparator(), doc1, doc2), result6);
+
+    // Test with limits (implicit order by DESC): (a==1) || (b > 0) LIMIT_TO_LAST 2
+    Query query7 =
+        query("coll").filter(orFilters(filter("a", "==", 1), filter("b", ">", 0))).limitToLast(2);
+    DocumentSet result7 =
+        expectFullCollectionScan(() -> runQuery(query7, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query7.comparator(), doc3, doc4), result7);
+
+    // Test with limits (explicit order by ASC): (a==2) || (b == 1) ORDER BY a LIMIT 1
+    Query query8 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 2), filter("b", "==", 1)))
+            .limitToFirst(1)
+            .orderBy(orderBy("a", "asc"));
+    DocumentSet result8 =
+        expectFullCollectionScan(() -> runQuery(query8, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query8.comparator(), doc5), result8);
+
+    // Test with limits (explicit order by DESC): (a==2) || (b == 1) ORDER BY a LIMIT_TO_LAST 1
+    Query query9 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 2), filter("b", "==", 1)))
+            .limitToLast(1)
+            .orderBy(orderBy("a", "asc"));
+    DocumentSet result9 =
+        expectFullCollectionScan(() -> runQuery(query9, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query9.comparator(), doc2), result9);
+
+    // Test with limits without orderBy (the __name__ ordering is the tie breaker).
+    Query query10 =
+        query("coll").filter(orFilters(filter("a", "==", 2), filter("b", "==", 1))).limitToFirst(1);
+    DocumentSet result10 = expectFullCollectionScan(() -> runQuery(query10, SnapshotVersion.NONE));
+    assertEquals(docSet(query10.comparator(), doc2), result10);
+  }
+
+  @Test
+  public void orQueryDoesNotIncludeDocumentsWithMissingFields() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", 0));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", 1));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", 2));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", 3));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+
+    // Query: a==1 || b==1 order by a.
+    // doc2 should not be included because it's missing the field 'a', and we have "orderBy a".
+    Query query1 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 1), filter("b", "==", 1)))
+            .orderBy(orderBy("a", "asc"));
+    DocumentSet result1 =
+        expectFullCollectionScan(() -> runQuery(query1, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query1.comparator(), doc1, doc4, doc5), result1);
+
+    // Query: a==1 || b==1 order by b.
+    // doc5 should not be included because it's missing the field 'b', and we have "orderBy b".
+    Query query2 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 1), filter("b", "==", 1)))
+            .orderBy(orderBy("b", "asc"));
+    DocumentSet result2 =
+        expectFullCollectionScan(() -> runQuery(query2, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query2.comparator(), doc1, doc2, doc4), result2);
+
+    // Query: a>2 || b==1.
+    // This query has an implicit 'order by a'.
+    // doc2 should not be included because it's missing the field 'a'.
+    Query query3 = query("coll").filter(orFilters(filter("a", ">", 2), filter("b", "==", 1)));
+    DocumentSet result3 =
+        expectFullCollectionScan(() -> runQuery(query3, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query3.comparator(), doc3), result3);
+
+    // Query: a>1 || b==1 order by a order by b.
+    // doc6 should not be included because it's missing the field 'b'.
+    // doc2 should not be included because it's missing the field 'a'.
+    Query query4 =
+        query("coll")
+            .filter(orFilters(filter("a", ">", 1), filter("b", "==", 1)))
+            .orderBy(orderBy("a", "asc"))
+            .orderBy(orderBy("b", "asc"));
+    DocumentSet result4 =
+        expectFullCollectionScan(() -> runQuery(query4, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query4.comparator(), doc3), result4);
+
+    // Query: a==1 || b==1
+    // There's no explicit nor implicit orderBy. Documents with missing 'a' or missing 'b' should be
+    // allowed if the document matches at least one disjunction term.
+    Query query5 = query("coll").filter(orFilters(filter("a", "==", 1), filter("b", "==", 1)));
+    DocumentSet result5 =
+        expectFullCollectionScan(() -> runQuery(query5, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query5.comparator(), doc1, doc2, doc4, doc5), result5);
+  }
+
+  @Test
+  public void orQueryWithInAndNotIn() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", 0));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", 1));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", 2));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", 3));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+
+    Query query1 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 2), filter("b", "in", Arrays.asList(2, 3))));
+    DocumentSet result1 =
+        expectFullCollectionScan(() -> runQuery(query1, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query1.comparator(), doc3, doc4, doc6), result1);
+
+    // a==2 || (b != 2 && b != 3)
+    // Has implicit "orderBy b"
+    Query query2 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 2), filter("b", "not-in", Arrays.asList(2, 3))));
+    DocumentSet result2 =
+        expectFullCollectionScan(() -> runQuery(query2, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query2.comparator(), doc1, doc2), result2);
+  }
+
+  @Test
+  public void orQueryWithArrayMembership() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", Arrays.asList(0)));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", Arrays.asList(1)));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", Arrays.asList(2, 7)));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", Arrays.asList(3, 7)));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+
+    Query query1 =
+        query("coll").filter(orFilters(filter("a", "==", 2), filter("b", "array-contains", 7)));
+    DocumentSet result1 =
+        expectFullCollectionScan(() -> runQuery(query1, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query1.comparator(), doc3, doc4, doc6), result1);
+
+    Query query2 =
+        query("coll")
+            .filter(
+                orFilters(
+                    filter("a", "==", 2), filter("b", "array-contains-any", Arrays.asList(0, 3))));
+    DocumentSet result2 =
+        expectFullCollectionScan(() -> runQuery(query2, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query2.comparator(), doc1, doc4, doc6), result2);
+  }
+
+  @Test
+  public void queryWithMultipleInsOnTheSameField() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", 0));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", 1));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", 2));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", 3));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+
+    // a IN [1,2,3] && a IN [0,1,4] should result in "a==1".
+    Query query1 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(1, 2, 3)),
+                    filter("a", "in", Arrays.asList(0, 1, 4))));
+    DocumentSet result1 =
+        expectFullCollectionScan(() -> runQuery(query1, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query1.comparator(), doc1, doc4, doc5), result1);
+
+    // a IN [2,3] && a IN [0,1,4] is never true and so the result should be an empty set.
+    Query query2 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    filter("a", "in", Arrays.asList(0, 1, 4))));
+    DocumentSet result2 =
+        expectFullCollectionScan(() -> runQuery(query2, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query2.comparator()), result2);
+
+    // a IN [0,3] || a IN [0,2] should union them (similar to: a IN [0,2,3]).
+    Query query3 =
+        query("coll")
+            .filter(
+                orFilters(
+                    filter("a", "in", Arrays.asList(0, 3)),
+                    filter("a", "in", Arrays.asList(0, 2))));
+
+    DocumentSet result3 =
+        expectFullCollectionScan(() -> runQuery(query3, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query3.comparator(), doc3, doc6), result3);
+  }
+
+  @Test
+  public void queryWithMultipleInsOnDifferentFields() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", 0));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", 1));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", 2));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", 3));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+
+    Query query1 =
+        query("coll")
+            .filter(
+                orFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    filter("b", "in", Arrays.asList(0, 2))));
+    DocumentSet result1 =
+        expectFullCollectionScan(() -> runQuery(query1, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query1.comparator(), doc1, doc3, doc6), result1);
+
+    Query query2 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    filter("b", "in", Arrays.asList(0, 2))));
+    DocumentSet result2 =
+        expectFullCollectionScan(() -> runQuery(query2, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query2.comparator(), doc3), result2);
+  }
+
+  @Test
+  public void queryInWithArrayContainsAny() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", Arrays.asList(0)));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", Arrays.asList(1)));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", Arrays.asList(2, 7), "c", 10));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", Arrays.asList(3, 7)));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2, "c", 20));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+
+    Query query1 =
+        query("coll")
+            .filter(
+                orFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    filter("b", "array-contains-any", Arrays.asList(0, 7))));
+    DocumentSet result1 =
+        expectFullCollectionScan(() -> runQuery(query1, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query1.comparator(), doc1, doc3, doc4, doc6), result1);
+
+    Query query2 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    filter("b", "array-contains-any", Arrays.asList(0, 7))));
+
+    DocumentSet result2 =
+        expectFullCollectionScan(() -> runQuery(query2, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query2.comparator(), doc3), result2);
+
+    Query query3 =
+        query("coll")
+            .filter(
+                orFilters(
+                    andFilters(filter("a", "in", Arrays.asList(2, 3)), filter("c", "==", 10)),
+                    filter("b", "array-contains-any", Arrays.asList(0, 7))));
+    DocumentSet result3 =
+        expectFullCollectionScan(() -> runQuery(query3, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query3.comparator(), doc1, doc3, doc4), result3);
+
+    Query query4 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    orFilters(
+                        filter("b", "array-contains-any", Arrays.asList(0, 7)),
+                        filter("c", "==", 20))));
+    DocumentSet result4 =
+        expectFullCollectionScan(() -> runQuery(query4, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query4.comparator(), doc3, doc6), result4);
+  }
+
+  @Test
+  public void queryInWithArrayContains() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", Arrays.asList(0)));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", Arrays.asList(1)));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", Arrays.asList(2, 7), "c", 10));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", Arrays.asList(3, 7)));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2, "c", 20));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+
+    Query query1 =
+        query("coll")
+            .filter(
+                orFilters(
+                    filter("a", "in", Arrays.asList(2, 3)), filter("b", "array-contains", 3)));
+    DocumentSet result1 =
+        expectFullCollectionScan(() -> runQuery(query1, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query1.comparator(), doc3, doc4, doc6), result1);
+
+    Query query2 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(2, 3)), filter("b", "array-contains", 7)));
+
+    DocumentSet result2 =
+        expectFullCollectionScan(() -> runQuery(query2, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query2.comparator(), doc3), result2);
+
+    Query query3 =
+        query("coll")
+            .filter(
+                orFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    andFilters(filter("b", "array-contains", 3), filter("a", "==", 1))));
+    DocumentSet result3 =
+        expectFullCollectionScan(() -> runQuery(query3, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query3.comparator(), doc3, doc4, doc6), result3);
+
+    Query query4 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    orFilters(filter("b", "array-contains", 7), filter("a", "==", 1))));
+    DocumentSet result4 =
+        expectFullCollectionScan(() -> runQuery(query4, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query4.comparator(), doc3), result4);
+  }
+
+  @Test
+  public void orderByEquality() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", Arrays.asList(0)));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", Arrays.asList(1)));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", Arrays.asList(2, 7), "c", 10));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", Arrays.asList(3, 7)));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2, "c", 20));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+
+    Query query1 = query("coll").filter(filter("a", "==", 1)).orderBy(orderBy("a"));
+    DocumentSet result1 =
+        expectFullCollectionScan(() -> runQuery(query1, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query1.comparator(), doc1, doc4, doc5), result1);
+
+    Query query2 =
+        query("coll").filter(filter("a", "in", Arrays.asList(2, 3))).orderBy(orderBy("a"));
+    DocumentSet result2 =
+        expectFullCollectionScan(() -> runQuery(query2, MISSING_LAST_LIMBO_FREE_SNAPSHOT));
+    assertEquals(docSet(query2.comparator(), doc6, doc3), result2);
+  }
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/RemoteDocumentCacheTestCase.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/RemoteDocumentCacheTestCase.java
index 5253a52a1dd..dae151e7e90 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/RemoteDocumentCacheTestCase.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/RemoteDocumentCacheTestCase.java
@@ -18,9 +18,11 @@
 import static com.google.firebase.firestore.testutil.TestUtil.assertDoesNotThrow;
 import static com.google.firebase.firestore.testutil.TestUtil.deletedDoc;
 import static com.google.firebase.firestore.testutil.TestUtil.doc;
+import static com.google.firebase.firestore.testutil.TestUtil.filter;
 import static com.google.firebase.firestore.testutil.TestUtil.key;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
 import static com.google.firebase.firestore.testutil.TestUtil.path;
+import static com.google.firebase.firestore.testutil.TestUtil.query;
 import static com.google.firebase.firestore.testutil.TestUtil.version;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -30,12 +32,12 @@
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.FieldIndex.IndexOffset;
 import com.google.firebase.firestore.model.MutableDocument;
-import com.google.firebase.firestore.model.ResourcePath;
 import com.google.firebase.firestore.model.SnapshotVersion;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import org.junit.After;
@@ -179,9 +181,9 @@ public void testGetAllFromCollection() {
     addTestDocumentAtPath("b/2");
     addTestDocumentAtPath("c/1");
 
-    ResourcePath collection = path("b");
     Map<DocumentKey, MutableDocument> results =
-        remoteDocumentCache.getAll(collection, IndexOffset.NONE);
+        remoteDocumentCache.getDocumentsMatchingQuery(
+            query("b"), IndexOffset.NONE, new HashSet<DocumentKey>());
     assertThat(results.values())
         .containsExactly(doc("b/1", 42, DOC_DATA), doc("b/2", 42, DOC_DATA));
   }
@@ -192,9 +194,9 @@ public void testGetAllFromExcludesSubcollections() {
     addTestDocumentAtPath("a/1/b/1");
     addTestDocumentAtPath("a/2");
 
-    ResourcePath collection = path("a");
     Map<DocumentKey, MutableDocument> results =
-        remoteDocumentCache.getAll(collection, IndexOffset.NONE);
+        remoteDocumentCache.getDocumentsMatchingQuery(
+            query("a"), IndexOffset.NONE, new HashSet<DocumentKey>());
     assertThat(results.values())
         .containsExactly(doc("a/1", 42, DOC_DATA), doc("a/2", 42, DOC_DATA));
   }
@@ -205,9 +207,9 @@ public void testGetAllFromSinceReadTimeAndSeconds() {
     addTestDocumentAtPath("b/current", /* updateTime= */ 2, /*  readTime= = */ 12);
     addTestDocumentAtPath("b/new", /* updateTime= */ 3, /*  readTime= = */ 13);
 
-    ResourcePath collection = path("b");
     Map<DocumentKey, MutableDocument> results =
-        remoteDocumentCache.getAll(collection, IndexOffset.createSuccessor(version(12), -1));
+        remoteDocumentCache.getDocumentsMatchingQuery(
+            query("b"), IndexOffset.createSuccessor(version(12), -1), new HashSet<DocumentKey>());
     assertThat(results.values()).containsExactly(doc("b/new", 3, DOC_DATA));
   }
 
@@ -217,9 +219,9 @@ public void testGetAllFromSinceReadTimeAndNanoseconds() {
     add(doc("b/current", 1, DOC_DATA), version(1, 2));
     add(doc("b/new", 1, DOC_DATA), version(1, 3));
 
-    ResourcePath collection = path("b");
     Map<DocumentKey, MutableDocument> results =
-        remoteDocumentCache.getAll(collection, IndexOffset.createSuccessor(version(1, 2), -1));
+        remoteDocumentCache.getDocumentsMatchingQuery(
+            query("b"), IndexOffset.createSuccessor(version(1, 2), -1), new HashSet<DocumentKey>());
     assertThat(results.values()).containsExactly(doc("b/new", 1, DOC_DATA));
   }
 
@@ -230,9 +232,11 @@ public void testGetAllFromSinceReadTimeAndDocumentKey() {
     addTestDocumentAtPath("b/c", /* updateTime= */ 3, /*  readTime= = */ 11);
     addTestDocumentAtPath("b/d", /* updateTime= */ 4, /*  readTime= = */ 12);
 
-    ResourcePath collection = path("b");
     Map<DocumentKey, MutableDocument> results =
-        remoteDocumentCache.getAll(collection, IndexOffset.create(version(11), key("b/b"), -1));
+        remoteDocumentCache.getDocumentsMatchingQuery(
+            query("b"),
+            IndexOffset.create(version(11), key("b/b"), -1),
+            new HashSet<DocumentKey>());
     assertThat(results.values()).containsExactly(doc("b/c", 3, DOC_DATA), doc("b/d", 4, DOC_DATA));
   }
 
@@ -241,12 +245,39 @@ public void testGetAllFromUsesReadTimeNotUpdateTime() {
     addTestDocumentAtPath("b/old", /* updateTime= */ 1, /* readTime= */ 2);
     addTestDocumentAtPath("b/new", /* updateTime= */ 2, /* readTime= */ 1);
 
-    ResourcePath collection = path("b");
     Map<DocumentKey, MutableDocument> results =
-        remoteDocumentCache.getAll(collection, IndexOffset.createSuccessor(version(1), -1));
+        remoteDocumentCache.getDocumentsMatchingQuery(
+            query("b"), IndexOffset.createSuccessor(version(1), -1), new HashSet<DocumentKey>());
     assertThat(results.values()).containsExactly(doc("b/old", 1, DOC_DATA));
   }
 
+  @Test
+  public void testGetMatchingDocsAppliesQueryCheck() {
+    addTestDocumentAtPath("a/1", 1, 1, map("matches", true));
+    addTestDocumentAtPath("a/2", 1, 2, map("matches", true));
+    addTestDocumentAtPath("a/3", 1, 3, map("matches", false));
+
+    Map<DocumentKey, MutableDocument> results =
+        remoteDocumentCache.getDocumentsMatchingQuery(
+            query("a").filter(filter("matches", "==", true)),
+            IndexOffset.createSuccessor(version(1), -1),
+            new HashSet<DocumentKey>());
+    assertThat(results.values()).containsExactly(doc("a/2", 1, map("matches", true)));
+  }
+
+  @Test
+  public void testGetMatchingDocsRespectsMutatedDocs() {
+    addTestDocumentAtPath("a/1", 1, 1, map("matches", true));
+    addTestDocumentAtPath("a/2", 1, 2, map("matches", false));
+
+    Map<DocumentKey, MutableDocument> results =
+        remoteDocumentCache.getDocumentsMatchingQuery(
+            query("a").filter(filter("matches", "==", true)),
+            IndexOffset.createSuccessor(version(1), -1),
+            new HashSet<DocumentKey>(Collections.singletonList(key("a/2"))));
+    assertThat(results.values()).containsExactly(doc("a/2", 1, map("matches", false)));
+  }
+
   protected MutableDocument addTestDocumentAtPath(String path) {
     return addTestDocumentAtPath(path, 42, 42);
   }
@@ -256,7 +287,12 @@ protected MutableDocument addTestDocumentAtPath(DocumentKey key) {
   }
 
   protected MutableDocument addTestDocumentAtPath(String path, int updateTime, int readTime) {
-    MutableDocument doc = doc(path, updateTime, map("data", 2));
+    return addTestDocumentAtPath(path, updateTime, readTime, map("data", 2));
+  }
+
+  protected MutableDocument addTestDocumentAtPath(
+      String path, int updateTime, int readTime, Map<String, Object> data) {
+    MutableDocument doc = doc(path, updateTime, data);
     add(doc, version(readTime));
     return doc;
   }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteIndexManagerTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteIndexManagerTest.java
index d7b5eb24ed9..57b0fc36ae4 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteIndexManagerTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteIndexManagerTest.java
@@ -17,6 +17,7 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.google.firebase.firestore.model.FieldIndex.IndexState;
 import static com.google.firebase.firestore.model.FieldIndex.Segment.Kind;
+import static com.google.firebase.firestore.testutil.TestUtil.andFilters;
 import static com.google.firebase.firestore.testutil.TestUtil.bound;
 import static com.google.firebase.firestore.testutil.TestUtil.deletedDoc;
 import static com.google.firebase.firestore.testutil.TestUtil.doc;
@@ -25,6 +26,7 @@
 import static com.google.firebase.firestore.testutil.TestUtil.filter;
 import static com.google.firebase.firestore.testutil.TestUtil.key;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
+import static com.google.firebase.firestore.testutil.TestUtil.orFilters;
 import static com.google.firebase.firestore.testutil.TestUtil.orderBy;
 import static com.google.firebase.firestore.testutil.TestUtil.path;
 import static com.google.firebase.firestore.testutil.TestUtil.query;
@@ -43,6 +45,7 @@
 import com.google.firebase.firestore.model.FieldIndex;
 import com.google.firebase.firestore.model.FieldIndex.IndexOffset;
 import com.google.firebase.firestore.model.Values;
+import com.google.firebase.firestore.testutil.TestUtil;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -74,6 +77,19 @@ private void setUpArrayValueFilter() {
     addDoc("coll/arr3", map("values", Arrays.asList(7, 8, 9)));
   }
 
+  private void setUpMultipleOrderBys() {
+    indexManager.addFieldIndex(
+        fieldIndex("coll", "a", Kind.ASCENDING, "b", Kind.DESCENDING, "c", Kind.ASCENDING));
+    indexManager.addFieldIndex(
+        fieldIndex("coll", "a", Kind.DESCENDING, "b", Kind.ASCENDING, "c", Kind.DESCENDING));
+    addDoc("coll/val1", map("a", 1, "b", 1, "c", 3));
+    addDoc("coll/val2", map("a", 2, "b", 2, "c", 2));
+    addDoc("coll/val3", map("a", 2, "b", 2, "c", 3));
+    addDoc("coll/val4", map("a", 2, "b", 2, "c", 4));
+    addDoc("coll/val5", map("a", 2, "b", 2, "c", 5));
+    addDoc("coll/val6", map("a", 3, "b", 3, "c", 6));
+  }
+
   @Override
   Persistence getPersistence() {
     if (persistence == null) {
@@ -83,7 +99,7 @@ Persistence getPersistence() {
   }
 
   @Test
-  public void addsDocuments() {
+  public void testAddsDocuments() {
     indexManager.addFieldIndex(fieldIndex("coll", "exists", Kind.ASCENDING));
     addDoc("coll/doc1", map("exists", 1));
     addDoc("coll/doc2", map());
@@ -99,6 +115,117 @@ public void testOrderByFilter() {
     verifyResults(query, "coll/val1", "coll/val3");
   }
 
+  @Test
+  public void testOrderByKeyFilter() {
+    indexManager.addFieldIndex(fieldIndex("coll", "count", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "count", Kind.DESCENDING));
+    addDoc("coll/val1", map("count", 1));
+    addDoc("coll/val2", map("count", 1));
+    addDoc("coll/val3", map("count", 3));
+
+    Query query = query("coll").orderBy(orderBy("count"));
+    verifyResults(query, "coll/val1", "coll/val2", "coll/val3");
+
+    query = query("coll").orderBy(orderBy("count", "desc"));
+    verifyResults(query, "coll/val3", "coll/val2", "coll/val1");
+  }
+
+  @Test
+  public void testAscendingOrderWithLessThanFilter() {
+    setUpMultipleOrderBys();
+
+    Query originalQuery =
+        query("coll")
+            .filter(filter("a", "==", 2))
+            .filter(filter("b", "==", 2))
+            .filter(filter("c", "<", 5))
+            .orderBy(orderBy("c", "asc"));
+    Query queryWithNonRestrictedBound =
+        originalQuery
+            .startAt(bound(/* inclusive= */ false, 1))
+            .endAt(bound(/* inclusive= */ false, 6));
+    Query queryWithRestrictedBound =
+        originalQuery
+            .startAt(bound(/* inclusive= */ false, 2))
+            .endAt(bound(/* inclusive= */ false, 4));
+
+    verifyResults(originalQuery, "coll/val2", "coll/val3", "coll/val4");
+    verifyResults(queryWithNonRestrictedBound, "coll/val2", "coll/val3", "coll/val4");
+    verifyResults(queryWithRestrictedBound, "coll/val3");
+  }
+
+  @Test
+  public void testDescendingOrderWithLessThanFilter() {
+    setUpMultipleOrderBys();
+
+    Query originalQuery =
+        query("coll")
+            .filter(filter("a", "==", 2))
+            .filter(filter("b", "==", 2))
+            .filter(filter("c", "<", 5))
+            .orderBy(orderBy("c", "desc"));
+    Query queryWithNonRestrictedBound =
+        originalQuery
+            .startAt(bound(/* inclusive= */ false, 6))
+            .endAt(bound(/* inclusive= */ false, 1));
+    Query queryWithRestrictedBound =
+        originalQuery
+            .startAt(bound(/* inclusive= */ false, 4))
+            .endAt(bound(/* inclusive= */ false, 2));
+
+    verifyResults(originalQuery, "coll/val4", "coll/val3", "coll/val2");
+    verifyResults(queryWithNonRestrictedBound, "coll/val4", "coll/val3", "coll/val2");
+    verifyResults(queryWithRestrictedBound, "coll/val3");
+  }
+
+  @Test
+  public void testAscendingOrderWithGreaterThanFilter() {
+    setUpMultipleOrderBys();
+
+    Query originalQuery =
+        query("coll")
+            .filter(filter("a", "==", 2))
+            .filter(filter("b", "==", 2))
+            .filter(filter("c", ">", 2))
+            .orderBy(orderBy("c", "asc"));
+    Query queryWithNonRestrictedBound =
+        originalQuery
+            .startAt(bound(/* inclusive= */ false, 2))
+            .endAt(bound(/* inclusive= */ false, 6));
+    Query queryWithRestrictedBound =
+        originalQuery
+            .startAt(bound(/* inclusive= */ false, 3))
+            .endAt(bound(/* inclusive= */ false, 5));
+
+    verifyResults(originalQuery, "coll/val3", "coll/val4", "coll/val5");
+    verifyResults(queryWithNonRestrictedBound, "coll/val3", "coll/val4", "coll/val5");
+    verifyResults(queryWithRestrictedBound, "coll/val4");
+  }
+
+  @Test
+  public void testDescendingOrderWithGreaterThanFilter() {
+    setUpMultipleOrderBys();
+
+    Query originalQuery =
+        query("coll")
+            .filter(filter("a", "==", 2))
+            .filter(filter("b", "==", 2))
+            .filter(filter("c", ">", 2))
+            .orderBy(orderBy("c", "desc"));
+    Query queryWithNonRestrictedBound =
+        originalQuery
+            .startAt(bound(/* inclusive= */ false, 6))
+            .endAt(bound(/* inclusive= */ false, 2));
+    Query queryWithRestrictedBound =
+        originalQuery
+            .startAt(bound(/* inclusive= */ false, 5))
+            .endAt(bound(/* inclusive= */ false, 3));
+
+    verifyResults(originalQuery, "coll/val5", "coll/val4", "coll/val3");
+    verifyResults(queryWithNonRestrictedBound, "coll/val5", "coll/val4", "coll/val3");
+    verifyResults(queryWithRestrictedBound, "coll/val4");
+  }
+
   @Test
   public void testEqualityFilter() {
     setUpSingleValueFilter();
@@ -399,7 +526,7 @@ public void testArrayContainsDoesNotMatchNonArray() {
   public void testNoMatchingFilter() {
     setUpSingleValueFilter();
     Query query = query("coll").filter(filter("unknown", "==", true));
-    assertNull(indexManager.getFieldIndex(query.toTarget()));
+    assertEquals(indexManager.getIndexType(query.toTarget()), IndexManager.IndexType.NONE);
     assertNull(indexManager.getDocumentsMatchingTarget(query.toTarget()));
   }
 
@@ -478,6 +605,67 @@ public void testIndexEntriesAreUpdatedWithDeletedDoc() {
     verifyResults(query);
   }
 
+  @Test
+  public void testCursorsDoNoExpandResultSet() {
+    indexManager.addFieldIndex(fieldIndex("coll", "c", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "c", Kind.DESCENDING));
+
+    addDoc("coll/val1", map("a", 1, "b", 1, "c", 3));
+    addDoc("coll/val2", map("a", 2, "b", 2, "c", 2));
+
+    Query query =
+        query("coll").filter(filter("c", ">", 2)).orderBy(orderBy("c")).startAt(bound(true, 2));
+    verifyResults(query, "coll/val1");
+
+    query =
+        query("coll")
+            .filter(filter("c", "<", 3))
+            .orderBy(orderBy("c", "desc"))
+            .startAt(bound(true, 3));
+    verifyResults(query, "coll/val2");
+  }
+
+  @Test
+  public void testFiltersOnTheSameField() {
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING, "b", Kind.ASCENDING));
+
+    addDoc("coll/val1", map("a", 1, "b", 1));
+    addDoc("coll/val2", map("a", 2, "b", 2));
+    addDoc("coll/val3", map("a", 3, "b", 3));
+    addDoc("coll/val4", map("a", 4, "b", 4));
+
+    Query query = query("coll").filter(filter("a", ">", 1)).filter(filter("a", "==", 2));
+    verifyResults(query, "coll/val2");
+
+    query = query("coll").filter(filter("a", "<=", 1)).filter(filter("a", "==", 2));
+    verifyResults(query);
+
+    query =
+        query("coll")
+            .filter(filter("a", ">", 1))
+            .filter(filter("a", "==", 2))
+            .orderBy(orderBy("a"))
+            .orderBy(orderBy(DocumentKey.KEY_FIELD_NAME));
+    verifyResults(query, "coll/val2");
+
+    query =
+        query("coll")
+            .filter(filter("a", ">", 1))
+            .filter(filter("a", "==", 2))
+            .orderBy(orderBy("a"))
+            .orderBy(orderBy(DocumentKey.KEY_FIELD_NAME, "desc"));
+    verifyResults(query, "coll/val2");
+
+    query =
+        query("coll")
+            .filter(filter("a", ">", 1))
+            .filter(filter("a", "==", 3))
+            .orderBy(orderBy("a"))
+            .orderBy(orderBy("b"));
+    verifyResults(query, "coll/val3");
+  }
+
   @Test
   public void testAdvancedQueries() {
     // This test compares local query results with those received from the Java Server SDK.
@@ -588,9 +776,9 @@ public void testAdvancedQueries() {
     verifyResults(
         q.filter(filter("array", "array-contains-any", Arrays.asList(1, "foo"))),
         "coll/{array:[1,foo],int:1}",
+        "coll/{array:[1]}",
         "coll/{array:[2,foo]}",
-        "coll/{array:[3,foo],int:3}",
-        "coll/{array:[1]}");
+        "coll/{array:[3,foo],int:3}");
     verifyResults(q.filter(filter("multi", ">=", true)), "coll/{multi:true}");
     verifyResults(q.filter(filter("multi", ">=", 0)), "coll/{multi:1}");
     verifyResults(q.filter(filter("multi", ">=", "")), "coll/{multi:string}");
@@ -615,8 +803,8 @@ public void testAdvancedQueries() {
     verifyResults(
         q.orderBy(orderBy("array", "desc")).startAt(bound(true, Collections.singletonList(2))),
         "coll/{array:[1,foo],int:1}",
-        "coll/{array:foo}",
-        "coll/{array:[1]}");
+        "coll/{array:[1]}",
+        "coll/{array:foo}");
     verifyResults(
         q.orderBy(orderBy("array", "desc"))
             .startAt(bound(true, Collections.singletonList(2)))
@@ -630,8 +818,8 @@ public void testAdvancedQueries() {
     verifyResults(
         q.orderBy(orderBy("array", "desc")).startAt(bound(false, Collections.singletonList(2))),
         "coll/{array:[1,foo],int:1}",
-        "coll/{array:foo}",
-        "coll/{array:[1]}");
+        "coll/{array:[1]}",
+        "coll/{array:foo}");
     verifyResults(
         q.orderBy(orderBy("array", "desc"))
             .startAt(bound(false, Collections.singletonList(2)))
@@ -644,8 +832,8 @@ public void testAdvancedQueries() {
     verifyResults(
         q.orderBy(orderBy("array", "desc")).startAt(bound(false, Arrays.asList(2, "foo"))),
         "coll/{array:[1,foo],int:1}",
-        "coll/{array:foo}",
-        "coll/{array:[1]}");
+        "coll/{array:[1]}",
+        "coll/{array:foo}");
     verifyResults(
         q.orderBy(orderBy("array", "desc"))
             .startAt(bound(false, Arrays.asList(2, "foo")))
@@ -654,18 +842,18 @@ public void testAdvancedQueries() {
         "coll/{array:[1]}");
     verifyResults(
         q.orderBy(orderBy("array")).endAt(bound(true, Collections.singletonList(2))),
-        "coll/{array:[1,foo],int:1}",
         "coll/{array:foo}",
-        "coll/{array:[1]}");
+        "coll/{array:[1]}",
+        "coll/{array:[1,foo],int:1}");
     verifyResults(
         q.orderBy(orderBy("array", "desc")).endAt(bound(true, Collections.singletonList(2))),
-        "coll/{array:[2,foo]}",
-        "coll/{array:[3,foo],int:3}");
+        "coll/{array:[3,foo],int:3}",
+        "coll/{array:[2,foo]}");
     verifyResults(
         q.orderBy(orderBy("array")).endAt(bound(false, Collections.singletonList(2))),
-        "coll/{array:[1,foo],int:1}",
         "coll/{array:foo}",
-        "coll/{array:[1]}");
+        "coll/{array:[1]}",
+        "coll/{array:[1,foo],int:1}");
     verifyResults(
         q.orderBy(orderBy("array"))
             .endAt(bound(false, Collections.singletonList(2)))
@@ -674,13 +862,13 @@ public void testAdvancedQueries() {
         "coll/{array:[1]}");
     verifyResults(
         q.orderBy(orderBy("array", "desc")).endAt(bound(false, Collections.singletonList(2))),
-        "coll/{array:[2,foo]}",
-        "coll/{array:[3,foo],int:3}");
+        "coll/{array:[3,foo],int:3}",
+        "coll/{array:[2,foo]}");
     verifyResults(
         q.orderBy(orderBy("array")).endAt(bound(false, Arrays.asList(2, "foo"))),
-        "coll/{array:[1,foo],int:1}",
         "coll/{array:foo}",
-        "coll/{array:[1]}");
+        "coll/{array:[1]}",
+        "coll/{array:[1,foo],int:1}");
     verifyResults(
         q.orderBy(orderBy("array")).endAt(bound(false, Arrays.asList(2, "foo"))).limitToFirst(2),
         "coll/{array:foo}",
@@ -731,10 +919,10 @@ public void testAdvancedQueries() {
     verifyResults(
         q.orderBy(orderBy("map")),
         "coll/{map:{}}",
-        "coll/{map:{field:true}}",
-        "coll/{map:{field:false}}");
+        "coll/{map:{field:false}}",
+        "coll/{map:{field:true}}");
     verifyResults(
-        q.orderBy(orderBy("map.field")), "coll/{map:{field:true}}", "coll/{map:{field:false}}");
+        q.orderBy(orderBy("map.field")), "coll/{map:{field:false}}", "coll/{map:{field:true}}");
   }
 
   @Test
@@ -855,6 +1043,201 @@ public void testChangeUser() {
     verifySequenceNumber(indexManager, "coll3", 0);
   }
 
+  @Test
+  public void testPartialIndexAndFullIndex() throws Exception {
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "c", Kind.ASCENDING, "d", Kind.ASCENDING));
+
+    Query query1 = query("coll").filter(filter("a", "==", 1));
+    validateIndexType(query1, IndexManager.IndexType.FULL);
+
+    Query query2 = query("coll").filter(filter("b", "==", 1));
+    validateIndexType(query2, IndexManager.IndexType.FULL);
+
+    Query query3 = query("coll").filter(filter("a", "==", 1)).orderBy(orderBy("a"));
+    validateIndexType(query3, IndexManager.IndexType.FULL);
+
+    Query query4 = query("coll").filter(filter("b", "==", 1)).orderBy(orderBy("b"));
+    validateIndexType(query4, IndexManager.IndexType.FULL);
+
+    Query query5 = query("coll").filter(filter("a", "==", 1)).filter(filter("b", "==", 1));
+    validateIndexType(query5, IndexManager.IndexType.PARTIAL);
+
+    Query query6 = query("coll").filter(filter("a", "==", 1)).orderBy(orderBy("b"));
+    validateIndexType(query6, IndexManager.IndexType.PARTIAL);
+
+    Query query7 = query("coll").filter(filter("b", "==", 1)).orderBy(orderBy("a"));
+    validateIndexType(query7, IndexManager.IndexType.PARTIAL);
+
+    Query query8 = query("coll").filter(filter("c", "==", 1)).filter(filter("d", "==", 1));
+    validateIndexType(query8, IndexManager.IndexType.FULL);
+
+    Query query9 =
+        query("coll")
+            .filter(filter("c", "==", 1))
+            .filter(filter("d", "==", 1))
+            .orderBy(orderBy("c"));
+    validateIndexType(query9, IndexManager.IndexType.FULL);
+
+    Query query10 =
+        query("coll")
+            .filter(filter("c", "==", 1))
+            .filter(filter("d", "==", 1))
+            .orderBy(orderBy("d"));
+    validateIndexType(query10, IndexManager.IndexType.FULL);
+
+    Query query11 =
+        query("coll")
+            .filter(filter("c", "==", 1))
+            .filter(filter("d", "==", 1))
+            .orderBy(orderBy("c"))
+            .orderBy(orderBy("d"));
+    validateIndexType(query11, IndexManager.IndexType.FULL);
+
+    Query query12 =
+        query("coll")
+            .filter(filter("c", "==", 1))
+            .filter(filter("d", "==", 1))
+            .orderBy(orderBy("d"))
+            .orderBy(orderBy("c"));
+    validateIndexType(query12, IndexManager.IndexType.FULL);
+
+    Query query13 =
+        query("coll")
+            .filter(filter("c", "==", 1))
+            .filter(filter("d", "==", 1))
+            .orderBy(orderBy("e"));
+    validateIndexType(query13, IndexManager.IndexType.PARTIAL);
+
+    Query query14 = query("coll").filter(filter("c", "==", 1)).filter(filter("d", "<=", 1));
+    validateIndexType(query14, IndexManager.IndexType.FULL);
+
+    Query query15 =
+        query("coll")
+            .filter(filter("c", "==", 1))
+            .filter(filter("d", ">", 1))
+            .orderBy(orderBy("d"));
+    validateIndexType(query15, IndexManager.IndexType.FULL);
+  }
+
+  @Test
+  public void testIndexTypeForOrQueries() throws Exception {
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.DESCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.ASCENDING, "a", Kind.ASCENDING));
+
+    // OR query without orderBy without limit which has missing sub-target indexes.
+    Query query1 = query("coll").filter(orFilters(filter("a", "==", 1), filter("c", "==", 1)));
+    validateIndexType(query1, IndexManager.IndexType.NONE);
+
+    // OR query with explicit orderBy without limit which has missing sub-target indexes.
+    Query query2 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 1), filter("c", "==", 1)))
+            .orderBy(orderBy("c"));
+    validateIndexType(query2, IndexManager.IndexType.NONE);
+
+    // OR query with implicit orderBy without limit which has missing sub-target indexes.
+    Query query3 = query("coll").filter(orFilters(filter("a", "==", 1), filter("c", ">", 1)));
+    validateIndexType(query3, IndexManager.IndexType.NONE);
+
+    // OR query with explicit orderBy with limit which has missing sub-target indexes.
+    Query query4 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 1), filter("c", "==", 1)))
+            .orderBy(orderBy("c"))
+            .limitToFirst(2);
+    validateIndexType(query4, IndexManager.IndexType.NONE);
+
+    // OR query with implicit orderBy with limit which has missing sub-target indexes.
+    Query query5 =
+        query("coll").filter(orFilters(filter("a", "==", 1), filter("c", ">", 1))).limitToLast(2);
+    validateIndexType(query5, IndexManager.IndexType.NONE);
+
+    // OR query without orderBy without limit which has all sub-target indexes.
+    Query query6 = query("coll").filter(orFilters(filter("a", "==", 1), filter("b", "==", 1)));
+    validateIndexType(query6, IndexManager.IndexType.FULL);
+
+    // OR query with explicit orderBy without limit which has all sub-target indexes.
+    Query query7 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 1), filter("b", "==", 1)))
+            .orderBy(orderBy("a"));
+    validateIndexType(query7, IndexManager.IndexType.FULL);
+
+    // OR query with implicit orderBy without limit which has all sub-target indexes.
+    Query query8 = query("coll").filter(orFilters(filter("a", ">", 1), filter("b", "==", 1)));
+    validateIndexType(query8, IndexManager.IndexType.FULL);
+
+    // OR query without orderBy with limit which has all sub-target indexes.
+    Query query9 =
+        query("coll").filter(orFilters(filter("a", "==", 1), filter("b", "==", 1))).limitToFirst(2);
+    validateIndexType(query9, IndexManager.IndexType.PARTIAL);
+
+    // OR query with explicit orderBy with limit which has all sub-target indexes.
+    Query query10 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 1), filter("b", "==", 1)))
+            .orderBy(orderBy("a"))
+            .limitToFirst(2);
+    validateIndexType(query10, IndexManager.IndexType.PARTIAL);
+
+    // OR query with implicit orderBy with limit which has all sub-target indexes.
+    Query query11 =
+        query("coll").filter(orFilters(filter("a", ">", 1), filter("b", "==", 1))).limitToLast(2);
+    validateIndexType(query11, IndexManager.IndexType.PARTIAL);
+  }
+
+  @Test
+  public void TestCreateTargetIndexesCreatesFullIndexesForEachSubTarget() {
+    Query query =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 1), filter("b", "==", 2), filter("c", "==", 3)));
+
+    Query subQuery1 = query("coll").filter(filter("a", "==", 1));
+    Query subQuery2 = query("coll").filter(filter("b", "==", 2));
+    Query subQuery3 = query("coll").filter(filter("c", "==", 3));
+
+    validateIndexType(query, IndexManager.IndexType.NONE);
+    validateIndexType(subQuery1, IndexManager.IndexType.NONE);
+    validateIndexType(subQuery2, IndexManager.IndexType.NONE);
+    validateIndexType(subQuery3, IndexManager.IndexType.NONE);
+
+    indexManager.createTargetIndexes(query.toTarget());
+
+    validateIndexType(query, IndexManager.IndexType.FULL);
+    validateIndexType(subQuery1, IndexManager.IndexType.FULL);
+    validateIndexType(subQuery2, IndexManager.IndexType.FULL);
+    validateIndexType(subQuery3, IndexManager.IndexType.FULL);
+  }
+
+  @Test
+  public void TestCreateTargetIndexesUpgradesPartialIndexToFullIndex() {
+    Query query = query("coll").filter(andFilters(filter("a", "==", 1), filter("b", "==", 2)));
+
+    Query subQuery1 = query("coll").filter(filter("a", "==", 1));
+    Query subQuery2 = query("coll").filter(filter("b", "==", 2));
+
+    indexManager.createTargetIndexes(subQuery1.toTarget());
+
+    validateIndexType(query, IndexManager.IndexType.PARTIAL);
+    validateIndexType(subQuery1, IndexManager.IndexType.FULL);
+    validateIndexType(subQuery2, IndexManager.IndexType.NONE);
+
+    indexManager.createTargetIndexes(query.toTarget());
+
+    validateIndexType(query, IndexManager.IndexType.FULL);
+    validateIndexType(subQuery1, IndexManager.IndexType.FULL);
+    validateIndexType(subQuery2, IndexManager.IndexType.NONE);
+  }
+
+  private void validateIndexType(Query query, IndexManager.IndexType expected) {
+    IndexManager.IndexType indexType = indexManager.getIndexType(query.toTarget());
+    assertEquals(indexType, expected);
+  }
+
   private void verifySequenceNumber(
       IndexManager indexManager, String collectionGroup, int expectedSequnceNumber) {
     assertEquals(
@@ -877,10 +1260,14 @@ private void addDoc(String key, Map<String, Object> data) {
 
   private void verifyResults(Query query, String... documents) {
     Target target = query.toTarget();
-    Iterable<DocumentKey> results = indexManager.getDocumentsMatchingTarget(target);
+    List<DocumentKey> results = indexManager.getDocumentsMatchingTarget(target);
     assertNotNull("Target cannot be served from index.", results);
-    List<DocumentKey> keys = Arrays.stream(documents).map(s -> key(s)).collect(Collectors.toList());
-    assertWithMessage("Result for %s", query).that(results).containsExactlyElementsIn(keys);
+    List<DocumentKey> keys =
+        Arrays.stream(documents).map(TestUtil::key).collect(Collectors.toList());
+    assertWithMessage("Result for %s", query)
+        .that(results)
+        .containsExactlyElementsIn(keys)
+        .inOrder();
   }
 
   /** Validates the row count in the SQLite tables that are used for indexing. */
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteLocalStoreTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteLocalStoreTest.java
index a97ecc6b1c5..fa44664ad77 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteLocalStoreTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteLocalStoreTest.java
@@ -16,12 +16,15 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.firebase.firestore.testutil.TestUtil.addedRemoteEvent;
+import static com.google.firebase.firestore.testutil.TestUtil.deleteMutation;
 import static com.google.firebase.firestore.testutil.TestUtil.deletedDoc;
 import static com.google.firebase.firestore.testutil.TestUtil.doc;
 import static com.google.firebase.firestore.testutil.TestUtil.fieldIndex;
 import static com.google.firebase.firestore.testutil.TestUtil.filter;
 import static com.google.firebase.firestore.testutil.TestUtil.key;
+import static com.google.firebase.firestore.testutil.TestUtil.keyMap;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
+import static com.google.firebase.firestore.testutil.TestUtil.orFilters;
 import static com.google.firebase.firestore.testutil.TestUtil.orderBy;
 import static com.google.firebase.firestore.testutil.TestUtil.query;
 import static com.google.firebase.firestore.testutil.TestUtil.setMutation;
@@ -30,11 +33,29 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
+import com.google.firebase.Timestamp;
 import com.google.firebase.firestore.FieldValue;
 import com.google.firebase.firestore.core.Query;
+import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.FieldIndex;
+import com.google.firebase.firestore.model.FieldPath;
+import com.google.firebase.firestore.model.ObjectValue;
+import com.google.firebase.firestore.model.ServerTimestamps;
+import com.google.firebase.firestore.model.mutation.FieldMask;
+import com.google.firebase.firestore.model.mutation.FieldTransform;
+import com.google.firebase.firestore.model.mutation.PatchMutation;
+import com.google.firebase.firestore.model.mutation.Precondition;
+import com.google.firebase.firestore.model.mutation.ServerTimestampOperation;
+import com.google.firestore.v1.Value;
+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.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -141,7 +162,7 @@ public void testDeletedDocumentRemovesIndex() {
     backfillIndexes();
 
     executeQuery(query);
-    assertRemoteDocumentsRead(/* byKey= */ 1, /* byQuery= */ 0);
+    assertRemoteDocumentsRead(/* byKey= */ 1, /* byCollection= */ 0);
     assertQueryReturned("coll/a");
 
     applyRemoteEvent(
@@ -149,7 +170,7 @@ public void testDeletedDocumentRemovesIndex() {
 
     // No backfill needed for deleted document.
     executeQuery(query);
-    assertRemoteDocumentsRead(/* byKey= */ 0, /* byQuery= */ 0);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 0);
     assertQueryReturned();
   }
 
@@ -168,7 +189,7 @@ public void testUsesIndexes() {
     backfillIndexes();
 
     executeQuery(query);
-    assertRemoteDocumentsRead(/* byKey= */ 1, /* byQuery= */ 0);
+    assertRemoteDocumentsRead(/* byKey= */ 1, /* byCollection= */ 0);
     assertQueryReturned("coll/a");
   }
 
@@ -188,7 +209,7 @@ public void testUsesPartiallyIndexedRemoteDocumentsWhenAvailable() {
     applyRemoteEvent(addedRemoteEvent(doc("coll/b", 20, map("matches", true)), targetId));
 
     executeQuery(query);
-    assertRemoteDocumentsRead(/* byKey= */ 1, /* byQuery= */ 1);
+    assertRemoteDocumentsRead(/* byKey= */ 1, /* byCollection= */ 1);
     assertQueryReturned("coll/a", "coll/b");
   }
 
@@ -207,9 +228,71 @@ public void testUsesPartiallyIndexedOverlaysWhenAvailable() {
     Query query = query("coll").filter(filter("matches", "==", true));
     executeQuery(query);
     assertOverlaysRead(/* byKey= */ 1, /* byCollection= */ 1);
+    assertOverlayTypes(
+        keyMap(
+            "coll/a",
+            CountingQueryEngine.OverlayType.Set,
+            "coll/b",
+            CountingQueryEngine.OverlayType.Set));
     assertQueryReturned("coll/a", "coll/b");
   }
 
+  @Test
+  public void testDoesNotUseLimitWhenIndexIsOutdated() {
+    FieldIndex index =
+        fieldIndex("coll", 0, FieldIndex.INITIAL_STATE, "count", FieldIndex.Segment.Kind.ASCENDING);
+    configureFieldIndexes(singletonList(index));
+
+    Query query = query("coll").orderBy(orderBy("count")).limitToFirst(2);
+    int targetId = allocateQuery(query);
+
+    applyRemoteEvent(
+        addedRemoteEvent(
+            Arrays.asList(
+                doc("coll/a", 10, map("count", 1)),
+                doc("coll/b", 10, map("count", 2)),
+                doc("coll/c", 10, map("count", 3))),
+            Collections.singletonList(targetId),
+            Collections.emptyList()));
+    backfillIndexes();
+
+    writeMutation(deleteMutation("coll/b"));
+
+    executeQuery(query);
+
+    // The query engine first reads the documents by key and then re-runs the query without limit.
+    assertRemoteDocumentsRead(/* byKey= */ 5, /* byCollection= */ 0);
+    assertOverlaysRead(/* byKey= */ 5, /* byCollection= */ 1);
+    assertOverlayTypes(keyMap("coll/b", CountingQueryEngine.OverlayType.Delete));
+    assertQueryReturned("coll/a", "coll/c");
+  }
+
+  @Test
+  public void testUsesIndexForLimitQueryWhenIndexIsUpdated() {
+    FieldIndex index =
+        fieldIndex("coll", 0, FieldIndex.INITIAL_STATE, "count", FieldIndex.Segment.Kind.ASCENDING);
+    configureFieldIndexes(singletonList(index));
+
+    Query query = query("coll").orderBy(orderBy("count")).limitToFirst(2);
+    int targetId = allocateQuery(query);
+
+    applyRemoteEvent(
+        addedRemoteEvent(
+            Arrays.asList(
+                doc("coll/a", 10, map("count", 1)),
+                doc("coll/b", 10, map("count", 2)),
+                doc("coll/c", 10, map("count", 3))),
+            Collections.singletonList(targetId),
+            Collections.emptyList()));
+    writeMutation(deleteMutation("coll/b"));
+    backfillIndexes();
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 2, /* byCollection= */ 0);
+    assertOverlaysRead(/* byKey= */ 2, /* byCollection= */ 0);
+    assertQueryReturned("coll/a", "coll/c");
+  }
+
   @Test
   public void testIndexesServerTimestamps() {
     FieldIndex index =
@@ -222,6 +305,441 @@ public void testIndexesServerTimestamps() {
     Query query = query("coll").orderBy(orderBy("time", "asc"));
     executeQuery(query);
     assertOverlaysRead(/* byKey= */ 1, /* byCollection= */ 0);
+    assertOverlayTypes(keyMap("coll/a", CountingQueryEngine.OverlayType.Set));
     assertQueryReturned("coll/a");
   }
+
+  @Test
+  public void testDeeplyNestedServerTimestamps() {
+    Timestamp timestamp = Timestamp.now();
+    Value initialServerTimestamp = ServerTimestamps.valueOf(timestamp, null);
+    Map<String, Value> fields =
+        new HashMap<String, Value>() {
+          {
+            put("timestamp", ServerTimestamps.valueOf(timestamp, initialServerTimestamp));
+          }
+        };
+    FieldPath path = FieldPath.fromSingleSegment("timestamp");
+    FieldMask mask =
+        FieldMask.fromSet(
+            new HashSet<FieldPath>() {
+              {
+                add(path);
+              }
+            });
+    FieldTransform fieldTransform =
+        new FieldTransform(path, ServerTimestampOperation.getInstance());
+    List<FieldTransform> fieldTransforms =
+        new ArrayList<FieldTransform>() {
+          {
+            add(fieldTransform);
+          }
+        };
+    // The purpose of this test is to ensure that deeply nested server timestamps do not result in
+    // a stack overflow error. Below we use a `Thread` object to create a large number of mutations
+    // because the `Thread` class allows us to specify the maximum stack size.
+    AtomicReference<Throwable> error = new AtomicReference<>();
+    Thread thread =
+        new Thread(
+            Thread.currentThread().getThreadGroup(),
+            () -> {
+              try {
+                for (int i = 0; i < 1000; ++i) {
+                  writeMutation(
+                      new PatchMutation(
+                          DocumentKey.fromPathString("some/object/for/test"),
+                          ObjectValue.fromMap(fields),
+                          mask,
+                          Precondition.NONE,
+                          fieldTransforms));
+                }
+              } catch (Throwable e) {
+                error.set(e);
+              }
+            },
+            /* name */ "test",
+            /* stackSize */ 1024 * 1024);
+    try {
+      thread.start();
+      thread.join();
+    } catch (InterruptedException e) {
+      throw new AssertionError(e);
+    }
+    assertThat(error.get()).isNull();
+  }
+
+  @Test
+  public void testCanAutoCreateIndexes() {
+    Query query = query("coll").filter(filter("matches", "==", true));
+    int targetId = allocateQuery(query);
+
+    setIndexAutoCreationEnabled(true);
+    setMinCollectionSizeToAutoCreateIndex(0);
+    setRelativeIndexReadCostPerDocument(2);
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/a", 10, map("matches", true)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/b", 10, map("matches", false)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/c", 10, map("matches", false)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/d", 10, map("matches", false)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/e", 10, map("matches", true)), targetId));
+
+    // First time query runs without indexes.
+    // Based on current heuristic, collection document counts (5) > 2 * resultSize (2).
+    // Full matched index should be created.
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e");
+
+    backfillIndexes();
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/f", 20, map("matches", true)), targetId));
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 2, /* byCollection= */ 1);
+    assertQueryReturned("coll/a", "coll/e", "coll/f");
+  }
+
+  @Test
+  public void testCanAutoCreateIndexesWorksWithOrQuery() {
+    Query query = query("coll").filter(orFilters(filter("a", "==", 3), filter("b", "==", true)));
+    int targetId = allocateQuery(query);
+
+    setIndexAutoCreationEnabled(true);
+    setMinCollectionSizeToAutoCreateIndex(0);
+    setRelativeIndexReadCostPerDocument(2);
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/a", 10, map("b", true)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/b", 10, map("b", false)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/c", 10, map("a", 5, "b", false)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/d", 10, map("a", true)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/e", 10, map("a", 3, "b", true)), targetId));
+
+    // First time query runs without indexes.
+    // Based on current heuristic, collection document counts (5) > 2 * resultSize (2).
+    // Full matched index should be created.
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/e", "coll/a");
+
+    backfillIndexes();
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/f", 20, map("a", 3, "b", false)), targetId));
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 2, /* byCollection= */ 1);
+    assertQueryReturned("coll/f", "coll/e", "coll/a");
+  }
+
+  @Test
+  public void testDoesNotAutoCreateIndexesForSmallCollections() {
+    Query query = query("coll").filter(filter("foo", "==", 9)).filter(filter("count", ">=", 3));
+    int targetId = allocateQuery(query);
+
+    setIndexAutoCreationEnabled(true);
+    setRelativeIndexReadCostPerDocument(2);
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/a", 10, map("foo", 9, "count", 5)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/b", 10, map("foo", 8, "count", 6)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/c", 10, map("foo", 9, "count", 0)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/d", 10, map("count", 4)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/e", 10, map("foo", 9, "count", 3)), targetId));
+
+    // SDK will not create indexes since collection size is too small.
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e");
+
+    backfillIndexes();
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/f", 20, map("foo", 9, "count", 4)), targetId));
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 3);
+    assertQueryReturned("coll/a", "coll/e", "coll/f");
+  }
+
+  @Test
+  public void testDoesNotAutoCreateIndexesWhenIndexLookUpIsExpensive() {
+    Query query = query("coll").filter(filter("array", "array-contains-any", Arrays.asList(0, 7)));
+    int targetId = allocateQuery(query);
+
+    setIndexAutoCreationEnabled(true);
+    setMinCollectionSizeToAutoCreateIndex(0);
+    setRelativeIndexReadCostPerDocument(5);
+
+    applyRemoteEvent(
+        addedRemoteEvent(doc("coll/a", 10, map("array", Arrays.asList(2, 7))), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/b", 10, map("array", emptyList())), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/c", 10, map("array", singletonList(3))), targetId));
+    applyRemoteEvent(
+        addedRemoteEvent(doc("coll/d", 10, map("array", Arrays.asList(2, 10, 20))), targetId));
+    applyRemoteEvent(
+        addedRemoteEvent(doc("coll/e", 10, map("array", Arrays.asList(2, 0, 8))), targetId));
+
+    // SDK will not create indexes since relative read cost is too large.
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e");
+
+    backfillIndexes();
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/f", 20, map("array", singletonList(0))), targetId));
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 3);
+    assertQueryReturned("coll/a", "coll/e", "coll/f");
+  }
+
+  @Test
+  public void testIndexAutoCreationWorksWhenBackfillerRunsHalfway() {
+    Query query =
+        query("coll").filter(filter("matches", "==", "foo")).filter(filter("count", ">", 10));
+    int targetId = allocateQuery(query);
+
+    setIndexAutoCreationEnabled(true);
+    setMinCollectionSizeToAutoCreateIndex(0);
+    setRelativeIndexReadCostPerDocument(2);
+
+    applyRemoteEvent(
+        addedRemoteEvent(doc("coll/a", 10, map("matches", "foo", "count", 11)), targetId));
+    applyRemoteEvent(
+        addedRemoteEvent(doc("coll/b", 10, map("matches", "foo", "count", 9)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/c", 10, map("matches", "foo")), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/d", 10, map("matches", 7, "count", 11)), targetId));
+    applyRemoteEvent(
+        addedRemoteEvent(doc("coll/e", 10, map("matches", "foo", "count", 21)), targetId));
+
+    // First time query is running without indexes.
+    // Based on current heuristic, collection document counts (5) > 2 * resultSize (2).
+    // Full matched index should be created.
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e");
+
+    setBackfillerMaxDocumentsToProcess(2);
+    backfillIndexes();
+
+    applyRemoteEvent(
+        addedRemoteEvent(doc("coll/f", 20, map("matches", "foo", "count", 15)), targetId));
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 1, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e", "coll/f");
+  }
+
+  @Test
+  public void testIndexCreatedByIndexAutoCreationExistsAfterTurnOffAutoCreation() {
+    Query query = query("coll").filter(filter("value", "not-in", Collections.singletonList(3)));
+    int targetId = allocateQuery(query);
+
+    setIndexAutoCreationEnabled(true);
+    setMinCollectionSizeToAutoCreateIndex(0);
+    setRelativeIndexReadCostPerDocument(2);
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/a", 10, map("value", 5)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/b", 10, map("value", 3)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/c", 10, map("value", 3)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/d", 10, map("value", 3)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/e", 10, map("value", 2)), targetId));
+
+    // First time query runs without indexes.
+    // Based on current heuristic, collection document counts (5) > 2 * resultSize (2).
+    // Full matched index should be created.
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e");
+
+    setIndexAutoCreationEnabled(false);
+
+    backfillIndexes();
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/f", 20, map("value", 7)), targetId));
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 2, /* byCollection= */ 1);
+    assertQueryReturned("coll/a", "coll/e", "coll/f");
+  }
+
+  @Test
+  public void testDisableIndexAutoCreationWorks() {
+    Query query1 = query("coll").filter(filter("value", "in", Arrays.asList(0, 1)));
+    int targetId1 = allocateQuery(query1);
+
+    setIndexAutoCreationEnabled(true);
+    setMinCollectionSizeToAutoCreateIndex(0);
+    setRelativeIndexReadCostPerDocument(2);
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/a", 10, map("value", 1)), targetId1));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/b", 10, map("value", 8)), targetId1));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/c", 10, map("value", "string")), targetId1));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/d", 10, map("value", false)), targetId1));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/e", 10, map("value", 0)), targetId1));
+
+    // First time query is running without indexes.
+    // Based on current heuristic, collection document counts (5) > 2 * resultSize (2).
+    // Full matched index should be created.
+    executeQuery(query1);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e");
+
+    setIndexAutoCreationEnabled(false);
+
+    backfillIndexes();
+
+    executeQuery(query1);
+    assertRemoteDocumentsRead(/* byKey= */ 2, /* byCollection= */ 0);
+    assertQueryReturned("coll/a", "coll/e");
+
+    Query query2 = query("foo").filter(filter("value", "!=", Double.NaN));
+    int targetId2 = allocateQuery(query2);
+
+    applyRemoteEvent(addedRemoteEvent(doc("foo/a", 10, map("value", 5)), targetId2));
+    applyRemoteEvent(addedRemoteEvent(doc("foo/b", 10, map("value", Double.NaN)), targetId2));
+    applyRemoteEvent(addedRemoteEvent(doc("foo/c", 10, map("value", Double.NaN)), targetId2));
+    applyRemoteEvent(addedRemoteEvent(doc("foo/d", 10, map("value", Double.NaN)), targetId2));
+    applyRemoteEvent(addedRemoteEvent(doc("foo/e", 10, map("value", "string")), targetId2));
+
+    executeQuery(query2);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("foo/a", "foo/e");
+
+    backfillIndexes();
+
+    // Run the query in second time, test index won't be created
+    executeQuery(query2);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("foo/a", "foo/e");
+  }
+
+  @Test
+  public void testDeleteAllIndexesWorksWithIndexAutoCreation() {
+    Query query = query("coll").filter(filter("value", "==", "match"));
+    int targetId = allocateQuery(query);
+
+    setIndexAutoCreationEnabled(true);
+    setMinCollectionSizeToAutoCreateIndex(0);
+    setRelativeIndexReadCostPerDocument(2);
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/a", 10, map("value", "match")), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/b", 10, map("value", Double.NaN)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/c", 10, map("value", null)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/d", 10, map("value", "mismatch")), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/e", 10, map("value", "match")), targetId));
+
+    // First time query is running without indexes.
+    // Based on current heuristic, collection document counts (5) > 2 * resultSize (2).
+    // Full matched index should be created.
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e");
+
+    backfillIndexes();
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 2, /* byCollection= */ 0);
+    assertQueryReturned("coll/a", "coll/e");
+
+    deleteAllIndexes();
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e");
+
+    // Field index is created again.
+    backfillIndexes();
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 2, /* byCollection= */ 0);
+    assertQueryReturned("coll/a", "coll/e");
+  }
+
+  @Test
+  public void testDeleteAllIndexesWorksWithManualAddedIndexes() {
+    FieldIndex index =
+        fieldIndex(
+            "coll", 0, FieldIndex.INITIAL_STATE, "matches", FieldIndex.Segment.Kind.ASCENDING);
+    configureFieldIndexes(singletonList(index));
+
+    Query query = query("coll").filter(filter("matches", "==", true));
+    int targetId = allocateQuery(query);
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/a", 10, map("matches", true)), targetId));
+
+    backfillIndexes();
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 1, /* byCollection= */ 0);
+    assertQueryReturned("coll/a");
+
+    deleteAllIndexes();
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 1);
+    assertQueryReturned("coll/a");
+  }
+
+  @Test
+  public void testIndexAutoCreationWorksWithMutation() {
+    Query query =
+        query("coll").filter(filter("value", "array-contains-any", Arrays.asList(8, 1, "string")));
+    int targetId = allocateQuery(query);
+
+    setIndexAutoCreationEnabled(true);
+    setMinCollectionSizeToAutoCreateIndex(0);
+    setRelativeIndexReadCostPerDocument(2);
+
+    applyRemoteEvent(
+        addedRemoteEvent(doc("coll/a", 10, map("value", Arrays.asList(8, 1, "string"))), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/b", 10, map("value", emptyList())), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/c", 10, map("value", singletonList(3))), targetId));
+    applyRemoteEvent(
+        addedRemoteEvent(doc("coll/d", 10, map("value", Arrays.asList(0, 5))), targetId));
+    applyRemoteEvent(
+        addedRemoteEvent(doc("coll/e", 10, map("value", singletonList("string"))), targetId));
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e");
+
+    writeMutation(deleteMutation("coll/e"));
+
+    backfillIndexes();
+
+    writeMutation(setMutation("coll/f", map("value", singletonList(1))));
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 1, /* byCollection= */ 0);
+    assertOverlaysRead(/* byKey= */ 1, /* byCollection= */ 1);
+    assertQueryReturned("coll/a", "coll/f");
+  }
+
+  @Test
+  public void testIndexAutoCreationDoesnotWorkWithMultipleInequality() {
+    Query query = query("coll").filter(filter("field1", "<", 5)).filter(filter("field2", "<", 5));
+    int targetId = allocateQuery(query);
+
+    setIndexAutoCreationEnabled(true);
+    setMinCollectionSizeToAutoCreateIndex(0);
+    setRelativeIndexReadCostPerDocument(2);
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/a", 10, map("field1", 1, "field2", 2)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/b", 10, map("field1", 8, "field2", 2)), targetId));
+    applyRemoteEvent(
+        addedRemoteEvent(doc("coll/c", 10, map("field1", "string", "field2", 2)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/d", 10, map("field1", 2)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/e", 10, map("field1", 4, "field2", 4)), targetId));
+
+    // First time query is running without indexes.
+    // Based on current heuristic, collection document counts (5) > 2 * resultSize (2).
+    // Full matched index will not be created since FieldIndex does not support multiple inequality.
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e");
+
+    backfillIndexes();
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e");
+  }
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteOverlayMigrationManagerTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteOverlayMigrationManagerTest.java
index 22502a8f890..e1d82f51285 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteOverlayMigrationManagerTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteOverlayMigrationManagerTest.java
@@ -25,13 +25,13 @@
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 
 import com.google.firebase.firestore.FieldValue;
 import com.google.firebase.firestore.auth.User;
 import com.google.firebase.firestore.model.Document;
 import com.google.firebase.firestore.model.MutableDocument;
 import com.google.firebase.firestore.model.mutation.Mutation;
-import com.google.firebase.firestore.util.AsyncQueue;
 import java.util.Collections;
 import java.util.List;
 import org.junit.After;
@@ -52,9 +52,7 @@ public void setUp() {
     // Setup persistence to version 12, which is before Overlay.
     persistence =
         PersistenceTestHelpers.createSQLitePersistenceForVersion("test-data-migration", 12);
-    IndexBackfiller indexBackfiller = new IndexBackfiller(persistence, new AsyncQueue());
-    localStore =
-        new LocalStore(persistence, indexBackfiller, new QueryEngine(), User.UNAUTHENTICATED);
+    localStore = new LocalStore(persistence, new QueryEngine(), User.UNAUTHENTICATED);
     localStore.start();
   }
 
@@ -91,15 +89,13 @@ public void testCreateOverlayFromSet() {
     // Switch to new persistence and run migrations
     this.persistence.shutdown();
     persistence = PersistenceTestHelpers.createSQLitePersistence("test-data-migration");
-    IndexBackfiller indexBackfiller = new IndexBackfiller(persistence, new AsyncQueue());
-    localStore =
-        new LocalStore(persistence, indexBackfiller, new QueryEngine(), User.UNAUTHENTICATED);
+    localStore = new LocalStore(persistence, new QueryEngine(), User.UNAUTHENTICATED);
     localStore.start();
 
     assertEquals(
         setMutation("foo/bar", map("foo", "bar")),
         persistence
-            .getDocumentOverlay(User.UNAUTHENTICATED)
+            .getDocumentOverlayCache(User.UNAUTHENTICATED)
             .getOverlay(key("foo/bar"))
             .getMutation());
     // Version is 0 because of remote document elision.
@@ -110,6 +106,42 @@ public void testCreateOverlayFromSet() {
     assertFalse(migrationManager.hasPendingOverlayMigration());
   }
 
+  @Test
+  public void testSkipsIfAlreadyMigrated() {
+    writeRemoteDocument(doc("foo/bar", 2, map("it", "original")));
+    writeMutation(setMutation("foo/bar", map("foo", "bar")));
+
+    // Switch to new persistence and run migrations
+    this.persistence.shutdown();
+    persistence = PersistenceTestHelpers.createSQLitePersistence("test-data-migration");
+    localStore = new LocalStore(persistence, new QueryEngine(), User.UNAUTHENTICATED);
+    localStore.start();
+
+    assertEquals(
+        setMutation("foo/bar", map("foo", "bar")),
+        persistence
+            .getDocumentOverlayCache(User.UNAUTHENTICATED)
+            .getOverlay(key("foo/bar"))
+            .getMutation());
+
+    // Delete the overlay to verify migration is skipped the second time.
+    persistence.getDocumentOverlayCache(User.UNAUTHENTICATED).removeOverlaysForBatchId(1);
+
+    // Switch to new persistence and run migrations which should be a no-op.
+    this.persistence.shutdown();
+    persistence = PersistenceTestHelpers.createSQLitePersistence("test-data-migration");
+    localStore = new LocalStore(persistence, new QueryEngine(), User.UNAUTHENTICATED);
+    localStore.start();
+
+    SQLiteOverlayMigrationManager migrationManager =
+        (SQLiteOverlayMigrationManager) persistence.getOverlayMigrationManager();
+    assertFalse(migrationManager.hasPendingOverlayMigration());
+
+    // We deleted the overlay earlier and the migration is not run again, so we get a null.
+    assertNull(
+        persistence.getDocumentOverlayCache(User.UNAUTHENTICATED).getOverlay(key("foo/bar")));
+  }
+
   @Test
   public void testCreateOverlayFromDelete() {
     writeRemoteDocument(doc("foo/bar", 2, map("it", "original")));
@@ -118,15 +150,13 @@ public void testCreateOverlayFromDelete() {
     // Switch to new persistence and run migrations
     this.persistence.shutdown();
     persistence = PersistenceTestHelpers.createSQLitePersistence("test-data-migration");
-    IndexBackfiller indexBackfiller = new IndexBackfiller(persistence, new AsyncQueue());
-    localStore =
-        new LocalStore(persistence, indexBackfiller, new QueryEngine(), User.UNAUTHENTICATED);
+    localStore = new LocalStore(persistence, new QueryEngine(), User.UNAUTHENTICATED);
     localStore.start();
 
     assertEquals(
         deleteMutation("foo/bar"),
         persistence
-            .getDocumentOverlay(User.UNAUTHENTICATED)
+            .getDocumentOverlayCache(User.UNAUTHENTICATED)
             .getOverlay(key("foo/bar"))
             .getMutation());
     // Version is 0 because of remote document elision.
@@ -150,12 +180,10 @@ public void testCreateOverlayFromPatches() {
     // Switch to new persistence and run migrations
     this.persistence.shutdown();
     persistence = PersistenceTestHelpers.createSQLitePersistence("test-data-migration");
-    IndexBackfiller indexBackfiller = new IndexBackfiller(persistence, new AsyncQueue());
-    localStore =
-        new LocalStore(persistence, indexBackfiller, new QueryEngine(), User.UNAUTHENTICATED);
+    localStore = new LocalStore(persistence, new QueryEngine(), User.UNAUTHENTICATED);
     localStore.start();
 
-    DocumentOverlayCache overlay = persistence.getDocumentOverlay(User.UNAUTHENTICATED);
+    DocumentOverlayCache overlay = persistence.getDocumentOverlayCache(User.UNAUTHENTICATED);
     assertEquals(
         mergeMutation("foo/bar", map("it", 2), Collections.emptyList()),
         overlay.getOverlay(key("foo/bar")).getMutation());
@@ -177,30 +205,26 @@ public void testCreateOverlayForDifferentUsers() {
     writeMutation(setMutation("foo/bar", map("foo", "set-by-unauthenticated")));
 
     // Switch to a different user
-    IndexBackfiller indexBackfiller = new IndexBackfiller(persistence, new AsyncQueue());
-    localStore =
-        new LocalStore(persistence, indexBackfiller, new QueryEngine(), new User("another_user"));
+    localStore = new LocalStore(persistence, new QueryEngine(), new User("another_user"));
     localStore.start();
     writeMutation(setMutation("foo/bar", map("foo", "set-by-another_user")));
 
     // Switch to new persistence and run migrations
     this.persistence.shutdown();
     persistence = PersistenceTestHelpers.createSQLitePersistence("test-data-migration");
-    indexBackfiller = new IndexBackfiller(persistence, new AsyncQueue());
-    localStore =
-        new LocalStore(persistence, indexBackfiller, new QueryEngine(), User.UNAUTHENTICATED);
+    localStore = new LocalStore(persistence, new QueryEngine(), User.UNAUTHENTICATED);
     localStore.start();
 
     assertEquals(
         setMutation("foo/bar", map("foo", "set-by-unauthenticated")),
         persistence
-            .getDocumentOverlay(User.UNAUTHENTICATED)
+            .getDocumentOverlayCache(User.UNAUTHENTICATED)
             .getOverlay(key("foo/bar"))
             .getMutation());
     assertEquals(
         setMutation("foo/bar", map("foo", "set-by-another_user")),
         persistence
-            .getDocumentOverlay(new User("another_user"))
+            .getDocumentOverlayCache(new User("another_user"))
             .getOverlay(key("foo/bar"))
             .getMutation());
 
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteQueryEngineTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteQueryEngineTest.java
index 7f90ebdb7d7..06f1c80f879 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteQueryEngineTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteQueryEngineTest.java
@@ -14,23 +14,28 @@
 
 package com.google.firebase.firestore.local;
 
+import static com.google.firebase.firestore.local.IndexManager.*;
 import static com.google.firebase.firestore.model.FieldIndex.*;
 import static com.google.firebase.firestore.model.FieldIndex.Segment.*;
+import static com.google.firebase.firestore.testutil.TestUtil.andFilters;
 import static com.google.firebase.firestore.testutil.TestUtil.doc;
 import static com.google.firebase.firestore.testutil.TestUtil.docMap;
+import static com.google.firebase.firestore.testutil.TestUtil.docSet;
 import static com.google.firebase.firestore.testutil.TestUtil.fieldIndex;
 import static com.google.firebase.firestore.testutil.TestUtil.filter;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
+import static com.google.firebase.firestore.testutil.TestUtil.orFilters;
+import static com.google.firebase.firestore.testutil.TestUtil.orderBy;
+import static com.google.firebase.firestore.testutil.TestUtil.patchMutation;
 import static com.google.firebase.firestore.testutil.TestUtil.query;
 import static com.google.firebase.firestore.testutil.TestUtil.setMutation;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
-import com.google.firebase.database.collection.ImmutableSortedMap;
 import com.google.firebase.firestore.core.Query;
-import com.google.firebase.firestore.model.Document;
-import com.google.firebase.firestore.model.DocumentKey;
+import com.google.firebase.firestore.model.DocumentSet;
 import com.google.firebase.firestore.model.MutableDocument;
 import com.google.firebase.firestore.model.SnapshotVersion;
+import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -46,11 +51,11 @@ Persistence getPersistence() {
   }
 
   @Test
-  public void combinesIndexedWithNonIndexedResults() throws Exception {
+  public void testCombinesIndexedWithNonIndexedResults() throws Exception {
     MutableDocument doc1 = doc("coll/a", 1, map("foo", true));
     MutableDocument doc2 = doc("coll/b", 2, map("foo", true));
     MutableDocument doc3 = doc("coll/c", 3, map("foo", true));
-    MutableDocument doc4 = doc("coll/d", 3, map("foo", true));
+    MutableDocument doc4 = doc("coll/d", 3, map("foo", true)).setHasLocalMutations();
 
     indexManager.addFieldIndex(fieldIndex("coll", "foo", Kind.ASCENDING));
 
@@ -63,15 +68,474 @@ public void combinesIndexedWithNonIndexedResults() throws Exception {
     addMutation(setMutation("coll/d", map("foo", true)));
 
     Query queryWithFilter = query("coll").filter(filter("foo", "==", true));
-    ImmutableSortedMap<DocumentKey, Document> results =
-        expectOptimizedCollectionScan(
-            () ->
-                queryEngine.getDocumentsMatchingQuery(
-                    queryWithFilter, SnapshotVersion.NONE, DocumentKey.emptyKeySet()));
-
-    assertTrue(results.containsKey(doc1.getKey()));
-    assertTrue(results.containsKey(doc2.getKey()));
-    assertTrue(results.containsKey(doc3.getKey()));
-    assertTrue(results.containsKey(doc4.getKey()));
+    DocumentSet results =
+        expectOptimizedCollectionScan(() -> runQuery(queryWithFilter, SnapshotVersion.NONE));
+
+    assertEquals(docSet(queryWithFilter.comparator(), doc1, doc2, doc3, doc4), results);
+  }
+
+  @Test
+  public void testUsesPartialIndexForLimitQueries() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", 0));
+    MutableDocument doc2 = doc("coll/2", 1, map("a", 1, "b", 1));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 1, "b", 2));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", 3));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 2, "b", 3));
+    addDocument(doc1, doc2, doc3, doc4, doc5);
+
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.updateIndexEntries(docMap(doc1, doc2, doc3, doc4, doc5));
+    indexManager.updateCollectionGroup("coll", IndexOffset.fromDocument(doc5));
+
+    Query query =
+        query("coll").filter(filter("a", "==", 1)).filter(filter("b", "==", 1)).limitToFirst(3);
+    DocumentSet result = expectOptimizedCollectionScan(() -> runQuery(query, SnapshotVersion.NONE));
+    assertEquals(docSet(query.comparator(), doc2), result);
+  }
+
+  @Test
+  public void testRefillsIndexedLimitQueries() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1));
+    MutableDocument doc2 = doc("coll/2", 1, map("a", 2));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 4));
+    addDocument(doc1, doc2, doc3, doc4);
+
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.updateIndexEntries(docMap(doc1, doc2, doc3, doc4));
+    indexManager.updateCollectionGroup("coll", IndexOffset.fromDocument(doc4));
+
+    addMutation(patchMutation("coll/3", map("a", 5)));
+
+    Query query = query("coll").orderBy(orderBy("a")).limitToFirst(3);
+    DocumentSet result = expectOptimizedCollectionScan(() -> runQuery(query, SnapshotVersion.NONE));
+    assertEquals(docSet(query.comparator(), doc1, doc2, doc4), result);
+  }
+
+  @Test
+  public void canPerformOrQueriesUsingIndexes() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", 0));
+    MutableDocument doc2 = doc("coll/2", 1, map("a", 2, "b", 1));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", 2));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", 3));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1, "b", 1));
+    addDocument(doc1, doc2, doc3, doc4, doc5);
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.DESCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.DESCENDING));
+    indexManager.updateIndexEntries(docMap(doc1, doc2, doc3, doc4, doc5));
+    indexManager.updateCollectionGroup("coll", IndexOffset.fromDocument(doc5));
+
+    // Two equalities: a==1 || b==1.
+    Query query1 = query("coll").filter(orFilters(filter("a", "==", 1), filter("b", "==", 1)));
+    DocumentSet result1 =
+        expectOptimizedCollectionScan(() -> runQuery(query1, SnapshotVersion.NONE));
+    assertEquals(docSet(query1.comparator(), doc1, doc2, doc4, doc5), result1);
+
+    // with one inequality: a>2 || b==1.
+    Query query2 = query("coll").filter(orFilters(filter("a", ">", 2), filter("b", "==", 1)));
+    DocumentSet result2 =
+        expectOptimizedCollectionScan(() -> runQuery(query2, SnapshotVersion.NONE));
+    assertEquals(docSet(query2.comparator(), doc2, doc3, doc5), result2);
+
+    // (a==1 && b==0) || (a==3 && b==2)
+    Query query3 =
+        query("coll")
+            .filter(
+                orFilters(
+                    andFilters(filter("a", "==", 1), filter("b", "==", 0)),
+                    andFilters(filter("a", "==", 3), filter("b", "==", 2))));
+    DocumentSet result3 =
+        expectOptimizedCollectionScan(() -> runQuery(query3, SnapshotVersion.NONE));
+    assertEquals(docSet(query3.comparator(), doc1, doc3), result3);
+
+    // a==1 && (b==0 || b==3).
+    Query query4 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "==", 1), orFilters(filter("b", "==", 0), filter("b", "==", 3))));
+    DocumentSet result4 =
+        expectOptimizedCollectionScan(() -> runQuery(query4, SnapshotVersion.NONE));
+    assertEquals(docSet(query4.comparator(), doc1, doc4), result4);
+
+    // (a==2 || b==2) && (a==3 || b==3)
+    Query query5 =
+        query("coll")
+            .filter(
+                andFilters(
+                    orFilters(filter("a", "==", 2), filter("b", "==", 2)),
+                    orFilters(filter("a", "==", 3), filter("b", "==", 3))));
+    DocumentSet result5 =
+        expectOptimizedCollectionScan(() -> runQuery(query5, SnapshotVersion.NONE));
+    assertEquals(docSet(query5.comparator(), doc3), result5);
+
+    // Test with limits (implicit order by ASC): (a==1) || (b > 0) LIMIT 2
+    Query query6 =
+        query("coll").filter(orFilters(filter("a", "==", 1), filter("b", ">", 0))).limitToFirst(2);
+    DocumentSet result6 =
+        expectOptimizedCollectionScan(() -> runQuery(query6, SnapshotVersion.NONE));
+    assertEquals(docSet(query6.comparator(), doc1, doc2), result6);
+
+    // Test with limits (implicit order by DESC): (a==1) || (b > 0) LIMIT_TO_LAST 2
+    Query query7 =
+        query("coll").filter(orFilters(filter("a", "==", 1), filter("b", ">", 0))).limitToLast(2);
+    DocumentSet result7 =
+        expectOptimizedCollectionScan(() -> runQuery(query7, SnapshotVersion.NONE));
+    assertEquals(docSet(query7.comparator(), doc3, doc4), result7);
+
+    // Test with limits (explicit order by ASC): (a==2) || (b == 1) ORDER BY a LIMIT 1
+    Query query8 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 2), filter("b", "==", 1)))
+            .limitToFirst(1)
+            .orderBy(orderBy("a", "asc"));
+    DocumentSet result8 =
+        expectOptimizedCollectionScan(() -> runQuery(query8, SnapshotVersion.NONE));
+    assertEquals(docSet(query8.comparator(), doc5), result8);
+
+    // Test with limits (explicit order by DESC): (a==2) || (b == 1) ORDER BY a LIMIT_TO_LAST 1
+    Query query9 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 2), filter("b", "==", 1)))
+            .limitToLast(1)
+            .orderBy(orderBy("a", "asc"));
+    DocumentSet result9 =
+        expectOptimizedCollectionScan(() -> runQuery(query9, SnapshotVersion.NONE));
+    assertEquals(docSet(query9.comparator(), doc2), result9);
+
+    // Test with limits without orderBy (the __name__ ordering is the tie breaker).
+    Query query10 =
+        query("coll").filter(orFilters(filter("a", "==", 2), filter("b", "==", 1))).limitToFirst(1);
+    DocumentSet result10 =
+        expectOptimizedCollectionScan(() -> runQuery(query10, SnapshotVersion.NONE));
+    assertEquals(docSet(query10.comparator(), doc2), result10);
+  }
+
+  @Test
+  public void orQueryWithInAndNotInUsingIndexes() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", 0));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", 1));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", 2));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", 3));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.DESCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.DESCENDING));
+    indexManager.updateIndexEntries(docMap(doc1, doc2, doc3, doc4, doc5, doc6));
+    indexManager.updateCollectionGroup("coll", IndexOffset.fromDocument(doc6));
+
+    // Two equalities: a==1 || b==1.
+    Query query1 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 2), filter("b", "in", Arrays.asList(2, 3))));
+    DocumentSet result1 =
+        expectOptimizedCollectionScan(() -> runQuery(query1, SnapshotVersion.NONE));
+    assertEquals(docSet(query1.comparator(), doc3, doc4, doc6), result1);
+
+    // a==2 || (b != 2 && b != 3)
+    // Has implicit "orderBy b"
+    Query query2 =
+        query("coll")
+            .filter(orFilters(filter("a", "==", 2), filter("b", "not-in", Arrays.asList(2, 3))));
+    DocumentSet result2 =
+        expectOptimizedCollectionScan(() -> runQuery(query2, SnapshotVersion.NONE));
+    assertEquals(docSet(query2.comparator(), doc1, doc2), result2);
+  }
+
+  @Test
+  public void orQueryWithArrayMembershipUsingIndexes() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", Arrays.asList(0)));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", Arrays.asList(1)));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", Arrays.asList(2, 7)));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", Arrays.asList(3, 7)));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.DESCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.CONTAINS));
+    indexManager.updateIndexEntries(docMap(doc1, doc2, doc3, doc4, doc5, doc6));
+    indexManager.updateCollectionGroup("coll", IndexOffset.fromDocument(doc6));
+
+    Query query1 =
+        query("coll").filter(orFilters(filter("a", "==", 2), filter("b", "array-contains", 7)));
+    DocumentSet result1 =
+        expectOptimizedCollectionScan(() -> runQuery(query1, SnapshotVersion.NONE));
+    assertEquals(docSet(query1.comparator(), doc3, doc4, doc6), result1);
+
+    Query query2 =
+        query("coll")
+            .filter(
+                orFilters(
+                    filter("a", "==", 2), filter("b", "array-contains-any", Arrays.asList(0, 3))));
+    DocumentSet result2 =
+        expectOptimizedCollectionScan(() -> runQuery(query2, SnapshotVersion.NONE));
+    assertEquals(docSet(query2.comparator(), doc1, doc4, doc6), result2);
+  }
+
+  @Test
+  public void queryWithMultipleInsOnTheSameField() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", 0));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", 1));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", 2));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", 3));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.DESCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.DESCENDING));
+    indexManager.updateIndexEntries(docMap(doc1, doc2, doc3, doc4, doc5, doc6));
+    indexManager.updateCollectionGroup("coll", IndexOffset.fromDocument(doc6));
+
+    // a IN [1,2,3] && a IN [0,1,4] should result in "a==1".
+    Query query1 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(1, 2, 3)),
+                    filter("a", "in", Arrays.asList(0, 1, 4))));
+    DocumentSet result1 =
+        expectOptimizedCollectionScan(() -> runQuery(query1, SnapshotVersion.NONE));
+    assertEquals(docSet(query1.comparator(), doc1, doc4, doc5), result1);
+
+    // a IN [2,3] && a IN [0,1,4] is never true and so the result should be an empty set.
+    Query query2 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    filter("a", "in", Arrays.asList(0, 1, 4))));
+
+    DocumentSet result2 =
+        expectOptimizedCollectionScan(() -> runQuery(query2, SnapshotVersion.NONE));
+    assertEquals(docSet(query2.comparator()), result2);
+
+    // a IN [0,3] || a IN [0,2] should union them (similar to: a IN [0,2,3]).
+    Query query3 =
+        query("coll")
+            .filter(
+                orFilters(
+                    filter("a", "in", Arrays.asList(0, 3)),
+                    filter("a", "in", Arrays.asList(0, 2))));
+
+    DocumentSet result3 =
+        expectOptimizedCollectionScan(() -> runQuery(query3, SnapshotVersion.NONE));
+    assertEquals(docSet(query3.comparator(), doc3, doc6), result3);
+
+    // Nested composite filter: (a IN [0,1,2,3] && (a IN [0,2] || (b>1 && a IN [1,3]))
+    Query query4 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(0, 1, 2, 3)),
+                    orFilters(
+                        filter("a", "in", Arrays.asList(0, 2)),
+                        andFilters(filter("b", ">=", 1), filter("a", "in", Arrays.asList(1, 3))))));
+
+    DocumentSet result4 =
+        expectOptimizedCollectionScan(() -> runQuery(query4, SnapshotVersion.NONE));
+    assertEquals(docSet(query4.comparator(), doc3, doc4), result4);
+  }
+
+  @Test
+  public void queryWithMultipleInsOnDifferentFields() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", 0));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", 1));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", 2));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", 3));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.DESCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.DESCENDING));
+    indexManager.updateIndexEntries(docMap(doc1, doc2, doc3, doc4, doc5, doc6));
+    indexManager.updateCollectionGroup("coll", IndexOffset.fromDocument(doc6));
+
+    Query query1 =
+        query("coll")
+            .filter(
+                orFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    filter("b", "in", Arrays.asList(0, 2))));
+    DocumentSet result1 =
+        expectOptimizedCollectionScan(() -> runQuery(query1, SnapshotVersion.NONE));
+    assertEquals(docSet(query1.comparator(), doc1, doc3, doc6), result1);
+
+    Query query2 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    filter("b", "in", Arrays.asList(0, 2))));
+
+    DocumentSet result2 =
+        expectOptimizedCollectionScan(() -> runQuery(query2, SnapshotVersion.NONE));
+    assertEquals(docSet(query2.comparator(), doc3), result2);
+
+    // Nested composite filter: (b in [0,3] && (b IN [1] || (b in [2,3] && a IN [1,3]))
+    Query query3 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("b", "in", Arrays.asList(0, 3)),
+                    orFilters(
+                        filter("b", "in", Arrays.asList(1)),
+                        andFilters(
+                            filter("b", "in", Arrays.asList(2, 3)),
+                            filter("a", "in", Arrays.asList(1, 3))))));
+
+    DocumentSet result3 =
+        expectOptimizedCollectionScan(() -> runQuery(query3, SnapshotVersion.NONE));
+    assertEquals(docSet(query3.comparator(), doc4), result3);
+  }
+
+  @Test
+  public void queryInWithArrayContainsAny() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", Arrays.asList(0)));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", Arrays.asList(1)));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", Arrays.asList(2, 7), "c", 10));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", Arrays.asList(3, 7)));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2, "c", 20));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.DESCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.CONTAINS));
+    indexManager.updateIndexEntries(docMap(doc1, doc2, doc3, doc4, doc5, doc6));
+    indexManager.updateCollectionGroup("coll", IndexOffset.fromDocument(doc6));
+
+    Query query1 =
+        query("coll")
+            .filter(
+                orFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    filter("b", "array-contains-any", Arrays.asList(0, 7))));
+    DocumentSet result1 =
+        expectOptimizedCollectionScan(() -> runQuery(query1, SnapshotVersion.NONE));
+    assertEquals(docSet(query1.comparator(), doc1, doc3, doc4, doc6), result1);
+
+    Query query2 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    filter("b", "array-contains-any", Arrays.asList(0, 7))));
+
+    DocumentSet result2 =
+        expectOptimizedCollectionScan(() -> runQuery(query2, SnapshotVersion.NONE));
+    assertEquals(docSet(query2.comparator(), doc3), result2);
+
+    Query query3 =
+        query("coll")
+            .filter(
+                orFilters(
+                    andFilters(filter("a", "in", Arrays.asList(2, 3)), filter("c", "==", 10)),
+                    filter("b", "array-contains-any", Arrays.asList(0, 7))));
+    DocumentSet result3 =
+        expectOptimizedCollectionScan(() -> runQuery(query3, SnapshotVersion.NONE));
+    assertEquals(docSet(query3.comparator(), doc1, doc3, doc4), result3);
+
+    Query query4 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    orFilters(
+                        filter("b", "array-contains-any", Arrays.asList(0, 7)),
+                        filter("c", "==", 20))));
+    DocumentSet result4 =
+        expectOptimizedCollectionScan(() -> runQuery(query4, SnapshotVersion.NONE));
+    assertEquals(docSet(query4.comparator(), doc3, doc6), result4);
+  }
+
+  @Test
+  public void queryInWithArrayContains() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", Arrays.asList(0)));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", Arrays.asList(1)));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", Arrays.asList(2, 7), "c", 10));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", Arrays.asList(3, 7)));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2, "c", 20));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.DESCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.CONTAINS));
+    indexManager.updateIndexEntries(docMap(doc1, doc2, doc3, doc4, doc5, doc6));
+    indexManager.updateCollectionGroup("coll", IndexOffset.fromDocument(doc6));
+
+    Query query1 =
+        query("coll")
+            .filter(
+                orFilters(
+                    filter("a", "in", Arrays.asList(2, 3)), filter("b", "array-contains", 3)));
+    DocumentSet result1 =
+        expectOptimizedCollectionScan(() -> runQuery(query1, SnapshotVersion.NONE));
+    assertEquals(docSet(query1.comparator(), doc3, doc4, doc6), result1);
+
+    Query query2 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(2, 3)), filter("b", "array-contains", 7)));
+
+    DocumentSet result2 =
+        expectOptimizedCollectionScan(() -> runQuery(query2, SnapshotVersion.NONE));
+    assertEquals(docSet(query2.comparator(), doc3), result2);
+
+    Query query3 =
+        query("coll")
+            .filter(
+                orFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    andFilters(filter("b", "array-contains", 3), filter("a", "==", 1))));
+    DocumentSet result3 =
+        expectOptimizedCollectionScan(() -> runQuery(query3, SnapshotVersion.NONE));
+    assertEquals(docSet(query3.comparator(), doc3, doc4, doc6), result3);
+
+    Query query4 =
+        query("coll")
+            .filter(
+                andFilters(
+                    filter("a", "in", Arrays.asList(2, 3)),
+                    orFilters(filter("b", "array-contains", 7), filter("a", "==", 1))));
+    DocumentSet result4 =
+        expectOptimizedCollectionScan(() -> runQuery(query4, SnapshotVersion.NONE));
+    assertEquals(docSet(query4.comparator(), doc3), result4);
+  }
+
+  @Test
+  public void orderByEquality() throws Exception {
+    MutableDocument doc1 = doc("coll/1", 1, map("a", 1, "b", Arrays.asList(0)));
+    MutableDocument doc2 = doc("coll/2", 1, map("b", Arrays.asList(1)));
+    MutableDocument doc3 = doc("coll/3", 1, map("a", 3, "b", Arrays.asList(2, 7), "c", 10));
+    MutableDocument doc4 = doc("coll/4", 1, map("a", 1, "b", Arrays.asList(3, 7)));
+    MutableDocument doc5 = doc("coll/5", 1, map("a", 1));
+    MutableDocument doc6 = doc("coll/6", 1, map("a", 2, "c", 20));
+    addDocument(doc1, doc2, doc3, doc4, doc5, doc6);
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.DESCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "b", Kind.CONTAINS));
+    indexManager.updateIndexEntries(docMap(doc1, doc2, doc3, doc4, doc5, doc6));
+    indexManager.updateCollectionGroup("coll", IndexOffset.fromDocument(doc6));
+
+    Query query1 = query("coll").filter(filter("a", "==", 1)).orderBy(orderBy("a"));
+    DocumentSet result1 =
+        expectOptimizedCollectionScan(() -> runQuery(query1, SnapshotVersion.NONE));
+    assertEquals(docSet(query1.comparator(), doc1, doc4, doc5), result1);
+
+    Query query2 =
+        query("coll").filter(filter("a", "in", Arrays.asList(2, 3))).orderBy(orderBy("a"));
+    DocumentSet result2 =
+        expectOptimizedCollectionScan(() -> runQuery(query2, SnapshotVersion.NONE));
+    assertEquals(docSet(query2.comparator(), doc6, doc3), result2);
   }
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteSchemaTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteSchemaTest.java
index ab1adc18288..44fe6051898 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteSchemaTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteSchemaTest.java
@@ -445,12 +445,15 @@ public void existingDocumentsRemainReadableAfterIndexFreeMigration() {
     // Verify that queries with SnapshotVersion.NONE return all results, regardless of whether the
     // read time has been set.
     Map<DocumentKey, MutableDocument> results =
-        remoteDocumentCache.getAll(path("coll"), IndexOffset.NONE);
+        remoteDocumentCache.getDocumentsMatchingQuery(
+            query("coll"), IndexOffset.NONE, new HashSet<DocumentKey>());
     assertResultsContain(results, "coll/existing", "coll/old", "coll/current", "coll/new");
 
     // Queries that filter by read time only return documents that were written after the index-free
     // migration.
-    results = remoteDocumentCache.getAll(path("coll"), IndexOffset.createSuccessor(version(2), -1));
+    results =
+        remoteDocumentCache.getDocumentsMatchingQuery(
+            query("coll"), IndexOffset.createSuccessor(version(2), -1), new HashSet<DocumentKey>());
     assertResultsContain(results, "coll/new");
   }
 
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/TargetCacheTestCase.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/TargetCacheTestCase.java
index e098f7666f1..58a3a57ba69 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/TargetCacheTestCase.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/TargetCacheTestCase.java
@@ -331,7 +331,8 @@ private TargetData newTargetData(Query query, int targetId, long version) {
         QueryPurpose.LISTEN,
         version(version),
         version(version),
-        resumeToken(version));
+        resumeToken(version),
+        null);
   }
 
   /** Adds the given query data to the targetCache under test, committing immediately. */
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/model/DocumentKeyTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/model/DocumentKeyTest.java
index f93ba0276c0..7c30c1d2325 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/model/DocumentKeyTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/model/DocumentKeyTest.java
@@ -17,9 +17,11 @@
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThrows;
 
 import com.google.firebase.firestore.testutil.ComparatorTester;
 import java.util.Collections;
+import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -57,8 +59,9 @@ public void testComparison() {
         .testCompare();
   }
 
-  @Test(expected = Throwable.class)
+  @Test
   public void testUnevenNumberOfSegmentsAreRejected() {
-    DocumentKey.fromSegments(Collections.singletonList("a"));
+    List<String> segments = Collections.singletonList("a");
+    assertThrows(Throwable.class, () -> DocumentKey.fromSegments(segments));
   }
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/model/TargetIndexMatcherTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/model/TargetIndexMatcherTest.java
index e4e1c2541df..195717bae1d 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/model/TargetIndexMatcherTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/model/TargetIndexMatcherTest.java
@@ -16,16 +16,18 @@
 
 import static com.google.firebase.firestore.testutil.TestUtil.assertDoesNotThrow;
 import static com.google.firebase.firestore.testutil.TestUtil.expectError;
-import static com.google.firebase.firestore.testutil.TestUtil.field;
 import static com.google.firebase.firestore.testutil.TestUtil.fieldIndex;
 import static com.google.firebase.firestore.testutil.TestUtil.filter;
 import static com.google.firebase.firestore.testutil.TestUtil.orderBy;
 import static com.google.firebase.firestore.testutil.TestUtil.path;
 import static com.google.firebase.firestore.testutil.TestUtil.query;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import com.google.firebase.firestore.core.Query;
+import com.google.firebase.firestore.core.Target;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -58,6 +60,14 @@ public class TargetIndexMatcherTest {
           query("collId")
               .filter(filter("a", "array-contains-any", Collections.singletonList("a"))));
 
+  List<Query> queriesWithOrderBys =
+      Arrays.asList(
+          query("collId").orderBy(orderBy("a")),
+          query("collId").orderBy(orderBy("a", "desc")),
+          query("collId").orderBy(orderBy("a", "asc")),
+          query("collId").orderBy(orderBy("a")).orderBy(orderBy("__name__")),
+          query("collId").filter(filter("a", "array-contains", "a")).orderBy(orderBy("b")));
+
   @Test
   public void canUseMergeJoin() {
     Query q = query("collId").filter(filter("a", "==", 1)).filter(filter("b", "==", 2));
@@ -566,6 +576,60 @@ public void withInAndOrderBySameField() {
     validateServesTarget(q, "a", FieldIndex.Segment.Kind.ASCENDING);
   }
 
+  @Test
+  public void withEqualityAndInequalityOnTheSameField() {
+    validateServesTarget(
+        query("collId").filter(filter("a", ">=", 5)).filter(filter("a", "==", 0)),
+        "a",
+        FieldIndex.Segment.Kind.ASCENDING);
+
+    validateServesTarget(
+        query("collId")
+            .filter(filter("a", ">=", 5))
+            .filter(filter("a", "==", 0))
+            .orderBy(orderBy("a")),
+        "a",
+        FieldIndex.Segment.Kind.ASCENDING);
+
+    validateServesTarget(
+        query("collId")
+            .filter(filter("a", ">=", 5))
+            .filter(filter("a", "==", 0))
+            .orderBy(orderBy("a"))
+            .orderBy(orderBy(DocumentKey.KEY_FIELD_NAME)),
+        "a",
+        FieldIndex.Segment.Kind.ASCENDING);
+
+    validateServesTarget(
+        query("collId")
+            .filter(filter("a", ">=", 5))
+            .filter(filter("a", "==", 0))
+            .orderBy(orderBy("a"))
+            .orderBy(orderBy(DocumentKey.KEY_FIELD_NAME, "desc")),
+        "a",
+        FieldIndex.Segment.Kind.ASCENDING);
+
+    validateServesTarget(
+        query("collId")
+            .filter(filter("a", ">=", 5))
+            .filter(filter("a", "==", 0))
+            .orderBy(orderBy("a", "asc"))
+            .orderBy(orderBy("b", "asc")),
+        "a",
+        FieldIndex.Segment.Kind.ASCENDING,
+        "b",
+        FieldIndex.Segment.Kind.ASCENDING);
+
+    validateServesTarget(
+        query("collId")
+            .filter(filter("a", ">=", 5))
+            .filter(filter("a", "==", 0))
+            .orderBy(orderBy("a", "desc"))
+            .orderBy(orderBy(DocumentKey.KEY_FIELD_NAME, "desc")),
+        "a",
+        FieldIndex.Segment.Kind.DESCENDING);
+  }
+
   private void validateServesTarget(
       Query query, String field, FieldIndex.Segment.Kind kind, Object... fieldsAndKind) {
     FieldIndex expectedIndex = fieldIndex("collId", field, kind, fieldsAndKind);
@@ -579,4 +643,195 @@ private void validateDoesNotServeTarget(
     TargetIndexMatcher targetIndexMatcher = new TargetIndexMatcher(query.toTarget());
     assertFalse(targetIndexMatcher.servedByIndex(expectedIndex));
   }
+
+  @Test
+  public void testBuildTargetIndexWithQueriesWithEqualities() {
+    for (Query query : queriesWithEqualities) {
+      validateBuildTargetIndexCreateFullMatchIndex(query);
+    }
+  }
+
+  @Test
+  public void testBuildTargetIndexWithQueriesWithInequalities() {
+    for (Query query : queriesWithInequalities) {
+      validateBuildTargetIndexCreateFullMatchIndex(query);
+    }
+  }
+
+  @Test
+  public void testBuildTargetIndexWithQueriesWithArrayContains() {
+    for (Query query : queriesWithArrayContains) {
+      validateBuildTargetIndexCreateFullMatchIndex(query);
+    }
+  }
+
+  @Test
+  public void testBuildTargetIndexWithQueriesWithOrderBys() {
+    for (Query query : queriesWithOrderBys) {
+      validateBuildTargetIndexCreateFullMatchIndex(query);
+    }
+  }
+
+  @Test
+  public void testBuildTargetIndexWithInequalityUsesSingleFieldIndex() {
+    Query query = query("collId").filter(filter("a", ">", 1)).filter(filter("a", "<", 10));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexWithCollection() {
+    Query query = query("collId");
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexWithArrayContainsAndOrderBy() {
+    Query query =
+        query("collId")
+            .filter(filter("a", "array-contains", "a"))
+            .filter(filter("a", ">", "b"))
+            .orderBy(orderBy("a", "asc"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexWithEqualityAndDescendingOrder() {
+    Query query = query("collId").filter(filter("a", "==", 1)).orderBy(orderBy("__name__", "desc"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexWithMultipleEqualities() {
+    Query query = query("collId").filter(filter("a1", "==", "a")).filter(filter("a2", "==", "b"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexWithMultipleEqualitiesAndInequality() {
+    Query query =
+        query("collId")
+            .filter(filter("equality1", "==", "a"))
+            .filter(filter("equality2", "==", "b"))
+            .filter(filter("inequality", ">=", "c"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+    query =
+        query("collId")
+            .filter(filter("equality1", "==", "a"))
+            .filter(filter("inequality", ">=", "c"))
+            .filter(filter("equality2", "==", "b"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexWithMultipleFilters() {
+    Query query = query("collId").filter(filter("a", "==", "a")).filter(filter("b", ">", "b"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+    query =
+        query("collId")
+            .filter(filter("a1", "==", "a"))
+            .filter(filter("a2", ">", "b"))
+            .orderBy(orderBy("a2", "asc"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+    query =
+        query("collId")
+            .filter(filter("a", ">=", 1))
+            .filter(filter("a", "==", 5))
+            .filter(filter("a", "<=", 10));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+    query =
+        query("collId")
+            .filter(filter("a", "not-in", Arrays.asList(1, 2, 3)))
+            .filter(filter("a", ">=", 2));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexWithMultipleOrderBys() {
+    Query query =
+        query("collId")
+            .orderBy(orderBy("fff"))
+            .orderBy(orderBy("bar", "desc"))
+            .orderBy(orderBy("__name__"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+    query =
+        query("collId")
+            .orderBy(orderBy("foo"))
+            .orderBy(orderBy("bar"))
+            .orderBy(orderBy("__name__", "desc"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexWithInAndNotIn() {
+    Query query =
+        query("collId")
+            .filter(filter("a", "not-in", Arrays.asList(1, 2, 3)))
+            .filter(filter("b", "in", Arrays.asList(1, 2, 3)));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexWithEqualityAndDifferentOrderBy() {
+    Query query =
+        query("collId")
+            .filter(filter("foo", "==", ""))
+            .filter(filter("bar", "==", ""))
+            .orderBy(orderBy("qux"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+    query =
+        query("collId")
+            .filter(filter("aaa", "==", ""))
+            .filter(filter("qqq", "==", ""))
+            .filter(filter("ccc", "==", ""))
+            .orderBy(orderBy("fff", "desc"))
+            .orderBy(orderBy("bbb"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexWithEqualsAndNotIn() {
+    Query query =
+        query("collId")
+            .filter(filter("a", "==", 1))
+            .filter(filter("b", "not-in", Arrays.asList(1, 2, 3)));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexWithInAndOrderBy() {
+    Query query =
+        query("collId")
+            .filter(filter("a", "not-in", Arrays.asList(1, 2, 3)))
+            .orderBy(orderBy("a"))
+            .orderBy(orderBy("b"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexWithInAndOrderBySameField() {
+    Query query =
+        query("collId").filter(filter("a", "in", Arrays.asList(1, 2, 3))).orderBy(orderBy("a"));
+    validateBuildTargetIndexCreateFullMatchIndex(query);
+  }
+
+  @Test
+  public void testBuildTargetIndexReturnsNullForMultipleInequality() {
+    Query query = query("collId").filter(filter("a", ">=", 1)).filter(filter("b", "<=", 10));
+    Target target = query.toTarget();
+    TargetIndexMatcher targetIndexMatcher = new TargetIndexMatcher(target);
+    assertTrue(targetIndexMatcher.hasMultipleInequality());
+    FieldIndex actualIndex = targetIndexMatcher.buildTargetIndex();
+    assertNull(actualIndex);
+  }
+
+  private void validateBuildTargetIndexCreateFullMatchIndex(Query query) {
+    Target target = query.toTarget();
+    TargetIndexMatcher targetIndexMatcher = new TargetIndexMatcher(target);
+    assertFalse(targetIndexMatcher.hasMultipleInequality());
+    FieldIndex actualIndex = targetIndexMatcher.buildTargetIndex();
+    assertNotNull(actualIndex);
+    assertTrue(targetIndexMatcher.servedByIndex(actualIndex));
+    // Check the index created is a FULL MATCH index
+    assertTrue(actualIndex.getSegments().size() >= target.getSegmentCount());
+  }
 }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/BloomFilterTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/BloomFilterTest.java
new file mode 100644
index 00000000000..0c82dcf5c46
--- /dev/null
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/BloomFilterTest.java
@@ -0,0 +1,320 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore.remote;
+
+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 com.google.protobuf.ByteString;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.stream.Stream;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class BloomFilterTest {
+  private static final String GOLDEN_DOCUMENT_PREFIX =
+      "projects/project-1/databases/database-1/documents/coll/doc";
+  private static final String GOLDEN_TEST_LOCATION =
+      "src/test/resources/bloom_filter_golden_test_data/";
+
+  @Test
+  public void instantiateEmptyBloomFilter() {
+    BloomFilter bloomFilter = new BloomFilter(ByteString.empty(), 0, 0);
+    assertEquals(bloomFilter.getBitCount(), 0);
+  }
+
+  @Test
+  public void instantiateNonEmptyBloomFilter() {
+    {
+      BloomFilter bloomFilter = new BloomFilter(ByteString.copyFrom(new byte[] {1}), 0, 1);
+      assertEquals(bloomFilter.getBitCount(), 8);
+    }
+    {
+      BloomFilter bloomFilter = new BloomFilter(ByteString.copyFrom(new byte[] {1}), 7, 1);
+      assertEquals(bloomFilter.getBitCount(), 1);
+    }
+  }
+
+  @Test
+  public void constructorShouldThrowNPEOnNullBitmap() {
+    assertThrows(NullPointerException.class, () -> new BloomFilter(null, 0, 0));
+    assertThrows(NullPointerException.class, () -> new BloomFilter(null, 1, 1));
+  }
+
+  @Test
+  public void createShouldCreateAnEmptyBloomFilter() throws Exception {
+    BloomFilter bloomFilter = BloomFilter.create(ByteString.empty(), 0, 0);
+    assertEquals(bloomFilter.getBitCount(), 0);
+  }
+
+  @Test
+  public void createShouldCreatenNonEmptyBloomFilter() throws Exception {
+    {
+      BloomFilter bloomFilter = BloomFilter.create(ByteString.copyFrom(new byte[] {1}), 0, 1);
+      assertEquals(bloomFilter.getBitCount(), 8);
+    }
+    {
+      BloomFilter bloomFilter = BloomFilter.create(ByteString.copyFrom(new byte[] {1}), 7, 1);
+      assertEquals(bloomFilter.getBitCount(), 1);
+    }
+  }
+
+  @Test
+  public void createShouldThrowBFEOnEmptyBloomFilterWithNonZeroPadding() {
+    BloomFilter.BloomFilterCreateException exception =
+        assertThrows(
+            BloomFilter.BloomFilterCreateException.class,
+            () -> BloomFilter.create(ByteString.empty(), 1, 0));
+    assertThat(exception).hasMessageThat().ignoringCase().contains("padding of 0");
+    assertThat(exception).hasMessageThat().ignoringCase().contains("bitmap length is 0");
+    assertThat(exception).hasMessageThat().ignoringCase().contains("got 1");
+  }
+
+  @Test
+  public void createShouldThrowOnNonEmptyBloomFilterWithZeroHashCount() {
+    BloomFilter.BloomFilterCreateException exception =
+        assertThrows(
+            BloomFilter.BloomFilterCreateException.class,
+            () -> BloomFilter.create(ByteString.copyFrom(new byte[] {1}), 1, 0));
+    assertThat(exception).hasMessageThat().ignoringCase().contains("hash count: 0");
+  }
+
+  @Test
+  public void createShouldThrowOnNegativePadding() {
+    {
+      BloomFilter.BloomFilterCreateException exception =
+          assertThrows(
+              BloomFilter.BloomFilterCreateException.class,
+              () -> BloomFilter.create(ByteString.empty(), -1, 0));
+      assertThat(exception).hasMessageThat().ignoringCase().contains("padding: -1");
+    }
+    {
+      BloomFilter.BloomFilterCreateException exception =
+          assertThrows(
+              BloomFilter.BloomFilterCreateException.class,
+              () -> BloomFilter.create(ByteString.copyFrom(new byte[] {1}), -1, 1));
+      assertThat(exception).hasMessageThat().ignoringCase().contains("padding: -1");
+    }
+  }
+
+  @Test
+  public void createShouldThrowOnNegativeHashCount() {
+    {
+      BloomFilter.BloomFilterCreateException exception =
+          assertThrows(
+              BloomFilter.BloomFilterCreateException.class,
+              () -> BloomFilter.create(ByteString.empty(), 0, -1));
+      assertThat(exception).hasMessageThat().ignoringCase().contains("hash count: -1");
+    }
+    {
+      BloomFilter.BloomFilterCreateException exception =
+          assertThrows(
+              BloomFilter.BloomFilterCreateException.class,
+              () -> BloomFilter.create(ByteString.copyFrom(new byte[] {1}), 1, -1));
+      assertThat(exception).hasMessageThat().ignoringCase().contains("hash count: -1");
+    }
+  }
+
+  @Test
+  public void createShouldThrowIfPaddingIsTooLarge() {
+    BloomFilter.BloomFilterCreateException exception =
+        assertThrows(
+            BloomFilter.BloomFilterCreateException.class,
+            () -> BloomFilter.create(ByteString.copyFrom(new byte[] {1}), 8, 1));
+    assertThat(exception).hasMessageThat().ignoringCase().contains("padding: 8");
+  }
+
+  @Test
+  public void mightContainCanProcessNonStandardCharacters() {
+    // A non-empty BloomFilter object with 1 insertion : "ÀÒ∑"
+    BloomFilter bloomFilter =
+        new BloomFilter(ByteString.copyFrom(new byte[] {(byte) 237, 5}), 5, 8);
+    assertTrue(bloomFilter.mightContain("ÀÒ∑"));
+    assertFalse(bloomFilter.mightContain("Ò∑À"));
+  }
+
+  @Test
+  public void mightContainOnEmptyBloomFilterShouldReturnFalse() {
+    BloomFilter bloomFilter = new BloomFilter(ByteString.empty(), 0, 0);
+    assertFalse(bloomFilter.mightContain(""));
+    assertFalse(bloomFilter.mightContain("a"));
+  }
+
+  @Test
+  public void mightContainWithEmptyStringMightReturnFalsePositiveResult() {
+    {
+      BloomFilter bloomFilter = new BloomFilter(ByteString.copyFrom(new byte[] {1}), 1, 1);
+      assertFalse(bloomFilter.mightContain(""));
+    }
+    {
+      BloomFilter bloomFilter =
+          new BloomFilter(ByteString.copyFrom(new byte[] {(byte) 255}), 0, 16);
+      assertTrue(bloomFilter.mightContain(""));
+    }
+  }
+
+  @Test
+  public void toStringOnEmptyBitmap() {
+    String toStringResult = new BloomFilter(ByteString.empty(), 0, 0).toString();
+    assertThat(toStringResult).startsWith("BloomFilter{");
+    assertThat(toStringResult).endsWith("}");
+    assertThat(toStringResult).contains("hashCount=0");
+    assertThat(toStringResult).contains("size=0");
+    assertThat(toStringResult).contains("bitmap=\"\"");
+  }
+
+  @Test
+  public void toStringOnNonEmptyBitmap() {
+    String toStringResult =
+        new BloomFilter(ByteString.copyFrom(new byte[] {0x01, (byte) 0xAE, (byte) 0xFF}), 3, 7)
+            .toString();
+    assertThat(toStringResult).startsWith("BloomFilter{");
+    assertThat(toStringResult).endsWith("}");
+    assertThat(toStringResult).contains("hashCount=7");
+    assertThat(toStringResult).contains("size=21");
+    assertThat(toStringResult).contains("bitmap=\"Aa7/\"");
+  }
+
+  /**
+   * Golden tests are generated by backend based on inserting n number of document paths into a
+   * bloom filter.
+   *
+   * <p>Full document path is generated by concatenating documentPrefix and number n, eg,
+   * projects/project-1/databases/database-1/documents/coll/doc12.
+   *
+   * <p>The test result is generated by checking the membership of documents from documentPrefix+0
+   * to documentPrefix+2n. The membership results from 0 to n is expected to be true, and the
+   * membership results from n to 2n is expected to be false with some false positive results.
+   */
+  private static void runGoldenTest(String testFile) throws Exception {
+    String resultFile = testFile.replace("bloom_filter_proto", "membership_test_result");
+    if (resultFile.equals(testFile)) {
+      throw new IllegalArgumentException("Cannot find corresponding result file for " + testFile);
+    }
+
+    JSONObject testJson = readJsonFile(testFile);
+    JSONObject resultJSON = readJsonFile(resultFile);
+
+    JSONObject bits = testJson.getJSONObject("bits");
+    String bitmap = bits.getString("bitmap");
+    int padding = bits.getInt("padding");
+    int hashCount = testJson.getInt("hashCount");
+    BloomFilter bloomFilter =
+        BloomFilter.create(
+            ByteString.copyFrom(Base64.getDecoder().decode(bitmap)), padding, hashCount);
+
+    String membershipTestResults = resultJSON.getString("membershipTestResults");
+
+    // Run and compare mightContain result with the expectation.
+    for (int i = 0; i < membershipTestResults.length(); i++) {
+      boolean expectedResult = membershipTestResults.charAt(i) == '1';
+      boolean mightContainResult = bloomFilter.mightContain(GOLDEN_DOCUMENT_PREFIX + i);
+      assertEquals(
+          "For document "
+              + GOLDEN_DOCUMENT_PREFIX
+              + i
+              + " mightContain() returned "
+              + mightContainResult
+              + ", but expected "
+              + expectedResult,
+          mightContainResult,
+          expectedResult);
+    }
+  }
+
+  private static JSONObject readJsonFile(String fileName) throws Exception {
+    StringBuilder builder = new StringBuilder();
+    InputStreamReader streamReader =
+        new InputStreamReader(
+            new FileInputStream(GOLDEN_TEST_LOCATION + fileName), StandardCharsets.UTF_8);
+    BufferedReader reader = new BufferedReader(streamReader);
+    Stream<String> lines = reader.lines();
+    lines.forEach(builder::append);
+    String json = builder.toString();
+    return new JSONObject(json);
+  }
+
+  @Test
+  public void goldenTest_1Document_1FalsePositiveRate() throws Exception {
+    runGoldenTest("Validation_BloomFilterTest_MD5_1_1_bloom_filter_proto.json");
+  }
+
+  @Test
+  public void goldenTest_1Document_01FalsePositiveRate() throws Exception {
+    runGoldenTest("Validation_BloomFilterTest_MD5_1_01_bloom_filter_proto.json");
+  }
+
+  @Test
+  public void goldenTest_1Document_0001FalsePositiveRate() throws Exception {
+    runGoldenTest("Validation_BloomFilterTest_MD5_1_0001_bloom_filter_proto.json");
+  }
+
+  @Test
+  public void goldenTest_500Document_1FalsePositiveRate() throws Exception {
+    runGoldenTest("Validation_BloomFilterTest_MD5_500_1_bloom_filter_proto.json");
+  }
+
+  @Test
+  public void goldenTest_500Document_01FalsePositiveRate() throws Exception {
+    runGoldenTest("Validation_BloomFilterTest_MD5_500_01_bloom_filter_proto.json");
+  }
+
+  @Test
+  public void goldenTest_500Document_0001FalsePositiveRate() throws Exception {
+    runGoldenTest("Validation_BloomFilterTest_MD5_500_0001_bloom_filter_proto.json");
+  }
+
+  @Test
+  public void goldenTest_5000Document_1FalsePositiveRate() throws Exception {
+    runGoldenTest("Validation_BloomFilterTest_MD5_5000_1_bloom_filter_proto.json");
+  }
+
+  @Test
+  public void goldenTest_5000Document_01FalsePositiveRate() throws Exception {
+    runGoldenTest("Validation_BloomFilterTest_MD5_5000_01_bloom_filter_proto.json");
+  }
+
+  @Test
+  public void goldenTest_5000Document_0001FalsePositiveRate() throws Exception {
+    runGoldenTest("Validation_BloomFilterTest_MD5_5000_0001_bloom_filter_proto.json");
+  }
+
+  @Test
+  public void goldenTest_50000Document_1FalsePositiveRate() throws Exception {
+    runGoldenTest("Validation_BloomFilterTest_MD5_50000_1_bloom_filter_proto.json");
+  }
+
+  @Test
+  public void goldenTest_50000Document_01FalsePositiveRate() throws Exception {
+    runGoldenTest("Validation_BloomFilterTest_MD5_50000_01_bloom_filter_proto.json");
+  }
+
+  @Test
+  public void goldenTest_50000Document_0001FalsePositiveRate() throws Exception {
+    runGoldenTest("Validation_BloomFilterTest_MD5_50000_0001_bloom_filter_proto.json");
+  }
+}
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/MockDatastore.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/MockDatastore.java
index e37e7069b0e..91077548585 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/MockDatastore.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/MockDatastore.java
@@ -94,6 +94,11 @@ public void watchQuery(TargetData targetData) {
       // Snapshot version is ignored on the wire
       TargetData sentTargetData =
           targetData.withResumeToken(targetData.getResumeToken(), SnapshotVersion.NONE);
+
+      if (targetData.getExpectedCount() != null) {
+        sentTargetData = sentTargetData.withExpectedCount(targetData.getExpectedCount());
+      }
+
       watchStreamRequestCount += 1;
       this.activeTargets.put(targetData.getTargetId(), sentTargetData);
     }
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/RemoteEventTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/RemoteEventTest.java
index c8761ec7050..57d1d6c0d83 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/RemoteEventTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/RemoteEventTest.java
@@ -39,6 +39,8 @@
 import com.google.firebase.firestore.remote.WatchChange.WatchTargetChange;
 import com.google.firebase.firestore.remote.WatchChange.WatchTargetChangeType;
 import com.google.firebase.firestore.testutil.TestTargetMetadataProvider;
+import com.google.firestore.v1.BitSequence;
+import com.google.firestore.v1.BloomFilter;
 import com.google.protobuf.ByteString;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -456,6 +458,120 @@ public void testExistenceFilterMismatchClearsTarget() {
     assertEquals(0, event.getDocumentUpdates().size());
   }
 
+  @Test
+  public void existenceFilterMismatchWithSuccessfulBloomFilterApplication() {
+    Map<Integer, TargetData> targetMap = activeQueries(1, 2);
+
+    MutableDocument doc1 = doc("docs/1", 1, map("value", 1));
+    MutableDocument doc2 = doc("docs/2", 2, map("value", 2));
+
+    WatchChange change1 = new DocumentChange(asList(1), emptyList(), doc1.getKey(), doc1);
+    WatchChange change2 = new DocumentChange(asList(1), emptyList(), doc2.getKey(), doc2);
+    WatchChange change3 = new WatchTargetChange(WatchTargetChangeType.Current, asList(1));
+
+    // The BloomFilter proto value below is created based on the document paths that are constructed
+    // using the pattern: "projects/test-project/databases/test-database/documents/"+document_key.
+    // Override the default database ID to ensure that the document path matches the pattern above.
+    targetMetadataProvider.setDatabaseId("test-project", "test-database");
+    WatchChangeAggregator aggregator =
+        createAggregator(
+            targetMap,
+            noOutstandingResponses,
+            keySet(doc1.getKey(), doc2.getKey()),
+            change1,
+            change2,
+            change3);
+
+    RemoteEvent event = aggregator.createRemoteEvent(version(3));
+
+    assertEquals(version(3), event.getSnapshotVersion());
+    assertEquals(2, event.getDocumentUpdates().size());
+    assertEquals(doc1, event.getDocumentUpdates().get(doc1.getKey()));
+    assertEquals(doc2, event.getDocumentUpdates().get(doc2.getKey()));
+
+    assertEquals(2, event.getTargetChanges().size());
+
+    TargetChange mapping1 = targetChange(resumeToken, true, null, asList(doc1, doc2), null);
+    assertEquals(mapping1, event.getTargetChanges().get(1));
+
+    TargetChange mapping2 = targetChange(resumeToken, false, null, null, null);
+    assertEquals(mapping2, event.getTargetChanges().get(2));
+
+    // This BloomFilter will return false on MightContain(doc1) and true on MightContain(doc2).
+    BitSequence.Builder bitSequence = BitSequence.newBuilder();
+    bitSequence.setPadding(1);
+    bitSequence.setBitmap(ByteString.copyFrom(new byte[] {0x0E, 0x0F}));
+    com.google.firestore.v1.BloomFilter.Builder bloomFilter = BloomFilter.newBuilder();
+    bloomFilter.setBits(bitSequence);
+    bloomFilter.setHashCount(7);
+
+    WatchChange.ExistenceFilterWatchChange watchChange =
+        new WatchChange.ExistenceFilterWatchChange(1, new ExistenceFilter(1, bloomFilter.build()));
+    aggregator.handleExistenceFilter(watchChange);
+
+    event = aggregator.createRemoteEvent(version(3));
+
+    assertEquals(1, event.getTargetChanges().size());
+    assertEquals(0, event.getTargetMismatches().size());
+    assertEquals(0, event.getDocumentUpdates().size());
+  }
+
+  @Test
+  public void existenceFilterMismatchWithBloomFilterFalsePositiveResult() {
+    Map<Integer, TargetData> targetMap = activeQueries(1, 2);
+
+    MutableDocument doc1 = doc("docs/1", 1, map("value", 1));
+    MutableDocument doc2 = doc("docs/2", 2, map("value", 2));
+
+    WatchChange change1 = new DocumentChange(asList(1), emptyList(), doc1.getKey(), doc1);
+    WatchChange change2 = new DocumentChange(asList(1), emptyList(), doc2.getKey(), doc2);
+    WatchChange change3 = new WatchTargetChange(WatchTargetChangeType.Current, asList(1));
+
+    WatchChangeAggregator aggregator =
+        createAggregator(
+            targetMap,
+            noOutstandingResponses,
+            keySet(doc1.getKey(), doc2.getKey()),
+            change1,
+            change2,
+            change3);
+
+    RemoteEvent event = aggregator.createRemoteEvent(version(3));
+
+    assertEquals(version(3), event.getSnapshotVersion());
+    assertEquals(2, event.getDocumentUpdates().size());
+    assertEquals(doc1, event.getDocumentUpdates().get(doc1.getKey()));
+    assertEquals(doc2, event.getDocumentUpdates().get(doc2.getKey()));
+
+    assertEquals(2, event.getTargetChanges().size());
+
+    TargetChange mapping1 = targetChange(resumeToken, true, null, asList(doc1, doc2), null);
+    assertEquals(mapping1, event.getTargetChanges().get(1));
+
+    TargetChange mapping2 = targetChange(resumeToken, false, null, null, null);
+    assertEquals(mapping2, event.getTargetChanges().get(2));
+
+    // With this BloomFilter, mightContain() will return true for all documents.
+    BitSequence.Builder bitSequence = BitSequence.newBuilder();
+    bitSequence.setPadding(7);
+    bitSequence.setBitmap(ByteString.copyFrom(new byte[] {(byte) 0xFF, (byte) 0xFF}));
+    com.google.firestore.v1.BloomFilter.Builder bloomFilter = BloomFilter.newBuilder();
+    bloomFilter.setBits(bitSequence);
+    bloomFilter.setHashCount(33);
+
+    WatchChange.ExistenceFilterWatchChange watchChange =
+        new WatchChange.ExistenceFilterWatchChange(1, new ExistenceFilter(1, bloomFilter.build()));
+    aggregator.handleExistenceFilter(watchChange);
+
+    event = aggregator.createRemoteEvent(version(3));
+
+    TargetChange mapping3 = targetChange(ByteString.EMPTY, false, null, null, asList(doc1, doc2));
+    assertEquals(1, event.getTargetChanges().size());
+    assertEquals(mapping3, event.getTargetChanges().get(1));
+    assertEquals(1, event.getTargetMismatches().size());
+    assertEquals(0, event.getDocumentUpdates().size());
+  }
+
   @Test
   public void testExistenceFilterMismatchRemovesCurrentChanges() {
     Map<Integer, TargetData> targetMap = activeQueries(1);
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/RemoteSerializerTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/RemoteSerializerTest.java
index 2a6212be24b..30e5715613b 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/RemoteSerializerTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/remote/RemoteSerializerTest.java
@@ -509,6 +509,11 @@ public void testEncodesListenRequestLabels() {
     targetData = new TargetData(query.toTarget(), 2, 3, QueryPurpose.EXISTENCE_FILTER_MISMATCH);
     result = serializer.encodeListenRequestLabels(targetData);
     assertEquals(map("goog-listen-tags", "existence-filter-mismatch"), result);
+
+    targetData =
+        new TargetData(query.toTarget(), 2, 3, QueryPurpose.EXISTENCE_FILTER_MISMATCH_BLOOM);
+    result = serializer.encodeListenRequestLabels(targetData);
+    assertEquals(map("goog-listen-tags", "existence-filter-mismatch-bloom"), result);
   }
 
   @Test
@@ -702,8 +707,7 @@ public void testEncodesCompositeFiltersOnDeeperCollections() {
                 Filter.newBuilder()
                     .setCompositeFilter(
                         StructuredQuery.CompositeFilter.newBuilder()
-                            // TODO(orquery): Replace with Operator.OR once it's available.
-                            .setOp(CompositeFilter.Operator.OPERATOR_UNSPECIFIED)
+                            .setOp(CompositeFilter.Operator.OR)
                             .addFilters(
                                 Filter.newBuilder()
                                     .setFieldFilter(
@@ -1154,6 +1158,96 @@ public void testEncodesReadTime() {
         serializer.decodeQueryTarget(serializer.encodeQueryTarget(q.toTarget())), q.toTarget());
   }
 
+  @Test
+  public void encodesExpectedCountWhenResumeTokenIsPresent() {
+    Query q = Query.atPath(ResourcePath.fromString("docs"));
+    TargetData targetData =
+        new TargetData(q.toTarget(), 1, 2, QueryPurpose.LISTEN)
+            .withResumeToken(TestUtil.resumeToken(1000), SnapshotVersion.NONE)
+            .withExpectedCount(42);
+    Target actual = serializer.encodeTarget(targetData);
+
+    StructuredQuery.Builder structuredQueryBuilder =
+        StructuredQuery.newBuilder()
+            .addFrom(CollectionSelector.newBuilder().setCollectionId("docs"))
+            .addOrderBy(defaultKeyOrder());
+
+    QueryTarget.Builder queryBuilder =
+        QueryTarget.newBuilder()
+            .setParent("projects/p/databases/d/documents")
+            .setStructuredQuery(structuredQueryBuilder);
+    Target expected =
+        Target.newBuilder()
+            .setQuery(queryBuilder)
+            .setTargetId(1)
+            .setResumeToken(TestUtil.resumeToken(1000))
+            .setExpectedCount(Int32Value.newBuilder().setValue(42))
+            .build();
+
+    assertEquals(expected, actual);
+    assertEquals(
+        serializer.decodeQueryTarget(serializer.encodeQueryTarget(q.toTarget())), q.toTarget());
+  }
+
+  @Test
+  public void encodesExpectedCountWhenReadTimeIsPresent() {
+    Query q = Query.atPath(ResourcePath.fromString("docs"));
+    TargetData targetData =
+        new TargetData(q.toTarget(), 1, 2, QueryPurpose.LISTEN)
+            .withResumeToken(ByteString.EMPTY, version(4000000))
+            .withExpectedCount(42);
+    Target actual = serializer.encodeTarget(targetData);
+
+    StructuredQuery.Builder structuredQueryBuilder =
+        StructuredQuery.newBuilder()
+            .addFrom(CollectionSelector.newBuilder().setCollectionId("docs"))
+            .addOrderBy(defaultKeyOrder());
+
+    QueryTarget.Builder queryBuilder =
+        QueryTarget.newBuilder()
+            .setParent("projects/p/databases/d/documents")
+            .setStructuredQuery(structuredQueryBuilder);
+    Target expected =
+        Target.newBuilder()
+            .setQuery(queryBuilder)
+            .setTargetId(1)
+            .setReadTime(Timestamp.newBuilder().setSeconds(4))
+            .setExpectedCount(Int32Value.newBuilder().setValue(42))
+            .build();
+
+    assertEquals(expected, actual);
+    assertEquals(
+        serializer.decodeQueryTarget(serializer.encodeQueryTarget(q.toTarget())), q.toTarget());
+  }
+
+  @Test
+  public void shouldIgnoreExpectedCountWithoutResumeTokenOrReadTime() {
+    Query q = Query.atPath(ResourcePath.fromString("docs"));
+    TargetData targetData =
+        new TargetData(q.toTarget(), 1, 2, QueryPurpose.LISTEN).withExpectedCount(42);
+    Target actual = serializer.encodeTarget(targetData);
+
+    StructuredQuery.Builder structuredQueryBuilder =
+        StructuredQuery.newBuilder()
+            .addFrom(CollectionSelector.newBuilder().setCollectionId("docs"))
+            .addOrderBy(defaultKeyOrder());
+
+    QueryTarget.Builder queryBuilder =
+        QueryTarget.newBuilder()
+            .setParent("projects/p/databases/d/documents")
+            .setStructuredQuery(structuredQueryBuilder);
+    Target expected =
+        Target.newBuilder()
+            .setQuery(queryBuilder)
+            .setTargetId(1)
+            .setResumeToken(ByteString.EMPTY)
+            .build();
+
+    assertEquals(expected, actual);
+    assertEquals(
+        serializer.decodeQueryTarget(serializer.encodeQueryTarget(q.toTarget())), q.toTarget());
+  }
+
   /**
    * Wraps the given query in TargetData. This is useful because the APIs we're testing accept
    * TargetData, but for the most part we're just testing variations on Query.
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/spec/MemorySpecTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/spec/MemorySpecTest.java
index b017caa0fbd..35383d7a6a6 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/spec/MemorySpecTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/spec/MemorySpecTest.java
@@ -28,7 +28,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
+@Config(sdk = 21, manifest = Config.NONE)
 public class MemorySpecTest extends SpecTestCase {
 
   private static final String DURABLE_PERSISTENCE = "durable-persistence";
@@ -40,12 +40,12 @@ protected boolean isExcluded(Set<String> tags) {
 
   @Override
   protected MemoryComponentProvider initializeComponentProvider(
-      ComponentProvider.Configuration configuration, boolean garbageCollectionEnabled) {
+      ComponentProvider.Configuration configuration, boolean useEagerGc) {
     MemoryComponentProvider provider =
         new MemoryComponentProvider() {
           @Override
           protected Persistence createPersistence(Configuration configuration) {
-            if (garbageCollectionEnabled) {
+            if (useEagerGc) {
               return MemoryPersistence.createEagerGcMemoryPersistence();
             } else {
               DatabaseId databaseId = DatabaseId.forProject("projectId");
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/spec/SpecTestCase.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/spec/SpecTestCase.java
index cf136ab45d8..a2a57e9cc48 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/spec/SpecTestCase.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/spec/SpecTestCase.java
@@ -31,6 +31,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import android.util.Base64;
 import android.util.Pair;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.android.gms.tasks.Task;
@@ -38,8 +39,10 @@
 import com.google.common.collect.Sets;
 import com.google.firebase.database.collection.ImmutableSortedSet;
 import com.google.firebase.firestore.EventListener;
+import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.FirebaseFirestoreException;
 import com.google.firebase.firestore.FirebaseFirestoreSettings;
+import com.google.firebase.firestore.ListenSource;
 import com.google.firebase.firestore.LoadBundleTask;
 import com.google.firebase.firestore.auth.User;
 import com.google.firebase.firestore.bundle.BundleReader;
@@ -54,6 +57,9 @@
 import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.core.QueryListener;
 import com.google.firebase.firestore.core.SyncEngine;
+import com.google.firebase.firestore.local.LocalStore;
+import com.google.firebase.firestore.local.LruDelegate;
+import com.google.firebase.firestore.local.LruGarbageCollector;
 import com.google.firebase.firestore.local.Persistence;
 import com.google.firebase.firestore.local.PersistenceTestHelpers;
 import com.google.firebase.firestore.local.QueryPurpose;
@@ -81,6 +87,8 @@
 import com.google.firebase.firestore.util.Assert;
 import com.google.firebase.firestore.util.AsyncQueue;
 import com.google.firebase.firestore.util.AsyncQueue.TimerId;
+import com.google.firestore.v1.BitSequence;
+import com.google.firestore.v1.BloomFilter;
 import com.google.protobuf.ByteString;
 import io.grpc.Status;
 import java.io.BufferedReader;
@@ -158,7 +166,7 @@ public abstract class SpecTestCase implements RemoteStoreCallback {
           ? Sets.newHashSet("no-android", "multi-client")
           : Sets.newHashSet("no-android", BENCHMARK_TAG, "multi-client");
 
-  private boolean garbageCollectionEnabled;
+  private boolean useEagerGcForMemory;
   private int maxConcurrentLimboResolutions;
   private boolean networkEnabled = true;
 
@@ -170,7 +178,9 @@ public abstract class SpecTestCase implements RemoteStoreCallback {
   private AsyncQueue queue;
   private MockDatastore datastore;
   private RemoteStore remoteStore;
+  private LocalStore localStore;
   private SyncEngine syncEngine;
+  private LruGarbageCollector lruGarbageCollector;
   private EventManager eventManager;
   private DatabaseInfo databaseInfo;
 
@@ -268,7 +278,7 @@ protected void specSetUp(JSONObject config) {
 
     outstandingWrites = new HashMap<>();
 
-    this.garbageCollectionEnabled = config.optBoolean("useGarbageCollection", false);
+    this.useEagerGcForMemory = config.optBoolean("useEagerGCForMemory", true);
     this.maxConcurrentLimboResolutions =
         config.optInt("maxConcurrentLimboResolutions", Integer.MAX_VALUE);
 
@@ -317,10 +327,14 @@ private void initClient() {
             maxConcurrentLimboResolutions,
             new FirebaseFirestoreSettings.Builder().build());
 
-    ComponentProvider provider =
-        initializeComponentProvider(configuration, garbageCollectionEnabled);
+    ComponentProvider provider = initializeComponentProvider(configuration, useEagerGcForMemory);
     localPersistence = provider.getPersistence();
+    if (localPersistence.getReferenceDelegate() instanceof LruDelegate) {
+      lruGarbageCollector =
+          ((LruDelegate) localPersistence.getReferenceDelegate()).getGarbageCollector();
+    }
     remoteStore = provider.getRemoteStore();
+    localStore = provider.getLocalStore();
     syncEngine = provider.getSyncEngine();
     eventManager = provider.getEventManager();
   }
@@ -410,6 +424,24 @@ private Query parseQuery(Object querySpec) throws JSONException {
     }
   }
 
+  private static QueryPurpose parseQueryPurpose(Object value) {
+    if (!(value instanceof String)) {
+      throw new IllegalArgumentException("invalid query purpose: " + value);
+    }
+    switch ((String) value) {
+      case "TargetPurposeListen":
+        return QueryPurpose.LISTEN;
+      case "TargetPurposeExistenceFilterMismatch":
+        return QueryPurpose.EXISTENCE_FILTER_MISMATCH;
+      case "TargetPurposeExistenceFilterMismatchBloom":
+        return QueryPurpose.EXISTENCE_FILTER_MISMATCH_BLOOM;
+      case "TargetPurposeLimboResolution":
+        return QueryPurpose.LIMBO_RESOLUTION;
+      default:
+        throw new IllegalArgumentException("unknown query purpose value: " + value);
+    }
+  }
+
   private DocumentViewChange parseChange(JSONObject jsonDoc, DocumentViewChange.Type type)
       throws JSONException {
     long version = jsonDoc.getLong("version");
@@ -468,17 +500,67 @@ private List<Integer> parseIntList(@Nullable JSONArray arr) throws JSONException
     return result;
   }
 
+  /** Deeply parses a JSONArray into a List<String>. */
+  private List<String> parseStringList(@Nullable JSONArray arr) throws JSONException {
+    List<String> result = new ArrayList<>();
+    if (arr == null) {
+      return result;
+    }
+    for (int i = 0; i < arr.length(); ++i) {
+      result.add(arr.getString(i));
+    }
+    return result;
+  }
+
+  /** Deeply parses a JSONObject into a bloom filter proto type. */
+  private BloomFilter parseBloomFilter(JSONObject obj) throws JSONException {
+    BitSequence.Builder bitSequence = BitSequence.newBuilder();
+    JSONObject bits = obj.getJSONObject("bits");
+    if (bits.has("padding")) {
+      bitSequence.setPadding(bits.getInt("padding"));
+    }
+    bitSequence.setBitmap(
+        ByteString.copyFrom(Base64.decode(bits.getString("bitmap"), Base64.DEFAULT)));
+
+    BloomFilter.Builder bloomFilter = BloomFilter.newBuilder();
+    bloomFilter.setBits(bitSequence);
+    if (obj.has("hashCount")) {
+      bloomFilter.setHashCount(obj.getInt("hashCount"));
+    }
+    return bloomFilter.build();
+  }
+
+  /** Deeply parses a JSONObject into a ListenOptions object. */
+  private ListenOptions parseListenOptions(JSONObject obj) throws JSONException {
+    ListenOptions options = new ListenOptions();
+    if (obj.has("options")) {
+      JSONObject optionsObject = obj.getJSONObject("options");
+      options.includeDocumentMetadataChanges =
+          optionsObject.has("includeDocumentMetadataChanges")
+              ? optionsObject.getBoolean("includeDocumentMetadataChanges")
+              : true;
+      options.includeQueryMetadataChanges = options.includeDocumentMetadataChanges;
+      if (optionsObject.has("source") && optionsObject.getString("source").equals("cache")) {
+        options.source = ListenSource.CACHE;
+      }
+    } else {
+      // Spec tests are default to include metadata changes.
+      options.includeDocumentMetadataChanges = true;
+      options.includeQueryMetadataChanges = true;
+    }
+    return options;
+  }
+
   //
   // Methods for doing the steps of the spec test.
   //
 
   private void doListen(JSONObject listenSpec) throws Exception {
+    FirebaseFirestore.setLoggingEnabled(true);
     int expectedId = listenSpec.getInt("targetId");
     Query query = parseQuery(listenSpec.getJSONObject("query"));
-    // TODO: Allow customizing listen options in spec tests
-    ListenOptions options = new ListenOptions();
-    options.includeDocumentMetadataChanges = true;
-    options.includeQueryMetadataChanges = true;
+    ListenOptions options = parseListenOptions(listenSpec);
+
     QueryListener listener =
         new QueryListener(
             query,
@@ -654,15 +736,18 @@ private void doWatchEntity(JSONObject watchEntity) throws Exception {
     }
   }
 
-  private void doWatchFilter(JSONArray watchFilter) throws Exception {
-    List<Integer> targets = parseIntList(watchFilter.getJSONArray(0));
+  private void doWatchFilter(JSONObject watchFilter) throws Exception {
+    List<String> keys = parseStringList(watchFilter.getJSONArray("keys"));
+    List<Integer> targets = parseIntList(watchFilter.getJSONArray("targetIds"));
     Assert.hardAssert(
         targets.size() == 1, "ExistenceFilters currently support exactly one target only.");
 
-    int keyCount = watchFilter.length() == 0 ? 0 : watchFilter.length() - 1;
+    BloomFilter bloomFilterProto =
+        watchFilter.has("bloomFilter")
+            ? parseBloomFilter(watchFilter.getJSONObject("bloomFilter"))
+            : null;
 
-    // TODO: extend this with different existence filters over time.
-    ExistenceFilter filter = new ExistenceFilter(keyCount);
+    ExistenceFilter filter = new ExistenceFilter(keys.size(), bloomFilterProto);
     ExistenceFilterWatchChange change = new ExistenceFilterWatchChange(targets.get(0), filter);
     writeWatchChange(change, SnapshotVersion.NONE);
   }
@@ -713,7 +798,7 @@ private void doWriteAck(JSONObject writeAckSpec) throws Exception {
     validateNextWriteSent(write.first);
 
     MutationResult mutationResult =
-        new MutationResult(version(version), /*transformResults=*/ Collections.emptyList());
+        new MutationResult(version(version), /* transformResults= */ Collections.emptyList());
     queue.runSync(() -> datastore.ackWrite(version(version), singletonList(mutationResult)));
   }
 
@@ -789,6 +874,15 @@ private void doChangeUser(@Nullable String uid) throws Exception {
     queue.runSync(() -> syncEngine.handleCredentialChange(currentUser));
   }
 
+  private void doTriggerLruGc(long cacheThreshold) throws Exception {
+    queue.runSync(
+        () -> {
+          if (lruGarbageCollector != null) {
+            localStore.collectGarbage(lruGarbageCollector.withNewThreshold(cacheThreshold));
+          }
+        });
+  }
+
   private void doRestart() throws Exception {
     queue.runSync(
         () -> {
@@ -830,7 +924,7 @@ private void doStep(JSONObject step) throws Exception {
     } else if (step.has("watchEntity")) {
       doWatchEntity(step.getJSONObject("watchEntity"));
     } else if (step.has("watchFilter")) {
-      doWatchFilter(step.getJSONArray("watchFilter"));
+      doWatchFilter(step.getJSONObject("watchFilter"));
     } else if (step.has("watchReset")) {
       doWatchReset(step.getJSONArray("watchReset"));
     } else if (step.has("watchSnapshot")) {
@@ -861,6 +955,9 @@ private void doStep(JSONObject step) throws Exception {
       // "changeUser".
       String uid = step.isNull("changeUser") ? null : step.getString("changeUser");
       doChangeUser(uid);
+    } else if (step.has("triggerLruGC")) {
+      long cacheThreshold = step.getLong("triggerLruGC");
+      doTriggerLruGc(cacheThreshold);
     } else if (step.has("restart")) {
       doRestart();
     } else if (step.has("applyClientState")) {
@@ -899,7 +996,17 @@ private void assertEventMatches(JSONObject expected, QueryEvent actual) throws J
       for (int i = 0; metadata != null && i < metadata.length(); ++i) {
         expectedChanges.add(parseChange(metadata.getJSONObject(i), Type.METADATA));
       }
-      assertEquals(expectedChanges, actual.view.getChanges());
+
+      List<DocumentViewChange> sortedActualChanges =
+          actual.view.getChanges().stream()
+              .sorted((a, b) -> a.getDocument().getKey().compareTo(b.getDocument().getKey()))
+              .collect(Collectors.toList());
+      List<DocumentViewChange> sortedExpectedChanges =
+          expectedChanges.stream()
+              .sorted((a, b) -> a.getDocument().getKey().compareTo(b.getDocument().getKey()))
+              .collect(Collectors.toList());
+
+      assertEquals(sortedExpectedChanges, sortedActualChanges);
 
       boolean expectedHasPendingWrites = expected.optBoolean("hasPendingWrites", false);
       boolean expectedFromCache = expected.optBoolean("fromCache", false);
@@ -990,12 +1097,14 @@ private void validateExpectedState(@Nullable JSONObject expectedState) throws JS
           expectedActiveTargets.put(targetId, new ArrayList<>());
           for (int i = 0; i < queryArrayJson.length(); i++) {
             Query query = parseQuery(queryArrayJson.getJSONObject(i));
-            // TODO: populate the purpose of the target once it's possible to encode that in the
-            // spec tests. For now, hard-code that it's a listen despite the fact that it's not
-            // always the right value.
+
+            QueryPurpose purpose = QueryPurpose.LISTEN;
+            if (queryDataJson.has("targetPurpose")) {
+              purpose = parseQueryPurpose(queryDataJson.get("targetPurpose"));
+            }
+
             TargetData targetData =
-                new TargetData(
-                    query.toTarget(), targetId, ARBITRARY_SEQUENCE_NUMBER, QueryPurpose.LISTEN);
+                new TargetData(query.toTarget(), targetId, ARBITRARY_SEQUENCE_NUMBER, purpose);
             if (queryDataJson.has("resumeToken")) {
               targetData =
                   targetData.withResumeToken(
@@ -1006,6 +1115,9 @@ private void validateExpectedState(@Nullable JSONObject expectedState) throws JS
                   targetData.withResumeToken(
                       ByteString.EMPTY, version(queryDataJson.getInt("readTime")));
             }
+            if (queryDataJson.has("expectedCount")) {
+              targetData = targetData.withExpectedCount(queryDataJson.getInt("expectedCount"));
+            }
 
             expectedActiveTargets.get(targetId).add(targetData);
           }
@@ -1134,9 +1246,12 @@ private void validateActiveTargets() {
       TargetData expectedTarget = expectedQueries.get(0);
       TargetData actualTarget = actualTargets.get(expected.getKey());
 
-      // TODO: validate the purpose of the target once it's possible to encode that in the
-      // spec tests. For now, only validate properties that can be validated.
+      // TODO: Replace the assertEquals() checks on the individual properties of TargetData below
+      // with the single assertEquals on the TargetData objects themselves if the sequenceNumber is
+      // ever made to be consistent.
       // assertEquals(expectedTarget, actualTarget);
+
+      assertEquals(expectedTarget.getPurpose(), actualTarget.getPurpose());
       assertEquals(expectedTarget.getTarget(), actualTarget.getTarget());
       assertEquals(expectedTarget.getTargetId(), actualTarget.getTargetId());
       assertEquals(expectedTarget.getSnapshotVersion(), actualTarget.getSnapshotVersion());
@@ -1144,6 +1259,10 @@ private void validateActiveTargets() {
           expectedTarget.getResumeToken().toStringUtf8(),
           actualTarget.getResumeToken().toStringUtf8());
 
+      if (expectedTarget.getExpectedCount() != null) {
+        assertEquals(expectedTarget.getExpectedCount(), actualTarget.getExpectedCount());
+      }
+
       actualTargets.remove(expected.getKey());
     }
 
@@ -1185,8 +1304,6 @@ private void runSteps(JSONArray steps, JSONObject config) throws Exception {
         acknowledgedDocs.clear();
         rejectedDocs.clear();
       }
-    } catch (Exception e) {
-      throw Assert.fail("Spec test failed with %s", e);
     } finally {
       // Ensure that Persistence is torn down even if the test is failing due to a thrown exception
       // so that any open databases are closed. This is important when the LocalStore is backed by
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/testutil/TestUtilKtx.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/testutil/TestUtilKtx.java
new file mode 100644
index 00000000000..89bf847c8db
--- /dev/null
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/testutil/TestUtilKtx.java
@@ -0,0 +1,89 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore.testutil;
+
+import com.google.firebase.Timestamp;
+import com.google.firebase.firestore.UserDataReader;
+import com.google.firebase.firestore.core.Query;
+import com.google.firebase.firestore.model.DatabaseId;
+import com.google.firebase.firestore.model.Document;
+import com.google.firebase.firestore.model.DocumentKey;
+import com.google.firebase.firestore.model.DocumentSet;
+import com.google.firebase.firestore.model.MutableDocument;
+import com.google.firebase.firestore.model.ObjectValue;
+import com.google.firebase.firestore.model.ResourcePath;
+import com.google.firebase.firestore.model.SnapshotVersion;
+import com.google.firestore.v1.Value;
+import java.util.Comparator;
+import java.util.Map;
+
+/** A set of utilities for tests */
+public class TestUtilKtx {
+
+  public static Value wrap(Object value) {
+    DatabaseId databaseId = DatabaseId.forProject("project");
+    UserDataReader dataReader = new UserDataReader(databaseId);
+    // HACK: We use parseQueryValue() since it accepts scalars as well as arrays / objects, and
+    // our tests currently use wrap() pretty generically so we don't know the intent.
+    return dataReader.parseQueryValue(value);
+  }
+
+  public static ObjectValue wrapObject(Map<String, Object> value) {
+    // Cast is safe here because value passed in is a map
+    return new ObjectValue(wrap(value));
+  }
+
+  public static DocumentKey key(String key) {
+    return DocumentKey.fromPathString(key);
+  }
+
+  public static ResourcePath path(String key) {
+    return ResourcePath.fromString(key);
+  }
+
+  public static Query query(String path) {
+    return Query.atPath(path(path));
+  }
+
+  public static SnapshotVersion version(long versionMicros) {
+    long seconds = versionMicros / 1000000;
+    int nanos = (int) (versionMicros % 1000000L) * 1000;
+    return new SnapshotVersion(new Timestamp(seconds, nanos));
+  }
+
+  public static MutableDocument doc(String key, long version, Map<String, Object> data) {
+    return doc(key(key), version, wrapObject(data));
+  }
+
+  public static MutableDocument doc(DocumentKey key, long version, Map<String, Object> data) {
+    return doc(key, version, wrapObject(data));
+  }
+
+  public static MutableDocument doc(String key, long version, ObjectValue data) {
+    return doc(key(key), version, data);
+  }
+
+  public static MutableDocument doc(DocumentKey key, long version, ObjectValue data) {
+    return MutableDocument.newFoundDocument(key, version(version), data);
+  }
+
+  public static DocumentSet docSet(Comparator<Document> comparator, MutableDocument... documents) {
+    DocumentSet set = DocumentSet.emptySet(comparator);
+    for (MutableDocument document : documents) {
+      set = set.add(document);
+    }
+    return set;
+  }
+}
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/util/KotlinEntities.kt b/firebase-firestore/src/test/java/com/google/firebase/firestore/util/KotlinEntities.kt
new file mode 100644
index 00000000000..b2b0102b386
--- /dev/null
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/util/KotlinEntities.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.firestore.util
+
+import com.google.firebase.firestore.Exclude
+
+interface GenericInterface<T> {
+  var value: T?
+}
+
+class GenericExcludedSetterBeanKotlin : GenericInterface<String> {
+
+  @set:Exclude
+  override var value: String? = null
+    set(value) {
+      field = "wrong_setter"
+    }
+}
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/util/LogicUtilsTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/util/LogicUtilsTest.java
new file mode 100644
index 00000000000..89b8ca99ee3
--- /dev/null
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/util/LogicUtilsTest.java
@@ -0,0 +1,354 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.firestore.util;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.firestore.testutil.TestUtil.andFilters;
+import static com.google.firebase.firestore.testutil.TestUtil.filter;
+import static com.google.firebase.firestore.testutil.TestUtil.orFilters;
+import static com.google.firebase.firestore.util.LogicUtils.applyAssociation;
+import static com.google.firebase.firestore.util.LogicUtils.applyDistribution;
+import static com.google.firebase.firestore.util.LogicUtils.computeDistributedNormalForm;
+import static com.google.firebase.firestore.util.LogicUtils.computeInExpansion;
+import static com.google.firebase.firestore.util.LogicUtils.getDnfTerms;
+import static org.junit.Assert.assertEquals;
+
+import com.google.firebase.firestore.core.CompositeFilter;
+import com.google.firebase.firestore.core.FieldFilter;
+import com.google.firebase.firestore.core.Filter;
+import java.util.Arrays;
+import java.util.Collections;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class LogicUtilsTest {
+
+  /** Helper method to get unique filters */
+  FieldFilter nameFilter(String name) {
+    return filter("name", "==", name);
+  }
+
+  private final FieldFilter A = nameFilter("A");
+  private final FieldFilter B = nameFilter("B");
+  private final FieldFilter C = nameFilter("C");
+  private final FieldFilter D = nameFilter("D");
+  private final FieldFilter E = nameFilter("E");
+  private final FieldFilter F = nameFilter("F");
+  private final FieldFilter G = nameFilter("G");
+  private final FieldFilter H = nameFilter("H");
+  private final FieldFilter I = nameFilter("I");
+
+  @Test
+  public void testFieldFilterAssociativity() {
+    FieldFilter f = filter("foo", "==", "bar");
+    assertEquals(f, applyAssociation(f));
+  }
+
+  @Test
+  public void testCompositeFilterAssociativity() {
+    // AND(AND(X)) --> X
+    CompositeFilter compositeFilter1 = andFilters(andFilters(A));
+    assertEquals(A, applyAssociation(compositeFilter1));
+
+    // OR(OR(X)) --> X
+    CompositeFilter compositeFilter2 = orFilters(orFilters(A));
+    assertEquals(A, applyAssociation(compositeFilter2));
+
+    // (A | (B) | ((C) | (D | E)) | (F | (G & (H & I))) --> A | B | C | D | E | F | (G & H & I)
+    CompositeFilter complexFilter =
+        orFilters(
+            A,
+            andFilters(B),
+            orFilters(orFilters(C), orFilters(D, E)),
+            orFilters(F, andFilters(G, andFilters(H, I))));
+    CompositeFilter expectedResult = orFilters(A, B, C, D, E, F, andFilters(G, H, I));
+    assertThat(applyAssociation(complexFilter)).isEqualTo(expectedResult);
+  }
+
+  @Test
+  public void testFieldFilterDistributionOverFieldFilter() {
+    assertThat(applyDistribution(A, B)).isEqualTo(andFilters(A, B));
+    assertThat(applyDistribution(B, A)).isEqualTo(andFilters(B, A));
+  }
+
+  @Test
+  public void testFieldFilterDistributionOverAndFilter() {
+    // (A & B & C) & D = (A & B & C & D)
+    assertThat(applyDistribution(andFilters(A, B, C), D)).isEqualTo(andFilters(A, B, C, D));
+  }
+
+  @Test
+  public void testFieldFilterDistributionOverOrFilter() {
+    // A & (B | C | D) = (A & B) | (A & C) | (A & D)
+    // (B | C | D) & A = (A & B) | (A & C) | (A & D)
+    CompositeFilter expected = orFilters(andFilters(A, B), andFilters(A, C), andFilters(A, D));
+    assertThat(applyDistribution(A, orFilters(B, C, D))).isEqualTo(expected);
+    assertThat(applyDistribution(orFilters(B, C, D), A)).isEqualTo(expected);
+  }
+
+  // The following four tests cover:
+  // AND distribution for AND filter and AND filter.
+  // AND distribution for OR filter and AND filter.
+  // AND distribution for AND filter and OR filter.
+  // AND distribution for OR filter and OR filter.
+  @Test
+  public void testAndFilterDistributionWithAndFilter() {
+    // (A & B) & (C & D) --> (A & B & C & D)
+    CompositeFilter expectedResult = andFilters(A, B, C, D);
+    assertThat(applyDistribution(andFilters(A, B), andFilters(C, D))).isEqualTo(expectedResult);
+  }
+
+  @Test
+  public void testAndFilterDistributionWithOrFilter() {
+    // (A & B) & (C | D) --> (A & B & C) | (A & B & D)
+    CompositeFilter expectedResult = orFilters(andFilters(A, B, C), andFilters(A, B, D));
+    assertThat(applyDistribution(andFilters(A, B), orFilters(C, D))).isEqualTo(expectedResult);
+  }
+
+  @Test
+  public void testOrFilterDistributionWithAndFilter() {
+    // (A | B) & (C & D) --> (A & C & D) | (B & C & D)
+    CompositeFilter expectedResult = orFilters(andFilters(C, D, A), andFilters(C, D, B));
+    assertThat(applyDistribution(orFilters(A, B), andFilters(C, D))).isEqualTo(expectedResult);
+  }
+
+  @Test
+  public void testOrFilterDistributionWithOrFilter() {
+    // (A | B) & (C | D) --> (A & C) | (A & D) | (B & C) | (B & D)
+    CompositeFilter expectedResult =
+        orFilters(andFilters(A, C), andFilters(A, D), andFilters(B, C), andFilters(B, D));
+    assertThat(applyDistribution(orFilters(A, B), orFilters(C, D))).isEqualTo(expectedResult);
+  }
+
+  @Test
+  public void testFieldFilterComputeDnf() {
+    assertThat(computeDistributedNormalForm(A)).isEqualTo(A);
+    assertThat(getDnfTerms(andFilters(A))).isEqualTo(Collections.singletonList(A));
+    assertThat(getDnfTerms(orFilters(A))).isEqualTo(Collections.singletonList(A));
+  }
+
+  @Test
+  public void testComputeDnfFlatAndFilter() {
+    CompositeFilter compositeFilter = andFilters(A, B, C);
+    assertThat(computeDistributedNormalForm(compositeFilter)).isEqualTo(compositeFilter);
+    assertThat(getDnfTerms(compositeFilter)).isEqualTo(Collections.singletonList(compositeFilter));
+  }
+
+  @Test
+  public void testComputeDnfFlatOrFilter() {
+    CompositeFilter compositeFilter = orFilters(A, B, C);
+    assertThat(computeDistributedNormalForm(compositeFilter)).isEqualTo(compositeFilter);
+    Filter[] expectedDnfTerms = {A, B, C};
+    assertThat(getDnfTerms(compositeFilter)).isEqualTo(Arrays.asList(expectedDnfTerms));
+  }
+
+  @Test
+  public void testComputeDnf1() {
+    // A & (B | C) --> (A & B) | (A & C)
+    CompositeFilter compositeFilter = andFilters(A, orFilters(B, C));
+    Filter[] expectedDnfTerms = {andFilters(A, B), andFilters(A, C)};
+    CompositeFilter expectedResult = orFilters(expectedDnfTerms);
+    assertThat(computeDistributedNormalForm(compositeFilter)).isEqualTo(expectedResult);
+    assertThat(getDnfTerms(compositeFilter)).isEqualTo(Arrays.asList(expectedDnfTerms));
+  }
+
+  @Test
+  public void testComputeDnf2() {
+    // ((A)) & (B & C) --> A & B & C
+    CompositeFilter compositeFilter = andFilters(andFilters(andFilters(A)), andFilters(B, C));
+    CompositeFilter expectedResult = andFilters(A, B, C);
+    assertThat(computeDistributedNormalForm(compositeFilter)).isEqualTo(expectedResult);
+    assertThat(getDnfTerms(compositeFilter)).isEqualTo(Collections.singletonList(expectedResult));
+  }
+
+  @Test
+  public void testComputeDnf3() {
+    // A | (B & C)
+    CompositeFilter compositeFilter = orFilters(A, andFilters(B, C));
+    assertThat(computeDistributedNormalForm(compositeFilter)).isEqualTo(compositeFilter);
+    Filter[] expectedDnfTerms = {A, andFilters(B, C)};
+    assertThat(getDnfTerms(compositeFilter)).isEqualTo(Arrays.asList(expectedDnfTerms));
+  }
+
+  @Test
+  public void testComputeDnf4() {
+    // A | (B & C) | ( ((D)) | (E | F) | (G & H) ) --> A | (B & C) | D | E | F | (G & H)
+    CompositeFilter compositeFilter =
+        orFilters(
+            A,
+            andFilters(B, C),
+            orFilters(andFilters(orFilters(D)), orFilters(E, F), andFilters(G, H)));
+    Filter[] expectedDnfTerms = {A, andFilters(B, C), D, E, F, andFilters(G, H)};
+    CompositeFilter expectedResult = orFilters(expectedDnfTerms);
+    assertThat(computeDistributedNormalForm(compositeFilter)).isEqualTo(expectedResult);
+    assertThat(getDnfTerms(compositeFilter)).isEqualTo(Arrays.asList(expectedDnfTerms));
+  }
+
+  @Test
+  public void testComputeDnf5() {
+    //    A & (B | C) & ( ((D)) & (E | F) & (G & H) )
+    // -> A & (B | C) & D & (E | F) & G & H
+    // -> ((A & B) | (A & C)) & D & (E | F) & G & H
+    // -> ((A & B & D) | (A & C & D)) & (E|F) & G & H
+    // -> ((A & B & D & E) | (A & B & D & F) | (A & C & D & E) | (A & C & D & F)) & G & H
+    // -> ((A&B&D&E&G) | (A & B & D & F & G) | (A & C & D & E & G) | (A & C & D & F & G)) & H
+    // -> (A&B&D&E&G&H) | (A&B&D&F&G&H) | (A & C & D & E & G & H) | (A & C & D & F & G & H)
+    CompositeFilter compositeFilter =
+        andFilters(
+            A,
+            orFilters(B, C),
+            andFilters(andFilters(orFilters(D)), orFilters(E, F), andFilters(G, H)));
+    Filter[] expectedDnfTerms = {
+      andFilters(D, E, G, H, A, B),
+      andFilters(D, F, G, H, A, B),
+      andFilters(D, E, G, H, A, C),
+      andFilters(D, F, G, H, A, C)
+    };
+    CompositeFilter expectedResult = orFilters(expectedDnfTerms);
+    assertThat(computeDistributedNormalForm(compositeFilter)).isEqualTo(expectedResult);
+    assertThat(getDnfTerms(compositeFilter)).isEqualTo(Arrays.asList(expectedDnfTerms));
+  }
+
+  @Test
+  public void testComputeDnf6() {
+    // A & (B | (C & (D | (E & F))))
+    // -> A & (B | (C & D) | (C & E & F))
+    // -> (A & B) | (A & C & D) | (A & C & E & F)
+    CompositeFilter compositeFilter =
+        andFilters(A, orFilters(B, andFilters(C, orFilters(D, andFilters(E, F)))));
+    Filter[] expectedDnfTerms = {andFilters(A, B), andFilters(C, D, A), andFilters(E, F, C, A)};
+    CompositeFilter expectedResult = orFilters(expectedDnfTerms);
+    assertThat(computeDistributedNormalForm(compositeFilter)).isEqualTo(expectedResult);
+    assertThat(getDnfTerms(compositeFilter)).isEqualTo(Arrays.asList(expectedDnfTerms));
+  }
+
+  @Test
+  public void testComputeDnf7() {
+    // ( (A|B) & (C|D) ) | ( (E|F) & (G|H) )
+    // -> (A&C)|(A&D)|(B&C)(B&D)|(E&G)|(E&H)|(F&G)|(F&H)
+    CompositeFilter compositeFilter =
+        orFilters(
+            andFilters(orFilters(A, B), orFilters(C, D)),
+            andFilters(orFilters(E, F), orFilters(G, H)));
+    Filter[] expectedDnfTerms = {
+      andFilters(A, C),
+      andFilters(A, D),
+      andFilters(B, C),
+      andFilters(B, D),
+      andFilters(E, G),
+      andFilters(E, H),
+      andFilters(F, G),
+      andFilters(F, H)
+    };
+    CompositeFilter expectedResult = orFilters(expectedDnfTerms);
+    assertThat(computeDistributedNormalForm(compositeFilter)).isEqualTo(expectedResult);
+    assertThat(getDnfTerms(compositeFilter)).isEqualTo(Arrays.asList(expectedDnfTerms));
+  }
+
+  @Test
+  public void testComputeDnf8() {
+    // ( (A&B) | (C&D) ) & ( (E&F) | (G&H) )
+    // -> A&B&E&F | A&B&G&H | C&D&E&F | C&D&G&H
+    CompositeFilter compositeFilter =
+        andFilters(
+            orFilters(andFilters(A, B), andFilters(C, D)),
+            orFilters(andFilters(E, F), andFilters(G, H)));
+    Filter[] expectedDnfTerms = {
+      andFilters(E, F, A, B), andFilters(G, H, A, B), andFilters(E, F, C, D), andFilters(G, H, C, D)
+    };
+    CompositeFilter expectedResult = orFilters(expectedDnfTerms);
+    assertThat(computeDistributedNormalForm(compositeFilter)).isEqualTo(expectedResult);
+    assertThat(getDnfTerms(compositeFilter)).isEqualTo(Arrays.asList(expectedDnfTerms));
+  }
+
+  @Test
+  public void testInExpansionForFieldFilters() {
+    FieldFilter input1 = filter("a", "in", Arrays.asList(1, 2, 3));
+    FieldFilter input2 = filter("a", "<", 1);
+    FieldFilter input3 = filter("a", "<=", 1);
+    FieldFilter input4 = filter("a", "==", 1);
+    FieldFilter input5 = filter("a", "!=", 1);
+    FieldFilter input6 = filter("a", ">", 1);
+    FieldFilter input7 = filter("a", ">=", 1);
+    FieldFilter input8 = filter("a", "array-contains", 1);
+    FieldFilter input9 = filter("a", "array-contains-any", Arrays.asList(1, 2));
+    FieldFilter input10 = filter("a", "not-in", Arrays.asList(1, 2));
+
+    assertThat(computeInExpansion(input1))
+        .isEqualTo(orFilters(filter("a", "==", 1), filter("a", "==", 2), filter("a", "==", 3)));
+
+    // Other operators should remain the same
+    assertThat(computeInExpansion(input2)).isEqualTo(input2);
+    assertThat(computeInExpansion(input3)).isEqualTo(input3);
+    assertThat(computeInExpansion(input4)).isEqualTo(input4);
+    assertThat(computeInExpansion(input5)).isEqualTo(input5);
+    assertThat(computeInExpansion(input6)).isEqualTo(input6);
+    assertThat(computeInExpansion(input7)).isEqualTo(input7);
+    assertThat(computeInExpansion(input8)).isEqualTo(input8);
+    assertThat(computeInExpansion(input9)).isEqualTo(input9);
+    assertThat(computeInExpansion(input10)).isEqualTo(input10);
+  }
+
+  @Test
+  public void testInExpansionForCompositeFilters() {
+    CompositeFilter cf1 =
+        andFilters(filter("a", "==", 1), filter("b", "in", Arrays.asList(2, 3, 4)));
+
+    assertThat(computeInExpansion(cf1))
+        .isEqualTo(
+            andFilters(
+                filter("a", "==", 1),
+                orFilters(filter("b", "==", 2), filter("b", "==", 3), filter("b", "==", 4))));
+
+    CompositeFilter cf2 =
+        orFilters(filter("a", "==", 1), filter("b", "in", Arrays.asList(2, 3, 4)));
+
+    assertThat(computeInExpansion(cf2))
+        .isEqualTo(
+            orFilters(
+                filter("a", "==", 1),
+                orFilters(filter("b", "==", 2), filter("b", "==", 3), filter("b", "==", 4))));
+
+    CompositeFilter cf3 =
+        andFilters(
+            filter("a", "==", 1),
+            orFilters(filter("b", "==", 2), filter("c", "in", Arrays.asList(2, 3, 4))));
+
+    assertThat(computeInExpansion(cf3))
+        .isEqualTo(
+            andFilters(
+                filter("a", "==", 1),
+                orFilters(
+                    filter("b", "==", 2),
+                    orFilters(filter("c", "==", 2), filter("c", "==", 3), filter("c", "==", 4)))));
+
+    CompositeFilter cf4 =
+        orFilters(
+            filter("a", "==", 1),
+            andFilters(filter("b", "==", 2), filter("c", "in", Arrays.asList(2, 3, 4))));
+
+    assertThat(computeInExpansion(cf4))
+        .isEqualTo(
+            orFilters(
+                filter("a", "==", 1),
+                andFilters(
+                    filter("b", "==", 2),
+                    orFilters(filter("c", "==", 2), filter("c", "==", 3), filter("c", "==", 4)))));
+  }
+}
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/util/MapperTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/util/MapperTest.java
index 6fffd89f3ec..17ffe9541f3 100644
--- a/firebase-firestore/src/test/java/com/google/firebase/firestore/util/MapperTest.java
+++ b/firebase-firestore/src/test/java/com/google/firebase/firestore/util/MapperTest.java
@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
+import androidx.annotation.Nullable;
 import com.google.firebase.firestore.DocumentId;
 import com.google.firebase.firestore.DocumentReference;
 import com.google.firebase.firestore.Exclude;
@@ -907,6 +908,22 @@ public void setValue(String value) {
     }
   }
 
+  private static class GenericExcludedSetterBean implements GenericInterface<String> {
+    private String value = null;
+
+    @Nullable
+    @Override
+    public String getValue() {
+      return value;
+    }
+
+    @Exclude
+    @Override
+    public void setValue(@Nullable String value) {
+      this.value = "wrong setter";
+    }
+  }
+
   private static <T> T deserialize(String jsonString, Class<T> clazz) {
     return deserialize(jsonString, clazz, /*docRef=*/ null);
   }
@@ -1883,16 +1900,14 @@ public void primitiveClassesCanBePassedInTopLevel() {
   @Test
   public void passingInListTopLevelThrows() {
     assertExceptionContains(
-        "Class java.util.List has generic type parameters, please use GenericTypeIndicator "
-            + "instead",
+        "Class java.util.List has generic type parameters",
         () -> convertToCustomClass(Collections.singletonList("foo"), List.class));
   }
 
   @Test
   public void passingInMapTopLevelThrows() {
     assertExceptionContains(
-        "Class java.util.Map has generic type parameters, please use GenericTypeIndicator "
-            + "instead",
+        "Class java.util.Map has generic type parameters",
         () -> convertToCustomClass(Collections.singletonMap("foo", "bar"), Map.class));
   }
 
@@ -1920,7 +1935,7 @@ public void passingInByteTopLevelThrows() {
   public void passingInGenericBeanTopLevelThrows() {
     assertExceptionContains(
         "Class com.google.firebase.firestore.util.MapperTest$GenericBean has generic type "
-            + "parameters, please use GenericTypeIndicator instead",
+            + "parameters",
         () -> deserialize("{'value': 'foo'}", GenericBean.class));
   }
 
@@ -2220,18 +2235,27 @@ public void genericSettersFromSubclassConflictsWithBaseClass() {
         () -> serialize(bean));
   }
 
-  // This should work, but generics and subclassing are tricky to get right. For now we will just
-  // throw and we can add support for generics & subclassing if it becomes a high demand feature
   @Test
-  public void settersCanOverrideGenericSettersParsingNot() {
-    assertExceptionContains(
-        "Class com.google.firebase.firestore.util.MapperTest$NonConflictingGenericSetterSubBean "
-            + "has multiple setter overloads",
-        () -> {
-          NonConflictingGenericSetterSubBean bean =
-              deserialize("{'value': 'value'}", NonConflictingGenericSetterSubBean.class);
-          assertEquals("subsetter:value", bean.value);
-        });
+  public void settersCanOverrideGenericSettersParsing() {
+    NonConflictingGenericSetterSubBean bean =
+        deserialize("{'value': 'value'}", NonConflictingGenericSetterSubBean.class);
+    assertEquals("subsetter:value", bean.value);
+  }
+
+  @Test
+  public void excludedOverriddenGenericSetterSetsValueNotJava() {
+    GenericExcludedSetterBean bean =
+        deserialize("{'value': 'foo'}", GenericExcludedSetterBean.class);
+    assertEquals("foo", bean.value);
+  }
+
+  // Unlike Java, in Kotlin, annotations do not get propagated to bridge methods.
+  // That's why there are 2 separate tests for Java and Kotlin
+  @Test
+  public void excludedOverriddenGenericSetterSetsValueNotKotlin() {
+    GenericExcludedSetterBeanKotlin bean =
+        deserialize("{'value': 'foo'}", GenericExcludedSetterBeanKotlin.class);
+    assertEquals("foo", bean.getValue());
   }
 
   @Test
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_0001_bloom_filter_proto.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_0001_bloom_filter_proto.json
new file mode 100644
index 00000000000..23f0f12b267
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_0001_bloom_filter_proto.json
@@ -0,0 +1 @@
+{ "bits": { "bitmap": "RswZ", "padding": 1 }, "hashCount": 16 }
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_0001_membership_test_result.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_0001_membership_test_result.json
new file mode 100644
index 00000000000..5a41f842376
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_0001_membership_test_result.json
@@ -0,0 +1 @@
+{"membershipTestResults" : "10"}
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_01_bloom_filter_proto.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_01_bloom_filter_proto.json
new file mode 100644
index 00000000000..43d07db5e6d
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_01_bloom_filter_proto.json
@@ -0,0 +1 @@
+{"bits":{"bitmap":"mwE=","padding":5},"hashCount":8}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_01_membership_test_result.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_01_membership_test_result.json
new file mode 100644
index 00000000000..5a41f842376
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_01_membership_test_result.json
@@ -0,0 +1 @@
+{"membershipTestResults" : "10"}
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_1_bloom_filter_proto.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_1_bloom_filter_proto.json
new file mode 100644
index 00000000000..c03535eafc3
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_1_bloom_filter_proto.json
@@ -0,0 +1 @@
+{"bits":{"bitmap":"","padding":0},"hashCount":0}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_1_membership_test_result.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_1_membership_test_result.json
new file mode 100644
index 00000000000..fcbc34d14ac
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_1_1_membership_test_result.json
@@ -0,0 +1 @@
+{"membershipTestResults" : "00"}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_0001_bloom_filter_proto.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_0001_bloom_filter_proto.json
new file mode 100644
index 00000000000..04b77bf83ab
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_0001_bloom_filter_proto.json
@@ -0,0 +1,7 @@
+{
+  "bits": {
+    "bitmap": "KAr7zKAep8YZNThiqdJDpC6wO/gF8VHCN/QG1c968zytQuhLiBZ5ib/1AFkrXvImaGA94GXHxH4jLUDnY0mYUtblQOVPzTiruu22n71Sv/ONHhI+2IZ1g8T+2qFZllUZejhGC8ee9LwwNyG8fWIjh64NBGbF1RdCZYy+enK7CG4HerwvMqZ5gKNI68XowVT4cjpEjy2VPrxmaa3aJHHoTaBVchi7C/WvNCzVUNYbQAxC98GUQyKQiX8z/EWEusYJKiJqXWB3KUpsuUKcQvaqyotGWlI1PznKpBUB8OLqszXvMGIDeT+peEV57iZMPZI3+KG3rhI5sMU2hd5N8+2M8ZgwaKzDmhXVbVyoGser0fiaO+M866XAG+RipmYXfLOW98SzScZpfrPpYs7usvQzd367pb/ByAnW5hFSXk+QEiEtoxhSU6/DG8qE+kuVDkgNKlDzmcsHNWYh8i2XrslhSj2cMJmmdKYwSJwLTU2iwnfhJGCkpDXW98ocjvT2c4xjIiy+CpdIoNuPK8bEqMZK+pvfnqz3wHGiICpU/GSqT2GbBCvickyhB4k33k2xnYdUmAWeGErmcS2DfWvOJAFJ1uAPFSh/8NfPKebUpoHiLkgCEeE7luqurZwR9/xW4oHVYDZ1XOVe6+N5vb9rGbEDPF5GpxQ+xc9RFrrXPuSgDdqJTZ4j2e9RPKLqcVR7CwhvdWe5+g55me8AL0Orq+sBJWrcgjy2fG4ctKxq+gJK3DAMcCskhbP4TtDIJ0gMUX2RwlMVXRb2j0j91fqA6+/GbDMyuYFmhRSx0q2Lb7SpbNdr8c5FH+/T3k7pINcuq27TBPyzTXbwjxBqpuSrqKbNFPX2cQs7VQE212ASQukjixwRW2/NXt34Y9Bst9Y7jl/5xuzNGCfYiD8w1/4Jq27ZuFCWNX1frEy7sSKkYA1m8G9X8RuvfYWl9sF+LfEZ/aMSItLdJMeYzgP4xYqWvie8kFA0MySiLnWBX5lHRjVK/ts3xr1DDc418EoBgT0mC2x2Jk+lxo2GTQNnLI9ImS6kh6TUclKFIDsegOGHWzNIz3f7tRSWeZnDe9ualp0K+aAM5YVkC6VIC+IFgM3bSNoh508RWHPDYAxorxvRBFr2KEeCN084w30AsgnjOZTcacElo7BcuECFJ8VytR4G1PlJ/yOxwtyvDUM4Qd3AzDqh4onLRry33IhNeQzxnejozppNpWcf7avyO79mTcu3kabaesNsz+QrAITcQtkewzqGezCa/Bj+TRQevMmxofJUwNInqPXRw7kZ8Rkpbdb34Ox2gahwtqEIc1a2Wt99MXoOExPKBn3+YE0DdBDYFGAjM1dMlQQ/D/mdq6UrND3rQkRq9gLiyvPDuZ39+EJu0jY8AVo5jin082G4YNhAtG+IEsBp1i0zH3fX/5/XiXEYkXZXa9KCkfy3RPAjThrRWeEXsYi9aCAZdDZDTIpzOWoP1Xxkj8DB6L4DfoDXVTVcKce7rdKocuLYEAtL6B5bNDGpC55sOeEqwpcOE1Q2IUA3U8aF2FGQIMBeXmAE2hSaLW61sKNNb9gFgaBy7PU4h+hlbmTXhKyQzn/4quZ6sncYQuEJ1OHuoxBHpfSmZ4EZE1JbIbYy9QQbo+6mEtVjjcs6XuHe6RMF3XKb0K8wTeaSm7VBuvJpcepVQGfQjt1f4cw4vYFxVZneOZ4ofGh9B3sYyiRNmaqFv/BtpM/aOIW8TaNOQag8HKxMoF4g9cr8Jej54098Wt99tNO4wcqfsRUW2oVId09skMNS9LdWJees+U8iNDCK2UBSQxdP80YaHM654Y2/vZ+bYql06pUfyydpf+HY6jKYvcmfaxw+SNZK617mUQESidRBmyoAKrTYLFd7cy85q4FtLO5UfEs0jwg58ELNyX2VD1mq/avUBmtPNymW5khj2muqLV0fJZr4OnRUNIgYwxw6FhLCf/CgKonMUq7RiJrrmR9GdqBeT12avvmZ+MPmccskFIsupLrYLMpPD0xWc1wuPXeZyqKWoEPb1CtCYr1EYex1XHeEYn+ELQodpktERhqAApD91f8q8RrWgXBUWEtiCd8pU6eipMgibvPXVdhangPhXQLIRJRbbJtiiw0krmaCjjmrBke7YmRybSpG3Jy49v17jmu7ohsVdHqozYre88qxMeMO9soXNByN2G8RKi1MbbR6zqoqCTJPLK7R7hQ2yFBgPfB3KhRq0tllpeUbx7kMGFv/2ZfvnLKIqgAfnajlco1nqlmUwPjiPIYPpZ8SPwjoTq6w0OJsx9F6nbhMHOXQg2NhXEN1hUK3QNvvbtzLJsGXhHrrF/di1FEZ3kLLLXR8rnUeoc8xnGCpawv+WXgWTSgScGvhLVopPyWTXy+VlqBPGc8J1xVQwiC20IrwFD0uB/uHYgqp7HFBbBRam9G+FjzgXM3qfNXoxZVpTy2booN3/cSPiScKnaTEOlJs1CVYgYtGhTxUgq4kY37phUGKgWPnlcqswUxnSQzBWRxwbpcGwUOatmbta6pyHf3OD78V1bXNradq/c81z9TnJrR00Xiidjxbj5k6sEg5wugHeCYz+8JQp8uY1aE8+9XtsvPPcvoRLwZVJWbzXn1kJPiDJrG/TbVsd4TWuWJDLCEHYX+iiuQSJI8Zx1P3AGSlMiHDyAiHkh4TMazNcAEXDqPSaL7SXTY7+5trb/vIwPU6qCY9dTR50Bm/LhwquEqUH6adjGgUpK2fcCfMBeUUcAnVhj+DfPO4DWCXgmR38YVNK4Kgv6k/K1ERGbSsj2KTxWRafz6Tu45MkosGowA94JhLl7CYGJuzcddXmeAVeTjKr/3DxCN1dDfEVZupNKCBzm8Gyxi7nV0FOn+iOAzfX/EVu6Cpa4Z2Np/UYoxEez9f1X1cZioKqo3nU4J/xyhoCQfkjxGg5Nz/HuQfLe5JjpbqZxUXxUOB8EuXsMNFeDzh0VFopA76cSAGCQHdrqkwkh+YSPLhJuNdHe5JVX5EkgpFG4sUHQTIZzZwMWzarA5XRMjF/8bqdccjr67ed03YbVcHodZVD2OCVcTi5n/D0pomUlaTZSbIM3OGEdBVXnRO4twsfQZUyTb4hLFdf2KooxQF1UYts0Mibb6lqZjBNfHKvlGklcfDNNqoJVhGgFX1/KscUptU9cKrVCB6APSCMHpIlBHtDXagweMId4H7wrGMrOX+1uUD1gifIZYV/rjDXZqYlupHzFxFz3ULSK0LkAsnn45fh1xOq749IMrV/EvnqvTmS9RmoAVTEnHW9unk/ftXiHtIEy0OYtmlm1R6fcZBrHCNj/v8jIOzWa5QcAQW1jRIracd33oH6CDV7EgtmAsGyrIfyETB29H8tueNpDois5bxUz/gGL+aGAhLQP+o1hsVTtilHzyzWWHzBWQ2ve/SIr6EqXp6UBJQ39qcBFDWgFEoQLRjtRGVUmZawXNJNZwTpz4O3i56x1jM1x7GRdmPtxECYAv9H2sBOA5zMpKMxaJreGQYQhNDJBIbUkRoShDYqWbKgK1nMjFo3CP3TBldDIT6gG8T3PskE2/rXIe6ktPhQBwRU4b1wVSUnULi4rE9Y9yDg0mQpdSj4sYcCwVLwsL2sysPhYlKLf0tSScbMg4mjYCiyllK/J3aJKsXtqr89iLQ8thMzBGLA9XoWosBlhoYDUfKs4jCeybqirLaMW6D7QN7lBmFT7oi8OCYrcOmmtLTfTnS56ZYHNkNYCTJPjrOGWt0ltFP4ELXrQFS0CnghdAQoUnSBZevm07xuaZvA4r3648yuWD8rASA2bYhJJ3dQcRNzx0t0Mv7DDm8NlgD8o/MqDNRt6VxTpKRDeVVWr00iSOb5m5elQtF+XHpAfWsvWVwbYCoTcxtcClE55iHdEWkwTIKMfrKa7b5amhgkiiS5Oil+k38GkY1VdSVZqUGhng0q6jJrnYYXLBvQuzs2gK5JMnvKG12wlkSnpvBwZTHwJ/NwmYz2kezdMQRIPOLzYQzxldxVuJUOANZjYejPCdhCsM2iLlE/yYt98SIoUZvae5e0VRrbtOR8qStErXr3PSCmZyBjS15tA7PYbipYdn2NVgMK0UHb2bTaW2SnESMU75RRXSLkVoow825TOAhg4KYez+16vbnNR504JDQdSGbfLqxMMGe6sFxm+hG0E+2n2R9PepnCG8yY5p2i/L1FpsIMV+VkIv+UWKheSX9q4HGS5HHE8VvkvqqgNt+HSz2dX1xkJZtovYrx8FCrGiHbOOdVTjqTw7SzDFdduo3lujygpcUqUrZFOkdUj50BGcYmJ4NDLNqqsKT6uRHFULU3b3M7JdezaD6a4uqHta5G6vitKq1VwFf2wxLmDMpj4niP6mdytKNTsRBhGIoHyzSrOz0K/UTgeKpLGzdZccSBVxnA/obuZg7XPBTep2CnjuUAs0dZLmpSQBH01bIQdtFGkyG03ZglVy7rkI8l+6ARxioJGy6xbApAwxG0upqUAVEQeO7X/In9dhfwaxK1ciPTP5b7xI8ZNJwWtE8+jc09kGGWGhb7VRwHBFSvaX/gV/Yeo1pT/BK0/34c9Q1AY+hZRfr8CHU6aNIKLQrnqvfd3O//gf9xMrqnPcdY2dEBOdllMgzvILSeE6qDLKejobMJ5n2aFeUyE7ruhPyZbkYjKfTmP7ucpcLiLqUnyaOlpmJ8UMbRR6Wcub0KLxhTo65pm5mFSQ6Tk9ORJ7fds+9yZ34NcWMnp87G9TKjMkTOCvPJAVye2UVfQqpYegG2y5HtNkTRwxI3mDuxWoCWKR30n+SzZsnTYN90SOSfuYv9+mXMNPJg0u9wzqhWRVqoPI+0qaT4bvJ8G+D6NFyQQq3Lr5USJRSgDY7Dqnpa78PA4zSFx0OVTfCCiUajCDiTFEOI6w6sfJVNqqERqsZYgtzP82H/Jtw3NlqpYeFeZwDxYFI9/QM4r7NiU1WUkqqGfXLYCktcCBUfStyb6HpnpbYBVnz24vv+IOWBV8c5waV9BHTAD48wdqb1FwFtRQOY7EmP7ayVq5WyChu1QPn4y8JgYleD5h/ZXvSLpUSTLTQxWWv4qhiUNZGG5Ck9eS6Bt94StJlfUFEN25UhI/ZTrSAhpmOHlcvQ1RYWy5ved3662j9G8t+XojERE1U58JCKpLuCl8ECigc+zpPh6EYUFtYqVR9+hzjQqzbo664K4PY6WsjGQkpoHuq0fCPvesFR9e1SDn2AT7nGK+TeDpT2yhM3jWTJJGIxYXUppVTjfRcT7qoEjYddOJfcUlPh/5JNBFkW49CnPg1BjdQy5nU3ZuNT3YvU1GR7R1+V1u4Ip+O7pDTFoBu+GfBdzKYKa29R87ONtIvct3xxUO9G9lYSg0K8y9SaHynxjStGKFjJUtsoqIKb1JLk17DaBdU8PaAIOeHLbvaURaiKUP7dFfq+c+7CpQA2Ud3QmhATYNsQfosdPQbcKXGz8q78T6EtZR4Iohy1hUZVvqo9s5Lk5h9xSAaZimafu0QsxJZ3Kl4zcEyLustn8OaZCpMQ1FWpLyOfoOAqWvmHxGXbT1T2jOEodoaJDrGYvFTyNzOVciPFI/JLKYg+t+7Iz9sRIMaLXZXZU+MNnehsY313pV6P0o9GAm505X3wuR/oa8ObsCOdEZGDZX8iz62MqJARcOVVIh7YJQDRqa18Cb0g2nNaPKl8wdN95sZIhyQl6008pdLw53zH8fywRwAJ+j5ehpNjUrfumdc+U+kuHN2s/IUmeGOrf+dCFWii1dBclAJlLNbkPOdrOUDih8aprZFqGuGNGIXjAEfN1aNG2aeT97w8/aKE0+GjaEZAt7OA3o+bxsv0xrSfkRt7FzCRWuDtIkq1oHxcCY9mtvsYtxEmbD0W44cjvVo1ayO6oaAYZoMIupVVOSYxkcpOl4PnRgChoadXOnO44uuJDHyK/rWOhXk0D8Aw7/CpX7YLlrkVGb9XONIR1st0hSB7QGeeBNEKoV1mIDiC2PkTY4eqbyiJXLslJms4xc4QjrjDiEM+5JnP2/ZVl7bBWBQ42jl9XEjkzZMXcgmyBnDvAGh5XYLTUBbgHgQ8y+6kSKSUuy1N2p0dsZkXJaLrWCCNM+NRJ4OCFfLBTgCvBt1xg5JqdG+lqirgyJeuoOYJ55Ldahc0niPXMPPNBs8eT9Lu+cYrgLxmrR/thS/crgGnauwEVPy9emmIeXiNSdTds2hrW/OknWK3hptQOx5RHfSbJd8tCOK1DgWHiFDS5cbWnKTSxJQXVxMnrytJBAfbpDAuTiZKVeokqGaPHi28GgGPAGjBEc4yoADnbML34UTE3rYaUucmyGwu1MFnQVDQsRZgWSdxiDnmGwwnsbLqM0T8CZMNrI2Dv9RhaDadXp8fXeQ8+NkSsQr6KKyceZeI+K7f7dQ7bhPrXV40nzXN9QxsiJ6K7lTaIxL17Ct1YAL/t7gi+ZCPaC6um9JqHT6tyWa46Ou5edmEfTDPg8ai7YnpQJVFXB1W51w+tj8AFdrVaaPyznSm+AOBgPclc6ngq8WZVBpUCNW7DZoxV21m3Rm0NuVFBpZozMI87ZS6aihD/JQ8vna0p8Uy541hO6bi/Mw6H4h0PtAz+RYVwFUU6q0jv4xUqI4FQ3/V9SAs7IdotDb1bVOAGYFkKyYACqqKBOwhUwLOu4kDSQwvsD8soxJAKrAPTz/f554U3DT+OzwLxEbOt6qvYB5DmMz0xsKswCBXlRIQKxhWbAmYeNBnHTtV6G1vRiMR4lrajHBB4rgn23o+/hc81eIeTdkueqX1XgVHCiY185hfFVIihEKhYMJa6KmZ2Q4GBBOocRrZdOx/7JNJ4h4h3JeVo9RguBrNAhFzRYRXg2w34Jr5FmakrglCT54ADpzOS5gs17KCPHmMJVOBszfRzJYjiET8aL91cZkdpLEAFkwgQkitlKoowCna88DBDOMi5Q3xT//RJqhYNpBrVx0KOysIBMLoINoxlZC+YbSzMzIza2kOAhHMB/ZBeeZfM746H+cT7EYc3lyHEfjGgabUC8eRVXpCvdYIaX5Yr8QaeF3lscz9WlBxJ9vRgglyWY1AmkQHAKElR6MweUpTdf6miFlE4Xxad+DEN7jiJWFB0sIsIiRrPF0W22Z7g3cSF4ZasUS5fj2kd4j1Sob+PNKQi4XGXfeqmySbhstaHAmyHqo+kKaTKn7BplnDthDwvQYPLZigIr3vTa6LBVs4d+vQt4IvUD8OSVWH1X5AY1yBPOUVUcLbvxGPJKpp4oz5iHl/yhzzIrgfxQ0bLM1kQnesZUZ6z7iGZWbJ8jU907U+BtdYOB2p6U9/suOLfHqSBhsVvmTYB3+QQCsHrNpglm5HdDD8wB3GVshyO83UeDw4q/tkeZ6a27P5Z8hKC8sQZ6U//xP8FAYSzqlRUhXu29LrkIUHjP/DGkfgLCBzg6TVgNMUQ+7arGspqj53NzHZXzjC7yXreQDBD+MRYLfJMWfSOKqaSjSiAoz2lFkwA9tqu7HnhNhY955Cm2LISfRoS7psgE5tZkTahwjDvtGtnu6Dny44czv916NYXBgAjJpg2aqrZ/hSh3AvNzwKAhOKz9FRpIxaD5kkyEKWEQD4xOQlamI/PyiYBnd0NecrfKc1G62BZISc9SHZhTvIAFQwAgRUb/srSATEGzmoh+Bn8HfKrkIpGL4rKZqkgVuV/ieWWvFi6oNscb5vh9rHG5khOqTiIjIKgh5i7btGtu4Q/zQ0XAcmEUZv0hGrWNfR80QypKTo974tWwUP8T8HNxK/ClqJt4aDUuQNFbV9DbTQThrB9suonGEphOvk9fWA52SS53VSW8HiDu4iSKqXDWKx5rDitlRo8Bn0t/Vd4GMVDQH9ohwRj6WS0RtNqnFf3ktGvVTP1R3d7bPdeAQgnrPKzrsrBZ9+fJHdrzrKahQtXm4bWFH1uTxqUCBRaHuhwRRY31sfa2fbdG1SipVZ4s6FuoePBoGW3sOQiCQn9mBp/g1Bia8LdGMlQQO9nicRtZzPf3+bygYAdc8zaKMnpFMsz8ddDirZsj51/tuqcoQ9cVBxlGrC1KSIz+1rGhIb1uQZkLGnmzIfovbW/DgxUZErUEUEYNoxFFJuSy5RAbyjdttD0lbFLU0zFcNEGS9j50ICrpCs2tD5qucFFEe+pgIL+oi8iRDsrYvpbJvg/uH+SDpt3h1ivvcPA/ywHwwnXL0tLynOTQW0+fSV4ObkQbZ8e8OdQaS3LKI57P7fqui6qJhxdS1uFKpTdPVMGWOD0lPO/ELIZfpdoXWO66tbUw1grVJY85m+E7sqKJLDQ0PAsOTPNfbev3cI5WJGpS0sOi4cCyZlA2rVrS2Y9b1fLN+PWYxT1bJZ0L9F0k1qjI0sGkGtBTZ3MeKHablabuz1rRlxLn7QWxFnTETopJ0XSirtI0UDwaABlFMi+btg1UiYjdRAt5tZQqS+rZYG1kAm3K90OKRdGyuDyKF8VJOP2yoS5TrS71PeSuo2OOuQgomM7L56PVEjF6JAkcbEmbDOTbq/Tg/4DTCEAn+csg/ikTcKMO9TzipIqMFGc6m4bZaOEaI4Q+E4DScN4J/mPuNeU66W8bDUvBufrTNqUG/KUD08dEuyxkAxLOZQJ5lg7onQokWThH66s6HDBZqP3UNQHgXj3J1QTabKM3tHcdF2JESSIqpmOv/qFG3OcAeZJPrSYc6AH86G0mG2gTKC8+na04RJxvdP3u9KGtBa1+TYJjop9sAEZx5+c25qhIRxbrI7/Ghq+Yoj/bM92cB9ZdDyPcIrWuyliz/gPrzZ1FlfxQHN7u2E6MyTYIaPeJT/O1GJj+4elWZb18YlblHIUEurp4crO47IGInsBfduNwCT6f0eOF2ycb+sG7sNCufXfV3RO9jgBju4slsAiL3mzcqm4bL09ChdL4ZCJGndu8PBCqiO6VeopcLLNRVpCzX92v719telTPv4vctUi9sgbUGDWfLStaVedJQRC3L1degx4fNQMhI7B+5RT6lDFZCIabhVP6cu+Az2HyCd2B/yaLqDmgqzSDb+mYFWuZVlmGntqiAFXEyJGKeTFfOEkOmHW5HdZJbndZul5BnQLW4SnrDm2w26/Pz2MAk6UVYXQ1n9swpGyXJcKfmKG8NdkcKyemVkJRBkRR+LC7PgkPvgzmjqdYoPg4DheQV85V9hWar7831WiyDTNrJzTCnkRAD8ztq13nKpwtHyC3G9MRmhny0rrZHsYJ+eBt653+dZV6nagirkwwPAyXiE1RAZczsdoZUgxBP9C+vxrbdvqyv26mOWfLj/2yNGCMIOGM8bh7tEYoB2zUnC02F2uyA5xcrXPYttoI+PjQRjYTf0H77xkNPl2IRPz6Yj6GCZeQCUkaMDRgMWhG/rReAqTIB2v2lbJZjSuUAJ1J5DflygX7hfJIeg4515IFKtJUqggBGWKkDsq0ob+phjc6S7J7ySx3RJa2lKydmiitxO+N9w+7uzmD50GqEiEaZWg/cqPOPaua9jkokuguoiYoo1v0mgTA1udh2SBbsp4ONYm80Cj3tfJokQ8pznToy5Fm6cJGGKo9gWG9VyrYcD8mDSZnHJZPZlqVgAK/pywrMSYGk9glV0LSsbjFoC8y632+QqjdxbVCLHawROIyvs1YPEAqMLoHZmRGtjKNrqc380blPACM5Acu7HmzhUc7l1HwheubnxR5zlsoANow2x8gkUsXwUcxPxtK2m0IdpiaOFZNQ4yuNkYVi09171JgK2IFpEdrzLQdUI0U8lD8n/KWHBplvAJMUeD/0s71PjRw3OzLiXwE60ct0koNpaRifLgcz075jj8wMOW1J1lmp2scFF3aHAUORAomRQr6ZkNelH94TCrWAIxtH2qd2uJalWlW7ts6TUbUI/HqCGFdZCuQCrAfrwW6XF5g+zz07sqQL/EylVhKxrdoVbJrtEHR9T19++VbQBsFW9xy6AWMkN6gPz+opVPAxf0VkJauXik3yBHNMquZm2H6uwqj44G9j6TwA1pDmECfm2Gtsn32DxWAMsKfacdoWTT77gmL9705tvr6Xih5muzHvtVzwrWztkgKR/YurcyuhSk+Yxk/l5kei9Bs+X5hd4KyQuIOsYpWkbgenyvIN/KgSKDXzR1ESZgJuUUCZTCRbBX7LCunxOK04rERxDJzdyVXo9Cfs/LNxFtJOU7B0AT5wnp8nl0TE+qJFG8W2Px4ZwcjtW8mNzDEScR4SjR/NECBkconhLAvx2ZCdxttlAqvrBgyD7SokcxDCBF0L0gjv3lkjA9oTAmK7tmnY4KsRRtuCoUkp4DAS/mqbzIjhfJ2cX0uP7EKuOvDyjvu98VlwIF0sikNjXnjNXvhYyzUGscCAp//MCN/SMt86wrhKi/gO2V/hZDgYU6h6JYxk1rEeR5rgs7ZftTR6/QWp7JgyCzaaKy2WCbHAxXwSqmpNl/vk5jqQpQ7WlxjHeCrLzYLmGgy3lHWrNBAHUar39X2x48c9RGh16ZJ/fueKNZ3hYj9sI1y5V+uIDmCm7LAd9L0pAFAh7mhwaahWP4tWx9dhAsbUyu3fIg5o+hU+ca7djkGYWsOr4mxp7Ha/+rkHrjhre01VcfzDzkT46+uK7wk+OT5JO6UF52wB27s6fsgbqDhqFoTRZFRh7OGqrpkFNXMtSRo6IfrXEIg1h8EbW1Qm2mEqE6LTL6KOD4PMF30OZfKNcrxbkyIqdQ2TNsS7TvkYj9HRSwPGZkLg+l7V46RHez+Zzv1D0oLzK1w+rF/q6YrK1ax44jb7go3RZ5czycyMV6vXmLHFFB9hmfBQN+5uRZ/FBVGVdb6/I1cDIdEc0Dua1AL3gWZpbl6RYHxwInn7x+qw5dfUy+3pJIqK4UB7sD89+cT+HkWC8lbMOhhSjKaPtmWRMv0lfhQt8COXyMn3MFmWSQzT+hUtBskS7rta0PH2GzaG9m8u/JInjEG+ebYpgT/lB5SRGWpAkOdGHctJAGyZkpiJolwXVjLoKUzwM7plA+Xs/KTUGW+6BEX9T0rlrT3IT7DDh+BRsas+uRCjlcZ0g16XRF8JxmKJQNuwsdmm0BYXEHRAAnZuq2yF1j/uc5vHt0ASM80YF1NP1rL5/BzNW4gRJTTVUXWQKYwrRxxOXJdyZTXk7+Wz7WXW6bOjTe7eQ6PVpDRVKW9YzgXerjrrE5ovq65+JCNjt4+nOkjiKc4apxjDrwd13bto8v8Rabwhh+My6fQjKHzxbELcKobOtifIlcqq7NpK81BXGL99NJMyApP1qAr0gN0K5IB2BDhvbBv2yy0Z0Jg3PHQsZKY3vqJYPQM3NOydedbhK0BM0tXBk/i+GK12NWX8XOZRmVADSsMVCogSpPe3w13XqbbTPEGbW4EwIT8HUoZ8H1jsQrdzQUwE/gsWO+KiDSdTZCvq8Aq5tAFaoSSVfDZRKoqC3IhUjDsxnq0QhLYvDLRwHLjsWUh0p76IUk/LXjjzAmw2ZHgFpEiQFY3lneKcOOKLY650j16s703Su4FXcMjgUMp5N0t7lmnwV3REYh+IXJoWaMHE5hmSr0Fgs4jQaGm04BhQAeZQgk3vl49iusaw14MSUPqIyeOJOIVs/CgPs2hkX5Gk8EGbRmlE+jQKmtHz8Uso+bRrl46rpsgmUEPAarKIGE83EbvvtAdxXQ8l+BOcwM8MSwb/ES3NJvVbhdiZYG6iORc4ZJg2+VlNTYwIudh24xAMPESI9UNS1yH75ZQDmFMhSB9WEkfbjDLSooWoBZaTkI6BidI+2NQr26DIqvUpp1wIW3/bTxVw5mHvSZSKI0sPlU631f5Rfm9jEsiNlCV61dBcX3fgPQATpdJ/v7qmoAlC37JAPVt24wIhhWaqWH6EjCZdr3cw/sOh2F91eFeyZ92CJCjsKvo3j4tpCMr4q6rSNF5L/RweYkey2LjKH8kZj7+dZlGVagU5SA4T2nAYTDsFc1rSS0F61r+kppcYRszEzndJ4DIpTNX37QzBNYICDAHSIYhj5nUyfBfWPwSJTlckQ/jgogdJYX+psVH4eBv7GJ9C5Kbqb+J74jCMt9cIMJEYMmJYHUHWSoF9lHQRdYCInhANkaIj6x4Cc4kW8yDeLWX9qsOSB9czSYWwjqCTGHj72BEOtWbPfdtrGoLDwiwfb2A3RRfQsSHq0tZrQCqj2JcGe6ODigvqL88hOk0GV4MbvBc+fcnEVyYg2ftdJB3LyzV3B1/4p2j0UeEiNDFIUyKC5xTVMwllFpdBv9sWAxguhNm8lHxMttF995hRG3WzeazgYjlAv4jSPfMvmKlWmu6A6PfsGwJfzLo+rQc98dl53y17D/Ly3aWswRbq2ykqOyQQmIwG1csWXTpOC+/v8VP3Y5fNz76TirgwCHVniOmJmo8PZeRmvCspqteNh2/HZDvT6n4b9Dnz6jGSXFsbalSAyT5vmODsrMSSCXMRvdQ0OT+yNXBWBvhhFJwBFePg5ckgA7QGKEMTMse4nAaaYy/5TPRPsTp1IB+oYayGfAqRilI5Cv8y502gCVox06xI72VkgjGP7l/zusxrNrbAejrYPrOiuMpn7jDUGh95Jfe1Iyl8HPOGVYWfBwhwREfMv3jytP8P5ywbXoMRAB9QnBphyP2lLjfgGZF6hpNkLozyn8oX7+Pwa9CxVRepspBJJ+B8ZWnAzQfthLcMdBb1BMpfrqhoMUolYOV5Z3kLAUoOQdqoJk1dJ/7eit6QWflUYEnGMepFlmARwl7Rx9q5A4kHoiPIp4I32R7r31tFsvmafhT1oFAU0E95ZoCU8i8eohfS4IBKAAjFp252EOBDheAGrIZLb07KTz5+Qd3usBlUJhSyy3MQ6swRawNrDRjmAdZMTa0RyeMrXpeZxMWKxyB2EukYpDXO1zsN9D7zxi++GapJEN95zGyrp5OgrWD9tCW+pWQWq4D4VgOZAaen2sRXiLPquOqk5VFftzGF+JVf8v/4HK5g0JoK9/0DmNWvO0FfFaZuROXcg0iHsZh+z1TlOvPPlDkWbLWD+OJZsmkf6VFFCL5iFMnTXiRFRUHpZjbiwNywQNiiDu769WoGLCJAMaGVRomwGEH9HBTl21hdICQeFhcudx6YEvK4MsZ9SrkO/sOqFOC3dCGXra+B48YbnlxMSVg9Osgw6rMI8JOjjdm1vBXUbX3EwT9emi4On0++2HZGbNsQPzdjoxm8eGhl2GOmCxMw4suXMH1+2t4YUBdPrMwPC87Je7N+6RdzeSBk/XJ7QjkswODjOVxwz+DVVv/516Ln1RZLPjhGJqQAqN3N/Jy3qnVp0RAMv8CR11RRufy1+s0tIJxTufWWHitCdHJanFvllgY6nzxETxN9lWlcCoYu2utccndTjegssyCFgYQRUwaxBLElkp0QRY120dBDTay4BAJ+Y6GWZkwo6D96kK71TmmET7/S6a1UZxVNBurP/TFYlpw6eVygs36EPEJ6hgomkIYfEstw5ps/inRxrNYDYjVA+TZY0EYIZdZO/169MzqtZP2sH6s8mSUSwFWIzVZvRSlkpihEp1jZ0/pdLeGbYneOVeLyta220eThIa+rOCGCTJFQzRf3fSRnPgBjZU588Ipj6nwegEcsfIhfeEOCBAEnjLVgYKNFofRIV8xg2+GFY3OGCeRm06MvXe3w4U7lmlscvpqeFJYjxcEIumK26Mw+nK8vl16dyhYZSl9TcZLWdzUpRmo6ldbc15ujsdu8xkw7Twj+BftrVUNFdhFVCnZo7Nq63iHogKDlUHnsmzwqyLWHE4T9yg1S7Fv8YJHSsObE1RZdh4B2DmRwOyS9h1w7/4fEORiTyhpZe6oM2RrdaYRwKnGvPIj4KLa1v9iMmUpuvM27Qnptxmose8XRfj+IUy5QMd65qLzodsgekfdGB9RcZbiRlBFVoirVQV09DVZiHMPuD3eoI1+PEhj6Jo2Dt4peJKv77gTIQUYNeMiqID8cApLxuqgip+pxktTUQr90udBB/7MKvEPV558gXDohYhE39Ti3rf5W/P8wAMWDJKBUM1xQ7NQy9M+QP5EFVECKAH2CUEAuTM2errulVN5zjDGMLWAkQZ6QxTVYLnoURLjZhsyRw1EW8U+CexfIHRdijtL44Mqbi8dovG2dZj8hjikwFb7JNb/yJdP0MbAQ5xGh/rTbSQzR7+vyq0TMGGx9R0nPUuA53YDZ79gveNZh0I8xTpA1QxSER3sB/FKuEzleghJFc6ztrKbPOB2A5Te+nMAI4FcvVpYMvpUXdNJ9Pi1s6P9IIiC3yGfUwBUjMegvFz84aDW1kEY2BSBTZpmX87A7FZLgSPAS+nMkMutPkoWpDFbgMuy8RsAZHU5PKIoHNXrtHtvOv6rM4WM3Ol1hRpNSdUbgsyJGklv2o7w8XdHzSZglbUHQAsDS/mRR6+maEp4ED4l+PINtAq5C6VRZesK5+9lghPk6b3caSdJHWnzZhfHgzPZ+yvnOyWcA+b12x59t/nEfmQiAspYN01OmdWxMl8/G1CS5pG//QhDuAPkNwXomsdw8DTFgV7WZ4W+h4z29/njGjP9ql1s7WckO7/Q4utgnMRfHIBkFXteby9nWuJHqkc2MV5c1DDmUeXRlwwVCk5h5eUU9czKw8cW+6aVZm0f7YDFWV53WbDcChY2+n94qfE18CodXlAbJkazFEjWEE5FiIDEYDbHLw0p8EQt7lgOFqfk66TBAwJi6ceshW6l4NOlEneQSEV7KKTWGME/U2PnkKREzaP9mcvEFX0bs3j21eNGOeTnZY1r2KUUSxBV5OFYjzesDpYgsi4nNQrfuEbKIH9SxXacN7etnp/lfLZ4RX6PJsRNPVmUwGao7vFqpuGKek4LUZpgmw17a8tq+hjBRyFunzplJjWsEx+A3sZaFVdX3sCIFGvLuXEQSWDsBq2w3o4TeqlLz31O2PEvvqomChge2WyJzJK+Mny8RWCcVxFiyQL84nXYVpVaH7yTLlh9m+QyU5VwfGiZzlKm2T/xT+Wi7HNGIx6DoJy1mBvSTWqMeNXG5uBK+PWyR2z31Bu2PR/LAVXtHzFTEQ6Ji8sT8WS3xmS1I1p3xxplCFgsrhitw8D2szRkKOF5LarEDr0Z7c15NCsHbRjuKnI/KUzHBEs1MpNZ0l647RrI/ZJ5y12tuu0SEJtFGKXsPELO/t/wDWcZt0V8Mj/W2j3UGiuuSVmDPuE4rW3mEZJaVDSph5HTboXxs4Az3fwOTHNJ0nR8Z/TWGk46D6cSE6T8QZMzAUckNU6SAcE+jx53BDA+qxqjHEz11NtsmcxKYJyKK3XfW88KWeOhygSfma581A6ypeQeAtWw1JAgzBnkFBG8ipmtpOyMkwFo4If+aZKA15GAfRkg7fV7NV2LKvfztBydMuJAOt9SE42OJ8ezQ9tnGvKI8AFjVzgrUIEi51oHQ5/xFzQZV2yisWoRlv3OUBgaLjuJMjth0xwMYSAhmzdgUt4rapZwX2DWOPVofuIOej1rxOa3LKspZlZVOyb4Ixlc0l41qwuExisexAiFxjsbuQEd0Lfyj7ceBbbrNboWk+u6hMYEVxJRQCRWezzJnWQLeO1tTohvupjUTo28t2q5HFpqEnzVRgmeI+0j0oUfJ2fzYefbqqUtUDR60EhWpRQQyGG/GhoKbyekgQFrLgHgvAZtrCAARmTXlwWIC/3wD+3HqCWqVRZpq8TUELcCyKBCN2Evom02CtNsIOhssdx4ZpJoQQVB5awy5vS9HYfBrSVl0oNMIiegFkCv+QFB+vFOc8XqnTvO8URWq+usbeFGxsJ701burBkUAITBtnsgaSEckXxrKCUM1E4JDiIQdzkzBIycvyEdoQq/E7qAZDAk9ZkHIVi6S4g0KqSsh98ZhGywE5N1wEZvKLk4Xgm313j6ffD0UY5mmb61tExnd7HHX/UhVpCOtbGfC8TUaht7B0anTUD34IQD+2rQeeqMfF8noOSUY4CARaF8sIADYG7Y+DjmZ7qpAW65hzg+gXBZF//sx9b6gnkLx1Gm3k57Xpp0iWDWKHmuSCSGmOWWqQK3F0zosYHqF1RqTsUGUueudOcTILTBsax9Nsvw6aLuYLU8WTgEUSKNlChRRAh3hTltej1wiY4kNZFgwrisSXDuIqlrgZVb4eMNjC6xu70Cs03s165c1M2I8/DZoAIsJmtS7Vq4hfEVv6RfQfpELy+OrUAvRtV6E0tLVIMgdbamfRqKzNqFktw35ejVTZ4mzPtbGeSGSiTmBCqR3QXYoUISD3ovAHN4QJbncgXUjpX7H/xp3ekgkR/uJYZu4vrkQeqophDJmuGZs8iMb7Znr+NXkXTIbZKDk6mS+C70iINGq8S5mQ6hbe65il2q5jMYJehkSJNLr9f5thaT8sl7Ui1vKZew9UowHAZ9rrkj1xlo0TBERqlgJfTtpViC4la4slJNEPDsttJ5NBa9OqCXZwmiOmdtXaeAZMRViBci0qmrxkPaY/hFszmJW6i773GeYls6zl/0Ox0NwEtuhqS1kHTBymlMEsqJRwTDxZQYVFELvARdLiYVMVmh8YS4YkbC2HTz5T1DfWImE8wBUxEaBUCnxtCbQMu8029z5un0qpfv+BLD6as2veXi0BoNAztvTLSX/nqANraplnvljbcZPQ0/QBWME24krSS4SsDBeP8Wac7G1K2K8tSHH6L+hyhLqe2hBfrADS7mSa53VRK3V1Gk8aW4ZEzlbJsbexvxZzt3LGg5SXIMyThAE2iGAuCcsC27WXodg90EYLQprsPAVvkSNiSpzooornPSAOeq7ZYuOnPCGKJ9PNH0vEfsDnEJOvBBxHwaFDixftKkitokViCUIei4mx1gYHhFhLsjHPg7mRDIJdUPZRz3GBBiLRccNq+KIQJKr4k5AFmCANpleD9UwLR3FB0f8cKo5HAzmwdNXEWnBiVXC2Rp9oUoOwEnAQhdeVx9xopyJX8JwlEeHSU+i+oGTzNxFAIHoBWZlfDXXT86davnqyeEAhwV9vg3+T3YnzyeOn2vW/k8oNr4mS4FbaXKF4cUWqa8WzJiusO0EpxQoFhPQclop+aGa/yXMHSTyI5B034kCrOWSCf1XKqE4aQ/eh5gnQPSEFgRLi+ml1ZJtdGPJ5XmwnZP8s6HGGLX0wnfBE3DfMGuuc1U/K9hd9r+qxsCUMwKGAitCCAAauUT9FiyuxVmRbOKJPD15CzrEFuAJV4LHIN3tJtl3Efq2h5mPYp0gYUw2UkVxL3iNnafvnWwRWNsAxMSQclHvrKQZlFJs5vx7O3LAagw7ljls4WaBm6lTXS2Yx5gxDttsgdup/E+fW3oIkVa0VWzVfQq2/npjoGEIKT1IF/HcfVAI30F6qUcGdb8V59Z/bQHwACaerDxBSICr5fvF2ZjjWsfIXZdRMhud+XcDi9uW+uSwJVwZrwwI09I1PMW0TGLf2P/E0Vr4EeBiGaf0T8od+S/dPCw1hWbmsVme5DdvDJOOHOUvOP287pbjWtvA3fslObxIiQov5bckoI53qk9rDKI7kBld2if4fkaaXD1WTtmAvbZCVhkIw2pl0GA//yCY5x1K0ScAoCvMRRailpJftNSDOW8tpLGKdIDHYNJvCgqTgdhFcR4Wkmb1eTaGVaR62VefN35sv9nWMT0Pv+teelZsljRiG0M0sWF4HjDgy7SvtFrN+1F0Jf54ZTucwjdAtPivAYtQoylnMndTPRP6in8FKckd0TIuuxh4x/xZnkMx/0Xt6LFYP/VHfEVyl5w5xdObJu5yDdrU75tPZF3BW7e7BAv6PxuFuFg4dFzntxIpdcgHHOfHA0AvyNXKkGzGdOJMG1PueFGzsyKaTb7OEYj8p3h5dIeJ9M8YO9n6Q3ephgjfZeZ6sVIh2aOgwdGZc/LdZbBjlxFtlGRxUxVPBW/1dxhb7Fyx0m1zIk48EcGBxN4gQa6Q70KK4p5084gfst7DhrM3KWu8vNdqMmGjK5YOfFls7p3hhWNzX7vCfZbb92NZY5tvPmShc9zyJFhKsmWM05Trm+PxMAXLV5ToUPRD1oiL4iZOwgJ7IhXMpj5GpJDR6s7MQ9bKCIZDWjipEB59FGPjfNa7EYR8v51Gj2wq7i8RFi4LC5TOrB5Af3vfMVzEoCXkAXHu31oQpXzvSI8lBWtMNJWvlEX+N30dzCEYirO4JMTBQECA9oGdICGWkRwB8gNX1Z4XDrdsm1vtaWmo9RaVBUTxvkl9a52tZ7Rjtpx4ZU6Fudzxo1IMx+8f+Gy9Isok6RD24Zj4g6ty41XA6l1bL4KopQE0mTODiT4GJo5xEun6rlMBFqhHCUZIeTXabIGL+kO3XNlOvLMQYRdO2ukLVN4h0hyOlG6MVHS5T/1vwyQcVmsmSJrJfsLJnTL4imLkFhQkX/wBEiKKu7J7FIZ8HOEPsbYhiQnsFf3n1KTOT5RCgRJwucUkM784o+FM86J5Nr3UXnOkeYVRmRmPOlWQ1p4b2eHf70frAgWHoSb4TuDgLgVKHDDqOhrq0daxKKgHVXqQk72lUqOOvBrgKh8PSRvHDEgsW5zO8J68Jwz6iCdqCA/FdUTKgYECCc+o7UdLj4pVpel0JcRqWqiD81UGdYUEWSBat3q6SuCOTX9+dRv39Mj/hDjPShZX+3LIoUzcck5hbwxDMMtmOX/Y+Gf23etK/+Ech3vyAFsuc1Ob/VEZQgTKNrWPpeWB26BxWHqDqDyiEh+el92ONoPCj/1Sut722RASdNxFmgjUEZA6eyE9iC/ApDlBm4SpaQ+LFFziPlAr+rPYgR+LffZJF4KuxBdhWxAwQZpoXpjk7T3FaIShiuH0npz/Tq8m1BdF9vsHLPPveas6BI+IZTIBfW6asyGD7qsDZXuuVIBK4t2q2PpEc4+HTp3XWa90WVRAp1gi7fGXoqAz0aO4ziKP14s5vhYd9GPMUEzxhsqNvWtb/ce0VxMzpjJLo+AhO/4r/Y6amtrP3YZCGXMgWxaZQLYSRg3i/f9v1wUrA1lA4V0EA41WQL49/L9mmJKzwKF+KYcN6Ri73x+F050xntwwOvTpZcvs+RW+LqPwXgc7gwWp2A28C0ISN1TTIzQWGQJWer49ZV/j/dudu3rKhCIprpOLhka3NioE66ezzCkWDFAhZkVy3iZDGIVS2yr6RH9XT1pLHaFvcmSMIwhJOwhHprXVhyErvEZMg1BmnB9rMs+5XwlhDQAtTDL3813EWfxGQtcdIzi777gkdorjIe+4toA3/Qvw13aYlT2MXqV9PI5xIalNxJBiHUc7OOslXBHJ5jTCUeQvp4Q12ip8wHHsRqwZvG1XMZ16YcciIobPytuig4Im8WU9w4joTLzCwJIePAF63U3k1/VDe8rcKLHewdAfMw3l+E4pgBHJshwz2x0iySU2HXSt07KfBr2gQfhH2M1ZT83a6SACg+X6FRazXPGUSXTP3esxrQtHq3ECMCtQu87aJHaCROYglx7wMxXvW0+HGc25cMzeXAJMwnzYUGhGJ2u9rNoK8quJ1Rls6NwszGFA60idZ1OdsZytP7shJfQOrxgpAAPD3Fe4LnqYJxDB5rPGY/+JOmPZ7HubK1KaLBlVdTpfohJ+OJYfSmV1wAGG9uMDUWLmJMGWvfB/NDj8T22DVcMpaka+qvru+psnLDi+UI4XUG8LW1T1uN2Q/6qZNLwoGMiIlNj6lp4ZEiNQwQ1YohzadutYEV+PRFZNDCiXOrW7ju43VMUgJM9soazhF3a7kRVBfU4Go1WDOrB2je3gh6i9te078ifCGhKIlVhnqzWQomma6bF/ML2va7UW4NAOotgxQxi9S2n4OBNhL2z+J1S0jgF8BCe/hdYBUvaqrmuDjI1XA/eykOjRss8ebb4rpkQ2BnUP2JJMOf8T2eT0NlyjJYEpKjxM0IUXe0a/W+BSQTDKdzW08H8pRqRG3clvVjOXZFCoI424N7i5lLee/e6KOGXYLHThSwDLQT9qbEK28OUxsA9a7P8+7eFdVRLP6yXSPzjZQUrTEqxPYsJEdY3nrjUX638dFPQN4MfaXosCqNR/xudevOKqLJ0I5qhWqfhrO5haLjbzWMecCi3hR3Mx+0Xtgp+MXEsRY+YE/r6SdYgaGjRL+qBcw1dBtcILhs/b+BTLtmlG1czlvToysJE4ElciTl+l17mvG8NHG1JUWkQGDlb7F4LNIiMpHB0CnCDYQnQjfa5atlAxpfDPZdSBSJMw7Dhe/K0MWyKh3WHCnL3g/+hLCBEVPiDBc3/6lSFbwJbuPZm1k5+MQx8p/AV+nwJ3W8C0NjpxPNJd0TaNVQ5ZJOEmliXsaXLPIYX915jflaipC6yWBoAplGJj71x6Cq3246SIhLz3ne0Z+dgDYcXNeUs35tljfH9MhHi5ufWzg31SsDHBhHhatyoGbSZ8KGG8qnbLqn4K5ipyXb2jYTP6wkRSCxFzwDdXZi9SHc3UcpGVYAFU8vJ84iHFBUNhBbn60hxrJvtzzNxGymm3kll0Q12xeDN5oLKvgc2j8gGUApsWgreVDrEBLgIWHhQbp1rMpCqO2LzxkbUfUCqoaqy00J7CLlc3hVD4bYJ6xkELQAyPXx3qfgd1l673NHfWBV7B2fwWfT2xSYeOz6yfbgZtX4voc/IILGqeTWV1L/CAqrUz6AoHoqE4jLKRM6y22/d0tJLC/AmNf1Z/2AQqqLcYlIgzclclwl7ChbF0Cs0L3OMWrI0CDqvG/hlx6bEHezk1MM46th5b/8aTDajnpinpxlqn5KKUVkzOgSgRBxklwLl+W9Cn0NfnIw2AUIc+JrN/O05wNO6V7bGMPvFGSQ+mPBpxoODEXWNywbRwUikF7TIGLSv6Kld5G2xzwPTsyQiliWbcn7YG6glE9ocwRwNSc1QZLDg2+E1lZC8TXHw7Zn1KNIbyJevmJw2sA0YCwwAyUMjVQp8Q2W7jPdWMC1GbGTsPyUuXNefFLvkBXDBqDSAKNzuC/Cc7I8mTpIhv1uEEz0bXLP5sNzlM1VTJcyjMRrGJnzNY16jjOhZMtzonRa26is8o4lo6D16VYEAhWYatFRJ/eMgY0nWveF+6RDu437U4ABSqq94uTKyACSQ10sIiX6Bpw5K+X++Pz4iV1rMd9O25EcH84l9Yaz/LZ3fKcg+blIXkw9lxwFXKAc1OepoAhqgC7mAHFqNR6uuuYu/N8iK7AFmd/LRkBp1IhMhlV4d0wUZ03MXpAi3QpQ++dD4BTmGIC7fuRsXAWxQj+RtwK1YFfeKBdAvt15MwjPVpONww+qT211blklOf4oGcFeBSdX9co2JKpZxqVBHT8HeSEhBaZSdGQy0yZIHYu1PKB35ljP9c+cQ6aiv35rZV6I3o9W4ExkxywQ3jqVRpJ9G7uUjPY1pzmEM64wBOrS44gEYNIyxOtun0eN+KdrEBCTMqHK/dc/OF91Rldfd3l8zqSA7eUhJzJ32SqieUcXaAA0KLDL5ApvDzW7V6158eCDteuDR0lmAepvEqAUJmaj8GyOmEafdX7Jrg3XQluDy5GYu68rdJeMC3zkSk4UlkNsIPKW76ArnjDMG86a8+G0f0CW+h4lVGuGOspd9no0JkYyCboqwmKFO4wozE9qFK2/AYJIn4osEyU/TIvV+dyOaGuAdK2QAAAlaA7j4+dWdXCK/qTTd23zTiTDE+JHijwWExn2owhlDW6sI2cKyxLyYh+0d9G7/KaQO7c5K+u9+6L8G5m5FW0FoQJAmKAgjhCZ1vxHLiqsOTPBa2PKCqVMYdtILsWJbypuNOu6eHGEO7s7JPeWSVmNDCzWHnCjJQuTSWjkfL3FWEBfImGkvv0FrqezRt+mMnuhnlmeD1/JTqCr3WlLDts7Prh1A1puXRvGXmauhW32/HeVexqgwIewPFsQ3oWtttkmczbXXMVm+12Aq5z1cDNH+EUzGFY5TRjQ8wQWB4MmIDriBq3TVLWZRA7nFeE8kqPnp+smv115Nxo4hw98y+WMgYsjgN0iDeqj9aX2T0JMqwOgXVNUcSxbQqlPnXQTUrXNmwT/W0WcRmgfY5g6RQkejZ2yvgeHUreMPV9IJRnlwyd52SHVna+6BsPYlp3utHWoO9gDSnBU8hIgEz06Ayg/OV1Dm7ZIOFVqtTwlQwI2IJnV93G0Q69YpIhUrfw3RyBMLQVX6c1TSRM9tplzr2eIY103yeKZycyOBCfzTYTxkHOgu6D0WbCE7WaRXdpgrNKJvHlDfzE75OknBiu9VCMBVz4LaXca8aOagnY00SMk7YJUQEoEAAc9EVoKcJQ/2G6mvFpvCEJ9OcR5KZ0vV3aF1OfETiZE+sbC7R9GRV+TwiL4m+QpGZm6Y4KB4DzD6HKESWe8h1O+14p2RgTH0BQqc6W/owNnZzmkWb4gWhYm6lLNlSXEyjhH5hWm3ZG2A6j+6j3m4knhzj+vcbyqiY3LBYGUUl/O2hj/QwSSWyXMXFHFJ3n4MC86CdDfziL2+eKIJ0fYlxIAGBf3VHJf4MOI0XJYxtVgdfBRGB2wOZ3Cx5YJsCYF7PNApEVgOTxAHF4nj3AuYN3XGjU9CCzvtaQhqCNAQ3bVbU428JYDLSuDwm0DgjCS13+jvT84BHsgq8e0SPYIokVMV/B13fT5nvEuTKkFgDpLvRnREkP3+EL74FO4ILOy9Sb+Kh4SAu6uC1OBG31izK1GgeDY8JcUIErQseYI0q/qy+BcLwKY7dg4hHoVcJq+Kpr02HRfeLiUI4yhg3IshziHx9m1fG7dlcwMERm16uYfNn7OV50Dv71kinEBDMGnPrp5sGnTEr635/5Qw0HZ9/TXKniR1muUC777lKKITXg3jK0WAlRCGRH7MH/6LckR3wVZ6iIBTOJ8WEypmsiq0v3DzeI8OJZVkgfFeXJeEY8rWHbjqMAIjTOz6O4CJrLyxuLnHxQBZ4GPra6Zl5G/X4rTuwXkYeTd+x36oPKf0sUWQvGB0l6oVHmI1m71m8lP2e73jHYcwY53Akh4nxt6yMq5+oh8mHlW+kkiOWbDqf5hHKQawO/0dTZOQokvrBpMOsc+0XMdzy8xSSRkBhOFe2GPsgmyvmnj8xjY3BVzOl1D6xp5QLwULL2baMEa6K2NcbiFFRvQOn2ZSOo+eR+wPHspWdrPJS9w6iuCwmipzQy3I9W8X4m6ztMAuhejn6SArynN0YE74L/Or7Y2oRG5wXX2i1zIAwb23HgdlMw5dcrtwfyAAf9WFjGog/Mi9Je8jshxwV5AJoWX0rKd+u1xXEG1FEF4t7SBS4zSaGJjDKSC2hDk8RHOicz9fRS10BnO/cjaCsX/k0axxHRzlOONcWl0m3CXuc1eds7XxSZ3g0PZ0AbjnFEOSZ4ExsEOgyYl6gPUY0mwh+By2MDAkAIHtMqT7ruIhhNq3LXs7txKwgmRJnT6MrIFFAYHYpEBkeG8DzHjuEiX83B+ESRWie2ENfKFlThgwXaSmhFJ7P9+Km8ICvhN6QY0sGW8CYPG8VYqVdFqfXoZqC5AzrAq2VD5FhonY5Vg4V4nsLPrAClAM7IuZxeuVa4JT/1FwsVIJtHKGLbdZGKSdQR9k8eQC7wJOEV6bt9cC7qtHb091MsKHm0m6vpstSMC6Jly1zVEKAVDzXce42vwf7UQriiDfBYBK1mhxkDelhCKSNf034v2eFNOZrK6U268tABNKWWe33wC3rBwcZTDeV/hkhQKdcCrlH1yC9wgk4HtHKDjcwutyYPybbbTqFHOT7k6zP0tryF3cKBCXE+dkbuWVQxWRSBoQcnEtq41mH3O06hz/kZ4BsQs4woRPqgMkDkXVbYwYiZKW07Rg/WaTEFIPosQq54Fk0FNEqC7zIeJRk7CfxTXqMRbnBHvLNgiTWx9KY0mMIgKp8/kPbjG+k8qPheld6tD1PnT265ivn+OQ0M1DTFHXnhpfMV0Y1HdwhM25Mm06gRuzVZxwQI042rX2kIbFIdC2om/xglFBNZDugVqf5mTTkxprSQJZCjKDdUma8gQZ6dvI7H/qIZCHh4s3MQDSo27E2k+jD0ciihHE9BKsg2KVoT6uYis4UOXoMIQaEkCWEa7n6PTDvkMbb9QdBzmkUd8EycNpteUdzdzQuep25bGxxu4ZQyKqszDH2dsGb8SIvKk8i+FxbFnfsMlETHtSpIoweDBaeRudhHgcb6cgZrcBPgezV3oe9Vu9saIrseNp8oahjyzzYifKK6gXAI9/KlDCRgantYwC91InOsrDdnGKXvrTLjOmUYshJh7bUhqWHlh0QuKkuTfZ6IDvW1I4CRTDem2g+QPa2DZU0uXiM/YaiHOy4xGLzbcnpGqWuHN1bVSN/2QZIrB5m3g+cKBQDIHSihWHTDUZfBeOjpXG77j6tnLJ8sQ59eFg6biZGThXDJcusvoIZSNYevOwb8X2Cxwjre3AiwwkKy54tirMSCC6Y6aBVApvKzwBbjaE+ZFfROSz4CYTrFHZrfd4AOpYgDItiGQOtOYXCSYeg/i91IItB7fovM4SshSQlf4lSnRR3gHfq8x//LeKoikx1IONhOAMSmssO7WuBE7fHm4/gTl7RJKooM9BNBKtiSLWGVUaDm5gqKAjx0+9k7lzp9Hr4wlP2KZiVHlYrPNigVej2Wd91b/vvBPI9uuv3T4kXmvq+7QOJYykK8kcUQ6vBF5x57xAzsTQwh8/Uh89/nfni+uCkkBwcYlB88G1jg+f4KH5L4inevleIt/bGJtaXmG2IMi0NZ667nK0txsNg/zms6Kxt/JitEm56pgAy2jLXZnr08/mexMnpBWAP8O9sQL3JceAtJQ8nm1L1oODrLET2YEskbDHac8xMjZJWCdepYLE+oqVGAVVtWaVfAvJT6O3XqMgk0kxU5523D3BLwZrlgpxthnqb1cHzDOb8CGIP2FWuN+ZCU0f7UkM5aJGJn43gRGPK4MvM+0j7A8Bdken3mxDEzuqpszaYJIXEcPBlld3b7D0XAfB9iWxuL63aIKYCdCDWBvWcDv7eAaeLtwbI39W70CrKstMmUb65sLgQvI+hEkwMkcf7I71uhvzuyL2a/fYi4jU6o0rFfNLMaEqNPVy6Zg2V8YsUHXUHpSyX0q6t9c3Yk7lNYAWE+mrddyj+0j9Pnz0ZL0rcgJTrvgug53jpScXX7pbS836np0ViSERW5evcoXQh7wgMkJwGtMddg/P6mGs6frWe+aSjZVCp0tRlEvCjT2niI9PiUUEEaF5HwyLGIEdtU9JYxTKNG1yt5nLEGJHZ4LOaYQze6rGFdU3DmuFzoTWy2Apk5X5eivi8aAHFgRhh+nyb/16RvfRjl7ZmVlf05LYaSq2K6FtgQtnHAcuokx90jr+aZu4vx6Fwl1ZDzWp1qcJ6cDbxNs1VF+EPmMMqWU+sd33AOGym2EngY16KSIRzqtHymi6alypwFyJ3Wit4QgEe35KcGNpmquGEIxBuKu53kA9hQsc1M3WeGbbpk4omElqT/mIhZ+sAzYr266X+qMDBSpffVADscUuKlJzSD2EVuIkG+ve6sPHC4IVbD04B9j3fW6rORdL3MxLp172tTc+HyB7WCe+REM9tnbct+F9SX6+3jTLWi0bvd8OZ3dk6ukXeiXI+8x+pvlQVOL11knWSrXDwmt9P7EmEeRybDPbvFUuqSK6JI523P+5OfoEZom9fgfXBWWWGIXRPiOTkdZu+C9O3UoVN8PTPHAArmiEAwERg0ayUcyuplSIqxpf8oXMR02YqN2aNpJMcYiaq01E7pBScmMxzdiRUzzm8QrKpLzHOlmy71NmUAzId3Rw5uhaode6BMm/CqQIb/8dqBjCvEXROeVifHO8uWmVMIASBn95wyDztPDGra34rDN8Yx4V6kmHPBbqMH75P5YUGVftT59D4WYiNaV1Fw7M/E/c0hxgQYzk44D3vk0IIyt/NHp5paNxily+1cZz/kF1I+I2K004XQng/7Ld18bCWWl/n+d41FMDMWn8KRGOowPt0F5CdnoWW+TWtH2jg4a/lhUmN9dhpxFSWZU6fq3qJphUrIBAycaM0N2KqQmY3QjMVrOBst+qjw9OwoDEKnDSF55J0VYY0hwOeaRKG5TwN4Z9EI+u7xG1Kyp/gehmFgLyl1GWSHH+O+7FwvxizWgseLovCedOEgKqmZzLrsthj0HLSL7b4vu12PaTQ4804cxxGel4uDUKtS0LiOVdPWKF8rSsgCunrQiD31N3w4S/gw3g3gv2QD7k6qOsahICYasThcA5gAo1SknG/C+yD6pgXI6FUNWLJ6z21LsghVGyPALckLpAK+iDkDkp5gAId/dDzBW2C0hvsKO6LyUMmtISOBDZneKM/S7vF4hK5A0ZZqxgnb786Cf5nrUk87GMeRvIADi0dU7VBBOArN1k3+kzWqQ2/Qm/dgvgSNuiYXfS6k3emAwT7qZLSqIzIkKtrJL0R4LHW6vcQ13KTiaLv/AHP7hFK6eOEzi//C8has3Eo5cl1BNG9AM5g8pb4esppXLk1FwS4Xi6mNu7kbjeQJ+6qOt3I8my/FSVxrT/ipRGY8SQG6tLzLwyqEFN51XbRbHVvqaF+1Fdlb8Ld68UY86Na3YxrSA4V2nNeqUX6c6vZkf2BoHEmoLElFRNjHkw7bgJL8RmtahSLEHxACJW9PWV4op1HNQrff8cctbCGSccJChdgG3Ww28MoHxnzOvxgDITgrPx1VxX1gEtHETU6rh6JJcGiA1x6J8JYcpepgTbkSvXAvKsC5Vs7GkAj7qKdHfvMDGuo2e8lD0Swdiop0lGqA1B6B+9eZwjIQMEs5CQzNLQm+lII8uHOqnMTTKVl7h1uduFiUrs792m8V1WmRb0N5sEHxWJGjbI29aZjtaS8S5wvOd1fxQO7qU4R4V583JldpnEmr0M26SL+xqARnebPIbRu8ZpU2DRH6s7H1nNdMahBgWLiBvDKbIdwAjqh1eMj1dj9I6RLOL/j4cSnLC8uVTyE/HkUS9+/AuoDUEUdOmoIU+F/ucdWHYHXfFHKtD5OiDKVj0RIOwLiuCdHY2JvngTU/qQFj78fo2xNGaYuYIMQknQCDthfRlktz11mkOA8YSeax8fP5junYqcpu7D/sM1eB7IUsYZGjPkJG/lFOAdXOR2EQ71EqDNA7XMJAq1oezW0+wM+fikBEKvL56ql+/PXHaOGbb7m99jwiR4Q9lJOg+qAQRZUs4pY7wNyDlLlFuxotT5WH0wGB6egsefTsiHp2K+dlzAygw77cW4iBreHVaLgde1FEamMt7+WnsLdx4k7/hTqatcl5nq1dgekZzc1OSM4QNc3x6sEb433C7c2/JIr8xuJ9Sb/0476wymoV33cmZxN6rRzx3GUoQRoflgOnlaJgtTlY/THMZmRACnwokOzY/LeADlHK2irRmUFsGAnDiFxR8B3U3tE5S+aBK/qbFttC9yCtl6KMA8EZ63eCJSortHkZ3Sq/oWWd6aG+EbM66vsS4ctYLX2zMg6Ogg5iwkLTJjMcbGknOPK5EhuIJ/kx+OS6C+iJHIDm2IsZqDu8ZT265iut7q2ERALdWZzmBZpe5fdqkerd4uFJMWxdijvFxJxcHwH9pDnDvFaOaoGJFZnksaAW3FZ9UX00VoZwdZT5AAZi6lMyCBO+IJFf+cJdRbbHVKeUnxkNrZt1MZKSTG8S3tMZn4vbfkRlBLGFecv27lFoI4+qwmxZ5V65j63VVd1pLWSAJzqIR6cVMgdUC4DOcY+0UCGBvKIqsdShpe42caT0IExHFcYV9Tc9Ldc3b1iPCi9ivGPwT+i+hj/ciB9v1Rvv98QJntmGjHULrx2X+DGzKtUtM4OvGOGWRDXUDGfOenqNjBnJ4NJaIV1wEDBM4QHvvm9pNNszMbv/I3WUyU9fAV9Ygn9jevqojQsi8xjjwJpZudKSzLox19SEmuH/vUYNHLlzzFl3rNDrPAT5PZuqFgBrwMoAzXYdLLMYZWxzMu1gBLi2QJOQdcHOi1CiO9MxFh8AJa4OicJEJaHkheoTg/sYC2aMOXMtKn0BaEKJ2M2dEpsjHrn1DzLkdg9PP8XImi6AWqcmW9iExN3NI0rIlayQnH2xRk5zZdTzqqzDSiJAJKe2zz5N6a0raCntDPyG2xec6bwc48DMhxVL6yvbpRNuI/OERZF3OYuumZLa/jKO9NUyEeil0kmmzY339A0DmUIEVTs3ZoWWU/o6img2usf9RgVVIrs6eYkzaYvz8EAEKAECJFKPXGUXi1Ot/TDfyyFDvT6T9lUyygNfNibyiG/6Yc7mErrFEmTP1oDQjH9LLmzyy0a79xY2ZVOLouZyskkWLEuKimXyc7vx+shURuinEdqAWO+IdDwBf0+/cw/tR5JbdKO/1/oVv/nNPoQzYBDykMbf7KqnWCsNQTfS720sHABnoS+QqYNyoSswK0Q0qULpLFlIvsn1PSWT/xYFx17FcH85C5Oaoa8+Er4yp4gXJxmjgwmixcS0vjo07EUY6xmfoQI3OdVJz8jVS22jl5z6Jre3je4i0EON96T88Kt+3vv8vcpKrlJphontKpbw9ElMB8nRDLmACnMTC7fx2cxyiorb+HqcP02oGevIItEu4UluR25gMcAiNS77trQTCd0iwWeiHWqsQWB4z2VVuor44GSAbkNqOAJeGevAR/4MIbQwMx8nHXn6aTy/a2C+EVpGrMI8Gj107K3Pto4IK5gddJoIlpfCnOAYVAqvDd2Ahja3ruf2Bm3A94dT0rGX7MOetcMDnHF5vB1JmgiaoXyFW5B9av58lAd8+fGNLDNWRdsBGlPZ7ySPFG4AkBRfU18Xua4jgWr6aXqmHKBLaK+N5VKhgjlBooKwpsN6oqf7eRHtWmMjTemS6FzbdhWSpx2oUeONZ+hv9dlX+N1mOe5xyEKDCZeqOFA0uPR5EBgBqfJ0QDydERx7uKFNtTrXhQSWMXUMzC+QeA80LW8HNUG7nSrTY4hwynWwI9tuozZhRdF12Q/cvi81oHLiZy3G/Y6WbaVlYmH8dC4jUYK3uhEGY5AgXPUDhGhvsj4Z+SGP12KFKEZ05Md+clqHER6aXStvSgDkJN4vZutMMSgctPkFDOnJ+YJMmBM58UbgAvB63rcedLkM43zRqA21Ag5BfUmZ39J4ccQdLIaFj9i+j99oOT/O/MBa5eWChxdYz6bUd2d5Aii67+3MUaiskGwuOQ2ApD47raD4UYBeBpQ0R2nLER4KeRbUYg0DHk2I5k+xjF8HlI47E9LTKiJ8Et2iCLh79oTnqWJF5AfTxW2hZ0ZT50x6t2klSp0G2REx8jYQScgHA5YCJw6ebGZS57mSvkmL1F7t/7Q4VXiJ788a/b38/arJTfZ26hvrE2t9dxUumntjLJYnuNeG9M6vD280xOAxa0euvtxhvUhuVX4GZZhZCXBWwqHBrulqZfU070jaPJ4HpZJXLJAYRHucNeqmVPz3T0d+suDuNjR0PbsRwoavdjX243NkfkJzAJ5AXmcMp3KyNIOILglMHsD2n6Higc/GT9lGKASMq48oYiFy8ZQRmJX7CQd0L10oaibvYB4uMI3JGwvQyPlyJ0hQvU1R+o6yp6byN41GeZtsPJvLBch0DvDEjFmBA5FaJAcUKCZqGwTy35aAOhPi9HCIYsq1nhAXdfKqTC6nnzG+GF6BZKQmx+SHGBQItSmroSoMrgIAqaxYrlcrZ5zdg1I17PJS4QrtDt4CK29tL6h5tDZSXT/KtGH3NKcjodFZt2Gjbdi/w7aikTEeyICNOBExUjal53hK9ivCnoQw65agph56Lr7ENo7n3EWLPKPbEKstgQ+cZI1lqlpK1S6yLBwUb61fEivEbsC8FfByM0n971fBkQ9E8KZDglypD3XWlbEfBYCJgozBOUdQsLdq3jVPYZgjBnEMMHqNRjTRdjnNvadYhaiuzes9XcgGNTO+sqyH3UolR5Osl1KsSCZfWek2JDLW0xEg6UOk4mV4R62x0ehKz73PCEXyBe2zw3LarYzmqP6JYvYPMb+pXyax+f9xdiW+DUq+u5L7GjMjVH0YI7QZvT2CZJUtJnqRGGeOHLd7KtlR9GPzjdNRCrnrKKcQkwFWjtcqQCy+5GcT8GvsH4LqHFZlH6iTE2BOt7r1yyAzyVIoMc+i9hqBeQv+xZjPRQ9WERFVy6WG8bZGedH50vFh6xiTUl7Cn8DJgE8/qrPFbdqnzfYyr6B/Vwbd/2V0agCWP96plEv0ozu6H3AS5VSHxkEWKO5dcrwOrdf9sZ+ktBzsg0ATVCeo8RAhGKLAzowRR7uMHl0sH4ggEbtKWHJV57hvy0aSlFXNGBrqRjE0lKx/k455ro3WVSAkVg2Fn5BFhoBOYsI/Ju787pIJq3jwJ1F+jofw9cb3mfiCiHlFs1rxXqgogwzCF3D9MnAPIGe0PM4i+BCeGA4w+ulIahz0zJ22ILeuwiPgguUepgPiyzq8UUglnsIr1/RwkQvJAUIzGzAkYQKy1cDXiscVG5mH6WDMcowWAiafLmOeN1K6GV6jLHZaaX2sFDWZkAlRAxdabhxq3s2Ft0tL41OjHPYbw/wBokSgtI2aFfpwHX0ovCNVCNBxUkXtzDdZeQVBswburMAw7Zd0j7tbxHYrQuVs1icPoptI3gZAbVHI1JSEiBldSTWwtK0dqnDfNk9O+kIVR3NBcB/ftkUNXCXcv5anhCMTG67SQKyknN7Z8vuVir2LQZZZJCtg8TkcBkymN9pERb0wD+ITNTRW26iH/ey/dO+xbfUIle8gR5wS3n3SIJ9r5Fok054Sa7KBsES0hT8YM/Wp6IszefrCgGR/vV8NWV561m6qqLkveHIWaKZJerxmqNWQDHaHGBM1GFwLM+DnV2dpp8i4CM0s0sW89uFyWWI/t1rN9FVfYoMuAO1My2wfGWrqG5va3AsfTcdqBAv4/XcRexgrJ1rpdO6/Gi6c17pnTa5cUNv3qfSgnyLTmmVU0rKlAD/lj32C/y4qYM8HyyFw4/QlVdW9e4wI7QX54ZA6x4rKUSQKXOIPF6UliUnr6473kCAcjGk/vKdmAPfCpPyVksFS7Qgpjrcj2NFUs4RqgenqN/uUgcZGdtYtRkdgEkPpZ3iUVjBjZkvmjuAjUqEdrfyhfUmTmw8/luvMrjmqZZYfpCqjeCyeBpXgpFOYrtnCUw9G3NkBcjG+W/5wULqRItCQPEYPDdwIdEYHRw1DON5YN54YCXBRsKNbnkMI6j1zmX2iiHSAOKPyX0MbajLbeiGZfUyK7ydsvnqoiJrXBtJ5N1vlLmpGQFckWaiI1CFqElSLwpB9jOcXA+8z3DreyMA9XM6iYNrKGoESPHQlb0OX8wFtyefnwHCQG9lG6xq6pO4Z1q6lZWypJx6dMgcQLg5JxNbNBJocI9ilakTB9zjnK9qt0C/MNsi5WEnNv59jbadeH2oobZLFgwT8SIaQhOK+sIxVZNRNijWm7thu6WdEZVgwIVTCRs8kBQ+J2kvwV134O0hiso8SkTVNBlEPq++Lz5k0bmoT5BlLuIzWjyafjiLcetl3Od7yHF0voEitIlY9xLwSaefv0DQZpAR3d+5MLOiYSxziErSDHTIERAa0vEDV8DS+XekHxgyesqhQWfRHFrAmXsB7XKNkWWmPzy1Q0YrBDhJL+nl2+qptC6RLVOmGhyLubplW0q6gsy5Ip5eDj3KRQu8eUBQdPD84eYS89yAEx/AoWGQsCYih/UmeWeFzjblO9AlAOy/Y9+DrLw1WtM6DE9LvL5BYGTHx+PFN6UXucq8ihYPJjt92F0R1IuZCBxJnDVUwA5menR0hABEAW67odQMaT1JqwaVpvlXUPfJKTCW/BRSlk311DyXk0ASi8n7+daLdw2Lc+Oud7ZRPPyZSErCvoUtzhiwL/x93KfLcusVHf61wJLOfOTCbMBOmtsThz4jck5BPKE4k8hyI4CdZJF/oOIfWEejJmmMe/haYydtMHLsY7bsvo3vBebXqLW4JFySmdTq+4GsYXkDddfnr/YWXhFXIFj8Amj7oY5KFR8yUSK5uXyZ+Y593cNSIUICibW0/56bGX24YBrmHwnWnF8RadtyH2jCeZu1gMItJurZXYL5cRWfxXiaT7zBHJPeICtVavoAAWYGSFi4lBwEiFELSKDGr2mAk85ft574VUn6q0EP6C2rovAH2DsrSW/fZCtZT5cBBeEbzvUALu3JbBObM6Sl4+oU/fkK5Ww4rLM+z/Cfr6EfVNFJQnTopajw2G2E5kyx8T+JyBYeKP8qEhKzWd4ullIES6ts0Xtm8pbkObf/39ppyjjXR/RW7cQVSWciw6aXRyQYXiGGeLx4wH6aBsuUK6mMAYorN+dxq3jrdcjG2A2uMgqjJ2bPoQUux272wHjOJEPA/06VD5inJyoYhwoWw650jP1n3q0YuCUFM5K9jTmNkRTtzEWeSuiaBp5KdcZZANdoAZLSCme3Og3UJnEOPAS+bJfB0xI1EeSAR5x00ZYydyYqqm3EY2vXp8Rjoue5Hj7lkchR1Uh9tCAie3/TY4DEON3WmNQzjQ+YrMk1t4kTpiIzMkvE6LRFSR7QBM9Jo6Goks1EcrmB6/L7y76jGRzv5wV/A8A5oeMIzqMAL/d73Ig+02jzdT7glL1RVYm+4GN+CZbsD62j4mUeuEfGBMmmlsFzoSQ6b40ExbPrOCRLszACldNaTfEj7U26Myjq6IdpJphZmEt67MGrPZGXyMVEFqYF10zsLo8QI720b7cxhi2ggjJbneOqK85UR8OsDVQeiVBQTd6Zw29hrB55U6NVVQlnqLWrs0IzDWO2q/Pu3/q2oFXbmXW95HWTeMksvaxIUl+OFSaMggG09j0bd/cGMoNY9EdawZxJys103hQZh74lLE1Cf7LwcS0GUabXVyCX1V4W54cLqcD+a/4au75WxRvPEiuU7iFEfJ38keNlHR/v47D+x9Ex9aj/5TNpXsRT3sDSZIACk/kD68M7JPr00g4yzfRILpCCxPO7Vwlqrh1B8BbAy0fZEyF/AAJSLRF9c/xvEpWmQ3aWHvSaKJuSFfHwIYHy0qmJZH9mM6JGmwnvVjfLgPdotUKwZ6m2Z1LRhs+ieBjyUNGJdfplgJ+N+IY1k1fP8BwRrrOqBbEBTpgyOdlrTQbO+iSqEyjyxzDjH4Os/fuIhWRCkHHjd5wgG7rRAfOUBls+ARFNCvGRb9IClD3pbQLq4hM093B7R7bDVvWQIVC3dbtxHyDNtuyvX5uRtoEnXBGbhnuC6dhCWs26UtvVF6bMsrxLe6b/gVLrQQQ06IiNmsEtKZJZWoKCa+XwG9zWCf8RH6M8ipozX1um1Ap9uGCUB73Hq1pBEMqjcpCR61rDHQZ0cJzTf7c6Oc2V8kMr8JYlIzORixyB0QjE09MnRgya7aqxqkuep1uunxmQnY3XczVcWaGobkMI6YXPr9fGBfkj0TVUMrPZtRDZer4OxheBfANjaIsa+fjlTXkrC4tqrpdQ+aYlNc02P1k3/IirSILC0ALv6E1vIQzCVPljyN6VHM0iCvTG19NvKXDkvULNwVi6hoOwtTwl88z2pPl4CUBnCGP+iMLrII6Ht3KC4ROQTMmxB8GlM4uetzhY2JbWiwYFxuJdWiIAZl8RzgoOBWtGQIZ7dZj3qRNovRL1ehXQ9OJce/ZjhhrG3aP7CehEHkz8lbK9X2sRFvhmSu3duNmjPLdGeoSJLgKBrV5TG7e6XXgP1UIL/I4wQWDlxmAnmbQ6jT1y+d6+xlE74NHP0ZDH/m9tdE9zrEzWTMJtwpYV7TYk8H5xfdVKViCLljvbdeHMFFIf9RP8IYJ6SFyCAIvbsUUlwOIdmg4+KnhhchxgX5jV+rXbkzK+JNvYLEFUITd0tfxQuIgmecKv91TDH1R/HwwgGDQwd/wBNGMHGSYU0BToH+hogLjyHfZ9PA6To4cK7n4qiZRa8WdkXii4LkDzyHxGcgu7rchp1I4GigO8tf+sbj6QpDWklHQtcPy2Jyjb+i2C3/FvD0e5Z32ABFz1iGzCe3nABmUlgWux0eCRs/Zk+qB/S77GSg9To5nAdF6rjV8LGokvUGBgr2vSHp93Sz/NV+mI+wfuuF9ev5UPvSbmSTK9EWvDtOre+7wsLt4MExkkowOrnDWTWfoaAxCRC2F9mMQgtAqziiWY8wZqBTCmXA5oYUWJEMzjulNCgPFJO5JmkCBJqdcR51p15Ekyy9y+znXvL3YK2Yh951avRQBKFgHOC3DJ3kadK03kY94Xz4C6bYq4pVHG+ihqUOhpox6kQc+Gho6mDEtNh3foFavZIMVQj7b4AjCeU2A03rY0laqLQDTZ/kz7YhRVLSByUw1oOZrl1XrHXVwVDKpfiLXRx0VmWJalFGx6hIBaYcR63hs02lRaTUIbSMOnSs1UCLLezVRieOAmvHe9WK76WhcCV20e0Q7w96Kqtmrt8YBlI6uoemcjVVlTNDJdEl8bSWMp/Zpeb9bp+JPFrJFJL0VJI/MAWJmIUQ02eUgDLIOd9Z9RardrlVzyKsju4U5AiQ0Wp+3MBf1ehAx0rIXq1Q4yEdciPTjyE8LWgMiXCO5WPdG9SNLK7jIjM5QsrW3x0WdZHFEQJvZ+wBW2vWumFYtS/g0xlY/GTrXTpMpLYwrGegL7ptbVjGGryYJ+BWyZunHvB8T4vc6AzwmilarkylulmQQNtH4oATy3m5jJT9cNQLVHYqcs9PooJCsDNOVajMSFNHjD9tEILNVlGBEHcQgYTom6kKCsyd9rc4uVjzaN+jTSO9VUF6AH2H90JhxV7fLKbi8KOiSihS7PngXR8Mn7mGXIhDfZhO1seJx/PYK6vOB5N86HaST1vrVMtBML0jg/yRM1gvN3qsUuj8Bb/B9U8Sbx0wkaBGRhaUvOoLZHFVEVYl7TSJE9hs7ZiX5JMeTMDM45UqkvhP2TbwHTtM8ZL7GhIfrtfcg11hZsVabu91LAN8yK2h0t8OaxA5xUYD/4xy0nF/KiH0S0pVfLgWuiB5VZskWebzV/zBOItVFCwdfzfkMfqoa2+MhLRRv2RGvxAXh4qOVnV7BBhVmyQDOSDyXGeJq96hpiRE0cgCKlDm8ehQV9mguK/9NY7VNgwXTB9IRaYUPfQJxGWpZxkieTKBLjyWYcszkTtQQlk6FunSuWSk8uZvJ2yByU/QtehmBVf5ogqtXFL/IzmW/eZeDdkd6Yd6thvmFHStdbUVpS5lVHtE1FI1frul2/KbPzByMpUZou//J6WuDrerpMOfoBJUIYAuqIpiApldsvsvlqtJIXPYEB420pOIJ47YRyb1NJb1ImBzTUjzmGXX0QCiSBuJcA204OfoO4AXbIry+yUS5LJKjJeHy8csHmlP5vYpmrOtMLmlWyGZwBRwFM2ydH1Jr0FlLzeWWez5XMwceV3EdFTa4VaCrBmi7OklFhAjou6W87j1YFe1w31zvKiGGty+OjV9LI24Oro0eunDuUlNfa6/tE5QJdMrllShN2JAf58dyKjrBJLEhDBDWIbvFaJFMm3izAyU9gH+c47q/vvbTT94TsyMPsOq5OXk1lhWfZR0wPl+nGA379yqEDNOmDIvEU3fLPJnJHghl3yGAVEgJgsZTXLw6yFwjtK9yOO5DUzxzgQzpZc01IlU0St72nmorPvPfSuxma3dbR/1xUBQwOv0yUqvTSt2LGa29iATWGQZojelHyavVZ4zHM3jQRnlWMBZnExfRLIFYbeZA0JympcxCbKtJQ1gpqU8fWOoT/QofpQ1RXNKYLnQJNR+QsqDd1xulHKnjmpdG6Yd1lvvCDMuXBljT4TdwSJZ3WqubRNT/Q6oB/FGUB3xORkWgFsYO1InNbv3nWVvfab1C9SrUm1cb4drZIXrbJhAOgtNeAQCoUu+w0bgyx5wwGkTNRngYt5aaDltXbJgqBoGyuLtpX6w36PwVFtCl53TI/YuGJ29DfthDFKlsUghidJHQ/WcVrQljqy1eY9hEHtJtUILLZsUa+j4wjj0KhPsHw28sAF2HYF1kcXwVZ74a/LfAuqdMxNFuY+CY/uMKj69A9WBzudKONhYyQ+jOuLuEJiErNy8s244fA7ErLTqf4gR9+N7EE01dQoCqsAdniQaHsZcFeoAr8Zfe/q8UIBrR94cnnJdDaGrpRAtOMj4TuhuNghOIjuMplwBtilgyapkta9ax8YDTgsLpIKy36+8zcWOoXWMDDJXOPi8PKLXTOes/l52hJMbjSxcju4eNQLxXWHaM41l1d2/6d+VsHENJTk84gGbxWoUhcn9sitNbJX6Ri8Oe62oLvdm2yAIPBxV9Kzul9zoOXr3oG+SlYTmJQDjDZbdRMz45f1XPhfrJberz4rmHjKPsxIWGs1r4Zv1HMfl22uiojgWOnGe+XaOGd+cjHm4YtnhK8ZYzsw9/kCfvNq/JJHe7p6wnEOnFK5ewDKvUBUaNPbpvopLi+ws6iQns7B4eXmGE12JxiztciKw2xd2tJPw2L0wMdzggMp41WBvMnsOnvb1ED1vIQiVrcstJfUbMxOZVC15ch/BWKsAVavJL8oKkmxIiDS3ExPlAfUjCbzyNBpLeYqRbTUxTvnptXTiHio7apYf+ocqUg7RdHWPyYcPJgTGv+b8IlYIgoJWXTn1/NV8SdjgtgrGFAop47WcPiSjHgZ8gRCDZPp2l7XPISnyj2kRo7BfLg2Or+u/zDdTnjxX8SGje/8QPtxWAsdUb4y7oO8jjnwNnuqbZxN+rkLnXjQO3gghG/14W0g7q7cTJ5wWEFcQyWQmgr86pIW/grNRpOQcBPNmVfsqO19gMJEerqRjcJxyMVYVffq3k0R4SwtDjDROoC3aTYr7w801Y7dPX1P5EuFw4qNHhZZX8pgeEcc7rMjH5JvZApVNJEua60oJIFRphLsoPjMyA4eg5JanhdA8vgxvho/GdjgOG0S/ctoaxhbkFGTVPXqkfwUklEkw+it0XJ2r86NWLdxdXr0ndliZJcW/sRZxul+GhdV5pgr8la9f3dmNEHEM0STY5DyI7I8oQg/StYw3HwgFu8sM1ppEch9VP9PyJPyuoc6ko7ixgE4Sljk28TjydTQLzID8TJivSvNmiWUUoOQyG521Rj7SA0lydTPZAIGgeI3KBWc2KlntFR/ZpwedYycQyOABrj+ZBwDZWplbBVX5NwRH+p+zVmh+ksAcOR15o/IaILQCY1CmSoKM6wqX/ew7umm8Lhe72ibwZdgFW0KQ/pUVLLXMunBjdwRCyLPZHwGKIcXie1ol/0kN05sJ2Vqr4UjQiUrpLTE5zB9/Si/J+z5yITgRfTaTbUMnnoA5NL0V4LH824bBP7VX5/kWga0BO3ThiexfP5iMsbdAWTCLztIDDLt+G7+QIaYJ6DMO2ANJRTl2Jo1/UPS0fWGe9IwhqTPS0L2B9oVId7oy/xek0AgjsmoH4qdh9cd1kqUEUUoQLbfs7aOug8QB2EZEYQNivVcXQIjsQk1tn5bNrIPOUdmIjstBXxMu7kHWVrL5Q5OxwUWAz6gFJH9bT+y1XjTKmEZAvrWXGBZ1OM2YlMwhDYSPkKH/BVAe/BKUIzMuGFQEUlfpDjGOBSk5dlyvx3vLRxQ/ylEkGMeuh9CE6OCd1pZSNBh8D5zNWRpK7dXkFC3HVyrmZcxVYh0ztRpvFvTTga/Vs6Nhe8IwGu9AfHwjtAdXfVzkZW4/YmyU9hqdHpMMzN8+3OupF/1mq1UO4EA2C7sKlfsNwOZi5FU03Iew5wYJZUZGTcgEXvcV50oq16l5nrwIKEVgiCRpFXttgIOw2+PbPY9go0oJh+yYF0vqJXcnDFeduetj/wKeggSaW5k0cI/j5UzMzwkpX2X4VnUfFAEBHK8aeqhiNJHkO1Y0VJtY3vWViALJ92RfjYzuG5HKacgC5hHCOtQi9lX+kzjEVw4TtskJcnVV0NlZhDk2KCc1iQMm1jRgc+RV7hV/A/2zkLGpnLEWHRkrYmv2G2acy5OuCJUC5pVjLuDWjXYqGC2Te5Uca6EDjJI+PI935gg1uLb29ISwZ9B/mZO35AHfsxYNwSVgFgGBJtza8vXZdGTnJVy1d2e4UTv5WYUDVsRRwHVu9hyPxYVKNm4m6fWGnwmCv8AG2nciWGLmiV9YbSInxzb4sXnileU8cY0zye6QvK6OibrQrQTH0qSzP0SBCtxANlyVA6HamUPZxmIpxsbDaRlZt4Ru+PzoaibGFIHYhw52eMn6Qu+GVs0KsmrJgTlhTrDZJRIy/8FqRig/v/fYVM5pXRfnHKiGJcYDfbrroEfCSddXEkTdMzwSNKa0v0i9mUtY+2Wo3RWVE2MBwpdZv9Q2wrpJoAI5Hd+ArMMQXWzayyccLhyzZDiZeDI1nIw+E/T2haZofbK4bDeATCqgDmilYNvCjXf1vasORF8qSiiJP8We/8qBz19NPyYt5AfL67Yu+VJdx7AfpcMOokGpQCz/D4++eEXux8wqVblVPZm1OIZM7QA5fyU5zuS6bH1gx3vRpAhaegenbWsO+B52b9pH3VAfYSYVbKeXrXbHGCamJrmAalTpESVd8m/E0qb/dKv42sGTNh2ZA/QY8oy+Mpd4Pu0hsUZf+dSq/S0JvgZifsqkAxgbPGMwJxBSLEaVUFPkTPsdbbhSckZbUO14Dc8pGXzhAaXSBkGc5WlD1bjCosQUzyEbtVSzhpurmOIOHK0kfIt79WY6AOoLxtcm7tNDyMqMCC461l95hI/zEoxn9T3HwswGT/7clgCmtUZBEOEuHyIa2DqC3FrRS1kdO35tYAOqQ3paIz2FPpxIuKia+aq4Q0UKD0IEz96fwtPnkIwnvs+VRqHxARSNZnN5DQkW7SN78TkzU7FI0YD7L9pPgoZUsnwBif66YXLZGWhWyZXpLIBpdC9z3Vdje/Gh2KfLTu8sfzHVEA3S0rlk12YuB1WMKbPGyWVPU4W+6QFHZIz2yYFhjRPldmXxzDaXjd+39/E2TBLt1Q8+b+puvViLebSBL6pEkvKb1bWOQVZcSR8kLjSV8GOXMoOzib0VKkDMdDRrdHqs2Gyl4KhlEmoXLMRgtFDTg1WlRVj4P4dfXhQttwK+txZ6iAZrJWb9XsDTL7F0592o+0hbMvC/h0kIVUPZwIUw5Fx8skF0BZQ+4pVZXXKUrDmM2RDuQxGargQ+dv0ymXtHr4qpJDr47EWLSckcw4M7VQEzOs8Fwr53UJpkzdW06L2cvLqJ5Adj7FfKUlnHPDuE1MBL3aMqVGJPAhEBkbT6FqbiLoT0ocC/0UC2gdZeASlJHtmBL9u47okg/F0VboDwtoC49PAsn9JOMwqjL3v7iMjcK/GFH75zwQFXb6Kmx4j57YOCyKPuK4zyWb0LljpSojSTDPYijXl1aFVkE4NMaXbbhxJuIKE6QOqWAzljRxGxxFmzUmaXTEbyV37zoLI7Hhq181/PWdq+LZeriSa1ixRONV7KBleJiV99JuExP3neXpItNbSp84ba+IdhPrloEH8PppUuefxuxhdj90fLStnh1gzFDtCbgi+roK/uMv2CKuseSmvPuxhvpn6b4YsQ95ePSxba2STHvFfLnAXWrxH9xdy5lOHMPLAkHVYvS8Y6O8v8wotVEFVMEUTdWnxMsaBTUNWDsrI48g7cV4PYyrXIl0gv8dvjygErD6SHKbKnHwzf3aZswybYhVp9QO/982g9jNwFrHIQ47NMVCJKKTUBQeQTY2SdNy00pFQ/j6H1QTNT7NhGDih6l1M/i4a4DqMldxsSZTj58+Z0I2QkV7hqiIalIhi/IEdZY0AXw9dYiDGnf+xhBmNeRTetseNxVLLRW/pUR1EQwkuc+fWSBuxfKXgT2vAoJsZ85BYLFmwdGS/xG2pjQJBu3D5MUijHjurxUYC8T1aEhnqEzayGHKK2DkA3qwwagzvCgYJMqx0AnyD7yUqsDRDsUEv+vmGFMF+R+1PAeVnEAEZ9VFoCApz6hjqCjCnmbKGepxVEfEIUEs6WpigS6ofSrf1qDdS5Gsl0yIuOm3GbkNFp5YaqyCZCMysvNM+r0YiwAF9FvmH7SSEPdqDOvlozQmaaiUcc5oqKIO+D8YrWMxLct4insU9RNd1ALLeGenLL+wEfkBstcDBvgc7aCuca4vzgjQFg74kKKDRsBa1GvsG4ID6mRqBNTkZsIyilZzzbgtJQXH7iaYBrUSMMd35tJVdoJAxj3W7IW2LsheHhSkEINY0ocU5Y3R4AeojxKcNz0zqs2Gc3BRy7CfAPVQLhrz7dwysUopa8A+HGrBMH1DoDYfh46y50ra2GRJSiEATDhR8G865FRSpl4X3lZALvNDiw/kJGPdpHYQC+qpeKVWkymRVMFV613xj2Khbx2Ovm3ZZAklpFhqulv09tHweqi4cm2wzOiRCzkkNVB6pXuNY5DUoEiJgVimTPqLwcLUmBKt4Bs5yVwPWpN7xtHH3K77DXblWybKrVyU2ckJGjfpm1EnRXit0rN1Ax2emMgPXN2XVUnNvH/0rzUyaccAkrwuU4yYKXqYS0nikL99vj17OFixCXAg+Z6NMiqxHIxkateDRGVJshOhUq6Ql4e8rUyY4ZQg3Vot6mYoRNm0nYu9dikPRrj+mtKKo8gk7tQHp5gdqyn4DeMMAyBuimqCAIjJPBSyI6tq5MNLBWQVg+W9n2kbrm8ZY9QlnUWtI44IHL+4MDUj3pNppU6rconi1gvK8pI+LYEemQ311r4BLqCnbHN+B6cToJOaMbg4eD4G3uRM3ZykR0lii1/yR/XErVVDtA3MZVV9IWNbVNC0AAFeHcvBhrp7MJrnh9ePV0xbOXfh5dvoyJnXnqhFsGeHxzPjmo7/N8yEqDwq0/TQIGHSpAfpGuCSv5qM4un4hLUPACksQSP/dSIoRuBKTTwsNH7sq4/YU1B/H4FJRHQI+tpZHBjyo18OcN+M5kVvTUqGXKLEQB2IFAsoEu0SYOcYMK6gQ1S8IV/I3F5h5JzQYIUh/ltfs0XZsqBlO5u0UqpYI/bTDKIzL2Rqk4DtfCGKZ64oGsS2NlvosvXzfDV6JTQFyPKBbrEVZxLT+EaRkSVNUXJFr2qSvSysbCBZt/EzrOXzMPYsWzXKlACf1SysTqIf56P9XgskPeBcQQz4mfDieAYN07CSifTaVigh0Ms8VSRWtqKWDSEi7hxbt0uivPQg6K3EiJFBWxrkqhwQ3GN5tcD4+mLXXgkDrOGLYg2RW2VgGa3wQZVEOBQjCIlq5mi6w9IxOEUsTI4mnzwNEQs9KHER6VXGiN1vXRkIUF3bdjQbwnti8cvuICgM58LP56KN9+kmm00dTejV/lZyY+bgKvUGJpHp0kVDsd007na8RbBKedaTmZPYqgYL/mwWCbdcLFA/aFlirbaXBFIABVKN1erj8DtvoUni/Aam8Caggzn7o4klbE1vXDQR72w6MVqophNflxIkZkcedlhpLp6hHpHMOIc6RS39eNW2DVKD2J+DgPE5d8BsPYAzE504sT9LGH6I1kQFXAwv1HQ5Dy0I8BykKbczqJNoZBevEXvU1EACSaorXHdTum0hRS8XHRx65VC1WBm5OFQPBbcr+2/9u09XGJ0gr+od5D93H1JFBHcJcT4Gnfc+y8AacmqX2MOB7KvULdIa8t15u8+nsB2UaH5x28CPCXjkrTIKpSMu9uTfBPtXc8DEC7tTeUh5PGegWbSutLY/sPehbuYo9w93iHBwdaKp31FVHW9DOeBO7zelGGM8mcrZyq2z4dW4g7Yn3KkuE0CAynvfPyD4ZcI7ZPwHXvJEgbudGE62UUOqcEjTZvsi0qQrdYSHDoFL7nnzjtojRzZ07lEncjZxFcehl80BVJj+I9yHNozP/6boC0qCwg/OKR+H8cZHvlNNUbadbHCyWygVFqgkV9RrwZoWd/RE27135a5McEfw48ilgZ/QjgAtoS5ZkUVNrKOHHoGthDoAfNYDOYFOLDHuMD2sMguz07EiUtx88BYbkQ2tsb/oWCRyckgerZs3RXeCHWyy2XK2E0NOz43UjrSV+mGK6Ju9Vj/FrWEh3/rk5Hz+iJQdqRZWwRlYntDCUqfTFYLpoUkWN37PQCQ9uAahAXRgIQMs1JqbTS4x490lDf0WTBVLcUJ2d2FlZAXCE5tQu35Lgb+tixchBHQMjo3PqHUVh6vKMNVvQZw0T3bj53b3FgTkM+rI7wRLR6t4EKJgDwMyAmkZCcA4mHTCBfr/3Hbi/SbKJAR/32vBAH+oLcnvUEa+No7YQ066b8nBt339E5QNPU59c40TH699xXhqJBOAWcRlytz2Ic0/1whKG4U32kR7GCO7UiXqFmtCSGcdSNbOPajfA41qrvKfTjiJsomuFNpHF/nbJ1ZV1KBCwF8sKF7f4r4aXTNmLmt6uASJB9Y80Y8pX4zoA4wv2riEAfUkDac32GOm2bLwg3WhMBdQwM47wrWB1+YAXvZDyC+GiPng0a9lF9JGK7u7111MKk6HSdNlli3tEjfbT0VnuNKkLYqA3S2PSyAIbX8HdbTnWriQRo65q7QbvyWcMeXc2DKAi4YChFy82axUI7Y1cihLr7WQbkUoupVv6HGR3Oq+8YwOx2+8Z5S2WTnkHoSyTWypx6s3ybU8r0UG2es2j+eiM5zJP0yS/NRbpU4aC6ANblZi3PQqUzylPHEu78q2/smk76IaXhdiJWacXhLFC8cuNSawGiVtiAQvKZieqElAyoTlh9sDNz9NRG5VxnqekYCG7N5CPdBVaNDPhNgCN9nNNnd8AjdJywIJ3wWQXvrcIIANDhcM2Eqm+QWOcWmSI7Y7FBK1xEcSY/h8dHRKg0OzkMjotb2EjRfw0DWdd1mk4RO/grfQkt53x1lJ77bR10b/NH9+aL3367jtrD9ijuCqv4u6N7Woez7fCX5TOgSly3cpYkY9rSnuDtlBDPe6Dv5TIubtCLnmcuKuInZjPiWIhvHqsvOmOzy+yt3Cag+2Aed+o7AJSWWlTnLHvJA+QRwNBZmaIKndql36SS19WTSTYNUg80RMKtxpVuMoT4mNt7BMUhMel5/PMJUCq3icV1H58wC/RUjBt1gxXSLHyXylRlpeAxi3ggizAsAh+iwg9taHph0c68EGCYq4hXDO6bAbq+RVXShuUo2GaTsQ+JIZIajVYFqBNxM9eWvY66PVVgi0n2VKmex4m3xNWMA0qqhbUJQOo0jt/J0DkmLbpW6Gd6O0R6Ei+e0CslkuPuglvreN3Ea0a4XmOik89JVGcF4ezLRcC4u7agAK+qKX4PU2uX0eLreIzLgPjxleP8gLLZlbPkVuStQ4Idj/YZKabVyfR3kjCQSNoso1Jz2rfxJnrAiVjHZjZe9/ngLTDUhbgWS8RC+uUWzOsqKCrMygL4NoatyH+T2nA9qIIscr83o4rCa8z+CKcC1QjmA1y/2DJ6LnDCUzNPF8U29BbUHjiYytapv2ePTmswHrBsjG5KItnWw9n7D7b2zBdg3HCzhB7hnOVNLZRvzX+T1lOqisGX0quqFtrneuRW051hOvsgKKwLbal0VHhYUVg6Gmak2K+sHBLPPgZyAwlg0GlhGQbV5+RmrcdUpYVl5r8EfVG8lYSVsa6RTbXoZFeGrMbiB2GPLF3nry97VnMmB5Hooz9tocGF0oaqshOLKXihDbhWC51pAIhQayZNtB0RywMEj1gi36h8JLhaCKH7lLFUelpXCuh1AQyiLoaiQqrRRVqdVEY6WLRYXQ4ILKRfWMUnProrClr7B+GpUjLRQqNUdX8yxdN8+ZWWbCrPlPHOq7vi4MgaAsVBJuynFZCQrK3tfowaDTHNJ3YCdT85TEm747k5vP3PgLIHY5Qa9kqjqEStqNO3oxYUKO1/pgCzaaNyB7qxSSmR6qMZEHiSI9zLdy6hK6r1pJRRCCzZHOsGfQtS5HQeyOT4nxdivKAznX70i469VeWJPq9pc2e3f/7VxC7bozCic2yt8jbqhNV47wfc+N58daWt79CT1+3UzXpn+ORbsI4sMEDLjXIxT/W0vE5/yxH9QRZMmCqvtUznXmYJvoGuINgCFxKFSu4dQfoXnVWJiq1srg3EPc84hkqNVyMYzmhaUci7w9TXiEZ9TqXpO5P8KRsPOBFpPV6KkNZYkEvnNbcmL5awFmwXX0k4WfZZwEC37nGUu1V7BuFUbyhjK8ERXi+E8VvkaoAo1FF5Nzg9iwKS5bK91rvp29mxCa9gWBoutDs1Zw2wnqe12yBIfGNiK7lB8NS1UuvifY6ZcdAkdF0NvFDKEtZom/M1K6ebVG9PF9YzeUn6x+dmwwb5JIyBdniDCMrZS7DYEAKcln57Vo0IUs8qXUjvsdkVscYNH58iaC0bIyvcMmbP6i22lBOC2/LmqlF1XvQ/Ct+BUqb9aLoAmm/5VzQ726KUBsv2Jso3IV95WvYwlukusQE7hAUDYsvbBJbZtw3Ddg/IDFeenEZTa+LoC/hYtmtco0UYc/gqN0ACLCZMU0aE9B+R1kce+buKrj+ABO44k2Kf0C+VcqHWSXu2/PGaREyFb1CWccRRA7GgnjF6pzH8zpm56R08jIDaUlijAV2soVMEkReg/aY961iWPtkLo2yRRubloksn1u6PlZLDpCWbYOTgJyQrAYaOv/eSKOYMJJP08TiNg9InKfPolHhgbsgqc1mNim0oebaveG+jo5fLa1b1yMbZBN9gIGl6tN1Qg2pm5QOjl/4F3gLfTg7qaJkv3Qen/hFrfBdA7GYO80/iWk4Q+xSDcEgN5yVlSwHE8tz1xVogaC5D1Zk39gAAghmsT6Ldyu4pu0k9hTc8JLwmu7NlRYqHNe+s64sSZIGlKHMoopa4dotdEjZSg0sNHKFDWkA5OarXqnGP3NyqJvE+4UDISsXR7dSYfKqwgxX5aMIZXK523MaJXwva+O8NmtJ2Ywjnks/igqrT9UfQIETsBrNRZ42258ec+PVZTH7sFI5POt7ZZwj+g0/XLDyr9nM2E4CiuDG3RXwvOh0PVchciTCyJCOGW5Iig8KsNjfStpDK7grtyaWF6yDRPwM3u/2RFHCDIAEarcWWzQlIsuybe1Sy0pQEAKCUd9uGvGnTay5VjKr4wfBa2qLJyuaZavOkaK0QR2b8Hfn9GIDRTh/t6xCw/ghb79rY0ekBxOzE3i1jDy1ujRAJbwDuE3azeU0kune13FuaVk/1igfAEktoklGUATSGFHRsfmiaEw9ErxM5931CGLICKZ8J6My996TP8qjp3YaJ5x/+Fo94msoW4e/YDqD8ht2EqfgwGAtk6ljiFuLPHoME64o42YIKCh7xvMgPuVM5bhN1h5neRPC20hpKWElMJun6tMmMMjwzWL2SVJu2zSz5Yk4Gux6TpkgBqjXUskFRZyOhV8Ujg+hAwGQPnbWunQZlQ+29P/Cl6gVuBwfoTRVL0QZpWl/bVkd2ihFbV+2x+9b481SBKpiadOLjerMah/X++po5uveX2RxzqwjgyfD9MopwKKYjBBdwg3kbUDKvYWb0lbY1uKXUcbQIE28bFuxWyDGmYPVA5jEEGr0gXWsKn1vbASRyz2o1PhVSpVoR+8/ZADxFlmN1+LN5mXb2hZxobZHaP8rvoG0wi6ArhtC4YZYe5wfXY4OORb6L4EEv+dCHKqp+/uW2YMvvUKtDKRKZHqu8VRyABcjjXAPVWL3BMtX8sBMEpQqRoJFNGZTI2BubYWP7ZjHERPKvbtFsLvE2AnTK21B2HN4yv1VKu3ggwUm+b6bIAAV+spKbD8QTKgKk3DAzvyKt7Ch5Eu9ZIY+VwGJBAGQmxQikALZqndKdMY5+qDwiiMSzQO4YDMRbM67/ADf4LhgK+YTSulVDueYLyBDnXPmHMq+DjBwynQ23NTxmIVey04aoKJZJ3xIGyBYmPeyF1CWh+40t0Z11ceLur4HNMH5Hc3ZwLm/9Gm2Yfsk2Xf9YaWt51UIYwlvtHaTpe/6KfF6qpoceE6eEVyIiSzSxrqSsoKYXDJ/n7DgbMvN73ifIlXO0O2Hui1t1I/VXPnibds9zQBy5ur0EcwgwDq69NjMQXiqIGsP3nBUy4hiHWAZheAEpCyUXPPEJkDmvcPzRaUkOKNJAsKsMM++XfMy+/B4O8C5sFeKCxbQvSiBwDJ8cSfxGLxDWuXpzgnrdo0b2hAFYRj4UqWc/Lgn3zz39Hycm/B0z1mzlR04MXmM7dMZCquO1BcIoE+GEnqOJFluTQQbolQvGNjQHd18D2FOEiWOAotIxrjzkuEdGrRuYqD0SaXf9v37HNk3NYt0X7/srzsj1BN8aJQxLCxf4kV/X8C7Yg1QVAjdyKFT9rDOZNxPgYw6VypL0yzM0thFel0Q1xPu4XMZBupopItpV6nUja6j2cDD5D7ZhyvM3UyUAww3FfgBEUPFUk1cU4AWdU3ACz6LtxYzKQaB+rXl6enEUrKRUig0Fcoh+Qq6kQEnMYTlhXaXb6eDsy78VWewLb0Rc6SIs1YrFVIHfNa4SwelFXlpwNFdVZz12PwaEvMLY56q3kp1zVWOXiobQ3/MnT6FmXvqIpN7wQGPO9YpG4Vj+q1Q827YyyVKbOT87z7DibJVLs+jCLZqodGBheH8YPq/+AvO1GU3criZoK1lHQAohoNbypGlBWrnKokDXw2KH1JaLckhgfnScJN1vfrO3NAZvDIb36Ep+pzOB60PZeiltziqQm5TZSTNTcTBO4TxTQYFvy0hDwyzQwzaKs8+zmMHCjHtVcALyL5Ys4vMegcz1v9rPlMNAHOFfy9P4h/osNoQph0PAauPYqfomPw2sKsccXzujUOiXwt7WyowoqeHhbMVgbmLqe8ACXiKbCG/AhIFXr2ZRej2xUqioHqfWrsADNNvsm3aQuni6UaGIqjGnft+HQpOdAEEgi86hq5aslWtPG9S+n+ALJedr1btSR695dXshINar2Wjsc+2UHC9rbAoygNdZ7lBcvo+Jeav6DIya7GfApUETQKmbr4rZ3OYEgExfftfH6PiIPGJIIZXP16FsAU3FGnNCcfiyz8RxSSm+/CIMnLLkUf6q1pLaaRfSOq1nNeSy1SkTwr4BUEGbeKqWo7fcPJLk+d3sm6/fXR16/vNuWmILpIyEl1XTvUX9Hw2XdxDaSR/rrRl1EWdag44F2uVM1UujDl4Wvuj68PVnyOxZOy/MfT78ADucJOHrlgsUY0zoZP32ghiTo60aAJtZZWfXViXz/zt7gnPp+XK0xgxRSuS+7QGxoDn6oYOfSgNgkvd1hDUduPkao4AffIR6qQBOh8lggTzyB0ShRGuqB+boact7nXPJFb63agnKwCGGBxZ2WtWz81gut9sXpUMqCn7AZoSTHYz5RNQt5UL9jCQ4Nwm02Cr/SHo2dylkXvK2tY400UyehrQaVQQ2Zu4QOHNDASofmDEiOsY4AIinvXo77U6oDXTMKuvpA4gyTCPAynW3VaB5lBts5rRxIE0xTXa/GRDXZ7yECg/1WfJN/J6MU625cuVvlID5wSAjOMJMVcN3xswvAULTQ80dCrfyEuJw3pyw20SMaZU9l9uTkUl/XQib5/KA0QZqc99xDqa7m076cR4tPHAulQOmyYyXN3A1TIAcrdNjKESLeBBRH46dKXEaqpgkqHjmU1Tt8WZnyRvtcrEbSLXcQK5ATVgktWCFWKpg97w31/IGRe7dvnIA6i2HxdWK4XXm0SxiP5RE1rPrBglE2/oiNrqjpQc+qRfXzDzS6U5Pe+xB+T42ax8Gzc/j5xPrgg56EJSE+Cubi3b7gRgAC1x7gkc4+jD4mye74erNyNwsmo9uDBtu8RRWAvMTHOid5XxWMgdnZXNXbSb+Xc1gEaQANEz3Doi9AxOgtObkJg+rosbtodepE2lQXumOfSxxwGDRjqGvPfdEfuaC67VWZ7KYJr8+7118Palz/uUewPdXcRtvhiJdd6IxC+7qubyyClvEawoNtBkl2qP5eoTjVP+9AN+43NqVvP1xCXZfvPoc9Q9nb8Kij4opMnN5nEjgQJlxugNZB9i1VHVIQRGlLmrHtBfgdAiqgMyr7W6+f9buDEZ9pXsCxBDh/V9Yydzbk0HxiOyc01QM250eYgtMODnFovlzm5832ei7NufJQiLg1BpOR0+/vedyFnVic+dA7QQL3PqBnrbf3d4a7gzICLhxXW7x/SNpW5ZxNfBmOFrhj3p5CbmGI/AhC6x60am/BDZI+JWRyZWSEgMX/3S/U/pW4vhEPR8EApWF1g9+uchPvQ8q57HY5ikbZoV9L0GGgfwTN4NhmjOAwlOorGwSCIjkf3Pa1TqYRNOlZmd03izEtCpEgwbgitRg/3ZgPAc484w2qJzbInqc0GxP6VXD2+g3Lw8Mu3GVjlw79u7xqQgiO2oYVRIhTMiCEBnLMjo+tgXJctCsFEsqGFAyyZMmbdxOrrJgbrJeNfVMdDGihHNF7Y75HN0l3aas2MhtWfmRIwxSO4bPHDe3+nhqYbGsLUZUocjfJhtHZ70SorRjizfHjsLVK0W4gsgoJkwEKA40b9tr4w1e70TEcsP2e8skhVscigZSMlrnUwrsjVss98Nahgs1LDUt/y71H0wPOayBTXbS6rN7onnToJD/0Nb0VSc1XYyWfgXi0X8gklrhy5YRGgWmDrCTNhJRHhT1ipa0Hgts42T2t8XgCR308Aoe5iE84/Eaz8pm91fHZwTbTfZ6LLjxaMv5R8VCGgCprYBLi2gHBo1eFXFzlpZSJEc9CR/mxnLuQoeOvm2HLO5HPjHshLeQT0C7Y4BIkoDDqr/DEtTutV2ChdHo5nvSUmtg3HhgnksrEg8LiNTP5mvRowEjT4SDAqSiFMjQvzubF086GtcEnB+SbTKROS3QxUd7joXpvgO3xHXIgFt8jUjqE1QRBvx3oQRdjkgjnLKwKOaAEPQRr5heV797fuLAmQHwMzCVo2AcxL25jLKP74uuFOejD9DZTqECzq3abovIdjqw0youL7q0ohZTinleMMKDD6NoRNyRYy6QK/k5OEceK6UKouLukiPqCE6MfHXiKV/KSJiJPfOOm7HGvZIZw8FhpJGEKiA9E+J3lyckI0Zl+fF/t0KNOVFhhujSFTBzjnWikJ9qS0fabNKvy8XTWE9TUhiBfc79/oLObWMdSu8OMj1ztL/PqhYS84OAr00QHbJtoZ9TRM5RfLt6apB2yygwxlKyMTKkND9SJ7NfdWMBmYd9lBsmQ+zWzU7PA9K11WhOHSiuH0Ijn/wiM+gmH5mO9qnpJ1znS84qXeQAXD6z4+4aD5PtTqh0MC6CVCXpR4DI5UG2pBloLKPYxB0G3q3jD9pd8zl205+aHTkNySRqZT4PPJo23R1daiHOiVbbN671KPiLk1jbwNSPIaY2mP7XlXg+K6Ps/jXExHYkDk5/j83d1OS0AjfH5DBD0z7BsqsKaPRDwJuNn7cHgycRPbURz1RuyAr5xuO8DMUKkKEB1+2ToFipSjSMfwVhphFLgbbc0SGhbbvGvgiyrVjCGVNFh9RZj1Gm+TdCTLmOddE45QRhDLToEThNADMIpQCMTO5D7RymXGgeZ/B2aUVqe3QSI6axhw+5zeS9REO/YhYd4Zngl7EZu7JzhzidP0karppPX/hGyUJche9ztmtrUTXhmBKXzWc+SukIW9DZ9CztgDDRQisrsCi45DdW3kvSGBCfR6Ps+Gbbm0yNKa6edbmIBvpjlM/dLvthNhcr9CofaMllxZFZXH4srBE54FPBw3jsA/JaURgj3+T0Zwk/FstseT/bDB8aP7iAhv0oDmM7BQTWALH2SkREYMGA7CzUSNLgfOI/cQl3nZsJNgZOE2M/4x5wZSU4NsAJMEZpzwbm3L+7h/Uo3Kf+I8V8eEeoqVSkMwuNiwYSyOtxhsy9R14MxN+WIT1pwp5DvV8inucxktCL87y2GDoBp8/du5N6Gl6Cv8SBPMayeD5WsRLBbR6czZkrUisEez6XyfWT+bHHhZL9q+O11x17M6V1JZ+t9EAvkui98xTE0ttWZEn5zvoZ/qYUWcgg0zlneeuknEX+qICQFIAe13MGypTIbLIefbCPGO+FLLPl8HK9PNwIOLk2ebvIGXKLVh38SedksibdmGJ5w+vibXL9FyNvcRKhd3MsO0EomwDgYxLQ42xFfa+3kGXeXLR1D1qMxFOJhcfegDMP5DD7fbX9eAJWJzVHyWaanWrzeR3HzUUsOGy/IxjQv5nozPulQRCFlv4EpWt0HFTClP6BaeURdsTGUzg3B68D9upNUjUkRmzyVnCpVLFWVjJxGg/TKQVrHjX4kXyDXWXwR7nmUPaIRLU2z1nJaT9GMJjzqOLGm/QdSn9bLEVrvNz3GSuKTKPrAx+x84VFtl78jzJVyxvcvwWt7mIOGsSPFYtnheuLID3ZZIQB9ZezAMN8HBExlED8uNVMIxv5wdDg1zT2BTonLzQhI774wdhuexIGA40fgWa0X0uOSELJosC1RrC41YHTGNzcN6PJIWT73L//xtDeywC4nGIWHiyhJJbGWN9KQ36ZymK8CCt7i7NDwMYyr/IKFOZ+8jHApTB4RcGFewmCgsyiISVjBkYW5be1gh16ZXMr/URcISldsbQgzBN8GQP39wQzCpIgz6b/qSJQFMm8ttdoeOHLkmGFqGKdPyFCNuWXseigdvnFgxucC4UWToFeb3Hv4tArPYAPG6Vphnanxkvmvy+XaTreTDEiBgQXhhqspz07cQpIDe9OV1PoSFbWEldfwKNufFr+25XaNBtY+02sJJ62fpL5AeCj9E4zUqi2bb1JwOhN2Ycal6q97ECPth2X4ZO8n73kK+F3/xkruN2fYrG4ha8iOwP//9yte8oiq8SyLCQ/i4vg+C1bWBQzMWpL7gKuavesIbssVsSF5+BG8uI6rmezck7KYFgnGIuxg8YhIiQBlLO6G8NUOxG4phr7DdkuJITuryBahw1wHYz3T5izuS8tQU+3PRf3N6grpMEKBXCr0+ArMo6+W8B4e4p/dsL9WKwC2fkdZQc5Sj/ZrAGukjx8PO8WAu59nKOfAToUtkNsfc1G8ewlDmLg/llAO3x/AfwEGJtHv7ipkU1fKBo9clZwT3r1CcoKQPBbr5mig7bREVDlBTBOHFJHZopl7v1pKGbBCzoSiydY5ZeS64+34ayEB//+RvEt/h7Dd9+nTmmSgOg5UEDWRZnZXkVCJQFPymrRBKgDs5H8v5c/BlhBKvT6baQ6UyDUtYXiqi/PAkxXWuaV5Kzqfu3ayCYyfeFQxYEeRPe3fTpbR00MlDaPyIAF8BBnary/G9YGSo4ctGsJ2QQe9AkuZ+6Rd8e9xxxrnW+C2G1xwg1oTKCM1D+pghpbkG+xDQJHUa/kP6UbtFGCJg56GI92fuzqZnPMpqkFaG1fi7kuX1ADzqPVqlb0af5rbR6uShnkVFXY2q2N9qVFDy5yx2VG5RvjQQsMRNDd9se0z9GAPFSzZy/k87LskUF6EU54eMzSz/A/fzLYWDsOGIot44DTY97V6whv+GsZhn0PxMG7QcThELbFMRcvEIe0emObcGHgoHy3mQtn7ZhlO/DPnKDFXz456j76SZwAKG8YWkBWNaVdpaC54QMWb+wwDFYROX8rwxGkVwuXt7zWfgiH5AXxmcqy84xvu3eI/ZU/AFWpsupxLl4OYnU7UvkRuASkMtWs2wK6e3gY1w3Qi8qjIJm1vXqB70OQSR1DS5prXY/g9rVqcqgIRcBFeNCzATVlphcxlC6XdkKyyyUN3nRYRu9sFtIab3f0AymcdPjs8UQ36CxjgKw4MfpcLGRBz9/5KaHRiCc6oIJS5WJ5IvpEUoWPJku2HvBlA2qgqUdnmk/pl1shBsI4am+Nyz1KLv0lJ3Einaha22Tt7AeR8tcsmN4U1XmfMrp9ZyVyZpHfmMDAGxSJF9GRasZ6xrjwDBgHdPfEyboxl0KYlcACm0H7sOKGma66gh7GIl6e+BNcczJSMgHkb3CYQqzAPzPpvH2fzRuF5r9FMV+CGK8K1JEyQQS2FsvLN2BtMZQ7VJ5J6lYlLJLFWyBScRUI8f6LW/5yoExXjafK0M/ew0XDMRGCuzrvno3HgAY1VDn/IblnyW1LY+Hy8zcPMMyRQ+0ZAQA+SJUdxGWYfjRpAYOOaev6SpX9d6HqPw8kp0THTaA0cFsR2sNrcbtSCb5EuL1ysaHcc8I6NJzmkWDo2nCFqe+AIZVjRkgM/s30pgmI2Jt5BJI7GgAxzRSrdmYm8FuswqK3fxwg5DJda35x2IiAaQr5EqSi+Fyvh2U3Hpld6ko9NE2gySTsind7rmt9se4uImNxDullWwnxWSN1b+Kntx5KYuuSrSvgpwiYhvjqOXzBf1HcOOm/qVol43jqLeILxhW8Yio6ssnIvi8p8QwxVBX+Lw8sm7EAIfJtkQHvLAo1efyV7iHU4xrAlTyQa9u0aLPkbpUCV4VM+R/FnWxMIqPagK5Yt6cpEKNuofdCxjPPYASmCmE6JsnSUGWAXTzzbcwOlDb+BR5WmN4VgF3A0eSmo9VfmD8nwpVVZbQvmy1Ni/ogo55CcWcvp6cQsDJRbbLL4cuY1w5I7CtpUPkKWG5M3xfZ7ROOGJNS/Xur7XtHhbMZ2vTZgsRK3GxwVoStsZ+iTc6TMeY/2RIEFleppENbTwLB7bpmU2z3Xyb1ZKnvqDSCgBDlt1TPuH3q/7eYBwvCeeyeKoMLC9rcLlOyLgfND95FExfjn5yWzzJZkghdakQVF3p0cFwXBJl8H86wPqiBNgwXzPuR8OoTPfOYxvGks9OKei9g0MZlJ4DvF/pi0nISKpfqMJiyf9ELaRHeX1uPkpwg1mJg9FfuG0a6KnBiapz3Y4cPZu1gCqsZtDOHCmEqkuW+VRCnRMIPHgXLYBxtt22+555Cxn6mMEOACahKHpTh3c56Q7fT3yAAkYcrwKW3gGoG+dZAV3ltr7cFKYuqFyCqOnkqF/A9QYkhbmHvpQBf+FU2aXsW7oppzkDFZRTk1okAzJg4F7gKzoG6iYBpaoyVipVRmhF0eyRNtYEVKQHqgl10McnOGnVWR7BtpUUDGj+zG35YfoMlBOAPYP2eoIU4r30MimPGQ0Pt0xvhrf3Wy64yO7jIvvuIXNbFydqDdLElRofwwN1rPJlpuO7jYwnDnQpoJ/cyQH2PWa3ojl1tXe5gxl/owz5E0psxw/Kium+oDO6FtHpCMtuloE0+pV9jdqpHwC2EVkA281zPJswH6JJoDCmh/ip+nIhRu7Hx5nUAXjJVtQbLkxiNrYYj4cpG8uX88QnNXrFEVdme6LfS8qJeFEX6B5vAclcf3Tv6jXKQ82aP+C++pwXSjcO9C0GS80qVV7w3O+6e7OEligo9irUtYlwoDlt4FH4RiMNg6gXjzaX6UBDECFV95pw0j5i30vKBrr1x1ckvoOlP7fhseuMA374vhZEZydRzjPlbBWFm7Djis7rnoinORhWXZaEjbSSdCWKHLqk/tlNgR0tmxzcYanNfow56FKW7hwCkkGOBYihfbxAKAcIn9NCECXff5ytytAbGaz8RjmqIGuOYsceXTWmO9AJU8AOpzOXZY1cKrS6v3ENi9IJM9ibaqHag5H2MyPL8kCLEx8LVeI8oIR7f+xNFK8wHZaDMqKXptlkptUkhvdi9/0cqr0yZoWisOjw08LDkf/TLWAMzd8nCBb9W0b95ihOXlkscduzB/WwZ/8Mdgd5XeHi003UetbTPiM2rU5btpJEHmdG0xGDUizEkCCZ4Ycl9C7JP1/oJmRKrTGycCvcE8OL7n6EFjDJc30UjvLAAnPNccgFTKavcOCtOuHxseY250+JCC5hmH/6ERKzH2vNkEYqEIhUVdFLByptoeAvV4cEoeUjKPkmEAXxhyp6cGXPyv4MJA0jyToay0Asa0q28dnuJbgRQWpKP6OBHJ5MsDK4yh0rPn8Sn7SaLOz9Ir82am0NIKMfwQIzm/OfYTtIYDEGaOKnfZnAogLqWMQ4Z0PWqXUGyygWxKjEO1Mr8iEi+uodPW56n2GvRA7FPKLuCAdJTefVVyoB8JjU4L7OlodLH0blLlHdG/kET4XgOhEfmznYi97qyDnh5NjOO/EXLHGuijZ4YJdqJcTzTcOISDLpSyMvQQXhzoR6NXmNwQKwZq7JQZaq2ms35yGQojuwrF+zD/Nn7grP37ktM4MniN+WZUaKCMY0jfNYT+yOZJgZrW7Pc/uaEpl7zRnyvUx7TtN4MrLHEr69Ep4djwHnE4g4IfInUS56dm5jVp+WyJ+is0QqEWnFiol5o02tB6DUJ13xzNT783lK6iZqLD4fR1gf8hCxzHai1nB+RFoqq76YdI3AdiBi79B6kkY2IGZcaU80Y/NMKSgw8SCvlM1JL5SfmqWrS8MerfWAXACjgfiRw2ZSR6SdepaLlICVNTswfwPhWAerJSSVGculJAW/YCXbzmOJNJCE69oTKrFogDsgJARb0pVbBXFFacU9f7avbuuRhKzau8JNsr8t/4npx7dBNEd7YZql7R4rwBYgVEASXhmYa28KttnFnzZULUJ2WrhH2eFVr4ImZ4SFS/suUKS0rIUThmBJiNoqfRZxIo0XgNq19pswNSb4wQ6NzDIzUuR6DNKCSYNd9HMheW10Y5T/hLx7SkGWx6P0WeftK2X20OuBg4+P1kt7qLTL/ZRGon+2NzkPBnq6gk1XrOJnW961inoeHnaaXGB6d2h64b2nQN6HfUv2A8FIB2A+pBKAUlEsichKRTY44b5mYFMXuGLDYEbw1uV6ub8kpuJnl20KA8ClubYZ8MKN+LqAtW3US143vgqOdAfh0gTZxYi70m5rlIaiiIC7vnVwiB4CKZEjyITckC9/iC0KuWGUxfeiyx8XprUKHF9qmivEzgHppMGhZ0GZUZLVkQ7wjev3P9AJd2LXfLvdcNgtWusYsULQKoI1jxWRny4dd3UDqB6jx9ce4K5Rxpzjf2GMF9yEsCSKOxNOh03D2NOW2KBZs8JVwcpTEon11QuFM0Bsog1XQh/uIhUwGxCMHtZQPNGtl8m46q04HCPWhXPInHef80u3to2NZuMP7nEojgi7FZUjrwEEUN2LXfsdPOuBD+PIDwIVNFr1hYIxZGKWky/EY+UWg46eIy8rTwcxJ29lJD/4os90He1k71tjL91qtrYr9QPgwSNkVSfkjhsaGJDrBp/Bo4Jhl2Jwg7EadKLhzgpAm/ZuUDGzwutbFNVY56wBlQzyCsIZ28xgnfDKetpo8MnZARskNEXyEYUWzFq4EhQe9IB6HNFCO3NxtuxC1XoWIriRmMnG2FGa6znJozMwdkYeiWRfEOmJ4dyIY7YWg7gIv1O5tdRisIzoeG0kua7bhAz/KLuAJKFN4X7l20VCTQOR5vhk83BaoJ3kekpeofhtLT/iGja1tdg1RK+BijULwqPE5ytU/Rep5PoDbRhCQbBOurq/pugtY2Zqt/X/BijrwpIeOSXmrIPZnrn4V17CB7DrF0BGXho94pqFMImdTv+GvIOX2ZzM8qeNdTM/TXR77Aj1lJl2KGn+gUhCL4IgeKGwKhmYG5/SaJfF2/7esvyLDlROUHos6lLs39JUnDAUMRUah6D70sz0lHzI7jxTYOW4Wn14U6Gto0DczD7mxE5gb9yEJOpyn9l6HQaueAaD/iaHCzVT0VT5nMjmCOBDNJFyedvJGMbKVfjLRT3m7QuScxarjO3cvPJdcRULHK/H8Aaf3f9keOyqGqbV4LPwT3EKkgz8d8WclZlxPZzpWWmAdHUcV7Okp5DFGfFogj2GPmSRs9smy0LeXAllEILCxvxlIpDIMkwU/+7xum38whr4/4e/4PWXjrCQJTUihnB/mPUQwp+IgE24156Qm5KKePvwEu0/XlWzYMmDvYgreZVr4O+N/OWcuaeIPfAhoQYylYRXCFXAaQUVy7kDzEAXOPn15iqle1Z1ak97SRPfJJ/GKJEMxcFBFzC6DhO41Y9NNaA2BGOdRTgiJyHWX37HtfHfphqVwRvMEi7SP14gBuibztVN8UNMKptnx6j59RBO1IRu6OspkORl1su+sUnIPy8eVQkZsNmZtzofDhaB1hVszM4PQbRR74MNzep3g2Di42GELs3uzOx3TZ4DNOilxuFBD4ggBsgScqiHbT75CD/r17c+/353nwEr59lgD97b9SC19JQvhTlqgjJsfvkIvmxxKaS0xG4eCtyi5Fn7IaLGbtsYWobupjPkRYNoiF91/2vi2WAKqe6QT68yIDjEHeGJUQnYtqzt0Uq2ObxXZuluJ/BUEods0ziV1W55loboCWf95iL5YxJd6l+z8NW64YMHzla7Hs4HsAf8YeKcF+CQAqAqWlGZZtSJyd1nJaNpOjDbdw6zAwUhGpk8fh12KxK8+iCS0oIen6SbYPqH9f/21GC6nHhKXwd+fpTQWqAcr46U5eQwkPmvkxjqHJgLIV90u5PTTlNTnVJlYnLPZyGIjP4yGf4QtKYYCaQwYKfO6rc/ne1g7izl5ex0PiGVKlRavRMolU//hoFpJCHTiurBiMAyGKs1RuHSWI4FKZArZ+jgl3hwEaOSahQFqo8sN0KHgFj2jPmO5hsJUwaHshuWf2KsLjNoDZHTUmkyC9GmC+sfwM+qp8UwVsHYaGktzAoJxyoI/zeLLORdln1v40sC2LAWjn354JSVvVN/kdqqoxUgpfVm5Gr00VM41DCXrDRkPgVsAM3WaBlDoJBdJh3GN5AvNBnzxUXhnR5lMiWaGa6xznPZ/F2idYwW4FdJTuUdvAV24PSF65gPVj66O0gcUflDeHpkWyZ12V0y+WAbPVKa0qryl6qQtrMUyMO6yqJ2hGkQ2cqQAr4TdVv2D68OFOhkqYQKgdJjca3nfBs2AcZ5R9qUoIvYwARz/RLh3+xCFPVw9ogC/Tzz+5s/n4I8M2kfWkk+Knt9T41Gcq4VhwZXY35JcAW2/eB2fvPILxp6RBrhTKiRMWNoBHcGLjSssyQfJa4dDr06jtMrGfu/U3W3gZUi6+XWBqicgjIayGor5EAS2v2uY2OEfXFPM7s6J5FZQa/sJ8IwRM4c05qPn6kflYEIeNKTBvqP/sxKRuuPJRLJr8zK89AY2uWWvxxY/ce2+LUn5TIsxz8mFxqmmCCWLqfeEhl4tdKU9ZUBDfn8YWpf2zTxULixnk2iU3gVy64bGxoiFQ/ZHmKWRVcTDFrTHNqJy6CDRLVptAZXAbIpklIL1lKquR6Iw/UJbG4OrgdeElWT/krHAvOBVUk6hS3mTqKJzMwdVNHHa0ah8/KFrrj6iwDSOHkVLVSaJf6/z0vt5Uyj0HqyoAU9RguJUVWbwlb+7SY918xl/Lu4yGO9LRkiOqQCu2S/DDsATvAPpRPzlxJwAa7I53T7E1GaWMdZmQhqWFApXb6IrTsRkOr7hjKdzkI1ZSRDBDxOvNUXjETAM1Zx9M1Y18+PZ0Dlv1QGSgIxid1K74r4QxAHgxyEDuICln6cXytICSqgSEX+ebnQc3nk/z+6rHoC3JvSyazvlEPIa6gbYfly8qIzX10aUCuPRTwnKQh+ZKbFFtfDD783u01eaUP7omVRgjLBsgyu0Pce0iOQFM0LZGm+XRiaYQAmb+ALyFxBNUboAhWgDy1QimKDvsWmXASuwIvcOF6yLEhQpRMOh9dSo4hvv6QlJFiipBjawi0AjTJ4ZNwpumqxh9hqAhhNASpICnuCCawj96Lb0Ykc4AOvTHofhPgO/j6XSv3yoVfWk5LSrqvX8Sje4iIFT9LhahrDMasidGEgG2tc3xxULvPvD+4hJtEQdVabosM9K5Inw9RNGbcs3Fo+v7o8DGziLv+DP1T0ouZiRyOuZI366AFB1jlTkFK2twqRIdIPfuYueAuBnYgflzeMvEI3SU3orsHe0k5MzAMuFE1BB68RBizmG/LcAwQt9GYtMx98RzoKQEaydyxWYCkVKI9GhSUIBS54cKyaG2HR9Wwyw6aujcFgTseI6f7O5o6QNCdyith89zSHnrO5v7pN8FmELi5TwI7dLpHFcYTcOorhFwZOqBk0uOuPHa7/ELFQXk2ziCUM6YayK9RnZxMEpuvCQgP4mgLkjECtvZAnXm08R7w8H0cd26We4qLXwx5q00CWBWIHY+Flut1SdsIDMp+BQ3nPTXWzUgbwwhYKnaCi8xaz+Zq9Ca6eSlg3p/GrBTHpwTnuFhxprxmzWuIIDjHrokDsjl5VmpDJL62VkJOCWQ0opzuuRv8Cp4A3pmmn5Hw0WbaRAFXJ2+vpcKAwpX4reYDrOdg5orOCqgix1/LxzoAcQxvN0y4Jv2MlcSii3czA33N3OjfODjdBZY0HWFeg7TnTtrfd5bRsSihZNGgUqaM/tvbGNuFBBvytkI4yRdT1S1bIux8RRslyGVb2dKX1WsY0MOXMZuSKSwMeN3Vvw5gFlKhmiwO6zgfiRRv+DK0uh3+dMRl7iYeXknZ1jwBsUyAd4zy1iqjIv9LBVUqF4+8LIn4XEdBc4IhCqsD5NhpYxOQDFJYu3NKxEZyVFzwiSe60nntKhseRk2FWtSOAWdPIH1LeV33nGkgfssYgT3GI2bbBBHSTjSvW3Qq88LnomFctmGsQ1Dy9egYO5vhPd+amYiKqYUG51n2J14zERKux5cCylIaMSuOtgonA9ZOY6YXe6h6rgZYosKNd7y6V/8GXu2ZTP1zK7f1WF5iDupxIeP4RUBj5s7pLN+V5CvRd7P2wipDlyTiG3Iiw6tw4LDXndheGhorin9JqUpq1aaj0gsVkI7tsGta11ofYWcVxBbZHrIfVJxvNpDFIoy3UThqrzqwBh30Cr/iGlRp1KU9cOBuRvJQZqSPi+qv9LXQXz/j7Ozqn/WV9ZoN9wYmr2VTyB1Hyszyny1Eqzzy4XFtWKa5wUiqfJprXkFPQbA4i7I+coDmlJV88wAjJm0V+IHAwK+FK7IADNhb4gjqC4vehXI8U5KdiuL+YS3/kY3JCFHA8IuZD4msa50FjkCJ5P/OAeUu3M0wDugwvuQyTz67BcuI0aVoXSoDd3qt0CuGTqoAJzbC0VYkqTayoxSIg5TVlz/gTlkySKCZFHTUX4qXe91uyrqi0rkMvYRyWoyGwjzG/KyZiyCTWy3cifQ4UPYKkoGUVBPPSXFHBK7QaVNfdglDzYMDDvMm7Kx4WEqOw0BgbSzDQHy+qRJ+uMLy3GFhsNKe2imNvBxKsSaBF4Ive74y2a+dScaQaZJfZgZq9BYgK8hdQkqY0866cLQfNhM5zp1affwl3TkQ6iS8AVEkuqTjGBGENzoS7YL/vt8+Q0HsSFdqVZ6zGEVOrLfUQYzmMoUGIUAU2Ighw+8CM/h5FKs39gKZhAq0Cjyg4E3Dpk8tUfeE5jNEMJjvg/7LStlx3sbmTDhGquAfybRELevyq3Qig8im6IXhPWmRLyH1eRX5gd5T67nZmss4IThgnFwZCID9vAZ6eRKHUi6yHGR42jyOCSLb/YOYMqxbJ/QSq9X29ZtUNBFKt93kD+vFBhhV2IDBC8QqItRFZh5GIxuidDJtrge3d7wJGgKrFrhqi4eskhO4O68NzG8eZ6TDl7JMayh7bnVaTNfx/5sq+WZoqj4RUIIBbKZEQwFyGDJI8sHIv15NYQ8l8YBiN3L4htkHAKGR7xidZBPdAf54ISP7GzH3ARba0o9IifulbZIDNz1Z4amPIxSRxfwI0rOkkklJFP8iDiMMCWc5CynXRjQM4Tzl5EgAtHx+MZ+VYfyp8U0mYJhyPfYVDKTJvplunowpfFFNe/SzaPjLLZ7PE2JNf4Kd+w0xXvZTU/Vj0wWAmEstsW12e5t3f5BpvK+/67tOuk1y9+YPiY2RL0uA3SklWHWUPXxAakCqe+GI3JB0PQgSHUCuFnqbNLrZDjVSlghHXFJXp/1z8hnoLuBOvqhORA6stFXnJP5Tbdcl0ru9yjoEZQBpA6ArVgG9P8BeE7ZeUdXkX7ywpJ5502qFp2twI04vYWxsFpNd5/XY2mkZd5opoCs6YRznVnPibkU/Ixw8obqiC2MM8ecNGPuBDCXNlBTFBCA0wGJM3pwywCLXFHMDAeUjUfgDLbluVn9udGqBsK+XlcTK74FkCu+DjBY6I8OBuYR+aKohA6eXvsyCu48mZXI4ccr0wEciFj0YEEI5emMRCO2+/IA6O/t045kgkShqdTfE83CxV8IIqP8+Ih5uGVdGQ2zRxWBplAuTQZGYdFDq3WmmikYrEpV4DLmBhESUtq8zIKCc64i67U9Fx7ObU5tJYKEDg6C4xJilrwpEwIk6oT4uL3HShKk432aahverg2CsZzSBCrK984aDmSUNBQO2Q2Qywyx6M/I9ZmheinEKclm6hy9a5dt1P0K+YCNKie2fu3mIkCKi2bzU+ryWCK1rEKkUFaJgyPR2HZU/rEYBDVCCzvNdKJy4XuYzaGn6cMFKvC8bTBnpXix6Oxhb1/+wS/jhmhD3evmssUZoH+uV3kwzavMTXaHqebmRxeWU0nDoAh1FthmJAQMoQXExv82IFpJIigGERbyQ7VvGge7eJBBwLwS+JglPULy7LGLMQSlTAFlMfWMDQviX30LiZ075d7zrqt0vJCCShXyHrI1WrSUoUGsGNbOOxazImPowvLkTvWmMi1LVFqJOtbfFUGN/GrF7hCaJ1MWWR8cVvW7z5V5njaeJMp8fTUlv8uRNRtOmLBvkPK5SMMVOJ5oxpG/c6lDw3SwpSuijpcON4qvAUBYhDiMq4hew7BySvfCvssd5OJ42EcwxE+K0GbPohLTkOPOlHV9CKhma8BFWxE7ZGIP2IQ/umEQiCzVpz7HbC/3mBlnSmMtol+XbboqqTvdlBwQQsQzeDDMx4Fb/q82tQmr/dBVhOaqT4Dk62lmiTDIevag9DwhYuL8ZdRsOIPnWgWoPYa6xbEGRQgnZ/h9P2Hgv8IZ2le36BY2Ck58HFOyZivJVZihAN/UgSMDShoCDyVzqSvX7y3bXta1IdO6xX6HQHjPWvbkp0ukY1g1cLlaqjTyuviFvFPpSpW8Ui3P0UsMe1R2JFQLlLLvaWbFW0g19PSZIC+gXAa42VSDptCvpto4dAZSqJD4lQsOPRRVIL1mLRDMjVXWPvhcGu+Sd1Af7BosimuAlKS7MfsWjkDm8d9Pd9ZCRTwfO4oMMqBtcUy9wfmyWJ/wt8BP5WPcda7gg3tQ/C3btUgq/EQNEe3XOkL3UiKdTSi/rG1Htz0TFjVE8cUuNDf+8SfT2JnGplgZJuK4NtXy3ghZNrlXumPRmmRVKO32RYMM4kHvsiRg4GMgAPO1AUk8BKHHGI345RrnPRRWih5hpDA/21n2+uC05oCV6dzORaqgfGBnqnqEA11HTNU1U5SZKY2VTX1PxIVbGgyorgCE0zxN8HSxAJ+LTWCDsiA6O8OrChbXO9iT3+HwbbFbmbhs/lSSSoM6NObfgLT/FCy5evpIeXAwBlNjQWwbUTiOqnUqeGMgir6bINKOVcLGPTl541lwkksF6JmV/giPq84y8M5o1qdlAJQSHuo0iBEryDPrEgBPwapIhOwc7xuRamDcDneBjnTUSwvZrJUFYR0Waa1y4MqISWXZ2FaEd6NkBzmqPScYQMeOLcXx0HNrdKwJ9Jgh6OZJY4y4ZVbdf+8w5uDDcQ2n5F7GKd3mHYz8u2/vNcvSmNaKQuZ3/YQAXG3UbogUSsFiKDdTQvYVhwMTmMqQoPtQgyI7VS7ArTCvH+WVYjTzra8mEB1Cy8Y/JvnudMriAY5A35zs4Y6YoXtWuuJaJJcA/pBlbDvYXPAP6iaF1k4DF+EgzrVHcvZKv0un3j0dfCS9mjTiTIQ8huXOSh0tV5uqE8JPW8nfvshDTh6JYn/Uz29KWCQKFbNQBe7gI7Qx3vLoxk6x7F2hE+WHW0ItZQjdSdyCufsyrv6nSUsj8jWA2dZZ13rD7uIcM7MVy3mtazrjKwOu1E1Tv7ow/ecUL8N43YNykIR4NEmPDcOQLnk0aBlqwDDhU0s6sUpr5E9Gh1CFTTd9jtQbd3ZdwCpYfNpEM/+GR9hIpnd60Ul/Jpmp7x2qjmG6+bO7iXIX9+0bOa6iCSpM9xSqcyybGaIG/PwMgGz0G6cHBC4HRWD9nQtcIgGbOGmQiZpm5/9n0vbWvT5ja/DTaM5OEejBL9Mb1cqmJyihtU7Qr2fnHhNrHaJgwP4qBcCT1BYtM6jQ/7p/HqDeKONkeEDiIFNfUFyT0aKcqbRw/7DrIGM8qWCfbRyUWGhLV6OLpBwvPFJdkFFNJ1tyAA30V1Ugb81rGS2sRvAqF6YFQ1F9zC6JKBDikKwq8ia4dcDKjCtSAx1evD6rVXw96/3UOz1306CQiXp/rYBT0KNFldIK2YVPo78RAlwfiDv50pJ9tlFVKbGbNEfSWsC5WBsbZNFkbLfQSdTbezHNkG492rfSyITNvRfMYHBf5ClvCMj6XRUPSp9C2t1NsCVHWspRXlYs6CEQ5GrxSu8RJUurXAB77eu/NLeAG7Rfdciv+3MYROreKZks2HYadIKy9+fPNeZhkHqcZznH8D8xiJItpO5bhozsOuNhLqOya7mgUM4ieI+5MjmlGfj7s0519Sr0mr4XHyl29DGN33hO+Xe4tP/rRsVdujL8iWtPjYOXTxtqanCUeehM9RjyuIcBgaNVwNvoIUFpweCs4BBV+KScLrHljY5fH12PW8l8PmSmy/B9RpjAZQV6fzUf/F54AQoHtL8ajxUJLoTSaUsuA6P0EdvQnbom09lLiE58JpP4RiCBArf0W9m+tz4XILnpbwtfPOe+leJsxwIP6CAYaot2AnM14QsrNsj1ALDzhDoDDEsrUSbbPQAJJMh8cPneO6aMH6BQGhi3KP1Fz1F9Yy97yY2VBA20yoesjjKVM58LOHrgIwelzBjUzjPegev65s3Nx7bX3WrxuKcxK5zwxA9RPx5dmAxQ4iq3A6UHGD2VXZ4mwVNeMEIHyynlI40fgCCD8gliaLACv0tnDpef0fe32XSEEKeDy/r/yOJ2D/pqld98U1g6e9hXOOu+yAwU9BiwMw55EUN6aFzLWQB8LxIMw169a72e/KRJtIoR1V40d0sLQ3I+AmWYoJXRRO/ckpjDRxPLT5oAiN+4QRd2sNIDxvNGU6zPdqRPSKItsLTwDmAJhug+1Xu4+tQI5pTuwMYtjBhCoOUt6AK1HLzbt9fGupiMMb/Q38a/THLVLQD/XMgOKBGpQcFLOSGR6ZT4nswn4WO2rPT/boXvxFIxy8fuxn3LzCiqMb2cCgxr8ZB4W4fkExvZQB1L4myCdxFwnmhSnBJvFVJsvWOg4SiaYfpuH/TrLUUpPa41CE8fGrkDHFhz5V6I1eUtrZLpejmFylfjxk7nOuw77OZnNJIS5cmGm+mXUMoIrX7vJPu1QFVFv7AEHMlB8QI/4B2N2yvdWRnsGTXAfCB1l7aD8GMSYSElkF82ekG1pTlgVqvQ3qCRScV9AUln+CJF1PfDF2o2vk9HtiSq2wcGLVI82XCbiXarw4rIyzA2ItTMB/kg2C9nqG8O0WCS/MIEojizVSs7aRiNtzfPqzHdDSUNniH/FVqywVzfPiSFWGcZCuJjg80bqM+Vx7A5EmFEoBfa6u9QqHXxgd3DYm34CXg8TeYUWM5hyQlK8i1337/rhp0TC4F/eF0ptedUo5dPVejEPc2rIlUyojwJ3h2iWxbkplsr12Ik2HakQ1NY6ZqQjDw2UhHcHUZer5UvNACd8Z7Cb2WYhP+fkjkwgJr3zsaJGnMTJ1QrfITqBWme0vfnAfopLin/fX+uRCzbRgJh276y3/kW84wv4mQpSutQdIoOMw3OsVwbT9CZeypP/PTMbuabo/Y6FsEl8VlqUAiswrTv/nMtaIYT6AZFhJrkhqK/YYMaEVd9FvaIFvtja1kQYMfXbibJPxisgQ9UygcFHcxud2cd4BwcIlGAKLE9Xo6BUjhLmfIaIhD1xhmvGCN7PNm7wnHvB8xkXBl0odSoY4h9ObOUAQ/HMEScgGoSTbxX6PVDWkkLXsA2NmcXPlXKY+sLhYTsqGf2p+KPKFSqSAqNNYCOk4F0mNYMTD16Mzj1hNlzZC8L4plF5ym2sJkblQNC2eXxsDJ5ZbglDcReqlcJ2XQ8sJMN+kRYc0Oxv89rKQNxMyrUZqwN7MLaz9caVJTQwg32Oxfi4W0HkQg2HeAg79X+aUrfdKe1ZFLcyo9lLh7ZRYKrBEgWfyif12kyRjgDMiFBVqWmVWpWXCN6HM1zexRsFb9YT5KNeCJzKDNYcdPNEQjA/dlcngb4OZgMiQ/YlrLaei+cNGZyD4YlXXLjSS57c0kpMMKSUoimFTm6H2uOFs9emhMgF4AcYDU81y1BrUuCPVcyXUSkKGaT9diSQf5wBBGnuq2ifUAmTT6WB1VicxKfUlfToTMrhjJpYbt4SWwVJEUW0ouKVVAWDdMyX5Ys0YIb+jxxRnI3SA6zXQnuF6RPLPWUyAqeLeEn6feRqT+/KG+S+gCVWjFIc1yn4hyxPJKoF59g28EvVapThz/i5LRwK82xs88qRcHNAued6QkTIw6jjasjgWo4N/znji67W1N60iVVrDbp8uHY2jViw3weFjA9KLs3k5Do2aP4wsijLNmGjLBFyKgRI9AQHR7VU5ZEDz8aQuo0UDuSp2RU39b0gVsT4/mlaBBfUhkciCIouoKBXze0uR7ZBh93Ipm25u92xqPQNNqMsvo8mvuTJjiEhTV6U5KV+ExTtEYULFT3C7xhW7DvOzrvAxye8GGXpDgpItkTKGLIq4TzeWd4MaY6lO/cAgmqAKRbltmxYVg2D1V0y6+mc7JyAEfp3HqmA6YLdTuilNXq/o4xlkH3ez6XvluLxnF/4pjSxWm/ABAmNewXcGlbEcdm9BpUE+x9dJLw8unO9sFtQIFEa4i/PU1K3uK32li5kueDys4avOJRaqZj5B4PLUzlfufzP40St0Jd0BYxw/hdRu/xg6OLs+OSQHVaD4ukM9CCXi/n5LLJMRD8Yg4n1WyQ74liFNO2JjdnSSZhQ3anRsuurE4RScO+9fywDnf0Oxgj4/v/ho5CYCi33o96GaUrjdQB4tFrcO2nzQY5DjlxPDXBSEWoL/l8pTVFpGKgFsYXxcZyN2yaCTeER6YHTTWGpDSimaZgHMBf+o8xetaLZ0GDMBG0tjHl04MIhVaRwpW0/4aiV4l6h2flccMXfl30e3hEp1FKZqUMZecRtJ0qAPebNKBba3A7WA6DDwXi3lNEEwEJED6jY7pAa0zS47diUCqgyqgWL6ZrBi64w19mf3rXMx56pfSXFbZ6F5vsnxQAtrAZVb/sBdmcQtrQcrrGCqNoSKYCQeFGAvA04vscEfseZoRisS5oqEobRkRnzI1zv38yvJCvQuqcFSwoTQM9HJ01caClIyL7dKM5WdZnTwJFHu4nu5F901S2jW9XO4Y8HkZC+Pu2WMYmZMl3+WO6cMRPL1VC1ULxRPNZCt5ojqDRvy/Wwg+qL67Gw2ZRCSBaP43Yu4bi2qP+0+i06VSssiTptH1hKNFJ0Z9u9Toy2pErU4EI/b6QbXbObIrL84JHODC3MU7qub53kvGgfnOR0kynUzzMFGWIEAaezb7/xXeTqUJyJgVhGZv1K6TuV6mtasuAXbsXc3MIC660+YyOyep867jUbQBAEmQiXPRZ3FXjgw2YORvon8DYlaI+9U8y/3fOE2YTCBr9uMnvbtejIvQAlw4fUgyndlhQsKz3SXH1tqNU8S1+BPsEiBbVtH7qYwyx4qOLdcpFb+uvlvgc/Vc9xlWhKNe25i2TrEgbTHEGLCHhxM10l76hrVTulTItWWVo1Gj4A8RyMTxCDiORGLT2CIOpBKYXQ2AkjJuT3B2Vy0baT/VGuMsUnvGhLeQSYXV0AEc1msLtdnaOTgN64ev/qCaQYq/s2TTp73u454ezpWk/tjeGL3L58dsCHIVHGIpXhTZ/EPcoU0nJNKxVbbxHjZorJxLmoppavrRjPKK/wdIS7TPTiVRj1/lKq/E1kmccCCdG4+Yvptlci3Gfgpe8151NBsxTmVTFZq6+EXUEJY81sEBP7CBBZqnK2zmIrMerMwtN65ZqP2qdHJG/R00oL/hKDCnVVuW8qxuxt/5rnxqgsIzX86ygWENnO/nE8XsqwcAgavmXK5sKIY9B8mGRigSpQCeRTAmYvOTjZMjEtZHrShavpYu4iSCLkFP+98mHA+65/6bzrShLw19CDIuiOlD2lc3epLHupwl5vwF6Uax/4SXrdhNcYjWEQ+HqWNAcwMHLygQ0kzZVo0nTEtKoGUKywBo7xLc+Y6Gt2hqIRK5lAE6F/sqV47i0aIcXNXsJvhtuyLjqz+UBCJ01s+IgXOnWSOWTWUCq9wWBtdvUBPCRAMbSbr31kZIYZXja1F2LqEEfWOvhJm4oqyAfX/GozOESA7SiHfOTq+o9dbn3aIHR8GjumMUbCxphSQln510bklMe4CYdVKgmHgDLDyqR1nahACPHIQ1Gq7/eWI1FjLBZCuvyl80e83TVLKwrtRQZM/aaxYfinmrmS+jMoFbavPZuEc8pQqKsF/hlnm4vz2XJ34SwFDi1TiUUGdrMGNj3IVf0oQCoxVLta8bzNW1oRZWpXLkWBGjQta9A9H5D+6gMSRAKryj0vWdkpqPyRt6W18EddeQrdjPYiRxZYNHRnJDGNPlXjQng+JEofBIsUy/K+CfdTfXDt2XUf3n64KSc3pH7Mt9WIVkLaYkcasjp5yak3o5loQ2QKk4FCqy4hM4hGLDSOCTOXuZ0oiCcL5LMf/q5GLZTMkKT+xAL+kDTzbLNikCPBtZe4ffVeGQZmDUmShduaXqXqcfAPGZtSB7jQB2nAY/MlqU3/1O4hRzhoYe5XjC3aEY13oQ0iH/QLyZLvQYDBG/zaTkQRMZmXb41oSWGMGIEo1daLTbvW2nCE8EqcW/YqORDZjknW030EeRvg8/lcKDjhVfyAyGB59NEMvFmKi0AVWdkUQitTCZ2mwQV7+vjpPluy64weSaaZO88DmASsAt+sLiM64oJjZJJp6H5PX4Q9blnPCJ6GvxTBRdcTODAkhsnxGeYThuo9ZBIdzTxdB5aus4UqEW3xEWy4CDGKwYitaOkn+gxjsbGZCvrd5PyGnlOw1A13HwtUU4Wak8hml6vbXe6JHFSS7Ws6dgp3kLblp57wL3wYEdnY44Sottbm1Ac6buRBQlc3t3tH89VN5fpNmk08CD1AQ6Hu6cl91RMU0i6lKIjAanvL5591IB04XomRvPX6k0deGZxMR+gBIZG/QM8N9LheCM2uIvk4MVRTrvM6MXQTVDjCsS3Ldw296NpZttIXUJ7AQnXTKhVDcDLsJmqhA7omMzgGymt6OpvYvd2ORzd/c1R5t33I1P97crBa6UULhSO1KkxXzA86K2K4wCXSykvLCzRR1pZVLgE+vZzcmzItmqEKHtq+Benpo0GtAHAbhInt4rw0Z3kpmjJishZSViZpBIBOdBR+pqwAZux5Lrkfh9ZmJ+3mZzjkTqgai3x5qK7TYp+/Nl9J+zV0Lp7c2zEnJIbkK/4UhGSBClu4KvsY7MIw5sW9SyfmlIsJzvkBvNtcantp4hvsnbclMP+EHbubaxMkDcjka9jyFXiNZKgABBbRcZecVrMn8bBJSvTv8Fmzmc8cllsO0hlBQPDKZiA3fV+nmxJCnTd1keNWEsvmylaGflF8vH/i7Y1jcpQC+jfTq8e3AFxTdUIZOmpMRkpV0ll5IhkeiuUGEkNFc2HmHNQg3ipc+CrUYYQJvCeKdUoNShTIXNCYtU3/H9SOBKi6Z9DETYRi6fxhrEeFIr1kYTVNF+WOaoWHonXQFlD1LvgkR2JSUF25oPHUmADJ1qhbbTT5rOJ4fp2DNNNTR2SFszKTs0+ut9F9TN9UpIfbR6DFz3XoCQ/oA8ZZRXuzDQC9SaImjNqsm8VPtotUK6Tlgl0LnuFytrf0XsbLTPzyESj43gPY9PCbXAs8sdimT+yoUmcmfI4dy0qPp04PWuVrdvxsSjMUsx7jF75Qcf3Gg2+MwKoQSFHgVGRXIBz2Q7XrpcfWjRnsqtnv8QGIYTs7C+W9JvKmfUW8txoJTigSCyqJmkGqJ7q/Qo5oYODX4o9Abp8+2pQHgl3fIsBP4cTDCn4nWB9RCaCvQN3hufjgiypPL2xYCDYtDNj8Yo0IoIN+cRiG0Kx0aTGzPgoBnxSNhizBBNfWYklhR+vGb9/mTaOjmodqLAbJiGAGMFzZkJwyHKjs2RiZy0mKMA6jnAl1ccstKzWoV6n4RMrzNvKhY+jJn6qhLNnOKJoUjGe2ccdWblgJ8YZF5ZCXnAE7kl935mjLqXQw7XHcYCr2dzGLCCtGcXxrefPCyRKL7EIUj/yVcfEAAzM7a7ZgeWswoU2CYpaAPsVEksYroF9eHru1aJg4qh3um7MXq8PEoIhUgabeI22I7jp8fyneNPwYglPabCQ+J7D5bugWetRyxMiswAG7wMMOk2ZIbNltWP44PcNtgyVVO8GPoQPeC8G3KSjSFY/ytC47JGCNWwEjy/hmiWNw3oiqe+cn0Ut48aqfsSZDo9f5gmGWwTzvzu3MtvgpBPFlxpuGHkzC2b30onL31aZQ2yOlaxgClAmiE1sUEfQazwN3qtHvL2kHao8khJY03MeL6ohPR81YT4QCLiJQgMnRq/7Pu1Q245cwGQ3TV+e55qzjiskY+tzsO7cQhRSCryB2OOrmZGxVloWNAyjowM/Q0Z6R9rm8Lj/pRiOqn55F6uOQD+vUtnwMkz61SmjlRehOMEjqXHdXY5DAPpU/HJZDs4CbJgq0oVp8aRZtXnR/Y5a4JJdB6koyEppJ7ZNN31fuIjk0yGpAtU37fEH6sEEDlLlbU8dCDZHdu6XFh+l1LpkK/JVRswbYaq28cZmgu5WqbFMqpBtpDsKhFJP6oJlTNVB4jpKU+hdNQlASGuGY+ie5lNkoVKAphOmxferNMym9PAg3x/lIR9wfFxb2PwGgV9Hewx07kB5P4aq5pGqe5qIkxZbgzaEuPCbpjT9P/0RPM3fAlK1vWsGrRLMMYAW8LwjsEfdTnIUAFXBswm6HOYTG0g3/BXA1IJ7XMuPXJkrIU85Y5M82vO6x6oCg4IVO+HVNVuBIb8M14kOo/e/4UCB/gORjeFJeWaIanVNEHGCGmUB4j0UjpqVyUI/UKU/DIeLVTWEuhCo0HEThMZ03cngfaZuNwQufUwO1zFILUqWGp8qnLj+IhzmjxOkTl5olXV4XUoN5lpjXr9HlMuEiAzPj68SVJpCXKJZa05dZTo5DMpHoAICZR8ZFipqEkTySZIP4kKtLkcgexZR2Wyxd2hexjSj3Iu7C8zcatb3TtOw+/M6UyHZAlKAuSeeWzNWxfVnLlorR7RfdqP970OepwgVLRSqqXFUQtIoo8oMMtOn8UBIQ7VBcuC7MaF1dk4VOgEW8srLAGOCG3a/wacjpDUwdW4LOlGQgV7t4Rut1Ey0iPxDmUjX+0FZzT17F2cVLdVZjTeRWMTh3cIl5j+ALFqQyaOKV2hj9FEuUXFZhIZwVqmpeIH59inxlBWP6YcibqQneeS5s7X81P0A1NonCvKgK0x1hh0IY2YuTUa3qDuKt3d+4ttQGOuLHzWK5sdBTZrLsF6nbyPmtNjZP35eeuvUmGGN1jpjsoSYGAvdC6szw9IiJTwyNQkhhCRdIgOzBMEfx4PcNHpdwylcqb3EVMxrA12t9aGDRC1XME7T6KnGuyLBOtHQzdCuA3GqGR5rdFn8WjmL1IhoCAPK0zlaAebk5JOHi7G3myvStVTvkFwZzupD8o7YZ8EryPlWpKb+u7hxuRLMlyaCN9BRjIDdZ1dQGStAOJWgKeq494g42hQE7oO2blyVRdKJoZyM1HaH9k47FkWapQtVvP2+sHs7SUZCqCT9cAvGmUcCGd6/iFUEpdLCS2zLnLJGBKIAEhhC4U9AvTMcF1kmSZDUXBCVwerQeG0f77p55g01HZlH9Hg0hosBE4Job+YytZmWkqHf3tVgwKQ08nkm0OK2U8On5fytA8sy/P2eCGNRG3jmcSa40ZC5F1CCkEeMQEQPq6ZU5VtjT63ANF4zz9aD4ndM3KE2uz4k9j6ilslTLu2j5yiaOGt2+HaZ2XHUk1P6hpPS88QGoFFYYdXoxVq+GgOtSXR1ZAiFnYunw/sBqNlFuw9j0stV4NGoAPMOzazWXM16lIm1ansN5u1g2EsdBO+W0whUzCZh1uKMAUAbDB5r8+pbkOAzGvRuXkTcV/8wrYI60uJgmysFsb+20IcaLxB2c2arJnuYNOgWd6EjaEyL5rEfRCbHz55gqf+ggzbqqQ/8u7aub8AIMl3bBWiLoobrjzjjuSBrX1oEj0slZUfE4gJn6rWjG3wCkWzRkZqFn9KSTkc69sBC+56d+bIpxEexSKo5ZElyoOM0f4YSFySISTyZzoClvtvE9YOntTybwZmYoZQqcPQbrOGFHpUzKSKs+KTTwZrO4im2xNs52KUsRHYyagDDloTZhP8JMUGDMoVKBaiFcTawSA+TSZtZQRHVbHgBMa7wt5XqIJ9SBSKLItomqBTHgCXGeJM2NidaNMd7tm31gd57qvz5xCJ9+2DymReADnrgmRlexhaCbC11KP6l4ncStsbj7O+++50txjhwOID01RA1+r/oSciApw4HcMhDsoTzHU+Wb6LG6LUtZ1EGO79ltSxCnGBt2OB2A+4OZedS6y/lA0ON/f9t6JHhRkGNsYbiAITAQtu+d4fm3ffZ+vAPEriutqpSo0yfQ7uQTbWcIPWWrxrTH38KWxmXrPS59p5SihG7c4h+NaDBt8cer6UC+O/RJFBPgyhBkkISMVWCZEawWQNT34sPP6bp/cqXjG8gs16mO67srmDW4T6a04C8qMXEp9Nn5S9qUACNcCtUykojuV7loJy3cBWuj8IiyoojDE6ICTCOgFC34kErY7+tjQqqwTKsPoSLjOi2rlo6eVAxCJutIwnHDVkwn2x6uabu0CIbGklpc0cx+i7Xl6XV4wbu0G87HFC8BIz4U3ljiK2nH0RhgqrR3KVzyUnrBLdZ1z6017Lp5kTAn5UYJ9cjBWbtePj0LfhjXUqs2RXvhfAj3XbgqHbkRlKJuLAz1yi20vNStYgLchqb8c/oF7TvA80H3qTodvzEld6vHGH0tjARujol+uhg26cOvwYmwY03BETntiaugQPS0fzJq5e9oAgalr/S0pbp9M3lz7XCqnMYylb7Hba0m/KcD+Zq++8kLWD7ubJje9sliesHbJ+df+6u8+kfPWYmE6uxAVlRF4mC1O879/jiwLmrWO2nGnNzT3zIZ4JI0O1DwxVHe7zWMpF4IsaStRN2bQ28/Niq6K7EXEU4ESmekx8pwPtGVqPsjQzFXd3iVfQnLdMx51RW95v5jhR7B5GZKQuk5lVlix+xpV4mKoHTAh4pB9GdXcrYhpQAY6E5w9+N74yzmnE8JMwdD9WZQoLEULLA+n2MefdlCARMusKxwacOwKoJqEZBGnpx1BccLg383n0DMZS+WKPmbobZEG/vCBjpk4QIwdB808Vk8lAm+pJKVe4hcm/UVPlxhchSlthYagAqaVqbNKt3XcyK+ckHWxAdUqpUjzFEgk/hqC5GQNEZ1JbNxRFmxinuovOQbLpvZTfR3ZffHIjWY+Xb95eNc8JhHd52Ka6jDaT3IKUQhoJuWBfF1Y8gukDU588VMnunUpP5uG5XBWHgApYAll1ygdY+BlvXUZU4v1b/bIcyxp7o8Xnem40JmDnIbU4Mezh48+qDdgnYJw34AXeYQWZv3v+RtQ3vt0ougGVbfzobGcAlhAC+gdf0I7J3l7pNcKDskV3wKWiaIL7lA6Q9nt0SSasFe9oh/8s3312f54PcOzbR2UBu2YdgpU8iuEWfUBVgU/kJDNdxfRu6QonLOE1Qj6CRgijcnxeM0voEIRbNd3bPyt+yaU4HjIn7cWG2H4o/RWJwy9UyUuu1BWdTUQXkd5I9eUDmkIYsXE+RBUuPKGDF4E2fv3OvfSp7HPS/9bTVWDpoqQm/HNsyD69146uaUa0IG2SDEAFyb3errwzbBy8dQKS7llkWjOhoXRrb1bNkhHS42cZYu5Xuv+E5+s0fhKY54nj/Zmtynkdnh4H/06CjgOZ6utB3b0Q+5eYoePLaT0sn3n6Ik5szIvkB8JJTsjU9Kxezv8Xs87HmH20I9IvmBXpWA/fhJgipfKGNWll5X3V0JEH9abp+UnoTssXHmJR/EjIpR6gx1EkkKMjJe2hwuFyPHCt+t9/4OI1al0TcIIe7ZHunYPiMWd0MUDVFCjB/YPUl8+E85Bm8EClccLDqImXSSxTYC6D8lzSjowcANpKvFrHK8/p5im5SFbWVH3PdwZEI6P4UyS7/tc1dEUDKEBgqfEV5Rb030j8Boj9uCFxhVxjdEJbcRkyE9lJrd58BdHVNY5ECJZRFWYO0JBhSd69nFbp79lOJFGUUBsZpEJUvER/I/xRi9wZS4+rnVR7xRCDUOosPJWW670zGKXlcQFp2HGPM6APRbgduAm4dahuA03bYeCFfYO2Wt3ocZo8rijU0zbrd8iN/BRZfzDn9e6AISK7V1d/O33qGmU+MeFIgeHggk2bYBVy8h/h5I4ZmJ/lNzgs5JALgQ7ArRUJwjuF32hZAeXk7MqsUYKXd+JC22kZLEVQy7tRENG6BeRXQhlbtLWTTdSXOQJKdjp9h+bSOxcvlPOKoJRPRV3Th8o/PkuCj0yw2sbNwP1HdqsH1oxHGzytFG+5aFIGAUEGrdPVa6ftPwinNHdpHRTA6Zsf0hZfUiaaMf4x8DPfFcy303RX/fmJctHvpodMlCDFyWSHwjlC5NVCOWox1/99emjw3UoDlHhPygeiaD74ULsi18gvZxRPqHqVxNRALJwYHMFlmhYtVOFGLE8BFTq3M5ESoDsDbobdMwHiP7LBmMFjHZsiO1UPe+P+obk/hoc3WSYyyv1v9+0s1JfJstFVmB0hf0Ek22zqoC4SkbSwgSo/O0ZSiiLMooA2cskQVxXPqOY8p+1VxznoFTq6jAbRjdX3E74A3JvQTC/A9It+8KAp+5LZ47B0p/zmQisdzxhLhvcwiOCUDmOkVfYnEkctId7KpMsnQmN5QaZzyOvwZd/s4nFtOyCmo3yHX3NnULp6tys5MVj569sgOj6m1BD6YTblRG9hYJEYeCI1sURa93LGwFFNkV7mtIlUe3w226tE4JsPDHwf4Jk3FXuhsquCKTvF4zDVGoYmVQeu8cV9cXQKkAkAJvcxAqhjz5sp91SU0WH4jslFt/+or/3VvaXIhL9m0QPAoFvSAWsMaKW62v/pTxfiUctF2mm4FEoXTc2VgCSb72kC55ISmuUj63KkFMGVncDKZbY+fl0xm1Yc02FcJTgxNP8b8GGlpEIedz5ArHpgnVtxc3EVXSe5SKt9teCpFwsjjJDkpK9nI8HMk8LkeJ2IMI8Bzy2PeZ0yixoQ0UtfnaqPYEd/6zfUqyXWHEDT0+c49ZNpXHkpuzAgExhkliFvwJNyxMi8gpo2aRKgA/Yn3rZSfNlcEj2yP9OS2NbKyepWtBkiJ3sngnIGWNB2J8HaXQKe2YbjpJfM1SY+uFp9MVngeOoBK1dbEj7G3OPrbWwPgNA6F20k7P4sRP3myZh7E4wPYg0V2BP++abDPAdnmDtuYXBXjDeqxshWC0UKhQtKBsDWk86LyQAealp/lkHG4JFrNipfMIkOOl1pL5Tu06iRlGCY5/oLqDhJzGAhzF5MZDuZE2KNQJru/UyJ232WifFOTNuGEYEkBjkRFRQ/VCyjdHeFQvsmsAn4zEYMubTz/9XUzWXK0Rkys6EbsNqZ8x59EMxUTa+h8sjH4+bCWdQlUOqLSPE0mjGk0ZzFh/x+csWpWazzBjIJ0msX2A1HGXKMlXRw9NdIwG2g0q7Svr/ZAf0dggXtJSZAQm0sLnp1mT7igt3VRGyHdytmeZBPptkhimwNqp/yxIGxhqxeaSbYoD+id7aQwqoZGt7rgNQd8CgDqnqCrSG7M4Wiw+LPOPhVz13ncLmwbgtuBtcw2mDwia/AQuvi+mGoXlDrMZpMfAlojckOG4kCG2D98lpvh4qZhHlARCVxvdE0QFDn7FWr3a5tcAibiAWeublUfGb4OkITAdfCaxKUwAAcSY74MCkza+TAFUtLIfRYErh0dkvWbPAYheGy7wUatNHTQtZSbM3BkLBPS4m7GL4vzFwaJ1eNFetL3LVelt1+UWelCGyNwLnc3IUgeAvp5WYq8b7d4tJgmF9VJap4YSZ5tBLqxES2vfAxWvEg2UEvAmEKvSmPvhPvWlZ2w2Z/cEWip9jEKHAhxMDWJHKf7NIAXc9gs5NoShOIZ+/ItnZNZVwuJ/wY+DU6PwLqTvi6S19MO9nm80IPlKOE4je/qPh3S4InVZQhenb0txcqqUG3otTgFyYql1Og2W8m1QWI1YynVsTGxE6ox8MOyPISKzL9iNzK2JqJZc84j1ZcMLkld2qU7mTxCc9UFbvRZUOJydLM1GPkt1E6wONQVugaExt/AD1UXZnK8sw81DPikhaM0Hb0YmGY9UtgTe/Smd3xn+ALby/+qW2OHHQVZG06JMiyuNC5htWyEje6jrIYapb5TRiSZArtnyN20peqA56Wp5kJDWjBiLgXrfWGuEEONB4Q/4Z46uSp2o2BpmnSxafg7Mg6uzoO74jHQtkgAE2nb/f4R2IZYH4YxElDgftXCx8Zl5QhJAjXAGftqsW2U1Da1w0+UlciCs5qL5/SWQMmTTE49MY2GNPJfc1iOct8doK04kYgR4BCeYiJb9ohSBS25kNIEC4lJ63dvhl/IzFXpcnjmJlIqPhnErATYbOqDpJr6HuavEn+qighUYg8Q5jIgYmaxYIj4AFV8MBfxv/7PbenoAJy7bqKvuWTd+CQixywNpe7RoGmkN/z5l5dFCsr6ua+SNtN1vJlgkXnCh94BX3ElJAXoC5uB5s3cB7F99ElrXwGSCFgzconKacVVGEW+4iB4W2ETJX90N9T0OUl47GWn0V+hHCwIfu/5PUU8AMorogAkiF+Dlb1QlR2+K7e3HsLS0zZ3bH2OiKNFHkHHcxrT5yvvPZZqGmHBjWlpr7ROl+rpjl/GF0oLw48RRI8gOg60w5FSNkscMJHXa10/+1aTxXUdJcFnUnptHlqBRdCFXJBsn/LSoZln8J346j9QUSnON4jgAKEobOyumBJ25uchPP9jyg9IDBU2jb8fLPPuZEF9PEf1BU5lWGeQJtS2S9riECZlUmi0Y2546nHQxGGc/+Ly6cRNcr/5/HDvugim+RXSBiW5hfaZRzWsUaTNJLsagc4W/YAZqzdbZqntoENkeAx2A6Tf7hcJ5jYf8XXrMjG3PsGBU5uNicM69Ibpd8bWwiujN59pv89lDh42eIkFhLeB8af7/HyNOMD4OS/LHEwx6rK6+jy+mhHV9UBbqeF7p7UlN6Ft+w8om61FPrDZMYgevV1OeqJAlN1VC1BH4aZwTSGo4HwlDx33b03wiJbFNcNkVQ8ylSd53CIPurvLfBxoiWlFQTApIrD5hwKR1FKBfg+Zss1Fs4TNXfSlBxxXQIkx/Ay9kwDxA+ngNUknlAfgWApKUl1Em2W9yGWmCN6EY627oXuQJchZtTcVEptOctgpM8fFHN1pBWu1WalghRCmNUrEMKlf7yq48BxF7LMFdipHsJENSlsbByWL2K1cyLfLLR4ROQrmRXLdqTPT+Yv0FNIOJkzEk7pm5UOQrNsfrgtI5jnAKnum2P6RYmYQ9DrACYmb2E+3C6CnLsTqRnk21Swkyb/sTa+WPhC0W81zLbdg5lNKtDTw7/ohhacSVc6BqF1UTujQ589fpQrlAfPM38gp5CqrbnCwOqIfkyrawdFaOjNnv2tJlr1+mmA6GErCTavLbiqbgeQSFWhqSRDvLhwvgwFym65AkuSaTr8tCAghyyC+jLJESVPS8p44D+1Z17MWt5e/4NpN8nyQ57UhMR784ITJ+4dPzuJ6VC6w4PDEjZ+/eMvS+OMESslqCJZp9w7VhnoI9JOviNLYZI7YaJTwphqaqe4DxFGCVvRilZYYzGvbakVAXFe9qWHJnmOLWhiZnX8I5aZRu8VjATom1Gsbfh/YzBGkOp+UvofTtRuwMuuRpuw0WyWfXpYS/eFqCh2uVcuaWPZ/MsFZMGsuxf6GLX6gmfxdXLYFwEA7upkAJk+c2sgX3hI3EBpYpZqNvSA3htvAb1GOyACtNAqLV6eq2C/suLlCVRngPPahYIiYo8qJd1Iz2qBPAKcazxXfrRz5Id2TcdAY/SpM9JbAHIzzrH2BuSyU2zZAIFgnqqezYNsgbBcM8Mj7SoJxnEM4KdX5VWWkXYTFZvarG0ggH11w+MEtqXb8j8t0gWIqljzfUH5QTS7tfdEmLa3oY/GbOt8+vWBUoNww5QQHTSSVKPffcq48pzpR6HdL6AS1W0Y4PyEjEK/BkVTdd6CqGaGNaykf5095sd0z8ILhvIIKGf+TD68SHG0ls5WKugt5dar+0tzFibpcYK12G8H/pgIK6DqJARzN4rKhkSGktnr3nm7kCOk/1k67PUAVbeqXv6Lrl2fborFcK9IiBWM4Lw/UPGkgBb0c4aEluwTCqFlDqxU58H5KvDvnxaVPFIhrBExDCG5gtUczoXIX8sDjQxBzPhddh+z3VCoBpYTvSccwYmNzwRebUAVsvnw4b7vz3+l0o4zjcy9WHKHYIgxg/WJJur5naweV9fvTfrpiDCktnAP4HKXItMh8lFSYp7lMDt0b5+kT+2oXTbfNtWQgNOHY1rzpCVyi1D3/VYwYHdD1CH/5hUZtwwoUz58DsVpTuPidLZevs/8vl/hcKWTGO01Jre6lNfdmFXELzDbrQExEeXK2Gi8EL4DD4k17ovfHL2euw73HvuYkloNhC0Expvogo0sCzLMmP134dpBSQcSZp6wTw+I6ogBBBjv6cxMvBqVfp9DIIHYAevm4Ubj4c+hwgv7mOwCShnt6huuJuOlF+uLSxICKQIDlTq0IK/+6PJp7QG/IcBdUeXyHoWt7956zZ8ugvYytRXqm96QZCF1L6lXlU4vlBKnn3/hQNzr9xaIJ17gGkATPZySIupD0LfmQjcsE0wU5pisuloC7MzDUNF7AdaN8iCowLCUL25PcxYg1cHq8QnzmDLlfgv13ZLFGoWhM0dkua6u7YfPDaOjcrQi+vqbouYpihcpd8BvBQNXYDepMuygsECjgjSkeMKVrsauf51JpDYE1cW6UcshgzyFUgsRz5PKBCQN2YfOgomepBo9XLTRG0Ft3UlqJ9r5F3lqC/lq1eaDYGqNlYb1YYifiWd6EJpGdRjCG3VdCa4lrJgfggu1M2nf6GjwoPKOrbllIyvOKv8/YVG7RcjIwy8OmASF5LaUvlUG2O2yIcoqJfuexe2EocKe0N1R/NWhCzamSBz6hXu1PYmfj8NOy4D0WOI56F1QqVDaAirKoSdR8tEam2EtDzltEkqeZ8dB46HnaI/+K9VIHUPQrEifU7LvPO3H5RYi/Ot+EDekhYvBzmqecs+zNyem6p2DkiUDVB2/E2ZZJsNHVidpgG/8osyGWqGfG8vNZqOeztu2Pq+rQDi8BmzEMNM3kJ0erB1lNAu0iwjS73/cOAyx3UoaatmjX65+j8XAPRxGZFUhEF6++tyYvJ81HCbSIpR0lyMeKheu3TYz+IAUCKQVLyRDk6BGT4tZQ9l6V3cTgfmi6NvUhyYWs0vs+xwJQmkSJ/Axc+zjPb0x6BvV2ZD9LUu4jexUSGlJO8i1NhMKpaHwFq4CbeX+/rfM0b5kzfwR1T1Gs/jsUmn1HSoop3qZ/WQ+554/3RA0zcWPlFwhk2mKRXqZ2Heo3ImWBtjDyBlnWWAhMoe6qjyodEOPGXAvwRiBWMHiLAbaPtILL50Iq8g5DuY/9gwIDcxhj9cHxfq5HcgdSX7lGXgO0qm+Ws7RFk684uqkvpws5Q/JyyXnVYMmowDkqLy8tb01EBdXQOnTi/n3c4nIdfjlO4nwJhy5aeMnxZ2hM9HhTnrDbKdKREupoCMgZpPq9LkmXDrKZ0s3j2sc6va/HBntbM+kuM4CdIc7SW15jN0iVaKhIHICBVz0bQ0AWq/Iu9OJqV5cls8sozsnb9wyOLgFecZN7dNyNbHgSGs+yGHUyEwtNgthX8BLkxCH+3NgLzd/WszOWXzFhrK7mcHP6/CRD+64xGJCMk9Cp4nhLFaDiDXwddlsl3rjBJxfSj0Wm2IwlmQQmSiKmLPAq4UPbB7gD99BQ1/lYllDVXZUYec3zmiNWZrOGeLJA7EjUYYOIHjKnGA4NZyyCkdp3bHNID4EZHFGKBbhQifB6BnE6bUBy8tfOYrboCHGFVgA6Ih9o6PUAqmp4JLMbmLas4LMzeFiSSkAMKSsPWFHiUNdhfWCvgL/lBFz6/U/wXb4+sW9GKAoj5MSpdpDHJQ3imOJ6Xvi0ri9ptQts6GeBp7GqcCngTQPylrY2O0K95dAljG3zUyTPdOxiIjTvHmhQKcssvLjxpNA/6GDH4XxQRu+ySoQOeFwthOeEl1uuvBYNqcQyIruktETB4kibGcipr9WGCoOVbpeozs1iaf5+GjoeVocFqfXjai8umXzfQ/CbQSLUxQKCrR//YPeXnc6Qslr4xwiIJvYMjQCk2aolIxV7j1vCAdM+dJIELxrExxxo8uFJtZJxEfDnlClShHn1M9VBZIbaHqINE5tcFZVUEt7llmK7kAS16gVajzq2BmQwznWBCD1osNpKsEk7PJnnRghSJOlpL9JRvyYgIrENPywYOMH7lDvcKMoWDlHjhDTJioRlS35TtIVWH5xLhrza45P7OVboj3GKfYnEe3goRrtqrBk15zvXRNyuOQrZkqVobT9Dzam218fZET9QScVp+G6id6w+B3dgVAGgof9xicCfj5BcnVn2ovQbsx4BGDdlAdS7UiQj5yagmx8Iq5t4qtH5DouOTXT0APjL9HioMzD3eP3RMr1bQCxc9LLsSsQeJOOfou9p/z6hj+vA1rA4Ajhv2FTmF3xdNy8/fB3mTkgXGEaFYEXx6eqhcEoXg5pF6LY38iTDPwYFpt9AWy337cR1C/k3dGQBD/IuOuxEmnTBmHYzUAp813PvWKYzCcnUh4aK5su82q85rfHjROCtU1uAA3y9AK5qi+DjWKYBZmy7sOuZBR3izvapROPPtr5jKItlL+LImJ9Mz23tbsYjPg6958JDMr+/ZWYY9e9r63oDqseA6+NZ3a1wLNHtGblc2XQqcnEyUQoIgGrP4LiPqQED0rH9itn4zpUhjOhqgpk8OGHZ23eb/TlvY/nHi4m7Yz7k7TPNq/VMrv2+U5AMsQnU0c4ji0dkaOp9GS9ZJVqz6ovUe2JNuDUXmrcX5u8JcED4aPEMPwbkNSVSWpY8PNfM0NyqTwkMoKHcWlEzkoPTY9MZpvUDyw+NBh2rRh8CP7iUUSQrEHY1+VcaOiW1cfUrRoWDD/iOllSsdv8zJQ40T5CFqLQCK8yTSrLzCZeVU6iVr9OEIDtj30bRiabZlgOddUuO0qqd4CMEY89v3yD9AwcWNsQb1M52ECYO2lkN1gSxE+dJObQI0lrevvPWDnXVsZysgqjs58S9B6mXmojFFTvnugTclleigcx8u9R625CXwRUIcmUbwORnmYttE2j9TdvazhNv3SzVkTE5DDXuLHShTxKwTAm5f7Y35oRujwcfvNfQmtW/02wmfEGtTL9kxToNuPcZDR/4Hiq88FLqqdrt8hT/5M5b1wUoObyLRiKKdinHZVafDRv0QR3Pyauxe7oMOaYUCmt7rMfgTKMBW6PtSAyyE9s44GPmyDm563fynGfEP2U3odF+U72cayG47gMPE/AJyAVfYLC8KuEihDsq4QIYdDB4qQFtaZh+30SQ+KJbR3LJohxPgq3y59sqtVQWxNpW24jXnbtwdSun//Oqg9RuuDV8xihlZt4kNe8UEnDnXrcKAAtQKJvRiAzOE18FlMu4IYXBuCjs4FNvj0qpM0V4ZyCW8van5rKZmoT4dels59V3VJ6bVF5grxB6Xoc03cj9r0YFDng/eBn+hetENKVTVFfeHILQOjwAB2Vl6/1EfuIHpVMbT4TdFRVwmnrYyUm6TQrvcBj+gP8RED05DvH3Ui1/wUlyXZgdvEqejbCCmvZLKocY0H/KakmNHr4LnYsd9beMC8k+lqPhOE6Sn8OpjaIQmMyo7iU1vz/rJOs6An35PE/qFZdEi9qbqbl+Zin1YltYZKBKrVdSGlQf/OPb0Ms6LKxGHglxu3KQX09FeQLrVPhOfiXutgmwDZwoWDnBvKsKQ3bQI7Lgq2R3sXeGLFgibal8J/Xvel576SaCPyfmEKA0VXhSMEBoaynq2kiRbRhOlW/lor/bcbcYlvXg9QzOYc0enDHyxhRBOIzLH3+BDmFvBZRRArtk8wUgoLxjQkYDdIT+liReWOeajxxeHSRqi4ZOaqEApjHshTLtqZypbaC9hp+4cEwsgJ19QQ+tDJn+GFTw+dfvQItRpYc7xj98mr2FI5nQyYAKCQBI7NvfAbojysXI1kdnCDvH08mKrCS0o+iFLuUNylwmwrbGoo7p5zBXatyyM9pLHlDOmL4MlEKpiAKfLVzOVWUe9QgS9JHbtAcXl9kyS+Ziily4xdAjuPNsfqKWVaRzq11w4mLlQIcAlotFqqCnuCWRtyW/MGZPfqzLRSgCipjFFf8hFMwYIBMi2bHv92j8iHy3Cc9SKlB5paD72S58mNx15KytimBce8RRQWDNx0x4glkqz+/DOj9sfXfzhC2KC/ck2jIm5PoG1wh3ReWHBnl5oq9m5k15FFDtblPEdWkDDGjhxOC/X53JHO6ekGrdYhmDZLs3flcVivRFGlHZ5eg066D3wacBRBFE0gjYhhIo8cpeCiAuqQFIdiawrMg1JPISCgwjNUI3fJFKJigcioBVIb+OKbhSTzkLtGx3SL4KjeYGg6Vew3JS5UV2gfKqIBDKVLJXka/G3OzOCLrKk5SsK/yTnP98fk2g6MJzfgFMciuaPq7PHM1JvE/eugMgBlwu2XONMAIqNJj0ByjIDY87DLDBAczpcZ8T9LKcUpLieM4UUCrITu2T5vuTNUxqmYtMQKR4G8v7IyJVgMqLDL5J28Wqln3lNjxikyYsG4ZsSQ74dTejzESWKflgcoSnsIJcHdNbyFWIP6NnJpgELar1lvOvm9f3FrMPDImUOahCfQ6TkrTOWu14mi893hFrq6pSownvqslNvtj4b+ZX4PaKRU7RPjMBOFzLzoJvp+Z5v92fETKhoO5LP2tLw44LjVB5YTTyHU43nI+OpWyq5dKAlh5yY7gwlvPqK4W0CozkYZL5IDKtFRbRdTTgXoa7ltTmlbKxUK2/7pTQZ+zYYb5J67QnyYGQwWfWg0+pUaQFMhNTAok4da51rVsdzI1Qvj1ixP/tVcdk7KVzKtm9wnkZKIZJM1bg+nKpZEj79lo3yb1N/RuTvfExf62HZdpFGVUj1URcAcNrue6wQZccAjV2T79Lwd/kibNAMLz+mzKzics+JyivXa41SUiMqqfspzvCbAI3M6APbupKenDsKUDMM64fAM4riSEo8Mhl1mhuaO4X0/SxDqCLS53vwwpAbnY0DINM3+WjxweLvLIo5vmy4oiTac1xKzNw5z+Mcn7Y74X6N4Io40NWapwFxgeTvuI3PSHwmTmC46d3sGiGMC0Vvja4oKBUISaq3jQ5vhOQVfQD0Oi1eNdXA4KW7gmsVQn6qp32xBy0rjFlKnMr4rP0ymsqLdF/O7J4+G5JmokRFmHpIVSyuO1VBKWxT3qOT5onl1rUfXuD2ZauaU/h/XfgrcsVKq2hZr8phpFTE24Ay0+URhYaZpMiPdNlu8Tw0oGz2qKDWAMh/jdXYQlC7JgoOJ7rk0CGmXqhFSMFeiNjQ4HTpBBnqDthuNbkz798ODKRaFPhEC8fVxBPWS2i0IQbBamuq9ohVtA5Ld1YvW8Lzj6/KtSzneH0k9L6YVmcyjnWw+Eo7NpvqCHwziVZrCadrkMherjrEQaYe84CvpRzjY1Tdls2rX8mr8mYjYyCRoQwp5jMm9ELvz+KXPQNCzBknc6nCwL+YYm8wwLGVO3OQga05OYJfKadpuZmbs66OfcZNo73Z8PsfWw1BmKTYdU0G4phbq1Djun3LiQHoJfD2CsP8pFGodJ8RG5g+huLPR9NqC2Es6EpLws5lOPZhXL8hcW3kHfvhKw5qJsbv99NHz06cGxyP1UAx636gG2OzGb6i//pAH4c7Alk5/EPPHm9VwAd+FsFIwDvc11j8h/8hO5cc+1XbnLzgGOs0x1qJJjytQmRdmaurR9hC2LQmfbO776lU7buYZ+IH/mQOyIWatWsHs820kyLSe1YxqjszKmT4lUvE7t+6ygXYLJ0P1ExTA5lqcCQQoR7DA1twZeDzdg5xdWDBKjA+gjtc5Nst8tZwHnmrFR0Ex/6R3EQ3NpBMCqNMIjZztzzR1HvhBVyVUWR9W/Qj6cVlZL12DiUo58JVXOUOlMxsRx7ckc1ojrnlhBbnis0D+ZGhthmoYVwwyDoY1MdN4t3Nj5fC+uX1Ysg5CUSLKg44YKtLj3IKkVafXhayM0T4GiMzZnI+Z6ITZT5g8HcFxdf8vTm6CYlexfS2XGJRdEknFbvAT3XliNox7bzaB2KxeE4Z1FGwJvodEF8ZHgkmqRRibX6AhXiKiJtbiTg8Ep2smy3Zlz989JZ2E7JdJMNpzk5C2uTEgvbbwyRuHFwOn1P0kf09/0eUlpueJJ9rJc4nuA+HxMPzWg7VE86WvtrXN9Sskjw8aplZodUaA4vLHQVpmSYytYkoyw86s8HlMIp9zBF9A4u1iSRhDk1gCCcB3qDVaIAJkd1oQF6C4aOIkdTSZh+ngXjFEOkKXs+OgQKFtYCHZI0P+pOUHziUUWXjRCUuKP7h5hI9waLBIvEoMQ5EuO20ihouWbnMXJzOHSIxZXoKD/Axtylsded3pj8LCCns7xXNG04mBHgmVDvUxC+agRSHWVQCsyR2lYNkk4a+41ZfD5CQgF7OJ24nn2TzPFY0JKlEk6+/O48LbbbQ0ouemRZPQuO18WdvUldCstCsYFL1XvVCtZuHSnn+7nk38RfV+UbsYArthQKdswCDv17MoPKk1hN3GwuRFDhvcIAgpZ2bJpLPDDXmwYhgqFg2p6IMIe8Rlj/oiQAd36gFMFFBUSB/hZ0/+HcRklHG1XBPxGWnAOnp97yN6ye2lGkjrjdgN4J7ZKk0vdaPhtE/yxhqu8fydCkIEm5nZeUPplKJaM+z5kOWFeUvyFV1HLFb3aUIS4TClDzoQC70ExYH9IAmX6iELL967qRzbijq3x/U5Bzj6zN+YHL6T+5y2tE4c17QbsJhydo9V5Nb9ebaWV49JLaml1kcurhumOdRCiyLnQl2xW6gsroc3iOExkroeQDJS38jER8zvaaaLBCjFRZ8Rz6maY+tAF2Qyu5ZJElxTETlx3SaZle0oaKCdsfbOiYHC5dgS3HYPwkQtyV2t9hiT7t27mj4oH55RCtDVA05kFAvLj/uny+CtKTsg0/3TN+O3A8LhMPTEMu5AEsYgwhkwu6C40KwEhYTyG7taf/AhG8uinj72VY9NKjofiT71LhfwDrnuNHFtLB9JrtCuPgHxoGo2MyjQLHROAh5Gtr4XvR04kVfYgz0o2Li1/h6Kl4ASTPIfu6MJfIVRDYkZQ+xh4FdSdZZ4xsgiilmQkJnjWZuxCGLJIyzUVOvjNUDZVW+6CQFMBmc9f3MoeTB5TMlqeXxsrqr4MyO+CjdG/To2DSCGIMIgf8asDdCylJb2UZPI0upxR0mCxmuxQ3q/HvqdoUqTGuZ++CzxDBsmVJDRIIGSHoc1Cch15z/DdTrMAKWYaqg9226OMBMSA4y2Imi+/ICM3Rvo+wqQ7JmrMqn06UVqP9WGPh2DwpoNbBjvrj4w9ANrBZOz6A/B4hDy7Z8z7whu8yIqnRPf4nxJKvbH4nQh8RvzEAS65tDV0zI67IcbD3UquWfkjndAIUF5cBY8kHUvxoOOwWW+eNTkey/o5PU9a5AsrMCt2mvkL9ygs1uXe/Whw1xqIBM6YPCqfBj6ncRa7EkMEgjZEiHTMod0/EEfEitzLpi6EtEEt45yFeLuAYrIY77CBX5jg68ERpcuWpA6qXcZx8NOzR3MST8i03IfLR2LOKNL8izuRlnOJOU6pjDPWruO8oR4JuYFwU49SzZ1NF0YaspdpBa4oxnnvbmqdeKgiDTmlxeIixE4OdfTNH4OQReHsZDJrLR0HmYyYquzl6N4OtzfInoDhE0LHoNMnEDbnjwhmBJsY5IKvT0RRIWzHYnNSBzETd+5BECRlQl/hkDiqefJpWD3Gw5ACV0zAzm5Q1BCrQhL5HbZDNNfh1DzXHAPAtSsdrMD9t90slD0VFVmxk6CEJfRZUpm9UhZVdr8Nnm6KnSHrFxhUlZgWVy9KZZFFsUkmrjnt2dzwsn2ADX/swWQL3X+OjPxoe305scOTSwciBKnO5dkjO98/39K46/FPx5qPb679kJrBaJHwu1sKvSwmo61nbwihdIL/kBh/4+Yj9KzkLZnBiR/5eNg/4agazyj9i8IEN8KpNsuKv4bk959z6tiVKY0faqGCcHTcylNuzV3nsMMBsxfHJZbu/+MBXj0HcySKESh1UWBNMjZ26yeK/f3OxuRsldmizs08pkcbdyOkVy9ciShaqopy24CEwGGVEyf46gZb7PiPhsc3/t7vaYp7Snvn+NIT/wko4DdYKTbbAJ0JjTO158AHYeEL4DHjQGk4xU2BAoVywD8kgs314I/jS6h1NQy+5GgrpH8J61IasK7xcH2puxaCsL02fEDZf6nzlw1OHZzVPvhhgCQdRhE29Dv9OTy1DO0LjsWksqZz6uK+ngA6o5piiLhdSYaSphanTl3vLECprHElsT7NlC2ZIjaqS4Qwil5PoFFkjBJIUITJcylSzEhRxtJYk+jdQjbJ4oDXfrn5oEwWAKGATeK0pMCQpnm1XKDQcjAyEDiZDywB31nvFJ12LfTLDuuJXmUCSTpUmz2KMsufTD8SSoR952MOvrtX6orh2A8ltonZXvfXYmjF5D/ETTpcWL+1wEPuTbKh+KOtGWfDJOlqtYCiB/QT4UrEPaTDN4K7kAwmX0pf7PZvSy6BFyjJU0q2HAiLQN9MZjZEEWDk6ttIvtzVMjtrOqZ2Li4NOfqZcLZ/vJVmKDlUTk0up7xeXwpZLPRUi7nm44BkhLJdL3SZvMk/HF6adW/P2QUCY/qG4HHFGufbbOJKDpBusLGXwCr4Rx69p0N0t2RBtw7EMkdBkgQWowXwE9j4u55LIb8T3ezkf8cPtofsoaeze+F7WmVH69DrXFYRCizdzVSsITyT0+/yfBIUiXk+fWk0R6YaIKxl77snlXL7aKZtBhYHUJquBuo2BzplU/QE8h/nfI31Qb+to7mOD68jq56X59erDjV2q070hvTnPi2yibUqUJRPRKBaTzZHL4+HjhMzfUTWHW0JfxQYyy0srDmyt6YA40+QZvu1RvkcsmiocwKPieTE5Qpehs1C7TAP9zhYyBf/et89V+zDNde8zuYjIQm6XGSALskK/24eGVlgE3W5bicFfyOEvP7yW0kT4SOEa1pHOpLYv9JsKB/OgDAn1c9KYZETrSe94CdLbRPE7P7DYFuhWjSOFqih29udH4vu2HvCof6kUTTFKAT7jNyVVqxFplqfy8KYCLIlWNzDGIiPAccJk165178SDaem1a2iygijqS6NJz2sYVvj8YZNicQ4abY33GT5WAK8+ol/weVmlwZ59iBcW1hYCj+cisxTSMJT+6ms9lZdcSgSCtcYvAGFbANtQH2VKqXDFO9XGfRcWnQluEKHuy5VlPyU5/vO+730qeO9WeUUpbC7ycU6dY/12VVXP9H6s3ghPxvqFRCuWZBFbUT2cUKmMnQ0+wCrshZ7CrFTMeSyCOgCHXhemjrnbjdQlzvRZMRWqGbDMF8zL5TC/s42VKY5P8IWSj3BSMZ1Gaq0wZz3zLF1tVl0eZYXuazGhAYIOYB+Du6IoKpPR3VQoTOdWkm9WtlDhNg02RLL3cPzKzCIX9eSxTLKXqJr+6K6TNnN6Ox0KoSDEB4GQ4q7FbfmT7x+V4I2J72H4pmdbVUZEyi6q88kFliPZoGyNpyA1+wu1MCVc9/tvoUTrNPkPpB6tP+Q6fu/ASFVDphN565MA5ccoi53it4pH5jORVEpEjoGnCzpMYvvISzahy4BdFEvJMOMwXnHDCIzboZfI9hpkrtqox2AROpqD4zEFje8mFxvlTi86sDhVMm3vC4FwBN4uXxKTkQNx68w1rZfviQSDC8X5+F7fFbhydiNAsADA3ROF8dgYQQpBWf8/cu6b6QYkd18nM5+Q8yYKs63oUo5gJ80ig4+flsPj8wUQYYAdHgubMih0SGykpGDB0Jz6yYHNKxdmB9UDgPptAkCme9FyWINrcC2LfsZG6LRhnwqdhtRYqv/WDjVxDaQr3zCL6nl2tVETe50oIojJxffhSDJ0RPipCLbmxgxYQgoPUs08JaB6+Zjg7LRQfQ9QKDxpESuCpK7gHUfbqWPEsO5UnuTd266goD8CISVA0QfVj40C8SIBmNZlcGmOqr1BafgJvlNgD1c2xmC/GJWVLM6ocrkdrRkudTpg+eCiy+jmDMa2oExu4eRKHFRCaQAw1NXiXWHmxGLtLoXWSKX7Vxtx19xTwY+ePGwNSSFDIDa9B9CmuR8J7gbELM8oqvpp3MmwhljyqZY6J0OzsjMg5cDkN8rrc1LXrAnuxBkdfYbrYaKs13YhcMWzURF8V/nlcQ61AAMSasuEJ4ezaicZcNKnoWaB3QOj+VRo6EE8IXDCGtVBmIEfkNQSvK8bdpynuYPRxa4BSkecDWM/hA+IECUu4XHGNeEsESFgHzBCOmXqODBTey8XnXxiczZoKyqF5WTEKYkUpB4ahJ7lGD1D0M4bQyZ5rROCRJqGLttWK414AzEIMs8M54eqnqXMcXfsOhSQsB9eiogXbWQUk7n6lWAXLYwhDs4uOneSsfB3Nyc2aI/qGDS9z9oIeDyFVFUtF0WhF6RGoiCNvcSbbjDWLwkBmC5Wqw6XANZv4xpLfD+PSwvimUi3j/e8Eve8y1qaL4iEDgQRSr37abX6ycqFNnZdT3VViuZn3CeNdk1TuDpPnmDEQQ0Z4GwmQT2tnTNBMrGIouJNOX2gEIa4hevbN/eNVXG48KcBo+AJYxsArK9mOFxDsReTAPZI3VW6EcWRdMaqeMRUi83nM8U+i2At8UpAt/3RFUoMou2KOShzs5PYKGch/L9cmOIcBtHsMQHafOyhnnwmv9bvmdniLxPLJV6km9ArENAVKD4wLJsfz1j2ETFEI+zeA/SssLw/cEDNdPhJnSgVryW/dkSUGLkZc0ZyeDCWvV7D2gS0Iao/NfM1ca74PuXUiq8LPLH4qHj0KWHWkkECDwo4JMaj64pRLSD2g75asr2xAPxpgalcTGBUiEhXlgAVdlrJxLR0zJZtz+LoHaOdCtKDVwIibv7LZ2gcUB563DFeWmf13Up3HRm59r8jj3OPnPLCYTlE0E3FVCWB6K+5m3ReyNQlDpBKcdVc0SpjEJX8SRAngbmObC+MdeonS2xJm31I37Rl5SJz75JJFj8qPCmJO+z8XvJIP8MOoY9jQoHfpo1MmGSQBvWc7Ax0y9EN38HmZ2Ls8J7DuLfcgMacVJIRMcgGfV35yPqnDE8iyxzoabCQhaqmmIF7+pIM60ryQp+dc0ShVfF6pJpbqJPiB4bwBi2QF/BHs3G6Codbfk2OTuLRGOq6CyF8mFl/kU1C8iQEg6CC6H5Y6rYTfO1IEMboGexOjrInUncnzjFFxC5OJd4yCZuHwEbMHICSB7XOXu/OkyIHh7t2IrsxoUgC7FU6/iXE89043NCFd9DrAK4v/abTKwVcipOJnN+gCDxPWuV0RhNP9Af/0K6ZwABvuDxAvWGYbb9a6AtGsDNP+wqxMmXOqzqSow4ZwscHQAj42/oA1O4AGC6wRkG9KITE4AR97uSZYeJkgqQ+0l3QHIgWyEz+R1XoTtFS6tvlR0gZEDtKecobl9+uKhS6tJqR4zk2qz3VOKeC8ZL5g4hOmh05/Yg/ox9i/POvGUuqSPvfvUsxcVCWH7PbMSfmiqSiaC7z3Jyh6eu9LokS/8vsOKBpgBllUFCKDmCC2Qyd+0vOgC9+n8cWNRxY+hUQ09faZBpp4GQuBjvJxj2RV0Sg5lBdfFgo34oJ61SqI2TKyIpAOMhxMC9mqap8RgLsS1wkRp9CZNBd/n/lPypKTSHNLsfCwFmLy4c3FYEzqBWADvkFMuTx4jOieQFIfy1NcV3MJcfAh5hYRn8Cn0cP1LIglOMeNNTyMLq2gtAw3046rDQEMzG71cvKVpYOtSjl0R8gN3UJrPokZbFJQIfb43yrfX8SXyTW63J5cSKbl5yuXcXx3YKglm/EUxufvCUKx9o7XRsM5rQ0oLg4pLZYze6nAZ8eFJMtLxe21SDkNI7FNOuiGEdr/F+Et1SFwz6ZNy/FPTL8BgNyf5XPPYzqgieYWAU5TCy8rFBVglDLHzuMokfZLOBpTy/m8ccCXtaBvX5FbK4x+o5YcFB0MkQ/4Y+BexPS7k/v6MewO6TmEl581tK5jlC3jYavFJNEtlzawt5nydHbE2G6UwuF9zIF+0R2PxPkXo4NALzg0HUBFo/TgT0yExTS7Yfrysj/0eeqqjrdTIKT7sFXPZT5wBnPSsWMSFjgE/JVy6l0x0KYpTJC+9sLc3Tca0Zb8APSq+jEe4RnCTKV0W10LvWQCXgEjTZzrArLzN4trWmDYUkdQ2UqqG28MzEnRHRqBeJTQycW82/0vprCTdlbJL8c+6WVGTaHnnDs8gVwS/n+FqlnRcpaJjS6l+em7gWPtchZwokmF/ZvL/7HcIpstHQZEhBEimsO6wAnYloREs/arSCKvz9sLCryhQupHgGM5E9slSrlMz7ibhtoHE+QFSFKqXip//mHmZ/EOFEdyr9tA5Y0AneZniHRqjaRgpYOXRhHAKyHE+xfRMiNYGHsiam4T8gOjUtm6gJtx7Mca3gHXJTVPsj3eXsXebbwDbcgShhPGmj9sk3e+ERD8HpyWhCl3sOtUn5oJuq9x3tPJSL+nk6VEpM8jiKZIAgnFFoGfqmNBD2AuY5EQ3UDGLjC/97NFZPlrI8qfuNGALQgxl4LtBLtpJOT9bporPqn7ANC64gy6FTuY7EIbcPZV0yW3MIuWxxoSjqYbzOT+5zdEW8/h9mmtuzFVWpj+QkMXcgHqBICtZYkDGRzX+E885vWSFRXNOKdwkxN9iS7umTiAtzkhlVd6ls8XzJR2P+9UQ/nQlo6Jr6Fzrl78YjMNAEcd15DYf+nc3jU7jIyrSdIBqTU30JKB2WMnju8AXKBNF3SQgOrCC5pPBNEqMnCZtl9KQDCgCiCtoLtdkzKkJlDmTY/BkC4R1DKCviYCnUyxmlQETe4VsBK9ZQ3UzRg/eQntcrAgJ5VZ/ovMVLIWs+1zRWZMl3uTFRzga4bFX7lMS595ikJ1fqoY2A6LlYbC+TrLToV7I78Xg6Cspty3nn6dDf2D1z7K3odpv2nUT+9PbscSXSuczIECUqMekC46keYnJEyBDknhHiVsPou46KI0TdxXwc5Q73IKDJFz8ouvXzXX+JwXL4SmHs3MQEl5UzzE6yIQMbdx5cZZd6AVL8UydvNbdhEozVA75SIuAXJEVkzR4E6RaZApJt82RNZoF76xSikF0qGJ24BeWXq5f+tAbs+nO6IUcqMsb/xl6gL3ARUKlci4HGDa1yK+g1Gc+Beixt8MQU0EwmZR5dK9dmx582cpParFpOzjgptiS6TgqMAxOIiEr2uIyNNLvlN2x/92nBHZ123NJXFOhuiwXKAu44DNTU5oZ9Hmo+NjXo/m8t6fUBVNkIiML3HaKr9pMVahvd9/RzqFdWXdJ3veEf8S1MHnvNrBwoo3aIEMDVisI86TAjARMpP1rUpA7CR4/z4FQfOQWeJmQJeFxrpWCne9DBNnbgc26nY+VmJkzdw4GBnTjW26w0TNOGQ42uMkOJc5P+sWiT92OxmtKvIyh7buEQW8Q60FYAS3BTzqOJDCEJtCfXGwTJWonhSK3UFl+ONgggBMuYlcXCIhJ7DwBA/FxT5slTtGf1WPxP0F9CtxphEcZvK4G9gHGHIWDoRLCcYeJM+8c3pIp0zUHTVN7U3MXbgbRV0ovWPb6Rd7QAf8hS4T7DZFDrn9L14KklzN+912adU7rbkR4UklMpiMZK63DvbzQQsVjY+v/lPWR9K8M+EmiT3ZxPpFZ7xtYWMV3Abhm1QcQPbcr45Jk2tIqf/SYaFNG2221PSRgzVgop0hgzA4PzxmkjUJLgu0LGNTdCzheEIAlS761QgqiHAP/mjgCqJvRo7XxKmS75lVrJwo22yoFEBHtlxprN7c1sKY9hKMATeAvbz2TzGgX5w/JYcd5hFJs2OzFwZMFp0VssxgYDmuzwl9VMJyisPIwh0PmQO8Ty6A7ziiwdyLJ6hIgLJrjikDhXsMwegpByG/Gz3P6DOr5pHbQoFddUJhiL8+B+qKm2pnx00xKfZS6aWoZf5JAKJU5eCFBpuz7b4nYP7Br9IgBLg9VOBl8Vh++Qycjj9PNo1BRmrmpy5KpnS7/nM8ZEyKYZWCZhFB4ck5f4s3mWiIgWljb8f2IFjXGFO8QzRGYtUkcWFTTmt6ZNWxqJnmJxeKhhSlP6FDjYCKP6sKkkHYcqKa2qBlaFZnuP+PoEzT6zB3CMh7MMcsGpekpws6VmeyKmF0Xcxric9cUIb+wFG1hK+UJ6ro6jNqjdEVz+P28BXxHA21WwCp0mb0AUdhhgTcLbL4nCIJjoe9bp8GNtzbIEJ+pjHtllDGc7YOKuqyoT9S7OrTYbQHlhCOkiQirWuEe47pQN0QZKZnAUc8m+BA5UwhyY20hp1rcg1vSAaNKwLiMhtsheYwjX3rJAOqldHqMZ42sUzbrZd+ZsETOV+C45ACkpiB7d5q4Gi7qbCAEtlr/BrGuj/vClm/eTChEAiojEngbwkQ6WaytyYn2yNqLSc4lDPg7JlBrySsUVm3NTN+5N4/karLuXXwsFIlpNj3xvpOaQDtd1nJW9gKj5e1EAf9T2LZyEUPqrPHlgz98Wtc9nGQeSEFrdlyEdE4O0hGhwixyzOX85Ph0jjjmd84IqYYts4yT+nbwU4l1y288eJ9uS+oonAywZ6ilvHIkyR/X/SPmrCn1Gpfgr8t/7KCCf3K9FCI27KNwNidbr/mNVx3mYTDvGkpbxvoPXE+BYTi3761V4hGaYz7BZhPsVY9NftRdckhNq8i7BSM/DAbXKd5I60qLa/fnGmqnuM28A1iMCpXNB2pJ03PkHfXDH2z3IKEupKpRD0w51Js8cRAbJUKg3uRgiEw5i/k1HodfuGMR0QvUTZ4oO8/7RKaq7sA1MtyJf1ZP7WTYN3g5nUJIF8buDJt2zBsxyJ1CV4Gkb1UQdA2jMVsXGIgPx2o7KwRtLonbpJRc4ooFE/uK01L8Xg0P253IRldGjrrzqooaMJbEtOhhzxd7VE7gK0aIqelOkmMCjs/mAt/B5op7uU+dDbGhcqIm4BOfoEV02XbtYW/jTLDuXdlp/npwTHWGZUjD3FJDednm6JpverovKZayZsPDLGChlO1XUowrMzMXLFG0mQwELO5DzXZpGzxwGnH37w3I8IOG+vDzA/IwjhuaUI2WQ6L4Sof4l05ubamljDUiYs5aQqrvcSWDGdl7FzVdiF31Kql39mlc1ZtKvJnnmmWu95WgKh19rBS5sSSdsgtDOMxcSCMkZNFCm67d3NZXEvyl1xN/6KY12tjrn9vcGjwIuWIyl/QTFvvPtfUzp/lfQx8xyv+++fbHLP8OQpBFnZNII9wOem8XgyjMC1aR3lMdauyO23s5DNGDYhtSicfPYpEJX2FiDvVr/RfG584R+unsFyPaDbvLwwy8VmH8tsQJo+p5imdTQUh3uYkrHZMhjZRq+VdfJyVWecUFHYYivkXlafUQJ4Wnn6d7RdFx/cuDzSU1vmGKLVQoj4E0tQG7F53ruUWVwom+VD/Spa88zVXvfIrKkvqCDke0hWQ31CYLh2OtWio+uT/iLDLSUUmxBbhTmbGJvUUC9wrxZHE6wCV3yPVGD3l5zJ6/Hf3VUQEhA4Caoe2Lx+1i3K8gZ0LQLK6Ys9eT8QhFJFoXmLOG23+l/fg0/RYwwKdHRF4onxrha2iwwH75cG+kCcHTRSy+Ab2SsmmYFk1ZSQpKlhFJV2L+8OaBA4uAY/U8l0CgFLGj/bBEdYUkUSsSAGnxhCExKAphobzEi9Yf5FXOKdbJfhyV0gCfxMyBNmUwCUk45jo+oMFuTcLnHgitaCYrQSglaf9nbLLdSa28QWg81W/Xj1FK5Vzh6zavqEMsZvUvEzJGEUH1M3qVQjtAA+tolD7y7qCgEHU42EXwfcYbF2XJqU08qTj6JR+KYZPRUIfugSUS7O5kDKqAVIU+nFHVZQadbO4dGTI1qdJXKzO2IL8XuuHeArdke8WcxViXTggi+wpjytQsZZSdbymaNrCDjOPJEjpYfRT4e6SI+lfXNl/4G1oIgyd203JMcvp+tSAS3yqb8hxDk8x9MwdQjHaivan3QCvrMVPwTS8N0Tzx2IY4GcCXBUQDG7FGSsFbepXcLPYuQrOTsRcCZWwa65qjvqj6aSn6XZXqP7JKnKIQhSbuI/OnbJyPsxKiRG+MLSJGaK3A2I4n5aELsoRNEmmlJB8b67uPE+1FlRLN9TUMP0dsFeSBTcuhNNzB9ZYH2TBTHpSeA5lJG272DIFWEp8XEUJHrmBYoqFhCtkTi1CasKMtInpjuWpA/RIzGsBlCylMXZ5XHdx78tSwZL8qe3vHVGreiTJ4XS5Afnj1bKLsOKlh2GDcoPWqhLE+0e2y1pecIKetbrpBw1e5sFEZQ3BzhCpWGbGghvn6VMx8hFh1guhGEWhp74efY38yae1Lfn60YBQ1D2jXo1O7VJ+8j7J0XQslBgV5SY1VDDN3Vbncsekp3CzA0ks++Ltjdb+qUBSt2xrhlloVcwiN16GCDc85b7ePBPpcimZusQfwfJE8F+sWbArzb+FinG0gbt1Z88H6/zXLM6oXn3JHCEe5VXCNbOhI3e7/mB3CMCfckBdgSXaWRJEXtbgt5dHOhZOYkUnZZZOkSaIahNenUDlWrcQkto0Bq8pAck4f6nEPcoeAvTY8y4GHtKYIdxpBT1rYDVS++WpLKZ8DVE6M4IBIic/s1sWY2CZnIfO6/qFABZ60Da9otnjnw4sW18e3fojpwCn2kvoqFtnRUqzEHWwQyw2CYJ3K4eyvAPY3T/wAQGF0CYkgvgZ4I1kb1adntHQFilOrgf6xa75ZhpER33oTEU+xcLGoqw4GhPo3dmui1SDAYj67sjA57aM2190rdr+1+ftCCGL7nkr/V09+sf+oTOUb4d4PkxGhvGAlZdaZs3S2ZJe6PvZ+SYWoAa1TebSDJNgoedvPhkfyCDIiqWWimwFZBJZQCWfB6cVS4Ub3PZhlmId+mAom/kkmrwPf0gv8SPitjARwzhC00qPhwIHO6MaCng67klpWscj1KOwYyKzJdsiz8YEghMw5RJbe9a96xSKHyKA6zPeS+g7gKVZ73ETzvQLfznyZwxe9g7x1quVRrYD3S/nBxLtEP37e6Py6IPziBIYPbLNGnmkRoNDeNdygz9GtlmHV8GXZdySYAvqQh1ZAgyZnjVQO+04ZwwKUCvAV8MgdklbDgqpGSXRMcF/JZKeUvKLaKLbiHysVdDH2G11WOdSAAWNR68i33A+Etr4jTx4XEakT/FXtC/l3582R5APM+JTcAtYw9nnT0AHJK8Hs9dkDPLXZncDKZBHkxvknTqe4cxdPjJ4YQQF0wMvpU6WcQnUrWxx/eocjlkXWAa4HwZ3vYOi3m9uJs2yLi/K2LYiAxBqFo4zI4xDEWagIUe90MMiLyQ2MGuSYUJJyrKyhfbQ+SuxSGOYR3tzm2q3SYeJCvVmqL0G9KDg6YyLlDFN/CgxPP6ilTV6/wAMUHt1OBqYgxR3kDzrMDuIjJUEPKuZNRMLz8ZVsQoK9FOvg6KEpjs8VK4DLRPz1cr6Wg2Q/vLO+8+qTwq3lFOC5TRiLqWd4B3WgfRsSlcDpOzudqYkqq6WeHHdnPhRcxEuMjNs740RnUfmfD6Za+OOZBXcshUsjHNdSxrQes1i0uPyCX7oQaplseU3DzB/52tqOAz/s0ZOdLK4gk+XZXX/QQTiiQ3DAozNy/MSVSLTyH0C0LhMl3o+cluihOyDW6I3sBwbpDDnUlkQXEyOLBQDAo4vC7xRjoALJE07I47FMkI7np5qZrmisR5R86g63ei8paCd40wRl4hFP/y1DrzMOm2oiBa0hkuCxVImXXOlDht+neUF+m24Ot+uKaG8PXnBj/DwmVvMo/BwHcWrOpVUU18TnQc9o8yfEkDkQ041Me3+JYekXwkhnLZb+FcJBj4AIuyJuybCwZm463DMmoEge9aZM/rgdIBV1cV732RVDApZ3e3hCEOhs5ZB524QgvjaKAZNK57DMprigWJ4a1s6zq66RD4XJelX05/4iI6CckQVcyKdfivDSbF7nVFW+1wRkMIghBcrejKkmbh8p//yTfmruUegkGvKNvVcPltNRFKObY2zV6nn2oTSFQyn8TKH7JT9Q8z/VcQT+T6kvT5fQJyPZmdwvECA0MND/WPFI+h3NU7cO1cfnps+sLWBvjEONxPlP3FUpJO+jZTKoVeZycxDhjAoZt4IoIc8I1Bzivv8f0DtWE6xhOuDkoY6smrcY/56LDBw+GMuMMeZfS3N7vGL0TMsyf9jN7bBd/MmwJsBmGFaIBbkki9dgcDk0YEKQKqf9KtkPvEVuuclBp/O1Q3KUC4cMXXsjbspp1mN0CBi6Ybu26rJWjBMEN8M8a6d8JWdineToobjQdO2SQhk3NJN42xGSoQtDbAmN3A4KC9sptWVA5loVxSCltjIMC+hTpjbpkSmBzpPz1POALG/b9sf5aqhPgvir1hGF89SLwBZHGTRygtXnyTzH8kDzktl1jGvglnE5VC+ZAHqb5aLPy0/kmTThH2atEDPqICMRB1u4UXAvwvRLz29JRa0K0Ra8Un4q+b/dTLKl5S+WyUnUM3FEe6aiFJ7tSAVU/xEPK6QkxxTP4P75dBX973un1ci/XlTb41fJdbqpqi8qZXAHfPj3djSQB7XgcXgDESYa2CeBRii/ZNB/xGin8X9rkiuO4bzgB6cVFUEsIG/zsV6ZNPmnQt4cWVRJAaE/gjq/jVlf0fh9g3p2OzvJ9uqON9ehGah9AfA5KNxX3DKOk72E1PJtjKqQByAS6gyHH4vcz5LYZCyLrycZa0kQHYwoiNvCyhzNex4VAfHLJJZ6CIGHvJYUv/fE2sboGNnn+Yf08VGKTEOZdtJ4g3pUSK/9SAwyM6uIRZIFnW5GiI36iQ4cu1yChg3gASOGlF3AF9tP2EbZUTzoCklXtrYQslnkAs26iGIH8s5Pvx+xoMCBi2230ph7EEAf8E10r37EjVDA0eU5gViOzKoXbX4boKEZ/BNXcUR9QPVeN8D6kuudCWqKqxc+OoZDQTStTY4jNXJvo2CXFb0DdqDemZr7Q+pSlJt5mb4t7tgQ04MML2DoYtK0isrjIu5mqcyvdkYruTZUMlTBpEy0eVATYtRH5nvRnsAhvQgx28R+AmTswetWs7xll66/Yt35PfKc5m8wzAp94Aj/2d6zyyG72RMJ4vTj27T6oc1+QL4gh6C0A3uxXe5ITSvt7aUb2D2KhXXjBvNZRJcmkREgdW6JauOsF7Czve14hdMOYI8+jSgerzYhP7gLTDpavxRUQiCryFnC2d+5QBxpVhtYM0jbgcVuSjNFaCVw2pzVwOY6LADEeWw6aVjET0dmyfytDUPZZBddJ7B7gXFD/5S6YN0cnyVKKlzzsMO3TwgNnptCccu47Hgv7uJ4DGcAwRc/n98JMEUaYqcEuhWhcICCLWWTp6+ZQLGJA2C8m+M46R4lsXsemS1t9ilUasJYcXq1rp+llbA5uIWqjbdtsKzLjJ39R+gwO+JAWI3PCtEDykGCbZQGcBuBYwRYqadTvGsFcB4JyziGiwFfvov6RTEr1gPRIAAugPckXZ3a8I8Fa0tGdc/P0f5OvM6X8XfHX4boPnZHQFGCkLKz3QcB+YhHk0tCyFCJUlTiiKdLdNnVy+aUVr58BBHG3CnzGmDrfSorSqNNP1PuRd0JYpIgz/C+8gJPKDuZicNmfKtdTr4W0uRwVu/CO9r7hQ6G6A8UfDwsBfUtK4MK7ylMoHd/cv62nzEETQ9clY9pO9zk91292/YNULC9XXGiTJBV6tugXfeqqT3GwJGZ82uU8Nws5xjgAnJvmZQ+jW7MA0kQmOELf62bVgebBPZlyOAlHqxMekUqw0oZh8nQcANfSAcfFgWB4ZSMu4kgx2vpOixKxYBkEG/7rk1+AXdDOVlGn+b9vkb/03Qnhi5o8fz9ngS25nADsi6Poomrc1gXIaClOMAYrSFMpxyg9UZDwJ6NLVYcdp9tZwmni9DXcbUbow2yI+Xxg4lECWxe3AamaiebsxOt+T/te46sL/o3DCdZgzt8F78DQegTR0X/3lR0qJO0oFdxFfwmIDbbWaTcCns9BrA9VtxasQS3VRzL4RpugIKcIICg5GjyGMlNp5awkQYdK62eeCsUbN0c7abGv3ruy0QJ+liKnikR8xZuf2MJfiQoBWrf2O27YE997V2M1PJ8JCGPh11rNtiMYUZLGJ4Ub4MvL8dGgqSeWORc/8CKAzvjk6fdpyb4s8OoFWeKLPkZIiU4kIQxW6BH7hepjtAZj0aAqYCT7RiQrQqHAjyUunMaWi4Q3SfsD8ouKsUWjS/pp+UTm2dLR1h1AQcFfH3h6UPLslzbWSQLUj1/2M918qwseg9+Ahp79iLf5GANwTwQbmGKmWkP5LioWksjOX/9caYEbdYxIkUWVwUEDkqZQMoiYoHOjfwmwxzQTi3o8bpf3mEbf8Td3IcUApQCbW7U1hYskfptC34/yh7TItj/LGcbNk/ZlUw2lye+pTfAGN1r+S74QGco4Lv050ANuApdjhRtYxEz+AZRTKZ1atcLsKVdXPQo4HuZ8mcZJCzZJeYBD6GKL32MfckKomK6JqHKH5YBKGziETLwqVSCtG1ytnKMw2voMcAFNQhEQeFFTCbrvYrEmmZSi1YcUaGHBB3fhHqItvVBd06OPURTjrHsZcXkyawT0hfMM9Y3o4PaJKv4Lh8jLCykTrCx3ryg5GeIeBxsdbpAVXGRITR5BtX0/dqsiH98qKYAgfCHbB4GwP5uJQKALOhTRaVJ4HgYdD+gNv1n5YO9ovEhv212SszPPGJb/1B/j/0mrxy6n9/GKMPXWNj58EeHTatl5/BTKe/iHszAe9DEdyI4PcwmmSSYMfw/rywgosOiVlpIJa0zn8L6jakteqLOtvKdF3qChH9X30FFdSFPCiKYsq0EjGafAsI6x4w646vr3rs5kRSuHUI5+RoGVao8CuySTdm5wpjrUr8tyzC/Ezh7wq11NF0z2QRFVD4C4efiir8QC6lTnRnQbUPj9pfAj/U35Mq/3K6yAx0xLMT3nu0VJLpPRSwUiNLOydjrQEbx483sKoVO2WYSfy85lwzKc4cDiiAkJFSowM0kh8vqEC/sxscaUq2n8Anr31aN3685dM12vewATb4wFr0+XMHhe/xbingMI7TomkQxzwzmeqWDacDHB9Tq3YRZTbCYvWxZaG6WVaYwWYZ7+OzglZiDsqRv2IrIJEpl74yFIHS9CFsj4rBQeCZ6OOCDsyjPtHmy0UeoDxCIn9ksEBiPZGqS6CYdmHTBsOBXnYrczrcoBrtv1n9f86j7dF5zup60RspSZQrJ6J3LNo/3XDn40JSl9s3R6h88gcDpSolc2pqSruDNVBw0IqWx0LHyeyvRJJ2RBiJt1aGNySiR8bX1oQNYTsSGySE7Hp+Dim0f3loSX1RnXNTQcfLs4jjrVgDa1hoUviCrADfYs8xzlgKjsQlnT9alV3zFueles6UQTBj5MDD1zjU8tAI6tWYPBWu55bQJIJ9LGJsgsPmO+wfZ4NbX0Ftqad7b4l3msUES/Z8lXhk5AHEjAs2R5lM+tD3QTGizlmv6YZ6aYL++1UCKiukpBcQD0rJwi8M0oobSV3Lv5x4UUOAVtV+D5FeiyHXS29dReIgvlN5tWgNIF/6ONfiYm6+dXpg/G3DKSShZa/rF9qrM3q75btQW7X0wI8eU4Qod6whiOKk4gx6n9avaV2wULM78DgNjObTPtYCrKMUqeuvAtFV40AqDcQd01k49XXotIFpUKMfCKCxTLjUxk+j1iNI2PaP30tilqRSB7rZjrqQgHVOLHQlZCTbJtGZO9okYTCi6S5oidhEnRSNAuifj/RDXCDzSC/6HQhGNY1Dh9i0bCZuHjrI24x4nqMF7ZAVz00lz8GAQ4MinTDy9h05/lvsuU/5GiH+BeYYgjDWpFBUeXijlXY2Kp8ik6K8hcoBPgDorMDcsefCFjwVDbEC0VYUQitUZf07BQS9QmWZF2u+F2/lphcX8dOpI2pvCiEmfDOTfxQJx7UwsRaTjk02VIel0jJEcQX4YZSh36DMI4qon7omWXGA850TF+SPhjK8RbJdOOUtRxwpTn+yqt1na2RAHdrbrGHIzMxXEQ9H5vTKL1dq4U75ETPnwjEs+RADBk+DP59Uw+lT3DNEJsikXWLL/lSrCROEmtsxoE5v7v3GPw/gAwoAkIYeye7DDuaNOQsqzq1V6vBOGa69jvxywSjS04WNVm+EgcxvzO2KyXG6Ue/DFHBmZSOWuYzwUBZX5j1BPL7hPCdu0lLwQbSFqdA6RPUVs7ngkxtB4/NgF0FWkfZ8CCeaTPY3Fggg1YAG7opFPskT6ae8oD0sJAxRTnsqocSprD1QVrA8z7VCJrK+P96TdDBFSW9IEMSo5Z9A00dfVEj6cgBlG3+GxXVQXLbkXXoMASQiYqztIIqr3pw6pzu3SrgCyg6phdCJKE1q+PnQKy72IzIFD937D1nNhRiN7WZnm9rQf0AFQJ1hBpGEnJbipnrSSwms16DuAFaSOSYVoAhEZDNMBGwawrkE5L1VIAZMXjNVoq3Ru17VhzXIP8NafTjwLWHhwZsNo97oDIpA2JX8zBPX5hk7iOU7Ip5SufFxuZO3SUxga3ApFWBkmBgIKPIjY0xGQMuaWVI1A18v2NRJbtciiDuwWRFyO8Zh+HBcAEZXIC6TKw9LU6T3+LsvPuKqkU9sDonoHBRLCssy+J8ISOSsNcZ2sFkqT1zZheqBlay+G/o4PqUSjyhFOFOcMFbmveYc9N4syXk+gRa1Ygil8EIVeUdNvS7ksMGMlHu6z/dyD/uw7+9BV0nyhYGwo1F4miZcolqbECYgfWRx7X8Zlsw4ejdr3CCdy6NvZa01a+o08TNgw5hu4URf1Xi6tGEqhrhzLJmVbPWp3bUuOdtuBTL7KtHbw7d4t15DbzTIUyOMcsoPy+FP5lvOLBKKZ0QefS7NQYbVqyDYHbYB4XIs4NeamYtzi6eAnvnfg9xIbWTlRPYSrzRGFkd+FSYVa1B8b0v95jH/hhO5TNAkGd8/PxplgUt/iILL4dSYnARSOo3fjZ08lTLUs0F/8Th/VZvUXUDLK80tFXCPdZpPBqPjrvXgcvJMzTzzAyKxTUVML3XO7N+plyVjzGssE4BFS6uaOd1688+ySWQdAgpgCwRa3pAwK/qAnwVhMPa6gjXCix9QOvmtVPPiTnJj+0hkg/2UAw8+czj7dq2FQcc1ypoEVGz7bOk9RCHJXAABbcfLpzRAWzvvWUUr2gsAvoup7sambeLT1Cci0mJtkUGziiU1/v6PPtUA0MqAWjq9GnwOSoC6Jomkb56xbWGwL+OzMhF8UiUHaPzwuQBHiSmePZu2PQLfFZPmekoO4Hbw6RZxMZPuw7GaqG23/aotmN5EKGSMryBcAIdMKCGwWLde0R0zkfgBXxdZPwDzczBlw2gUDhgbKLkRKEuGkHGScQRm1YiczT+57uQfa+iKZSnPIKXDU5gD1Vpv/IIG5aytKGFCEWwdbNymneyMJoVk1BsoZ5IajfOLBFcXNkUwoKAu9DMz4MIxQ7eip96QLjU2RiDwprKNdP7QY9hEAir+eTz729ipRPPSdPJgtgdd027wkeGAymcG55sdQBV1VkDocjckTI5kLh71c7fY0CxSh2HOAw6qviKOEDAzKGhWkqSVnussw7ZOa+sPsz0JY4rQ3Tjm1CFS3WofpNxvKODeQmGV10FwkFutnzNAhCJmJllnkyGQECfelZVoiiNmCzECQVCSpRT9Du0TnZLht4PWhskNHtUKrkTxxgM2MacLShpcFWVqJmZNNNEajbLtGV2hA421p8FioSlm+4MoCLAgcCQ6N0+xE+UB6ilhrvWGFwCVD861FJka5CAA24/UhIqzeXDrIx9JES391je94+qxySDNdX3kgNkkm4m1iYdg9OJvKEHvn6GlUxNF+VMzA07xJF6MBxveClB0ZH8laODQeRlcsGnPYE0KYa/1PgJhzRIeWD4qIngSWx+QpYT0zePr/NZ9WpdS5nCoDepAqieu7idTegWAZXAOe4dB2hjETNzEzUGuleKIWmiZ1YJR+ImaTcU5rwUmelVH5mgd5LM+DK1fi0kWhOcE+fMRc2j0E9KVXB++XcfP03f7hvKx5TnB8FKOR/9H2SUluYzBqidBp40hsMjO6ESz/rmNmBHnutTorwMiJbGQAB5sRVtorojMgAhkRuC0bhTDL9DRAObLLWxiiCJRgpCx+nPBPxM9StZdG7hKxT7sDzljZGsX2Q+OICfLUEuk8em5QgB7ychplBObcAvIInP1BJLJL+dDbJ2csTdEwHeycoUgfZMR63kidNQJ0Y4Z7j+/hhZolM72cQbQm4XusskElPQCQ6s45gI5Pre/0A5pTJvq1PtvQBIg3lui/MzU1/6eMRoBxb/YXKbtOvqzD5P6euPTDs3iC52PWQWijHbbD1PhpMsGVD40+x3wWH6i56XoctRP//dH+UitE5YZQLjEWsEUaikAIhphm7DaoxlVR7sZ8X6eb5cCSBEE08IFiu0OvTgCa1zzmUYSvy8B2ScdTd/Zu3hpVxBB9yIJ7SVa6m7ktmRHP2IPmniXKFxaD64MwfF9zB/nuJdK0lNJvE/8+lm+7z7jTMz4XcLeMgPiLe/GUYbT0XTkfUwMCvtW/rtLLjDVb1dQdEcaI+nWMAphq1ZVYgpv2Q1FcBIqs+RNhW5mxI4U/wXFTCJB1VyvPT85l5qta8UVA7TcYpQ4Yar5Ofhy+bWtSMYxr3Y3xtIrOJ9Z4SzkqHJIhTDFJFza2FDiwEGKpA4GI1stHQUpait/iviv5egmDzLgW35vJHABq4HAEQmqEdrgXGrNQDzK94Lw4hISP18qzZY0sYK7vitm72wwhtFBuLL8A2S8Z6FqrwGLDbkJiWqgFfCQjbrseRyFdbFGJke1mS1xW6IyFVxvdzsRhmCMpQSvD1lx8jz+z2Z+4zS9P56yaBaRUjrfhiNaRONtybE4b5ErkjKysy+hFAbQ3FOt8Z1uwbudWF2oChRM5C4phCJmgA/ThkyQ4ZzTRvCJ7j3xaLriu+W7gpOpX+P8sDwTpVrc5g3QAWrUTCQS8XMAj12VDCdiB4frdgtSeU2Rj2oJwha+NeKemoA3EdQobFliyGfFLXl426Vsv/sjPBGFtZvFbACgcGsIGbhaXh2VwPTDEG0gevsUDRiJ5H18cwXz27cuinRYoOcFG9sDVDv+kzTA3hizyIKWq3L2YBW6EO+kCtTd/xIqKh3+ZKz//dCC5W0cRpJjqFYEFWLMsdk4cZMSDVljPE6IVrAN/eLh+HT1A+JNQKGow3i3Wo2YdAv26IEGgK6y8lkFWLKAx8LuTPl+8DsbRryp4mghB9vO46Iw62urH40vZHpIB/brFOAbjIXLb77D8/Hgfdpp2KWHQbrAcOfEswcpfMCmL7Q5+xMmXpDE5LrzTW++TmKH2okeEsrQQTKzpCOTu2lD3fP5ZkXjs0LMaWNnnzZIqHYJdGvURBVwMtzcfbs2EwVSXWkDagtyU+I0Dh/yn/kFlPHsJvNCh/bJ2boXdfZy4v27YDR+z5jfcLx848xsTZxqKc83IS68ebWa+mfGJc6CqwGIArUa2kMdMyY9vdhD7YlUbk88bOTDmyVNN2uerC+pXCqb3vIUKWG8c77bOXNk4U4VlxVV/ljSk1UQxtuik+DL4xfgHHEdeZOje4K9SDo6RmLt/3+JDzvXqf4TPRzcmR5hWdr/qB95j401pnf69v/ms+YB7337gmTWDRImVFSY8Qo79o4x7y55Q5ujym+ZIa+LLPUJywR985aI4ayHuofDqJ1l9MEcAyxEaADGQz553nlCiK3xJgqy9DHDsaLIFUlfKOB6Ha5IoIM8lK8ubmsI2zYiQsSnLl5CQ17qsVTCktFzzYycCy5uzmVJC/AlPk+KyQ34rrMQNiZZEPixivDdIdMi235HT6O2Bxp/XPrOoNJ+LDeofN/mRLAxTwnUXRoHI7/mu7sFwrZ4ys9fMGwu2ynx4nSrpV2ycL8++JHK3gdLzmD9/p0bb4wXfmu+NgkmxjdKTRbzQ0B/sGURmkZs6Bjc30fEBYS5cT/puYf4B4VkBnB2Dvy/aGG7LoosGTn9AMnS7rjjwDgxLzJ1R4T6JFAqbwreSIyiUDLv8d42GoUqH+FkOeTRYx3IDGGSofTbS9Z3UPsoPVJxCbWNIhzLMavcRHn3/wwxPyv+ZrzWEQbyMRszSDj/42Ptf2shQDHfhWL5CErulsVeytt9G1CnysVHS821WpMGn6FXQ921WI+L8vmZ1wqTHCDqZjDKqtOWJlsTURS9YqmCQXpdSGhQ0sUqkuCfu9gzmS/yYDSutehQFwnvA3HN510zEF9ZSaymvtQf9g3NOSBa4SpwZqrkSlqfr+pcM7ChsQZvqAtwm+454Hl0IuPrr25M/B9EUnUoUb3TH0MBvIIbak/EZAuLLIYNlarXZfgImtwxnMX25ZhV5CvRgWqB+Az7uCvKsSgDtgVc+TboyClmGKYvx9sfmk4NGvZgPonz12znq4cjXXpU4FPwsgOpZLgcuAjypZBBlfUEqOP2oWfsjGQ8TaI1SaFNsNGzGqzgKRJHaLAaVScodaI+hvIDiE4FaamceGqfD+RQkUXdFnuEfWvsu+ccgHXJjnpTfsUU9KhVV0Y8y9fintwmim34IddwCc4/1OFK/EJBbsZ/3+lzsRylUOEn28rH4bRCje+l+vxhM8RF8aJ5tgLixiI24v1Cn40qpVG0OqNw6/ZE2dNYPEjWAt4rfnYRC+tTPNArffTXOIvg/9p/2xidl0DKYJUoEA3DQz5tV6cQeqkGvxiy9B5k2IbNH/DqoFwKjX0ThfYrKUsBWwMnZoM9/YBNeyQPvYX/GruSohCkgd6pEExvzrSeDLCa0HZxbuGcqH5d3F8ZWMqpw4d2k2fmv9/p0VAvnI6cGRf/LZip/Nf8c5WZCYUSJ8obwyxEwswwS2Ncae3NKyCsAF9kFikNZAXnHyDT7myB6fErwlC0RD312AITKYDOwO9B9jQY3f9YowksnQvLPXLCvIXyF9Q7aJC7mC8YAs1Ae9QA+laG+lyyvP1A6NJ41yM0SXA1xG3Qa/ot5GA1q+4AlmCTJTDxYQQTB2Uxl8ZFBJhgng/+1aJ2OjXqkdOXxxv0KpSzxTOI6hyzsshoP5PLPrlBoBb+IeIAwI59n9X9dgFQEcKdfmsdAcM5GTo8RsyRAQG48gYLVFeWO9qXotHuNOS0ge9aeb2JgQprRsQTNsxGcr7pR6MS5tzl0eZa01b3ATgbRJZz4c7P0hYdQmH+3yb9hAewE/wIvG0BeY/Aw2ii1BPIbfqPMoWyMYK7JWsUGXmhcGXkeUwMVBCTgw7ILxWsiFBi7ZQxJNsBoDAIeWlFXXsv+H9zAySpvmni3VMYxzprNLJjJ8DxysSzv4dvFsWmVFisSbym9rEZradAqkQt8dYfLDD0HJ92F5iAqJurLD1gzRTAkyyKqQZzQ9uD83/dupuf4ADgSbdKTVGqXhvddnE5zH79rUSRbApei+aoN8kwOpgnXTkPb4/cNQNm2Ix/fjniBFIrd0heFe4s3Z+TxHiDM3/a/TKzNpW0lB+VCnJjwBMRNwSDfrSBbJ79YAmA+t5sX7Zt2gC4PWel0f8gK0rEvrd6zCIWis7/EV9Pfwv1FlXXMbu8WY9jJzLci1gIMuHsAIPf7c/zYvKKNgr2l9D9+F7NQsRPpUcrZIq7GIgjAHNCZTRm2FFabRcBoxaq/RaUHW2gdjlJPG/dAUCYSlrbUvZXVCG4hmVZNdRGIBlbsqQENR8B6yfr/YWb1f3RMYF2vMDDuWKKTGnDUqw9U9tGtlhvH+zPlJgTSerR14UyBlLZ27bIunGMTgnE27H8/cerWqK3Kng1cgo91DMBkdK1Ac/jwRMDvHZRAe3g4CFRMiWgznVkadNYjEw8bEcDQGAD5FqbrvaLMSxFGmuSpj/SCsMpR0T6OslkRqeDrh2rKKGvpJLiZGIrMsoAYyAJK5MMV9LQExXMvur9Ai+ORLvY8Hz6ljoF0NGo5bZ4+emIfCzaQ63C4QGZYBIl5yREXGrBK+ADfd5WQp1Am9csk6ULTgPiU6sR+sIne5Qrfj+tfaSpVL8JaKiABpf4b5/KNsXrNgJc0Jd1E4q83ZuZct6w3bAS1GUJkIUvMiIottii9Ang7MTFJXZRZlmAswG5IflBEu2hPLKsvbk+guwZOyf/0u7jfxovLzQO7qMv/oWNlQ6BVmeAtPEnw1zqDnYwfcjFmeEMbifZizfpMypixdLRY9kIRqoxYFZyFngwoNFjnkL8EWHm3RQfuaMvKxUsHbE1DVys44RsClQMU4pD/6CKzHHjEEUmUERM+1RPxwXEBT5cSjDfqdGoMbJjV5vNQoUeVhw/a0mltkgkP0VXZGbrqrPFX5snwyjIA5o2wxhdrTx2wpwSMsutyTO5SvjtraQ5DMHxvOjwmwmO8HkW91/RMZgQKdijrbyGTR0rS5uhVgoz+5mt30hqp21ogzdKMwIhp14KjJOsUMGin9519NOLRu3xQmQqv0q4tWUHeIjCMOr8lMJwsP0HnI6EDa11V+TEMM4m7aKaI70QTfANyspFjB2ZhwfpXJ0zz414Xl/Q2oqeNeQ5+kCiHGsJBbUm9O0gDMRhgvZRDHmFGyKdIxEYpEWQdCh7IqFKsij2oZ2PJUBBDrKVIxMLGg3YZORBKcrDMk0nAAcHF/llcOIQ896PkANdVNcIiClj7SzwGWQlQWiahsWfvrMkYtTWm2tLIEWWbV85iDZCs+YFL1G2WUXswxvorrRZ2ih3XZYoNR1UgAkN3Ti/R/5I17TPVdMrzcgfZjQSQsjPXRu/7egZaX1uPRNpG0efUkKo/1GLJ78wVwYhm+Glr8BNcVA/puhrlzO3uDopu2RHMJZr5K7f53ITMX11T60F1bEdq70GWR/pLTmYEyeWB/fiOAyWaKIs4gkTxrbOM+Xll6Detz4dd4uxiSvA6BjbLjdzAtJtiCyBSF99yucMJL2fSQyQG/vB+U5D0iI0wEijiCurWpsfzXGtfS4A/a8CGm7kBqJAGQ3miqHLSmUMJt5uvCdZSkErS82ncuTpa25YcKe42FxvbybXkJuWSCCIuxVp48nGnbIxwMhhEFc3Ouel07ENpfrKfoG88DQ0f/PTVc1RqzHUmfjJIu+YHjuIGnK94EWK/A7rH7Io9kn2oeGrrnALpnBLTECXLdYT9WcCppZnKMoJ07BLVVk24FY7gZydO+Dbypi56N+19AdVYdvvBO2fb1zENy008gGoqCBQzYag1sswj7uESLdxygBMmbgjtsEZVLUp8x4QV8iSaeF+vNBCsyM/ZndsxjN7+C3zWlfofPIxbbzG1dtF+3HsFzO1fS7b0lRZhAqUJDNCARURQ+53t+glVD2YI1xeWw2Crl1+bk+mY/Y1XOAuns9i4u7z9Dz8U2tBoOVKJto3Cyip9Lcv1MolVZPI28ka5wtF7iuQ7sjYVxdyswaSZ87QcXNd+6HMuble0bVv/BW29Zjs2xIUX5Oxx9mAUkbP9bg47htpJEJkYXgppaLCe5xeh5FSB+KCQ9C+xZ77ceXaH8kNiWQ9vr6dQB1x809FnVdL0RSPOWNwnN0lSXCN/xepywRMYFywpzyZKM5Z+Bukf1bb4RCCTJESUUtA7OVFCtfT7Dh2FHNE6lFZfafPP+3wF5Xqh3806g5UFnW7Rh8Z2X2mGTTnI0NceeLNx12GlBwOnJ7ED/YYhoPuSEp5lrh5AQcKUpalTYC+kA0KwfpqurTs/6N8UfYJKG7IKAGuG1XqYcZj3CMCmz5JmJNAT9VSXvrCaQP2jQQHOKCouds7EgI6lUnPohcD8ESz5pnUgdQYjv1bB7rdZUCJbO4FZXy6gReeN2/ki8WwOUNmlqrWTgF6bWSTRWgI/W0jzLRlwWSCpjNnTsxqsJyjpELMLExeMVZ0WKuDYDFYiobPaAi3iSzc5Y4kXxxAM16/wEpx6ArBRqNM0VrwVCOr6esSw2YhK5VxoXibu7wV1rYMOCrQkrfajjFd6IjPDueilk9M6sRSFiRuEq9RFbXBMc/e0efxiGmVZrJ8kmAo2sYv6A4oLX0zDcS2wB461Eijm2x2xFH+I/BkGt2uYgLhV5Dif9vRQPL0BxY4FvnIUzUMXrAjCvyBTty643qrc+/jR8wqBdmq3+TtbGE1HAxIQALSrTqc+XLyTEQ13w5KX7tTHY+HcQ+m8YNN+l/DW74uXuHS/8H+A7csd0ksR1HTCF1mEvUqyM8lYvZMkpmb7PwTUEW1R6JMYuvDYbQOaMtcyTkRhziyFuB9mku6HKtKFuTpPqkYoPoUvansZ1MSpNmie/rz1CgJDIs4A4puj9rclJZ50jtLKaf/BFPOQIhQLUdYKYoMcYyXX+cTDkXimUmzCK0PebtLqFGhBg5H64kKSYwwHEuXgT4SKHMMgilkH7UL1/ByJ7G90mOWtQpYw3+nZGN8QBRDxD5fwFLQKspDFJgMiIDoUMeiKEVaGkiqmA9Ii1IINPChokQoFBPVaQZEEKixYIskOhJADoTVcusRoc9Kq/qXIAmMgNgfbfIHn5Vl22fmFdYFAVPZdMDJGrNIcAxylMOpazj1XmEDIypwgCV0hFFziAtSLv6j9cqMmFKRmiNLY4jccqJNEUFQzhCTpIMWQYgn8iovnvO3XZ//dNId0inAQjKlhNihYx5QThHMPSprd6SEdyEQM+TGfuvxfKGYpUm3LCRcDWm8Oegp8vYmNN1rTw6SX3YMPtptHHMx/4wxb4EQjfAXZqpAcJSQuqAXzoW1ZXLk9dPPmqXmZy069TS9MuxJxImMEhy528yiRoJwJmIgHL7pePKe3kyn0ygsa0t9BmsOFiIfUX/ob+6wGm6q6bcwD9ZZookeGqDARoTUXXmGAd36Miyu8CoSaqYpzHLriBTemNQDlggn2DB1+wMYvYF4KNysPuRPJlYSdTCEsEBazAvYT+3bB2pmF50iDEV/0tXlJz8wK+gLwUzBKMLi/z2U5580A4o/97AidM/B2Zu0YEBgMgD6HeuZeTqogtBt+WmhkHfVIDCKiSSbsYfmki53qk00ahYSFcrdeIdZGPE8I1mY2BI1wZhe/UC4x5HpvnasUtZ9tGvERqf6CMDwHD44PuLaxXB0a7YLw1IW+VGITmQKvTCqF3RtLeeVpwjUS9rVqw432pazwgwloTRlcLwCM9VsCnUm1fOBrXSPX2B4eo1MHQ1kRd0z3lcxTR8lC0gzGUU9qWo1dfRIZI3NNgB+D3Pa+SAB2LlU9Tv0eVt48rb35t14MA2+bfHJBsrN9dXWUCk0UqHluzdFGHo8lbT963J/L5f7g3v+gmwKOwCgaC0U+rBHGJq10GPPt9jEIWPjnapvTZv+bhqtAWucBMBeY71/0syrewPeOJvMfM8oQBDTCWpNDcL0DCRTQyILBUpMNLktHdz9uoL41tOtLTKd+RBph559aThmzVKP58BoyYUhMtKUaJ64am+bzWvyc+6lz0qUEEf5ISBXXbUwCzbUdx8f4CDP8t7zXYuAHy1to9AD2deFqfDW4dGM5GHXggapEAgDbAQyxTWc9wHDaPYUxjP9NT1laI8mswGBciNZoXPvYSH9r8ac3jRqtbxsecHb+bAKe3iJkABfOrBQ0WaCBbmjyPuEzKHMQMiYmh2ESlp33s4O/cppP+cI2JzfpdtnyTcm8Ihnybjf/aAKlgy5LWUnKUByInXPhMELAgHuf922qbhfS6gq43wx34kdpbTQBtgzivj0de6d/ULqaeDeNmUl+thTr9ZT0cqxa7WbbFLgd6qBsvMjZ06uC3d+v6UohIkLhukfV41KpfhhZ0iEWMLkX0gm5tm5P+rVbzSR0nb7zBi60YmdISYkVlNVNKGX/4kiu1KtLpPIEQZ9nLLshuJBj2MsVxlWPNQM+WYW1T/WgtHmJeZ+ArttZGrNjlTi/736aB5E+ylzu+yk+1PC9QhcwYHycuJ3wqOV66zf4exhsB6ZjnfQI386+QxiYOCnkTxixDTxkstWbwZuo/e2NxIgeU17BHYav3GfaCr0Lo2pSmsblrtdHr+1YPFCLSt2s/VxemWsysYqxhoYoGGr+7KRSzCAi1bCLilE8EFCmSraFUONoekjFb5pJk3r1LgB+qOfzd5HZrz8Hmrd2Cb7bHVOcq89vlHiXDb5AMkCB+rbpArmxxMUZ5sSRaEoSBCYcmJl94qb9AazcrHIxrIjuzNyXmJqr1XcdaqV3u0fg5aBYZ+zNJz3qCo3xnB+8oFMCCjUBdMnBqdeKojqZ/I02l+y5arbmslMG4/4QDS5zgC99afyuPr82vL6u6Oj0q57RNq0DBjR5x1Gji+/bkmyOqRFpcTpReiXqj1N1hCaNrU5a5DqMwWQivmqDy+6fSTDgJF9h9SgIKegkRySDxFXNJ1g4s1aCGXpb7NI0fFX8c6MHkFO7pYmMT/UVWg88W7G2UkzMzB4/8SP19pZjW6jQceuktuyqwLJj2UBQ9ht1dhNj6bIA7ntIKygy6DSI4/mkhu3MAZCjAD58qlPEIfRPMXiZXNZsDsaEWEzkeT0gWTCXdPH360kYOBTMTX11t6QPIije4sVHZ4qh1+V+RMbkO5XPjnFWY56+ip9ehnumlGbU2KDtOjvQKVStJLVL1M2vS82bjr+Job2UbOXeI2VVa4MNYUV4ycp9aZBt851HyYq9Nn/EFg1a4dBTmYkF8LSAulfSzumQgL6ugDZoh8rwCBMDf/gVIn62rH5dsDHG9KdfUa/aLxl9zs72+36hKym6R7dPYT4HCL574E/EpapqLUz6yOvcuelLbcrsra3FPEjtZmEJ5FNb01tdzdlkdA890ir+zhlnIuzBEnJg1TMKTtgzPCGiO0PoFhvExrz/E8IpQ67E4VNi/Nn0O/KS5Aj9tSnyRwOUEoEv4OIyRRRJ6vQXh0L7KJxn0nUj3uRzcwK5NzSR3og1p3OD/EPmAPOi6heoASPXK2AzPEX6O6X/wWcDPnMxHp2zkheX0M8tfvpp8vBIGTS6NGtGcCdoR/nKDSAVbs0Rl7eZGBWdnpMh/kVtMdKFE6ndd+aC7uHPTlo2f2pxoAIMrc1F2MQkUTsFDFkm1cyYZr6bH6RF3EZoONDibF8TpBLOnOiZ7E/qjll1GlYKzma6jNOQqGIlfVRiNxcTBAeFZK0OAj+wmR2cHxX32mBRQwz6zwILKxVSzBDyO36h/9FCXbGyGHAPLyvCTcE5Kcyxfsk/zK/4T86mMLfn4wJtwBYZXQht1SD/Ma7IIeNTh5Ktur891OBfUzOy4CDaxg9B9uT3fh4BNfFcvA53uqDdhv4UrMXFgWjBpwkhmRoyY8g1Fuvt6DJFTc/mDrqQ/PkSjs3TOCgZRdONlN2htubhTQw9otDcnQ62KC6T2xHY+WlaWLSR1zFrBVZ9UiH82BQU3L/lDW0nuqW90am+3AfwLp4p9cwwLMdxpZ8rfxiwIMmAaa1xCcHQmsc++LbUFkHEwtYkEM5KNsDppqR9Q/+IN6gpvEatYGSJ8IWCNAx3wxo1yR2GEwN6N5r0eIpX16BrPQUN81hIrBVAjCbHd8NZWZ+4+sVDYaX21WeLqoHsQ8acQK58idqETdcyk8WOrqm1NicYjdRIpPIqFFiILDH0bQQnglK5bfv4AfYpGfqU7XLDeMBd1PEX5gla0uhUM+l12qBNapEk9gacc5u+OorPkPAglDVPm03xMa1fJBRlCyQ/HcljSesShP2VNGtp66xHBaNyVVkiYjM1hh248xrjjzVSETBR+FmFI5LAeclU3liDNgg0FptW0gE8HhFEMmrWmTNUyq+O2QXnOUNQz0mOYVx/+o+FnpEeEo6Fz0l1nC5fBvhO2+xzHCL/P31FtiEgAH5qMa5HbDtMfGS9fCbCqdJnGXeKuNpHl0z4GNcI/lZqMx1QzGmbbSY7xg0az9FOP5OrmgDBCp42idUV/rlUerszOvm5LUlMsLzKhIB+g52Eh/FzwkeL5z5nDHpHobEdVikVdTFqidoeK6SCcpLprSnBu/1lDb/QIKMA1r0b59Hs0BNNn0q6mZS4M1IlRq1k5d0K9/NtOdT3YqE4INiEwTZwXwjZQz6Th2m1Q2IKZQQkASvjTW3hEpYbK/0GPh+GqwvBPTejtj6nOIYSzoUYhydS1MpMuRYmkeAw+FxXBRIUFUlIWKgM75yvDVSfKdv4LRk+bR7WKmMDKAKGLeGXFGAR8fNN87D9MFWsqcOfV514J6uBIfae03osxam1zwIetZhYSXsupW3f4vw898730JqdceqGxBXUqbVByCuVtSOzdvZBJwb6cYN0Dqpxxpuyk1DspHu+18CRSpeP1JRcTW4mZjtCdNfZDrOBLs96ubh7mRVrPhWnr1GqZlvbQjaYzRosj7zuwaJznOawWui+xmnP8H983dPS05+k6KpYa3swXglOc7v+Zs1NWhPMwgVAOEwGox9YknFTgvmgNmzZ8mgmA2psGODnG1fJFeiUjO1HSnYDxcWrgZYvHzg8ZSKK9GEYjRnXuFdh3AJHMVbriDHTok7j0GUJEBzgrPqlPgrL/he9yDV8ChUNu7ERaU6jti0fPzA0fs/dNMAKEa5RKGBZouLJvhP1dowCOWMCIUqkMvj0ljLwA+MlWPmK31aeB3zk569P1AWID9a9yXNMptA/TEyNVGTTThQqEGm5oe8xdUQTMX63RpfqSpXtaa+TDB0wXIYZTNxe8S1JOYiJmPkHj4P1PZpiFta9TRsxysNiMNbMt7OXnS0AxoGR+0yuCDCMAyvlIuEabToZn04Vsld0kUT8uQj3F/zjmu3TS+6h4Pf0EquZbkmpjr4Iw8C/y8JsRluSO6i5k6IuBs4PrdUYtFjY40J0BeM6CsCdhsAB4uaP8XaOFdz5WeAAs+t256OYbBnoVtd2fbmoKNqnm3pyPFVCJGQNU+7CgfuV9UKWxd4vyvFIVI3ZT4MMj52+3P7UM6RTtDp1Ohz6ONkD6DwRr3utofRTU2kZEeeqeazWMBLRUBSXhatjhmqGSLk5ZtOLzr4jSU5gCsTJwJFRCKSkOVJvig4QDRvcAK6F8IDOfKI4Df9F+KhKudhs1ENutmb3HWeeO6eZClqnJTj15M545LPhh84pGQYaqVVIry1UmJI0DVk4ObY9FItdvC1Xw2JB9abBVgpJy/Sp4XcYnCTepbdBRCR2RORWVKBkuVv8L1anmKpZTnmBZ8TpsBmS9spiYUud3h7pfwghk3tSVHbEZBT6xaTNF0n6T3xuYWSHDPkoA6h9Hqzvc7+HcDh5OxGQvWwOWUi/7hnYlxqPPGFqvG4nB2mNRPIQ5yDCpQ9HADKVBhbDhYq8glcvtfAYe20CvMOMMJ2ed+Z4kujgnSMQ3ADDsCxyoMfDK/z0twge2y2fSGTcEbQlihE3lRxXru/dagvwE6IJSotDdwtawVUTK011L0Ah0tpjflhdBLrQ/Tv5Gba5PaBBjDD5jmyO/OdNtPV8xhxqEq61JtKkm8BMCtB04r1Q7sT6kZVbQanMTIYO/sGxII1/vXO3NNaA2Bg1zui76SxZOMQc573LuC8ypbU8kelQxRHehbqOMEALpQzzttw0tEeJNNhmMKzU5BF3qRmzRSzO3NgKZCgDreI/zOvsppQFq9ia5R77fb9P4HkeXK4WSUL9Bkkin4qLBM90HsA7WP6DVK/tAsjGttaU24uakWikGD8IIXfP205CrDQXR+e4lVYwhKOFYoSLDw/2kwH5v80Nj0/2a6QZmmtwiC4TMwZeevBxB7afC2B8vL+TgkpiRQn6Phbj+C1DwZKSfY4c/zJXQhe5VzubtqqAR/d9Uch4Iw337J0TVgHNpPPgeV1iY0X6LnIIjFlzBsMXO36uOIGFDy5/ktJji+GjU1LR0/dpCBLt6FAJKYsMyZESwI4tLNoSB/gKBgA1p9t34oAqp8jIbgGo3ugCKQC17hSJu+9KHXdbuvJS7/0tganqCSlvhRh54fBLlDOVNQXP34yJSE6Rm1k03+w0pLWEpHV4sGtF6DwTAJ/jGDIDqqnqlb4iISe/s10sdkUDHYwfv0sNDeMXL4gKOWp7DHeeD4mfEYOpYDTm/8iGQJVi7X0Tpl+IQY3dY20mqHYJn02CbXx9CaAEoZtuScTeE542CadKoh/WCAL4/KQCWxWqhnuiQRSeVOizKOr/1LapxqIaRG5rqDTpLclme9XlWChtRhL3RdGwhV5rUfvc7mEBDKPqhT0SkNQNkjmnMsdBBbKgMtBzbfr6vKdCuMychtvj5ll504/Jtah2EhQjI0LV0a1lUe/+kMzDew8xKpssFm9T27Lptg0PPvO0S1HTmRh7Jd5DS9uA0SWUBmK5sGYJ0GAL7wPJvx5rYc5Zsh3TNapHa9RRMyUeVLdqiyI52nEizUHQhT+fB0hiunA/VPtxPqghnGkgg7vkOVZ+3j3n/YUrIg6f4GLG/IQpHw2cXDqPHKCxd/svvSkX6Hsc9ykc8tjRbl3FlNVnn6i0aW0rBEdF4B3jvYvV/wRuZzWafAfxw+XGBtd+NcAnXGaPcYZL+9D3ecF6t7EeP5pnGa7VOsshekUoH6M507BiByYkcwy9nzVFO/cKHhA/8gDezaxqoKv4hvdoifjuQcqGGOzbvLnhE7JZRwEZYgjLJrKXEsyb/NYNUpdn3lPMOzZk8qfrJAVPi/vv39ACLciRTIwaU4ysjhxEh8OOep5O+7tmQTJFeiW9NNTGWLQQDHSUANQs0CAEyvR6Y17wSeUk2sneCj6LyYjbaZg3EFEBomyWIWHVMDDdrDPvKCf5BvvFzr0+uG0p9/YoUmUaFLv3YhQXkv4i05H2l2hVKNCIn/hBaY4jKURWLRVnFTBVDE2tvtoJFhQHyD0hs0SujaIjQ+X+2zbLs3FGb7vyoJ7lFnlLqz5KyN4esOaw440wkw1169KDlIGH5jMIMy2xiB4BKAqwHayuvi8Ygmo1D6U6lHVs8ceORASGrj2t6yAQhtvHfv/FZVRXn/MdQT7Qxe9/BT5g4u4VhEiWNww/vSjhiDy5NHhAzfC1I0btWdND7NtSZB1x/SXJ77CPDLPbdxk5kc/BU4WIFXfcmaIuKBlu1o9GmsoFhXEOAoZp3fnFol7ixEzmcfjRStLPVD7YHUTueoZWaE9IfSE9h/KmfTBZhCRsZCCXZYA0ls20gFyg4IDVcXPJTQ6eK4S8Bf9mvX4kMVdun9qaVhEYClJqRUecG0W+sbbRFzm++Z4SUVxYzRsiUTfq+VM31KppqiHp0rAYgQ4oKzBc4qWManT4XItgeCbeHR/HVLS3oOoj4Lwq7mfnk8exzdI+TmQkO3wvkCYFW55939jhqsSNCeCfMuBvB4aJA6xq0A3wxO045/jILLxpUblHZ+qGmRtOQcCUwDjc7ofApWtrvjonw+8jUT7Z4AAEeA/+xHPYfjf0LBF5+rDhfIv0P8lN39hsuc7HVSA+i1KC9tg2e6MUyP4x3MEEigasUFRtx9Qfoy7LABwl4T0gGSu4tEHIjruJgMa0t3Y/WSL2EeuLjbRo55ZOZmmlv2zXgWmbc2t+qWDxcZ8ZrvTS5hPzMP3Ie0GQDADRMR2oC1HU8kOIPrYL9gnonYHWR89hciGeG45ry99WHZGH1AfZ/5D9LBAxQir0gyGG+kGAJlD/BHgKMGEEE3BmFlyyAzDeAiYcOcwVLKKOFOdj9/GUx7BGbLIHYdk0VfGcICVkmzj/g9O/J6d13IUH0fEQpxz3ZsIWvWBiM4yEeSrokebCyIr65oW2aPYkeN8cNOH41jpkIsIXRcLIhyYn+2Zavz0/qHOrBd1z7xI8yLiYHDfnuGz6yBLeFCgjiK9l6epfbFNwuAIuKBXQxjaC3np69jq9Wp/1DG1uN9EwkmjyPybCmE22QRr1nb1WoZu9W4WOaCG0/1saGgYfP9YEJRu1RmckAmaecuNy++7FI/I1PmZxvy30euvThcf8WqDsRzRFMRhbNYzlP6bnfeWjM7AbNoJPwub6EqZewO+Epjh6LRBDP9+N4t+2Mm1OtPRM11yAyT3h1Ys+eT3b4X/yQI+SS0M2CFDJrMxdnFT/Dxx9N5jjFEz5O8lXW2v6CqA0t0m3EUDGdKmcN4vy0pBje0iCQ1+ASVHHne53ezvKezRnDEvc+deqmARU/BKsOvhu+CaB8Xy0RTvpfsNw1jiZShrtmHYH0aJwR/n3sixiGTgNhGKqi8hd1UQRywCVcuyt45Nu8l5CV5MLYO8x9vimd9LTTz+Xq03mse6TuD/dqRCSFmiSxSBaXSqMjbuSOzaMrUP16k2cvFZ9iLsY9u/3cBIYSCTgh2nDYApmTgb78dDK9Ef9PzM9tIFJc9qyRMxZP0hhbfa6G/YJBj1t1qCLfDWzZYbKJ2VFyVvuGLOh0llFPUBjfMHh7CC8va4+/uv6v5bGn6Jd5BbrSBZ0F1kbtzMOKxzB4FiWiy5Wrl2xxbsrAUnZ4YFiwcTVM01yF6SBSqsrOKSrco/4PirezEGmqWChURvELQUh+fTT5ikuPNHbcTNpIOpoe0q2e4kL9QoohzV3mOc32sn5nHLxcHIm/q24/fFE/YGyOOVLtnhC4oYbJzcQGogL+wOHk5bLWu+MXY53OLOzNrBZaS0DSOPKZ5pfVTzu/bi1Bx+CQxu+55hjrnUf+9pX9tLEr0HvlHH8dTmxaSge1DEVHOKGCNhI4fEmp8GQCBXywi+g2yzFvv60tspIiXWGg6JFcDmmjEs10s9TsGxU3q4GMckuzkH8omVCeoNo/pvX+S2xGDHmh//BuZsBNV6ot32MS6A+1SudaqIr3+NN8y/RdtqIrm4p0doEp88kWqbt8S6hryLv+wCPzDwlypaRA4IzDKxIgEHFTC0cJbZ3ZGpSW5IfAKLlxr6DQeW8+LBY+Qs1F5nroqJXpXkpspHKOg3yzIsPETNsMXVPShLCPDeFTPiziQIxQGVSM8B7EOtd/IVWgf9ymelGOy8ok+3Nxuyn9WbEHnDGYtMocqeq+G3e3Sz06fcbyfF+qS8Q1fd0y5NZTIPrdDGZ4ohoaqhCVBEzz0dpq7mZ+LZMxOLVR+AAM1sTQXtSprI1XJEWBgog+gNmhQfbyHVdHsMK2YWeqvOtaYvvk+AxkXHxCMt0mfDoK5wD4P5Bx1Cc7o+zp/95i6Gl9C6j84NEI1Ygy2dTk4mLMTft65LwvMc7JsQYVU7ApOZHRMZbTBJC3Gw3oHP6yRDp5rBtOykmek3XqGr02QQcuBbeXJ+yCis7meL5zOHcdPVlzfw4rzM7/6BcKsYZ7Mx/dHusSjBAYXX6IdgRIUANRiv9ui+GGuw4iPwXctrXftuvKsmSmwhzEcKPGihqnldo43gJ24a4gTh5e33+gAHG0ZVPQPdwKtYDyrdmTboqXxlMY6oQCH/r/neW+xnYv3T/FQP5y7rALYWHGz8t6184zo/G3uiGnJxHeY1uTsrwgyhUg4UJpi64IFcRVBoWPG6ZLWxImUcFZjGFNOBWI6pUG0UHy14QsYLkmp3yJPOqczyx9Vg4sSPlYmG87KHe9AvlJYb+BRsGPvhaA84KkqmTQlMoQ8Uxojo/7z9a7hx5SulnLsZdHDCR2/RZQqaTyMwfJB8YV2jZ0Cp9o13DGST4Alpa1IAJHe46FT+/7Pi03XxM0TqYGjGe53flQ5PkuvWZRjwcym7Yrp2OJ+osfkZmNsk7PUrEnRAp+LAq4NzGfIVN7fLafjI5tVFndbgnjWFhdHqQiYKXMsaa9dqTSOt78rzfaxAd9vlZxQXWAakXZ56mkNd5RNzkJB4k3hOhp9twpnW1GtgO0cag+Fc59FE+Sywu8GPvooGkOyIYFo3F2kIut3QgcUarEQJMudfa98TLlrn1xhJoITcYq450OxW4nxosmvByC+XhcFbPEDjApLkhVteCZ1Hb955AO9fypU7JeELvRJZUISWo12NooiI/GwYGhRur7WvYYeUZVq1+39vJyeeupqCtQd+Kccm52spwMv3rOqP9zwsdvju/n56ixK3EBdsjwqBpNqsrIgorGGu2vwKRo86Tobv4hWkBoAXbIXeF2jCvOVDxLGLxFuTYIXa058y0iTfzcq/O3p2JYFtBUxuGG7E5NAS78XdCtNXYY4MSzC/6DSY6Xkg57L8FvBoOtAxQQTEYcX8/4cbzrFrxQ83EB0admTXoVB3R4EImh1xnGyaHCyJnWRLP+6Si7dUJ1M15OTWIFJE1zNOPa/V1NIyxbaNzwSkz5w+/5UKA4cwHPb5oEeJ+E6lVnl1bN0+oxuwfJ1DgKYhzHcsuvJcJQxI+6NEd/H6pELfQRNtA2v6sLhYkKb/EiHzcPVVJ2F8ZH6vck6m1cai/UCCjmSan1jgv8G0Q1O+hxYKDnNXoPWN8uAnv+fBYI6KEwJqR9WgmLreAzpkjuaBWbI6oPQkfprTXN7NmplDFmdqdU2ZRDGAxUs8hVG6+bzi26iniWdNwfhQYitUE+FN095EaFf+kwSx+Qf9PmSFfQ9IzE1mTrC/NhXtpruJb6DPcSob69kUXFMJn7lLwhlqDCPGvbB+GmkSJSJZg2erE6NmqGffMLZmZjReySddP6kUd+7Xazxa2FuxQAIDUBQe1yj3xJQKOlJq9awI16QFsUJLgLwrlxsppS3om4dmy84BcsD00PlUwdoiOab+zphXrWT82JdW01qO4uUF3JtCIBTTpS4oLHUL0AUMu9GTyJKMDXCnNLsEy4ja5RubndkDtiZ6cd2NzQajHHMsPpthK3merozLQ22IKyP3JgYp7cCKAZf5vOmRUV0u4HmZBNRpIz0h6mxaw5tXQbaFzbD4B1oZNDOk+LDYjC6i0GOAD+1MfDFDfsZxa+sDd+Jgn8tO3DZ961JgVaro22EE1OyNZF0SjlOOpSOfdQdvCYXnmKI23IB+GVT2OBfwDPWLWtNVAb+FlRVaQ4GDfQxvFj4nGBUQN2QcR+egfW5efnuC0y1TltFKotf12YKMQMETBUxSmc4+ayxGS8pJdMawaUXhjYxLdh8/QG3plV7DZGcp6LNvDGY/t/++wkM1RzAiNmXqhBK6r5BZDCYQVwB8AxKRVp4ZkpOXdks+KU5g/9j7NuE9JLpXgnhWd/64TcFTxRNGJsZU1UGw8MGpyhX6dKlIghiHJNtXOwEq3RbH6eniBR9pPzy44QzILqC+NtGOg16QmSCpSQlwb1+n/wEHaO/RjtUIlpPm+85Hp8yDKKcmna+oGEbfKwN16zDQMwPvnZLqQ4jeif3tnBS2fLaxgJ6XonqZ1wl+xfabscbBSavZ3S/ftGaT5yhhp9MCVe8WrX3R793QobzSkLxMU1iMqiQqxZnPMlwtjjMWlErK/6o8RsxlSNt5vsxFuDyHuvRU4yK8Gdza3UK5EAXt4FLGUbUj5szXqDeFRh/PJKuNKEJO1YjaYQEnhiJGgg/jPnqbYybWDtcwqpaems6sGAF0L8ZGJDII6Gql62u6jIWwBgdemouzHkqVpNuh758j9CAAeB3NQjoNIgVFqdReuVnVLD/3w+5WFCFET6N2xmX4qAtaeeK6857U00bO4pXLm1TJ+GkT9xSS0pbtRzxnFamfmecp1qIOmCphFf+oPE95DyDhiCVxDuEuAMKuRPKSDb1Fq7Wy3XEebbRBKCoJ7A+xPGIm1Ojp8hy9SF5IvIDtwO8PyF03KazQ8IsrcjoHauyNEc/f/B7epLftYAn+hZ/3ZCArlG3/CxhSDP2TI35zadKl82mnQvzm5IP2tTy4/lOWrsVn6uUUK7XAPGQsOky6r32D2ULgAXvUkKb6mqaZFERVTVeOayQ8G+F6mW/DzUq4mybFn+YFczfHUZ8Uc+3p2caVaqcIpaQ5Y+xAGRFRTIzPK0JhhKlzV1i+cccLpeKHIHcmITjqt5DMQij3QismZJYO/CvIFzL7RvGQlOmvbh0Yzmts6vkjq6z3kf9vEILRRt8/AgQilSqyQ3NJ6ILJ1eLZUrWpy4JK+v+svQxtqPJm7EQOmOx6SqBPCXCA2PjBElgUPGxdIxODPCoFpNznBv2kf31+8vjd+uz5w0Kw5zLnfsk062GEFfi6IhgdyfkGM80T4SC2xWs4QkVMWD+yRkLV03T5mcAjXyniF8Q0TzsBmTf4yNTc/PdjtEYAIOolSWU0G9/3gJr69r6GlMNT0C+dCA7O1CYwIv2GAgF7dVK+VkU9eK5kU7sWjMVCf76w/D9fqGq5d2JHbFW9nWxUONiZus4dsDhUMdRLQttwA1i/zJc5LXi8Fn7Yyx/Zi15e5JXUvCXRi7PGx8R7s0IXJ46VJosQHs3P9zlbmpDO8pamZVCwOxqHRwLpcWqoAaKh5QrtkrPIZwFKbsaXDG0jB0WrDiOYnfAsNP/v2Q+/LXz8numqfztTKHqz/b5U8Fh30MqBPX+87h29R06m/WLUeaogKVyHHQjkzDgXFJZrSc3S+KYXOK3OqmcH1JYjvdxN5h0Qoh3UeUrMrfNUfE87qyFYrqT5SD0PqYTaknV5F+eablCjzTXUdCIbTqtZwNRHrX17sNRv607B3/Q4dSGNkO/c7msOE3wZKSAe3H2NiaMEeoWKHbJjwlRhXrQgdtFSshwlSTCaI/lt4uZZmVQtshd6GZPM+I/+ur/ZcspP7JeWkilLfhoM23fuun/4xg+J3SA2Wb0J2BLIHeEcMcklowwCKe90GrrWhZu7pI9ubI52Blbi96FlSvZI7zv+AqS4s9bxSMt0WXicozYrK8+gVLIw/ASU4sSiLIhA0oA940v1vlhlP/cbyunyE71ftl7DNeSP1s8V3Fet46/GOjnR+IKPIis0m14+yRxmHOE1Zw7wIMvX5WSC2MmvT315C7Kg6JgihQJY+SozAZp62rlkWoOdmBxvOLvw4ikqDo/LE2Doz5I5QvCH6WcxdqKt2yWACr8YZFgxXqUMS6rWQI1etH8eZNNAQYE3rl/dDxAC6FqjE44xd20XKNWZvO4w1sGE/2unVGMpAJ1borN/MVjFia0pfo6b0m4LpmJl/WoI0xbkKm1nKkXKBYYuqmtl0GVWOT6CWmSPKeMISa2R924UeLdknkaEHSs+NnMvTfifoCBXaf5h8/NAeOABKZGGOa8yy580ItkBnrHiB+MmMJHn0xmRTJlGOVtqimp3ErxPHBpnrtTnOCQ7wYhbBUMhATTQDBe7zfrFoy1SLQNjmdbuSf07t0oeFt3ZComFWUj4pQL74nmJ5wlhsU1yxWNxkIG2DpCF0ig27KzjEnk0kWQfnltNfDJD2BaClyZGOOtIP1WAtrNLRqYKisfL9zS/GDxEK10357onCagm8ZbANMdsPIz8igGlIuYEU4JbbHM8+qAsJvumgkKOdvM/PYnLng8ZrcxXnui0z8be9Q9rCrmgNDFxl2fDkb6+zZBQ3DTZB/VbhNDG8sREheWifWPngL6XlRLw4pX1Ck33x+HZ5gOSJPxpnLKHG4UeraJD2IC6OE4kluq89V5JpSHDMURGHOGBaksAPN6jRwRQe4Mx7pN8OF+AdPPZSGIXSIOm3x1rJOvB80IxIZWo4vsvpTf3Z4OhGnjEFEcOApGwRRzuZ1vpLU8lOfaPzpND/T4OApXyfi7BAgFo12hMaNryHyyGzY9eRsgn6LuuiA7mj2CVB9ZQJO0yjdnpdD5AWr6UIX5WhEa5eFfTWQOWlYabytZ5BNxZ2uqPJ1PAF0MgTwU6hDa8bTcwU0SOXSIO2rcnEeZABrD6P7beXM1lRLjj6fW6AOUJugiqHW4JcGd8cIC8lHK/yG05Xg9eAXmzWqDIrGGHknUYhxQnsJjJHmL01gkkjaTgxxNzP84e6llsh4nOyvDXe40XZIlmgAIv7u7iWhD6j8pk2kFk6+p0FiXBFdHPJaGOziqndf1sbCvRigylTl64IW8uG+0Hp5HPfRmQvLx/SQiOy4o9yOQ/6At+/RPMk+fyzcXt/C9VlIuBpmApc+89Q5DGpkd/duakKCeoVi6EEPqA73s4JqUCRZ/x7oVpi1//jzrmS6M/U6Ro3qpY5KLa1etCToqY6p+rTPTvHz2SFCG/Nv0jGAtRMqBbvZEt8lrbgZLIPk7Cvxsklf4Lyysnm69NFQh2p6Du8Xh/0IW2Ck3QsbuInrvoPpxZBzQ1Nb1qoSZersqPUQS6EHT82Zth/1b2cuwMpJTPDZ/4CC0eNmmM49M1T6oPsAIOP8krjDzNgGhK7ZmONjoJpBsWLkzUsUDxPLbxYiTc9TLUY9tSNqGymaijNZsUwdzUOECFJSj7FID3if2fAjTau4osHj4PWZnae6ysnXIGhZupqeCWuttkJmK0YBKQ6rtSz0iKLT4NKX9uIk1bQSGWuHIXptTWg2jzYrg268R6lHKJ4WfIVchvmqsFgakzEtXQD/8QG7/uv/f6MfqxdiEcPGvbkAPmcTI8VSM4GCA1IMZeEliQVyk2SRAk0xlFGaJGwMDQo+aubi/YIwU3zJQdnqvsBdZISwEOD+fR5s1fM/asMV2rCgSlz0P6bdi1yPU6LssoW9V+sOjqnnWeGdZYhiqb2hDgzSf/f+FkzLdixns5H9DED6t3Dk7TClnFxajr+S4gDzvFbMan0ZxbXCGtWzPfg+J7kTs3g5F2RLIEuDF7CBHYvvmKvhrNNLwAtxaM4I+6JQRMNmGUPrSwJk5h2e2PH+l9QPerVvkghBawgGcZHILga7NN+tTJoBGpCCWN8CN0dC/YsmN+uTrpsuz5nw6lhbstvKepFyGhOI2hsBqDGTr6JXEYA4qUaxTLieTLIuYG80ta/SGWXYytvOpXxu0m7G6NnllcNdJjEzv6vr6CD3dPS8AYccam2RWBsGdqQ3fKyZ6MEeQGydCzdvaxUws8FkeUaUo3To1k1fFhODV5q0iXg/78NggpQb1lbjmlRKCWcTvVoPODOcgd6OPB2HJukGNbeqJRW81O+4iMZbkf4dcQhC+XyiK8ff4/dWRvuLZko6ja94VMbYBRGwlatfr0XwClOFSq5qxw5QPBKrR5gh88745QfVSmZdXRB1bQdIjAnXtosxvlZTRgEsGYd1CM1UsDsnNOl5ckzJQgDkj+D0hUWcFEAdJp8oCZh05NHyT0n6KKaAups5NPo3zRCPO3CEnpp0XYaWHcJW+7w3pBNYb2rNBB0O1NuK5AqXt+G8DbjCJ5lSxN8pqPGvOPirr6dmfgz44xa9q5VR4mOKYHaMG9UA4lKqQagFxx+dL0SaYEJitLiqzJVtIiC8pKmnschHHbm/xKC0Hec1qfwHL9PK/+8FJQAdgb7IiwstB+CaorrZztPY+AEo+mmo/rH6gGcuKyaRD0mTxD5EiAnsu5hOQXckU1z0n3lhIN/hucRYbnbm5V4ILsWLE5NmDGMvweafW+28xG67sIPsmx9vOsscz46dgxpHybhk5S5O2oM/aWs2ib3ST0KoC4jqoa3uSmAS+wQ4VDX2l91EIMeR5DcY9aPdocH9y0gpWEma5ceW6tSgw1u6Tfmcn/L2+BGm+lBh8Vzp6QjusdJOeuMFSaS3lRFnlDRN89i8V1/THdyrztigp7eZ5vzHFqGaea1addvvMekJ5duo4uc7rNt3M7DXRl6xAHPycZoNH4YJclPpHTMtqxg3DQP1TCu+2QCky7w7QTId7K2DRXH2TnNG8dkj3zVwFKwnCZBnmGAC3vmByxVB6+obnc8esv92uASt54QPP51fzGQ2KgqGYAtps82kRbj86EbQk0wKKAeS0TVuwgo9nU8UFcPVbaxnCEQUm69j8gmJ7BwFOMzDXoFaKhOBEiiW0j5neqKct7Byv8isMsHAM5EzzB4ysCcBiGs1K9IygcUvAeNa3aLHA8YsbY/o6V/oH6n2uWOMuOGXbaFDUukywxLdWy7B97Rb8MM2TlJWTpbP7SMqPamkt773a2yMerExtyODLxgDmZzmTPcNODPmSGvrZ6Ngc2nfYmgyMCokM4wkT/trrET49hWhAuWgsS9p4oa7mGXhsTZKZBjVjYvHmg+CQZSTXma7z6N9uBljHUKJgLP9OehYPSUtD9ZsGwh/DnXZNjiMu5YMK93TckvD2yCsVwN8DB02aWnR6TES6QDzGmm8Hkq+Gh4hb7zS70HZ9Iz+fbxqafn/9Q46WPcIzFi3bpUXi9WEdnS2kRbCbj/2+XUxGMgkZ52uRJ7jk8AllDMwbib8mDtnazZCTaIP4pne/IsFWRFAqeywRerf/Sfj3GYicQvTj9O0w30qEgu+VXSb224XNxGLludPmTxAuDh79aFX37d37yAMBvq49o69dglBIPK4ea+XwiCA4hkPzZ/uNwLIRFVj0Y2VPWAD1ltnQNXbACeN7Oly8D+Wqyj4Ng5lMKD4LXlUy9vavRyOLYJ6dw8b72z/ka8kACBoihOxyXWV/JuKLViVVGDmKbWhrqZ36JrfAEHaP9ZqijoS1MlImlpnscVxF5/05vPVVQ3/Xh2s6DLNAtkIbgt4ov7PTXauPAW1/sHE/jyDM7b5PDPEgY1MLXs9Kjjv7KG1hKa2SAiDpCwfxbXCTWptzt0CB+FcEoaMRkvwRYuySXaUAMCn0bDktyTdApfDYAHR0BfWBRfwNMlYR/fgZoXE9XQr0F9rYJtyo6rSXSef6Jm6JnzySb5b7azaT4doZPsRCUJttHB7Dbc3dPX/Zs0DcwLAjcws2YsiXr87LOCZG74EZqWV5dLrB7A0xSZGskSB+jaqSySHPdBkYkFZ9QeLJvMilqro4IKnc3ZcyhXtdVXBEPgwx6cV73pVHEmPvA6aIcli53YyK1kMvrK0v0aTeJnIw1NLEbxN9BUbHCxD80Ebwr9PKd51K92b92MRDQgXHGCtKE4STfSXg4YlOnumnul66BLA9fp4PgLSEZJb1GtQa4mCKXAEQJg06LMWjhh0ltZMyHJbh1rAX1r6w4iO3D5hBL0xrQStgybkbAsM2ZNdLBShgFeHgq4AMKlFjjOMEJymELYuooY6M2xQrQROUr50V4f4Yu+QkH6jkfR2kbi7ixcqcQhnpaUMfj+AYuvvvkRSdSHqMlurZAm9jheDgwrco8SGx8gR9hakYk79v2gvENsDbiFAi2EH3PHPqL8zo0JeyHXc+wKOdcjza+Gxxs5ys04IMW4kmelN6mjBHrx9M9SR3CjvgELbidfWRYU3nKdo3HQNdVZXKEzMpW0Nt4nXEBg79WXjGdQrkobLnLOqYza7mv/nPsLtwUsGliQGVWtenhIcX0SpK5Lxy+5PVgIaYcy8cuZimYfwt/rqob8F/pGZPr751dU0Bo7uKaKRwbCGabagPfFw/x+rBwMxYfyAQ0cnEtfdZKp3algrVGtg2mD7J6uz9PW+jp2MULjIyr9P+LGg6t7++AZYBaHKf9u9KoyfFFrdl1IAsuFCU1RcnqWgITxKoiBqOi/KFOzymwC9Da6POx3wPz5UBh8BEHnqX7GXJGN4gl9YU0lpSEqagA1s3TRXdMsqYf6EZBzdgJJqvmv4H9I+3Ls4tEXW2gjLUkPXlaGidUGKaSS24l/jgxMpVopHGmA403qT/rbQ8epteQhM6+e0RNxPmfMHWVYX9/e188ZHu2cX2NvWvNW8NGX+hOsjSR/pblUZjBvWuv7aWkSiuuGnD3h4fjIHq6LWBVyDmpRrEGkf1zHKhX7c17eiYocgTNh28PTg1breQKWgn2/kvKI1Elk1Qt01XK2AJUkM/FACrNVUE5etyst2NtaJIUXRRcSrT5Q6FP7bZRMA+POu66xIltCYCQ9A7KYGWA9nj+AhHPb6l33f6NE6XhMwlh+GvGROsV1y380Hn3qdjlWzNB0A7+MkMooo9YKkT5yBDqZQW0RoMb30S+SMSloDPzR4hImvlaxLh3vMsIuoCbGbBXz916AABgxWj9iUFOptqdJJlqN3vcd99RsRhejP4PzUOVDTE8QjzTZ3QoFglZBndBuLUt0Xa42GbSOhA2bR/GcyfGGXmGAFTfiOXcgEIZCceHNUOEjYMc8lNff6FCfoJ6HTq1XXerbSKQd7pQRhWA5FK3KFTiAf/K2ogCF6LqllOUTHidUT8kQLVp/KBJfcAujuTevdOshnj/6m071IYgdqwWGLKMQcTIsTvLvBlAf1L+acXUtwOSlcMqczWG2z8aOKYSbVDkgf7Sdbne0e5M0wvhlD19xjMShpN2KDbzdy/57t6PfIE3aZIHidJzkoE6HtLwPAUTZBti7cbKf5hs4kEc9DvnglLQ+Abk49DgMdffUiCJvx8lNTpl6pQ9kBmJZOxMQskcSCFlZyC6kPAWpIePthrWx7s9oASmcwgZ61pwjktlpMOtaoucCCbTMAEWrdJNbJIE/fVzF4u8PKwbLKrvbgD+OOmGEYjzniQ3HoFNplDyOtziuIk78Rh+Qn0B46pWrzWrur+kOa5cKBQKOSPJpAMN9JpPntABx048R7HJpQ9nZDEx5fT8HmzZtc1aPFWfx+DZlNu7BwsLYdTLXc6G6Ye9C2vOdpVqLfy36r4KFRXgfGKdesPjcW8zQfSnndeJE68AumbHLw7oGiGjrkf/ikOtE2Tvc7WG292p6gsDqJKL9859XiKF62eemgpEJ+c+YCYYtNiJJrQX93cx3UwcYhk7SMP+ztCe5/mfJrEd0SFKSfOsvuoN8t0gjOoneFpURajJ3sNXxAFCgmAOV6qQPdhLVfI6tIc1/Kd7MfkvMIq77LDChJtOnK1+hZFI1ApK9ouM/vyiISE2r6UE7dTFaOuY3z935pgjRqJnbzzKJ8rTkqbG4KNKmA4K28rEy41rCIuiOsNvreevwZtMgIOM3l6MqXl6y/tekQ04CZy6T4G+16zsL2MWmjsyG+RAG5LTg6vKlaC97YWHUeBkvgzO4iMNxhb3cq/7StaDQcQ8FfegJ4tUaFyosd1KUwtTaHyHpjisA1nRGt+3By9T1rFnHeI8hdaFp4HLXU34kXiZ3rld2DO4LzQD5Yi9a/+D5fgmuu6GKOyi530gRrJnwe2Hms4YdjOwyRK5Lx4KrH7UJkGXcBQj4kel3lNXGzxrBnQjomP+6VbThQ8LWKSlPtm4KC+G1C3p5yNnYakjgH4D2Ri8ry24iOj39WJwDUAY1Cjsmi2I3m/6Wonk/60aURr6Zt1ZdLDCGRcxSKwPSGXpy9uTbz1ZzZqyUywCrQxBXeMbpFAQVqlVXmcZcPhmgpThZZ+jCQc09RtZesbfG6jT7pqZ0JXO9TcjMTc1mOw6cYpK4Sl0Fwu7MMiaPiEaacm2MZ63jrVCEdc2EKvSU0crX8Lhv/ezGtXQe5KvU5lvKIn6LyUeQIYCUsFxyr72Gr0Fjn2wY3CykCbRfnHGJ+9J3VfgeWGlbIa9mi/fWZkItGyZUhmNGCUboxcl/jPMVPj0wg47KURghXp8OwlDPHTGvJnsjBC+lKrguOEb0aszzezkXL06JBLErCp3YWp5izg9YNBKEykaIuLIuotIgK2SFqhj9DKyMZxGt4M+dTYxKWjG6kTrKSE4pArUG4dbxIgxjgBMbJ9LM+jvVv03BKOXA4STD9i0lIIEAFIG8d+2MZkwNYm8NuoDfr9PhlsPqEkSyvyqR22uazMGGCsUCnsK9ren/RC7lWgHuNRgO64cVOiDdFOAybKaPQcNepFBvP5J3JidB34nUmL7QKm2w2DyInPS34kf7dLXKSeNDKq1dZTGQgKiE+umnB3XDsFv0gEW8J8EZAIgkXeR/V3YW4SowQ3gfBNrqyCkW0gbSSg78a9yPn03jNmpfYI/xDVYIcyiDy7botAkNLlflswEVRmACuVhV4rihr8unyQBgUt57eUULwKFA3x5h1OpJNfmuT3pmdzMJUq2lt66dliPllPU9N2DzXcewTQAIwYoVQqN7XSHuomGpB4/UCpwpgFAWxgVmaSLT7iX/oazRYwIgek78CkJfF3UhOFFett0PyLEZJAWFpEgxgTKE2HHDGJEVUtD9E7NplqwRurcaZGy4f4Uz7oxQmmJ3DZqQyV548CFL0CWtyWeX2IjHKaMtwUzCkJVDTxDZvk/VPa6tjRgxka9/vGJbDzrjJb7LBDregRQSlkMdBltWVD5vpapSYBjosw2v98gKS7mhgYpwkqKxL5dfNgROJoRAtHHXEYvVitObBaeZQTKiZXMToRMffHBXJ90GimXWyVHTOV5ejJD2zK43HL9ZwY5j4yWfCQIIb31h8oXR7r1dWDYrNkIEBIWBx4Oi37Vqj90l7cFgk3DBSAXlf4c7h4x6XUXdGQE1zg+1qfAhHwZcg81NVUVntmmvyphJ4zAF3RHrIxsy2oU0YoGUHpBivp5EkQn2MnjehOxoc5BCTkZond6X8YWRJVjaxWEGhxWBIiOsBohzEShJhTrzNtIoQwSvcJK7bCqllj/9JhQ94tTGlQU22oHPeE9DSWmeocSsxQxLljFTTTUGOsXW5Qe88NGdlLG5Gd998Yh0M/n5yYQYavLQpexGqHz92PWSiZDMD+rqo8uDAn1nBSdu5c1steZpLOtADgWAaewXlX5EYOBXwqgq9CPWvfzCKtoy7S/vLtpKvsWARQUpHyHrbKtY9zv+6v6YZIomUIB1m6XWxjiR5NuD7ciQU7z5SBYjPBUXw2M26XHyHcZoKEK6iyESveQtREBWsvXq+aJe8ttnPsdRl0EbxEIFnoE0qMQvNBOBW2AYGJdtsH9gx09C+Fr2tK9X9rRY6m643fc7M23Ysodgk6HjWKNFSDA7aFSCEpZyKm+cRcYIYx3RmjJwODWSJWHg4CrXDvDALMnF+Bk0DczR0K14ELXG5yI0jgki73CdsSPTSPaWyzQawJ4STmzsQK7KySbqJcQcw219iXFql23N4kSQdoQt5j0IPuKCt5iBfoBL3GKkCYRDCy9YnpxrkTPd67UHomufhBIUIqZa+Jj8GoM5paRsadv8T0xwGmjLprc7qcI3PmzBOfarEUsP+QLZk16zy4iwL8EXm7H4BqUTLav7bt9LkVeXbgg4G57goC47fTJB0eowByNfjPK92raAp2pM8XkPODU/0HX3bgRl2lIcZ0/V6FSIWu7LtZdSfMJZhlkFI2Z8tQqOzP6dUw+m/f08OZNn4UbjXyMvNS2I2WRNT6bYXjjxW+iIiuPRK1dKP8MrKpI8jY5JUOwjlClnElPJZ+JR9Haf21eifrLq2gADdQdrR8R/9N+jZ7cqqbTmgLmLqT4agSkYXjRFFblfGqPtMioF+tGFIb02xFiYdynkep1t3x6fCcB+b5dPB+YprwSxcn/Ana/Ni4jFlNAX/Xub4VhZ0wg48qGS8qSE8J7pO276uwD3EiVE5JKzoq0QeBSSBAONuJqFVi68zwqRiWhWcbImdv7YG7/it36mHQvfP7h0EVwjiS0Qbq7W4PS6S4WGbAARZAlgIyQz+0gWEr2zaYs+jBFsDWBTHoialpqhNu3FAPfx3kb50RQeKHppySlWFrjxBOVvGk1uRvD8A1GjffluwbFUgZEBuXI4zSu2upfbKTAeKo7GinUrg0JOdCc5eeS1wHdR1GRhBFkQzvOVLE/U6660XIHe3XrpPtyCM3ouygWTgYVPdAZGQJfW9aGp8Sk2aHDMCbAFA3LYpw8EseMLnLv0vHZby6kdaF2Veccref0YcwJYN78MwY84sEC86An/82H0t0eF0qa9FlpM6gaBromg48UrbPX+9uNYkZQ9VgnKv99cM5nKxk/0rGGGBwD4L93x0cokg8pvm1rqHUTdYPdrDumm8lfSEugR5fBCh2elcfKVHgw0s1qOk+gY3hkisi26vWhtJ7qhQHrYRLuLpGXy3IM2VxSp6kacKExQOHl1eYEHritfklPbJ09cuLyI3QTdozx95cmH+rCN3RpqCxL1/6YPeIZ6/tajvijE8Uk3Dosb8ax0k20SpZPrW3+MaRkuw3G6OUFqm8m4NfA+EkToUtTamw6D7XrweIlrkhP2Ob8/QRQGkTsnS3tcFuAv2ksMMqFJyO7S4R/wjJ2Y2wFxciLTYQjvwgvymlbkYW7hwfU98xZQDGLM/yWE1yZdrWR57nDPJo4WyLrq+R49jvxlY+wpJHuhjcvOybVPpc+OSX17P0tB3/XJiAg9DqtNeGsHagJ8WBgsfZz3cucoXoMgzz2qKSI/VQSGfGEYOUB+F8Dgsngg/C7cBTPgjbMWMv1KRCOvolf1MTm4AiuwRvvYbgkUA6yINwIOBBWkzQhrAHZcWrdoiErW2OCYzDFmYk7zr/sxbKZU8OymxaUWIM4kXzWsZ//AwCXqCDt6X+tl+vw3weXTp+Ec2gZ3e0x+VGGq/6lzBH51lQD8rcpNdEjvYRJK6rwKYQz3XkimhenhYTFCKz/QgxtreMBU1EPLQmZ4rxzq0jQDZ1EJ8etyCmAA4NVFbWWpWUtWx/ynAPigq+I3maBmbpHIqqcD+qYm3CqD+okNRBlOsgCbZVD+EzKo0L+0eoz48COVEaZZlc3fx7jm+jXmiYCwGMNSh6OF9zmG6zBWBSGlCUgdoUOZ6mjsqxzbplC6FD8DUWfYYo5qs0ukNji6liKvxAcMBXB2Y9kV2HM5tAPJK+Gq2TsYk7VYdvuHwwoy0HB+D82Z72M84iTMeukLev/Slk7eSEL05qAjIdCI5kM8ajkG11GSllDgKRZuMABpdpVk/XX18ef7JMkJu8DnzsFQ+/ZVc+pVGhVqBF5sS4QlPXpfe49bstWCCPdBqS+ouxC+2AUGSLWtiE3KpDV5wdoxD5BxoGzKWVIEul6vLQ1piV4bnd4YStA3R3Cwkulmu1DFkEWIMwDq9GtrWtr0RkH8Rd9kpBaKo1gY+DdMGwsxknviSc5qDer2VYa42ptRYgsDEM2HVbnioFP5CZGJ/eLEgVE38DDuw5mw8iy54G8tE64xkGvixkJgs8CpSOlBNWXGQJMYbyLjEIrYG/t4zJXNiwZGlhClT3gLasa9TUjCTZKzHPEmnXNbHpzYLZV3FfbKk1L6LHNKXBFPNaSf//CtJcK1gZbyuHrqVmLtQIARk7IyAzyMIgmSBQq6AX8rjP4BSi3aFmvVWxsLcEHxlLGi/xfO9uu2F5yqqQa11SsASULtxzylIg01Dhj4Oykg3FJGnYqcKZ6PH6kslbKsrUcb83bl2Xjse2f58z1r5C5jBKYX5Lqa9l7IIAYy5tfx3hxIfp5rSfMM55XePENWMEfd0ZtTB/dviykkvJ+hSrgNGuHUa/YQwbDZyfNmH5hLiB7Jd5QNYTCwU0NbYaK/N5RH2M15hAVqMADf5ALr8qiR5F6x3sE51PXIfTpS+sYGiBmTQ92EkKR5UUqLsIBJsB8yO/Lgdt60udV+zBPW/x5fXG5fs6TfuvZrQU815Q9JxshUZlTInnWsGul1biegD4+g+mBDT9rLKakbm2aUWiN3aKbCskWZkoI+AWgobHLJE6RfGBMvF18vDkzQIiNV3MToADVtjbiZV3B6CXY5AgbSIdSk5HOrGzwy1aCMyKliA1NLszTub5aeSOy0jcepyMAE91HffQY4wPC62wrNGBkO9r84lqrv4iqoJRxCo2JW48YbtqGAh67HoeQZ1NGOAtJgoLXL4k37R6uakpClAPFaso2SoMp50D2HQ4vKyOM9a8zJwtUbELWRCuD7YJdL8V7cbP9RRl07CSEAMqVp0chqCC4jfSSntY6mgFjEJqcwAIqcqP1RwalxODiFzZCHMwhL5iOv0DCoFnISKBsNcTsIA7+zVofDvcUIUnHgSAeesDeuPBEOrmZ+Bvor/cZplmBZBMnRd5Tv0DgVZVIR3qugiBUia0hXIai6JWeaU2cp6VsMY5oIRjuOZtJlLgNDn+ckS8vbjwmC8nge/hAP35O21Ad1vFP8dG3TNQSffnwF815Y7bKh1R5en7jhbmHX6g8jj0HWYYa1k5feN+bxI0I8UM+OPHnoY0Of3MmYOrBiTA+0NrOorjUiHw8viIuiEBVfhFJoopQq99Q/7A5DrSv9olHp7uXR6Qyg3vQk5dEzpeYQScAXzzGZMmJd6HihDFsU5DrUeGWsknmVZjFKNNubHSmGDByx7OnQsM1Ch+qzvoUzT5gq6BIXskjqBxf9v+U+9I8D0GI2b6hIgtyod02Ab9bBIJUJqiikYrn6usRJip9HqoruW3EvyLzyxVqTgNYksBLgpJ64XLArq6A5DyRAXbKr3xtsr4RY1BQF0qZx7kfj2fTGRVULtFtuzI2WEODswfbw7kcaIzNHvXmVeBqlRLnk5ANcTqgjzDMArn1SDlom8vu365mdWDf5s+h1ReKYRsmgmfaKlu43BQJjLVKgE0ZgEz8frQif6K4dKb1nXmreNBfR1g1EJDC+kqgvmg7HqC78+pi7EIeH69lRa80LgXeK5GbtcDCLWpIC+OCGfEl6WptFFfEoy5lygajg8+tz5sWoULgwUEyeLA6khcOSZha3J6SOComo3Hil4II240FE7Tj2zwy5Oca5WF+Ddu40Me/G/3o9w6VbuvmyB8WE/vtYG5qy8uTFKDUnnE3S/DEyFIW/5CHRKhK4CO7PHqNIIjsMkNQkq4onfbnlGXtkNHaYvzgthslHeWjiBXd4uOoUQ+FCFr/gSelsmUf/BRw6cp6M8zSaCkWwQrhNtweuJpy1xFkc/mMPGNkJeeavZ+jPY8IxK4jSe6fh9nc603Y4ltBerUPcGxpSHvVwanSg7yVCv9eZJGF5IHj/EYHzONzzqiUubuCIjMSqGmb26cA0nxJQqVO2rgHgK+tcKBLxJVmPwvdc3nR4kmqzqhY0QdCagOteMSgXd/aO0OWhwmXGntCgyIBlR0UzfZ0c02+CuSmt6bnao+yzFVeUI+I4WSIUvkmYomFWS7peeQIYV8qgymI74RpkQMQ+Ww2UUaSYPH5+FsxAkiUaELC8bYTQYFYMC71zeX0b1hygy38cqS5ZtVtmgya2qkP5J6unlR46rKlduXoOwMQEGy/hvl8E8mtfknwLS6vfsbH1zA5UJ2s075UsqCu7qgFB1v81DqbFhQKEKxBWBn564r4HkKHtKCUMSW7BDZaRysqJskWqKZf86OD2Px4WpmDtRVk5y8j1UGFNGF4TBc/I1k9hBctu9W+xe56GF/3YwaH9Cu/wDUOg68S7eb7M/3HFyBEEf5Gvs/+qmxCZasS8GnV7zBKVaxvmxdNwivns7LCdG7f3yNkwSnzKQKBcEjusUBMi0Afa8EQLmtMlVwkYSvqea4PR4ESfZnx45xcXer9XDh64+7R0cKAWeH3cq8zSCxsFXOdbYQHfsO+5AdUUFsBC2RAQTTt+I4D15VSWRlOOlGB2VQKPe0qFQ1+bcVhYxFavGVeX5TpikKDRuYfgm6I9oVDWkiXTUR6K7Yx3RmQlCcTU288hX+ji56pVcqVNu4nu+f/MpWYQ3Jlk3XaQWwR4V9GORUu1HUtHxwOAUfexJINHOLK7Bcftp55MgOEbnStIrrdlivXNv3Lt9SMUrHuHpUFLeTP24JbEntbEEEZJEPHASxmgG210TD0Vt54Ut761VaJ9zXp7GqM9L6I0HFnQdmdAgW3UB+k8XbKeyven3M5QBWXZakZoYK8EQKit3wNyOldEat6YJ/r9VPxC/Ms/26SraXlp0yHpWjuAIGJzmaK8kwPer6t5D8p66Zmi+JZbSThyqmJbl4LKK6yX7dKsOXksdEip/0XkVDwt9+UVnOp5g+CfWCHLTHQD/ByN0Y0Ll0XTVbHn57CioBH5fUXUWpLO3qf3ebuLcOYpmmODIu5mYgeR8CtWEOMpZhwx2lyB3HUYWHxVLjQVntzGhwcHyb+8lRBT9+ILTtL4v+ErASWBmDcLb6Fh/Kgf0qedZKY3JEJR5iK2NpgbZEXw/D1crp2w6jVf5ZX1RvDchNIZh4O98E32C0kOhkiAx8yDUIah9yvbY6fnWBdTAino3G7Hmr5XVoalQWGH5VymqOuX+VP8QURb7Iadco615suDTq84AuA1CbSq+Svrm0iBfWAQnb/BhCdg2gLsBPuXcRMZryhFZZbNgG/v8BX7BDWKsLuheQDHAydD372sDIlMekX/ZTSXRl/+nk8sSlGKMlgzbYrKrk3MtOog1tPLbA8/xBOTfcaDLEnpKcvXjk3q9fUDOS3fNaYyacNoVurcD7dKvU2dbwnPR2AqUz4iGOkwQP3wvKtpDfUUrg6KklJ9TPVqqcdqL9WxEBDx/ecp9xS3Sq/SJIqtB4SEKXksstGWZ9zCABka5GEd4KLEUqg/weJiRmzeUNmiOVIOgcwCgdqaVUt0FakvI8f4chTLe19XPoYkHQpmpwuFb+qslBR7wFeVZ7q7zQ4Jw0RBBGx5oWFBTKbOL6dzeAQ3jQ0ViylscQOHnEBnGMS796zbBx6NC74wzidJuRedtHedAkFdcUKdKDB8n5jM1w0RrgrdKuZlyReNuudDggJ2DHZ7HlU3BWfCyhZ/zR/Q8aN4g1pm0FCBm/qla7iqbvyuDUFv0cIEdF4UkkOdgEUzOhpEzP3ZqMrMsJiwGiJ11Ix3SMf8K3GYDiS7pyRKI1pVH7jTxohCmuzn1SfuLHeqd5bF+eOtwonL9J2p4M+OkDhZMrP9lgHSp0Q+KQo/emi8TDikUiagG5zgqxg9HrbwgKDwrSRGxJahCYUZokZI9/H2O9GSO+J9S8JjGlFOFa+mPRqMjX4Vny2kKzm3rm71qTqy9xS5MiAhN/2TkntPUECTApzPKKrHN+Dfkk9B0Ie+76RuIw8E1FsjuRpFELbxLCBDGS9Hpn+uCLXqFgH3WhBiAd8JNwV8HmgG8bTdAx1x2msVWciQFmtSsr4OkjMMkI7ikAfN+pvZN457IUZe8PbtqEoCXnOzWaRRq+qCb8LcpRYYs3VWG2AFQYWH4jcgqOR1kAcNbGx0fQE1qOLwblkdZBeN/KFv5/aSTPI7ZqDi+fpv3ePbgqvsVRM0Qmi0fOZce6/XR2Z/jE3UjW9r46C6OUTXEnFBITs4ry98NHY13I65hawahw4t9S2mdTF+0AeltSzvUnqH0+vBfXp1toVomNWzW+KAt69algWsuI098+5g4DtcKwUnyWLGMfZN6VX52Mw3lFrF9RbmypNerOeStcoUGXluH9MMTDq/LYF9oqGEaRIV4UJO0B+ZPUzGbXFKVdIPrXujIDkZJ2Qb9qwIDPo6dNkBa2/uMlYL0W+wvQpZJbD49CEbaPZFzX2WQBhVzx+PtcN6NC/2TiEvNTbHIiM+3A6ZR347ZSJCVdPHl0FKmW58CV3fLmKQnYqoCAgMCnBSJj+aAiYo+U2x23J3WYxwQACDZ7b5DhP+2jE37zMSWSWYdzHDynWAYSu0IweV2NvtKoi3ws8wvl95IlpwjrnNLWdq2WqC2V6u3OPEwVtRyxEs19Q070kwvOEj1PvswMHvMgir0fDVFJyftcAJIDS4B2kuGPMwXpY3n9f9ED4kCpp2TGJnI3yWUJYclVvbn6rlAFxdCMYlby0aWOl5OatIA63Y/prw507thpbUw0Z8DXUjRzuIO5ayRqyuOepPAwEz+4RiHzIGjlVe47KG4djFojzwBNW/BKBC/NdGk/kTdgbNJC+GpWWpRyWH6B12twUIqaydAph0JW88PqhGHctDpNBtowirxo9NXDb0S+xDXX6jFbrPqWn6Ely9q4WY127wn5j2kB6veA2pJ9q+HgFA+umZaoaLbfR8bb1SR8ESyxsSCZClibEawxWfVFTaIrFpSkP7cgwrp2O/0CBQ0n15QkMMDAjK/w5B2f6jBNgJHWQyZgnqkHZQnfa1uZYEi6Ch/Gi6H7yn5vM02G9kyUoNF2yJ+77IJ7OFXnUQwwGdfHEitwh8ZDh/WJ3B3Z5CJJVxLtfDZG5WCOl04CAz1nFjh0hAJxZh4hxbRUlBvJ+gAYYkweLgWQ1vfgGEhBwH+5D/J9Py4YTWtWNt9A0Kr2E6FYXzEqOh4yTJcvSJ//ghXch1yzPRvwxC14i1bsB6L2iYvVVfy4qVB/OeQo5rSQnZUkNkDsGXOs1BKrUO8G8STwYMAwk9H5eGFDgxarKvty3Yc1kZk9mjBvQyXCngp9C4YUXtFw4ZLMjGRw5ZXqJ2wM3vc2O+xGrFP6DLGCqzOaN7z9L/40DDqU+83qVCNcraFIiHJUyjr0mT6qm37mi0ia2pSFWEP4LjfFbj+3QUmbd0kMf7lhuIlcMQ2NWQ8wnYGzCUq1EEFOZtjROYAjUsnhrdy+KLHcHVLdgZ55twEIYHOLXexrZ0xah5IrkcNfU/M9x4cwnXPiKv2YnTQMXZHmLXH42K9l1cxhyTbK4gBHqikhSIHecek5qgq0DWe8RUMp0PNVkhK/Z+rm+RdGS/xZn1hrzsnI7h5H5lQaKSZcGuxB5VIrIqEUyvJOLM2PHwgDo5YgxVtrzW1KFhINDIzQVFIhRoVfDML/h/7zgTL0UZ2V0/vQp/eb3B8aAGLcEqFebvO7F1vurqU5gmRrKlhLeGoHuh8/qMJuyhJavx/DgFgZa3eNWJCLDDSC7iLhjg3GuIyhbYYoE84MAO63hGyAyVfYKBTYPs4UxpRtG+1VSeiHGtKdFaQsovCs2hVFDFjxO5RgnmbKAQDhT2cRF6vhiKRI+FaF8iQ5JEQA7v5ipvRJh9057GYIrcf4IRn6bXAG218rSWw9fLKS9V9fFxMoocJ712E947hB+V8pxtX/eWQcEX+Aurzq9WjxrCIrahSfBvPZlRJQTjuQKXlNmSLLo4zEm1hmpWS6m8r9VDHaV+jLtIiQHZP7OJPJ62XuFANcD2Bk+vI5FmzDwLPLL0b4b2CKVjfx0T4woqEQtHZWICFViilHoVojxQPM1M213mcULl/Cdb4WFgG7ET6uudWf/kifu7VVplgzYCdHLxkLqTcpggbW8iR1CkjFkrjJ+5ARazKZS1yKx0xHZcmk2Y8rHsFjipSEC23pINOF1MyBMe7pOw57E2DGpqpcy4QAoF6glVPsgNjvURAXi9mxHjLzZNtxjlpA6CW9zG5EyZKQ5HkU7cbiSNXx5C9yQ7nJQaw7UXcKuD088tfCZZzXDukKLqt1xgBaTTcoVQvkf/lTqu5KLTlr7P1GKbeJRDpcOVoOqDT70peqar19dOSly49vpIO1ylsvNKdeHqFTke01Y4q8hxy1TcVodGdh8duBfFgqxdO3yWdwyTZr5Vu0aC8BAZgRf513JO/1X7GkHXm2rVqOR5stCW+W0TjaNnBA1huygc5md9DqH6/fxyxuikb4g2PIHHAkpUVF/DJBbwOByM0EVJjgMvGIiMozojoswuwi9fSuRsd9IojhYOpPkoaARMVsNgMCFWudhBZcwbZ2vxPVi+TXpr92AGXI7VHobnVyhjy+BpT8QRGOdMDiSBI+9KWd0E53tYEFaMKyFT0dt8/puWnpPAqY7qVTsIVo+ubgMZCP3a8w44qG0vhEE49VAqr/YPhU+xAF3/iWcePWovT4bOGgmyjfKhW/fyfpDJVxM0UM1w8yGO9sswu1iiq9fjSM6ywYm3Il8+jhi2vvj1LnDxt/p8cRjoEray79Xn8mE5R+jixTgTJ79kmlO2f/rcsqx8ZQPAYbbD4SNlDNIG9Qo3GMJLTE78UjengsTTgl/f21JdkGebhwWy8y9tBtDvjgtdKVK5DqWDPK8ZOrLZ1IAwUR+BGAg6lnH+2QUZA/o1h1WgAoIagoJj2opESQj2YOaZf2WJ5aHw9oKXjWLoGEw3m7CX3Elngd7eiMyOgQU0pwccURMxIjOi27b1Da5qoHB8j8GnuZKigYvZMvbj0xYxqUYwFQJmKEl3kuZCyJnLIfkfoAOJLSl3iEdSPCFEonmRjIMhDweSqsgYkT3QTmas2RplMlC1lQi/RxOBv/rZXLT6e9tuYhi5oT/SYRQ5UHvKQtWqDQa+Lwi5TYaGIo8GBjOssOuGHzR4METhZyvIF2T7oSEsNlmZM1ZGmtEsS+U250h5nO1AYmTRw7uffZOG0wT91lqIgBS4bnE0C5l6itpAosPkIwjYnTlpiQg5Mw8THyXTlflFHAMWEq7k+Mq91Ui1JvQWZLDALDnfnb2SHiE3nWSJNy/VSWEuoXGbEg7Ypc3F7unBS2wGbKs4t6JV5uJ6jmCRymikz0iOuVbcmigJ6i7r7BK2wUiblegL8axQUtztqeb4y4X4StTEmN6zQJju3UN7T5qAF+n05D6iIkfa+KZiLtStblwODtEDcpkB5JC6ko8FYzx44E0HVPAj+AAOF4hs+GYrYUgGUDV8z4BtQ5OQDMk45lUl2EjwdJLc2OxMP0nwC6kGfWzDZ7bAbWfz0lfPHlpqkFXPFkQE23bp64X1/gKUSpLtNs+RIKmPQ8UTA0RAgND3pRonwEYR4jkEuC+1I7ro8WpRXXOWDUBWEkNuq6gQiT2vlJVTwVXMnBApLxDLfK6LARkw6lVkGp6hHjqW5zZ3CHH0YpLnLNqBfUU6b0+UUiFlECPiQ4uuUU4dyOPGbjUsoZX8W4WGjkf1TtLsrLeQMlzTty6t2akYH3SUHZxgqFIVxnI/A/XuFZDGW/7sg43QWNbBjSgx0iZkCF9JO9YxCE71Xhic8XluSO8khZ7n3iEQuX8sNeKcjUO8nU6dVOT4UkOhBb6k9TKwpdbZq6HTb9DRwBEY/v0UtSOyCi/d3uLhmrxlKJg0ed7hmaWmkfGkZgL0Bcph8wA4UDylV+r+9uGFdUEfxglHh3ELwUnzhqkWbU8L2Kw6rYTR05NUko8uln+OwJF6SfOvEDJUznMUo8gdu+LxTiKq/7mqAaoI58j3pFoOUzKG0lW4wip0XuGm12+6356xwjugVCnsBpvgrBHXT1zw174kSZkK8R2GcfmdDBM/9zUGDlXeKSHco7OSqs5km3vpV1beQ+A53kNAC6nWqFulAfCNyLxlsGdeqUrWYMmaC/tgFRBXGkJeSChPSb3EeYpfwgEz+auscl99QHgrqINFApzIijPcXfVotIf0Mgas+u16a93V+k4mNgeph5JmmaKoahP9U5JVPgELFuRBXo1KhhqU3l1BqxriLgUSyKUx/HOPw1hdUH07sKhN0mmvFbyLhrKVqQLm2832b8KmeJoR+4ihWcKpUrmGachuaGsFQzYJl92+QigzxSIpYQFtL/t8QBT3dGzCcEX61Xtd0VWDpuh/gCi7NBUtf3nh9oOoDoTS7ogVI6hFFDR13zsaiulpQgEv6JdlLMPLV8BVKdteAV6NfXomCzTNDwfy546lfa6c3Q+DaHV0RgYkKs6y48NB/UCT9K61Gv6KUiKaCv6reUKf2+mVWFKbsO/J3XqZQIAZ/mMnrShmMVHacwYDLnYpbIKaz3T7n2ehwYgNDmqefIyWkJw59bUvmU3h3uvwzzuRAoU+VGuAQ40gC1sU4f0I9HYtLzoGoO8VPVGaUeEbOhpsgBrDb+2zwqiSnjp5XKkzYxOOs6hgn91b2UqsLGizfp6DcXu+/F9GnKIIUJou8TyuY9G3BHpwkdCRSZBEWcfvwk9CEolz5xowJbHdJk3HmDeohw8BRCU/v9ajkYMeGGz7Gz94HBrKHiIuEMCzdmgyh/1XvMDaoeqmbtp9yb+hbErzaYhJRXvkwrFDnsvO7IDzXX6sCa/lEdV+4jaYAr15qVJinYfVosFD6hA3dwHx+TSpWBull34WFaNwgIooG4FZN5ZNksmi8tFamSlAEMCavuy9FoqwZforPsxtxc1oaRYFS2SpbYr59uYHz/Ndod5nw/VQAe8vLUcFlOX1aU9kFRzXYi0g1ApHCp7reWB12lKqcyJeEotyKeWor2/qcSOCQ9OhorPI6gNjX+/MgJyUiOFhyEtI2SBEG7bUIbfXWlhzho2DeoZpdD3u8pleb4aSrGXZUcBT+R1dhinCq6YeRgZy3jxSrGohkkwiXTbsw39z4r0BEdNdHQBbP+s49hQofL91QZ975Zcq4QnuEoalKbrf2pa6lmOdMtT3z5psGqqMQBwjjlhgn1uLjRk9M7cMEBYt91BEAAO5wHVklbL6ZGz+IBrIO6NJF0XP57nGGTar3teocsWijb6sTVT1fWJTHM+kdlUXA0HFtHsS+o76Tbf7Z4iAf4Afh/5LpzkrfxXwuXmsSrPSqzYo1X1Y4DWR/+LeaTx4njuAdpyd4nmKP0TNEpQ09OvjRCxWG0VdDo8vuYAhHi+p+Uo8SPtFQxPzCz/Dgd82wGgmi/mg9vai3NI6u4RGxpcJvm1zwb4l56YRLIGCYn2uW42acyAmm7ATh8IeRzRtzO3j5W9Onq6Z26ghZ2MVLyeZsnrWqz8PtkYjeVpH1DXlqHgX10GBFpecymvGu+I5EdS6u6rU0fj1yTAbC/OwlL+KtyDiznB7NDMSu+GlXaTT2z5Jjp81XkmQLOeg7PBAewmoMUQkZ9XqGW2MsmyGuadPcGwLwahoHcKWl+LV6ml/1Tb+H6ZgFLg27MLv7MHQfDbjIf2u2BI5Dz4UD7t3ZcDvmaPQkSEToHb9kJxXZ+HNIoY6BnFNklErrhfY8IfwBprWXq0wGnx/sq+5YXsYll2h6okDoIh61Nw94HdHaNAVrz35HPxZE/4vJY6Kuprk9Z7cg0/u1RmbhWp5J5IWtxAcMTGf5vABjArApJE18K8lloHzzuUjnPj8C2tEdWcuRwf638GXjBchZn3TafWA4lYa8MqmrZwOCjK42g303awMs4zfYaUgEU3Vsd/1EJusPMQkxnoVbkZM2DLMQwy5T8R9q4TWF2u0PIG+e0YRrrS2Z76+mhDAgPiajhqMMm2zljJfO4jKnpFdC7G6jAAd7ZlYnKYgpjRkCq6wGFzThDCrBIAMGkiuI8bXA5EsZSrXdJRAlVK2ginTsmKdR2EOKuJ5bUsw2bjl29RHWKrY664rxSkkYcgDDLW9gJxVuquLkTyPHpXL8AHEPELnJTlLVWnrnvgLwhKqPR9BDMjhcXVR531/vzAEqEZlbZNr6/kcYujJV3iynry4do+l0IvH5ZGzvqC2Jre5cfiWwsswWQkgGAw4+SpwqrFkLu2nkKA6JActdrOktMPdPg4A3LrOSBWiKO0D0um+GgAKn2lR9IMSB84J+Zy+FfpSiA08TIzSMmgughhGnwiDYNzQ/5MKk6QYzvVD4evroUFItyjmEfZ0bINQ+2UI+5PWStRrlJ7O5S4VEO6nyRLYhPUmmtHSHs+7fNJ187IzjqRPx61vIwnl+SU06sRtVIuzVo7cmNi2KE/dQC6k3G4Osib20CrzCZ4a3aZl0pZyRkYe33ng5QF1HQ/WHkCu7KN0gFtULlOefRCj+IGfpzz2VSVW9GoUrlMPzrGaN6XQiFwKBW26T3RSyy+psVgEnTdT7kViB5qFZazRhcwzwiR6wLCVJJWK95g2cahwGsGcVGLk3wrjOIhGGB92Vn8kROsZ0HbHqnek4OQYqOKgvqMQ8BBR7QCVMlRqe0ZSRxXgpvd4mdSK1G2wxOwD4F0Kkue6bfUMGtCTwdbK24GirvGL0b3CwdBe4W5pN72QP6WneAghnNnVYb/y6exxSWPqPbgu3sXgbAbT/2maDcXIcrMZivedwPDd8ha1YAHCYqp48HdUQmsLYNauPScExE1A0Jl1FaRVNysDZJ2XILbvEmjHLJCpwwFLb00QBskoeDKQIQYxk489Gygoxp+xgjXl+hQ6BCiJkoWcUYT289kHiptS4p+Bh7CCyJJ/iHPmkiBO7lGRfg1efPAhs++gkscayLnuv12YjJkktlzt/6wUYqiVQ5YSGc3XXiKQME/7qxHM5B3qA2Cwo2UnMH+V57Zsk6uTGUFR0AG/FDVfrUjgRJpZytBfp1yfnpZJyplhJWqJXCINHPDXA62s618CHx78br8Yp+P6n9EMiqajHxOV7UOM9mhJmGWXW8cHLnkgF010Jt5E4CJJXQMIOGu0qX4t2pnQNxYICXd1rCvWbOKhd+0KR3NIbgCqdYC/QDiOvZ763HM0ehgkWcVFBg5WNyAY+fFZ1VWsHTfJBcBgnP7SHevgUXy7YzAsv+xeOtukijXQ18/Zc5GYpJDbIQr99H03bG0q2MAqSvsyvmOmYGfoshUOKMI8BkIYPMdZOOd/KrvOWCC3GKfvF7Mn0RUMLI3FayBBHr/CVWTBsaLczdVY7R8mQMQpxwosEtKEj35Cu9ee8cg4wiMDSO0zhu6Xm24FgNT4KT+8IUV3FvKEtPG1YgJDaB7TWaCv/S+a04KhBrRuyF5jSvBV6Imu4p5LuFv1rNNNQt1wy0Xh1LzEAjpQhGw85fpGrrYuKG/uSXOW3ZLHOJatAVltydr6pokb1fNSrL0aki2rQ95ej3y+rlLtGM9TdrLr0pFETJplCuhmB50iZJJfxPdC5snh+FPCe8vmoJFNgMb+EnNXt9QxM5Zzej9V1CTFHOHb3MeL3wn41tcD5tQ+ClxItI1qjf6c5aMM22YniW2wlGgFYhAtH5uTPVw10a1mrEufBvQ9OAgYCm1oit8rqOhqnLvM4y8a/mAz4jp08UcpxnHus4xkNSMq0xilHq15JdgKDxRJPq5ApZx8mjLVNoCz5NXvsSSw4m9qGIxMpCdBR7RIgekyAiQmbvBpqBzK4EKUmWj1Sz0BOXziOAsOnoFjOJ001/hYVXtDGYKn+osLgGk0NlKE1elTOI9fMxTasz5ui5FrhgT2H5Sn6rSn5jy7N4CShYVdINwFalXUsKh2uH0fJPMAcGnEbtublv6Zi8iCHKGJXVSHlP/ui4AVG4Kva4D09X7cR0yyFuXEgEKc6p3yI7UiJkD0xSPXEfZrGb+AhGnWFrhKkzI4QuC/Dit4e0dZlUSGREt+wxEh3IdBZhvHyABGgySee9qEiz8jX7LSgQ+RBivPkwjIKv1/WMx5YFgeGryqHO9UWOis/YcZQAiCFVFL88BrQtWhAu9eL6pjh6xeaOyZgiZlyNdsEx6j/wZmePW6H0V7mYkSV/EwRqGQDNM1Ec16Nh1OCWO5hMABaHCLfcLH3s8Fi80bP8lMhlKf8cSd++gtdTNdHqVAHnc/HxirYkyQ7DxbA8/rcwkGUT0PM4VH8xODHzMsQlemPE516vKIifOXeiB7XPV+Z9p7k467cHxke1Vpmlp2TetN5yMUI5m5j68mmNX82wSDWOTcfi3MV4RfQ/eE71JkDKokH5jKTMGa0AeId2ZZ+erg7MS7J+wDu4kViBsUq+uS0TpOJNDveUC/lf2YwFGxSmLg+7Jp2DStOhjkQefCUBwPCAV7TLRmLIPd6AU7/ZkFYXwn4KOCMCByUWi4ZLreXyCMGZ2ochUYC6laSkoEQNobNynoVzsI1C4xjXTK8GDHWasKQy+kIHHO2qub+6C1gdLqgx8dqEqoQRowtjyQhX3pSWyQBMmHyRL8QTZdb4zMx7aOu3GXHglAvvOrgZVgopN+UgmtcV+BvPILeimhlPVBRrdrpz/KYM751uIURb1BqKLAQ+PD8KBMfdxxa9aoJZLmxjwsvvsRvuh1MhJo7ObjAO39e6Nj7/kQwRcLj6uXRwtFS6wJRKLwhiC/QGJndJlR5LSWNblqwXRPMd2y+zAhteUb3ek70P4eYNhDgDi6E7jEdfvdc9Nk7t0Wc9dTTrVnWgocR0Ul1FriYFINhSmzV9ZND1Y9wJw9e1lqSaANThrmXzAL7jYRI5NyEP2EZPvqBD4seDlUNFL37YRq5ZLEUqlzPqpcPmk/VCqS25Bybn0CAbFDwm0kPN2TunwdMdfsbPMmsLNoSvQaiEodGz5rkEixieKNMHDRZi1HG7gyJmPwTj1OHPyOW6/M06qSTOxWn7mN71qbwEZB3cvXqCKXbpO1PNR3+DIUQPAOBBpK2OMEAzAMITqeemDmlUO0pAHOlayj1pVHXNwc01pS33iLUf3eKzgI3t8abvgJBzem+owlmVxgL3C3yZsqQky0YI0YrdDtwGl2uv6yH/x7GauVoquRAf9budOqZICvWM2p4uLVbau+vF105y70nwTnTcc0GRv/vh4h3fKGKaRUbbahbEMcG9tKEuQGbt61UgOo5qOdVKPpcMyWninbe01QFaW3LNwW6nMlfU38Qg6hwsEJvgmu/GeU0mtCHSYY3bCkrwPVBhR3gJdzvv5tu2uWFIBAGnXKgPgwIglicaYvkzu51HQYQ+dQ22X2q8idqQpPRumCI8kIx+3sEO8lVwyaKkozefk6YCxwoVHVPPZRkB4PGV5tM1HKc84mAj8iyGtMg6aton0BlcHT/TujWP5B1SCLUBp7c+RTFiVTvb533rBG6CgQ+DEoegE1AReY7Nk+7OGWt1EzBldGLguDAjHzwg90tcc5HUl+iBNlkJYDuA4SuJ3MR9+DF71noLGfbaQyhdY72hcw6UpQdpRasvcUTlxLWKd+iw24JTu+Ap5oQcdBnKGtnbVrinvFyRa+NZ3R7Tt0fof9MtwAY9F4G5eSdEWtnyWINSg4okjcXB6e7wQ3UAsSqG0pDyvj0rXFOovahC7Ug999bWrES7LTMEWJV9DVjjPCGgtm5HwN44b6bkci8adYLp5WcfrCYr3c85S2MC3GXk6xvZ6wzzTYry/Z8KrOqqOWAUosbvsL60GVpw5yXmw42cw/bpyLtkmCv2paaW3wwKVbiQk4bidbKwhog4RB6/23kdYEyUSrtMAjDhKulxfZEJKcjMb5hfpFj+MX+JKEhxW+2T6ccABJohoKR+hUx+6Ym1iYQOpTBZQIKm42qLWIHlsFhGxH+dgyuFpOXoJ+vx77nvPvAZKFmbiGqx5W72tg209NatC9kM2jVe5cfVt2odQQUIzdREMos9b/1DdaOHG9MzPMhf2o09CUA76IRLPp6JhvmoGZIppz4SDOVsYRgz3cOpWgWNYfbWklkyOEovfH+dhHvwAVxIelowF11vYMFnCT9zUWhMlbDDbVsCaZpFsxoVpT1vCFKiH7lAi0SJ6cytxnAMJ8MvE2pvdQqx5hVYT8Umm7deHzNCO5a+VMi9S95WVSMpJgpHFZTmmunrtRwkm97ZgF2cRtOelkP318okFgpU+ll5LHDEzU2IZxsetnZaahACKZxSKuswh4Tagqog/l+FsurgyiRtx9nlC5LJDe6dyZYW/h0fT2kZ3EIm3I9sIGijjAEObg+8Pg6QLrE2VvPccN3zBCldZfIfL85r4/oVST8TSxIaM4S0kfc7Bi3Xt0OUQmxu5dBeBNwOnW70MsQpnNRtImplFOTS+XbJmW7yVRnkbbsUqh3OZ6TCaVzaC31JD0+GhdWy8vEqyBlGx6lquu/TggGkHJ3yUCk46VzbT2L6YIols++g2oA8234Al71hrZpglgWt4SsEEdrond/Wy9TagIUEMNf6gc3voyZBE4PVzi/UYmoFYe+fowDkIRgGO/YtoLnAi+h7MyMs6FaXxkzmVAxvwjzHciRv1aA9KHP5TK7Wa+8HB6BYAli8+DiOWb80BnwD4743N/HayFK+GtHuGAHUu41Tg3ZMKmDOKzf4ITq0hAJ9iaVRg6goylX+Cukm9GunRncu8Mv3VQ69gJaFl+3oGlgSqueBjVL+Q08IbaA0+WhNqmkdCFJELaXSkLzMSWzw2F2hla77hdtMvwYtbUj1VoDGoM+9CoYuqS1TKnT7j5gLmOM3NBZcDVJHcWg1FHNWGbusSBe6hGdagE6rgFBXRpook543Nd7XsPy6FZBwLp8iPR/b3AB20J+aKfPJQbOO7XCW0hlweWuIrtw+cSE6uMTorlblxBGsAEx6Rp/VrvhIJ+DmeA9LVEm9IWP2zNON4uChSBUIIFm0GLYeDEmVxwfXDZEirEgoOaqAnWRJQaekO0fcSC5UqMJmXUrfSG6G03zJ1hWg0ObJRLsm7dN8U7NTSsmEq479FGj7wiWkw264AXn1MgN5HXbdsi8FsXPg5SYE5dy6lZaqiARqJMitGeTBTzCA3FLJh7PDtCyC6jC8EBAOTVolXWeyQMx1JRMcAADFJrBEoRWCN+ddGo1LZZsp9SSFYABL9k2OxxcbvNuNx2H/VG+TJXNrwXhnySeT7JY+YwBqQUtZlEKcQLRUyj98GKz8UdIWxxPQAhI7Dox7z6nkVXKbr3I5RfYxBR5+EyPqYSoG+b3v+a9GEtsQ3Uq2/MNvWiiU0Xz8IayO09BGjqXHvonEVsSOtPRsM0nJ205tvQ27Tt+ETM07UMvdgVMOhsiPq2xQtyyEGhmtPtisNR7vfir1+n9ZJpUFC/hSQC5lluR54fviRJpOtEbxJpouPmYlpBORFiKsoANxALXisAdBTzCnmgZw+8Y6mgGsar/tndzSfTmKQIZcaJoV0NLJlzrGopAb3U/XD8W2IYTQzp8oXnwgpdx1VBlVuvmeIcKIbbzUY7N7pKwxE7aZ0J6c0FDfs/mhQFvg4XBjTBLEvg1B26rPJOV6lzMTjgLVP7m8zp5TouD21BrVdnqjcLahSQeGsI0g/XICI6dF0D03JGQ1s4f2GqZZYcFiyecI9RWQ7t80hR9LlDSS3ecix0pIBsGL9jESlJikrZZjPf18scIKTaroOw3XWMKnn0tH+rZeRW7FHrGJns/b8VK0lxBxqvnaDa/NI5MUk3Ltn/PeIB1QSMBkLBjdJisECfIfjJ+pCXj47yNg1yzYMhKCqGY+CVpX9z7EwL9S6cfbzkoBntjcvgay+MXTBnlQ01ACq6ghJlN0Dxk2hsmJtEabA3Rdh8Q7LPkA6q+K8RbZnJccTqtXYDqost6s+uJiwsnJ+FEu2VOqsjJFb/bTBi0hTEX/NI6diSkhPWCpSdWAnNyqa5oou5ouroIGZhLKScao04OGOaFrwIdH2HOQGc4VlTVFRMnzRFm1/k+wr+vok5kN46K2bzVXw3xKfpCSbIaRSgTwvAPYcF5O0GwTBj2gE/9L/dKdQJXDC7JR6xpofQMEW93SUhzWEuWDTYpCUI3leQPVTYkk19eBf3Of3ku64jL8ywuyEr8PFjeYVzqwgkapi8eXkn69Hy4GMIl3OQbhZ8zHc/y7tvPRpyDBT3rC3c2Kho8YSzdS+SElSwyO/FvsG1hz3BqLLTh+1WmIetUVcguGNIDr0G+xNxzHvjlBpoF8MrPGciqSDEh9OaHDzaerO5LFFQpR/5gCEelNvDVpBlrmytCCx78h/3Y+bNJ74uOOjXwSPfwNGxZ8lZADjSHuVI7TuJQrNQ1bnLDXRRL80GxNY4UIg7Jx9U1scqoCzn7IcNClT5Be6s9SbfCGGXgEeHVH6Q40BOAzGBUVQdV500MMjcWHWxMApByXyfrTI07RuIISvbQQUcgh7GkPhL8K2dm36DB0kJ/78wFOhTiPKp0X5L9XqU/ggNLD9O6gU7V8SlriHkGQOkx6WBQB+wbsZg/LiTcb9jkjbDVOOoBVaqbjOLac622TZXsZZHGLhe5BiLt+svhQ6j5TGKzAyZDe31dJkSedXvwMPASEmGQQMlYNq2nPZIjIsc+fwzuwfka9xPNI+tYYaSDwV91bbctMs/KhbLJ4CB7BsMIOiqhu4aUi/As5m6PcDncyiqcNQbn0JQL/abr4MuiyRKG62+h6SWG0E7FbyVlSS+h3UhOGkCFXlGi3/xzT/mvMmOTWDeggpSbsq8blZeUnuz+PgmFIdOoeTrY2S5N2NHqmZ/Nj0DqPpYZlC7Bc3dB6W6/IYFyGoRrZPKvV3jFcR3ekAChGTNH29aiJsOIe+pOYamxyjC5fuTnzn1X3An73uMoWZ7GRQ665BXKT0usFbA8pg8qQHVkh9cXUvuSgzoxISqb/VxS19JzUHrE4w7XU5YYm4TksC+DCwbJN+iKtDdy85ylUTjPvH0SLdKN6//AYLeQ05hJ5ggM7Iv+F0Top6hpMIy6Yc42h7kMvOOVviIQOfcZBGoZKpiCkKMDXxA5kJLR8GEFAVKuR68W3TjSn2qS0Qmw1ilZ61HTdLDJzWvYUy/S80+86PLYskIiJl5lUnV1rLj+oIfocYZxTysubJyF7+WE8V/8FKfDgsYIShPNIkpBwR7RL6uDOtLXrXDaNOguOIM9ebzwcrghCR6gMYx9/cyItOnWU68dj+ksZU26Yvhdc4NcHde6oJBzNXgcbUekj/r5MRG186Fg4uBvWDCt48CJtskIadSJLqo5TSQ5HJpu+8ZJMbRXF4QWKEpIlsqAd4KfSlaMsqsoOgnVuBpgffuA6MzPIgpCfytRa7fb8xNAfR8zd9C69xWiiNakKNAZJSsfmL32R1YlpMa1XVPwJFJdenzUiT+iXL3eoRq/r0l95e1oVhxNtgljJbqcomdM5+DTd1rpN2hoe26QxKsoW6eipCSH2j+sMqvzlpvnLerTHP8JGuKiuFvSDrVFTOC5duDlfl2HDhDwPg7XrYXX42aRhZ0K7SHk/j+LPvG6D+jVDByJrsYsybKsZYZG38XdFOEJl3YRxWkCFd0JrasmmSRWa1VxIpfl7ows8uuJwSbhpPyAdewPrI/0QFwdwR2iSK1GzKsYNkxgrdEhGae7yd6LpDbYUi74TnPz2IOK+UGs3iXERk1yo89UEr1xscbbvXLw39FaBEE05zN7oY//GPpmhRCxqWEE/5X5HO1C6cFP2TbU2xvWe6RQK5gvQd+Fj1jF1K5Jw4MmLhlFA9udVOmimo4mLG2XQcGSLCwT8/bLVxYhYsltFFUw+y48olx+DBYs0yRhyDyepf05B9YBH0UuctdF9l3PPDIDyzSkoed1WzV0Kmosge8QxzSgfhMUAiWJADVHWsIh+A6LzDzr1Sv+6D/szoUdG5IJjSrazibyUDte2e4yHegNjpxrvrUPuomtkC967SGCezawyaXEpT4f73meqs1XrdRhkeh6ZRypG1ScLRQWw503xSqOEEpY6MR2zbAmNAFJTglHahZ6oEdWszsRAsQezwYQXtzm4lVyLz2vVSaBjHAsZITJzNbY88xrhEt8A+hbp41HYvUyWd/shgXxokUfbwZHyleQqcc5rGc+StFVJChlKROk9p4OpqAmMODDlvkpyBmtMzNMlj1mF/TLfp5dH1Wyw6mjHjiH4TWAs3phX9KdFoRFTKlrVwXX6Z8lju2O/3XFXlUNPm/KjaCqw5YAIaIOWTLZEmirpYCumermEDn7KAVEiB3yJlz4BlBQvEm2zJokZuvhW5MHDshczDx9HwTGzBQ9gzjm0VyHmLTvciE+eZuxTnf/4c+eTMz0wTrCSXmsE8oioczQmGEIhMZHu670zCFXGCFeenJfoiHeRCtEpIU1H+cdN4kHlkN+VTtWRPOA13f62F8JJCmq3lwcz1LDB67WyQElxFD82dqp0HJCOkE5fjw1nCOSlu7W7jxbXW7cVWc7F8nOyV7+4TEUf4P8qmJ+CVYwNqCyaShD5MekRAeFuigaH8I28lgx3T1qxx4g0AIKE8DoemzsG0QCg8q3MTLTEyePtL1RY6oVIzyQ+1lWcYos9soSxEiVr71ahlIWmlKAqFxLzFnfcI99JDcJXb4ovpZgUZmOxcLGTS18LjmXon2Fr4NKRVth8xezBQ01ku12UsmJxR9qG8C3nYLAxBqzE6kC4DFNk3QswV+qsJeO1/p01VOzGe8ucJvrikG11/HWO4nbSfVUx2LXsNAxKMUC/ttwAZD2SHnYZGZ40O2JE571z+mi7rRGyysy8QhktWQ+JceUSi26pK5XMfbICdR6fTl7mFpzae4V7a7KMv4NGS4nNKd3gm4/tTZj2O+pVM+huC3/MMfTIEElLdJ+F93x2vRx4s6A5cBe3r+MlXw7A1iMp7+1r95eeu5rk2X98FUIg9MH3BZXBLmYE90ST9Qsg8pV/nyMgxuAAkeRo7vXSIfgDEA1XoRZsSYWxZYcnRvLo/cVBvF8oWrrHhNnJDMuS40h0Io56x6iZSlKab/DjYdQX91OWwcirfC8i13gQufjAdsOu1MaqKoviM4RgoU9CPHaAlBCBUNVpQKHE1z7xcEFlYXOGBqMCuQvTrdTSDOOxG/mj8g9j6A+KTIsCAwjPi36s3Hi7VB0w37aIDEsX2BVQ160GENOpGQeLXqrUn9TONuWaLGIur9x4DzcnasTsQYUGRGZz0tjMnlhZTryFbr5dikV3g+82kKJqUKzX2ew5g/DctyQhqW/5joH8hFfA2pSe2/iXUPZYQfiO695DUQAGkFDFhsH6K851UrLNlDUkZ3NQk5QHrUAfZe+QWbzgSZ539BylgeDrq/e1FqGzf8L7zRd/CnwdpuICYPwiGAT/sBBl4LgdLAvxIWnaAunzfe+ZIBjw/J+Txcr6HlB+6VKQAj91Ecewql8Va9XpMzjGMnJUcuRZaaNEEvukYVNn+aDwEKt2IAMA9LFZIimnzu91TIInupc8UoQ6mAsfOrspeSg7pDLSz441i/D0hEqBxnp33i1bKE+/55bJzNkFob9llyCYCQkSawvg0j2PTlnJO4+nsWQYqBRqGhPXNXDp1U7d5vypPnbQ91dyXkRHYHkJmTdojZEFpfJHj28ne9fObJWlWRDGXOhHPz6fFXZQh1vwxFsFLbgZPxaVUUBByPErVherjigrFrZ1RTXNoyw7eLgUBEjQxNDwRD0BFDlSw3SwoePRZ0cDjlg7ae4oT7XrXFDK+J4R3LXhBzFNaKXMwjQFuVeg7UJwPn62/cD8+2a7YsZBh039K72ClmaQiRkOaRsgVYUvuDyOdWW9CNYDumNeVJlu6W5A2mOR9JtSzoMvsJL8hqZeiSPpnx9Ib0RBDs22bCGbDHyMkImIxUeRS1FGsnd58ElgzQsLFLiWOF4OuOv7A5kEUwql+S0m/oFpg80FVxiCiUStJuWY1BqohBeqoKOuy/4YEdXIe/GwJNgqAh5SQgp9hG0P6fwjOasRAOEXwjeXZxHT4lBanx+vWb5XW2UqNmdMOzp5gAq2xLBtO1s3aVwqhOFxHzOyZTBvV+6oBOyCAUAjRkG3n+7VRIFkY3zIOQF/bIPuh1QwlC2zUlRGcoEbRoclV9BM8mPkiOhWvEeMxHDIpv7IhPXBwcU1aGenQsDHgPBEmnel7pNcQpYlUo4U8L8G8+RRvJLi3bfZwvMav1rt1rdcA5cwDcQa0fIR/i71wqH3wB3OAM0nk4ea4mXfWib3kN1m264bBigvn4JPpT0cQv99FyYieSuAJ1c09BgVZj2eI7Znz8pPQtmpFeb2BhX25rcsQtfzaQXASIhuMvcKkDlVmBdcfPVxKUe+8kBHOePZFmBskrgeD+0X125Jnotlo9tJ1gdInlbXrwzqeKkkXNc6mk96g8d5puMYrRrAkdrJTQA3S/qhcXmtdGpp0W9iQ6KmU77GcV4jxU2rSnrpUCpzY99t6ca9WuIFt/fSmb2aqlVRGDlQcppnHXa3wn/ud57kcvo3Ct0LRD33YbI//nLTWQGJgSiAIrZDLrEq745MttzH4wvoWpUYDCCkNHHitum52ZL+Q77+D+sZBMiB2j9B+XjXw+0LbptBQcIlc+hWvQZ+JugPtvHYiepV4eCCt6XeG772oLGKMZrUXBeTmw+RBmqAj/JSyjLEMMSn7rNxIkS9CLRgRGmON/ibYQftNXA9vv7vW0iC5PlVDL1YmNRVT6qK/nwgzL0OX+hrkzUVaPpUO4gqv84hQ9cvh4GJzZJfxLIDEBxk6oPECuLHkGKOxQ1ZIwQYCk5L5ZQxBTaEXccIMLalofuYHAg8oW0xQYXfigr9LJxeAb47I6Zd5lukiIXqXVoplXYqjpkRGtYKN/DYWPgMu3DCoUMccEZw+H8Ddy20GdSs2c91O3EhPcpAuDkwhQkePvjzeMWrXypcACno3WlslOUBCLTm7nz5bOwwBQaicjnwR5RaDgKf5zXoCLC4IanNJpC2+NaB13obTg3/UFEIJZ8Sr+KKiBR+zafyjGbJAqRrp7kwfDJggQ6Hhg5to18/cfMAmCNLEJdCakukhHhbMu7R5I3DbWfQMzSNNUdcjSO28XT990WmhSAHz0g/UjmUsa1gmn//4Kf3XbU0BHQ/rRekT7gPfYyL/+l2cAUXSAXXngKgs/CXgsAsc7YrbSSvjkn6Sqa2oYTVVNbOM3Ziyj9xNR1wTF5oULS1CMXasFC2u7Kk6fHPaispaoze8g5AQcTe0J5ATTqaFtWYPYKmnrlBPxcPbh/ABXFZZ10AA98zUIeGkYSNVxPKOUKZVDGKxI0JJhmtpNp4blHLAkyFIp57Y9q6f/Kg3ipB28vEwjqXOiad5gJAVRRf5vxFONA8IRxcgKCjBTzcRGxgQQXdpVVLPwyPUlHsqeFE4v2RQ4IVE9m1iqlmZ7uWDcEmywGqjqGTWAE1o4phu9hwxT/H1k7uEQtMVimsi1mokrmTIbS6KEeyme2tt2E25laDh8ydAaE4+jbxFl+9Imbzj4ZlA1EIt+g7qrS0mg3lcNLBvjtuAwxKdzqc5waGCHAlYqno3LOH+R1O/0Lb1I6VPdVqROl7NqaFyey8KaxrL3HaKQnEnhOQEA4wWNJ8Q6tuo2OoyLTBhcVm7Ofbf97UVcISQRsoeL9giXV8nM5SOm3pZX8cHbSTxsPfKD1+p934auarmQIbKgtaNQCOCh0OsLko2KwMrB8qb/j09tDOb67lUPmiuYCaQwTUxqcShBhMyv61MENHeNdDxZnzH2Ac7FbzVhNLIHAQKvpDz1AefmQMULKE2vygRajl15DTcysbSJAOxHAdY/wvykQ3GjCIcomn0ZH5rgqal4YdZaoXeRLhGZmRE09cK1MW+3bo+Zl9i8+KqmhCkBDzSlx8NgR38kEGXlhcQ2KmhnTJ6eEb7Mf2VkCJwjrPL/KY6pgGHtKPvHpw8tMMU0Xa6y4K9MyAIBcq3dK2gmwri44aToSwtu1aaYW/53PPzrBjFqgdusNjdy58ydF+cjtdZh2GP6mWIXXPvWbRw278Wod2metFRRC0upVL0rVr7H8/MZ9oxkc0cJNVF/SlACaEV/l1y/IdsxcuuSRTpWoRNEny2SPsntYIpqRGyypn5GsM+61cCE4ncLwGXWyjRoGeGZ4jK8QlMmIzH/9K8ZtB+9AiVf0xY4xyBEQGtdPWAn4xAAzCX2MAypZPGU2semoeE+eQnMlazSxnEpcEU8zGEEJNfKPwJXUSgU+rHpvBaqG385pTv9uqYmnHJFlkpJ7BLpfjOvII4hV/iOzieyF2K6GqZ3WtAh21beNPMbZz6jTmFhjE0G0HRvo2+oFuddQaVcgaohN0JQqG8kh2sNA22TgAMCM+FpsPJOUnDuNpYFDrmjOHl0NpotgYDYdPt56KgCYWBpZ+ZFyffCm+Nj146XT8oLyLUVdiXHkiC+K5P3ZG4RSHOtdF8MTvRGu5ZpUPrd7IAXM4KjlTatcR3uSKhvNNhF0Lhb32dVmjl/frll7PK3zNVcXJXrzZrcbzkna8iTUpFojyM0IptSeAgSgTEO/MD4N78UAcFiW63VwxVPq9YPmZNe+NfYK8lZ3FVNjdQSXvksEtUnwR4uJoP6Y7r40eZAnEPNQtD6fCZorf++daQ0h0QDsEFGXTaanGRY5Cs7OBt+vt8ekV2dw+vLl1WNMAD2JAzQv8AamPTX3E/cZ3neni/FLr1lc0OlG2ZQqM4TO3Bk91B4ipK6sOWdO1D49ynroOiTcuZ96LJYqEtJplEaFfdfDXLglsZCMERSE/Ii+SW4xxzPMptSoWRTcXmXTHtzKsuAIrvTlI9/GGIvgh69Znr5nG3VQLfAl+pims95l9K87cVFEXzsZXL3W+mQflIPVVVm4UWlOEn3p6eztQaVVcCZG9BLpFz53DNczK370/8E0GQ+6PeAPc0IJJ6ehfUzcDeRHXO6TxGicEDKwQeSyqys7XIiFA13g5P9cWJE3FsVCPBU9JAtxR0DLFD1/0JPLJsvfKOXBRRiVi8rodVW1CSwNbdwCoDC5DeYEGxKr0FEMSHpaSF//tI994z5PzVOqvJkIBpRE5aavTPtdGqFzV3Uw0v17XJRqNrBSgK3Ggbthf8QjtMbUmOdr2vgghC8X2HBJE8Rc1Guv4/RTe3e9rvEIvbBd2pVY+rGsz/7pGH8x6Kgg/UTCfcqlWQrvjATrC2TJa74zhLhkYbDbAoQSZBpjYyhg0RvZzX//4g3o579zbN9/9MZNmp4glGwxKiwJxGiOWXyyETguKSV+IZj3PEM8XkO7EPyXbCTayA4fDhIDwQVwzuVAhddxaEs4B1fG9828F9jYA3XbEFFQKAduv+CpGR7d10oNTjqMayuOfksvMEvh0q7uBaNwnBhjGElqwdcbmFiGYht8Zg18zraoHkkYjoWgPuXgdukVJZHrvbl/a5U5lBC8xTZPGQV4r+Ozbh7humsjO46I26tyip/zW5nqV/ze4pwubO0AoYy1ZqH8LMPtJYUT4pPB5GO2vZ0DggTIEgMwNJnIpOiHeOEaS6eDtMPNliHlV1j9nmGS8ML7ZCEPhlVM6NnaOk8ZsLJONAualuT8NicP1BVuCkzWyE9OilYY04/sgP4XYxU7x2rllKKeUw0icbDKo40u1Ofcwv8lwJG1SlpBX/Rfx4TDnWwsZBbBQPpMXGZQC+ok9dqrjpdRdo3KZSXMHZe+0fhqoeipFytPGNWpCrB24xVN47wi7FOQMoh3aIEvoB1rOVet2iKR9tMutsUXXJ12wkAw02MaZx1YIU+s8IGsaJSBNYQYIphKbKE51RPlNKZ/C++QsmqQJVKiLY0h6yyIb3hIqk86DalAJHUBAlho0CUxdnqBfH3a1ImZKobShKd+l35Cn/Or4h1dJ7wgHVHNJndD35iCLHZ2u4hGmBGdeCEx3uppL+Xif1WkEE0jkTp/VqvLzhgFfX0pyQH9z1eU248Slwsbzx8y88GRUQiPmUUlZBdYUkfoj9d073IiSRwloNAQC19pGnHvTFdEma92GcXfvGIfG4c9UojAfpibY2a+Zukx4UV0Dzb66cReRCIrz8YLdSvb8IMuKDWBaoMVs6w2T5oyzPYJUkP5orZYvn+XlgiWARES21V/RzvjQreTd/ySiQUarYPFA3cOA2ea0aVmO+d+E0C0UADxGxdwiAIta5GPyEMxbQHKjNjDIy+UdvaWQGfiyOJoPe36GHFyq0Tr5MhjM5CMcJJpGWq/Lekpwwp2vxzXhMxwTa0cHTsBKftaQ+i36BY7mxqxgbOZqRdr4KTaX93p9Bk5ioGIaIk++2hjSFUzu004AehxOsauHlcNHsKN6PJKHzAaQaB68QVPgx9dWkAKiyPoNG/ZFe+3okSTff/MR5Qn+USiCiQR9M0FmQW8s/G6i6kCtQsbappzzCpUFw9DwmQN+xQJnOIgZt6DAEfe+4+zoKekpyJXeOso7UyqITV7O7eRmr8FQyKodmx9O7dfaVMd7bJ52WrEB2/y+32MmzMLBbog1YWRwfMHH752j2nZSm71fXb733whBrCkHJYkQgp8NAZJUc9I7/thrVzQfSAeX638+OVfk7QdhKW/1lOqqgcx7HjBZEVSeV7GIPqNnXA4xQDsC5ohry2idln07zI9+PJzIyPa4Z4zrTBaCL5QHMQNWM1KiESqacPZSe0oZJsiBYe/EBX4j0tCOjm95nsOFQsG1pQDo3o3bQL4kiYg0RmSNeOTPmUtQpa/OvcnQzOuDhprN6JB3U9M3+hdeVnDteXngiNT8R1QL6bPkGcFgUSjGP/p20sbE0uRUWNJe0IIwxO2XyGvAatNIGJpCrrh0PDY4U5l7PuTjr7a1gHaoTLT0PcC/u1XG/0TdsIsEZGQrTdMWC1jK3Fd1qNfD5aXnup3UIzw6d+eoqYIJA9pmsOOvlJY+hycNqM/y9fV/W9DDDwwbyUNxkQ8LqskwaTovGxEEKKjdpqtcMkfHbrEDnsV4TZutdalBHBA0jPRyP54WPf2CWjic22ozLQyQbJ3cP0bOe24JgIdxM3vzhtbRHinecCZRnEfePy5RfBd9G8fOFhbcsihGgjBtsc8Z9YT2CmFY8lRGD84HfHb+/LcTaAEx6CLiLiTflrnzDz6+6V5C642LAn6l+ZswTsGlDwSJVTEOKL/kCcUuQjnKawUROvc3ONh73Dup5YuRuJtJ6JRseDp7p21hjeAZlQ5077I887zXYiDW6cK0TPvVa+7yQqNnIXDlatEBPtLb6d8l06JagnKV5wJkgCSSBClk34XSvCiwHPEvMZAJK8yCjwmTQyl0tEfXAljR7pz5pfV6az3scSMlVpnMwLzH2xcEWExV0w8zZFP2NvsSSKzQCSkXz7Yj84Y1IOedS0Q0HlWZy19DNVc+ihAZwUxqsWWpjmzL4IHSHzvyQ7ng9K5AOc+wCoK6zxROloC3mSCAfmeSq2Ertg2rA970uxHGQGBcEEbrfFdR0FWU5zglEK6Oty+bo8jtRydTLheuzAtdUS1xEAsK3w5RO2POjdTLnznJFnkjhSzfY8g836Ib+h/4pSh/vJudglwD1XOokICZvOl4o1/zezaohEWU/1Xg49XDgRVWXjXgWeshbnq3e9FR+7YSXfMFqBDUdw5FNFVy6DUsMykcb9jg9DKjBdpE4QxZILnNFbsQm70Sila4JgPNlS6O7+UJAfXgr27gEm0IoV2iAqwXa31JHqc/4rxE19O9QcShOwvtZuUDJiW4gTHLoYmzkqfa6zgOtF93W5ZAbc/DaRpJBNKUHKz6as+ZRsLnc9rlBxDtSE9j9NhSXzqprsNeKSY2PWOGIilzyFTcoy5WoNT6n3DfXK9bkJ0xFIn4YnaXsKDNLmgpgHwYwWFSC14XCjYiKbdYOtU3C9xZ20EVinbSE3QGsZO9YEn1k1AUqZu6H0ODP+t+TBDjQ8K5Ejl5hi3n/IV6M1UpXZAvUr8D1O8rhwzTCJjq7raz9Vl174hRKQQB23dwUrrTwzCKfUIjMHbTq5EGrhZi2AuQZNwRdGpfF7pKhsfA+dD1kujLxBFJ1CJnHInRjqZ3WHiBWXHVeMCchq0L/tyn+m9NFcI+/Gljob+Zz3B+6HOibEm8fSZItQX77QYZZ7UpHpvmj73nkWaTWN0sTuzxqA9+IYU9QH/OpoAhFYF2R3eCIjVkZ6ERmocitKWJsLZu/fk3T6SwU7UV/oc+Tb6GQhVpFRkEjST9Ai6PFK4xCO6RMNmi6+g7e9Bw2JnAOGL2CujcY2eAPHRVrY9n8RzH0r/5k/V7KFUwTATI7F9UMoVrd+VhXDXo+QS8JUqTtn/4ZLpoB8ou9W3QY917wAZVyVWGQKLRX8OqpDD/U8tVIEnvncRfZCLmSg6/qc8cMdslamu6freE5HmJ5kj8L3aEKdaF/Wr1lEu3hIe0o/sEbhIFuK7buw/1TNTAigqGGsP1YS2TnbwvLCvtRh+GuoKtWx3/uJ/2QF1lZyXUamSGTmsD+aUs8PIXdsBdK8SgqtcbaG1YPK+Ew7WapFc0SlcM4aRnKVtG4Y2fEBNQIDTDN4hA56ublTY6wAcUcEL84HYZggESWRNR0J4W6QB4HBckO/Uc1LsbrsvzQrkdO6dqIzEi8gAurbnoHu0FaNFw14rgUdhBwmh2H4q6jDTA8GYCxFxHa0cc5aOFr4i5g3fxUwmGkRXm1NCJMNkvpOQN/w1sq2kXe+uCIC5VWyOuFzIOduogtk8PcFI31I5/ImYLrMcmZEMIMr0Q0Hgh9X/VMAuJUWQYL1PkNM1DzeYfLitRcL3oIQ4+QgCD8/nc6TmSOin8qIU5UWNJ4AV9ZyZvqHClnfkEgzrLxJHofsaIiPqZrspieNcckRQe/PK2zuk65F6DiDjfpczca9GG38oHo3nLHRNYSIxitjCAAm0rlrYuso2cYORpZ1WBm3rI/d27gRJaMzuKdyjQWc0FobhgNOlb9vxseeJEqLGjvyJetoCMEXCQMi3QKukYB4kbhqMNyyPOaFsrlUFvPBP6sR7+A3Them5NFycNWqBVSP1uGAKrZvAHUyC8pTrTJNdBFZaHp0caF3bQeS4aWdqUdOIXo+qIYUqq7P8YWrRavBDFRk3VzHxU6Hf3bKneRCS2VAYKez4rhT4c/BXNi0G6Oau+36O6mto2kRxa1Y9gGmyCgP5zisnz/bBSMnhhvPBDXv2aR70ZQSJPikZs6bn9a1o4u9IfhVLJyMnnYOMTtZUxhFhKW3AydUBNglC1S2Kh6fGSQFz5KYtIQNHcflmYTVrss6ZxRXnAGzxucOqgRO5Ggv8ASLU+K/vuHc6dEmGeR83LpCd48VeiPxYpJYNrj5Yyl8Gjv0vz/bjOLa9z6JVVO7SCh11SGh4z8oZU3s18gepAE52jUHlOE3TY+uorB3FPWxgV8asgHZKteWq4UtnZb9N3syd6iFQC9Gw8NuqC3A0NljNKmNjUhSKS1IW4mB1aX0bsAnojuQVSfFxfK3RPzLI71bYixgcIQ3P5AD+W16EPjxRm8Po8wdWdi/RiDBHUq2p1hBgzdIuNx/CytvWFQGBRI8lj/77j9YoDzTP9Tzlc0TE2xcBeeiukXBkPRsfv/v7FOrqmLyKxRDUV9UwxAVzVKJgveosbMpmvywBUVitz+NllctAYhkQ9h+pmCEdCegHKdxcblYnB7w1AmXVORl/mhOwfadlWe+xrgohJl/qMGGzDU/eYfysilQElfQAND+mt+nfl1/tBaug3UCWUOeOyLT3SDWKAnUfTnIiQSp3MmrhtzppEixSXJ9P+d1km2riTGtpEbg3nVrtYP925O1MIv1UAaivGEHyhnVJ6CXp49PBeDNP6wpYXHk4il/LysMiiAjRTaCsFBFVZL61gPAo7lUtbAiir0VAxAT+NmVAdCNfQPWAH7cRTsduEB1NUn0Li+EUTdLhWw+M+AVqI75WjVM1CEi7cYsyQN4MP1oJkyqBEI9VHzFR/9YmI08Kq/LIRa+A+qORnJT91FT3WXMXMNoDam380hZs59lxB2KgUCKUWVs1sGayr2V3Mclu7eRhY8qxdYeX03ZLgO3OeE3+HGICSULIutdlQaDHX9dGDTWQOzaE6qGSPV6toigd/Ar7VxpSVy1yRO38Sl7lwttH44tHs5LAzGhxwXbTfalhVP2+Gky2tTHM4gpz1lFsr/bpruPDnxyDvCKDLEcd6O6beJTrjqpch/arJ2l8zoVgGWk8CIwwPRRRIE/2E4Y31w09RUz1xSuW4x+aEvzaKXId0WfxQsr/4eUFrQCtuG2rD9fvq9fnGbeW6wmFpo9vDBFr2V1Vc5w5d85lfalG1SvDveAHoiX2l67FpEovx6BWHMsBNqyeVGeYiWKIQ03In5kOSiM+QfSr0F+iZ/AQyEVwarWfR23NG7UiQ/Tx5+gdwAAbqjNZGsFXTh/Cgn7x1sGoiVS+waqdodn7lFd7sggSGPRhwv7BeibCE5DNGlRThJHdwXAGIErYEHUhov5IPsGs7bzgX5AO7ZaPP2TolzVNtKk9lGcBEY3sT+yps5IJ8Pu098ccFcTsT1X4l9GWAf2yibXVRNorGTMyD7oXIVFc+sM9IrOGpyDNFa7VN714ygF7WA1w8Mgkwk5dRqJ8Q3BiJ8cHcZ7eMYdmmIwGlYIG8Ul9cf2sMMCot9zQYK0KOjCMwYpR0GoOL4DuMzCkutcUoCwxDLWTTTnI3KTWbLLRgdNkJlztCih51fo+Hti+47dx3VVrYEUFeFoVRUuDJfS4BETCENSIqJxsSekcCCQAX6arCkQsOmYv8qbwHZS01/A6x4RyiIAVozvG8DWQkias2wFMa1kh7SqxdtCaFoJgJObUXXzzeE/BrKiD1K5pQzcsR20hhfPocxmEKxy1AS7JT/pJViJPhX2kdLO25eglB0Dpjo9Qhda/IVCJJvAhawPJytLo1p29uvSYN1T4ufpg3S1B5iK+Y2Gg+F1AgCszy2sfWUGV0zDaQWVXKH+B+cHUOEtQvNe84mWm/jZZrM9J/0clItrWmC6dlT8XZSn35QV8am8XEtpRsWu8uZwoIo4O0prt9QCiCw9EraB1oE9gm80NEU9OUXEy41hWa+t7D+7Z3ngcJObkUXnmaK7wgStI/hrmwLPygnjNPmomKkeVZkoVdkF9bBe6VkseQpx5/IRc2Ch8eu1UxfrJ9+pBaUGUk6pgt9uKgTWnTr0huXmZv24YWvtOc92UoB5FN/YLKGlHLl4CEz8ZD1Hris47ZvsI6e/Kwn4ecF4IRLdnslznD3VSD6gaWyLkWk1pRosnblshDNX2VsqKlEaKs0jNSsltsAUVED/9VpNmGg15ouMtLTwzUtgy4eavFJsEYENRRtJk21d+KS0oehSkNfqaRs95sMGJdjfkCF98qMzrMLgz6R+6g91Z8ctzuL2dAytLxC/oqpELhfgcZAsryblmKwW1iP89RFSfVU04HKeAp/OvNTlDSdKKUImrTUd/G1uJSfWX8hHX7u34K+A1ATM2XCv6BEVF9kNZmgW7efzQEtjcncFSYl0is7uAYODau8d77MHjChCLfxTRzJ1vwOhtVLOOoYcQ41Wa6PDxKA/z/ckyMaRd/ZGupPzKy5/Q8fyoqrEvzXCucQyAhaOnylhSTqRiGL35ZBuE7UFsIWSllf39Vld3zjAydPP7LQfTEOphervxumXMy0JEsxUz3PeSlZsTihAx2IJ/5976VfVoyoiTgvKJgQiS4ASSR+cYJ5F/LwfRx637dsrEby7drMUngSLGTEk/dc2qZ/Hk1O442ygNgqJxrkVCO5kd7AN+aBG5EqJCPmSGWz7LCemx4IYE4hYqrOA5kivjK5VhHSPsl9vsWgYeuiauIhYFsxV80PZhwXQTUiIffhej39J6Gi8CQ5xzpcKze2uzvo+me6e9e2TSXj3TdG/mCOf9chHChpIgXebmOtDlV8tDnG/H3fPpmdqhi01RsKYLlveUiTysoSSGlCx/IOJvGQFcaoutOh52HolHZdjBJ+q61x/97QDLSQgOiKKnJSdqI0QPFuXbkxDgEFlq7GuMwIbg+Q2KSVZQAd064lmwpi3qfkQYRvyYquIjEkHCwWhQB7jkBRjliSgfH1EsaERsF9PPKH/zGfvOPDKccJE32mg7Ppm0DyhJABTP+GOSP8Jf5OfU9bQktOCPV0VRH+K7DRqDGZlhdY+sfEIZlJzzReyoZRfvOjwRhfMunrVFTF0WWg3CMPWRevd7nYc38z82tqH8JZtN1fZZG3rBykadhebdk+LkuzpiIQi1dvlw0mpjbeJllFPHI61UAB5Omz0L3IxJQ4NA+zyPBKlp5/oXaHeiH6soSozIvrejp/7GhkARaXjfLO1S9CsgpYnXA0AYQx6aP2bVdFg4Zkw0faabZXS3Qy//MtmtEv3qsHafKVcCnS01hjvdcyG5hZwjXyxG5cF4Qxe4UHeeIRiG0WKLEFw1giahnq9X9eWg==",
+    "padding": 1
+  },
+  "hashCount": 13
+}
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_0001_membership_test_result.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_0001_membership_test_result.json
new file mode 100644
index 00000000000..25628a9889d
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_0001_membership_test_result.json
@@ -0,0 +1 @@
+{"membershipTestResults" : "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_01_bloom_filter_proto.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_01_bloom_filter_proto.json
new file mode 100644
index 00000000000..d1448123cdc
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_01_bloom_filter_proto.json
@@ -0,0 +1 @@
+{"bits":{"bitmap":"wDb5w3BUgimh8eVeQ+KKlFd9AndbLKEiu93opDDlxt2z1C4QgGn4r6JNWhqbJO19UCrMKX7O41U/YtiK370eefbhM9VBK8Wb00cI9cI7p+4aP6LzmLCsP98raqWrtTdfynNlBln9Q4Rd/+lr+0W9zZmM/CtXXqx0sfk/w79onK81nnxHQ29cirfUMReCOhmzZBqIGyelz1me1qTkgIOGzz6ANOfQXOm5pLerAUqA0e1iu5LZnKDbCtUZdVZShrFq2y2OKq96A+A5ny/SYrT+XeBtUaT7WNKiNvgKrn8F/uH1qUcQhi5hQyYCitRbfoYlClQyPMi0RyLYvryZsQG5btkcfi4UMzOz3gCHwEnav2OujgWGVrtKU8G3HpG8f+s7zw/Kbhlkj5rryYjuaXmxhnBp74mWC6Ft/Ij3Mej1ibnuu1h0rbcaGk3WaWJU0Sz9eEJHZ8MestIjk8hNuJAN3G999QUcYZ8eVgJV732q1SZxYCqp+iPTgoB8TN+1euGam4mei2hXreNP3enoIX7siAF6nzv03P2FxA+lzj2HlJVH47CJJRtarnN9kZ0iag0Hufq9rkQoAxxbKtjJHnsC5KzRhAXudHT3TBpN34n0CMcun+mFtIMR04OHPHbUO2ZPtM3DFwbCtLcxUm4bqHrUJRWIOOrlYQLPg+t8VzpvL+Kn0RGbq/+b2N3gxsninIjRCDOk/I5ib7BJOQQ1JhpK2KaZiMmBDkJfBZKfYee13HQmjw+sl2mZVp6EO3/CfgYpOS6Tc7roS27x+cXTdmAdC6DHO7xXxQsUjmXvUZZViPuFRmqIwFF6HhYWQlU9mRJh5a+7I9bc/KiNrL2pn/ITJpvyq0hiteRE//i4eiN35OYhGXd3hmC/fBgFH4jcEWXz+iGlXJxA0vadxsyQd9UDwPuCr9b/8wrhpHnHVFgxUn/ii6ELnmIxFuwKMX/Xup/PlZ099DeIxG2zoQh0tVgs9kGtLtRY+PreJKtQgIMl56aickHzLRC3IgHA2yIk+jrG9wHUL2le7iQ8PA4iNRKaZlF5qlsDmTUR57d4xD8VCUapZ8qT8diZ55doKmnRDyp0fjS1X9fU2cRP9yxhLxsx/Qhor7wuutfTLITYqoIBBUgYXUJ1h1M+b6of/0g7QcKU40Rby9UT9xkP3W6WbvPdGSCKvY1tzcZmv9wxQ09UszQnEe5bu0wxA1IMXyEICNnuaEb5bnnpI6VT61KLfB+pJ59K71mYb/tkHafEjPsgJtcm+zzS78Wp+6JfraPjUWV8+dbl6N06GFl+Fq4m0OhahCOXV/fi8aIWUSivQhB83oG1Le8FPUXR9mSTD/BtroH7b+xZToyOrorBwhdsLipJbJMY/l1ssCEgpxCsO2wOYtYKCg8xdw/P3QiQqDObXvZ8u/hak99m9LsZs87A/4s4vQ6+9qnEq9dUbdOPxnZ9x2WN4foS0hbNcxmW1wSxElwWG18xRE7Qa2Ud0/sw5LNymgMHx/gC/LHMcrmPPDBktOg3Kc7ZaZEoWVed3UqewWkheHeZrxlw5bV5f5AuPnRCq3wIGHIV8MPE4eZecvziylqP0zt9tPO2qP8uIdiDAaUMSvyCaCpHPt2ER8M4bEGaSo8UCp43SELqYEm6DELrhhzxtJ4HmG+vf3fVss21AqjF1TVe1GGzSd4T1t9QKsuaBThDOVfs6/znFyzkMpt9Nm/uyxVjV1b0G+JE6THmSX3OD+roVGM/Y7c0ugnkjH7/59xv9ShtrPtbv0fCyr0+h6layo/InoYK5ChzGp+JJZTGHePLfcBauEDx4YdsPqBMLvlDd7qVcxdvRoU8azXkj0yIFG+12srBn09+refwVsdvwqoj1BnR/oge6g1YOV5Fpxgv2ZSefwTjyZqg/RxD0gmCQXve91AMbc8C8P6oxjZMFPp3mH/ZvxI9yQrc5d64pJAxIdCciWuK9yKueEW3QO3Q5b776w1V9I49S13zyWSo+zp1ZsxiWNqLqM1YuUHlonbXF7MeuTsCrz+TXV7GHivFI+t9Nbsm2W3sjm2AFTW0uXrubjIgAuMHCTBuQvLdeKGlSY2AWR1bOt3XkE5bmND3TPwz1XWApgbPD7pPUfLPXZc2ZuuOtrzhQIpkKnyy3nLRuA8M4N36fzm10jtp5JxCQcdFME5fRWSIw5vUukp/v9BTqWuZ9DkAZ+K5/qqaFMQ47ylbXaIyeRW+1/2iepaXkzbQYk3LfCirhX+ZJRInHmk3RvkEiu8cENvVPOENzSf/XE+GzFeJTp6rNod+H8Gnuuq+SGbQ7EZSskjUw3VzqykpvAJtj6ehkv/+zJA8TxtuPOJTLIAKSaVtmDS1z4ifAuThYkh8Bp/Qit644twIGarwKoIaE9EuooZHWWJ6554axwNjR1sXpZQA1Qd7Z6a2xVuHhGiB/K4cwuJGKLcdltIvrMSqsa04wyRPK3fqYJLIV0EtAj7/IzbxXg/CAaBTfCXOQZWU+fQZGmo81pPRzn+5HprobleaJtWCxGxO+wJHswx7PR3sdosoaoac8uYrix32X7LXo6Z/sn6ijb/qLF+LVXimy1H+Vkcte0U9GHY8oohthJn1wWi8d29z2brbCH0MAhgJOw5W5cmnUf/bn9H7vKlwKgL47Su7Z/MmDYGYHKIFMImAvT/HvgD+yGLy10y9fws62mBNmqvLIUw4XwjB+N9XPuuDXP1fhcHm2o9o4AvNFAyr6Z6sulppkfGmrDR/cgy5rcFNKiTfF/cBBj8Emc68lN9pR807rZZrWfkXwzPMEzMVenFXrNHWVROXWxFDR62vkwYYe5Em7tJ2drl2E2F1nC/3NFzjd4xo/vC6DZu4btrVYXmM4HrS238Nf6lgd+p91WSuG/05c5U/5U12yZTmXFiJbeuQxrqlbkOhUBWjZtPRR3N3Pvhh08UkYiWLn+oShxdyz09BO9HWNphiVArkOymjDAKW9oYYHzhqs00j1bOS73I2X10Wb0vhikj5cNvRwPXeO8FqgyOeifPqyfTBcNaWukZpivAnIaRYQIO9oHRk5aZYEk14uKI5NPfvxWQyXsLpDVeUOVAOun4RZ7GglGlJ9XMCxF4Vry9j/HboT0Kh0rVNag8XZNkxjjqyYYi5h6LM6A9Id/99ZGgfcjbe9E1Q7DGw2eArPrMo2kcg9uxQYO+gTXLz78jdW7kkv/7o8f5Fxp44RWaP3MsnBtzg8q8MI3Pv6L+UpG5sbTF1LFliy9yaKbxrLMS7YHGk5ydYa8hkzq0nqeQRlx+/8OoMVC705hNXmfQc4ckGgy9tvJAPqvVUoNEa0/vxoEQ9FdEg39425Dct1hA301Lnbdd+K7pkaY3NPganiqEK9F+o6Js0NbdXU6PjB6PvyBiJG4Bx4iSj8bTuxN6S9X7FQJeDR30w0O9iAGFQc3mAzxqCFet/WoZ5BofIc5tt7oSePm6VRru6RtnDFMsusg4twW4sHw+VOK5X2s/J+MbftY2c3SeP5yd0JK2POD8wYCi7TzZ/rLHmzeE04U38JE9cDkdC/SVm0kaoIc+JFmTeyMxAqq6GZQGPQ2K5tP8SzzfbnYsyE58FKqt1FqSiKp13ZqW98Kris6/PIe8SCY6sIjqqIXbtVkBSoJHq5YYYYNssZMVdJgJH1z7FaAzP0tiVTpxmsjO/m12WHyjaLnQFEo7Z0gV9ATr8Zh0miWqG1rzWb6DTSZTdazn0tfvdozbTdkftaKADg3VQqDbUQprsfHje1TQpRLa/3ceZ+mf+T3Cj9l3tnMgHKiYcTYFdQvj3VVKdJpINDrmD9t3MRDL/Rt1UIOp3mxh5r+zpYGUQR4Lmy3/L7aHy3OXy3UUWwRqGMj7mvZSPlVwEmnd8Ct7Z8QgscJMH3v1sdHhkVDlsqkDg5J5lH2YX8UwaJk00bCFoTZ/SSBb/h48X12DOrlcjt428za25UR42EzBUt8uV4gx5IoSODKN8l6UYPTcYQXS8IjUPDts1NKizlFXjZX/4PcffZN1cADcXVOKzdzg2d3Lk/b0IYzYbp3KbYfctpHONxJUha2jDLKxpU6BfyE06z6vy971WJGaP+3++HMZbjkmfna0te3y9TE+tahz1UKfM8Mm9/TM9u4GQr78qDzonI/hrBEDQUiqntbsadq2+DvIFEcsGcodqxRDA8t34vZeVbUz4JzrVxlg1XhG/kKyaJtbAKVJDtS4KL3fufti1S0+mZXpF5jytu+ubRJMcwerLb5vcYAJQECUr3hyfMWlhAujpSH8Eztv8xF+n0pHOePV6ed889S4KyY7dkQA47h1fDgPUNrlxJz5DnYIkoelmwu60+l4SPC8z+nyAFtL6j23WZfr69Xqf+T0fX7jCS/rv6+HZGS+m1RTFA5fBliqUelCl6bYdfRo1GLexnoNPy24bzRu1lKeojnIAyUBOru3yUp09ukq5Z0Q5urSc9oMJZJL1dEQ/01mm0mlm8h5JAM3GQcnJPdw0d1t5ZAzdJVkR6yr2DKUQqhoyVuxXjwow3oJW+oW0jPz1fQVwPy8H6E6kqpnfrnSwAQrL6K5ZdkjDckR8UsVrhjDRutnLj2hv7XVJ+SdPPJ4uGcBXEDFdsibp43eeCfVnPkkr72hE9dJIlBwst1KTOkp3ZnOoRAgcVbC9Sw2BrmRzHIYX+0HtL2lPIJ3fpn36I/st5dxXgH9ORRX521UrtIv0u+T27Nxljy0aIkxq3c7QeH8BUXJZ0cFr2gj9zvdfJb/zzLY0bFdeGbJZJ9bHhYfasVgPKEmAV93Kij2LirPEBltexpzzxVKEhzy+nLqHZR5Cl7Nb8nafV3IC+sQzZrBEo1jdOXsovl8pvxD6SfiM+z3st/Df540xTTpaTMyPyzGhqMvhnD772h0wJpB/ZoIsKjiM9PkNAj351Xn4/5LNjq7BEQ5ivyTnew4UVerTGQewol21l92nyXbjjNgWIhaQqztvLfbT4F9Jz0HgTFqUgIiyrTLT5edfm39hZx3VPgDnKdxGzRVZtTKCZi5QGopQRf6Wdxskt7aO0c51n2NAZz8V2OdQJN3zH49aE/sP+1Ad7kKP4yI6FM8Byxal/9+DqARg7v/Qe+tpTROQ/0pSv0I5FivV7goXm/qbVwkAaEhvyL7QYCyKpCdviwXLGwK85qM69SyqWEQemH9ERLlzz6dIvRVg4vZxn/4oNBX5lq6ur2+0IQyOunxagR0z3NRGZvfruhLLi+jCmRaUHO/0uJQxfsufMLBSFpEnWCmut3fB4LRHpr6ue3wXWs1Woop5mdrgBm4bFpyGnHlAgln2Ssa0fgoJi7+kk06Rg5GIeNCp6lavTr6pZJ7+pq7cwjKtNvuo7tDO49kWB34fFYevMuii7J0Pv88XfLzsGfNbYf+WebGnciBC2w4oVtweYs/9exPQKaW05X4rSAP5x3WkgR2q3klgbw4dNLr+TKbGalc3CeWg1C3Y6tFp/WI2xQTf5Xyjf2GEo5K1U20nWQurcjiw6+Y899doMN/wzGWutHwoqq5RE+DfcO/4KX76NGq2tCSt8undOz3h/k+zNIkb+UXXNtmw3BuNzqirvTJEzfcNCkag5ciKkvAOkEQPLEj9ssrc2lb0O4W1zymkfCcIW18/XXdN8UUrktpnJ/90R7IKDm+hrD58DKKgkuac737bzJraH6TwiQcEkXR5r0H+KAfzhG+F23rKP2heoWz3vQ9lG4gGS9e3JH6n29T/56ldrFAu1+ukuBHnVL/djPW9WVltczRga7XxpTV3AWKvsJevR7wNvZkt9WGP/g0QCI2tMvsSNcMgpAxzrP7kOHeHlAKz8MN0/HlKLFg0h2QXGugsIhbLj1VR91Mi1hUWceseZbTtK4wiA7RpZuW5r+v+8VH4ib1qtb5et8Di2q4FNWfri/qvuaMYkFJrDbpd6M94KQEnj3xRUUlucbr1nHwvF5QbPVdriWN81mhzy3MYD3IUkVCTzmVoOI33vMpTjq6XmzBewElruNsrp4R3CTQpideLsqyjT6xRo5f7oEseF2ZhbGYrsvQbDagmP+7+pH4m3NM2/1W0oN4o+f0V8ho1v+uUUWNFVJYJwad19vcanD3mAeDRTXF47pA3H5bcj8n5F8FL9O4y7Po0fQoj81dDWaHU9sN0bVhvFyl9P7CEPHB17Bix6LkKxxPT1urU3QaJE0NoV11MURorS2SpLY18A9DxAT2n1qp0hfrJXBZg7qUQewjqOtRYpCbbNPO1PWEVCTeAZ/iGnnQrgfNyir5OtZX9aPm5HHoHp/sOrqrvLd1+6M5B8oPZX1LxOZ5VtqDVDlzytX4onvVzR4AOkEfnxP2KA0e7o0nHtXkW0tr8a56q2sSHoP67VfSjUVH6bsCDRtGdqW4cH7HqlmkPB04J685qznkA1elE4Ka6+WfQUzUfM2Zh/hYhn11SU//LM3XzAeVnROXbJtnd3HKU1bmHRixvRpwD/hw22krhxJsA8bZHoquH6AdT4Pv057ixpWkz0XEH5t1H5KtHobDCQ02JcYTSmVns5KcPoeW710XzY+7Ts45dOf722MAyhXs70FV3Zn5zC53xvbtv4/cG5NVO61t/qTIqGl0xsG3cs/mWWA6XRDCL2gf7f8SB5r+G/Ki/8+6x19V/+J4J516JLiZpXUEQXVCiPj3pEL56qb/7FXfLVeZvya0NL3DH3rYi7+xWl62rls0OfGibwaF/+ej83XOattZs8O9URfzklU34G9CycVRLTzRhOoIn6SS126x82uNMJJS7fLtLGxJf8w5gwonqou4xNMzf4gDKdBDh/zdhz8TeZyWZ1009LRqrXrLAd1gmbVYBTL1XIbnliEEqIx+mAqSc1tOEPipzngky1Ng6M0SkYuZYF6a7jBGyUJXK9z+2nMayskM/C4RKJ7dnJAZOb8InNICa88tjv/zkIgcOesDfevkb+GIlcCAwzjBssYUeD5bAwnBTKz66p9Aia6/clu/2t3JNvv2bYvN8uNn2wx8o7UtQJBlh1F7pEzjyJDFmdmW9Dr3bbiLtcfm5vRc8+3xjTy/FV16rtRl3YWUVzSV0XtOC3vzSPvnLMwLE8vJbif8q/DuM2NZRHbbvoZeWaqLPm28O2lJfxqrHxm5PmSaes9Haejq2LIvRuRV+VUAgFNH5L3bqDf6msqc+mPPLwVFSLApTMefwS99m5rUdgIkI68ApDYN4oVwz1EOrx6K3SW0oj2TV1d1Yh2Cd/NI3i97cEbkzTtmGS8EzJUtk6/+8xYuj2bnxy5x1DS8dGpIgvpuyS5vT/NkiGxJZ7OvxN9i6wvqd90gXCHPRVuw3b7Q85dX/znceBy6XAopZhUrx3EzHowH3jPzp5rczPj0xT0GOuWLkCY79mUg1edmQifajd65HngyRmaty34Yaa+RinlHJ4Pv3BVlVp5Zg/IM32Cu55ftpDFurhTH5pojxaH4r+Rna0qdXxT95r941C8aqhe01GfNQT5JqmuhH8rl7LJjefMjuWDH/O0R35RTWh5wKJA8mkCINmuzpQ3t/a+1P/4XK17uPV7z3O87Q/glBLjqeI7Vc5c1++48a/7pn/OMzjnWWc5B1tbushZCMQiUDRK/nUWh7I9RtzoOlLbVs5jqJASWTBurodhtqIjY4M0dYQ1CCuYnL7NeXXOKEqKH2yt9QuD97A/yU/vZmVW3Cjk63zu8hod2lLW4FUVkVTwtEqRDXSpY9NKnkRAVQsl53h5Ej8hym5wCKwy+6dzeVRpJgazvjiZkGb3Wx74TteNb+pgpFlQjLrTjJxKZLm2NjPw3OFZ3mfz0CcN7gyzkvSC2LDZBWko5lVpc4xPW/HgNtT6vHHFHG92uarsVWQ/1bzv5o81Fu/e56WrpU72dZz+GPyAHpNXb2miUcjrn6dL/PiFr6uRUxtnGn9x0UKSWkm8velTCX/ctVCgNhTdvlwmx68GL58Po1pd2TzTr9/oiTfnzChXEIG5N+DkjryRRUQIYn50C/6w7CjSWAQTtdHU3Pyc7yJDxtf8CUPjQGEfqP6uxgtcdvB91wFzDIKuxfp1gF9xeC/BCgNCBs876w3s1Pjp80WJHPdK23MWSdRzc9R77vHXRjyTeSm1Ujt9iL7LVuzRVywyModMakTlbHLdzPH/vvNf8VY9byeI2V9+hCX0rO3AK1HFkzC7jLynsZbI/jatx829su4HNDmRdWVbbSfhIfV70H/dFB/v/Iy+BXK4LqZl/VxxfpQ8xRg/m2Y7REFTOFhEL2mh6mZOELNHwf7hgLo2y2Yvpf9Z8b4Eor+TYpyJSMieJa0Jl8rPsqxFVmuZZW3H73NOWT+S5gFndHhFo6ZTevsqN8qqP36HLyNva2pQ31W/61Xrhml4u1xiUAsOFrlDOkeQT5acpUWfjv3ZUNqi/CFLJqRZgmdRQu7wi+LEqEwtIBhLhhvfouXQR1rs3y4xzw6pzLriUpEWtpSE6zAFH4GXf53Wx30WU8q9um0SIqczYmI/munNGz4BOmd1fMfvNdhTDWvJFNU4gtDG9tLVVrsEyA+se9aQZV8HTwuGQGl28Kdj1psrYefxZnYKuxaAE82e443B+5hBQdvRPM4L3WhNue4hHso1IsfzD3ZAB47UEYWNqWEoKlEqZBSC1dnqnr4JGyzUhSkaRdUuxcShn9ExD1M/3ZxyHlqgFu6o14NKpd/jViN7+8fWYjjrt8xrDHQso/0/8KHk+GI986/++Gf+XHBs94gr63gr9ZV4/x5gypuA1X+bnZZ63at3eEfgn9NtKjfWWKdocKsfZ7A+5rrgaOmnJQFFTpRE19lEOERQM4NZq4xtOuwLuZcJroifMAlI/boAzIvQCQVH9plVSTPtkmAurtpSa4jEUUYC/kqTozFQDvG8MH7uU8wupQArqYQAGCiSNCem65gFXftz+zjt71mlZDbvU8PDJJe+cYNSMNNxKYaCqcYR0q52sXpSbHERA+GIvkKM1m6mZw5Mm78wvrPN3YS5Ji1a/hi+W7Rrqrb/onA+fGYzUHFsG9Kgr2/9+HPEAksQPuHmvV2yeINKpL/U8LKPRl9hySFnFlFraF39G/c9tqlxQMsQRV9hrzPwPHLWf/h1HVQjAGK6+Wv7RiJS1eoVe6mpkK4WRJIaO8pe+fG+A+G7hlTGth2m5lKS+MveqfM3sBmZflsCZwjrBXoD3lzmu4l6LsWS2i+vwEADyXZKZsFIWrZTA2MUznnVF6xu/y5KPmrLBQvntHfSuts7jCJz1YDJeCM36zlOepbE40uPU6Qt4hvXiK2Gr7tH3/YuIRwN87jj1DrFsmrlcsK1eBqXSj+r6szaNEIqlxHtlh9oKudQ+/zwDGS9F0jRwDactuc4lLELTqK5bRcV47nlyOSYQQOJQg3iNDdKTvk4rrM4KplczdJ8lEkR3D+ysT64PvumClQv9ft0cHwutzHZ+x7Ev/39XaBTrD+FXchlrpJ2F7a3QOeefDqk7nEeKgU2SWp0f8J6D8ILVrDcrm3jd1X3PkxlOWPbgxm1W6iRugpqtXyDd/XH1JXlk1AGo+j7uuNhTyrtsvOFkrg4xtfC3cndjSB0P/Y3aMBA8g6W4iEFYxIehh2h/6Xm1+ibpAqJBTlX6UybW+wEkSqC9tZvGH5c+26LZXG8kGF4tbMoqu43h2wSjU9ggvEFHCXh9a96HHA+LI6hadfHtrseZhuFAQg5RlCQRtIxS1tEml8wDfPPSrl06dm7805e/0L7OW93vzQ3CB9X8+NZ/xB02nVKkA5/T+oIOCJnDHiQQkG71XuOkDiRucXVFt3B88uV6+LooKl+qi0MNSf3JYFzLd+17c++DqfFub7jMnasFhhet3NaRpfmvUhnxwwF41g+GTlMTESDRUTyGcrKaJJfT2yjhnExXzZk1uq60rBuDNm5m7zh7HAzJPbfkG/jQ4E2+CtPixdauzrO3gFZVAlAo9TFCKXLCBBF35pdQnA7sRGclEAnbuh5vR8jBBMM1qhiOUYp6jjIe60zzqsRXsRqXqoRdpObX7p/MjnTV15Nx7SJuVW7fNkFoWTVFrnLFCqWvnc5nCcQ1Ol4If1ZkpFlffgDRoziFNG9qaUskCBEqVq/RUa9UzVK+ZGuS6Kkcs23eHquZ96G441zR/EkvXMvbNdq+oLJJCN2o8hbp3o2+Y2Ugh24T85tvj57/TEQ3rAI+Q4MpoHTDqUTUOmRFNOjraTx4j6iwf8dkr/4FQuEUm/uPCuX7IZKpT8psgcPV7fSq1x1VQeJ+cXDoVNiNSk7td0DFlO0wq1eZQXV9hKGHqsMT1amKzvwWLtEVOL2H1Gid8P1xfvHRbT4TI4UvhbUED2ubzgyE40+XcySr4JD4/L6iDpJu1Nv7RpQkUhEbaocmKLy61lhDEdGuysvNx+JHOeACG+uiB7HdvXYs8x0K5T1M8ypY3+ta+arM/Nxtf0SgRqTXdCjAnuAc/cxs7miX7NorKj0F67GjWlXQKg2k2WGnMQw+/UIm0fD57jfuUVTf+9ev6u2H5BF4B5fNel/bobWxZqiDlhlE7PE0k43PQ/MtdfTeJBcOZ4BNVVZvhGuEhcOrdGGjoDCmtr5fXujo02NVYCUEKbfw+kv75p6UqjUW6VkbugUwXUyLUKDWQ7GQM17r08nniqrdbMOgyWiITEsPbPKtjKPin+ls0u5jt63+VcXU3tPv7ixqLY9UtZt0P3V2gUFx2wQMczs+6oXxDsw7TyF9E8db+Am/wGQbjNTRwC4rJ6Q2PHtiRat6rYSXRmoiKEzvgtr5O98P03fPTh5z0uhAtKxqriBXr1J/qWOoHdCNaUujdeba5pbwk0xHN1Wpa/6fkK6WOU8Tmurv5uy61os3zEmK4124szn0tKTWTwMXaB2AykOi760De3it61G5JUfAkcqGKKpcylmttSuv9u9BmjZJakd3NT0wntE7t3dgE8IvmwjPwC3cnrqvz+4zDDysvN7La0N7bP7j20/u/ys4n45JuXZXbFjsR3Suw+pfJQHcT6CSb+4uF6y139+5f6CtP6ObhcAJ5td9gdRKbRtaqN0EgoU0tnvqj/t2kMJ+sEqev+Vpl/UFZ/ldNuaXIQtLg5HvWPeL5KvjzJ4Xrff4xRIt9zjSjPxrBVFv3e4yi1HTtkrnc8cIRK1ujvbfIDYi07cAVuv0YuIlu0yYgHtWd94vnxc95L7N0rx/CMOlOxN2u7+3IHis03gPzTr7B7qV9dZeh97WBf3cuO787FLdMcdVd7+4vf01ZUk2Kr1rFaeqEXvQgr/3wnBvkYqduDK0xXw7j0JLbev0Tos0nCeug7ScILzyMvfLac552JLIWwmcajQHYKxmSyqx7iPrb/dNlfm891bNiw4KaLr1EP/ibufwkr4LzrsT4axYhfJ3rf8vzqa//EpHPtg9Bh3JWgLrhbvNK/m9b6Z5vEvqxVgZJwv/ILe7Rh1vp68VvWZzGrywL+WKnIsHPC91FIXSvHnH8ArDEizKeEpIB/BSZLy5WHM5FnrjBa9pU8A4Kt2q+XAKmcvqLnU/X/Z2Vs0yFiCyEfwz3fSoEAN6FOuawwo7w90sKtZqq+fpHFP/0tXY1puZB+NoolKqu7gKKbiU5a1huNi2TQWL4LXq6ci3G0SaSxe1FmrTt2znVyfPeXBIGJSLW+zcXrOtTXkKchu0Jo1hwY6RAwa+3iK1ssDPqwMdeT5KZwxmuHShd1a48nWE3yVLjVVtC16l8FPheB+4Mb3k0UHblf63+ofRNuLg5v+DSC50ZIBFt+dwC6iWvmETlqLYyTsWGPP6rfbVcjwUjRLpvaZK1vh/OUfzfDtQQmQ17nCnWL7cqYxBiXHPp97yVoIZOd4EPuy/oUmzlC8nRcdTiqnz1u/IGrgO+/6J8+clgKa9XSl7f3CYwbtt3winhVuPki94uE7XstUj/c1AruAitC430X+zCUMjvtbzTbr5NwzyYjti/QYfa1DTYPhX43uE+40oz/qiEDQ0tQvZZRllZOnY8XY3IIfoJZc18jdQQMrmFp9p/5ZxpKcCSfF7dMolAGTNzD6VTOh9mNKXtS3+ds1gY+/HZ5zd8LCHccAeowVibzyjqsmx5nemNoa6GKHLwHiDUOq5De7nOB2XnjQzVVH+PiqSsVv65E6qwSd4IrAK9kIk70KMFeokRXrxO8wR5ff7oT9YaRSzGooczv1f6JK46wjLvgOqnIv2qVcuFa57T0wwIviuXHB/AHsppu0wgVH/rcqncc5n3m667iu+KYb6/tzUttglfAZCRldFn/rb2ydyaAeDos005y7zj7Znp9rPwttefOuFXNZAWBT6iN/Zx2ND6VBx8bIeVscn6HG1zS/wrjbrtw8qP592WR0MeKI37b+Gf1rKzFd6z046bCrH4Z/0kXQwHQpe57q6VCGMyGJ8vf79pPqpBhqRcFc/PzkIRTaoB9BcmlOW+WfqeS0YwbiSD/rnmU7jvZPzLQnlefW86fauXs/jMJ3jCr8gMw2oVTpP67Cj4OkauphAA55BVR1DB2r79XizbjW+sK1VpG1re6Od+Fy1neK0c/p92wVzSPLkTzmInKDA1ppFUuss9KA4sZ47FQxnK5Qs/bphE7ZLVbqj49/h71HqFR7KsyNjAA/MPY5T51OHWava4rhgyF4NOX4tEpebZxSwh2QihD5j+bm7nJCrnDvk1F8GqTeYJ1EeW/bQaXfLZtk+MfRVoP9AaJpyHMLd2Gk6JYUImy0yF4PvbOca7mW0d5P6l5Ieaj7JXCaDGiiOkaS9B7n8aSBRtdCfIvoSLjesUSDsOL4zL1FJj2F7IHTeZybt1VKYHUlQaD9VGhWB3VkAkMOCRRkGDdRHXt5RDhClAWVH16DAPk6q42KTkNk8orjyBslSZ37UsWmhter1rmZUG9302VSs+QjvBv+4LmK6m6vafeVq7Rxp1vrUDDXG/G3l/89ItxKwTG6vgU4O/yMBpm+Jqz8aRiM+AFnhXad0SNqt2S7nTHB3qJlfrgExNq30O7wCRiQ3cnWXuIcY016CTYl3XhHZf+81hF9a/NILswmGERdXFbhkId1VfPYdVCGWRA65ZSMJvXP/Q+NSMW02zPDyxWLmmasPlrEVQmD955OAnw1gcw2fueuHN62489NtLUddmi31MK2vRNm6WDzPSBX/3beS8xkl3bG3NtuFXf4N1ML8eReY2VSN/+R+8ZjUISuB0XUhNoW53RBdsKX+XXnFT30q+qm85ZoS/b5oRQjghc5GmrzUO5rdncu1Tz9cuZGynNN1IqeqIzWwsivz9+mUdUtwgRFhO0JSzxEXmbHZLvV38137q8AR2QyuK+13yG63qlG5lk1sorzguakPb2cHOpX3RH4j9vK8aOafI1YSRHUH61DX6cI3DH+xa7NOPtblu8iFA97NYbx2xI3p9R1VeyzpSMAK2yskNivO9hd2cBmdcUPxDdJdPDRQR96iASkdF1k7bNJaEx2m5S8JF4o+UvfjmeZNLV215EP4Jv+cMfgUIbqkqCugYlX2Ige6P0aqD97CbIV3ljrOPC+hQocQR0aJocMMyua8jh+5V27ZUGRr3+RGGmHCUkzXTXXkkDqBXOm4y49rFycOo8ks/hexHLLub6TvTS46d8MBc10kZZvy0XvKvlMWTCmtjEfnJPJr5GrzrLtfV50zqeZfgBEkHHLzEf3Ff3xN9kMku1Z33G/+mQYv6RLETTIs4Nq9wUF56c9kAU4zwD9epCOhqCBr9NeNr6ZMnyzrS7WU0LrArSliS6M2BcsFtv9ce2MfPmZoxCt+g6CWWzjlxzLD3ENJKD+GTc2in21AVVMCrFFUb6C4GLNdbNXM8CTBmjvlY/stOsQf738MPX0h3WncrI70Wj5OPkpYiBCvRSD3qXVjAtxW9ynCQ3jgayr4DFaqeIJmMKGJ+GMHo2UEktwIxloa5RCxprv2EXvhwPSrRy0a9A5zT7Q+l/a2KOo7S906tFPNhJM3Sn1uXsxKq9dBVE4fL/Ee8dc3AO/ZrzDY1zL2YHU2rVurq1DDnFIarrF23PQ1glFn5kkLDV0ZklTFRg2fR5GanPx6vfqn8C33SbJiQ0cE3jW6JGcmZ0ng3kESmubnnZx6y5fXnVoy6ItGM487H7jMAivlOOhiaY/jKj+gXactmWppHGBYWmInt8E7BJ9op72bjDKG2j1owJTJdrfI//3+7ySpMpj6PGnmhcS0WWWLY2osbO4fZXZ3SuEMsVxUb4ecMisPTUMuFD519xfsQNY6gdPJcAWQrpmEAeaFjq+UdzF6K8wgT1ClOCTgcHCGiJNJi8tpGVDsp54sIA3v5MchovSDMfDyzN5R/3qLvOVYZmTblcXk9H0CaAnfRP1ZK+wtEIh1kahSb60HChEfqplT+O/9C99PBngKxdEL8Htna4kMeDB9qJMYfcdDpmJyYaSgSiHIe+hs5u1y/FMPR3uYlmxiNLAHMs8xrsMSxgnNC6CBqxf0JJAAQ/ynYU6Zo9i1L7cw3f/uWP5iuzZFsm0fLmt2vvtKhdoaS5EA7SNrikU4V5hOaew9PqAkl1/0t9ku+faDMXP3ybNMzgaC8smN0zvjT19l9gpQx9Z3jeGWJ8txpALw93dNusB38076V7L0ZrWm3xYorNdv/Tx5wZh79GF92sP9GEGwoM9A1dCn4uw7jRJtlJgdOIQq+VdcVekeifOGWcF+0uW0VtXnTe+6djmzzCBk7MR189xidlrHxmCqxipKRYXfjo2KxMgfvsRRMdLLlRNU77x46xlLfJ9WYaoL1+V69+a3KwI3U1mCnyUpw+VL45XOGrQ8shHgt4GJmdlk40XJB5aMzk4ik3BC5E/7gkQMIZpL4SJKzhalNR3xhE4oS16U1yvxGVc3vri+yT4JnZMMSrr9noaazzgz2lEjeY4vT0ufcfZvzEioMJkRyj6lr4vMJOwbn+onCa+4loBdBS+Hcaemy2WO+Wqvpud4J8vCQWRp1F3cPVrOuA1GQas4ls2zk/wHQVtUoG9nJcregoT0pLsXfahgIDeKLx1Lludq0JSuK4oTO1mhN+vaxgexQrnq3ff5tXubwfRcd3ZY71T4yFElxEwpXnB95jBHirjv1AJ7JpY0t7s/2WaQ3Sz1Ui+nvd2TmksVFG5ygVHK3nMwO0SqMP6QgDB6mHm9apU4qUnAmwGAFpCvqqZhmgxVrUFkn3JgXuq75j39Ug2N2b3c2RZ5GEZXS31zmCoTYcI3PlNJyf2UnZQGEmj9l9oxLVAzuZFGfapCA/KTTjvCZAi0kcMZI8wD9jiPa8dRCwH/07eX5CCkcJOGvD9H6LGPgQR6WRrJs+b0xPIs8rRmvfWLmtGMByDrFJP5FgTOy3Iy2b3WsQAvOcWYybYMnZh+XoPQs7Gcz3vwGqA2xG8kFL5oF9Kd7FRPsNvF/383zX2V97LUpQfU5/somBqSu0707mfpoI+IFDFlmIrdCAW1LSpaka4z2EmMia4sSsE+xw3F5x2uo81fDsKa5JW3vveYlCOTiPVruSzAq9drMnLIf7ucKrh7wFz1CS2+AlDY/w6zFMtAlk9rRVozcHF1sJfeUgpuH7NVIrUXKfmHMHquP54vNafdbvzn3d0A+9cgtsXqXH9fsykXCjfUOhefc1BqDzYfvr3v2zVnQJiSxeRDLgZdE2ypkPcqXkjvpO3Tt8evdXmZYGnp3st/guTLsYIWYwHLOcHz2B1aXsQ27/MwD1lxE6AeyCHbn2Y31QdJDOTq+KoHV/i2qXp0//ESSCn1T7/LQ2InMa+MQAuHv0qniz8IpmLP83aoMNr3dt/CpuH9bkz+uxuXYl3YBlaEmhv0sq/lau8g6jx+A6n/D86Y/x99izEfRJqYL99kgvEMOeBGoaI7xvIcSet6O+7d/QDo3WHq1U4hR02NEHI6sZqm0PggVv9vw9PnhFR+5LsZVu/5NmK1xVaksbxK8W1cblazviHkWggP4ekXmVojOx2N7Ug779NfN4StzfS8Rt6o7lkElVewLyM1NyQ0G1LjGbcOU+Us5O4c8+CUnoKpfPjUhMHy73EEHZf90wzt5fnF/WqNqOGEH9xOwFNC1LiisFhtBtXE7VXaZ1tSsXa8+nYcwDJ98MU4z2eTRrYfTuezSV++3wzQMNBAU2kdhsNxBfJ2KPMn9H3Fz3fvThJT11lDkdVYWKNrqBsHPXLla1JLXk9wXv0g/yi1LUuqcpllTTFsI6Nbd/vxxzhz/xoXz4wqjR4tUJNJqNAfjK5lb2LMrB3Pyc60+NxDSpZslAouCqk+Z4vbqTZYuQSAainivYXW42yGt2knV8efAXkrDMD7qfg5RluiYJvL170u/KRQaxNXiTn2HGTbcPvvpO0JXO8KgJbRVKXTPKVHLdJSW7dfUbLieL7HEoFgmQJiT0Bd+dpvJjTTEyjXYpnI+ogSs/GP185X5D+N4DVcsQMydCtcWHMUn5yoDpx2aERqAr5LZ5YTj5lUppvpFivzcfYevFnOOOBbTY56SKw68fQjATbTp9Gq4a5v4mE3oj996bTdmYuzx4BCu1eAF2WfHoX83Hk01SvIesVP3qo+5dzHunvJYTLuh8TLD/6O0uy3I2LcuYM4tXe/5KXpgnNZ6Fw9dwfm0Jd68QdhYKc/eg35zGXk3yoSQH2SQd95Ef19EPAJPH/mU2eFqiPXuiyuYqm0+/iT2WJloVoMbQBfOi0ME/cnGwdwTJ8k0dZNvHjZDApqh2522KqNcaY2Q1ZeIg+TdyVNtz34pDysnPrPFWvfbr/8JG73LUki0yB92Yujfa6zQRV76cjwOvCgkbtPn52sDhbKo9KF/K7qfevVPZKfRgGdspE6mndJ6rq1ymhVp3HPIvPfztw17DdE0M8MiMrj6pJMpvZzn9SQv4Lqr2eh1TmaVZU+kMvqVP4ixT4uAgqFkOdYGchSzEbuyTzS3Aia/5i8ZMyM4LNwSZnyFzj/BPB9eJiNG7T1pHxJS6PGMrpH+8buiG/QNB1uZbKqVXHsXIPbcZejdFCinaoN7FXek0C24Kmf7fcYXqco1O6eHmJGpDUf8l3L0ghKcZejHrX/9huqpYcDaoXALB/j3m2lYKK6py5G39vdho8ga+n+gxBUc+7bJsb1sOEA6RWfTzC50QdqKqMkpArnu4qVcQ9vUQtsUx6Ubz+ED7roEeIxnP9G32a0kw+0gVv/osna3Y7y1Kv1hHBw7ZyWoAN4SfeGW/GvSyKTQ6d+7BnbqQjpGn0sVlXTd5eRBikU8+/RJe5dhBysMZ2Z5d7rQRbddWSDGeM0AobnM4ZxUjIs/kDwrYXg0fOXjqb0cdWhsgKPsCf/5dxM4r0zttL010/fuoCr7YUcNr+Vk8gw87vqpF6p1qw8vt7vCKNpylSb7WvjcQi2l0I6SqaENVFfX/H0PfEt3j6LAO8RoSzNn7n9s3hZ5/vcCYY2cEYF3eeLGqATwlCzlk5wMP3X2GHZi0tvnW8yNNKPfl5d7R6YiRvcqfQw9Qmd2HZ6ASIi0/Kn4wvxEJ6aFeOflz5V5fLa0P02nlcXr6sQ770rk7ZiUnCpg4nJUtS/DEW5Z9IrdY9+jzeKzo93B9tPDKSiy+5HTUsSRJevI0ENoraq1oEd+6c3IS5bUTyXzu5haeNEsxvcm7gVNT3eivMtMcqdfwaxFy6/Zww9Zi6Vq6+fNRqjbfq2DKDgEXWb6Imp+36Zvj8sm58kxxANiClXVjJFHaPwzDuaPLyhU1FaebgngB3qnRPyZ5wZIvLfiga1jgEhPHoPSdler9d6qo/87idjmwPGI8LFo2mm7aPl+ikBE6yBNXw78v2T37lolcU3GgphY/MwS9cSW0l/pbCFdlJD5SbPXvHvM7eG+/UvJILeW+SYTFWniNzGCet6u2b+k7jHJlnZ93r31y1/RSPOAkqkanpQ9Gj4uX+gtS5ZhzFMHyyGPwRYWOuttNLs5c6qA6yzK2C+E/Yym17sggbL+VhzBWsFwH/NQNnZUFbH4ZhWgv8XUVGUdI1pHRen7ZLQ6geyNGFjLTnutGANppDnJ+5s8CWG4S0ohmwJyY2aCXdWPWcXAkuE/3LKO50BQGNKrlax/FMcQskT2aQMDbqohggYouc3j+1U0SLFZ0TRzZnCJyHN9hOr1eUGPDmWx6J3GU7wQrC3UI7Z5MMrka/SwO0fe43AJvBBy4GCtxrS2JxTzWKEbXzjWRSfu6RioSvEBcAQVmp3wF3uPrT9sNLj6yuk7J+s96/uHvw/6c6fGuZnBKRr7eBcu35M6+1L4KZ3EyM6PGpG3sIm1YpAP/8Yj7+jFLaJk/I2wJqHPm6eLnIkxDWvhgZl9hY5ljyyq3jgT9u7E2mXWI50uN/rrZpCKOKF9vSh0BoBjez+yNs11Oifz6iGzcr3pwRje/yBBsR3ljnHoXsDTM9tA2m5s7n1AXHNfYeLwo/teUq4zjRaOYy6X8v20KkYRc36Zo7+tQ8tulbTXRNFVCs77KBdHGoEm8U+bkLQuqob5U3LLcu2VQyXR8OAFOKW/Zscq/TfniIJGLiy7f8VHaJFiJ0eqea7oOGJ3ISndeNxtu+G4HCtcRUAf/PTGDvr689uexWt2jGqvzzkktfKESIaA/lwe+XBqFv+hrbi4S6V6pl17HD3KnIkfwl7BUc3W/+3UR3flvMVGmxj9gqTQBZOrsD1Vwbg/LmP925KojsNt7Ky5ioHueh69Y+Fk77/jZc/BBHNoCFPMLLHdBz8cYL8M8IN1L34r0JL/3hZFN0IGzVoUYtu55hXqGCtixRME61JluFhOY5AVhAW0RvIcvr98f3X9ZLL5q0Sks/Jmx1g/FVvC7DjXVuBUCjE3riPJSCdAW6l5VK2hMEikci1wS8TAaArNKJNhNTrJ6QRy9C71ajGkJX2s56cSlNK4U6Hw/0gi3LymxE43sD7+ZFI08ZQhC2z7BnzpJwyf2SRGDqYu53e16OJrL0RRKSPJRyam8NXxqR86LIw5f/nSdXptRdydcxcYUP70zRcT5DZaoyVewMsmceUyngXqXvYfy59b7o1PmzWabdp2tgtjYzzODrCHZeP+9xZ/GJsnt0HSEyhZSiZ3TLb/N5S4Mcwo+KPhB6kgp5Ww6T7sb++vSKjE7kqwwUV6BcnmuMGGY1UKaDxzQyFUVj+iy2iFWp/DUeyxXOWmvZwW5zWxb550bP4hlCMvW6o8JNVyWzNw62CEXhU/h/MCQj2sRddDxFbf3YzuMeDGxzEFV44/0BvoYuIdRym8VWBTd52y5TXxw6h/Hq14+2SgxPYohW6rkbUYXjnwBqNpu5wzqPPP21lEywGyIp4qQQvu7Mg/fpb9w/R3SxC2f3TXwKyIEKMSS8ndgeEX/4JIULuPlwA8cNsJiE2oj0UGrxA21zoKbbPiX/8PtbFVN3/8Qu62I5vKVU1th4GWekPq8sHHSXZ6ElMxa1lux+GlXd7/mZGJgBRYUU4DaZu+D1O7QYGAhrekF1mY3fLrCZXVffQjj4siT2YSP60H5OwakM/ZLXUxLkFwYc5fZr6xNSM+Z30i8tIE9JP0fHojmrCvev0oRmaTXRxDkn++PEGivnV+XD3650BRvzGqKS+d50JxtfQ98f095PQ0EGwe/ypnZXun1Q8g8BymAuxyfeF88n16+hoNfLZ4Tl7wqeyWrKvA4SqNgEyUeA/T7W/zVnQGAsWlQLnnYfLSD1UIT9pyBtP2XqLRr6AJLHbSx8/s1D46sJeIPu3E8feF7cwUb7l8SRPwslk4HIruZX04MuQCgJ/SVZ9A4d+n7w1VDz+Egt/4vdazSf7LTUWB/Sy96AagOnJee0MDORbl4Sc8yy71TTnD2i7wibw+C2d0WMUPAPY2IvSxE7uO7KfKRtdYhETKMfPn3qkgvf7rM5yetlvkz84nbshAPepyz6bw1fHOq7h1aMVGfSCwnixJ0NLLcAyZJ5GavfHnfwUjt2pv2rfOiXags7qdNvvDl0crQa9hDnOq47ZwZ0xnCOIP2IL374DLphlhH5Sd8tzwyLq7kNGnWIsoUJNzD8zQF69Hri1mQTh27aJmtL3TK+Dv4fP0u+1QG2+Qk/7dyEbiBRu8HZJpFq49NK91BR51wPXKC/hMRU0idKuSIj/MvdTUsHLAI6Ef6vxpg/w/oydFTQOdEXl/lO+Xf4ZYTlzdT5P542NtW5QYsMuhHkRiYMS1O2/QqXEDrytBUz5uOtCcLiCHKH5KVsd+6316dj6ZvaOYHPFsLSWFFGmmH2mtRMUlxVXc3ny2yEudTU5aEC5iOt5b79nEO6xrlA9YTZr4rLv1E1WIGqidcLHYl06T36ffn4ibvy+7fbqaF90bsLpm9cgmpMKAbxewsC9Hm9A6v0/V7TtJMkPDQa/i9wEU4BOtTiBK+jgAECwsOfxLxLwfN8kCI2VarA4Iq8pahePf2joSCrUvoZK8Ea0pd6u5QzhMXmd0XOtNJ5+qhI8/R/ww2abqKTmN3PdFezl9DnTZIx6yKdJzlDXpXV3VMGHX6fMhTibpofyTWUIL1fSk8RLc65GdvP8G/R78ZagtrJhZ90dLjAXlNHuU8DHg238ptusvNON2sY8+y+Qf2Nis5ocJu9kl3VNBnsI+ej0Tckg1RH5JrPqwvmsIaXx2ZT6+nRHbBnWtJL5cRoFVB5gfMqdgpTt0CURmbMWspm3MSQWO+Q/EbVh/tHQorxfdecI3Z6D39yfu86cM4IPXW+8dxkeZoarQXtfOlz6SX9dxLbPHW6vEGILbea7vH2EXEqjnnuB55ZddyVu8XD9oBBOTYN2NrgQWE4Uc3xHRMY7060Wt51VgcCvfjr+35jIqM50+8Xp4OuQlsSu2vq5Tb+RLvENnBFQB6d5ygi37ytee8q7ixHmOi7xR4X70Un2pe+6Mu/t7aym9s0vj7xroWpq1FMWbLsx75XiZRaHXZNCMAcnZ8Txuhj02pd9foy4ruO8+pXXU7zV9iZD66TMeNL0ApiOHiyEeXo1tJiImYN3/VIUlAgeF/SM7Hc75c893Xub9aP0qsb3m5ULbzOFhRufnnyY1rIahGZctASGfWs9wj/PeFG25Db0vyeV6v1b2Psa0zjRAu7aKdHmVOeNpvvxWSRmwSKnWciZ9El8OM6K611/D594R3n49R4QCtiymLo1bz1X1OAKFTNazuYqnMjRb1uXmI3R4v5EU7FWiClvV0r7TLy0EVwLQvgmmCdJTD+el7tQN9mzH73T1XD9SUu5nl2ZOKAsH1exGoQrBCxWx7IaNrVVz0yIWRtGYod/KOUxV0l5zahWwT+A4xHAF9tcYnw8m9APkO/u85SNFzVc/TDJ95mkKumrbaAUkoHTz0OJSck8Jae5MawLgwfsFDROTKCMB82R4d9W/dpSCf7dQ3LVjyRrzibb/545XuI3JN+4ez5T8GsQxE0PUN67MililVHN/PuFXoPeY2es4QVLcDnr4qARDnnF1Uk5d6cZqGZ6wbt5ANBqWGsOz5eFL3jxULmEWWi9Q7VfW6//MSV9ZBUbDtEG/fsKOOMautvA4rn+k8LSSjyOFIig7y15FTPHErUXhfTC0t16y7ynhRMFwqll1OE2zWd+IADrcWSJmdU3aN88IRPk77CDdNytDXqDHIO/rl4xnCTOeQ/Wp7J435W5jGF5znWhvZ/FLkCFmj3GRWzj7J50JfFvTqqbYSp6ZKEv5pPMqQoMbXAS12wI0ZvibNXGVceelTsbdlGbAzw1CC1O3L7oWI8rJVVFjuLHudF//xZB5q5jnDCujZyccm0b0HJbJOXbnqjDHVpPCWIGG/rJ6LFtQDsLo32W+8ZR2qBHAJTAy602ETdckLBQ9GMUiRZ/p/PVu5UinTVVv3+sooj22qge0lcMzQND12r1SkezHkUAMQcHZjOdpl0oHp76aAsHWS4//uZ1YXU6t7iid663/QY5Ol116ZKiF2tG3caYD50XKjMtXg8grqHHK/8he1sz/11V5pwQ5pnh+k+c/bp+Wg7Of7hJd3UGaTQ+QArzLqgDNqtlHaWnmyTd2o34eGS/EnMzxw6/mvXPB8qvjc3IOC1Vf4WctAbthIQO7/DiFGpXch0BMhbWkdjF1TTILK90Ab25/zTk2IRuJwcpwJjennwLj4Wrwhvf56NlNFvV7XoEyTbL2QfGlrp6J0pCrwI1tPkPLMmUGtvytur7Z2XhAwiR2W4mkD0dOzqePyCZ0a1Lp8cRARMwIGeb9kEB3pFNo+qBlGoFz5IWPWqXaxnUBMn2i/L8G5q6r4reM83v6nr0KtaXgCnU0SQblZe9KQmEQdKerkUFFNovAZ84/I28n6sEe5s74q9AAFLIXDPjYv4Fpkv3QvnaCA+Sll8fiPytX315jGFtMSWcB/KMZwl5tNO/P6z0yvoZsqCNor8jzy1jzD9ozq31Pd7a3vbehiOcZsDHn1U/y9Vl2Akxg+JmMebhT1O128HqWEXDt/buEDZtfXaYvMqrLlm77jLabirZsk1DjkGkYVeqXIkFOfGUx+spslSb7i3c+TNL7puiTO6ql1VpP/Y7wJl0cG/q6fO38nyJr1/o8cJPMe//ys1w0EaeV2pYB1uIWIx6T905s+V0Ijzg5LOPRErb1lvcPGc5GQhPX1jS++7/QTz/nRUq6ax0dgSZUEcjvc3I/YX1mUKGg08rj85Cgl50G7Kd7nnFD5H+NtMwBwSHypmntUbJA8iUTgycbU78WcTFSqF6+k39/f4LWSp1PS/ng5ofzCg7+USTSMqvLmUMIujrqCrYcqu8wFkLbGs7i30rutVB92JwHR8VOMrn0yS0M7RqfOYZPoeWcZlPgsr3YgSz43YrWi4epsq/rhCJtNty2+p7KoRSYFFfj8QXtynmN9C8M7pM68Jo2B92rLm7CCjw6kUaqinQyfBh8p6tkXy7sdbb/wxEIxXHpwXxfhXqV7ddC0n+HKwwKRjJ+RyaIpvvQYy8BL33Birc9/YQPRAtCj5n9ZlnVAEJqC2XKls8rKaYS5x0RVOM7p75ijnMfdgi9teCF83TLYC4am8WbdPEfu8LjICJP6lgaR1UFtdlOx+XMK3+gCwQT65f9uoiwSp/E14H8/TJ/xdSrdtomwjO2cWxFntRiu+XHO1nyoUrHEkydAxv6YOdLpERFrE5FbMAFDPWd4xvoZI4Co4qNLsOVhlNV2mpzrfuX4uEyeKLWo4h9Lce35/q6VeRKd+ZbMxKnTKHtaBPOpeSf4COnTaBz+V/j8NHkxDsBeFW56i7fJLNDb0nJwjDtY4k4DhaVqSiFUf/rQjK2U6IbHEcW2KrofYjZMFgNNbqHUMBw6q3yuea5yoGXz9d0oNtq/r/m+vr99WNVsDBgJ4yPkzY/xeU0DkHv3t059BmkGmEhjRbmZo2atLxxfO3wzKqfyzJ9f/AkkRyRcrYSNH72gUvnpxml7+s2xW6tvVANi4jNbrHT1K64starwmmoNS6TLxnkmM33olEQaWVbItlTX/7GPXDr0J/rf9q2XYNkxd6xyRgAHSNiXAUi2epDA0JrPH7swJLoFxQOHJrKMzp5MtZf0TGppuG1O2ei03kJ9P4uYi8GpjQ4K9eTlC1Ks+79FPSZBl5j+bZytE7lA39BCSlP0SnLWpSR5CgSH1fytmrEWZ3wyNqx6F3/F2nVZZU2AZOWkkYnMjjGHrM+cRCpnj7NuwhfROSl0KV6IH6pF7ZZIDwxTPiU90OQ8Bz5HTdj74kvDz6MlD9mQFxY12Qf/az29sYypmGtxr7Rg32+ioQ24/FOHxQz4+cyss9TDArH3gLq3e3+MikUXJXJcwXfQ7qE7jtqndfmzNY956yTvaWhg+/mri7aBg7fw3X/ubMzpfOo+wy6Z3XmSuRNwXPPa+Al/CJFqwEKvV5OX7B+3vbsNjdnEHsZO8bWzGbxK+shd++zEtExiFMt6Et/tG5cR+jDCkkfrVTEPI6Q1bjDkPNtDQesX2XJortEaUjD8L9jD/9kkHwPQkDYGSylH5g2Se6k45CFq1Xw659MI8KUML9gY5b68qIpZYKFS86ZBKXB5iKFOHr/tlrvEPn4sip6ntZO7uFlawWcNqLdM4n08Hv6H3093bwJPhx2VXzA19jogesP858VPeQ03L+RerHaLb6gzQaXxn5/7Y/5qDcJ4UZter7KDbA7svX03JnrYq35leoTs0JVUgffiv8M/cp5V2XEOYK94j9FjSDLaM70/vQJPngVk6nfL1ImgYFvi0o3CbUWA6QPuBkafqxpL5s/ZdV6XWho+uncpHI/sOI3xLyZStqCMiFE5Hh4WGEOONX3kIt6zzbgva1fPLlv+fk/p/H5ASaYsDa1O7/HQXbueZpKM/t4GQ2gGisZP5fxFjjBvRPV+fGe0rYevQiTB7v6hyeEuQPN4+mCWVESpTm7zR6AN+PnBh3YRDHigjbJg/vrkbii9LQ8jLF1yb5TBS6MoiPuwXBaS6IkDgJXCWMIhosIWb+6MclBEyTyqUTPe8zalXe52fmCYHxYQrjK+MKUAGcRUeEPVy+CXkruTg/K/kwqfrlDS8mS/KfbQOXSa8GQxgCwj/Llak5bKk4ro8utGfw71EI/ubZX18wuXnU1ZTP3g2YNaASe4mM4sdWtdfxF3mrzbhLeWkdGdASPe8pvOpGC5M7ebjRRvXIdYCSIt3LqfhT8OWK6Hhh0N/PGNfuMsZVdBfelv/P+LDu9sCEj1bfVmw9aCEeTq7LHs3MLOw4JVHnbQpm4IABqt2hQnDCrl/83nEYnikIerqo3n2MOuREPz8ST+8rnHiFrDPTjKon/xpFCmzd+9twXYo2zsinGxvxMGcJnfq4+J777rvWsb8bMewd8FO2hBvemlYLD2JI1JRMla8h/oVEe79VBrmKBJq22zRWldt4QB4IU6d71Vt2deQAgZ5JWzwz5PKVzqBM79PKwJIPvVJu0ntV3Uf9dth9pQ338FhNmvJ+UWR49yo/35EGvLs9wskMVqr5k2TzZ72PBz7mIrwfWTPMU5S9npN9fOIXw3wL/E8s2Odfzwb69y8tvXqRKLssI1Ln8V39fBvRp/PzsYiLZoyT4GZu2Jf9j9aqVpf+/PKjjobRFniVdZg8j4VNgGbhupzMWx/ZRkmU3z3MCIdhx4J05sn1aTasHJiSHUk5rFmi23+VqjjoKkdV//wy+tf0GyUj5w5Z+s74zsVezYD0Y77SBNbRVvhV74Ou2AYklyxmCZ/vfZjNqh8L697SU360qj+ijSzcstUGnkjVOkT6ifI2X6J1vJkPcQC2GwvsmvXzx5nqtnsNJ9Xgqo/XY+AE5RrJi+GGbvHBLyM3NVeCxnGKZiwhz5Qpx3FzTOiMHV/QGgZpVVFT4JWJc1lrmxCIcWHVnnOcT5ZNGjS7M+cuthfUgLWOU38eQ9k+JIh/I/xRFWxwc4mN6UwXP7s5uaZbjaV0Div4AUPm9B8I/jdnoB9578ftHbXYWUU6cczw1/CeLCE8Quny5JKWUx8f5sB14TyvBptkHD4VQA3gMKK52/Lq7QI+r6PhoXxpe5qyMcDeEl9fhoeXQeAlUeixvULgaqqIBgT6z1UwIWzAVX0zV+K3EdlfO/CsAOWyUeu4kbOiANE9s+lRFFarKAHlmCT1f0sae79cjfJ473bn+lHvnie8dQCPKstKBvWB/5Vd8hgPUmc66HjK7khESedBdmPg4OP2sERbbOqTQ/zzhGEZd+zHrpClY3gXZwkZi3xoSPOf/8pf4TMzOGd2/6t95lf5Wgjlfs3FLbcfxJb4M+2ma/IpbP1wWRZP3aFRkmXWQE2yp1c0mZC9OTbC2v5TSSHTwmzMMJ9yEZ/aofFPUl/vpRLnXqrnE7t7rz0ccSfRy1fH+HT/3nqDZOatoG8t/pumCE08Py0qdp6RXBL2FyzsSNtjNxzhUgTKw7SiFLCsm7YMFNQDKPzX9fQUE9tvnvJwFj/8Xy8erz1y9kW8UTH/LBaIKLjBxMsiqreTMvhbu/dr3duuA+Gl/M+2s7930HNUYHMgb0tXYuKPbyc+YtmIcgSK7KkwCxx6+t+jpXqZpOfVdSE1HvxPY0uWZaSoxPY+nUxCMls+l6J12yppQMDW42rTkKzVcpPSXte5Kp713yub4yyKn46pfYsODGpOgXPeP2kV/affuBTb88awamlM0q/ALdEKEjoxjt+8K8NM+uqVFXkG6dvEwd6ksbi58e4mzsn4gI7WOtZt6dZFi9ST8p+xtxTUcb/DIEEXMn8WV8viVfXU+f8ZbbKA352I2X32+MC/viUKOrNbRag3R+3WH0d1L8JUV1XUxKCxS7DTiOBfRlRSAQ+Fza2Hy3qTmkBZSrnsmVleBufN0aESq3/AisviomQ5uqMksxb/g+FYckLGGA1rZcBTBBJdkxDNCDHC18UDuQPxwYsan94HRAe3hNncpHjuGAIdhDMe88TO3+CNMtdMR6RA9GjoO3fpJyaAPRqrLFavXctN++a3/fQkPxW5RrFRXNs4DXF37btXTOGmbnVYuplWfyX4NB4nZ1yOReNw2fEiZiQ7za3SWsc2OuRiR0hKxyFmXs2lAYgHTaI2beKmln4GP2gwmEvXtU5Cr3UDkW8KWRTiuiImUhRr4avzPCwWDmqgOqtGP8UVRvzJWG+yrCWh9SH5HjxHS/Z/dyYTjCn1vmfvB/Krxa4XkIYP3ZnrJ6sQFe+z2euRPNK14yNqPXO64mrIjF7YvBWG/O02VEh1DCIEesT7vEn2P5+hXkMB1iBYh8JfV3DN/zRpCSTsJsfl62DNYps+23dC/oOjFNpQz/vHO3e+XQQO4zA13HUNa9b5bxkH91+8PzC7+YZux+7azKIpRK31veaMe6XYXJsX37arwbe9Exl3oeoj3a99Ir7WetbBYp/CEUrrlNAmPX7nbFoWgJZbPNyk5+T811yEz7Ow1I80SF7IfqJK0JHG2cPhREUXnD5IpiYnw1ZloqH0j1Ogpf/N07Vd3hsX/sbmLZqMwwjGsAGv9orUC3oKoyYozLuTumfvm4SrJ0uDA0y/3koQmxs0GhcjNh+jIuPCn08Q8CjHx7xkr9zdyz4uYe7hfQoih2+Qm0R/c/lDzz9is6mpEeeb8Q1qJzkmbUt2LC3wwkzlGRxThaeA64f7Do4c0XXl5y4yG6/vK5e642vf3mbRh7TW/hqY46O1quAIowBuwrD0c0ak2a+tEyan6trN7Qexf0WbT0sgK8+7W9FKbhd0LDQovrvmZ2WJvwAQt207rxMMGDnHp8edp6g+LzUNyDG3z8n+q0MbM1mlZKd2C6zLl4D/bgS83O61n1a71HhNVZDbjI0wkUv62TY5YOakYmUvtZuJgfYvdaZLlJfsVNJt1BnGFoZ8N9XrSYF6Bt78Py6GygXre9f+x9g3Ny1GP7zF1ThpL3tPnXufISkzU+Gezb1E/BVNhP+Jo6XiB0CvPMnz6WT8YnvFH5PHgOqATUnQEOnSsi7L064wcV5KYe+HWxeVKVmi0wm1xxSlq88CtlaRxWEk/TvHdw8hftk7p+iL2W/pQUQ/L6/O6+erxRF9GY8nPNguRXOs4KhLeGvBG7rI9u7xzAMT77CJe0b1ipcqtco9I6kamzGYeygSJ3juz16zjmFxa11LE1eFQff2EsvrmUxatwDlBQn37+4HmCH9lejIr8r4EXfmx5VC2kxgd4eDWDEwbn6zNv6qXimTqKoDV4SyLQ2tk9hu19j2kxyVM/PtCtG1TdUmwuzK3aflMb3+0rjvnogfOQlBKpP63KXD9EjE97nVPOm2dNyEd9fLBvfQrI8jbcmUn5p9x0pugV5kgVcDGWfRsv3JhR+zkhEFgyfqfgBM7afXwnvodab2ydtj/yEI/dtF+hyL9T+L+zMOGUr61zPNN+2+uu/Wt2cek2eX5Npk7jR0TqA1kKkQjczCZ384veoSNB7/1mA8nf5k3dFjx2mpF/MQUwIH9Bt0TDyyPT6TtIMwW/33RAnnwFYixbx0jHyStAmLqZbyHGGjr9SsC2X0Yi6/WmLR62r3aa8UzCtGilUzfvPirrnzjP6BDVE0Ucq8pt9CxqzXyT5u5FZ719Br7yl7fJK9nJ4EJlKY+Ux9v+h/5ywIgGtEw+WCLTIfyPhirYYqiZvMovWskjskh/pS/dBhPUpuT5/9cJSb3WAsiMIm5yjgXTc+/xiad9sE8h/caM4OWY8PoMN+LUfhzi7pqKPbDeGol7/+Upu9iNAmKzuboacb7ab4O8H9g0p0qPU7YHPUw6gDDJX606lXfh5RGu3ibW/OsOeB26nz6A9/9T8RplwdqRD960NUCbDldAMmMaaA7upqEofoKVkV80HSdvZc+bX3yYjovtWRza5G6Olnm/IVNcnaHMp+OiP5G+4BLQP9A+lfKOreJJxtcPdeyVGVE2noWiz1N9ds6aBl94h2WeYtF6lpy9zYU8VQJJSbqpfE67ZKCYA+tK0lyPVg6M+ctoX9vrHdwSL3ZEEYSVZmYAQE2mI7Q2x/tmLliiRNIYYKPo+McVhfQO/honzXCIckj/bxGpmxewJUzmuMpiIrWT2MwZSkHvw7ZDGM787Bt0vF2yNaKSoMxzqGJxfJM/k2zOhp9BB17AyFivnlb8OD68dKm2gfaKB1O73QpvXnxTVgXXaFB8yvjHOoMY/6X2Sz26TkXUkrovsCcOzzFI3B1vHeqhMmeIq8DV4D7QdimL5jF+f+fswmDQ3EnsCgXZabcYr/tpaq7guEjZYj08vf1lwElq39gTNQjrx7AKoiMCyJeoku8UXdmaEA4zghE4qPuxmZchT3dACOM1sp2hWVAi6TpZYNiQdukGRsbug+8w3465Yn766hGDln+3kdUL6zAO07o3HxJ2jv0XqOFuJCFZho03a6a//m17VLnE7V1nxh2ir11ICBtwJ9d9pDNByTH08VUuEtpRGfXzrUpkWO5sYf3wUWfmFWXRV16MDqGxzuCPxxnN+g9G8iSuD3c1GiV7WjaY7ZH3Qk3dxqxTTonTE2RTS8W+GNEa3/lYi4YehN6CfGPpmnDVD2NsXffzsALm6IMz7dsVfZqcrpqTV7dzUk/tNv2F/lQafgKaIgeqQsDa+4MZH3Ljymp8ZSqf9vObxHsEZDHbKQDoBz58Cel3LSBmRho+k8aQoJCJxNuEb0Mrqa0l2pgBQm4b87gKwUz7owVNbsKEITpu8igqY2D91/egk6HeZL9zkXxNu+l5PKSh6xSMUnw/27rW5WDFEGUuGmvSrr+Q965ax0v4d/ELkXrQ6BMWPyfrafWT4Xd8MDLbAUsAGSD/mRPTbkZOBj+efz3eBjHHb5h7/JkCqTl3ok0id/yRmu64bStAzjaynC2Z1hBx0dbSlCowjpv7teQSsSGl6Pb6ZNpLpf2H5pvW0ppc4HmMWEOGddp8og98L6CqtT9N8THJfXCFg2/l1xPxpcAYSOwzrC62fzE5+N8Pi4fPtoRq4RYS3ReD635rpMhGMsjyxrvDGnKbZ+iIVdrcYCuwWNoZt591jtwbaZtydp7NoPOCsc0DAUVnAJmj4M1waxF24HWmBLWfiC8xfkQ/eVJEH1+CzKGRcgytCYxAaVnW2Yh/K0+/QEe3VoMuzmW2floqWoO/IzcNw3kLrs5T2BuMZxvywbj6vumtAUvOX9Xr4eOMRaL3Xwa/8P4Gwh13+dTnNrEhDQNzhwFIlcG82wsIxYJiDQv8fQ9OqORVkIU60XfC1+ZXQi08HIZ238aaFcxZnvhv+iQRJ5fRvU8X1rDjGQUfP4qfYdQkeHehNfjwfd3DB6w26fArt5yzI/jkW5J4L04IA5fv8iwKnmb6RuNu1W/hJmMv4gr61RBxY6GKf8U3+eTUKBnrd27wOgkeSkdVyXEp9i1geT1Q23RjqjdLuqt+dFyha1hmJiYV7+EMjtMi95Nf6NC5xQ1cDlYnZztaZEJPauTK/mUA7+/oXjfRx2y3Cjb9Ms2ureQPWjJs2MG+4cUMNjEu81zVPSrXhiu3CDQ5kQsWZuoXB0+Q0YKV7QVDQBTm4bZpX8mnbOK2p4DvdLzJI0yJrCDJ+iGLbBuVTOUwLquRAE5C67NZtQji2R8n9g8U5KiBfKb6Dfv3F6euiKbUvkRP9rkF/fX+bp3WFip8jclKqZi6dlgDECv88/GkkMn8ZnGYSW4R1qBW6Mclnqyup1z2r8mFfjWuOSobBkJI5e0AyzZElQ5n0d8tzWvgX8EDE62ERveGgcPy3BaSf5tzq5tWzhe9eHcdxWLV82lz8yPmmdo/94t4pcJ86yifCuaN7wUpsUMqT1Dl93NXoWZMopgQt4oVAhP7TzAtXgbj9jjsEJVdy9Cuck9xRyqZz6WzEdDaV5IaYwJRkp7HlYAqIPOEwloQc/+dpgYF2sd0yqXZIBltKn251in03Rdji+xrbINdfCFK87Qc3mb9c2L///5cgSz5jppBLRbx4i8pK9BGZh+DO90u/JRx9ohDfit6/X1iMCS7DCS8kVvG3CJ6gxbUkHAngvZj53RI6k1Iu+/Cjzoauy3tzNgOILkiqBM7xT5L7epSkGDjPYFbNHz8Mz8/AR6tKdJ44b2hElpRx7a5AxUAB08focyTjq05JJSF/BklrQmiDgJVDLTNxwMzybsBc9Q/NmTLlkJJPK3+/Y5zJQPha8Q07r/uYejCyi8MT18YlpaCvh+bxtOJxbDu6yw/jAQ10b2hqzC7pyGoL57QZ55tpiX9CSpU8zX990G554HBkr7Jk0uxdscH6g+EWPGE9d4T0TU8ysXSTjccHwXx+E+1B4995X1STWQcTT74npKTDe/Ti9HueODWP2/vk7qsXYrlxBjV0iNA8SLYPkD/aFzOpzYrbbP+rLnUH+hLHgeXe9Zs+XyotdydGyLgdk0Iny2VHz2rdpyq80hgLXNZDZ+7//yibukyj033SwcT+mO76wIdQAry8p0pb49Xg9uTM/0aq85uTc/eDX646vLWn9wR3+zbuKUD1j+/2+ytSJio31eXQzPEoa/CAFCtOD+5kGpjDFyhqnJHfAuK39mElQJ/1d9Po854LSPFJZ4CDfn74H/FabQlV4dRmP7o2gTsU4jAAJkNbM0k+LnmSuTI3m8MGa8ZGjEGvnTh8/t/74uDrdux/vpZ7mTJcWrrLdEAV6RqiwE1Ry8yO00TvKsxkRBqgOjrREgVuiivRp2rEEY9EQ5zB5xU4wfzUcBSNtkkzOVYcJoDWUhgrxnm3PkGPTL+qzHskT1vOGv3zVbP2YlGvG2u7kD+24m36YhYXGOCPa/nqXSTPK5ZYP/dcgBXgkb1orqyCb0R8C1foKfJ6WNI78XG7N/4xYLz6J0Sa/YddAEyu4/9/qGgNS2S+okknjMVV/vLVKsycNfWb539U7XWAPVkVPbHWR7yEzynK+Eaok+ErxePCKn8sJGua8x+hEU9geP5Dw8mROGE4uH7JYSC0GKFS7M4tbAQj7vDKygwgGRWvc2Xe3tE+njSMk5vimcv43mFHe8CWTpFA8GAaHVtkWlHW1rKiPR6vzXCs4vFvoPQni62rMJwv5XDmY9F0srK1JSlz/6KpN+OESR5P02VFtP19G3L50oW+7su7AxUtVtLQwZAcM5xugkBy29Bf0fndaL8x/9JDMp+p8Jn1h/nwk5sjf2TvD9i8Q8BWC67BxqrC08UY3ihYtSQksC5tWT6TNH0ocnJUsT92p1AOOfhBzBqrbhT3EZXfP5rdLNQNxPMc9mMYrz4vWyr4ZrCovGzJvd15+F4bgbN6HAkihVX3KqVvQD/8dLt6CR8dXxQ0Dk1+WoknU7VN9WKqWUDRqRbj1siBAMpwdDqIMLnKkMyex0pd4keOut00PCJUds1v5aBxqWKKuouURrvPEHuWdLN9TcUdZgi0vSXr+WW6XC1TBF+ZwSJzOoWxn//ZbcNKPLGAvHrwR7f3NP8LS7od7lnG+YiOb6Y53jKKKn9vNt8yW51XqiGjoBrxmDqjTkPllXHaEgVQkcS1VcwI1iKASxuOdwO0QP+55n8rRvM9/Wp0LdDX56eSXJ8W77vl3wDTy9CC99kJOjeZmSeDzesN4vjTnGU7jjiURL6tJsLZlffT3cXovCHRX99B7F4fGOJd9Pyiv+0xOysMl4Q2gTUFCmRm6jSIfrWuqf8EoIV8QTlHTjFr598szWiFx2x3aQ9eUK5VlVUM7ymv1yK8VkMDeR3NFJhESOsmRodHwASX93k9wwYNbruBdnUDgrVEyx5brT8gcsfAHIJ77sOBZvHjbYO6iyRhnTAm3qeVwMx9Y8E+7f04ltL+Xqcr7DJHhWle4QVW2tnOLtu0y4JLq7T9oZMCAjOaSzDIqhJcpybsSZOAUhR45ytSas4seyuIOsN3bYR5SgxjT8xposIml9sX/E3knqcWU0cW01D26bS5kphDn6xAD7GrfL63Su6xw+/gXZe0Xc2Vjg/Srd//TO6zz8ju8e63Fk38UDV6IujCu6cB5zDsSXYNk+Ycd03d5hsk1xXngjEe6rozBaOnAd93vPFS8bfN+qYJDdOO0cA2CHF0vJjr8AJ/P2rGx3Ax4K5s9hC3YY7z0yxJpSS4oi+WG4gnzuA+T45rtf9nTxEgYf+L92JLAsPC3+esG1f+f5q//2bRVx9PCzF1fayaHz35q2kZ38if1e9EBVEl6WxVeNVh+Wc9PTtw3xMX9NOCOQI5MgSx8yNffgbqhQdtSr7aOx8Ek/jlPnYOJIWy6X3gQ9/TobAs0/ZcZHOzCqUCaWZCwA6d5xuLEJWPt3ZrEmebdmYRpVUyUgdOnHBI1Dj35VShVd9ZEgVaP4rRZQIyjjzk13ttnc5BKVOfKjX71mR7niFraK5wsGdeaO820BzkI/U56TCF4mew1mOOzCdGILux3H6Gv7Nu1hRdt2zZACjwsO/bHYmIEfIPnnit/eIKvqYvrvkMk5MdB72UoOJEHAwZrbxFZ2J5+IRSBGpDvwHvjZa8KtwyZxFPuTrjA3U5Go9oSu4UyS/SHM557rDNuyMThS2o2sKUKDBire3CLsjTe/fv2kpfviUpPymp6VdxokjqHllxOL5zGTrT2ybUgcypUH+NWrtAew3FvXh5fuw+dLecAP95gdaskZpxI+NT3wi9LmKaO3b52Wnap3yZMPcPT5gtuNS4TBSsk4UeLEIbBK2zhUQjM+a3VA1eV2prmq+tIDNYngrP2IqK6Dg+OWBNgYhRKqA21+8O9+u1cZXcu76OZlHpkhJeSZSXDcWi4A4Y5UEg4a3vJTVTuSHNAjjyte7ynd/yOtH786HG7HOjirz7mUiMXfLd6faKY8V093OLWu28C0NDp07Dna5A6AjPObU4IeKG5aEQfvhvxCM4peNfXzQpphVuXV//nb6jVMNljKd/nf3l7P5cars13li/9OID9pFMtTsY/CLfPudfvkRW5PHDsqWdg13d/6tExk8ZKwyiIo9YTs7HqhMtH4s38WI52Rt+fz4t8zNqstYa8GSmYGcc4rBQl6fM2l9ujD3/M1MjGZozFO7Y1VzR/baAC/i1bAHBaisS3/4W9w8kV0+w6Bz5ueKNZPYUMvBx/fKE0mMECMJKWU6jeLJvsD9y/gG4vt4b3GUxBUItYVDFvi3Ke6PS5MBE+Qlc1TktHUpyyVfwx7ZhuAwKazaY+pq8St+12V/w7697JHCULyADM8E4nYWZbQwglVipu6xQQdRc4fkRU+pK3FWg7WlPDdF6oFi/q//3Ui7m6qS1CLPHZOVz87e+0eRVy0Dki41OlJbH90eGYjwBxAh0/tIY20LUEyxCS8cCuU7Vo5PIXEaUXnq5dlabYXB23KhkkalWKClMQN+KFz3gT58lsRc7c0rNYWH3QeMHBmIi1vjTSG7HOuNLVWJC5u54ZiqsiERec4CyJgeiYam2fN+h/S8asgC+JRXtyb8bK0UlPOnpD63hupln02RBe9oKtTpZT47LA187ctkQUWx1eOtWyOobDx2vD5YFDqqIs+kP7rngw2tr72ug9VX+6Yiz79WeSj3cLdcy+XaYez+d5obP6dgz/ukHuhGlFa+9pbPMMAALuZnHMe7fBTQ9F2oUGFo4po9JB3lyzfsN8ZBT5eMuQ+JQbmfuHvMVS+Ot5cdupiI3dnLkEtNLFxcAI+hyLlMe6o7xHFLE2hyNU8KAablj0quf4j45JjToS5fEQhL/hpgY7nYlW9PY1iY0RuoithXjpYg5xWuu1P8aVU69OYEqR9B5iJqkbPaFkAxBufCR2G5DYO0A+d3sHnUtdHyRuelIK1LYYugmmfDkdnPlu7LyzyB6EWOqNLmoF1qFe+xOLHqZ/k70jdEZXJ6x9zR69f7qSzFZ1f0Vi65Lu34e5R8fMo6oJCzWhH0mXvJrU/uqpvpcOrkfWehuYfTO3m6X5nXuXtD7ZB47/ZdyY1bRdg6hEZn70JprWXKOYPunZfHxJEghqvmrjPe9Xm4sn+3FuPHoSsrnwwzpFyJdHM3kBd9i/Iu73a6kIWUQD5FuuyjXOrQ4cxRmRr6lbxaM4s30G+RTeiTXpfRqP6l6SSx7+A/nn2Rdme/+0h5d647rE2l6d1juiTziXkluhmBu8auuSJql2fFUZsSlapa+fmvwSYrdBb6aMB1/OlpFhCJ4Fecp3XW83lNJSgwfdhf3D1t74DSt5kTjjD5O58a5IuEjahVge/aSRE3ZsLPfxDL71e2T8gLQ0Eo8yt19IKswQosdZ+hJ7lhPdwDaxsvjEkpRdlo//gfMNuFnyecPzlwmemg1+ud/dkpV79z0Od4plK3Kt9lM0KvRzbPTp8nHgK3ORGUHDF9w7Z064GTyLYqNQ7VQJAN7xLS+CliUwZjggKyatx+qz102/V0ffD2bfi3le34P+pK9oUvGYYykXwfFcG7/6kxcijTJnCE0LmId9APJzX2xgbZJRI22wcyoPeDZPQmXZ+8/DoEa+/7DpHRPnxrxiy+FYpQJsDa4nd7d024JDc7y+m9g/PrBY/yPWdoIyuYDVSEWfVuHoeCcI2kRYrjsx1O9cl5TZx66wUmsCE4JCo5DcC533gVxo6xvg2v2GU+DhEXDWwBEzdKrfbB6p6usw61PH6TrwlcFWF2YFKv1Dl3r71o5gWWi5MQkslhddSdCHi6Q+B1spBT0EBnTLIZD39odZVxiBxlDC52x5J9/4nhMXuKJWpD/eAgL3t+7FP7XVVblqrphT2hiUxFgtvdn8SKHeg8jVP946VyuM2kBCF3DfXsLO1uh3E4lb0A3Q/Hk89Z48NOZH30jRH9oaSgyZWaBO41JmxTtkiaJerwGAdnLwneDKojAf9foqrHznjbfFwCczwv7tm6B+XOFWaBtH+WI3jw3M/FT8ol01/gvmZ4oycbZve9yMewTxnYeX192NyElR+Tb+6szySq+rp2UcAxdf9Io9jEvyhzQ+tynnmFfaE+w5ehHtlQs+jPreaQ02hl4XLbgvzYAbxC3FC7tv7238e8i9dM2GBvbo8XEUM/UOzWuw0+f0QNAvLxfOKBTPYvgnCbciYPFqDFAmizl1unXwv71GKXOExMqWOcbYLopZFkPIz/+IVjJA677zkwVKI161TzPGcOfLUXH3ObJBe6+DRVusSY5BY3z37MdLBLP6HdEkc8GCQPD0UjkQVuKGqA/tpEv6Uj3Xxh66eLfbmxFixIy9jsYPlZQ13ZobsAWfsFelWBp7Wr0Jl5v7RxA/3a4ZmbxDjN4ge5daT6QqpVYjThprnexrvzf2O1C7nsoHVaOSMzwle1m6IVs9KsEX/bQg1BmWlpT8pLtd6wGfX3QRAPrTg9GBd7by6r7GoGJpS3wfZKBAWl9Ofl9Ad6h+u9Cx6gBKqd2E2uInNCR7hf/Vueftq00nJm6qcdxUr4Xc2Y6/W7hl3M8eUvTlUcn2VrV6K2y0apPRISmtU9iQTQ/fD3zTqqaISl/eaH+E16eaCINFQsMNi7ohKiffTl8/nZNToel/zp1/B9uOwn301t4lcm3M9PmmFuDKcXDXzdDfHa/8ptxoAbuTlpOM+wyt8YT+uE8xZ29oTYKlht2nc/WbZKq9js1gqTBmy6r82sOhpyU1CWyt2ZR8DUEPt2oPaAGkbFlGXpB8Q063+6wouhb5Db/DYeMcu3v7U7CMjHYdWutNMNq2D/Eef+R1ponkDUEgo519lSzUHvtX57510K/PRkMFTNXj63JaAp0TZXb7h/pGWUfe2US6tuNt6qhIpJKIWT1jVEAAQrB4hJKGTRWnjiUr+YZFG3d0E+9wVdhWqyMxI/9oDzCsq82mgH9lBG1Wb2ei7NRW8O4OTl3nArmZfPEf7+xLfFxguTT/FJH+xbtNr3gzJqchll9FQxxRSL8ez/Ql3nOzk8r0TrcGvu+BEy6QSlmePJmMoiHOtvOeqr93JrKIpHj9K6JJ8c7/vwtW0NvgOIL7+IW8r2QoWVyk6/r6/5adnSP6dGDPu7uPiMo32ejpKuYkxJAGblNDfVDVcEWBCcqoLmA+nwUnMhT8W30lhmMv2bps4Lycq74ZW2gxJkCdEK9VHsj4wEykzsk+y2xY1Xa086w5qaJfQJiXLz6ECPtoX1tA6+9daC+D/x98/QF73jVZlX9QsH5HGxnO0md7t0KCT8NqYy152Q3Gu/Zs0q0g1tFE7mB9esmfdIo0R2Uvag1EOyCyplRyUScX3l/WM/Dea2F3KRs3zoXaZss8od7FNzdUgoC/nI+Jz3gt/w+b+q0a9NL8tEtQtVZym7ZObacPP6YUXyBJgAc5OyHHS5KzB8aKPJSyabdjBb7+ONt857q7sbElMfirTThwR3R+LJObpvVp2WmulLM2c3+xvjXtdMp2K3i35evYV2ffiNvOgZjb6pnLOxz/jZcl6ZUvK3Z1inch53SDaAIWTfAjxWylOTteLlheAmvNfILS4/uklDS4EJQrtFmCaY6uIxjW0GeRrNTyRqBCESOVnFhdPxG7r4FE97zp0rxuy4P/FKnaG3vd7CnwTEY2Zy31GGLWaNgqEAUFbgkYEdATCis8nEBVLlGyRxnN7eJ9jJejXAnfxitg1Hd6k6FFs0yYulJlPlABmx8ba1Xb/UZgES9idChsLMQ4x9bBNuF69q3XFjXhhDN4GL7vKfu9B2p6vrfWP2Lu1tbbkt+Ggpk529qlWiwppvhKX8L9Xg6vzaNJ4tc/6LTeiJ0vZX2I9sDRbrJ80bA3RA+qUr3A/4SCmwns7dpMhZnHlBX7u2EBQX9pqw6vnu54f0ewzGz3rmmAP8HsZOwNfMQBi6Oi6kCxl3g7RprZKp39MyTag9WmsItjk4eQL5oANTygtli3pj6euMjYxhRH7sP3A+QRadvx6YRaEnVtoVYGRVa+VQV0piHsGT+tW94u24ZahX7bdS+KxsDBbHR66J/R00m1iOqEkyxrKpfIa4/mhxE9C+qnetCsZO2Z+UiVk16tbrxwgVmLmiOkiJkcV1gqDujGojX39VeyN0GSZ7iCXQnxaBzNB4W0a6FH4tLyAA/H80hxpLU5NDh3JPLBLdqqX5em2gdKDT8Z73MHbxlmL1ADYNs1x3lq1O+nhLXLXEU/wk5MMzjr3DjW/EIKT6cKbI+7UrTbu29U28ChYw1eIe/gDyZY0xsY6ZePzPodtYLTdbs89blIghPsZxln7PV2jtipWUf9cc55egVcouLpyaDFXpFI5HfSTH79pPOfoALkM7PPGQyOCOGe55A8myNRurYFmfS4ITKsYVbW4lKxMg3pKqWG49dZrYdb04Fc0td2IJ5Tr5ojabIeAd/iO4Ik2VQsrdIeB+GeueVe3zHmqIETsbO0xT8ZUPSDT1f+lOmsv1BfOBKcqClUxEQH5LGGnvoRsejuKKCfc8w4elrpKm5e/ChH4C1TeQvB97CJ8DsnpfsU3x/VAoqwzWd6m3L5JiDaDrNUN9q4Xc0TaUmej356U2jo7TV0qD8anHdfjO45bPNz9PFx+Vco9AGvFMAwUPJoPeF6VLEgz+YhtM2mTZdBvoq44193oEhNnD6Jx6AWS48T24ykkV08Ju8EJMcj+gf1036Nb5WeN1Oz/yz93Zfl8KWuGude4CivVrx2QdB7MgmuVp8lKP/qPVsBlASbyVeJ4pyldsbEXpJ+PccA6hg25ScJz4SPVmB2rQAQDjvYevw9H3lM2JsDEQt7cD/g60EqyhrFUEE/0Ip74578fMVu1DwCd/+fvBFn7fwp1P5Jm+d8XWmGVx7mcQ3jdUa7dScK19CWMEZhNLDpoR9Ng7Ik9Oae5+q/sarpH6G6qkJT8RpZ0R38iX+9jPJv64OctQOQSghe/PRrzTDGuvNFemq+mICLH731qGI7U21bn+6IzzUSeus/oALyKtoc6V72A8+iZScGlaGxf3T6SnW2/RMJF27G5SukTUK6aUe0fVwI7fdo/8y2zKSGO1T4ZZ6x993R5XimYvgHj6z5y9AYChCBlWCg3lmsbJ3AtmCmKSMjsEjc4MUcCLRT9C9R4LBJMkfzPptfoFQrmI34YMufVxp0uurDZFSPT19UWbcXQoLEQTTjb4LFSbH6CW3oiMafW9+/hkRL3ke6g/HWfGa6hCddOEjOGZrl5mPDOmv2n/Fn3UK75uFG0lSpackSnYFy+yz7wj/0S64X32DpI7OkaWUZc+HFAzbne6rKdERvtHT5dQnQCxKjzBOuF7hLPpGrkmTY9EwzScsyDLtx4VZ1eI5iDs412VLqSbmZTMc2UI1Ei0euvnnQeQ5cvDFtFYuaPxyheS0RXqOQs0ur/5K1H76h2hcnzqUBCC5k/C9Gpj6vlMQGp4hMX/hD31GcCdp5W43BSy/Yr3+76P9vIhRJZlHSiuw/bQBHoLjkdf+vq7AB2KSMtWUbz87XD+cye+W8Zbl3L2Pd9fV4yOUWW/QQjqdlXOzD8tc8DHpdGBCLqbd0oBvUmn/M758gvEt4L/5r8HzEeXDl/nMsFxy5i2lduVn664FqslNmVG3kqNvIuGEwrVhTgm+PrfLmM2amhVki3+ISCkupe+LhJxvB5WeoSjdTz3qAiX+IOUslvctvgAtyVcaog5Wn1cwbqkkt3cpoj1Ch6Bz9NvxUfggexVjbLWLyxaHxkxsqIo5hX5j2LcOHdFyNZUlWOlQ2ktu/vfHHpKA/QkPc2odaiRimLvK6PdJ6X15VtS3QgNsWlcGZs2XY45rp/Hr079W4VFrmyxb4Yg5Qq9Fvw6XXPo4cpmvAjz9ueOw2O8iFyElg4m6DHC9DzNdW3AOS/4W3TPuqDQpeLUtQ2KxJu0dd51AUb3dqpk7i9k7Pmlc7vD7AsYd7bToI2JNdxm1KgIlDl1v2nm6l3BnSLjFvO7z+FOA8LecldrlX4IWe11zNpa6Zg65zIf26Rcx75aGH5MotdH+84G2CSN7mgnY8LEoAjS2bD6K+oNgAAOfRCrQufF8218WE/9BeAm2E5+NQK+heo08LlrNfB6z6jxJEY2QfEgL0VdWsvx++EjZ36If/JS7esXy/RJCx3wuayVbLnmSf9/HiLYoK3xWH7dNZfP2FA2viO4rXMch4oKSqfZhcCgMXkBleA713o11CLWZmphCXrYLGHBw292+XbiukZcVRJ5dZd+cc1V0H1bphZYl3L7eyg37G/y0t8jeBXlAFt0xZv/r1O0zp8T+j9DBOW3ZiuPNljoslaRqETF8jkFerfZGhhgBAySYBK5VC2gwVztk376Rst8alZDzyeOXlEsVWMn5LVhkbMcDnLNjKgkDQUk8eZSL6PJcKIB6DgKvcxo4zfVnc58xQ2K5mgrT444tyAJWy3vzS6lkoBs7Nu9eHyu7rnID8zc5aTeAesObu3SdUtKl338TbVhxWE/wnq9kn6I2qnNN/a5dvfx9K2ywwYh6D0O53m3ytuFLAqpih73WAYLub2L12KVevIVyDPHYaCR4ZxIu1UavzVX3eEeotvA125u1qrXvoL9w2kpeleg9wXZQ19e/maNrKpv77GV5K9H8LFU7VeO9TP1/wMIvrzDVL3XsIfL3wtyC0OrMVVNfzh56ViHimGuQh6Wf97j3l16fTqyHLo/X0Q2btYHbLaeA///U9m0CL5WvauE9wv/DA9Qdxp1Hv+P1lLOzE+E7WugRsv/f3eWMw+OHXzVFBHurP8ZbvftvlZXRibv5tY5dlwop1/VR8rF5ehLi5YCfeBwPti81Lj5lPv1Gh/35J2eI7x/BnDbqbi3bdSblg3av0nvyXbKh+wlr8l8M+hwGK6sGj3M7/1Y9h6Z0oSxR943jnny/0RszAMx/6uw1v3/dLMCewSoz1KTGTHlv52pR0z8KI1zO2n/2UqI8Zf9LqcOgqOsUDMVJm79BhJydwRErjldWBV37eM+t0Kg7vPxfIumaV4xFvHdH1d/5//zAyFJ35tWB23SNfZ3NS2+4zuuv9crLbiQ3QB0yVdHp45cqx+qZzMUDclllLZHzzoVWfZp2qJ38cL+Uou7F43cptVzXH+fX/JBcdckh6Hzu3jOykDuRlMd4LoX1z751Upfrd/ApOQuMvGgMPLTF/vl1P+e7rTz6Cd5uop3wKne0tRcdM8t0thkPFlqVQnTdAyVixqW/SDiLXoaftdHDDS+UHmzxe43+K7vw+jaFJ6pV3nEpKEDZXWa+icUFA8cz0dqKzE6wgaGv7Ta2Fa8Ebt4oGrsr2zP05dR6/N/3VbzB18nit1Ssz5+GBqFM7T+juhp1kNiQC68rncE/X71fMU61GsIWkKuRsx8eNpZnm4Rg3jej5ZHz9O8GEvaF8Ab1p+kZvKUE3haC3s6asHXm6WWQYkXPDET1UHwXGL4NBEcryvCbyQm50Q8C77NUHYrpdjmsTzc4QJWy6QUn3gXj7HYsazKSvXBS/uM4AplO5MZoQT9+Q7HK0tdzMQCayXv5oxfOn1LNPZnYFuPKb1XsRH/AvmivWApJSct5eUjkxyiirLpNbXB/Upa5N0m5WCY98CVO5EtPe37/FPEdadyx7BfzF+x3LRkSTpGh+JGGnD7H+SkVX3Ml38Obwj6wJVh22+4nM86QtFvjC3uBGx6R0e7LcFVJNbppXqxRYyIUOWciytD8rdxIBEGs4pQp40gse4T/8Q0cvlympUlXatyvPFYYuMDDNkr697M4sse1vpMbxM+ISw/crAX//Vde4jBGVEU98ezcY6Gc2/TNeSlB0Fy9vj98rx7ihzs90NRfOnRcb6qbrjJcZKd+ISMHxuYsI3907pQuXiG84R5z+0832/6dsOHQ+P6rFAO7++adNPewcn7dOD+llHa7n916uDdHuq6DbzoqOcZQgdD46fm4oL/mQKm6SfefTrriwUWV/cbu1tj+htH5W0Tj3Os/u7WDtILHCy49Sh5KIXQlbZ1yosbIPV8p8mi358TkfCLO7j9RaXtJmL/40Jy2Mc5lessuSgn31x02wCaxOzEXRZoRg4jWeG/tmoxYmPJTRRp6ONV8rU70V3eXfNQ+KQ714BFh8D0Cp+bckjNtCbCVyUI3m5/9fa5Zwil91A3f5ms8RfI2Meiljq4YKcJlUxhLRypmI6DDLg2N+XbKT9aaRGagIxA3B/5ndfDR0a3dDNzUzv5sRbzrYSzEa+nP1Wr9/UPZ9hD5NHdHYJ3o57iR9djNeEkUnR5o9QW2b2K1ruMftA30DCTcAS5HzVSXp7yaVjz75PzQKh4OJFV2UjWoU9oW+chbJdLa+JsDYVKKhy+9cVHP7alMNfGJkgdBl0fq3yA7SWSRw5gbeMZlGA2YoNc7OMOq+7ZeKZEg+77g2YO8a1bqolAmHEUfw8qcEYO8AymaZ8LU0FqI536hiqhUM1Bj6x0CWyus0b5nL5VjZ+KZtVlW/Ycp8d2bht5Y2gVE3WecHK/KSTN4IvrYZqFveFdAdvvZrkdfI3Z+kobXo0cvmvrZh6UJKv//7l2Uqd+e+7aNUrFBHuZxZp/o+mWD7/RrEqfM5VAxPo2gcY3irQRr7w4YLQl2N4GPuJfIHmhppe08ULnDQx9Y6JRz6vaFa02Zin+I9oH1Yw/2EMMPk9NPOoCH4yESYkFqrZHCcE2XFk5axBXLZYxeJ4x6pS8G2FWR65FiUX2us7jxUeR8Qp8jM0jR3y2eqyiUjHAASi1q5heagutjqmBNk1lcykv4fLOh5vWDMJ3QnIynoPzYGvnsmwCJwj/evng5eafqKdYhQKh3WBzfBAAt5aTDmrRQuPBf5tit1c/SpxS/7ehZl6Itrj3j9Igby9gM6UpknS4+ynmf75vK5xmyyU//gdJX6q48nwYkaXuof7GlO4i0edpNjG9W7X5bhvI09TlAuuw9dSq06kt015D0f+FaWdvyHfh1AQjwsM53/bezDk31GN6Vol68Ydqk+B0qPQ/mBT2ckKPtxSfj1iqbb4TqdynV+Lxj1B8SnAFzebeQ91886Y3YBxqwOxf3vxZqz810a4VMzwk8upw8+t/yC87FtJX8SpFKhpuxkkhb8ZgXMiHzy7EzGeEeb2C7xDxm1u6FfmvyYgesNHKzP+mrmeSBn/vCE13ns751K7y/mX3JdVwp5vripLFqBDlfRdx6cJezbCgrfhMY9kJVq3r3zmMa9yWq/ZPE9YBjMRxCFwh9sr2yafa0TTKraazMZnoq5tG1jhnhc6kLN5tOD1zPqxz2i3N483ix9vLT0LREe+nIj1SrgvuCEYh27M+V0zzq6zcYSlfMrs/z12JKP9D/WSEEVHcqH1NzTParbgokWIisqDLm0LtgP8hL45nOtdbl1JLd2oaBHaP6T2vQ3P7GZ1x7Krd9PGn34fJyVhloTIkgAJD/V++Wa1xRKt5G+v+05WME2l/0gLqCGyiGWIj572AM+2zuHh53bKnGsPT+fo35Mc2zbmn+6MP8zAr8P2F92ebRYPFo6YvqcNVuu/AgE3b6MwwmzuKpe4Fuk5jxg5bmFo5RFNbSVL0ohLCvOCyc9HU/U8EpRw4V6rh7aewiEzTSuFX+cdJZcTEDuJhWZoWvoJvQdwHBenzraoybULSkxd0fDAsAadcaurqoxlb9ts9WewVdAkBTX4/JHRWUZY/ysduMw5qc4pEX63qRHvQbtSCF988WNOMVBK6UlOrgCQNAvEK0k2Pn4Ruyuj5Et8Pv8M2tILpPxmUcnYoMngx8RcnijfR9BszQJvACWjK3IlY65qxSajRwkTg7i61cruPVpbdXWioA8gD03sjOesJ8ODupwoku5v2G2JExjuW56qTzrlW/wopdI3FUMN6RzfRXn/LOjV3x56fjI7wOvLFoPyMS9VA3IJrk9xntPGeTPpn1epVJWNcq2TjkV9Y/lOg2eT3/Utt2qBa6t09O3OtOCiNgkCp5+2sAbJTLz7ycvgUtpyVdyB3Ze/OclOeOrqLzx4e0+eKbPNPyeHQd5sgpYhEe7CJ9unxGDiAjNj8Lp2/e6+9CwVBlAsZzJSk+XySWgv3bRouJ111NXT4Seapy2BdOZE6svyFRTK5tBWaRzy1M85q941T4djKEWYT5MlJvGrkmCL9iwfJlWCzqL3nS6/r65K/ofAfzw+1+YVa1xE7zU0w1qN9RL+D8bngGGVtttP9kKQDYZWVcr+5q/bQs5KqZz+Gnhp84LmCW/675V4Duu8TLOj1ZmLPBLi2zgYutPykqxMzwleQoKcVuvcFgFXieM1bnr4zF7//1wtJvr1iMoNAUtuuLHJt4iDVxBro6G5e+3sienFIk0VJ+3Bf0kG65LDuP3ZXjNm2Be+YEbfePOX5kZeD2duK5nip9h7JPDSlbDappUA3hDqig6SHlunbgKLk8tl8njxfHlDAZ9kIuu25kemYp9rRrLCedUy6SqhI/cyqIPVdoRC0g3No8uar6B7aAsmhilCZDTzTNhfxft/NoNZAyH63WXFuNwifXeWZn3stfq6hFvqjmkbXXLNe3Qfqo/fn2WTKl+RdXlCpLtx0sfOZuz2jT121h2cbuRVgj9RV//5E/XrSQj8CEoCOkj91j87Gz+b7MAILxBuducN++FgbEWNTzrnZ9NsxA/cn/ipHENC/BcBEePLe7L9WYrj31T0caQ165iSfFgh9clt9t1RHd00qZ89X066QNDxZoamwarrBLtVc7S3LWInWnVI+ZA203VaD6W8oo/aU3/qDNu0y1jpmIn9ZNWj0WELwoGHKV5Dpuydh5Ps3cp5TdrOO8unF5zaUGzNapTuW8rizFfxYH9bWaeWdRo2bgvB1SyOdl/G1ve4hq+6AzyDE8EfV9AikT+uzTnFeTqDO7lzIriES4jjpvT6Gmb+Cd51kZsWyN7vCeTFFiH8zTSsrvTuZCT3IcDHcdB2yQ2SlG9Xmz/VSCVi84zYvh+QfTZ9VfaN5YfouuvCQABpB07531a6U8dk+GYrGdvsyfDAUQ3ZWT0eKcaHPNEYor2pUiOFXciyqxso5Y7bAz9K8lCZ5f3UNc0byZ+GuAhzwKJ8zFGOCJmjpdFPqHGhRVHs7jaggcrlfK/vdpJMUfm4XXAKauIQ6vOl/2Jbg0PvFH6YnfVJQXJZ+zXaHntu/mn+SKqxHB0Y6sQ9cO3jemDTa0KDCbllKFldt6kvH2zs+SWDf5SgckEwQMPwWInmpllNknOBA8TtOiefiXObFLP1gc/X+gmoZWbLU/df6UreHDQu/Ftru6QV/YbNzOf6OItQ26o4U0dLTPraB1v07VBL12F5xLatXlo+/eFmLP2Yutg5mHL33Bbgcr2PH4dZTuGolhNRr5K5YOdc5Abd/odwVZ1M0OWjMZ4U0C77klzUNh4qhH/y54ByRMk0fpJmHnyP8/ojpWbgiwyLBUImrtIagHBsg6SsKd+hY4ay6l6bdnk6j1jvKc4kADO6H6hhNOOEdrNxy4z7f/ZQMVTdaOc2AAtBrnXRFA0P0qWZ8O2B74GdOBeVxzGJOE/cKUHsy2uEFk1R5j20mQX6arR4ZCqpDNd1/3H0XfpiBgCdSfcWp0yB+uQ/foFkwAHmhb4jso7/sfmuxZuFJ4eVehQiXP4KwjbVkxw+oUCtsXdTIiWfoYx6mX+Bowrch0p4/j1/9qZ7qM5fw2TLpEuIBgEJL4j/7sRn+bvNSTNfySbobIAUf0MZON6U7Qof/7FTarc2hXZTNrq66WIkxEMoZ8I+HYpTJ6xGwIG7Q3gM5bWwsx0ugNxcfaZRCapskJi3hhzbHeI7n/9rUSvhYOuuOfF8Uja2dh+xE+DaB/I/ehblEau5767foF19C+6ttHvsTtYc3h+tvNVf8lbf+ErxuFUro5Hj+Ayccsf6ovi3va7HvmlYO5ZNylXrFJ/12mAJneeV9aHdpC/nUjai2Q9xivvUxRnn8MM7OrGQIQkqCnAbyfrAoX0+QzLuSRRk34d4JbjJT1X8FEj7HwXYAMg7lHlPeAiaoTkNfRWFXehMT8xWkHNsXeLWSRNodjQ1h0bn2TQbMj4yXoQxloc11ft9xp56lvMzxUkfkk5aZFCksuMgfXXsFb2dwMCJ/xXb4Y3nc7i6dYk2CtWCT0776NS1E+Ls/NBXNjfLxfBoQqOnxowCEq9m+jxIIAg5fRcGrdblZ3CHj1Wy0+6qp2BcJ7ZFoB/IOX1F31TTSmCurvgL5aaJXYUVuyWTnc8WZGCdQifj/L2/HSdVOQSsGpYxbGn51qfr7CNPZ3ATuQmJOgayD/TbCduzeOYeK6ML9tp/qScnmrtVtMbWs4QWXuB+6rCrfWRXAbYsuS+dq0hnfa/sSWQFkD/R6XCjRpvWuR12tLriJ0D2dwOibO/VlaXwsc2jnGDKO3v84oZkgozWgEAn6G4wtQludveT3mv2b0zN0EhMMCoNJwyiIY/B4Dxcxxn+QOv1/EpfVgjatS0F5dxRdOCwCTA/MMrZ4HXLiKhf+1QLhX286vxr4bOtPqg0p10KTsWrctjG7+SDg3a3VVQXdhPYRyxz6YjgVDmBPG5GOWWvg7viTJfkCP3kgdx5mqMZErgHTjhyCLbHHPH8VMWBmxMl1ib5xrUwkO66ExjuivFGJ5rb5vmhvsZHEvkRxLBw60435/fsRDPBRfg4yv6mzWvWO8F7RPAg1ssDTvEa6GPACBTUq4E1ZYJm/b9XOyk7W0oxV6jENHqkXWPeha6ccLzrn1y0bpX7GjxuplTVUtCKwrwII9FsER53VCfiyRQR00q1tV3akPpQAZIy10uMyrm6+Uju3ynpaz4O4Z3FHH/SyPvMySl88fyyf5dqVqdnR+8U0BuT3/v9ixLxCmmJPdPaO4bvns29vm/fBBj2L23qm04YVR0PMjH/Sh+ky+FZZ2t15zAfMKY50s1nNKRvgeSGuwMyactWU14idyS2U5x5KZp8r2rO4wcV9NqZKSEqdxmcxRAdLfIxvOOmyOPnRyIf83YJu+XrBFu4DcpWkeJ29Ot+2m2P9/zLra94UQWeoWQ3o/5pkTzxp6A3sQvtZLOU5X2c+II9IXCFFupPWbbvy3CxxcVqsq5lWt1Qs72oHSsh71ppMw4TPa/DT3W62FG9V+NKMDBZgg3AL0P9ETsstDyv0cOpYZKqDeQpx3XNj+55Q1npOwqlF9SUq6u/lHnNbDZdwTauZF/lub8D0PUJ6nNeD3xxlm3TWVN40T4WzCU0ypkdLQg2oQiwJTU9glHTYo97gBer+DsGwgt2ycsowv1ohrQpr+i3me4KPkC1ptctiVaP013LWdbM00kd//Y1QxzGHcQxqDVQIjXUycebEsGfn2YPZ3vjiM2rDWIg1SwYd1ogzKnpG8jucFNmqj6q2uhiLg4XKcPnaHT4OFZe8m54zpXuKeejRaxq99iETB48yu1WIkhGjOo7zjrBJZIJpJeh5yi7odbQWqpsPhduljjg9elRgZR3JDO18icg4eWf89uduen8ZWvULLiuFd0STF4dF4cVXPK+u1+NVrj6bXstmEC1ggngT9VP3aUa22PL2h8H2nhnFM0yY3hZxU9GOoWk3nBwifyltBFFF9cnGT9a1BZvwUjKyetipLN7JeN8c/yy8hk3zrmxfVMX/iakIYw2Z1NI0qURdX7LDm+x5IFjWaYvimnN36Hk4o7CJGoD7cRqLZ9+aculd6g8UybzsHlkx+T+6iOWSEorQeG//Re+yWJMFavcgn9zWUBbXM+Ms6vvl0DNo1l9L6yzzjM2NYclT51IBqTwx9kWe9LDGMVS7G+4F6xgPaNaW0txWcq/4aci7dFQPjP34rbygxE6/L70gLz57oYfPcPWdFh0ONwSC9VaekLlDvCU2njv8iF+ATkW9/Var9PLzrGE23XDwGOyY7c0loMlCNpUyYxhJ0hK6muQULThqdpBM8UeHDjDBjOZU23vmQSMEjxW3D3V0FKN0zM48XihRDqIDTFuC4jPIA9atz994W1++8/KXzKzrAKBtNewbmXvVTu50wuq1ZLMwHD6TUs9k2cR2o2HaOW3yYuX3lx8oXObk8/8hauU22wOPAAtXXx8NDhLsx6yHN92dwh8yCsrJm/GoV1cHsE868gyxbTkrRkh90Yxj4T0kGKTC9n6YhKv8eCpnIY8/HDboQVduVauZvDm3MbmD+LPbBT9Mesw4sfiNnUDzagd32nH6HkTFrXWJC5vVxqanX7Lr4iHqaKsbj7n/fSUdA7J3wPQvHavlREG//Az24n9zGcUOa+XcJAm1yOuRAguiWLvMnhIw//X+D77V67t15s82KgO4S4TNeDzK97NrfPTySMe4uzxoRIbXbD/WQoDVSofJX9SsOUWXZ6hsEb24YP61gY+DcUzI3rO3M0D+W9d9LdWxgi8nUfyZO1jMStLfQYVLsOZ6bwYTqCEzG9iWG5UeMok1TxAsx0/m927aw03fX8djcZQK8+12uMnNl9djEa5aKGgbAp9hzqnFXprDt6d+0U3+0upoLyHzqBAQMiaKlNqxcZH/7pcudjj8+bioUojp4UsYQ8m3mvrFwov1n657V/MJiuPxLUwvBA6TayU4QgkfBkqoi/79PUcEwxlh02HKyR9/kfgSXeBf7hrepaIYXxE2NB6B3pzrps7TuZ+HoVC4ljEXRTk0Qg8rrNTCOyKb9JPh5ecm/qa3I5QMNz0omvDmy1ZF5XosrbPX0l1yrE15mA2IM/uElYlmWnfrGxSVzFE1MK4a2I3FPYz4/G/DwfXxX9s2W3eVr0hhbLGNXO1Nrbb2+d1MAQMVitOBMQbOREenXCI3Nrw0lrVMxQGbe1DP3iPGhFdZaBw+FgJ90hutadzdFD1Gh8EWwhY9TKqUEjaoEDPwotNFrqS2x7omo9lKjvq8hSc87eXpB2W2jXd1vXtJ4LA+7ZAOmMnCi3D63GJ5//c+GOqn1HIDqAdjVJXcEeeYKqqDhH0nMh5/pj+c8F2YER6mrhPlIePTNAo5o6lLkrnKc+W+37XgakfHpmsLaW1kztjdm86KrZF6FHykUBkXpS3ukSrc+4er1SITiUr4XOyg5fGpONQtR0DuRHGVpeZWrMwU2VQqlFHeB63zL5pj0nq8EoYcl1SM+kn5bIV/4zMKKdsGvbsZUk8R12ksjY52iyv9eiO5H/0vj7jBzkK598OROklz19E64mpt/6cl3iTC77rg/79mMPkM/HERXYQGbdyxGP/c++rsayn9mYepHq7rqkpbxpixYsCqPlZAb8vkX5rhx8jx2vRd55eKN2fNBhDo/8QOOt2VqsTq4tIh/jlp37O1eIUwE/v1jFeTW5m3jGaqTYvt0dbv3RHyzOIFzODcPC79mLs59JEU2C3q6QEqXaoMZ9zNn9gVRn7ncvUTyHKjxrMs9GVwQeFH9X1YtmOBZRueTpHrfF4xRme6kEaOcOu6XdA9PhDp3UPBEtIqkJOOzRhq08qfL3gAAtUQvDTej0/WJ5+YvbrRhAKqRyn9EvD0mxCNoiOJNGw/sQbPmeD/Vu9VjLhi+aWW75Vcwq7L7z0aQizafp0WP2r4D4U7ZxEXfu1i5WFdzQaXSq8uv2abrrDWfYRe3p5UMgiaRunsjwlrnbEFqLtNe18krRzPr3OX3w2gW5PkxejT7bOIjh3Mfc+YfLiz7ha17q8xw+ylpmXgWzNgIBmmGpwRIeso2X9cznOcvncup7B3AvrsMnaQTfyKYf/pE1EZN9sMEwe0kKe5yiZ4VkunvWQWd43vYuxJ26R7WkSjQAireS1vCXw3ySqkp9fbcaSflnx1Mzc9IuDgs1SvtQkWfILojoXftFvBtWcXAgeEpesAfdBV17eXrpeo5qtv+U3HNb6OOLZa2Z40eDTB0uy0pufIcqXPagGxPw0kG+uslS9YCDn3dP5vYByLmm5YYeyYrmJN6h/wWocr3s/ifw6d32tz7lT761ewteK+66EoKcj0qtqG5ey2wni/jbyuUFZKMMld9TFXjDY4NOQMlZ+S3u7PiodrtyW4Qx/5tWruHp0PUhMihN+xCTvf71xvsCKa9LwOHV7yHwvhVGuJZdTMe5axN5/OfYYjvvNIlwu2E5bSKDEo4VRzOTj4RMnArhf7ud3sfjhFtesqYLJoaPwTvijYuHJd1oAkXZm90Y9rpOdoxnLq6w35z/bcUMBg9RdyYXFUhQ70nAvaplz5lcx3yujV21S4IDmUlvLYdTcFSsFn+xuH7s6zJCTiS+Ig3kbOSsyUacM78tDpTJMZBrbE5VLdGZnPrSItqwfPrpju9V0kQjbDyfQq/5mLeFf1Lbxk8Hg62SWXRGb2fQ2BJMrctmhOeZkXUgr23BP92q9XpzSL5C+nI3RJB38HZOazb0RJ/G36eS+3qnh4y+PU5FishrpG7TAo3GGCqQzAWrfKzdlb9sx/eNTROKltts4qj7YkvaiOXfbqBPXjxdfW0g2ZL1x26UZVf+2+rsilvFh1Os9ndxetXfBQPubM+6KB9XCeUGjL0/chncfcLO1nm3On6rNXLga4asgNk2XafH9a67k+BwkOLN9hTKYe3CWdiwxNr72hpB4uaszk+OZG6g4w0LvJ7qpIBZSSOYqBMo3ttGz20AeOCFyGqaVMRy7w29qFPiML0mUOm32uFX0T9HJpClNam2keTbb0qNk2XXzyriU48OBbGXcaM7JkW/dzcF9MEeW0OuqqD36STtfQmnGAwjz1LVRvFBYlEB01wMU4o4iCvUa9gGQEBCh1Sdek+6FlwM67e9lPw9ndvDlyxqDOX2yuYWZXtVuiBe8RvP/WHNiLWa7yKlm/p0wR6q/hsPIl2FlayMpDzV24tkpcNE6A5C3WfHdRmvOT6cqvCIiJUhPothB79Lr1UqdGrAeL0a9IxxLlmjx5IDMxl8I4RG+WAtndfFSfIRNHtB5qu3+rbS/dj+FTrGmiBVZfuoDlHUMVsSL39Xc0hb6zM9Nd4e/ZONvuqFRL34IVvFrURUi9x7plApS2+zXADEgZro2wytwl87gFxf2C9l7rsyEkeCjH/zZ/5QlxZ6JQq/thWq5U5+hHTITPuq0VaWdC6o4Q5z/lc2unpvwpzrT2UfVVR9ZHXGm5c1dZ418+cZTdSv8nqQoJGjo8E3JdzrVtOGuwmgq8zoeg/mRlz8IVFOLDjHf/JfCB0ny3v7jh0XeKqxYrks0Lj7Ob94XJAsCauw2lq5nu1boouv9Sx2yNv0t33p7VPRlIjUXuOSrfIbDgacllaEFWt9VUtikOJovXPx/wn+W0j9N5WY6umeOoUnYJ0lwcUsbltuYrvTmxlqgI2RCdegsGLJi65SOIh8xhsfOiGFPAK/3h+9iFmcGPC5PRWM3732tcOs8HG550GqATv/n77FVv+dJVXqn/FtjMsHnryR87EWMkzHa3oFfvOdLLfaQt++H8/ljEEGKKWhrnSpD7v78WPtb6YWLm8PAfRsqNP6pkO7QIme3tQkOaG97d6gWxAjyhRNvmy6tZRDLb+5TL1kAwKw8arZFEReNU59wTPyHcHewdfbSAwZ/mwORM+llrQahGO3C0Mt0TxVdf395r4n/g6tLjXSQnwPcNleu0J5is5dB03sWYYvQsSUmffyPP/HRVYQfS2H79/ocjsvi028v13iwtVBAwOHS42w43kJzbWOBosmkGSi/tDkj3ri3qYTMFm2bCvmclUD+XTW+IxSA2x2wAduwJC+laN9lXNl1RznfRPlleL88yf0+MpkS9r+N4fL6zJ+M7479g1LcBi9NAuyOAf4+ArHKHr3RI2xvyX3e8b/2lYvW+0Slgi05XpkJ9uPZI0OdLKzdJsbsBVqj35el2L5bpAtnm4mBOeQgSTVcN0EAYszfx52RBrmMEuer078TeuuKKCeA14bpO6R5Imy/y+7qH4QYYxe+00rt4inHepcDIhJOlW+YAhOVX+QWqaXbY2/RrOQL3qTstc1o1Vs50QIfN3mY0HNjwT5RgGSo+WoRt3Z805iN/9QyImg5fultwyQVEZ3HY2P41bX/u3OtkMG/eZf8G2WAjTx2G+2ctdA7lgkEUbQl8X7VdZfjqXUZWRZ1148yVbUemoaZYuwc8ZzP1fgv0BYPJSkMGrgrwt8HLqjYuvuPNwH7Ht8pij5XHIhCDe79Ssn43TVRRnUK59pVZ/H943Bj3LbDW0Gw2cd6mUr7a2hDT2v9s+ai+tdz9sYx1/lYV0dityig3YyjefMOx7UEh488agmijVUqZ4KbqItOLZQAY+xBSt7+kdlsytKAljuJL/T3Unj/B34/2Uck80qNSaLsEqn/GN/SJ+H5mmkhrsm/J/VXJx3aO44n6EzU93jqluIqFzCOGHcqlN/TFvcd1mh6eUJsdXS2nrRXldh/s61TmE7G7tImKPzTQkNrciZPaZZFGvSMfFe8BMaBRy1br1q1QxphG7NT+O3lh8vx0PFutV/hUJz6ZQdoo/DfuyXeDpuuCvrSfZVH/f1lhrQHSKgfzVhGkT8ecbeQxB4hye5VcG+yTIV0Rpv/m/B1eV6vJdN4C7osZt7fQVMZry5V4xOV2/vWc3Ftw6kR1+urdOK6WNvDsra5K/OmcsmrCpmrd6r/peNeTkCFvqeD5HhOBI0U+7i3I8YIOpQsD/S6T0maCnpSu5VttcYjvS4H/WXMwqIx7qSTkwBCUCbPMV+Lk1vUvcvzdS7J2dhLN1LWTlD7vLdJKRXo34Dla+CTS1FVUHMGy5OeBdFhTLvRgOm4ZK9XsT7dgdfacasscfYe1BxztEnEBXbu1zaSbIX4MWMNhe+rxYTf/EycuzqQ1h3e46kw7lOZxIFX9wqWEoQobts4hPxsxn4++cyuY20/nC811W7gnTc6uf17aPc9W0Ifdmf+SseFYxQrtuw0TxebhJ0GtKsU2DJs/dV1XJvem7CQZ+zEDl21pILzZ/Xsq9ofHjI7Kint9OX82M+9YC1MvK+wxUak77ss/JQFUxnIMJ82QS/MU+tgcHM+zvozw7PXlYy+3SNfjkBRrv6d00CXl1ghrJVtp8ldEtDR+5Tv3zpaaM+fpi3dBnAC42su23k7TwhF3C8YMWptVDMmDMBxmFilRC/xjeVgA5HONg6iA5noDr8kifo73EFiYSVV9wUIW+K7CJ1uE5vW1Xc87wmWRtAbrNYyJUpsQG3AaVZ6I/I9gYHP4yvQ+FW/LN4fz7RlM1pPpY7/PFi+F2TGPJx7+kLxwnj/VN4UxWwwExBp6w+MRHkJn7vszU+6c3LWPo0Au472IFLLVvWrJ6OsPod8eFt38w84MGMAJqv97xS22AzSNdQ/15hpnA1S/dcA6TiBJKcfphVNIAXsr29rZMEe77Q5y/SGj/+hXtwVqdwu8dBqmG6w85A99m+v0FRY3wwVh2xyBMzvdwNJi3L1F8inEOt6xQ3lS6A9cs3B7YhxnSmOG1IwDQ5sdtfcsTBbYTQKt99Hc/guHksKDhLMjhSrmhbzCBR5jBuJGfvQ1wYT/tXVFZLpR+sIkUj+frXzHeRM1dxp5NeVrDBh0rjQoy1eBRrQqiPwQ/eex+6MxJe1eXz6LShLOygwLPh/+a1u/l+/a0C48hfCFXWudcW//tL2v1zuzyYkkChjc3JcLoMgAZn7kcs540sR9ZD0Al+nDGvTpUMcGlYQEUAYKVYttyr1Im8HnxLxxidEY6QWpvEr7GcIZyeTiWKjKQbmdhVkpxyZB9e/mhS5jZLug6lSy7FV/4wpXB88cER+O61OFOsXYzCQh+ZWN4z54q8+XvWOCViB1m8Vel3aDnxZz/1TqyY6UlE2fX2u0GSXe0/dRfaW4Hq0/JUvaQeecbdD+e5ywFkdVSsXqYyEpEU1asVF5kMmATeL2co4wH8ajxVANC/zUbJ8MdblZ1e44MBUv8QGnCB6/MTe0L6TVRX9IF+f7M4Dz+PbZZ32b/GxAh8Tz1LpF8HbTEnpSqpsBf/r7lJ23go23jU4ImpKFyyKJzUfXmGFa7MIeM7b5+eSRFl2geRzLbzGNaR7NFM9hhheM0JasBZfEYw7Qo8Tp4uw1T83aTxboGmsTPWzvjZenkeejz943f9qErhGJDXVQSfrAHFf6bPNS9N99KRcQKNF+tnSgVfxGjZOUjghJoDvmaEnMs/trgENKKFpQzLSgXY7mj1sP4Vz8s1VEA8SEjPvJBRo9nhYqO31YP84adwxhZHysHoWOL4taST7TsYWOVc+pv8n/nFXOXso6ELHW8Pa0SKF95e2pOEuYnGrIy6dKbzPXPKGL/JuFR0hzhbXOvVHcluV8J8ynUqMwLW/+iMfrfxX30SHj25tss+/lu5sAroGfD4/Nz/4icbn3S0PK+JA1XS9zujEuiGBagzPHHl5erS6jmwM1KUV1xeqo0RDZXRNoYAOIBi9Au9xPoEy13Oi1IoXR0/9CNzBGswSO99chGDPp1/dyb/t3J4IYnyn79UO0Ago3il/2rldnyZ9XGpLIWg2Q/puXTdxSz+soz1pd94VKEXpgA9rVscvU/5isKYKvi70CN0glrqqPb+hbow3w1TDbya6Yq7PEAO3ZPQRwm0e1ZEw55B34KAAAVakhRKqqbalFlgaNDTiO2PuCAqiudTeUcUwTCssdqrW3Ph+Uq2VqyCBHcaO3FM0YlG0RnRWQDAxfpk7O3PoCbOSuusDo6W6HgZjm7CcNKaVEzQxnufvQtk1gdzMUU9bfqr2mFaMUKfRyxO60OKgfrQ90WG/dRHZoNYNqsDfuPElV+RF9lRjIjaFekt45Etk0PXlvYHfomVM+mHqcVXs/WjOunuoB6QhW6XSbeNui7JCua1QY4jYmX1sbHenhhZ+CRKvpWzjn2XJ/eIfOH+3z3yu2xbMP1EL5tsKVb8Vv399q2RiJgsPSaXIQjrfm28pRA4GU36mZJ8MKwCpj9XeMogh5ITAjjRf4IyYdnTtkI7/lXV2+Dg/WzN6ccQz3h4jDZvyD+yibcV+mo2fRE2S+QpJgLvMWucSt2syZ9kK/p3fPkh+0TowmKfuusoZtLAmKduDG3hGSn0XRCXyruC7XyokhXzlnQmX3NJHfMibN71q9uHpkqCluKRdFuLNSzl3vGq5EVuXxh7jQu67aBWdfX4Pt+O8xo6595s+XyVIvAPqIaoP3gW7t5P1X7BJ4BiAywPk96XoMB4JnYcWX8B4knlJsIzxApF2dQjRh3gLRi1bB/ABvQP9nCld9qWOPpNVDDWrje9xuOKMGazHhxt50Tb8uJUj9cNtG6+Sy/1eOxOj44ftrd74ZHqikVY8KJ5v6JGpMbdZNcDnUO9NQ9QTdNvYL68+U8fYxkJHbbO9WUvdhCOVdBJmkowXxDn0UiA7dtFL6PTHPNkju90eNz1Dzo6wdolBMVk/I5Tt9I5jxml7qTAxoCNjUKK1Yi7G46znwUtRos60RVrT0k+3TzkdeGtx3fFv8QgTkFq5TbTWUQBSUUOSwsd+vaTaXp9BRbQODlyx5BejowMtmgnwwOl+vJ4dubx46+m2YyE4WchIvRiEOmR9ovYt2Qfty6lqieDtx/fns/9ufn/37lufJR654fC0faLwAW7+96iOKsEgvmDsH4YloDPPUdg+v4VYW55DHiQ6OjgKr4NKC2rkkZNFregAbrYn7bg5KgP09U5e8I2ui+Mh/N7udkgFWrKRx8LmidmYcgEOueWsGw60tG4qWskQ0Q3xeXbq8hVOGdnYZ6i/JJjFmpLQxE5ytpXRLMag3ZH4XZsSmICcvuh3w068F1QJTeFTDvONe6/c8/0WNZEKKhl6NCEk3l15piLQvMnTcJXeLmphlumX/sD1nQqnJxjqroWH0SEDu+eW65ACURNFdMWzsdKgJkUBqnoc/xCuf7LTHUpiyvvOzFe7Tru6BTiC4lijwhyWres8tE7r5LhoQlJA0K+t7HsQcn3un1NDRMs4paB5P1TUw8Tv+AWdBDLwMLNCxxpkrLnwTwDb7jyqxc+KQGKr3GzWwn3+b3PvZaYp6bzP3U8dnqCA6dWEnZPdovC6as9r6L/2gtYvYjzhYKh4ZpdDpbXQER0mjSw4HrIXIa0LwJk+xE+4FjrSS4UKZlPa6GAid0QsrHLdBgz5u8Ym6EvBTcRQArt3TxuIZcme3j4kDUVmKJxvqZLKqgn53u9OcOYp39WOUrahjSiarL90nTbX16lLrf1FWVAlKtH8B+TKwb+aPfwiJ561uMOECerR1TPDcclwAHUIVu0e4D8WLArobgDLLHxxHU2HoZmYxXyFEO7fKgdZAufG3myJMh98LubQzFTaES0AXe3J3cWV+WalkHNi9NwI/Zq8PGuoczbhEQrKmlWR5pJ7Z892943eQT9/PmaUbQ0AE5k4XYJ+1vb7dDZBum0vK5XuLMLbxhMAFbA6OwlYUTKZF2u443caejrSYWFMza9ilNAm3Tdn1kjrXf0za0uuSfcPSiQO1j87tVOiZQwBTiqW9A8uRC8HyrP/qfe0BjQuf8zvIGlq9WfHtTz+DHHWBWwmlivYDEcgYD5Z36kDZCYeNsjIkj9Y3dt0Hff/0c6QhK2ea7EkMFXVoY+UHAWX5zJT1hdSYDSnyzVBYMbJjDJkSR9SWV42iF3Nne7Z86nqaHn7Eceie6uzBYUOU1PnLEpfJxm1n6jfebGvieY3wvUyBfX4W0wuA0bBydzhBZ5CMJC/cdD2W1RDNwlYt+/co7tbT1CXXUnSn1/5sFXZthTxfEJ/p68kbLttDhr/Z6vctaNJmhpzor1tnDhBBSepUlLff3LxLfcM/6GRXvX3sUOLyuOEsQR/oScV5b+vKZgncdUS+G86kzVp3F8TrFUxKuBtqlNeTr2uzk3zs3efbXVf+Z/zJ2AptKqQ96JP5hYam1XkiWYHbP3/f/q3L19Kzta34fi17eVZ5ciJTkhxgBPaHWeXm9NURJ7+dZ+jrGJBUnBGrB4scHFNKsuibJ/fbERNf1NLbie2p/PPbqk/YmkSY5f5Qoi9m4ZpnLa6I1ntI8kBSAJvyzv7X82V9VThMdpAe/KOnhTYEu723xYTprMCNh0ESkIK/lZv1IsaGUBAbrrynfHj+n4sH3ePukxBYMvWc13BXKipwFjpE8/8pUL/red2LK4eZmHpLRd9Bex+HA5bDhw5+8LA9HSFOPNFO6DzI586le/N3R/8AyW7WLK2aVc6dHMfu/QI5F7JUWk/B7/P/3jwjn25v+LwhrTTFNLKeL1MD0ejfJA5RqOrPv2JlsTc4HSqolFSkwwaqFI+t6JIOlvFHWo7RnEZ+De9vTwlsMVh7P9R7h6ZoCgbwhWsm0qKQ8qj+EACqx9p+ON26+3jmaabYvlMZCaZNg2xFujYTJUnaCKd9GMJXmg5bvD7qfsRgYHRoafpnfpD7FTWMKLC3mpv02JDvIal3cmV9Cn/Yp+glzKJl/slOs70PqKY+1Npjfk2ZfknnhIH6H/d0yW5eKtaQoPzZKum5g5/amiRkBXrpTiI67hu89Yy2b+jv89hcovFEESvM0oMD2oi8kv56gtBc6WYBDsmQY9Wx0djXUXm7K988Fu6MvZHTEjirspkQ7480PjVNI3xttE4c/uNA2r47zv3BVHObUCIotfepx3yhQpxDjZlDIKZgzS137J3gh3mVLoSNOJbiqsaRqjxW/Hrp02ic/CosDAkM/tBQ5vFUvjov6v2Ty76LtQJtUIATlOfLkPBQ68bt6z1GAdjh7tx4g+9fHVfIrwWXo3L9SZniSyi/O4Kh2rR8daOoo8cU+gNj4BQyXACS4H3gKhtMrQMmSWsCv5H95YtlonLCb4b/7KRwd99nkxzXS8XRCfLiR2i7N0XIeJqBpb3HuP8J5RaCzRPYpeY7iv3rsubC3kdR7NI/1UbTx3BmNeWo3H2rHe5XqX31LHxHvyZ6y9c/+1qluE8hbvdwn8g68aogHcfodxwueJtJatmLQoy8OoR3yrhUODXUyN0+tfuM/iaRaffvH4VFQ8DIbzA078C+YK7vXeAgWQqdDOq/3+t7fo+SCsoyNt9bdbn3JWekotQ1fk7s7xvMjHFexg/XZBoV9OG2zot2RD6HsYl2dT8Lo//asNKJSHazu3QMxsalBfxIIljDosCEie3pjuwU2drtJSCAYaRpzGmTSuUDs2BFMe1JaFb5jlZeLK6hB2/pqGnuyYBxn/h45WiERlZEIa1qVufcGZz9UtXF0uAnzJL5+IUvwuf807uOxMS484Vpgaxu9voo8Py40CifD++YaWWS8yeFsb5o6dYAFdWZAOiF2Jdefg69Jz94UtE0rCnRcub5lSBUt5XA2LbjDVkdVoTmAxZXPONcX6AcCLwDrGfiVVdl6RP0unBWxwxE6wP0tfnKX1PGtenIsjeqf5EwupA2IX0iVAMz0L0Do3g6ri7A1kmoqw//BLfUzuCRnc/yqWqwmWR1nnCv4Tb0xM9QyppZE/4Y3IetYJt9fu0zo8nkRvSeR9aJ//4oRe6PNU5LQAdDwKNkNtsnlzktOPzh/UkDqkTCB30MulUjooalczsmNHie578to7UT4VpnXHWvkxu0/1DOOnzIcSLR3ZTkpqhzwEl7n1Jym0v74qlsxo0uqxPnhBgSxq/QEoGo8dH48J+O3X6OcdoDp+yothPT9iNO3KrcnuKGq2emPGzB+vXd3TmoOX+l5MpkTiOncpvS6o55EMBjVNHu/a+UQy4v3HfDNu4LG+tIJyIOVfnoPGtkBtT51FT6bl4k8lWhiZ9zCtbXm2f1DynVUjVqGDDL7IBB9j//kD2Iryui7VemJym3V/c1qVH+0svJtur0RWyyAzyEhoYsbEyHOhNDcKw5xUgSNhu8kNtUZ62pcaQ2tsMN/1MKurfIUZv6nhIS8Z8rXhxBzw5d8mMIm/4X7zDsXgd4Y/rOvRDzw+/nkTS632857Y12YLSXO89lV7mrKYsu0CJ8gLZAlDO28O7X9QP6ytzCsLGQ+29W2SRAtFe5GiSS0t6FbfVtdwiYSM/TfkVhzQmySX9G3wJdO1X9aN9pGAM2gHxggnOxBuZCX7UFTqme4Od7vMgQLC6hbcKnwngVeogTB4uC7bGCp/xq1ONgk3p/8U8fH6YY5+r8Gp1giWYIETLXFc7p3hhuwq01OnXSKceizEqV9kWTHm7XiscIMbPfSOUtfpGvTpQdv98mNKP1f6+8Ef82+gwCx3IdXI4xKSfKWp2sApPNWsoyduuI5ILU1Dsp3s18Fu21vvw59KCSD8oqG4iK1JZA6jZVqKEcVuY27N872fJqe17k64kuwtVI7UOVEelGpOAon0HxndgE0yYFx2IeHs32BOU77zsOMY0ezKhdBOp83+N5KuEovD5+c88etu2edLrLNlbgExxotja0iAa3X/a3mNRy0k1XTarDirqat7Rsi/48LZtUs4QT/dS1InnUUmK5ytYC7dc1BXP7EfG7t+uuwV73ya7rhxBM7ZVlw5NZBjrrY3To/mYwAC1/nh3PGhogaRvmc+5u+lLgnL8zK9dX2P5RszGfpkMv3hkFa4AnEHXvTy2q6ktrzdZpj7Bl4oiLfn0rW9T9ZuSNzZOeCr7ojCnbHpKocqkze7+HzoXNLt5/e/DmC93+bg0hGFcfLL7oTzZdtexONA2pNrFIhp6Mk+fOZ4VStUnVpSe9Xwok6y2p1GQsiZZzzj89xZwxnbj8fnpY+oNg/1XIc7YzV+SGwleRDMoxd4Vnod9DSkOSTVLnI3BP/Q3ZomUzrSIFe+WYckJ/z8eBXAHa1gXOIwNbbNcDRRxK5B1nD3qnuXcoN1rAMW2urTYg3R8yKG6lXbxv8hE9frK5E3FIt9/QVuCJWPnC9VHd4TxeZwOZXpS3APP37jJ+Tc0NmVsj05h35z+iQZXdPqmoP4qWs3ucR9i6d2eGiaq3Z+rgZRHpH558+qKe5t6zI0Bxds+1h8XfOusDHHYsaOaROQJ8nzwH3e1oA641mwsAnvS0VEajOkzKOLjmQ43C0V17l50M7ssfQF05msjbDniTpps1H5n0WbfEFJ28Y05KCmwQ1nrGyB9aIwbOOc+WzhF33WN6c1fXYfZgdwBLTd3nImeFVqbjSY8kbqtOZO2N//dQ9srWUPXNhHiYcWU91kaEZOyvPQPS+HsbKJyH0AW8Iqp3B99YZBk6QPlc2OzxFI9b9dh+vvPg0IP3ZX9/YZgvvZ9SxFYZh9oeiyDky7rFMkYgKknxS7Arhzv6R3b2MTJ+aiibRXieHP/T9KVpS35EiscvumfXT897P7SrQz6hzA5hpeTkHLf7Hdr5/RLjcNVzHciAaW3e7CoeGe19VdgJUbz50mPSbdQ+C3MOgWM6iuNs6iVEPkcFBEfjZGUyPnkIb3g8IJdvaX2tIQJB5oY8CsWJd0U+rQ/+qnd1QNBQvPuHAIvWkEpZV2rEpsVvmRkIfMW4j2XIGYEl9IomiPvsUQlhfkkx/uCdPgcoKXCG2OZQY9un/KVaeEqCvvDfpqNu7b7Eh2FePvtvXCuy7THh1maD/880YavB4p1jAxDO+c66RRGfaqHgEmqlY5HJkv34R14Bategl6yssh+hHnf7Y6nEmGswcJtdqdNK8Xq9Od+DykWHZbxvEhi+10FgwK4h9WXb4nR4rXaZMiPRHZolet9q1M2rPCo4XdP8tqhOGkHF6jL79PU01zRq/JYKapPMr9OfLBHkyk7PqDzk9FeZyASm+4cfCGwEMMMTZQMnZrLf4VapSHpW+f09Pb3O30rOg44sfZZpqYGHYFe67s6IitSexO9EqPXnu+vOtOoFd/n2QrG2vBvy8HrJ2u4QmEWY2Q9fcb2SwHnVDwenQF7yl4ULcC4XgFi9U5rEe0IV+U/b+JL7Nj9Jc/1+MFvzu9+4RYrm1UPyZUY2Q/2TDslY7nqs6BZxUeNhuR2wWu5RNOQD7WjgH0+0aRHn41dpY1fuG+4dl27L8TG76laswvGHtDpvPJE4Fq0MNF7xUFo6eY2I8uwkSM+LOpg+uEG7MvpvAd5u6StfzB4MOS//YxqNIeTyabSRTpqEFrbvb3LnqkgFMay/UrtjCpoAZR/9yj+Vy16oRUPKyhHizyHzcf+b/0WCIv2umzMphss9JUFbNbTvUjOGrG2jhddSV/x406wXkohzVJxE94Tac7fGeweFXBZKqa/0s3O+6jzEOLpX3/umbb40FiC1xGRi1uo3VOwYijxtDLMGLA96bmUnf0+d3Afkzl4n5FBpomkjcZ5X5hhUOGmNzHwcaOCxbbrKcGaQndW/s864QUNGPscfu2Ow8Q92qvJV6pSTT/wb1yA/d4eARn+OaB11WBGmt97bTNOYeQzUCCbf0t6VuQ3kCbnngZpbRlCNLs/tK+JMQkMVeim5K0q7ScNp1aZSHwHocOP9/xX8wEdO0w0AcSWErzzZmgG+V11b5lVR+wUT5HgjC0mNhtzgti1GCE8x5c9KE9tEbcP7fLuCpNvHkE8V9VW8oz2Yow5TB80CfU6MCmNDxKAkZ0uK0GAlIXYfZXvYPjJ/Uw9HhVb9dMny/fn96ysr1Fq4qr8R1QzFMZwssko5hTT4bCc+L8wNXO7WjVdST25+Bz5cmVrMe6S4jrGz5EhxsAF5gOHczIgqL/HG0x35W/gtNjOemZRnAfHVLVsXezmleFYoB2r4l/zjDdXp37m0Se+KhGOEtzmbypUKtA2uTNiCu5n7TA8wbHOo/tHh3QyJ/oeSFdP7UPgPuOvJArSMTCCMTmN9gKAwXgR6NF6y+Fe9Rk+EjyML6wQz5UGqHpGtJO3GS7Y2bR4nqv+HsZ5UIrMYmFWqXVaE1waJbIwvidGS1Uaanp8V64CiMI0bg/71+bPy8YZ9ofhvF48983/xtuSd4Rr6spWd3ObVvrx+me84zfjVbPsMIPELfjDpNYOoEqqmbOP1onHLrlm7XSgIyEmytVKFeERS3Zh16aYr2tGEuFdrdW0C+0qKlDaH13Z2/oQN1r+P+M64jsL/UHvF25HCH7Oq3rzz2s9PCex2ed0Dv072MDG6bb0nSvhQBEFsZ2ia+u5ku1zTrjfd0HN4u6eY1JfevG7b8IydlP+zxdrZmIY6WzICp+w8+QtHevpDfyuuVk7jXP0FO8qLge/kVKKYcr4dak65ueSa3bBBA3epqGqPxc1yPbA4pt4Umei5fu0Rtc8XZ85FKy2fY3gO1n1KQl5usrXD3qTwq30vkXsE+JgKh90b5RjjJrTt4NIMeLMINahEeYm3mZxrfVmDc7ggUP4bGuao2x/ex9udzNaVLmt5eLLL2WwtzRfQFbNwl0Yi0vV/+4X6k29p0kC+Tf96XsUpB0BYxc/pEP9v0dYHdsUzPutux/dUzwX0LLdd8k8bZ5tCaXTAoa89ufTwhxdv/wgeoZckpzjM7NyvFsp42zhmFpzegNIHd8QlP7cJfdZZ0HffshZQ9zxMcm6zONGVnbnQFYKss1ZfGjtuY4/e1jExSDG/daZTVceqNUZJbuIJQ8LCukV9vA+lk+gCANnTtKbMVoSQArNHcsn0i8xsWoKXzzbvQl+YwaudBqYczSluXge1k+LOzhxvCvamPmCFbUVy4b0+/GCnRPeco6gNYzx/Klkj+vSl/H7ak/ZQnk1fn52hWoi6jZ7RZ0HqaJZ6ZDLgHPMo13+7fwvlgu7bKT1kKrUfGrAbnLTOOej1D5kWsUaZZrTXD5tM46FcahLbO8R7yXppH1/+fdWfC/6JnMDcdn5JDn7pyHNqHt+y91AjLsJ0jX2UNbRapvPtZPpvtFY4ARPvTQdTAW+zOqcS/+U6KSn57q4fMd7ezrvBTDUETE4uLJ36FHRdVOUAPMZlkgdNauyYsIVSD/yKlpKfvSs28wPTzItRVh4h0HQh7CaZBGr4UOQsGTn4bxWy9+akJXAUEfdJyTvdf4lsf5TMLnsPlyG5vxFkVHQ/ZcszP1J//PVXJLOWvlFn3ikyIVlXubJ1My+e6s5aoB2yw7m7UZsBc2dAhmUdDsWsNqwBnUH2zFzq0BCTraCU80+Kft9yHyxNV1+P5rZ4hvG2dm38JQvZF+4/LL69cGCja7pPev3XB60u4OB1MT4colZhkUFA6M62rf/9Rzd/Ov/c3OIb0wEwtTOrCEv7ePvCJW8wdXbT4MifGSCU2D9lQKf2hVG6fslmmjUAB89RIs7r2lNo08ZsLk/ecEXcFKRYvksiIOS2sllq4Htp1pSsHByR3f0oT67UTQ44c8hqS479ff+cyr/cYjkf04ctDiijatsNJA0H6F0430PuN9piYfm7B4Pzk0v2AlyFamGY+ofhn2nE2yE/VIoNul+B17cwoZCoG5ixIASq5Zbfodihx9NlhXG2FW27oUMvQvrbeNyfFPGhM994ufAoTKCb/v7HoKWARGlBVSgNGhstWZTzCjKwzW5YTcsNYJ8M9FJYhYV5hmztAIwjARA8KvhBTuWfHG78k5kxymO0h65yckXuksLnb3H30wk0hus+EcZToR0TdcQ+dTfwVxGvKm6miPszCfwkASOMpIJThFSWv8Dp/+Cb9N3am46jNvdCPY8N2Y++4i5u7YI0Xopr72+EBtObABef7kEYKXmyNpq5tX/veRnz/sOQW2/0Jwlhl0uG+Qqecs9YpZU4L9KqTquJweZ7ugZDbWKmcM6/6Nxs3FG2as6ZxwF1tbPbv69kblGzzDW/Tae3kapZCM5P8PqVWZ3dqDzjt0loqoq2NV3aireSqzYKco2YEJ7ATeZ0PXL+yyNLp8VkCrXNBJC3QTmXudZPhZD1BppzG3ndVbftAptVR8PVqtrJkiPq8jtFjvr2KbE51el19kOyYerl6SreLuLHO6wvPQ7yg3WLS9jVMBUl1q9X//fCAHuNJuwQ4r5zJp58vFRFXobTC4N3PSGb3uCsRvO5gpg5UKsFJX9R9DYgkHeRCGNebPFKy9l8AMrc0T3XZ7s1VgcI3w9GppWrvk/lNH3455IGC53gNvXxw2hmPJEFiJ4aSbu287WepPCMNAZ9tK8OpXldJuIyG9QOR8zWO9Q+GjGn3Vb77Lk9VzfU88cx2diBZV1xKE4p7fkts0jyQlgRrmkxXP2gPxtlh1rv5mHd6p37p8xnUJ9ApN+Euh08QafmUzspTSXOflND6kkORtZWL75or4cvJwB6dM5PhxqNY74daafPOshbonj/k1SFA8KZQ3tNRQKSq1j5yUknasFfeSVSttMz7tCcOX5IkTvwYsxuvzKmTgR9xzVpMzzygGLpva7U9+xSJJGnvO3FnBtgG45u2jjAbphUGpGZ7Z/HMGi28aKRpxaQKBi4n0juUM7pGm9WglXeW6gOopLV/CqN2WmhJSr2cB99DV3G9sbgXC2Nd+vYR5FO8b/5x4Yy7GTW/Xh8b2cboHOl61pMpFI5atllmByuofU1VSoeAPuYm3wXwJ0V98M6drfIyEYd3BljL3zNL0BdsvYxHRzJeTuSXJ2+GdtrnG1h0aQY9648de4e1XNTSz4+ouYjNTFa6nGKKqiMGcqKgeNl3xIzgtcXlj4NTBl3pMePHnQ0OTanx3fjk8jhF3//77+K/voLslSwQ/LtR7SFbDIv3oHtmG/uDTKhc8NIpfAOZR/lwP4nu3nA8w0vajPo/7S9He1Ym990CWWsqSgz0r9VTjWR2xLFPSePfwWONLudxc6Ci3GqKASlDrl1arR2A+VULZq4zH5PSppabvNTk73rPBf4rKp7RFDZM9Dc9A8/wRVnffQ/UkbvR0WtepMEzb/ez1VSWnsTC+Lea3+7VVaBpn20aXk+EWzb0rkbWks1zzsuWZW2OGi3r5tebxH+ndWd1dWvLFwMvY8uqGMdpiAWczM6E27Mj9/B7GyPvxAbdsxmkBGf48qNv7QqNraQpOi2sqVCY8D7pdkx7buBb7RO7M+Mv3daGiHClIBtPy6rSVit4ImH8P4mUTLhs99ngB9K0p0DhKG4Pi7fMgS1aH3Hx3Qj+OiSz43lQcTYMdVQd9mxxiJbB1SeeDlQS43+1neF/VNW+VALLooAbTzTt0YzhhGXh2R/Om4xq51ZPPsoxHWm8DMdgLmb1XZ2kth/mXoOCN7ARhmIpaCprkf9bVLY69qsNMaK1HIJtOSgqzvZIlonL4vje2wkEs+Nq/cZdpDc18EArjSNneIKZXfzr0bHxkIeTegVwED+qGQ8nrfR5zFbu7vnRg7XVJMctNxmNNBYuIBkffXDqQZyaMklAqaWTU+hG5i83Ct5pPYOPWhjqPAZGvzOc89KjKm1+NMfrKZtZmZEJ0LDj492vmsE3jYGkuvIbgEaHWxXt4NlAsXjLadVXkkBoJ74qPCrrxb5mow+1cbehUftoNoZdsdiBxqT3P0g7U5nYHzUf7XaHVly95ZQq9jBXpGtPHc5ihz5vpJyO2z2WkpxmTxKyxh4Syn8sbtbJ7OwSuGfYs7wvitLVd6fS3Kkjf2SdxXXXLP5RnsHH3g2T0dNvSRxKyb+ob5VwZwUuL13lfrWOs7crZu85qYzP0aAF7lrel9K9AT2Dr4N7ZXzMrXG6q6M8S2fRXn7acAagSavflZLd0I1N0kushaNcbnXETrW15dTbXjMvp+RY8svOMjAXhvLXWAMC8x3LDl8efR2dw2uURItLcMLZAY91XVA7xmcSZ0Js9GJ7j4kuJzsLv/t+CRyN7ev4NRNQBIjNia44voVpuySzYe/MBFz7dV/9CGtcsSCTgajkpyPFM6nPJQjWSBaXifSq3bf6aaU7vYwalJ69rSOn2obpseYiaQOZVrywikBbNIBgab/4gahbqU17mYfbjzoT9Qlruc+T2CGMKYzVPm8GxJxBtbnX6IQuIrN4EvL14GQjWpNezSzLMONgWv9gOkc2W9kvmn0uk1hKx32/F2gw5Arcm7JzWDsdnFtDco6buILopx5Nj3NnQ8voY+3y9JSb1G3+QLwSp8SAGoitNEP8qXnHnfpuvM5sO4z0uro4TrbdFOTDfoaaWEd7Mxt7bTVOLZR42RlyqtjO57FpdE287w5vfnLu9nuMe8ufKF36nei5b7CbbqRb6kEfD3x4zHM2ktIe70L3Iyp+YZC1+fgSxxMVy3gaj2Pfp97EZttBYSsJkzsMK71QH+7lk4pLooy9U39HRqbnCS7HrE1xowWqchXv81DpzhNnopiF53U7lh50X1zWPKyGYq3op3mfjZDe3qqLx1rdxnHhuM1rn8ILFhkc+Dg9Q+LhB+NW492FkRc7dGrYvrUifeea56oOjNDS+ny93OwRSjuS6IKA/HT99TbiONv9aQPNEYvV4Rnz7TErgueZ4GiDe4z171IS9xroQCiF184x7GKMObV3vVxgyLxdwAyM8hFNN7geSGrK0ZMCnyWbSaEewF2Cm+xuH4fdFtyhd7t9/WR47rPb/+gfABuDb82NN/XcJV3iS06hcxY5Fn0gqLXG1gR/mbNjOGT3MngfXZj7JEdO670HcrX6O+dt9ssotUpotVx2xUwORglwZrW4e7RYWhZavD4N6cWZ2vnHodLxVTuWy10upQ+bHOoGl7Io61BSooDiH31kfYiQCoMeHO09O/HuaT3YT6MzA0UngiW3dvyikmewFTpfgiLIUv6/LXUbjXTLxHc0LhV143cFLFqzunW6QlUEhx0Ve61zWu/jErN6cb1oJLzLOkxZxfc71KncmRwmd+3kHg1Te0S1lmpfoAe3Vk7iV2iHbTrwwH4ZOE5faB7Z0gkgmTITGGdTaNxYfQNeSUpqVyMyY7v/Ga25iaZ9kJTDCIjVhfCOGwd/mjp5eQsip8ddsaPFQ7ufDC2yvdTLPV7uwGuu7Co0l7sc/5nMN4PfvEGjtswdLij0yMi37bA6X8wNaztwfAe8ttnnH+jEtMf1DmM4iBaWUKbUNmucQqT2oGwdidgkTMq42XVYFWTn/5p3na5T82isGq2esuX31glOuD/4KLtdrYAvgKCL5d4tyUqIqBoarhUokbIuph5Iy9ZN07SqvEbkHHfkHcr+AU8y2Hln8Ut1jIQDeOTnVpxHuaTnw66+RpJXPd86AhuOJR3iYRMUkNzktoQ55b0b2IBqU0SlVpHx1wWP9sMFB8ZIs5Trgn/Qf3hP0r+jmDYEeCZDgAMF1yv3cixlmWKHRxb/FJVqEOXgM5RZ1NyjPq+qlUXljb+lfe/J1whxQZJ7ulfvejccSnMWxKIHA1dlifHmkMxGdm74+msw1NaWnhEy/j+rd/sPSk+7QnHDah1ctWTJYW9VYyD1trr/rB4oWNaMyqu2d5hK6hDRM3Upo+AGC1XRJ7NzJbCZwoN/9szmP3oI7/MoRHGmZean2Vwxz8aeT1JVeddanFbDmKfmu3za+kmxmRGgfNcnVUvfxgjV69r2Bv0xourxxqZUe0IEfmhmPV1NwgV/Uu1dHtppocXjQPRSfqvmT5dRXFhYrYHrXHKFSRVZ0ArhSrrgw8NZU5SajO2YCEJBZS2eyeYq/yv0Cxt9jVMLk6LYkMTyHmOrXQEtyK6f8cz33PVr+PdTd+XRwGKeBIPVt2qt/PEX2xjXVswmblJguyi8uSXmlNcK2/WaohS7VEvwy/NZuvhEUSgU66LT9/l4qPOuGxH8Uq/dC/TIN55LCVyNkxGRFudHDbC7MctSzLAz9csj0ZYPHnT6+DWIluViq6CCsu1xuhTnwcZ4E7PC77viV4+4l14U4cT101Rnc2qfuDFph7vdV6Y+BvAPhGkdRX1NrQMYFeBVpOSd9S7U0K349qYuPZf4o4D/8PrxwIebDIqXLvPyPEhtf0y1rvlLj13TQRWyKqlzS3V7AuzYAmn2DgEyXeQqNCq/9QxMrFcevq4mxLAcSDXg/Dob754zX4LGQZ8iyvXLUgxTOZmbTEJPY9ADegDrDMakXqKT8DP9wr33taU0pAP8nOzRo1y2WNTmMZiW0fkVjmAi52OY5utwFltjaxztFq0l8VmwdqFJdkNVa07aFy1n6YRhMvTPMjWV2nuzSxKunDWaI5fUH5aG3Dkv8x/OH/IeuCDdAr6Lcaxap7Vv1dzRv7QiLDpDDkODFDVDU5gcCD9sd/0snV0HoNDpQnVgjF0Rd36IOBkc+/qDBfnGPTqVlj0l8pFeizf0EWcf9R3bJyV2pdLdXJjEzAqydI7++x03XQHSB/BmD9X4qqFtYz7MnPdCL5oToLSguTX4eSicE3GUycmKTkQU2p4pwCOKTgshBI+qFOU8sqHVj1Rpgag/BKYCHZr2EB6qkGBQSMSCkO9y6uyfuPHbgWJP6sPSXguGyYuaYGCDKIEgTTsdFcGIcrspIdp6ksHMXMceYA455+SOUhsmgd2WeVZuHuKzw6T0VvrKtcGK/E3J290jupFR5mWnXDZqYezaQ+XII71fNFIOyue7ZNgKGCFct9SwikZabwv8yTnG/BsaTWIqXb3rvtrU21wOU64bDIIqJoX2bEGUuTHFFU8DUSx5gVXq4+rfZLK06R/GGEzWBg2+UrGgwfIDSrlx/7bbP63Jy37zr7qkt78l4vA/hqrIgQRx1up/PilcZK51ZD2Kb5fAE7T8nOEuObNB3iuLt5P8uk5kRvRwnYsi8bpEJESwRPaHLgF4AkmIEG6vY45xQo98RaSyq0oo7wEmDgAs+LRM18Cc/H1GV79bliulJrrV70q0XW16yG+M/zW+QLG9ceqkgZ7vGMxu0w1AVv9foxg3747hHPyMD/jPRYGbvdZvLRMtiho8QNOb9ZZAHsrVMQt7+hG5drTqz/Wh4ZF/WI3YglHTPP06ZNGXV1dyaYXb/gGXaYR29nG/XIQlWPqqaT8EwjDGFmR1rOJESqwK5RI/XurjxoUK4PnFl7QNbRBrT39hAo7H/1e3wiwzmUp4EXpb/KTOkqDk4j6yB40frOEjY37Zj9U3m7xXFDxO14/sM2ZuiPaeMmoQT/FeAKUOmrHsSAx+ZPwUuWpDU0HZVfvCG8TT+H/W22z039rhGVFLSTnn8ZuOEub7KN9/IOoxTxckeEhT/7TOW7RDBTOrEwbWXbaXKNtN55S2qVXToTzxSiq8Is0NN8gk0Nubc3CrGGGLSda04V+kPHhGv5WgCdR4ftRtAdTytqSpY9rjeejtg3RAHpIRsiZyKx55Jn7vZtnx7VJrGoSyiqnf6UnwBnWedOT9epVwK0s10WKI3umZ+FCtwy5H7Dq/KRiuupxarW6oi+hA+VIe3l0P8Jq6PGOBsM414/+bw0Z+vUff+oq4xx8lb9KuAqpBAOQk6vPE+rdUOe14aDCwNDS+2XIEv/Q/XmyzvbGCn0wMubYHTnJWczHkCFxxK7rrRBmWCSTPsnQ9sHK45HXONjc6xeSG/X5AHSjwtDlSD2zzofrIKLRoqn/sUEEF1XP3x6zYGLwA/37i+BSgyBLsENHrlUNFGtJ6kjeWOhNrlvj8AjN8g9/10M7P7dTtYzimyzjPEvanHJf/4hnFXRY1+smrRSvHrgQZKbkwf7hi5qycsfb48EBc5vdn+39Oj3dxzFmLhMUZwLyUrqhge3v0wrMzvsNYeaRZ1HKxeKp78o2Q317aJZicW+y54FUy5hoqcQzy+XxHwQCpgpsAf3V/eT1w7WIynh/XDzbi1hsEKQdctFsPC6UrrvdsG/tL6vZXOrDQRVYf3HfIKCLHTElwnNxtcIbcyOQU+Fqcjoxsv2AzGG2JEkfQdqY3C3mz+9G+Vm6xmpgpbQwkMrOTrZ61jpQf5Y+z+aqW9AmGt/U65iNHGwLbtbB57REzZreCRcMqPoF/6YKD1qga/nbj03D7xg/8IeXKwpG/9QN7kg449ZrtjGF3pYf7fJwPvNro/bafg1z4WlZyE7/72anzC8YWdEbZj/oNhXGsU8GRjNk6DlyE6rcA2COPVaMPb2u7IQJwRzCwG2KPeuW0AZPFytnOos4jdEdUSrXLV8or/ze4GYJpjA15BAANaM/k7tHZas4j8r8kqy2z8JkyCkcT/BLui/qOcXv3N2/+WUt+fkWVgu6+6G86X047tisC8P1GYmkM78m9q/BkqUNn6F2IXnFKgrGt0ZF2hpsjfhllu/DW/jzKNwqsDpLeVFiG4RR+23EvJ1wTFvb1xv3CjfZreVh5yxhKdXuwjDsLkDzscm2mn97tTucFEkkhtP+etb1X4jaufE+mxFPxX/DutUuf9ry+ndFHhoCN+LclYQzu3JSi+y6M695Vw/n6keoR3CNCig+M1IVEYgNzfP9ifmtwVy5NeVBsF5lmJoZG06mg8HX/DenD+MK48r+D1+O1+emHJ9Z+WT8Puml/dS7AIUF0HJxpAirH8cBpfqOUCrZpOvqRxsUiaMd3dPmXYXTeZQMBKt/Y44IA2+YIo3JmTuh2qbXMYsq7YF5/hWtsHgHjbSmalTLUWn3ZWHqRRFlrD2cCrWrOcvJa914CJhwRe5/q9liacF3Ch/1HknsvWIIpeztI4uDLLtkuxL9wptLHGsyAjAi6esotnjONBdBXN40y6mNm3RVHkD7rP1jSX4owvg7vd/QvVs2dXNEceZOQ8NuQdxJL7HNI/hKclZ8Y9FJjFztV6ieJlDPxbRApLYMRHSviVXN76ks2MArFMAQxc9234mNfC4viqhCLI/qMxAtLDZdJaPuqSjDmiIi3lN78HBRmOWHkvLv1yxGSj08vubd5oLR0NIZ/0HlJsRLPFxJUIVynH2oGbw1ZYRQXVKqYw7TQQfzinpt29/cag42nrmedi9Wnson+t/vrw2E8/VRMSrg9b+bqMTAW5jN1vaggX/qWEtSQeqmtKGO6neGq3qyfIxrDNIRHMmS4dphdup/s9hxbbvi+KUGmlXbS175OVsEulaCOM18sUo6SAARxCFq7SVyp/8li6uN5g8pFdC27PWKeQ68+Bhoe/A/kY6lJZdCBNVSbCcu+FTfHFbcA6jrtfbH2b0w7LcdTa5BnfvBzTYpVgzOQSkFaWC7a/S7um8L8PScfEamtTPMoSqcMLiie7uu+lrntQwefc+/X2kf3611oWIjCj2d47fZyygXu17uKexFi7LobGLbjl78xWd3q1vNnNWui30ewEklLj1hHSj8p6+7umJ76TcuWFs+NeBCOw451mt7bmHKD4O1Pczx2J+/uI/GYNy/7+a7afICKAHTepsdj0KNadP/N0hETrG0/aRKhHQIqz1ZYVTM0xtSyj3Ws1QT5mNAyXn5WO5mg9enFcUdsShLUHGli44lCLiewWr+0gnkf4FGeCwCmsgjqp+dA/xftB5y1c6lJMFEJaaCPDaH8Q84/Ua9y1RJWbEx/nMgsZdtKB947F3v9QxNG2WtyRJ/2fj9yANawfcrtESsZcMNnniKm7tVH4ZGEWFX2zBc1F1DrOE7zsYUsvkm1tHBOdlqPHw/FJNBFeV6njvvFINRviYJ+VzHEdxyPf4SwXka9AiiPmgI+drI9GNFVVUqMbHtFul5S0ipWOe5oXO7DDHleNZ8m2oLO/9HPAWUmXuo52yr2hhlnHsE7ep34bPJ+A4/Zu8/1t4HATaz4lPA2/g1db2+H6ES3/gc65ll/6BDAqTuHRIdVt2uPLfFx0JHVpq1mQzc24IEWluXlf5/6q7xoAa1fR+LKAIDUkv2JAV/OGXpA8zACr8sDE5Sa4e9drBke6gfOtKDN+wzwvz3vpTaJiRAUIqjTlt0nT8dHpjs/VBZKPpfs0Flc9CEjexj+kawbf+wUiPP+NdEcxJUXdTGtidgswCc+bzA6uyQSE9v5eJ2gsGdwFLZMB8zTivB1DjtziJ4zN53rf4+G1e5bFEK7zn3vFXsvuk4sQo3rvjueAxz25zMmH99ruU9jwAnff85gdI6HUz/PEESf5Vw3zd/sEcWep6kubapQ6q0Soig3n3jZ/5YJ/2tfclrx6/6PaORY7at1SeYDRBMXq1uarHVU3wLszY23lVJMTaul60N+d32KXiD/GzozCTODCd6l2+ZHpCw+91ifTiqwJUVZvYmqgEeKN4egKezoxYB3511ZpduaGSahXCLH4lU3S8NXWW7KcgmjmGIjOIo0whOmOGSv9yhFEeounvBtdUhT/i4GH9t/rdzAzqoPzk7+2P5i7VdbspyCN/X3tJwawQWX443czr8+EgD9z//XAFVlMUWyLzctQrSGXq/KoCcVuTuF1v9a5tQVLdEUK0Qt585RiIiTLb1FG+NnsAU/Po+u/Zf48LoJvoxNuBIfJU7nwE1mBo+90S7U/TuYk53qSSBO6rEE9UGc0S5VSp1dUGSmsV+GsvOzUFUx8e+R3RlB6o3WMM1XJwrH1Af8tREiH5uObKwjLnxrwoD/VL1Y0Tt62cUpbnrNKACETdGzAvnAGttHoZthGJp8XVPDbPrf2V8t3R4ACNrMzcpJF3OH7/T/EzQUB2oZdYfW0zX/uf+xvXfBT9ioiWbO0lsPNVXV4bedc+6iQ1iTVQW5GRK1521fHvDqCbPrGCAPfP5PUKZRf8TIgyzDBy3kbeT3Hn9Bba3+gzZPLgSiz1m3rr3zvtDsVWxFDeby7RD0/eTFOffIAc8eXbHRLwPmWEexeUhTCD2hpQxxAcFK6aYQ05Vbt8aqt6p2Z7AYIIp4k/wSW7VLDR2fwSh+6/qzri4LBBh7XgUqWid9raSM5J9++EmBNLyQ/INbUM7TLbrLQAY0/3XfsoKz1FyVKo6tAXnrba2rw8upYJqx2hPxu8c9agd7qg4B1pTeOhK3nPuOxXxJkd7N+w6fZ4Yd3ULPL4cJHmn8P290FRaOVwuk2SOba4LjJLH0qaCua8Gr+wELXypbtxstxnt17vf1tCBBP7ZZf7vil4qVROWe9ODTfAGrUYXZHttCYZXZQXD4fy2Bhk+fUBe8rUddzFX/F5HsMavtNP3FzPlOfhJ2yef5OtaSK98/1NvjVeiGqG4HibtppvzWPxxQkj+P73la2qaXKrnDOKQWoqAWQkxzZV/Qj/HF7Z3kRPnq/eJngo6jFXtInGtr/3FFlSmjhbRdRLIyw31qGRcd5u2rlb+HAmbst/fduvQqoaGZ8tPObhSW1xpAkohvQr5CymbSyuOGOQVXjuzb7T2lLgawj3jllcpUVzv/aDLZN783hQObdNf1ixAe40dxVDhH/IV2O2NKuqJhPyIyD1PHRnTIu9v7frFzRCwPygW5W2tPhqB388r0o2qpXCA8RdSPEHb6t6Op8u5HrHCykl/1qee+bXTknfJSN7VkKLwVePxgFejIeoBGm84q7LV1d709yOrx4O1SzI8lsUlJjqS4BqJ5B5lgRtON5gIUY5z1dFpUcD6T9vihtV6FJY+/iK3N6+T06/LHebcU6iMvCn2ftsZuOURawKnC5s8u7tPUw4eJLYvHvjx+91x5XEoNUJwOVvh+m0BXDX7uX1jyPtIR39gdP2u92Rz8AMpCJj0zjrjwP/0x4lQjvK0gNJB06ZH/SF99/HNYpmbjCLRWZ9GMM0uEIXv47JL0xdmgibduoEKw3s7PLybRcfggSZrRiIgSxKvsSNpmxDdyOJje9pTT9xpi5TE96vXc5Af8fDTAJIZz0mEQmfq7ebJAG0+UaODCRgEjyinp9E8raIGBdW/H0/oPoLhwP9i9g5TfvNKyX00zxanvKMUYf97WdFkptkyTIIVVfOtke5dpMaQLzbvRAtEmtnAgB1FFD777xp2kLwujWAvIWIUceyDabYWoLh1LDXJN9qMj36Xm3d79Z6Za280rn9vgUhuvG0rarDyI8qShQ82FeMmHi/EI9Z9NyUXn/u5li6UyZOvzTW9t5z4xj9Ct+536/ZQ6h2q0k+VDAslQb3s5+OR9bwF/cm4w4ZSU5DHagNumCPLpu5P5UvalsMKdQKwje0VmS5zCwmmcpjvBDeFc311ck1vdYzvInNGoijZUtZOPj8iPRt8J2ZBO3g80qHt0fa/feEoO7sMibIo+qmhVvXvipb0MPoosfifL1Hbft97vN4kBwy9sLpHNPdZW8R8RUoRWLRTSd0gaiTMJU62v9IEkJ0MrCVsLdDvDIHKhhTkbFqcmGnz3HZmqcQIdJqiV/+JoV/0tWRko6/KfowLed3u1qZ/il8Rg1j6vrKaInYXkiRG/g04dHWbPdDFG6YcC1viC4aPgGSMopQSD6Tj76Bv2HM7s9B0iC/X00UpRFjlfEmXHHJBWl5munVrPvyDMb5wsuFkZwjWM9LUV8uIaj+cnHpFeIqAkdO11H5iTSbESVliirdjetXlrAMNjkas61Q1Oc9Xvus8MvJ5hStWmYQ6Nkykt6ht/3ZSlGKD6g1O/VfVdAugC3J9pOTilvvTeGoG+cIIm6tvMwor4Up1Kkir85kvhS1oVV0B00GZlUmpKZh9Jyi7WguRyLXzXskcMI+slMoXdXlbps7ehzxM8IXV2utLvROl++qH3FWhj49HKynXc6hy9pgpR9iDFUh+SLSaBTj1LNW0wVmkNGjhz1Fw3zmngJHvt5W43TX+AgZi7WitPl9MLmshuq0P/2tOX9qRLqeJuUxKoEAa4GFqCXQOhfO+8KtgJSxuwpYYrx+a4w7dkKNkP/huUV/pwexDxxPOnPSdf7aW8ddKvWPL+7G3SOa34grbwV5JM+M1qAQ/+9gr6ExSFlXij5P9EZL5MJoW38uuNrlmzUeo0IKVgeO4X73M+PG+7oNi0hdZb0R1qw2nPQLCu6tT3MXxIjSzX3UGuTNKI4ADi+zNJLVeRFCjdMjJgA9fP911CYiCU+4s+GyjIsVrBt5c9jvMluFWih7aE8XgIZK1tpurU1udbs97QWu1hrTqbdfTerC/gMytOYcNWe1u16xaqN037WleByV36vTy4psdkskY2OlHUNmoJR3BHUBltf9dZQ9NfdZGF+CUoBtP7qt1VDqbrvObKHEJKjwL8kS02qdSXfd45thJyUFz0KSXa9nnMCRsddPj/T/On+/Uu0/Ny+qu0x5Tf1yVKDMc7U7GtavETrI4E791/Ds9IkQa7pRDOuiV+jR1W2K4gi9zNq8PSE3OI60wDDHWjOfKIXjtHrDzsGZdQjKum81pih76Qs1yx7vi7j8LyNyzl9X2vEwq3v0RmXmjfdbWtuu8bbtmB0FXwt2bV/65cDSaeJaLmHHuf3ZplnvQvA7eCl8XdnXbRSY44x+CdUoZPiG0TE7votiFJOmgkoWktGMTJQmK8IW05FJmKjbFFD/55Sw2XH+St/dP6ntd/gQvnnnpi4FIX/lQcAgNLm4wY6zfFeEH+fHvvAo1pcq7RnfvkXUTBsEr73cNmVqLcPutSbfZAPZwvug15p5Dyt5Z7ZOlcSEinWFy9NiDA1N2cp9aPnas8w77QNGiCH7mGkrxbXMoexs00WQb7Jn7pOH6Z+oei/jpteyIv23xj99v3PLrrYCc+YKfIM9094cix4+jzDbf5qsq2Hmn4GCId7CvDslx+VmU3A6UHgA4NB79cSm2EEfi63d9kqjL82oZWUsf4r0skZTlHSOBMfylIxENI9YxR1I7P+R9DHmnjSzsy80NJXwnNQcj6TdP39i5wmaO6HZwNWG52wBsxolisdrVar/2g6W7ITDYQr27TjcV/czdShSkigaJZehIu8Lxi+2Gq9TkXyPkTyA7dayAIgcwHQiaIwIqbQDZ20GLe6zfU5N5RS9OnzQfLzN6MZTzFe5II8T8D8BJuKzZpKCifnrmq9npvv/qn3E2rkbACkFlEqPZKcwO21hc9T3LRwyNRZXB0dKhZz3F9vhm79R8fwEfOBqQz7pomMKlOs8M6na+fJuNDap+ivXUL1oyE9gvi2su5Guyw+L5oQ+OZgwVYelof6zzkfH4LgJLFdOXBzz5PZFWzgS+w1ZtyNOArKeXXUKDNvxb+n0tye3AK9+Mbtnlk5c7XskscsNWYSe+caN296pIhdFM2BAMPAhB8ueK3iA+2rwWI6H7ZDW7EJXbj+fOWhudu+s/eCs2w1XXMPUcPa8tXhQXc/qXw1u+q9fRZS3p3rveAfB1HoA83FrpixVju0vo07KBFoUe9CT0uyXnhuqntX26yrmmy1F5RnrJ6pd3RE6WGtNP+AGYn/G++G8pBiZXwNPY73NBg02HsChDz9mM5apIgnwyay5Qf7tf4ur0qcVflNcOwTqCFMPwfiMlIb+XAcOV5k41dZC9kr8xpkdCirr7Ow10enuo3+nOwvV//Ws0/NfLGA7tvtE0B5cS2a+Wv9dp/HIzM9LNY13+M1RedT2P0HRGt4BV4n217T+2Y4lhQvv1MT2HMkXeSmTis6XfsLTfS2KmVvkXE6g7JBI+JPoNFyNncFH7WK/3e7lku68eKUN9SWNj8S1/4rmW93u2irf3Fzayq0QKLuTwK0C6ugeZXMbh4avd0BxrMyS8qrOXAJ8yb1d6jxnEfFKX4/244mXeylwZnu+3qZwJ3cm5jVlB6weYssAsKgfxIeAIsj8ClxIE3yYPalUGlRsZ5oJ2kwpbsOT4XwyRMMC0QsMhHl0XnDO2WL22oKIE5zti9cv380YToPrcfEco3dEIs/ioxK+MecrL2n2Gn9qSjT90v30TmlYypH1BgqMtDDv8q8nUTp9bFoxdG4H4f6fQz4kfS421uHhyhPOuHsnwVHTJoqRM/QLi2XSLjMuQMx+rO7BaKeJLhhjkX0ugRIcQTzN6jrbvzyDo/plETzi7XJggW9tWiKMNpuDwK+VHSe5VmI6ETxlIMbcNXImq9rYV/uZrMHkpOiTgyYiIymEe3AMu3JNa6x/xj9b5TK20Jfv75+jsH2fO3sUm9zOlY8XYbWR4/baoD6Xgrl4tZpTKfeKsVElmYZSD3G3BVu9v17tvgnH/CbKaHUapsaA2llb9U+oQAWRPOc3leV7lPQiKivibjQNJQNTxxunaPWW41w7GwlGZAjDJS6RdlV0UP5OfmhMst++aCJEfKuKGSuDWZufeF2OEoHTlusy4iMAV4n7OVsnByhunIfjvmaw7lAsxJMOacgxt9fe0yWfcN7XS6mMhPo/tc9xMVKzjsqVtjGaPKAkpiDwygmmGsxSH3aWiAapzda1hudF1vNBYNwy1IOQEe/1Sc/5fi+pPnFpvhS3wkyAuqevwukZA3wxuvTfbwcX1+PL9HMfSEP2SLWwnkzaebm8xDe5RcSgOOzkzwkdwRAcPyjweo6dbthbFB53ZGesokwN3UrXJbNHn4/Y225JTIlNsofFWK8j4Ta98vy3uptH7EBbGOopTHDanZO+mmYfTtPQ7rt+hjNamZH9YbTao1K/FGqxa70mSI92tmUtrdPJMJ2kUooAHGWa6X/ZidYK2jU1tI/TsWSDcXLueyoc5RcR8pTnSs+bZfaEYYeX90WWWOthyIREkOUk/4JB3FyJqJ6MFK9Tvd5e9fosrT9uFRc0sXmX2v2UTAwEGmKAgAUlWNP/CgYGQgPogpxhk7l/kTEzL08PiafCA+Ed8jhJlcpTaJ96xjXD4Xv1douaUC70YZo9z/OIo7y4akoWo05vik+k/o0oWknhjAP9xaMV9GLozfy5coHOnNbYIjkdG3rb9riDQ4ftP5C7/byd6+RiPbMw+BR5vy6z2cIe6KARRUeBJBip5PrYwj9glheYX3fYl0rV/Cx2eLQHaZLqtEXGddO7Z3zpOUTA8FCGXAqgOZDoYLjbvt8PxxmciSLutbJp8jE8dtt4+Y946m5aVvEtnqS21HiYedf0un8gVtoUfHXevvWft+UoXQ0diZMwOZdV7Z+m9/tL3B9K+Xi/eLr/XVe1Y5Qrk0bvixFjR3a20b2w53FpLjXPgK9wCan7WQtC781E3EJjasjYsFj3v3v2Gcf74/lh1RfUgBUYNx/0elLedB6SM0HYCXU+eTmkuQ/dW0wsdlA/ebsAZ+zfZiiPbNCVW/c/QvVtT0Y9/ZPER8occvO01dxPueBaFfkoWJTq1IWi5mF0kC1hdOnk0lvbPvCoimCW+wACRGqxEuFJLnWoBshyVDi3qNm+Q267G251ua4jAvM4j9UZW+FZrtrHvjb7OYZNJvo3z9m6SK+8tv6cfHVXeW7q+Jq1ZCDmM1Vuk35ONRm+lb8NuePpR7RatDtfvsoWSntf2sr/21PLh5c6reIJZT1jd6U383qOgwQhXDolCnIg+6qlyUA87pu7lpla22JqdNPanlKvuY8ujrylHtKXGkrCEAU08m0dBPva61iXfHiM8u8zrj6XzGv+L8AK4DC4MX5AM+41g9CW5OF4999KC5v1slaMTea3RHlSrPppNMVrlYUJGyOosKBh8XG1rwHAtbfL8o5c/YXve1/RzZ+ELBofbabd5zDgQ4rYniDlS7RJmBKtVRVdGvPgvjLZa82jbTDbDIVXRIf+Dd7LQhWYjCm145qm+1gfE0axeJP3ay4cHvu9W9rC99pkxoF/9L+Rp7N6fRvHe1kjjXl61h0hyfJ1NeRs4L928Z/BeNcCfut+Zdxkbnz3NHsG5ueuvzxZx/kT+pg7gFOMX27ywlyHj937gsBgwPbMw1MtJgfXOxss6SqXitc1r32mxe+nzAK4x/vv9fGD/ao7RFMzdsvXS2vfFQBP1sOo8nLaIRIHPL6DlLNTdW9pAtAW/xJ6P7N6P3D36XG6b6oDBQ3iBB/+cNV62LnEx8LNzlYY+0kZ4Nqa//6VfQ2pOdNwq7UVLoHTFAesZn76NdQz5XuXgIQC+kWQtWO7d6f7WqsmyvNZbqCfei6oVjQWtPd0ATwf8Ie5uMpHkhVcCNS8QvBFU5W/68IL3/0faX24UdXU5ySdGpRkHlftCUnJM6VfUG8AyS0aMOrYdN8ZcL52zAEwZKxJdbRGpzQmfov9VtO6G2Vji1eYlyaqoj5rwNBnVf+rUaSWLWY+gRkwJ2Adeq3zcMu773hNhG/rYD8Of1WVI9qUUj0KvmlYbzC71voNlrxH92Y9nB+NO5ANz75nbE0SfFzEz3MUWP+7BBuQ0SMeZpZro0e5ad9FSJdaulIvjbgWm/uldpphmSvbeosLexetvviyg+CvEcX9Ik+R1V2u+HXsiyokXlwxeivXsXzGjIV9WpjEgCJnkgHvXL1bb87rvtr/bY/yHvGpdkdSZc4uvu6UHhZgWjeBebxvfZYfxbSeiZtGam84tHN6evqR/2ebVZJ1ynKKCNht/x3y7Edb/HBEdSaFlEv7QErmpembndwAy2JX5luztIiESpp2bYVhOwYmSIhev54gsBsLKY1aAWH9GJetbgxM7kd3fZIXM3akxxDc/Z3ALeLPDlngiYbtqm0Z2/tcTMEbmgGMSyZM+UxxB8ij4ILSjEseq+rDP+thUCqIs2r2gk7+KWbYA/OYRbxb/HL3NnzGZ5s9bXXPZ8WVlNKWLqM8XEZdPfxXIf1g2M6opSvkS0znRn1slaPG5IjfTPExyvf2k0wTyO0b3NkcnCjAkarPv7Sf9BhnXUMS0hHz+LiYS5esVQrfrCLzmAZWE/7LXnxi1rUtPBO7isxcFYG7xlmgc7mPTFC5AJJAfzw1MZVsFUmhw906M2/dPoVdO/4O31x26oqi7fszAO0X/pYwnUx1ilQslON/7sKQXv/aluc51nb2TgVq9IKh4RP4ytzJLUwLW5I2Da23W2xP54D+4mUZeNDiofOm1TQtnpLN92tCrfpNf9OOWYkpq2l231YXq3VlEkB6eQy7f8croUa3756QyUjFMSisQj7APTrXyPnwUI+dRMYMMOK76zwaCNlEuGABsH3uxccsgaGAe8g42dd+xCizwCQeOSauP3YKKgi79Y4ez0p171neNe/nWV3UraxRdkI+nJwIWcuF3Zi3uWJ1f1LoPw7ZrsMnig5zOuJM4RYS//GsaUs/EsqriNO2xRYFW+24lj5N76VxLrLZuUzfW7FkiurW7dTIISwXyjlO+zr2r2NGOEpALpj50mBsYIEJPF2aOvFcdx1rK0GWpuTW+5/MQRnB0F3WBRmiyUyrTCDEmyduXuy6Ta01szQ8q3OM/nLt4QWBMxuYUeLN9mC5I9EJpkxAftSfh5UX1Yh+DUBVGKu8uEIhFzx33F0NIAAjR6eNtQgXK2fYeLbYcuFxHn/x2g0aG68ifrEhDYHhmbKZ/xiaT1ZN908Rv5PQMU7NVAbtJh7Aiu/ELwI8k3+r5CrgqoEGcwzvjlGsX7N7T/Uf8ieI02e3FTES5bxuGD2xO8zRMc+wydhPIxxS8Woavy83CW8hv8QW2iYbXalXpWgva3ekCvPx9hh3z5GdcpR5MQDFYe4dCcZSWIwfjQjGAuboX12cHnhv71xWbH/89dRJ9oScDV692T8LZfAKMypgyScqUjrdcCzty8lS1G5PFXou5uvTA26EQPi1N0gUu9sSGKBWNhWWTzvpFSLpi5FPJfOdJy4mVZYqrFsd4d4zP93ZhaxD9gNiXNtO5nA9BOIWdGkKSkByvB0LsVHvlv8xt73ZNjQXLPG7CzIlCy6kD5yoxED+O+WhC27kMir+ideD1cl3rODjtLMURwr6sTXP8cOLdw+vwmvmOwOIOPLXsExtZTwlm4B6B2O/Pj144BQskghKLAEctm05ULer80KgPfBJMm92byP1WFksfPpDwNdu6IjQ68g6U5ds8DQhL4joJgw8UK1KTXGCjAaIWFOHJ7qFCK6huLLU72UjjjbS1YUzH1lCVLbCUl7s/irORkxHDTBtt4X8nRiRkGqxMEnmPjtHBUv1kb+urO607YrSwFuB+Sm8gUA6olT61c0/ONZR+Ksb/FnU0nDov+RdQXDTDLOLmKpuSrW8J95bZnp3oqglyjl9YHwoLRzMf9VS/0/T+Cth9df+c7YNg+9IzHpwiuQD1EMjAmiQLhizFoYitg1EgtsTLsJMf3gLLHxs8Fyj2okDWoylj4qLC/45dp8jovZzmvTSqPZcmE4rvPllS4ZZCTTmqrmEFp7oMaWNxtLmy80Zxi3hzOZpCQg2+pbO/3smYFflqQ4Bg1GHpnV1bXa5daTqp2myT7amqx7zza8pPA==","padding":1},"hashCount":7}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_01_membership_test_result.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_01_membership_test_result.json
new file mode 100644
index 00000000000..c8bef092c6b
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_01_membership_test_result.json
@@ -0,0 +1 @@
+{"membershipTestResults" : "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000000000100000000000000000000000000000000000000000000000000100000000000000000000000000000000000010000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000010010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000010000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000001000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000010000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000100000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000100000000000000000000000000000000001000000000000000000000000101000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000100000000001000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000100000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000010000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010001000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000010000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000100000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000100000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000100000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000001000000001000000000000000000000000000000000000000000000000000000001000000000000000000001000000000000001000000000000100000000000000000000000000000000000000001100000000010000000000000000000000000000000000000000000000000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000100000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000010000000000000000000010000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000100000000000000000100100000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000001000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000100000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000010000000000000000000010000000000000000000000000000000000000000000000000000000000000000000001000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000100000000000000000000000000000100000010000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000001000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000001000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000001000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000010000000000001000000000000000000000000000010000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000001100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001100000000000000000000000000000000000000000000000000000010000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000001000000000000000000000000000000000000001000000000000000000000000010000000000000000000000000000000000000001000000000000000000000000000000001000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000010010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000100000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100001000000000000000000010000000000000000000000000000000000000000000000001000001000000000000000000000000000000000000000000001000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000010000000000010000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000001000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000001000000000000000000000100000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000010000000000010010000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010100000000001000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000010010000000010000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100100000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000001000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100100000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000010000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000010000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000010000000000000000000000000000000000000100000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000010000000000000000000000000000000000000000000001000010000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000100000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001100000000000000000000010000000000000000010000000000000000000000000000000000000000000000000000001000000000000000000000000001000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000100000000000100000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000001000000000000000000000000000000000000000000000000000001000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000100000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000100000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000010000000001000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000010000000000000000000000000000010000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000010010000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000001000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_1_bloom_filter_proto.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_1_bloom_filter_proto.json
new file mode 100644
index 00000000000..c03535eafc3
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_1_bloom_filter_proto.json
@@ -0,0 +1 @@
+{"bits":{"bitmap":"","padding":0},"hashCount":0}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_1_membership_test_result.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_1_membership_test_result.json
new file mode 100644
index 00000000000..8872f804c6c
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_50000_1_membership_test_result.json
@@ -0,0 +1 @@
+{"membershipTestResults" : "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_0001_bloom_filter_proto.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_0001_bloom_filter_proto.json
new file mode 100644
index 00000000000..41f4c45b813
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_0001_bloom_filter_proto.json
@@ -0,0 +1 @@
+{"bits":{"bitmap":"xdQcZ8NOMjvdJWzA/WSuWC32Bj32rIjsfRD1uVBs51n2feOWmw1NVL12gkJ2/E6aWLxnfo07GBDPCkCdJhVmqmXzIqpAHbTx0WTc7r+6ybJnHiJYonv4Vvte3EBu/+Nd9RSp0liy/FxW45djgQlVqKtYjK0cy8yNP2QANUYhHtRRHg7n1RC/nsze5oLUsYOCkjMPFZQlGFyRdXXoG90B0IePx361tLXYIDUcSiQMWg/xC9TnSiQ1iG430859gCXGmN0nn+HQoZveGYeaE9GDFmqBQR3LhZKBhonRZSDlX/yo2hpmPtDaxYwnVnuEGF5hztXDV2FeTFGViGgqv2cAz8Amk7AfeNayF1kynJDYa1/Styng+tWiegr/gZixN0ZbSKxd4p/YF/rhRKTOsZS1V4qcwm52SyWtQD2c35wb+i5D0930JZO9iLrOGCY2b8gMhyk57mB9f5zEkz+DIHpIXlF+lVN1sUAJOusGqPKWf2wbSGIYxbRjuvo+YuO4be04E3MoyfdikZhmr+KtIvF3ZBWlyaxNXaYRtfwFctYPXtoFMifo6FbT+f8oBAckOXvqMup3u2H5fYwAD8aoOU4QeuaVUraTulyEq3tI4nnbIwmJnB1rF4dP8xzwj6IwGk2rz1s4ASl4QkZXUUjZiN8I9/iF0QYijV2bZ6fo4zSEUw51QKj5KiYTSSB5skRHFW9jLA4AJKUjgyDmlYTm5Ocookr9p0VBJ/p3yowTm7yXb5FDscka4jxhljguik9g1YBc4XdDp019nwdoSnJ/FH4R0Kl0EsxkGJ701fDs2Gl/8c4YLbf1u6agaOlbQpVm5BMkzoA8/LQNmwxDsLGBnQwUacWUowwY5wQCBxW/yy7hF/TnFzsysAHTFxioZd2GHbt3LWblB2KbmJqVNAssrk3284c+jRLRGi0kCr8KciUztIBnJfaMiWb+ifD5jNDDZig74eRXiBEIcAyO5sSD/06of5FFfOIVnYFpLedzVkYPHMPNXrI/0iG+8PSJz4QzGmrn6PQiw3Oj6BTiekY9i4T3glRJiRYVDxdagWR5O6EaQP+3ZSBuYumjZfpFF42L2JSsdPvDfdEu6S9wU9pM9PCpptnE+Vxsl3oXAOF6/Ud+pOy2h20u0kVYTNGWQmeMt6JKxAnCMXKg40HHVDyPQwRVnreUN5lmuot0vUJwdWvM1yQFU8zND4WUWbgP6Bnf58FpmOwFQ9o5odcEnHqKyn410e1GyT6BbPZtAPZ4gSUDi6zxXgpJU+LDCqU104yLazZwIJhO1qIDZCAdvrrfUTZ4FmEBu9tAepVbq/BX8K1ScN/qVqJmUnIZwv22ArJgBvVEc+WfIbZbbLTG/COxSYnrvfCpAlrquvC3d/VACdMs5JwILSaJoGaGYSYevMKhDyn/01KY+ROV6zadBMpC7gg+7iiPlJHE1u/6EM0xfuH56iI9u5Aahw3hBC6yCXqVxsaNC3lb1nahz/Q75wpXHxRmVDEkfV6BCZy1Nol2m2P0vCA1tMzGgkqolQTfc0/yMJ07WVdiymDarQvwUfm/UhoAHfsd3AKChk/Jykf89W3oMiVGC73lQ7ZHVMOPDLhEQe8HR/bvurCRD7OL2TxFFDI0q1cxg4r+Yp6fZCEswoUeK756Bw3yDm4VgAQP72LoO9P85MtnEoBKdxVbBEBEHp3jCg+rHRvxyGGwQuz4s+6n3efgh5/gvdi+RvTHFql3RshljAVOI26MlW/3MutTpL8V2IaLx7xyU2mMBsagCGAEHh882O3hhk6xWk7Zf/26IBovYX+AWUvd2yF1yDSf5gb9Kb4ieBUvSBb9EEb78XOHnla4dgFTVt45+m7pSc5AOxJUJdIFD7+gv7OrO+ISJkrroBuHr/QYucsHzvQhnzaj+kpaVFFmSxtAYOlNXxKv7pekB6lQ0R9hnGWogBGPd9CoHvSfFyxTflT1Wx6kaUIBZbDEHcd/iDzfLK71Y559MH8A6ICgdUAHjbh5FlghK+Rn3xb02KdntXas5VjzYULg4DrVZpVHbU4ZxmEo6Ek3g3AjSs8t8Jf12mhFfcmiAXTsXbQxBjhVoUzUoPspt6wxt6QZZ9Ws9k0vFAsHpR1FyaGc2LuT1Tu24boK1q7TzBVWdX3Klih8ljQzI4wi2jLdm/+ghj3c2FUXgr2zznNIKuzn7C/WNqsaKmBezTzuq84dubx9rHwRI38+hVAIRyV2iiuX8IcYvtuU6cSsEWi6x9BBJTS0ZIdScn0KIAvvVrd1FJeqTZsw73N9ZA+pKMJWDSleR08CNjRqDz3/t4tjiFGHJYBwEl3EterPSJ2UC24fklmCcvw6oUuNqxKcykoqqOm+47opJL0inBleF5eUwphkwc//XJnVBzygB1GmBhU7v4QldcLz2IqbvBTBDN1HEYeY2yFzCa4SEVxZkWoxPVYCSbpzBuXZJIjDibcHp1v4qANYfF90f1TtdpKOKrzOwq4tKi5YFgBAIZx8eE/VZJcAhYfEMj1ECLhE+zAnQDXUvZngdzWDpCwAKEU1Qv2mAeDpb74rCfvXY6b9QqggzX7HmwrKw0LnLTO9kdUXW5iNxIs5ZhYKxlzoh8WGCS4z3cdMYXK5kg3ezDzqTkOo6IscgTPa6uS48Nlupz3gN52PVfb5HmuqyRtP9532MAbCkKTuMI/rR6MNuDt3Jzehg3RUGKIgkuY6biNnBBGNjWNQdo1zhrwozUMS7+9OjqSYzm0uyDAtiLu4hCYV+mhM6A1iYDKipTNdjHMQlN1XLOAVF1ygsbgOW237+M4oKmgOiec3tIh5cQAkyQlA7kZuydnuG+pdmCCo8LmCyWsH8os4rixVYl0Dgda7//IQ16GJP+bRd3J4F3ouXMZQRK0edquEw8U1N7q/ULFynvBt6nk8Aac+oSSmXmmQLieUYe7VJ5m2Fdrqcf8oCBhvCQTs9U1Ovsuk2QDg19OCVXsroThlGC+atSSvsFQNhEH7+w9pZt8qeTsCT0NGON8+saVbaXyAZNB1VETGrPKKjC3bfzS8amlqs24X/vIuIKY+udIrvTpBjlnYMmXo1F/3TZUl+FxjcepqjQj+lpLfaHDCGgy65qJgW0A+kbXc12tpA6tzyjoXUrNVNjfftl5GkIOpsPqzyfDNQuf2FjgiBjiOnd2jirbNxtjwK/Sp6fnpaNbpMqvrYZ7gAIIESJolJl2nGABoaqCdW1pAI8PSebl1dJogGmKLAKrkjrumnULssmdx4QFBz7m+hFt5AgJuiYmYir4vQWAgQS0T6xdgzmSRNQBPBMXnK8jVioEaZ+eE0zA3df2+NQ3mCcKaVMKGmO80FXrE6f6z9K3w5oc9Cwis9TEOAFdzAY+IkYs+H8mEHQwVSHDQdfo0+RV8q51pEoB56OzKPedGn1LiTfzVVLFiRUsL892tK9euktDnnZ6y5sDLNp6s0smDOROqQuLy+R4VeyFM1O0ZuEjjEjtQDZ3IobzM9ONmnz8hH7qPU/HYJq7JgbndYbSfRpudqj5uACyys1DD5KRiUvLNWRp0ZzqCbHzknjHZbva6q85J/zWUX3BnTgW8XbDLgpXTojWEKksPOw2zuwcURqsYOW+Hp2ElYJjBOTDjEDhHC7Tvl36ZtLDdB4NwDjJmdxXOXJRy/6y7xeDhTiKaKyeFMywFUvVgs4FEoCnNuhGOpcFUe0lHuYM4tp6KgnyWkOWI7uqtS1uXmYTJATotOXamx4y9DkeXYDMNxl7QsRSEK355AVwg6+iMCEqhzk6C5sr6rVOgdeoEiH0JEh4LnR3SbfrV9XYF9B0/BmeHqkl9Qwms0NZOuxXiIEaalA8La+NIuUhkI3OoHeNebAkcoYDI/SfPZZ9EOGHBrWp9p/heqrEY4v4TPOvjkXpuXmgasvMuxzAdlNDsrE3g/V6ltJdeP+KAptIRUXg6dPMJ29Vr6PRhcoahP8MkeBjBCEUeCJYOwAlbp5E+ZPBePduch4iPU0kfbWZIOxNW4WDKvhOcHfPwTs1xfzyTP3sHI5btb6zwSpGcJ9PQbx7gLNk3pMe+BCoWXLBtHO0r2TT1P4YJSxSJ0iYODzjV43LRSD4TuQwpKqzscIdkpn8rmqrk4gYbFAcX/Rf+OfQApY2yEb290pEQNeTGm/dQauEqzgrlKIsVB6g9NxQAK5SUduP9qC9CppL2SEeJgKK54ka2oWDi0vMuvJvBpjaJ9AuHv6B/NoftbN0Qb/7tSnkFAXsnf3XmCSmLjiujbEDku+63eGE1kEQvEagEsSqSktVPmmHsam4rXf3VGTR5GLSqqMdWBzTXM4PUKy5u2DeAqb5sLYGPy3VtytuaTkXVAhJ6I2/AbC63Wv6iax+j8VeZOhUQagUqCH+GjmiDTIzeTHsJ4e0K8uNXZMt/bGVRUJLOnb4YWFPyLEnLYduFPnRekF65cfuwTbbHEUAgr9ZezgKkAygCjF9tIiYmdqzEp+6jicW9Y4TzJb6tBxsxKjqe1YAYhbEHwHhQlG0oQ8FdKUB2FWPu1uyL+Ttht1MovhEspDbYaTmKUKtjwJZN3oBvza8UUXbiLaNEQz/e+xzKJGI7cMSF2IXucOTZ0LfTZ+ESrUZArtH1HfNOz5vWvXGVYtPvqPXb3TVD1eZwVxRaP37sC3XROmQ6wj6oEBaPyGCdAHZpBjmJ73ew3Fj/z/xY1DCTk9Wg1OvOU5nIlKnAK7g436cMaOPSz6bB6rwXPVfK/0fQqW91hXp6LOW9/Je/qoY4Ur16LgSpQ0GRkAm22tFj9baZX53Y7BWo9GGWu+rGWG/X2CUq5wOc7KfSJjUNSET99xHqfDyBXrCb9pDONZfyc0n8PcvnSSEtX9bu9Ou5fOVo5Njt96lRNikGje2j6K8EHBWnvqKwjcy/6IlNQccjhdY2FcAsAz44Ecw+KDPHLpjNklqwlt6SBNe66RAd18Hd9o4JwaNx5MGlzhkGr1JJ/GjslqegS2Qd4GiGI1iT9b54H/hMHmgjooPaBMIkopwOLj39LJbr4R9z5aLHO6FMmPDeIPfc3heNswwacJO9Zg9OMOO+R+AA52IXGyD/Qbh1H3ROqaxN1V9nTB1I8Ewu4Hc/z4L6LYvP5B2zQLmRyRElqBkbgeM1FUiQKNnQsF8EFFVGBy6Lni0trh281nuz0HkM7b9IrXVjUmGvAngcfzxi/J02QFta6iFB0Lr8Mik2J9MtkqPvUG4T+FuSTmndUa9T0MGpB5JadlkgOhmTY8UUd6lx5+Yc0PbnUvp/zIBwZQvOC3JCho1rBQlINUsIXP9SDbQ26SYJVLlC7WOhoGjwdy4wSYCIZY4CR/oaTnc5VymCGOri0ZR1DqnFx9Z/koVXYcBfJNdddlJR1WBbhUOCcfU/HciQvzoER6xaijmzllVCFyxhnhWcMtBuViyJpGBVRYBj6kitjjBPLvoCKBoYrn0VwjCPUcA2JQlLl6+RPqng27fLdhfSRHcUv/zNxi7fZcQN7Zep0fdN+KVggj+tFNUdWL8aAQqzQyHmPBnNeFJdn+11Oc4V2JuoDVBEpyjFCkaMA6F9qsXX/RQkdBiT+AnWdssx2kTwcmrdbYbcgjeWpfgSpquT2StXswcby7i3F9ismuQMNUxIEIQYccpfOtTtL9f3XivYgfjnVmkp6bwIYfcuLdNzjDlc89p0giO3VLxufboihV3tythbCQ3te9WherywYcL9ZOHB9ECf2u96HXbBSkIi2Sqaj4ISmL0f5KFN07kBLygCtmqjzRr20lun0XtEMOaolvLjbH2i5FZzNtL+GcUhVRbGh5q810KLpBrbhX09pdLaOQ0QgKh2DIvMSeDamPEI75omNBNrHFDg5xg93vZFFFdzGodLTp1NLuiCR1prs8Ou3BEBWPxzXc2SvRnjPee0jVP1Mlf9Umc2hXxFoQ3QV253j+Zpxi5LUoWr8DZm5L627YyeK8+gmhokdHRZsqgUoaUcU4xikoyK1Kp3LpfYpwLJ3saiVeJng9c+gObXzcZOOIB/IO/ilKVGmsl7BfFWA+clg58hNJpq40FDwjN1zMyu3hVie9iIj4bp2jfLZDQSrI2xhikXBHTln/aVkuXr9U2V7ch6RcQXf50rOPFeFA/w6elgvIVGzSPmL3K93czNQkHlJwE0qMGRAcQ2O34kfGObhDVu9s2ZBVqCUyNC0eVcl2U/uxnWwhBqpJKcJD8dbhJv9JYKsOwWjfjBDhF6xz0j0gQPK3vbf9GQxcHaS3X3tK366JdHFMBw22fOjby7LZpRGevR1+jPWHzPKFUI0Pdrkl5qTlLpSmzwL6kKKE0m6sgDmVPPubfe87B1A5HG2MESSK8hrAhveg2t5vLCogWsAdILAGe8Py3W5pOB8ZvOrGDNQ1myxK4ZbfPdj6eTF7w7bXA/5NtDO+UidYPWQgcvDCaFqPEl5Nt+5FamO1G2pgAW2aiXuvbjMiDRWxUZ7YqOYsJidMWn47mcq78qqcA6n9E7hwcgKkaAbS51O2h8tFJz0kH0kcvag8Cr5BaHWMv5LIB/XrPTUv6FCYHvVibtYzIQPabksMIROweN5kHYkjoQKaqp4P8xvlfnAJdY76G9pQ8p+m7bxbhRhcwwOM8ph6GoKDeFLKZF+p0wQ6O6KTbAs1soHvhrShNuQJDT+A9/d0c6cV6ofnVWwtcSwAWh0iESvjKH+Qtb1SxB2/qvuDIHaYo+bsGDhBlfdOE7k76cdn6L8mcyCILI+ebdsDti+cg18dKjrotRjMRvGk/+8jGLtw/EPjMQYXHNSmzs3QKqNBQjWJDum+oPaxJ96hzo6KRQwt15YPR2fokGl+fP0cUYUoQ4FEYQLMvlHPfy6GToAq2trScwPuKkGEwOWDQwZ9FREchuRroZQD3uM4O2ou/KEzmhPkAqXXO53GpJ9c9bkxEcCXA4fmhcRTXRnGJYVbNHkyEoIexVpjSL9u/aMPabEnEFSm3ibEHzEQ3DgfakDa0xNv14cjdTAZCEDJa1FXBmGcs/H94RZH+QUuldI2r8/oXBlV8FRcdXk7YoiAI/ehZLtJAqs4M1Q5BMBqyiN0DmTY3t4W7+mn4Mc3SG7874KegRZvKXOlCJjKB14Z3SuzbsifH1UrGS68pNWpwmBZavTo3k8j5WAD3t5m0Fu0Z8Ajq3rsVJrj3bEFo7Qq8eMV9WvJgFQbL52r40WjslAKIdhkNgPYemK8/1z1V/VXQ5oZ3SDaT04RNlJsgHMw/WrUtY9xOAUk2bqdgxKXT0yo6/4ZgoX2AkSbUCcfWAAC+9hY8jF+trMNNil//9zttTFIbAQNG9My4IH6Di0BTQCDH2yeGZhkzEugvZGLQ9dRZZR11pKS2wiC4uys6IRxigsGGoWuxbeuLFg3395A1u1jLlpGAAKj/L6bWMeanwmwnHjdT47xYcVjJGVPJXQZhH17DS8zyaGpNWjk0CQCfq76vxlY0/mM4YvKBvbPVAgwEIN81F2kX0CJFa90LDG7ufhMsRDlMoobgXUdrq8aqfQ7ZcXKSjQqw6GagNZgjYkTL7COsU+W81Y5xER3DznCElvhmZx+/hhDiQsAxD4w75bg+aJd0nRSTkau50d9qgmY7/qPgYpWHItYt2N/Zm75EgfEBq/H5ojzkepHpLYuTZV/KwUOJgpxoluFNd/crK3Og5FnkqwKm8N1qjP7vkNrUbw3fpsYNtWO575mMggNZqfREfFd2s5g5iq4QdMfcseC2BBNGLzG8q8mWOpAGCJ6tjfj0CWoKE5QiES6baZvWEUY5DvDQkRI23JHxpurx4m1nfwkQ5gBJe658fIluOuq5+T6pWDoqHsJsXpPybxlCu+MAY+mdBG8m/XFzFxiXWbIAMbNthYtqKaHm27zuNCuPUsWdRAn8TjGru6hmBq7qn3UX2rZqvmsypTsmjRLOXrJL9n3lq92dskLHC/rIbO9IalmA25FJGn8twe962dAlXkk61FEUsGfcJbGfzBGFSmT5SiDS/jOWyRs6F1QJzDPl6RFEDKinIj4/jj0mC1r033BP3zPbUrRLiJlWJk3EutAPGShg3VEczKlX8fQ74CbzIcbXoqr9BITO2K+hl7vxIWjOTezXZVDHzRfWZ1hKMmAz7gR6znXHLCmh3Fb20kauWMbkCkOJyjL2rErUxHC020SAIskRd3SLpvGdo9SSQU84CwpELM+MDyWwvA1COGudRGQ0dm46kwoFfkzsJJh5W23VkrJKLOfmtnLkVlHo/Dg0qX7i7qqqxYu3rSj2KwFJDS4/zM5vxYaOMLLSMqpf4jnPqxb71hHerbhtovvIekWtHyBvrmG2USSvHHVOD7Rvm/QGOZFWq2iExubURVDkPO4YBmtT4U2Gug8+QLKCW1h2ryTtOqCjmchFfu0TTlQcGKxCqozNp8AhC77eDQQd30JrNS9Q+1oq2pAECBQ/iaiaTAPLQNfJiWExB2ZBG0qZOE1rRZ/6UR4A6sYB8zs4xciUjNsA5+kcBge2UJenrKxMPtE56JuIZQqcg7EXwRBItnWfWanDFHJZyKNk+m1MAChOoX9g7q28yKtyOPSQR131cATxAbIf9kfEVOdzg19xU6FC1fxZwLPjySTuCbwcdagLlLeTg9fu9LmB+012S5ofO6ozoLhQDXFeESRAP7kTZ7BNlKZItSylC6H3mbTtgCHfraT0l3gE9HuJSZlGiB2hhzhRBZYS23yKtujZR4G2wQoZhOmvJ325NrVzeicV8Xlq+QJpb5Uddv40EI11oXFRGa5GaoP/43o/cVg3ULVcyM84r0H0KUU+v64m4w+AyYdP6FoK/1EgLmL5Fj8w8pwcr/d0/apJB7DqQtaTdS3JaozNOWtBQoNwu9PID+FXrJhPzxTS/Sru/igMUSBlbyygBVkVvApguk5l277lOaSEsUBHgGHo7lARlpwZU5DcpBzxCi0hLrZr99VVfA4PbPlmUk1rJXWDy9t8moCBrOAvB6PlY/gfKaSauZ3MFaQMIqyjVPPrhuajzqzl3El1sFd45kORJABOfQ0UG4CsHkHMmle6hWrhO4BTLsDPkab28pM0yHMghZl0VC6SqBUWWnz6MdYR67PllCTDg5TJcUVplQBnlt/2ZeOmgrAszE7v3kT5zHg+yv3YZm+86CkJMOkNJPxknQtbHBJU6tRNOIhtMI9Ho5GybyzEASFkzeyAs4zSVO4o0U3kWDPi8r6YihOiu9P9pqZTS8v15+atklF4XGiMOtt7DnaDSuRrEPdZmdRUfO7eRRBe1PkA6/Uc+VtfOZRGd8QVvv9lHMXOC2FIMWCi1yE6icV5DCYHot56oIhEJZZJYVm29wkw1QBLiHxM5tUogoHz8/DBB04MUh6AHeSzMPmEFe1KHUd0kcfAGwqjxshO2JLQ65yupAgD+wkAuMGhk0idQSKOAA1iywHeJpEO/aDi3jdu+w3slMN+RsrivTkSPT8cdnetjNCqhEZV+VePCobjc1j4/LB6BZC5QfAD2Ct8hwbf+BRhaQm3COojBFo/jfCfoKewGlFDkk2KDjrpLWPdMxqRpCQdnWHkGDoy6YF3uDulHX8UxbWpGkAhQMLXXqM94nT3VvPwLpUCr3AW3M21JBxTqCa0bzoa7P6zWFOPCi4rQZmqhNsCFSKyjc2EtXKiT1BnCax/62n0Wu5KdYNtNXpVVJ8H+om1RG5XxGl3k06XRVAT7pdoMHXgMnVmi8gRrFCs/6gSOcPtsXWGZaGkzjcTSpmqZmE+huCYq77vXLbXL1+poCUAwDNuUGWfkXIwZLu3TBJpiv/mZpYlfdUhsOZvm68U3gxD3xgQalWu4vMhgNgebmlRwufZSU9s91C0d/QAyhNhgwzDl1ZO6R4LVlGSA0hKBfHmJSSqgTeaI0svjxP7YReDBFuCBZj5h84IhwJkuVDkv185Bb7Rh4IwgcnLCncOFhkeUHKjFUU+HptuCf17ARX4c22gizb84Biwd2qrpjJ0UiZ8J1n4WpZi2qrL/oRyTcEuZRWRFVPmfY7qvcaACT7frTtI3bDZuCDOiS8AOkAmHPXhUEMvkinXCAfXsktCUHJwZHPh/c/kEjhXDwXYQ2xjhnwM8w+kqakHxkRVt37Als5D5PftlqagFsA/J0i41skpq3dmGqKxzRh/QWkQL5T+cdDmfvjPccI+Uzg8EgZzBTO6yjusvc4j53IlW7dN0CPc5I7QXTE1SNbGzbIQg5xnmmUwdvZJZ3pN27H9xAdnwttHFI5kMoUwTkWRGoUiRtrpu7DUhVI2gSOF4HTtMoEngIbaVzs1mcK7Ns299qwdBg948dYIx6QdOCaX4CN3GeQZUOkDjSHH5ldq1sDRxNv1mkqlxNuJmNXeUmjAHja0/CS4fcYUGBnPztOgPstWEtj/Y6BpMoTd/I7BWZ4nRW5ogQgIsMdx2sO/XEnEBYGOadROf2aDcI/4iCQfusyZsQH2jQU+uVItFTq1cHXbcRAMMhetoQ+rsfqmG93zMvzamNCaZ00Ry0PAO9ysysWCbbpssXOytVnTHBwU8DoBkAELIROSELsJmhZEKkjpj1/Q7uVaabkpYt2Lol6JLaagnKBhOrcIIkQK64d2ssERIX8rdwyBRowAKRe3gM8rtKrxMLED4w4nxNsKtgBZj6tTplNmiGIaCkpy2MRzynEVwv+xBSZXS50MrVRsiyxKe/XlSYZTdOX5BHbKjaHW7fqhMZ5EZMLbPG8QsRQIiioBkYrsv51NG0JGAyjrGKT1UbfDlrtOXiK+2Nr+GuBF6DUiA2jFMOVR56sOFmadDzYMP6LdtY98PcBleB1QfzXswu00KJOyD5UA/KaRJp/+NqJ3/zDsW7q2AkKPVzx42eTnJ7nbWzQ5sgNtButtqm/7iudN6EwzNmLnt4xYdo6/zvzQpUKbabWhIXXDqEJmirN3lLc3bNYSeKULD0JS6nOFI664Tk3UegoIqXVuPiM1KIoiEAkv5/BMcUxWhLj8o8UPhc1QVyTvY3CWSHhTEB3+pp+a4MkqBJdpGpSOS82Vd1ig3YYGvPCBSZhdZk+D+HhTTYKJFRdkqXM+SN7fEwkd6Ex9k/r7wcYQ4F7svQ2aNk8Qv2OhtpZUPjTurbSxpRzo9fhT7kjIHtbG1Q3BGQjnKaFKada5TKHynouFltdf48Pi1hdZrLyLCyfkOV0qIKLaGyARZR+xsmhSj9xT8HzZ6rEaHhtVo2CICwj5jcdX2555Y0GKZ6pxpkeN9wWztJRV58eDxMLE2aSC4DHhLm8Ay+bAmEXJmFcxvltdNS1fPBzZRjgS+qandrUF5rKj7CR35BWWinWOfwi4jobOxOEexgHSlzYJEC62VU2PhyJeBssXA7wUzjRvP0TpWk+KWDpUVpe9wJuMVgqqJEPVDyOZ9y+QJYI0ukmxrL2MS0KtyhfT6J/d6zql3x6G/Xc8bIanNhDLzukWOWO6+WZumC7Wan/mPXn8FDtrEMS6EinQOhdeG3tWTbwJ0UQv3Tl2AA4aVoGOQJUq3alU5KvWz2Qbd5mtuKCXOPOaVCWR7nBkehi67+g+7UDnwYMLiXF2/QvXvn1uipP87Mh+IbY0GifVh0hVk08uE5nL+IGDTU17DA9QR3UI5PANPzr3fJLhf7gPQjXSeIrUU0bdz8Y9HS4teAHqjujWVzAWjDAw45hm+Wbv3cRuVKJtYAMDFB8mKrie5e8Dcn9xm8tCK4DntKRgoh40Xacr56X742NqDvW/L+JlEUnW+cLU8LoxFNsMFXFKeJJdFx6InVbwWbbXqzUxE/m0s0pZd41la60jhYsfUtXH9WiIL0Ljy8ZuGiE7wjyRqeVd7AK+IH/Ga8iiZvDLQ7RQ8AnOxTF+dj5Ae6Lg7mevGCpHyp9kZFRpBhwe5zPUUGy3WxGM30YvRhk16h54EFmCqBlLBSIzGcXgcjvO1lXcRWUqPVNLDSt9r86hgXHT8TAy5a52YYjhmEvtAFetG3bFmDbqKkFLKw8XsMuf7xhUoJdH89SUBZD2UJ8/Ljns3lB/D+xVAisFLYUkOfx0B/VjMkv4FzJCCJyTlw7k2/it9j7mlpW6+4g9ewCmFHRy3TwRlRPRGrk8dkAUM2ewTTLWgVw/72E3Sghths0sb6SogNQXs0K0fvWaDPbFQTewnCyf6x/QT99owPZ2S6Vfl9z9mqWwLunsZfBfPMHGYzpo0BsKXZZ74XUByq63unckCXwISIBe/Qe/DHWhFO+YnYYCg906awq+ydFZyACSbC2/WJ34GBHIm2UM+mX4h0o5XPNUiDpcG20+nT4igoOzX4JbjZ8wacAUBRRmZyJ6T1A2CKV7lNDdmBtDdVfSTXzlMgfFoAx23S8HkmiEgla9cOMzTbR3KvU/o8YY+suQ7mTr2bBY+X9mK7KWuHH3iDH/UKSAuWkFA+vYEo5vdqnsSRBw7OLb5exHgw4rEu5JmQCeiF2pV/eIn+DRTgGk/KccGSgNMrexOR3d5WrI3vLXLT+pAxubKDk/VDUWkof/qqEYtmncBx1roib3/ELsTIYCIAluSGjqHYUfKmiL32eiw8ICTghh21TFqPb459DA5atChfc9ayHiQp/IJi1vGTMFHhwFRuu2DAFeXFULJUnbuMdXLWfmMXGf8adN0laEnWWOXa5bmTjjfqRBMzMeU//2Of7AxS/5V0QysOQOTOmxAL2WLu0LYTO8Ayn1RoywnwcWRQZsh28OWaIhyIYawHnxWOi7lYVAd0VSP0VDkBoh5IvC7CMCGKeKI7dfiLYDLUp6JqteaMbSk4OG2FGM+nehPbZfo1rBNwl1q12nuB9Yyn4tUergJUpAqJpg8qTdy52842RGSvZq4g4y3xOC+FmiAp5P9F2NZRbReZPyYzLr6mzKl/YkGkeGTHDgn9sIkJTC36Eu6Vs/8hbnKAVtQCievn+2XQJHN4Zn7clph7KEZhhduFahYCmNaB7egak+mCiNP8cJIX2mQNtQ+u1TyzoDBLAVn7ogDBhHP1E+kNiIGDqvCq7RNz88DKSzBbyLME7+m0QC3AJWwwTBPptOsHqTZ7QfPb290CnVbMQ+w4XxpYGBiy26tTFdl6Cmk3oH53466P+rTEte30rinuwB/cLh/jvFjYBIbUGpX2QUowzeNzrL+NS1M922/Am/hHvTwQm52zVIS5w9XP4W+TDkCJTq/3tMc9c40oeu0xQayXNWjbC9Q7iC261Qt3uy06SCbk0sMNM2j/29tirSQMcmiJS8GAdkDulf4iEmuBhTpur3Dgd7kM8C/CWRqCxoluFhaZAY0BLVk7t3Q4QdjUMNeSnFCvNCmnsePw8WAYdn75OY8JiMKNxIxLQz9Ykg2YCXiOASi6y/qYB45FYaVPCyZgsH9G45gzMC4ZlbGjJm/0O0jdYt+bVjr/QiJD4YZLXOg2OIm+teAVqMsPIJPha2KdEbopUpTo3qRgBhOGwQCrYRsA8KHCLpFNTIlQN2Hy0EsYlzAZIA2yvP77n/GEUU/xCBX7uWxGkZbRovmZoxrEYgFemg6ra5dWRwBLf7W+BhYHcmIIPP3HjFgM8A8J5RLvjGOiEjFR9zIYpxlRtVSztb7vfOItXEuG0/DGLcMPfUevMALARVM+9eP5j4f4NhkdglrVDECr6jKX+GBIYF0nrPUs1qAOraOdUH/W2SoKYCnICCsXnh+mmtXJddforKQ0xqQsDy/6hXsk32fYJJCYTNRhR9QEZVw4nfEd/SLATyViBSUTEUiF3x33vHfaxZFQbmLESMEv5WNPaeABg5Rl9kJqQqX7uiP4iAQFLRELLwVOLlhTPt5Er3wpFn57XLhKbiVOwbQVYvblqDlVVOtqj4RClVKcUHN9Fl7FV22IVz7OnPSyHVgLXi4rwqVQylGeBLS5kpo8eAZ990Gi2UMkS36tr4U6KaTwkhZUTrGgDU3Cssj6SLrgv3CJvbeFuuL0nVcEhrpzYwZg1Pg+YdFB9nxhy+fsvjpJZJyiX7cIyxC/SRhVeysnLvm1/DPPLn0ycwAFLpxBqowQaTuP2k0J6xg7CR5XUdSA79/9G7qKS3A2gDUcny78NjBaw5fai5087N74q4SJZoAwMYnJz4gMBcsIi6GYq7uV/nQ5pd4+VAkfMemiJXj3yDpt4e9kmz/2yuBmDJSwh44H2Iir+fdg1ceJNANJ033SLeFA6QbbfmDFUGWp6lnyoQWvYeAlZtAR4mvhaXa8BmVqIYvcKNdUAlDf4/rdI+aaNygDK0zdrhr+nB4eKmP1xWy6Mmyy9pgZimdfHIX2RfahdXd+hiRz6JgQJjLjOZuwPTeA9szehR9ERoYENatl49Z3MTReSdhAQOillhJz7/+WoXzsZbBDqcFI+UxCldf2GfbjbgUTT2kgFt/EAivVACCwYRINxVQsX0RdqjEryLjldKdN8C6zpGEq2VcIUrjlwpWFhgNsNsk2VsM0qUT1d+T6/fJbzDytibbEkGbeK6NitztaywU+GNJ2ogGmHBlJWfTcxCrlRQnWBXSsIq7r76Cfh1z5DFBBc5gEh4A2JbZcLUhFUfFLYz6ezRDgy7Iso+SiQWjhQHRDvhbyAo1qyFpa5QwWbOSkisNspSR90ik2PdMlZEtviTNE7fEyXewGnmm4bHpkYH6yiBeKH2/k1+D+L0hIjDvdc8cgrOVpK4bEWE76xNNd0yWlZ0A9YxwLgKAC5SOACHb+RkX3LigkyCmajigTEF5gDARx1wd35d/kRA2cgGQAqE4yDpCHWGflMfW1qudRPLy/ME+AyqLF1Ifn3M6PPMtcz+jSbCqK6lpDzEnI9jvqkgDTV5m1kkZq9qY6Zom1R4g0M9hR31s/m3RbM0PUAokFPGJK7hslL0uv7odxHOtbNxofFsQ+WcpzrcEhOA5iifZ+UMrEU0spwuR9FSaPGBWl7X7KqF47ne5oTtJpAUyexgW1WDYPYTW8RP0q9UVnTwAN2qN7bi90IBWIWT/lBiYpAHDqqpyvPdbImLJqv0BZdf1YvovzCWg1iY7SiGQgK6E2VnkJfOPEAQWZzRkTHDNPiuk4sD6SHGDdAPx1FPb3nLntLBFkWyDuDh4cXlCi+OE/KyDkCmiaQZu0razEOdw5tzbVsIrWa0DK+SElkS/Zx7MHsZeW5XkrQFghiNUCYQeHRrXYlNetV9SgXjuPYaD462UnkLAwbIdcj4rXmm0UvGSCAhrxTg+kNT+w0irv+VPQgaX6kag6oEFhuM0ljF+P/iGvLSQwwMi9tce4O4lPTxhdjVQBSf+N6O97kU6tZD8NtnAz+SKtdrjzSCxImZig3faz8uWYgNdItopS0nw53oU8a3A5JOpx63HGQZRIsCJO/w5A5wjzdCsUfVdx+ICJTcuuJcouSBnlvKUTB5qtn9O9JztbImCNewhXttWLrG1H5sBEbhCRZFhmO6W1DaYco90XfGD872hfu8i7wdxaFOesxstPa5gI6vdvOtKuJl1mU37Piby2DStOVuCNB7S+lYu3CfFOOduaZJSyjQHOxQWpXtlIR9GJUY8TeQBwinPsTTpPG3kuZg33NZT0zmKNqef9tYFFwdSRY3i5Vk9ZMhu4BnfusGnHCYOxbZvgs/dOeFDmnaQrFM4yFXkBHtwFCfen/JFM8ma06V6GP9yQ9dTohAQGvvOViZuFPZMLUuLBwjlxmP1/ba78tStVhwXwqFruI6VaOlYpwC9dUUaTYZC8TxNMCiJVCsCZdfNXplZ39RUkp0I9UUhfVO5QwgPhFZfJoO2Q+g/3WY/oawrCUBJwTUmCB5kGnNoTcvC56VlvyWy0OBWO37ehs5pa4RVk4vi+jJPEgmCCWYCMA0iNycepGG4coK8KktegG4icVK5F4X+J1P3X8n1Xz9MI+54MwMJZU/i/bqAymTf3NXEv6wdp0ck0jmSFAgu/2TBqrT/+agIpT9WRBKcy8c4v/Oe1KAJtoEY0YRKMYcKBEKr4L2FWuf9Z5q6Oy+bZsJtinO3bYUHIRA5JajNda+cnURRy50imijOsFBxViIUJAVGs3VkemAM8QFPHU7Dat+0ngSe49glAA==","padding":7},"hashCount":13}
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_0001_membership_test_result.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_0001_membership_test_result.json
new file mode 100644
index 00000000000..e93415cc7e6
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_0001_membership_test_result.json
@@ -0,0 +1 @@
+{"membershipTestResults" : "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_01_bloom_filter_proto.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_01_bloom_filter_proto.json
new file mode 100644
index 00000000000..0cd630436d1
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_01_bloom_filter_proto.json
@@ -0,0 +1 @@
+{"bits":{"bitmap":"wjjTjP8wpopzOI/yqv7aGye+eXToyr2OfL14H+hlkPb2WfXNqNlQUOOwwYXxBl4+lY7JzyO8b8X31F+9nQ8g5dUHhH8k4GAfjg0i8lSGsmbHmVqgyKs8fs6cSpeds2Powb6/e9VxO0y19Igm2gYrRpOqprQ4DkLVJ7ylu2LESWi4Bc1Xe8R7Y5LV1Vm/9yR7kEEfT4KDwlPwsnG6IsjPnUd7Mwyzcs8rrvafbURh/+/8QBLirqF2WAR2RWwEypM1eTQHyYMZ402Oekhj4HiV+Dz+knLIHPIz/ZQTT0JWANE0O/DE4GLTrXKz++6Y+AaReYjJzbl7UxA/7OsnmW/hmYvNKthtsEavS3+lj2w3XWAnVpySsHdhPj24MXlU5tszafMSQn2/fJ0q/JU/b15ERcnIM92U+8uXaTtS9dt+TlHeV87pxyGdttyJo4a99y5HEuUe/Iq9VI9fZg3gx81bf/SvlCcrsdsAxGMYAsceBLH8pYEEoIyG7Fv+uEDFNNv4yLd4hCWGULE4kzL5vhRs7uj1LS6pZkAqMUFq18pJCLfkmiXqBUpCPFug6VzTCVEPnyTQd8dXCohIxA9nD4+zUeNBh1N7u9s5D/VAfLanJnOnTy7hwfv3Mu0VL6v4Mc9815H3XZy1tmXK6rKBtnXtXOMkVW+yKm7rX+74XidBqukVJDVXPNG2qJ4xsIU2L92UJX+rlFfhcoIz5/m3R14Fcz9ht7epB4U/hYXdjxDnhrsIelCe0RgSboubi9Y/h7v8cn7LTeD9cPodLzxdzoslQOnIibkn7mC82KOUyVp653obOfjgdX1oXOA/M/JysSiyhtlPp7l7nw/7lp8zkGfoRs/1PQMrnpXorJZIj8HnFdfKM7vM/t0X3PvZpet20UyJ6LTu1qQ8Y1zR4K98bvkcCZVx/gjRiohXYvbUNqfyVyVRpWNTeHfqSUJjm+PkABLxBBgSiF5Vf1nvCsXfUhxAxhAUfIoLosWsrRS4EYCDoSp4VYWY16fYP+xxonln5DjtLEjzsJkfi+Wk9lgregxTcXYRMsLKfS2UgtOiJ9owBIfVOzK6NlRKeHklRnc/oEbcT+ofB47xPd5NfazvwqnfEro/pgzIY7+nqpwdYFqX90CHLhhtNKEi0BXcWwSoQmXhlVy3azNo5pZAp2vsGr3HuF38dO8YfnkMEklP8+45eDUcyVa/T1xfnu/Fl85SOA133/1+99cY5J8YMTKv1Iv84ye2Vq5eZZOfmrZXkIVrMN4xy4eDGWqa7Mzb4ubNcFnmMJRa9VsuAtD1HGmM73sX8p/35vQcokPAcjXDm1oo0hHye6VCalxm7AgcKe15EGHmYrSO6sPFa+chp58H+g2954fSXEYyv+ZMmGP/9PdBB/2tWV4PE7XizvmwbIVtZ8Kr5iATxRfwhQslFbi1FvRIwqqxEyxVGzRjMJyTW68V7d1cZ8gu4oj5lmHNPNR+/PQE3o9OvZI8OwKfBUbtdAur/nD5l/4Tym14L7vECzjGmFmCYUbSET/6EQoPsHcNgdFHDianZhcaDMQJqneff8scSGt8aDfkOthW7sJV/oJzplaWwPjbjqntsFjG0uoDMfa+eOjssWDx5urnABHfzLhC469z8MX/RVfQshfrFBpFRQgnBSp03P2YppXl1sWnO/bqo+CWT2aMC3V1//xqmHxOO2HFor6f75XXx6TsLU/SzsI9wSNcjzit4pXxR5+jeYiz5gel/zk0wL/Vj8/vfYq+93kIJO7DMzE3F8Hx33vswBKu6AOs+cfQgNlEpQB6y+umOY1AVzFgp70bKOp28VTjifqLo+HNa8U5x1gTkmgWTPfUU56MCwpLSqUmiCzgHITmkF/QUtQzzE9z+hBJD2fxihrFE1531/XB+rdX++qOpDaFs1bsceq2X01TivQ+lV/bly3ksxxbAiLYal/tNIWR9clIryJjzTNdTovgvQCCp/fPBLPN7qVLp1XqBnLV4vbYN49PK9Q7c1DQq/trmroOckKxyH+5lzHQs6pyDZ1S/3h5nw+jW56nmjXjZ0+MeUinoRjrrqqyrA/xt476DgrtK4+/n8JWG2yAxBfRKCzv82dACs5Dm8ztpaLZXtDssJR3bjFxkMlySP4BZgA0bAJ4SKm0U1Szy7bbQP1XlMb12hAujwvR6gUpfy813TR3nv7EJUfo1HGeAHzaWYqmojC9JPGeFLKBuY44pa7WzjAyJt8LWsI4XRsHXJvmorbZ02vyOwNtzjD/hudTuTSetTLp6Y8AL21tCM5H9Y2wNNE2XgkUxYz/lRHCtv4Vj1H9LDJO6XLidnvRXP3aSZBq2hiy+3Ovv8RO81JW2LDLonD+7fM/ATYS3AydKXeuTDbcuTFsBx6J1Ldpq+WeUlJ3RFeRNVjFiz7FxO1Rluvasc4wu/W3hIljqzYqCV0+3FHz1uZMMetPhGPt4nDbEkVFX4ce/zqgN8oorixEqloWEksjcVG4ow+YRc08zasNkAqefaqNskulB8aSsBbW4uC14n/RtDLM3eoew4pR+6DmQvZptDOU+z4ff/Kr5OQDdalsVkFfsusLt9yvbx3zqxuT077cCL/IAUTq3ff0WuvvCkXypLA5AP5xTDjHYVivi3UaCfjXvdte+f7lIlPUUjoBMe7l/d6t+rcf109DgxDu3fX2nCYJx0sGzwAR9I2XUE96kZfom39I861Hmww43cusnOkDRelFNUAU5Dxp+RDckZ1MYOh4zDTSea81aYQo0mR/6bR6KGr8TJcpT51sXN31ZHdrXFTNeO0Es6MmK/dlGUS9hrS87LtjxSig+eankJ8ImU+v/B+iiJQshizJ0/YzfTZCbuy+Z+DctBqpEAne08s7kH1aDP1yMXqtxJywhxmMEb5NalyC6aIcPpjFeWFGQxwv17KbVBcQE3VfDKBR2B7vwP8xJweazDnj9QJTeLUZwC6dtDRfbqvotlf8QYc/+92Olma/AnDOKqYzcibxxgz1Jgo3fdvhcyyaQRE9viZVh/8HDnKn/GUwVTkltxGC/a96PLxFI8obVVRuqzsut7jntAh17aS1nfStl6djj7u5vsJ0m42ds2Kt23aZoO1k2tYBX+5qYrcDXs7KbTN8wwrwuD1qKiy9jqhtnhvc9zvrUdXSwoCC1ecIsg5uhYaLzRwjv7o6uQ0kAyXKuek/AT/TNJcI/r+00b+qcXkVD3gXPVmvdiGkY/lA9wg8fZZGpVHI8gNFdsp7dM3owJ7dv48sH0iyIPf7xz5tGFrc7q/i9QEyMHEB6JTDOaThMM80h7Ekrv5Uwh8D+7jtxOvvntTm2LZbmjXSFNeJCIuqXqJVEY3hbzX4NZ8/c9sfuQYI9//6lUMMN2IzaochC6NA+rxj8xoLOzMa50ZKkPn7GpZ7uo/vcmimHFn5FG4dZN5B6Z+3eRGVQVcG5Bd7zE2VRIB5fzk1pYomv+97077LmvxVOp67//q19DSiNQ4p1t71kRmTpvhW0JWW1vsf6FzRhY8DIvKmO0iSQb+r37rLT+3a2xIUlE+8rO43SMOStRC0txHckXai+Vis0UKQFXSdM9bIo1FpJUNgIYMPNhr4M3zI+U+Rjj0p4IuSgCjEegz5Pn4v3aNakr4JG6vrpeLOJ8xX/lO5pABGT6Hqr2QDy8ZfdHJkhq0OuB2eAUivN51bRruLTK2j5BCoqsyh/hGCT+d3P2recWWKJ07kNVr2ti/3bYRw83WMifqLiPWZeP2+wvXNmDiA9XPON6V+osvuT6yGdJw6Ka/LEhXzKS6bW0XHH1KAjWkve0Zvx4MLjr0O4LtZME9y5xrcNdsW2fvR0unoPNlDoi9YblryMighhu1eK8R2TmAS2d2YLNoZaJ36f0QLp0yDbJzRE1N5PMpYNdjqPN1IM82haxXvya4xWXnuhQf0OuqMsF3K3c3YwZsdZ77UraB3ix83WxqXv/mzo6my26fdAGvFCw8xun3lTMMTzvyyv4eZWYTIWrau8425d5lXAf5pGcI3Vh/QvZkIvaXzTzijrp3tvvppD2lR9cqlk+6qU/LxtLuS23bSfQb1fBbv2b7tFIGSWMy5A0WJ/SPDZ5iAoFkd8QxndARUKeuZGT76n9hbHFr1sb2nVP3f1p+gEcvMB4xDDXHv+W+1giCaGY5Df1/tq7foakq/yi3bmvNTvCUyio7cZ1IDtFzW2yCAvJ3FB2MMemfXaJlwgqMKrovylrbiANJGf+XxP+TTziQW5g2+OXF7xUC0nTJcykifC79UKwegNxHKc45G3m5F477GTpWkhMD+xssF/jt9+ijXns/BPyMSd83lk3xa73/5oOZH+Z425xxvBpntUjkboEwmGdcX0xfiXdhTtxRiPmv3/5tTS+2tWVV5lkTCW9lLBL8g8v/6jG4159qJyMaIoT2bS50EdXdE/ydu/pY1MznvN5cIiNZ4936Ss6ep9Dh3teqXfgtNQM683kZav5ihWu9KOjdqwyfcYrWums1e0HR8kd/UhY7DXPqpUwbT6WRgtZSlIvUq1eW0XH8YULnSWbCubsulRDmPvfuGNVH/l4nzzV1PQe0RbmQIpwOcIZBEdCYTa4n1XYaDA5/VcOahJ5blzJ7DxzQOZlA9QRaXtoXg51527+b4YH7q+E1sgZTyFtvw/lbuRWn/UcMxutffYe8dhE1lPj17ZT6uUYj3IpNWzlT0Q1de6JQ4iFu/glwY5cUa1BfOCsEaWv8KvTA7cIjhqNvj7PbHSDiuqzVNP343qWsL4PJz/uuMZF6wfW/cEcRfQC8rfBW0bD0KnurZIdq4JjjndnbTO4o1bLhLlMsbeLXFiV46836dc+IwpZ6TI/GSUZl51Wqqs3UbKhQ2ZNqtCCd6S+t31BWnjz6ri3N/hdXRMU+WugjaSGBwj9/rcF8tK9g+bnDMcsVpceBtK8jxeMoIIVlkic5rlOoUlN8BORoMuh/umTZ7Vcqk6eSi6FkoM25vb2tWsH6REGVSpu99cYWGwTdVGJaNVoOrtxv5zPuqIov//ftvnhmmoadCowNWfJIHg9GV5LkL0iRLi7t6VEv1Ebrs8OWaEh2kP7HizvqU/H2ueLKaTgEcr/IORH4g2yOgRONKnPOTwKOV7WJDbFRKgnTieovP8ZkpGgTtc8zmLlAojIKAZNOoOLoLInUnp5vaNRCUV82AP8anB3rVfcPHG6jh/aOwOai8Xo1Vvkm7iwe6AhkM+8cptpkw/C+Pc/XAvPBqbMNIeWG7eNsyqnvO0bMYLRMNq5NsBBiWi7/l+jX5jBr50wX2N/0iJRY+KbsmCi67wTfOOtCp1/QHptQw6anV345vvVKbwOzUmgeiYeyIGHWu42jb+VFfp2gQsBL1VsTZYmKMu5NsiElFCU/bjdDpCZtxHALNK6b1Gpjrue5aYTUYFTf/nBJr1lZUW7+Idq3EGJZ3ohQsbW63+2JGVjyjCn1C9GzkyJ9pGFjYJ2QiSqjcnzZd6r8ljiLA8KG5Noin6iyCBdMSWDShPu2k1505R32tmf8LilBLGTFzVf5fol8KbE7ej9XeHpgsG/WYClB7pO8auMaimE40dSfLgVCzxrXMO9NpEwlv7dYkfWsj7NU+oCFhEDuIOHZ1W0oN689ojPzOK0L2ZQG7w/y7DeYEyZxo3qJgX59HPv4LfGjU4Ud9kNuaFy8C667/IDUC7Aub03nCsk4VD/r+WJkZFK00Rps30j6Vk4pWuEUzWVbmRuT6e4ltaz+CNdtixjqRRHgHZquA0/j2Yto8a/xhzwHBAuUbqaZbh+0oTR+y9e+urkm79f10es+64Yj6KO47prqOhh/broaM2BjAfRzaHP9X9v99Zi3Qf1567jgrREm+zG2tf957jD1592PZQMz+Qu0lSSrc2Q7/WVmm3mYe2eVxL9aVqL+/OBVsH1M712QGj5qUxPMHx/IYbu7XZOE9uKMfPim5W7JFmRFM4LhKML0CRdpLyHeULyGGTkoSsIzM2zJKFVj7m8W4FPL1Z+dIRwDpoZ6nmHXLGcELF7zjheBmVC+cO0XNwA7g5P46x0XuQNv1ni3am9duXh6wFXQg+alHsYPkHok0fZcSLyoEDlgucqCe2r/ZQrIZGWr0XlfFstYLvfR+EMukyHiH15i76yf2sMqdeokblPKSN4tF0hKfm0JC84EUxXMYtQwNyCau4ozQ5bfK8ftM0bnHmHUw/uPNSWPaJzbtlva59M3Po7118Jw2tVemKq7eDMe1fn5K+tVWgHXBrdUmJ3UoVz2A5fQzToU2p80yZOP8mDetYMkA/yD8zUFtO2EEd9L9sFgslR0fTGS2u8GMDtQqKwK11VYJyldUEfFJdA2LVaDouj1KnG/MT44MVylAiQrdYlV7EUEJF8gZ6wqib3kyKi0szPUZ7Y2wpznmKc5d8C/HH98Gfe8ljWT48ox6kiQWbUyYzCW79dGx2kkbhtQ5I/FKbXSmTI3o1cFncF12N8Eiiz1rSigcirZQwnOBXcAy8dd03PulOYaiL4BnRyju8tlz2Rzppa2Cvfkck26Pnp3IT+ytHZFAHvLbUVALfQKIUO9MwZj9T8bzi+LQ/sAPLCxad2Sa/f/Uj+edezy0i9gTYPAtK9TO+J2FGznCmTR29r3lyrI/oB2LCua3qxouFR+9U3k3fP5g4XFwuaEfUd70BLqoAvwJHxykgl0wd7Ol9ZZnPwMbql05+Xmtw76HetJHVOrkbBqgEgC5nCZ8P+3zq4pdQzw7EjOOd2Yx427rg+/vL2QzpYnqVB/KNy5lrVJjBV5aMkT6vka24DKaVpH1iVLxIZz/7ySebiUz0RxS/DuKu89zo3x2bMeZ0FkLUs/dX3Ye/ioe5WfPxUzJ3BYq44HC1HibZG0nI2KgFOEJMZxl1kxXf3mZnhZjwHcDjqZA/c3bd1Gi+tQhkUTVPYmUXYSkQGbJvAKNKrKtuD9/hooP3fk3OIXS/djXDPqOmnJE9rlmTwZKuTMApqF1r/BvsjaK84fVG1zzfpqor9TPt8TWH+Z2K9cpxa9cf0jd7mbpL4mtPxVeCjz30039QTf1Hgipf2XhLjBQldk3TAvgty51eh9GiJxqXxAumfH9dl8nNK7d9mKU8LLLS1wEbh6+NWjl8VY+GJm6ad6rkDwbi+QURx2ZfkpX4X93aE8SSu+Y2IRZ9BDpcnoWWVTbLzdGYKzGTfNYQ6AOL1WXwRGQFR/J2Juva+m7OGHawWemnk+zBh/egn+2oOjSplLi8p/O1H/Q9YHcnwZ7xsrSaTA2/aSXM4MZrLOYn+3VCD+ovfkQXzYD+BHT3eyZ/MBIYQApljacoY2mpbH8/XrYFrl78xd6YQVkhPdn6WnJzRtrgxDQhE0WBJTGBL360T9jVaxy3Eu3Z3f8ooe0qR4nhWaGP/3ieM/9xeM6cNYPGP8i+Z+JHRrDbIcrisq81Xn8XZ2eKSA5UFMGMKnY57IezjRdksn3Tfs6ON/8dGQL/GP/BZSPSUoanjZL07wyKelNVrB2E2atf1TbDrPvxT50ZGZmtsD65nGKcwGs9ufLLqOklrj+FAeQc9KWCvcFPPdOC7r1iTz/4ym11yAltdNVWazymOcJ7+FugDT+i+8TXPjhkC6kRxVXcY+VriSdc1TNmc6nTLyCCQVssAJCGdjZA47u26n7ZuTNf5pzu1Om+w7hourA4/N2rq9Dv7NLmsMpNlqd9948ue9QUpc8SUA2B/osHhv3/jAxQD0AAJy29BOMuEe4JAe9WEddZR9jRMZBMtXpM/b3BqFeqaItiXddXvw8i318YLMn5lvIAImw1lzo3Vy7SsQ4SfUoK/lpu3pR4WlP86NkuGVxnx3m5PWlcomdR1W5bQkOcv2XMltsOZrMT99PnbFs+KQsHWc75zYsgnrLLSybb/uG0IdfLyXYByb1Ho6LmO1NRk2tBmym2aSjcVhLztuO5sQ+L6hkVnQTSYS34X8kHjwvtw7MREUfpSCDQZTLNKhxhkdbhPup26rTV7x2FNRbi0FH3MzK94r018p1hWUDEw==","padding":3},"hashCount":7}
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_01_membership_test_result.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_01_membership_test_result.json
new file mode 100644
index 00000000000..416b190ec53
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_01_membership_test_result.json
@@ -0,0 +1 @@
+{"membershipTestResults" : "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000110000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000001000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000010000000000000000000000000100000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000001000000000000000000000000000000000000000000000010100000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000010000000000000000000000000000000000000000000000000100000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000"}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_1_bloom_filter_proto.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_1_bloom_filter_proto.json
new file mode 100644
index 00000000000..c03535eafc3
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_1_bloom_filter_proto.json
@@ -0,0 +1 @@
+{"bits":{"bitmap":"","padding":0},"hashCount":0}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_1_membership_test_result.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_1_membership_test_result.json
new file mode 100644
index 00000000000..d568ff095e5
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_5000_1_membership_test_result.json
@@ -0,0 +1 @@
+{"membershipTestResults" : "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_0001_bloom_filter_proto.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_0001_bloom_filter_proto.json
new file mode 100644
index 00000000000..b206a483c54
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_0001_bloom_filter_proto.json
@@ -0,0 +1 @@
+{"bits":{"bitmap":"vusW6Yc2oIsxmEapab4xh7Qqznx2LAVmFrA3SquH85kFR8l+/MpCIokPAAMuIAmKqcrwBtx/I8ds9Uw9ApHW2KZ/BMTbijPDac2Hm0oQvWFkUjycX7gNQrkjDIsRBdO/IaYDwAh74QwofDQLYxrSNgAdT+stIC7UKnpxZl1tRKTnIa0JQXrRChmxvO4r6WQI9QR76uk55KNZFQ5YmgvT6uYeTafiJEZb61Q9V3OOks44hV83F/8/rgPvRoweLHFJ+ezSJ04P9A+a1DHlMtpriDsxVIAgJm/CKuPkBC1jitppF9CagnLPidC65F1OPSE+8RAzHaEfuic32yNJEuQZfb1hq4pwE62hQ0/ulczuNFsQykikNcGBAWWDHWK4ur6dwjQSP7tOq3m4fLK3xYQt41OpIdPzPfn1Y4NC+BFdKQZUhIxEpTX2TPFoGsW9iSqRvF2zzWstAjcOyvT/yJ36ijEjVV9O+/NWfZvxUft26/NNDRPhpnxXHFGei10qKGMYym/seFr5+Hm2bpczLfpZtfQt/IHKg8Lyr8uMoAK5YhYrTqKY5DDo2jCPGnIbgwYJUDQRL34Eegvnd6T0A6XaU0y+SXbbfbk2vHybVZwuGEobTYZabE2bNg0rmdYx4LJvODl2ZFN7WZ5isyUAtBJJa16Py2PfLBxfrCScVpQJr6Xdka6eUrHA4wAT7V+r3NCZslUJyQky4lDjtacCVsRo2ONMGuWkUh9xqynRCQ85d21St+xAo4pl/V0ld1FeU6sOVGzV5oHosji3S4DFZZ+UZbKdAQwqR+UY+DRN0Vt51MZheZ1YYJd80ZX4DTshs6feSJpktuOBWJGftFzdbIIclJG29KKbwSpR25wGKnFafI2rwItNizCTVkxa/aQnTYF4PGhBmLu0zfEpaIz3pmpMUO7TPE1aYjyV8xakSJA4iDMQI3Z7n/6eF7PFxy/qUNuzHzmV3PoyvOjIC8GNnWaUdw9SlwTr/2LUzQ4fhucCykIAHcgawtcD/7whga1Z/LfOPROF1JfKw7a8H0vERX3WC427LHjbvbhAw0KnSfyIPMok49H20i3oZOdHQE0wxYj/1APD8JfU/TlMW1umRVARZ8ohWLF0oZcohEqexajnKREArfVvvBroyFvI5yRgR4vQapTI0RPCmi4tNbw11Zgy43snKG2pVYR2S4I/Dg9rcK4Plr301TIbFRAT0CE+vqUAjg56lkxcDnUxMW/p9qDU2bILaypkXyr16SiZxc9bMvYEVVBztcbyU6uI+JLFruiPl4mHHv6IylJIc7HJ1vL1gnRTP3bBBvw5qyEl0KS6woregx1RAbPszwxRrTR+zfxV9tUKuC59BZHlmpC5YFAK2wLyU1d5rQyhMN4ySA8POYD6rj80DEZHXQzoTvfQIitPp42unEQRGMKQt/PqljT8A/lBU5DZcc8M3hkFklDpDyIXKuwLkd1zuiPrwzkC27GZ0SZEvQvUi3xVefevyFdY8lAeAlP17z57E+vKDjG9Guo+sX7I1qByNUBpMSO4UkOMP9otRBToRjxD1Rb+lEdGCUwcFm677KL6hR9e3Om9PWkZF6LpWqH+qnt9+lPVxgY=","padding":5},"hashCount":13}
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_0001_membership_test_result.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_0001_membership_test_result.json
new file mode 100644
index 00000000000..3bcbf418c24
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_0001_membership_test_result.json
@@ -0,0 +1 @@
+{"membershipTestResults" : "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_01_bloom_filter_proto.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_01_bloom_filter_proto.json
new file mode 100644
index 00000000000..35de64eee0a
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_01_bloom_filter_proto.json
@@ -0,0 +1 @@
+{"bits":{"bitmap":"n+36qf4UgWXLxRabHwqwva8jpXlZ7yfdCjRNwHQ5MBmgc35tGNWFvTgrWyfmznuz1j0wMabH29pR84MjjWGgAxLhDXU3dyYTY505812+BYTO5GXEAyGoUZhcBlUZPK+RAqSZ+9e3q9Gxpmoes/4iCbxJFc5eew0+95v5Z0h5fvlF2Y9iRBDu2PWC1pVGuc/j3W+34+5IwPtDLPbtfvYhnohTfXP02vsf2/77YqEtfmMVFfIMZJ5e7uLOA+rcmQC5fFfxjubJfKR5R+Rzw/UWd0Eg3gi+FCUIk/WUP5938R4tPH3fnrtQjclvsZhtj5dak7WWw1Ph4ZFdJE2XdFBH1JSvggI5tFKH5WUeIBlHYj+V3HomQ2gDrwMXGsIJokcwQi1qTUjECnwYGlOl/FRjZQg7h3QoSkyxgBnp6w7XKttc/EJf+279WLkvm6K/sTuQiFsOGqdQQ+c6osu9SzICn7Rtu4+RzmfxgCx1i2rX1OvVt+DLWa8/K5TlLvVM7GqXiHeaLuvkaz4uR754T1Iurp8/Ps2yJdXYHLyGndJa+7DJ1BPsGK8ZYbYFN7jGamHF9de+3K/syp1raDltsNUxUGAaMBghK1nIRDtHLSHBtVkuxvUkP3iVIkm6pEp0K/2npYUEAsbYVkug4Iv7qhnLTGwMUXP3piTMySLLoZ9bGY0k13FMX7h/s79dJDcIIf4fR9S0SN6fWXKdZOBLFzyXGcxbD+o0o3NO/UOZDgmTet2or8rvipr4tGDyGluUnW1o/fWPlGvEIo/7Ep6avGyw7jilLKYiunAA","padding":7},"hashCount":7}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_01_membership_test_result.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_01_membership_test_result.json
new file mode 100644
index 00000000000..2a851465e72
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_01_membership_test_result.json
@@ -0,0 +1 @@
+{"membershipTestResults" : "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_1_bloom_filter_proto.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_1_bloom_filter_proto.json
new file mode 100644
index 00000000000..c03535eafc3
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_1_bloom_filter_proto.json
@@ -0,0 +1 @@
+{"bits":{"bitmap":"","padding":0},"hashCount":0}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_1_membership_test_result.json b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_1_membership_test_result.json
new file mode 100644
index 00000000000..d59b3592362
--- /dev/null
+++ b/firebase-firestore/src/test/resources/bloom_filter_golden_test_data/Validation_BloomFilterTest_MD5_500_1_membership_test_result.json
@@ -0,0 +1 @@
+{"membershipTestResults" : "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
\ No newline at end of file
diff --git a/firebase-firestore/src/test/resources/json/bundle_spec_test.json b/firebase-firestore/src/test/resources/json/bundle_spec_test.json
index 1e21bbea06a..028895c50ac 100644
--- a/firebase-firestore/src/test/resources/json/bundle_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/bundle_spec_test.json
@@ -3,12 +3,11 @@
     "describeName": "Bundles:",
     "itName": "Bundles query can be loaded and resumed from different tabs",
     "tags": [
-      "multi-client",
-      "no-ios"
+      "multi-client"
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -39,6 +38,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90,6 +90,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -153,6 +154,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223,11 +225,10 @@
     "describeName": "Bundles:",
     "itName": "Bundles query can be resumed from same query.",
     "tags": [
-      "no-ios"
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -248,6 +249,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -295,12 +297,11 @@
     "describeName": "Bundles:",
     "itName": "Load and observe from same secondary client",
     "tags": [
-      "multi-client",
-      "no-ios"
+      "multi-client"
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -347,6 +348,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -383,6 +385,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -427,6 +430,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -477,6 +481,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -504,12 +509,11 @@
     "describeName": "Bundles:",
     "itName": "Load from primary client and observe from secondary",
     "tags": [
-      "multi-client",
-      "no-ios"
+      "multi-client"
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -556,6 +560,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -592,6 +597,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -636,6 +642,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -690,6 +697,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -721,6 +729,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -748,12 +757,11 @@
     "describeName": "Bundles:",
     "itName": "Load from secondary clients and observe from primary",
     "tags": [
-      "multi-client",
-      "no-ios"
+      "multi-client"
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -800,6 +808,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -836,6 +845,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -878,6 +888,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -905,11 +916,10 @@
     "describeName": "Bundles:",
     "itName": "Newer deleted docs from bundles should delete cached docs",
     "tags": [
-      "no-ios"
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -949,6 +959,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -983,6 +994,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1023,6 +1035,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1043,11 +1056,10 @@
     "describeName": "Bundles:",
     "itName": "Newer docs from bundles might lead to limbo doc",
     "tags": [
-      "no-ios"
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1127,6 +1139,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1165,7 +1178,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -1224,6 +1238,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1262,11 +1277,10 @@
     "describeName": "Bundles:",
     "itName": "Newer docs from bundles should keep not raise snapshot if there are unacknowledged writes",
     "tags": [
-      "no-ios"
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1306,6 +1320,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1340,6 +1355,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1378,6 +1394,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1386,7 +1403,7 @@
                 "value": {
                   "value": "patched"
                 },
-                "version": 250
+                "version": 0
               }
             ],
             "query": {
@@ -1408,11 +1425,10 @@
     "describeName": "Bundles:",
     "itName": "Newer docs from bundles should overwrite cache",
     "tags": [
-      "no-ios"
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1452,6 +1468,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1486,6 +1503,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1519,6 +1537,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1546,11 +1565,10 @@
     "describeName": "Bundles:",
     "itName": "Newer docs from bundles should raise snapshot only when Watch catches up with acknowledged writes",
     "tags": [
-      "no-ios"
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1590,6 +1608,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1624,6 +1643,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1662,6 +1682,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1670,7 +1691,7 @@
                 "value": {
                   "value": "patched"
                 },
-                "version": 250
+                "version": 0
               }
             ],
             "query": {
@@ -1709,6 +1730,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1736,11 +1758,10 @@
     "describeName": "Bundles:",
     "itName": "Older deleted docs from bundles should do nothing",
     "tags": [
-      "no-ios"
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1780,6 +1801,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1814,6 +1836,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
diff --git a/firebase-firestore/src/test/resources/json/collection_spec_test.json b/firebase-firestore/src/test/resources/json/collection_spec_test.json
index 54409fb6977..29146516cb5 100644
--- a/firebase-firestore/src/test/resources/json/collection_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/collection_spec_test.json
@@ -6,7 +6,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -46,6 +46,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -80,6 +81,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -113,7 +115,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -155,6 +157,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
diff --git a/firebase-firestore/src/test/resources/json/existence_filter_spec_test.json b/firebase-firestore/src/test/resources/json/existence_filter_spec_test.json
index 5798b877996..ae64f7aad82 100644
--- a/firebase-firestore/src/test/resources/json/existence_filter_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/existence_filter_spec_test.json
@@ -1,12 +1,12 @@
 {
-  "Existence filter handled at global snapshot": {
+  "Bloom filter can process special characters in document name": {
     "describeName": "Existence Filters:",
-    "itName": "Existence filter handled at global snapshot",
+    "itName": "Bloom filter can process special characters in document name",
     "tags": [
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -46,7 +46,20 @@
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/1",
+              "createTime": 0,
+              "key": "collection/ÀÒ∑",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/À∑Ò",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
@@ -80,7 +93,20 @@
           {
             "added": [
               {
-                "key": "collection/1",
+                "createTime": 0,
+                "key": "collection/ÀÒ∑",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/À∑Ò",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
@@ -105,30 +131,18 @@
         ]
       },
       {
-        "watchFilter": [
-          [
-            2
-          ],
-          "collection/1",
-          "collection/2"
-        ]
-      },
-      {
-        "watchEntity": {
-          "docs": [
-            {
-              "key": "collection/3",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "v": 3
-              },
-              "version": 3000
-            }
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "IIAAIIAIIAAIIAIIAA==",
+              "padding": 4
+            },
+            "hashCount": 10
+          },
+          "keys": [
+            "collection/ÀÒ∑"
           ],
-          "targets": [
+          "targetIds": [
             2
           ]
         }
@@ -141,19 +155,6 @@
         },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/3",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "v": 3
-                },
-                "version": 3000
-              }
-            ],
             "errorCode": 0,
             "fromCache": true,
             "hasPendingWrites": false,
@@ -167,7 +168,23 @@
           }
         ],
         "expectedState": {
+          "activeLimboDocs": [
+            "collection/À∑Ò"
+          ],
           "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/À∑Ò"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
             "2": {
               "queries": [
                 {
@@ -182,12 +199,45 @@
             }
           }
         }
-      },
+      }
+    ]
+  },
+  "Bloom filter fills in default values for undefined padding and hashCount": {
+    "describeName": "Existence Filters:",
+    "itName": "Bloom filter fills in default values for undefined padding and hashCount",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
       {
-        "watchRemove": {
-          "targetIds": [
-            2
-          ]
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
         }
       },
       {
@@ -199,7 +249,8 @@
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/1",
+              "createTime": 0,
+              "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
@@ -210,7 +261,8 @@
               "version": 1000
             },
             {
-              "key": "collection/2",
+              "createTime": 0,
+              "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
@@ -218,18 +270,7 @@
               "value": {
                 "v": 2
               },
-              "version": 2000
-            },
-            {
-              "key": "collection/3",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "v": 3
-              },
-              "version": 3000
+              "version": 1000
             }
           ],
           "targets": [
@@ -242,20 +283,33 @@
           [
             2
           ],
-          "resume-token-3000"
+          "resume-token-1000"
         ]
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 3000
+          "version": 1000
         },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
-                "key": "collection/2",
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
@@ -263,7 +317,7 @@
                 "value": {
                   "v": 2
                 },
-                "version": 2000
+                "version": 1000
               }
             ],
             "errorCode": 0,
@@ -278,17 +332,70 @@
             }
           }
         ]
+      },
+      {
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "AhAAApAAAIAEBIAABA=="
+            }
+          },
+          "keys": [
+            "collection/a"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
       }
     ]
   },
-  "Existence filter ignored with pending target": {
+  "Bloom filter is handled at global snapshot": {
     "describeName": "Existence Filters:",
-    "itName": "Existence filter ignored with pending target",
+    "itName": "Bloom filter is handled at global snapshot",
     "tags": [
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -328,7 +435,20 @@
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/1",
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
@@ -362,7 +482,20 @@
           {
             "added": [
               {
-                "key": "collection/1",
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
@@ -387,45 +520,63 @@
         ]
       },
       {
-        "userUnlisten": [
-          2,
-          {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          }
-        ],
-        "expectedState": {
-          "activeTargets": {
-          }
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "AhAAApAAAIAEBIAABA==",
+              "padding": 4
+            },
+            "hashCount": 10
+          },
+          "keys": [
+            "collection/a"
+          ],
+          "targetIds": [
+            2
+          ]
         }
       },
       {
-        "userListen": {
-          "query": {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          },
-          "targetId": 2
-        },
-        "expectedSnapshotEvents": [
-          {
-            "added": [
-              {
-                "key": "collection/1",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "v": 2
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 3
+              },
+              "version": 3000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
                 },
-                "version": 2000
+                "value": {
+                  "v": 3
+                },
+                "version": 3000
               }
             ],
             "errorCode": 0,
@@ -441,7 +592,23 @@
           }
         ],
         "expectedState": {
+          "activeLimboDocs": [
+            "collection/b"
+          ],
           "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/b"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
             "2": {
               "queries": [
                 {
@@ -452,69 +619,21 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-1000"
+              "resumeToken": ""
             }
           }
         }
-      },
-      {
-        "watchFilter": [
-          [
-            2
-          ]
-        ]
-      },
-      {
-        "watchRemove": {
-          "targetIds": [
-            2
-          ]
-        }
-      },
-      {
-        "watchAck": [
-          2
-        ]
-      },
-      {
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-2000"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 2000
-        },
-        "expectedSnapshotEvents": [
-          {
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          }
-        ]
       }
     ]
   },
-  "Existence filter limbo resolution is denied": {
+  "Bloom filter limbo resolution is denied": {
     "describeName": "Existence Filters:",
-    "itName": "Existence filter limbo resolution is denied",
+    "itName": "Bloom filter limbo resolution is denied",
     "tags": [
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -554,7 +673,8 @@
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/1",
+              "createTime": 0,
+              "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
@@ -565,13 +685,14 @@
               "version": 1000
             },
             {
-              "key": "collection/2",
+              "createTime": 0,
+              "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "v": 2
+                "v": 1
               },
               "version": 1000
             }
@@ -599,7 +720,8 @@
           {
             "added": [
               {
-                "key": "collection/1",
+                "createTime": 0,
+                "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
@@ -610,13 +732,14 @@
                 "version": 1000
               },
               {
-                "key": "collection/2",
+                "createTime": 0,
+                "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "v": 2
+                  "v": 1
                 },
                 "version": 1000
               }
@@ -635,12 +758,21 @@
         ]
       },
       {
-        "watchFilter": [
-          [
-            2
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "AhAAApAAAIAEBIAABA==",
+              "padding": 4
+            },
+            "hashCount": 10
+          },
+          "keys": [
+            "collection/a"
           ],
-          "collection/1"
-        ]
+          "targetIds": [
+            2
+          ]
+        }
       },
       {
         "watchSnapshot": {
@@ -662,72 +794,9 @@
             }
           }
         ],
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": ""
-            }
-          }
-        }
-      },
-      {
-        "watchRemove": {
-          "targetIds": [
-            2
-          ]
-        }
-      },
-      {
-        "watchAck": [
-          2
-        ]
-      },
-      {
-        "watchEntity": {
-          "docs": [
-            {
-              "key": "collection/1",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "v": 1
-              },
-              "version": 1000
-            }
-          ],
-          "targets": [
-            2
-          ]
-        }
-      },
-      {
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-2000"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 2000
-        },
         "expectedState": {
           "activeLimboDocs": [
-            "collection/2"
+            "collection/b"
           ],
           "activeTargets": {
             "1": {
@@ -737,10 +806,11 @@
                   ],
                   "orderBys": [
                   ],
-                  "path": "collection/2"
+                  "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -780,13 +850,14 @@
             },
             "removed": [
               {
-                "key": "collection/2",
+                "createTime": 0,
+                "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "v": 2
+                  "v": 1
                 },
                 "version": 1000
               }
@@ -814,14 +885,14 @@
       }
     ]
   },
-  "Existence filter match": {
+  "Bloom filter with large size works as expected": {
     "describeName": "Existence Filters:",
-    "itName": "Existence filter match",
+    "itName": "Bloom filter with large size works as expected",
     "tags": [
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -861,7 +932,8 @@
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/1",
+              "createTime": 0,
+              "key": "collection/doc0",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
@@ -870,86 +942,7007 @@
                 "v": 1
               },
               "version": 1000
-            }
-          ],
-          "targets": [
-            2
-          ]
-        }
-      },
-      {
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-1000"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 1000
-        },
-        "expectedSnapshotEvents": [
-          {
-            "added": [
-              {
-                "key": "collection/1",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "v": 1
-                },
-                "version": 1000
-              }
-            ],
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          }
-        ]
-      },
-      {
-        "watchFilter": [
-          [
-            2
-          ],
-          "collection/1"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 2000
-        }
-      }
-    ]
-  },
-  "Existence filter match after pending update": {
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc2",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc3",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc4",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc5",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc6",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc7",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc8",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc9",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc10",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc11",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc12",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc13",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc14",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc15",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc16",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc17",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc18",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc19",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc20",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc21",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc22",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc23",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc24",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc25",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc26",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc27",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc28",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc29",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc30",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc31",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc32",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc33",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc34",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc35",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc36",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc37",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc38",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc39",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc40",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc41",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc42",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc43",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc44",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc45",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc46",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc47",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc48",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc49",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc50",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc51",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc52",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc53",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc54",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc55",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc56",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc57",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc58",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc59",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc60",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc61",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc62",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc63",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc64",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc65",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc66",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc67",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc68",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc69",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc70",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc71",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc72",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc73",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc74",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc75",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc76",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc77",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc78",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc79",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc80",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc81",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc82",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc83",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc84",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc85",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc86",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc87",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc88",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc89",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc90",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc91",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc92",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc93",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc94",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc95",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc96",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc97",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc98",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/doc99",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/doc0",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc1",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc2",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc3",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc4",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc5",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc6",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc7",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc8",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc9",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc10",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc11",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc12",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc13",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc14",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc15",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc16",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc17",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc18",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc19",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc20",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc21",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc22",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc23",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc24",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc25",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc26",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc27",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc28",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc29",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc30",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc31",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc32",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc33",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc34",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc35",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc36",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc37",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc38",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc39",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc40",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc41",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc42",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc43",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc44",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc45",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc46",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc47",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc48",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc49",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc50",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc51",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc52",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc53",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc54",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc55",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc56",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc57",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc58",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc59",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc60",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc61",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc62",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc63",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc64",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc65",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc66",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc67",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc68",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc69",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc70",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc71",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc72",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc73",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc74",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc75",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc76",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc77",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc78",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc79",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc80",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc81",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc82",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc83",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc84",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc85",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc86",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc87",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc88",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc89",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc90",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc91",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc92",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc93",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc94",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc95",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc96",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc97",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc98",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/doc99",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "+9oMQXUptl274DOaET8sfebQ4aCu0Roiddbja3z8TfadKuyPV/9XWV5Ksv+vywRXTfZSNIn8z+xk/oq1+cbOPepeNvbXVOF6H92fCOAz/KiS3Mcw338R9tXE3Y7QB1L2kbvbvVHW3Kn/k3Vx8k9Oa19eWX6RYE97Q+oCcVU=",
+              "padding": 0
+            },
+            "hashCount": 16
+          },
+          "keys": [
+            "collection/doc0",
+            "collection/doc1",
+            "collection/doc2",
+            "collection/doc3",
+            "collection/doc4",
+            "collection/doc5",
+            "collection/doc6",
+            "collection/doc7",
+            "collection/doc8",
+            "collection/doc9",
+            "collection/doc10",
+            "collection/doc11",
+            "collection/doc12",
+            "collection/doc13",
+            "collection/doc14",
+            "collection/doc15",
+            "collection/doc16",
+            "collection/doc17",
+            "collection/doc18",
+            "collection/doc19",
+            "collection/doc20",
+            "collection/doc21",
+            "collection/doc22",
+            "collection/doc23",
+            "collection/doc24",
+            "collection/doc25",
+            "collection/doc26",
+            "collection/doc27",
+            "collection/doc28",
+            "collection/doc29",
+            "collection/doc30",
+            "collection/doc31",
+            "collection/doc32",
+            "collection/doc33",
+            "collection/doc34",
+            "collection/doc35",
+            "collection/doc36",
+            "collection/doc37",
+            "collection/doc38",
+            "collection/doc39",
+            "collection/doc40",
+            "collection/doc41",
+            "collection/doc42",
+            "collection/doc43",
+            "collection/doc44",
+            "collection/doc45",
+            "collection/doc46",
+            "collection/doc47",
+            "collection/doc48",
+            "collection/doc49"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+            "collection/doc50",
+            "collection/doc51",
+            "collection/doc52",
+            "collection/doc53",
+            "collection/doc54",
+            "collection/doc55",
+            "collection/doc56",
+            "collection/doc57",
+            "collection/doc58",
+            "collection/doc59",
+            "collection/doc60",
+            "collection/doc61",
+            "collection/doc62",
+            "collection/doc63",
+            "collection/doc64",
+            "collection/doc65",
+            "collection/doc66",
+            "collection/doc67",
+            "collection/doc68",
+            "collection/doc69",
+            "collection/doc70",
+            "collection/doc71",
+            "collection/doc72",
+            "collection/doc73",
+            "collection/doc74",
+            "collection/doc75",
+            "collection/doc76",
+            "collection/doc77",
+            "collection/doc78",
+            "collection/doc79",
+            "collection/doc80",
+            "collection/doc81",
+            "collection/doc82",
+            "collection/doc83",
+            "collection/doc84",
+            "collection/doc85",
+            "collection/doc86",
+            "collection/doc87",
+            "collection/doc88",
+            "collection/doc89",
+            "collection/doc90",
+            "collection/doc91",
+            "collection/doc92",
+            "collection/doc93",
+            "collection/doc94",
+            "collection/doc95",
+            "collection/doc96",
+            "collection/doc97",
+            "collection/doc98",
+            "collection/doc99"
+          ],
+          "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc50"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "11": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc55"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "13": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc56"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "15": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc57"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "17": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc58"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "19": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc59"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            },
+            "21": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc60"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "23": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc61"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "25": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc62"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "27": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc63"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "29": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc64"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "3": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc51"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "31": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc65"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "33": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc66"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "35": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc67"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "37": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc68"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "39": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc69"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "41": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc70"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "43": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc71"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "45": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc72"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "47": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc73"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "49": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc74"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "5": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc52"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "51": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc75"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "53": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc76"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "55": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc77"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "57": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc78"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "59": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc79"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "61": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc80"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "63": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc81"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "65": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc82"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "67": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc83"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "69": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc84"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "7": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc53"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "71": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc85"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "73": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc86"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "75": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc87"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "77": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc88"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "79": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc89"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "81": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc90"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "83": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc91"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "85": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc92"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "87": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc93"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "89": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc94"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "9": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc54"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "91": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc95"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "93": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc96"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "95": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc97"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "97": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc98"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "99": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/doc99"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Existence filter clears resume token": {
+    "describeName": "Existence Filters:",
+    "itName": "Existence filter clears resume token",
+    "tags": [
+      "durable-persistence"
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/2",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/1",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/2",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "keys": [
+            "collection/1"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      },
+      {
+        "restart": true,
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/1",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/2",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Existence filter handled at global snapshot": {
+    "describeName": "Existence Filters:",
+    "itName": "Existence filter handled at global snapshot",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/1",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "keys": [
+            "collection/1",
+            "collection/2"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/3",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 3
+              },
+              "version": 3000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/3",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 3
+                },
+                "version": 3000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/2",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 2000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/3",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 3
+              },
+              "version": 3000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-3000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 3000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/2",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Existence filter ignored with pending target": {
+    "describeName": "Existence Filters:",
+    "itName": "Existence filter ignored with pending target",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/1",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/1",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          }
+        }
+      },
+      {
+        "watchFilter": {
+          "keys": [
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Existence filter limbo resolution is denied": {
+    "describeName": "Existence Filters:",
+    "itName": "Existence filter limbo resolution is denied",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/2",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/1",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/2",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "keys": [
+            "collection/1"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedState": {
+          "activeLimboDocs": [
+            "collection/2"
+          ],
+          "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/2"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "cause": {
+            "code": 7
+          },
+          "targetIds": [
+            1
+          ]
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/2",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Existence filter match": {
+    "describeName": "Existence Filters:",
+    "itName": "Existence filter match",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/1",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "keys": [
+            "collection/1"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        }
+      }
+    ]
+  },
+  "Existence filter match after pending update": {
+    "describeName": "Existence Filters:",
+    "itName": "Existence filter match after pending update",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchFilter": {
+          "keys": [
+            "collection/1"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/1",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Existence filter mismatch triggers re-run of query": {
+    "describeName": "Existence Filters:",
+    "itName": "Existence filter mismatch triggers re-run of query",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/2",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/1",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/2",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "keys": [
+            "collection/1"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedState": {
+          "activeLimboDocs": [
+            "collection/2"
+          ],
+          "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/2"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          1
+        ]
+      },
+      {
+        "watchCurrent": [
+          [
+            1
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/2",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Existence filter mismatch will drop resume token": {
+    "describeName": "Existence Filters:",
+    "itName": "Existence filter mismatch will drop resume token",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/2",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "existence-filter-resume-token"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/1",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/2",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchStreamClose": {
+          "error": {
+            "code": 14,
+            "message": "Simulated Backend Error"
+          },
+          "runBackoffTimer": true
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "existence-filter-resume-token"
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchFilter": {
+          "keys": [
+            "collection/1"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedState": {
+          "activeLimboDocs": [
+            "collection/2"
+          ],
+          "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/2"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          1
+        ]
+      },
+      {
+        "watchCurrent": [
+          [
+            1
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/2",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Existence filter synthesizes deletes": {
+    "describeName": "Existence Filters:",
+    "itName": "Existence filter synthesizes deletes",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection/a"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/a"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection/a"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "keys": [
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection/a"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "Existence filter with empty target": {
+    "describeName": "Existence Filters:",
+    "itName": "Existence filter with empty target",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "keys": [
+            "collection/1"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Full re-query is skipped when bloom filter can identify documents deleted": {
+    "describeName": "Existence Filters:",
+    "itName": "Full re-query is skipped when bloom filter can identify documents deleted",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "AhAAApAAAIAEBIAABA==",
+              "padding": 4
+            },
+            "hashCount": 10
+          },
+          "keys": [
+            "collection/a"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+            "collection/b"
+          ],
+          "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/b"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          1
+        ]
+      },
+      {
+        "watchCurrent": [
+          [
+            1
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Full re-query is triggered when bloom filter bitmap is invalid": {
+    "describeName": "Existence Filters:",
+    "itName": "Full re-query is triggered when bloom filter bitmap is invalid",
+    "tags": [
+      "no-ios",
+      "no-android"
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "INVALID_BASE_64",
+              "padding": 4
+            },
+            "hashCount": 10
+          },
+          "keys": [
+            "collection/a"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Full re-query is triggered when bloom filter can not identify documents deleted": {
+    "describeName": "Existence Filters:",
+    "itName": "Full re-query is triggered when bloom filter can not identify documents deleted",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "AxBIApBIAIAWBoCQBA==",
+              "padding": 4
+            },
+            "hashCount": 10
+          },
+          "keys": [
+            "collection/a"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatchBloom"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Full re-query is triggered when bloom filter hashCount is invalid": {
+    "describeName": "Existence Filters:",
+    "itName": "Full re-query is triggered when bloom filter hashCount is invalid",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "AhAAApAAAIAEBIAABA==",
+              "padding": 4
+            },
+            "hashCount": -1
+          },
+          "keys": [
+            "collection/a"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Full re-query is triggered when bloom filter is empty": {
+    "describeName": "Existence Filters:",
+    "itName": "Full re-query is triggered when bloom filter is empty",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "",
+              "padding": 0
+            },
+            "hashCount": 0
+          },
+          "keys": [
+            "collection/a"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Resume a query with bloom filter when documents are added, removed and deleted": {
+    "describeName": "Existence Filters:",
+    "itName": "Resume a query with bloom filter when documents are added, removed and deleted",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+              [
+                "v",
+                "==",
+                1
+              ]
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                    [
+                      "v",
+                      "==",
+                      1
+                    ]
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+                [
+                  "v",
+                  "==",
+                  1
+                ]
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "enableNetwork": false,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+                [
+                  "v",
+                  "==",
+                  1
+                ]
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "enableNetwork": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                    [
+                      "v",
+                      "==",
+                      1
+                    ]
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/d",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "AhICApAQEICEhIAEBA==",
+              "padding": 4
+            },
+            "hashCount": 10
+          },
+          "keys": [
+            "collection/a",
+            "collection/d"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/d",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+                [
+                  "v",
+                  "==",
+                  1
+                ]
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+            "collection/b",
+            "collection/c"
+          ],
+          "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/b"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                    [
+                      "v",
+                      "==",
+                      1
+                    ]
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            },
+            "3": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/c"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Resume a query with bloom filter when documents are updated to no longer match the query": {
     "describeName": "Existence Filters:",
-    "itName": "Existence filter match after pending update",
+    "itName": "Resume a query with bloom filter when documents are updated to no longer match the query",
     "tags": [
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
         "userListen": {
           "query": {
             "filters": [
+              [
+                "v",
+                "==",
+                1
+              ]
             ],
             "orderBys": [
             ],
@@ -963,6 +7956,11 @@
               "queries": [
                 {
                   "filters": [
+                    [
+                      "v",
+                      "==",
+                      1
+                    ]
                   ],
                   "orderBys": [
                   ],
@@ -979,48 +7977,32 @@
           2
         ]
       },
-      {
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-1000"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 2000
-        },
-        "expectedSnapshotEvents": [
-          {
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          }
-        ]
-      },
       {
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/1",
+              "createTime": 0,
+              "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "v": 2
+                "v": 1
               },
-              "version": 2000
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
             }
           ],
           "targets": [
@@ -1029,32 +8011,45 @@
         }
       },
       {
-        "watchFilter": [
+        "watchCurrent": [
           [
             2
           ],
-          "collection/1"
+          "resume-token-1000"
         ]
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2000
+          "version": 1000
         },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
-                "key": "collection/1",
+                "createTime": 0,
+                "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "v": 2
+                  "v": 1
                 },
-                "version": 2000
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
               }
             ],
             "errorCode": 0,
@@ -1062,31 +8057,168 @@
             "hasPendingWrites": false,
             "query": {
               "filters": [
+                [
+                  "v",
+                  "==",
+                  1
+                ]
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "enableNetwork": false,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+                [
+                  "v",
+                  "==",
+                  1
+                ]
               ],
               "orderBys": [
               ],
               "path": "collection"
             }
           }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "enableNetwork": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                    [
+                      "v",
+                      "==",
+                      1
+                    ]
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "AhAAApAAAIAEBIAABA==",
+              "padding": 4
+            },
+            "hashCount": 10
+          },
+          "keys": [
+            "collection/a"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
         ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedState": {
+          "activeLimboDocs": [
+            "collection/b"
+          ],
+          "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/b"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                    [
+                      "v",
+                      "==",
+                      1
+                    ]
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          }
+        }
       }
     ]
   },
-  "Existence filter mismatch invalidates index-free query": {
+  "Resume a query with bloom filter when existing docs are updated": {
     "describeName": "Existence Filters:",
-    "itName": "Existence filter clears resume token",
+    "itName": "Resume a query with bloom filter when existing docs are updated",
     "tags": [
-      "durable-persistence"
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
         "userListen": {
           "query": {
             "filters": [
+              [
+                "v",
+                ">=",
+                1
+              ]
             ],
             "orderBys": [
             ],
@@ -1100,6 +8232,11 @@
               "queries": [
                 {
                   "filters": [
+                    [
+                      "v",
+                      ">=",
+                      1
+                    ]
                   ],
                   "orderBys": [
                   ],
@@ -1120,7 +8257,8 @@
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/1",
+              "createTime": 0,
+              "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
@@ -1131,13 +8269,14 @@
               "version": 1000
             },
             {
-              "key": "collection/2",
+              "createTime": 0,
+              "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "v": 2
+                "v": 1
               },
               "version": 1000
             }
@@ -1165,7 +8304,8 @@
           {
             "added": [
               {
-                "key": "collection/1",
+                "createTime": 0,
+                "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
@@ -1176,13 +8316,14 @@
                 "version": 1000
               },
               {
-                "key": "collection/2",
+                "createTime": 0,
+                "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "v": 2
+                  "v": 1
                 },
                 "version": 1000
               }
@@ -1192,6 +8333,11 @@
             "hasPendingWrites": false,
             "query": {
               "filters": [
+                [
+                  "v",
+                  ">=",
+                  1
+                ]
               ],
               "orderBys": [
               ],
@@ -1201,19 +8347,7 @@
         ]
       },
       {
-        "watchFilter": [
-          [
-            2
-          ],
-          "collection/1"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 2000
-        },
+        "enableNetwork": false,
         "expectedSnapshotEvents": [
           {
             "errorCode": 0,
@@ -1221,16 +8355,18 @@
             "hasPendingWrites": false,
             "query": {
               "filters": [
+                [
+                  "v",
+                  ">=",
+                  1
+                ]
               ],
               "orderBys": [
               ],
               "path": "collection"
             }
           }
-        ]
-      },
-      {
-        "restart": true,
+        ],
         "expectedState": {
           "activeLimboDocs": [
           ],
@@ -1241,81 +8377,117 @@
         }
       },
       {
-        "userListen": {
-          "query": {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          },
-          "targetId": 2
-        },
-        "expectedSnapshotEvents": [
-          {
-            "added": [
-              {
-                "key": "collection/1",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "v": 1
-                },
-                "version": 1000
-              },
-              {
-                "key": "collection/2",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "v": 2
-                },
-                "version": 1000
-              }
-            ],
-            "errorCode": 0,
-            "fromCache": true,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          }
-        ],
+        "enableNetwork": true,
         "expectedState": {
           "activeTargets": {
             "2": {
               "queries": [
                 {
                   "filters": [
+                    [
+                      "v",
+                      ">=",
+                      1
+                    ]
                   ],
                   "orderBys": [
                   ],
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "resume-token-1000"
             }
           }
         }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "AxBIApBIAIAWBoCQBA==",
+              "padding": 4
+            },
+            "hashCount": 10
+          },
+          "keys": [
+            "collection/a",
+            "collection/b"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+                [
+                  "v",
+                  ">=",
+                  1
+                ]
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
       }
     ]
   },
-  "Existence filter mismatch triggers re-run of query": {
+  "Resume a query with bloom filter when new documents are added": {
     "describeName": "Existence Filters:",
-    "itName": "Existence filter mismatch triggers re-run of query",
+    "itName": "Resume a query with bloom filter when new documents are added",
     "tags": [
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1355,7 +8527,8 @@
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/1",
+              "createTime": 0,
+              "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
@@ -1364,17 +8537,6 @@
                 "v": 1
               },
               "version": 1000
-            },
-            {
-              "key": "collection/2",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "v": 2
-              },
-              "version": 1000
             }
           ],
           "targets": [
@@ -1400,7 +8562,8 @@
           {
             "added": [
               {
-                "key": "collection/1",
+                "createTime": 0,
+                "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
@@ -1409,17 +8572,6 @@
                   "v": 1
                 },
                 "version": 1000
-              },
-              {
-                "key": "collection/2",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "v": 2
-                },
-                "version": 1000
               }
             ],
             "errorCode": 0,
@@ -1436,19 +8588,7 @@
         ]
       },
       {
-        "watchFilter": [
-          [
-            2
-          ],
-          "collection/1"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 2000
-        },
+        "enableNetwork": false,
         "expectedSnapshotEvents": [
           {
             "errorCode": 0,
@@ -1463,6 +8603,17 @@
             }
           }
         ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "enableNetwork": true,
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -1475,18 +8626,11 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "resume-token-1000"
             }
           }
         }
       },
-      {
-        "watchRemove": {
-          "targetIds": [
-            2
-          ]
-        }
-      },
       {
         "watchAck": [
           2
@@ -1495,78 +8639,46 @@
       {
         "watchEntity": {
           "docs": [
-            {
-              "key": "collection/1",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "v": 1
-              },
-              "version": 1000
-            }
-          ],
-          "targets": [
-            2
-          ]
-        }
-      },
-      {
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-2000"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 2000
-        },
-        "expectedState": {
-          "activeLimboDocs": [
-            "collection/2"
-          ],
-          "activeTargets": {
-            "1": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection/2"
-                }
-              ],
-              "resumeToken": ""
-            },
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": ""
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 1000
             }
-          }
+          ],
+          "targets": [
+            2
+          ]
         }
       },
       {
-        "watchAck": [
-          1
-        ]
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "AxBIApBIAIAWBoCQBA==",
+              "padding": 4
+            },
+            "hashCount": 10
+          },
+          "keys": [
+            "collection/a",
+            "collection/b"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
       },
       {
         "watchCurrent": [
           [
-            1
+            2
           ],
           "resume-token-2000"
         ]
@@ -1579,19 +8691,10 @@
         },
         "expectedSnapshotEvents": [
           {
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            },
-            "removed": [
+            "added": [
               {
-                "key": "collection/2",
+                "createTime": 0,
+                "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
@@ -1601,38 +8704,30 @@
                 },
                 "version": 1000
               }
-            ]
-          }
-        ],
-        "expectedState": {
-          "activeLimboDocs": [
-          ],
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
               ],
-              "resumeToken": ""
+              "orderBys": [
+              ],
+              "path": "collection"
             }
           }
-        }
+        ]
       }
     ]
   },
-  "Existence filter mismatch will drop resume token": {
+  "Resume a query with bloom filter when there is no document changes": {
     "describeName": "Existence Filters:",
-    "itName": "Existence filter mismatch will drop resume token",
+    "itName": "Resume a query with bloom filter when there is no document changes",
     "tags": [
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1672,7 +8767,8 @@
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/1",
+              "createTime": 0,
+              "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
@@ -1681,17 +8777,6 @@
                 "v": 1
               },
               "version": 1000
-            },
-            {
-              "key": "collection/2",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "v": 2
-              },
-              "version": 1000
             }
           ],
           "targets": [
@@ -1704,7 +8789,7 @@
           [
             2
           ],
-          "existence-filter-resume-token"
+          "resume-token-1000"
         ]
       },
       {
@@ -1717,7 +8802,8 @@
           {
             "added": [
               {
-                "key": "collection/1",
+                "createTime": 0,
+                "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
@@ -1726,17 +8812,6 @@
                   "v": 1
                 },
                 "version": 1000
-              },
-              {
-                "key": "collection/2",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "v": 2
-                },
-                "version": 1000
               }
             ],
             "errorCode": 0,
@@ -1753,13 +8828,32 @@
         ]
       },
       {
-        "watchStreamClose": {
-          "error": {
-            "code": 14,
-            "message": "Simulated Backend Error"
+        "enableNetwork": false,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
           },
-          "runBackoffTimer": true
-        },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "enableNetwork": true,
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -1772,7 +8866,7 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "existence-filter-resume-token"
+              "resumeToken": "resume-token-1000"
             }
           }
         }
@@ -1783,11 +8877,28 @@
         ]
       },
       {
-        "watchFilter": [
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "AhAAApAAAIAEBIAABA==",
+              "padding": 4
+            },
+            "hashCount": 10
+          },
+          "keys": [
+            "collection/a"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
           [
             2
           ],
-          "collection/1"
+          "resume-token-2000"
         ]
       },
       {
@@ -1799,7 +8910,7 @@
         "expectedSnapshotEvents": [
           {
             "errorCode": 0,
-            "fromCache": true,
+            "fromCache": false,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -1809,13 +8920,47 @@
               "path": "collection"
             }
           }
-        ],
+        ]
+      }
+    ]
+  },
+  "Same documents can have different bloom filters": {
+    "describeName": "Existence Filters:",
+    "itName": "Same documents can have different bloom filters",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+              [
+                "v",
+                "<=",
+                2
+              ]
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
         "expectedState": {
           "activeTargets": {
             "2": {
               "queries": [
                 {
                   "filters": [
+                    [
+                      "v",
+                      "<=",
+                      2
+                    ]
                   ],
                   "orderBys": [
                   ],
@@ -1827,13 +8972,6 @@
           }
         }
       },
-      {
-        "watchRemove": {
-          "targetIds": [
-            2
-          ]
-        }
-      },
       {
         "watchAck": [
           2
@@ -1843,7 +8981,8 @@
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/1",
+              "createTime": 0,
+              "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
@@ -1852,6 +8991,18 @@
                 "v": 1
               },
               "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 2
+              },
+              "version": 1000
             }
           ],
           "targets": [
@@ -1864,81 +9015,83 @@
           [
             2
           ],
-          "resume-token-2000"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 2000
-        },
-        "expectedState": {
-          "activeLimboDocs": [
-            "collection/2"
-          ],
-          "activeTargets": {
-            "1": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection/2"
-                }
-              ],
-              "resumeToken": ""
-            },
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": ""
-            }
-          }
-        }
-      },
-      {
-        "watchAck": [
-          1
-        ]
-      },
-      {
-        "watchCurrent": [
-          [
-            1
-          ],
-          "resume-token-2000"
+          "resume-token-1000"
         ]
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2000
+          "version": 1000
         },
         "expectedSnapshotEvents": [
           {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 1000
+              }
+            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
             "query": {
               "filters": [
+                [
+                  "v",
+                  "<=",
+                  2
+                ]
               ],
               "orderBys": [
               ],
               "path": "collection"
-            },
-            "removed": [
+            }
+          }
+        ]
+      },
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+              [
+                "v",
+                ">=",
+                2
+              ]
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 4
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
               {
-                "key": "collection/2",
+                "createTime": 0,
+                "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
@@ -1948,17 +9101,35 @@
                 },
                 "version": 1000
               }
-            ]
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+                [
+                  "v",
+                  ">=",
+                  2
+                ]
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
           }
         ],
         "expectedState": {
-          "activeLimboDocs": [
-          ],
           "activeTargets": {
             "2": {
               "queries": [
                 {
                   "filters": [
+                    [
+                      "v",
+                      "<=",
+                      2
+                    ]
                   ],
                   "orderBys": [
                   ],
@@ -1966,43 +9137,20 @@
                 }
               ],
               "resumeToken": ""
-            }
-          }
-        }
-      }
-    ]
-  },
-  "Existence filter synthesizes deletes": {
-    "describeName": "Existence Filters:",
-    "itName": "Existence filter synthesizes deletes",
-    "tags": [
-    ],
-    "config": {
-      "numClients": 1,
-      "useGarbageCollection": true
-    },
-    "steps": [
-      {
-        "userListen": {
-          "query": {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection/a"
-          },
-          "targetId": 2
-        },
-        "expectedState": {
-          "activeTargets": {
-            "2": {
+            },
+            "4": {
               "queries": [
                 {
                   "filters": [
+                    [
+                      "v",
+                      ">=",
+                      2
+                    ]
                   ],
                   "orderBys": [
                   ],
-                  "path": "collection/a"
+                  "path": "collection"
                 }
               ],
               "resumeToken": ""
@@ -2012,54 +9160,68 @@
       },
       {
         "watchAck": [
-          2
+          4
         ]
       },
       {
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/a",
+              "createTime": 0,
+              "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "v": 1
+                "v": 2
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 3
               },
               "version": 1000
             }
           ],
           "targets": [
-            2
+            4
           ]
         }
       },
       {
         "watchCurrent": [
           [
-            2
+            4
           ],
-          "resume-token-1000"
+          "resume-token-1001"
         ]
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 1000
+          "version": 1001
         },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
-                "key": "collection/a",
+                "createTime": 0,
+                "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "v": 1
+                  "v": 3
                 },
                 "version": 1000
               }
@@ -2069,20 +9231,35 @@
             "hasPendingWrites": false,
             "query": {
               "filters": [
+                [
+                  "v",
+                  ">=",
+                  2
+                ]
               ],
               "orderBys": [
               ],
-              "path": "collection/a"
+              "path": "collection"
             }
           }
         ]
       },
       {
-        "watchFilter": [
-          [
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "CQ==",
+              "padding": 3
+            },
+            "hashCount": 2
+          },
+          "keys": [
+            "collection/b"
+          ],
+          "targetIds": [
             2
           ]
-        ]
+        }
       },
       {
         "watchSnapshot": {
@@ -2093,60 +9270,66 @@
         "expectedSnapshotEvents": [
           {
             "errorCode": 0,
-            "fromCache": false,
+            "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
+                [
+                  "v",
+                  "<=",
+                  2
+                ]
               ],
               "orderBys": [
               ],
-              "path": "collection/a"
-            },
-            "removed": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "v": 1
-                },
-                "version": 1000
-              }
-            ]
+              "path": "collection"
+            }
           }
-        ]
-      }
-    ]
-  },
-  "Existence filter with empty target": {
-    "describeName": "Existence Filters:",
-    "itName": "Existence filter with empty target",
-    "tags": [
-    ],
-    "config": {
-      "numClients": 1,
-      "useGarbageCollection": true
-    },
-    "steps": [
-      {
-        "userListen": {
-          "query": {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          },
-          "targetId": 2
-        },
+        ],
         "expectedState": {
+          "activeLimboDocs": [
+            "collection/a"
+          ],
           "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/a"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
             "2": {
               "queries": [
                 {
                   "filters": [
+                    [
+                      "v",
+                      "<=",
+                      2
+                    ]
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            },
+            "4": {
+              "queries": [
+                {
+                  "filters": [
+                    [
+                      "v",
+                      ">=",
+                      2
+                    ]
                   ],
                   "orderBys": [
                   ],
@@ -2159,67 +9342,115 @@
         }
       },
       {
-        "watchAck": [
-          2
-        ]
-      },
-      {
-        "watchCurrent": [
-          [
-            2
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "CA==",
+              "padding": 4
+            },
+            "hashCount": 1
+          },
+          "keys": [
+            "collection/b"
           ],
-          "resume-token-1000"
-        ]
+          "targetIds": [
+            4
+          ]
+        }
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2000
+          "version": 3000
         },
         "expectedSnapshotEvents": [
           {
             "errorCode": 0,
-            "fromCache": false,
+            "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
+                [
+                  "v",
+                  ">=",
+                  2
+                ]
               ],
               "orderBys": [
               ],
               "path": "collection"
             }
           }
-        ]
-      },
-      {
-        "watchFilter": [
-          [
-            2
-          ],
-          "collection/1"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+            "collection/a",
+            "collection/c"
           ],
-          "version": 2000
-        },
-        "expectedSnapshotEvents": [
-          {
-            "errorCode": 0,
-            "fromCache": true,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
+          "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/a"
+                }
               ],
-              "orderBys": [
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                    [
+                      "v",
+                      "<=",
+                      2
+                    ]
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
               ],
-              "path": "collection"
+              "resumeToken": ""
+            },
+            "3": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/c"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "4": {
+              "queries": [
+                {
+                  "filters": [
+                    [
+                      "v",
+                      ">=",
+                      2
+                    ]
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
             }
           }
-        ]
+        }
       }
     ]
   }
diff --git a/firebase-firestore/src/test/resources/json/garbage_collection_spec_test.json b/firebase-firestore/src/test/resources/json/garbage_collection_spec_test.json
new file mode 100644
index 00000000000..88466d6093d
--- /dev/null
+++ b/firebase-firestore/src/test/resources/json/garbage_collection_spec_test.json
@@ -0,0 +1,1108 @@
+{
+  "Contents of active query are kept while inactive results are removed after GC": {
+    "describeName": "Garbage Collection:",
+    "itName": "Contents of active query are kept while inactive results are removed after GC",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "b"
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "c"
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/d",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "d"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "b"
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "c"
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/d",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "d"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+              [
+                "key",
+                "==",
+                "a"
+              ]
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 4
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+                [
+                  "key",
+                  "==",
+                  "a"
+                ]
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "4": {
+              "queries": [
+                {
+                  "filters": [
+                    [
+                      "key",
+                      "==",
+                      "a"
+                    ]
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          4
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            4
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            4
+          ],
+          "resume-token-1500"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1500
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+                [
+                  "key",
+                  "==",
+                  "a"
+                ]
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userSet": [
+          "collection/c",
+          {
+            "extra": "extra",
+            "key": "c"
+          }
+        ]
+      },
+      {
+        "triggerLruGC": 1
+      },
+      {
+        "userUnlisten": [
+          4,
+          {
+            "filters": [
+              [
+                "key",
+                "==",
+                "a"
+              ]
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 6
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "extra": "extra",
+                  "key": "c"
+                },
+                "version": 0
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "6": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Contents of query are cleared when listen is removed.": {
+    "comment": "Explicitly tests eager GC behavior",
+    "describeName": "Garbage Collection:",
+    "itName": "Contents of query are cleared when listen is removed.",
+    "tags": [
+      "eager-gc"
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 4
+        },
+        "expectedState": {
+          "activeTargets": {
+            "4": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Contents of query are kept after listen is removed, and GC threshold is not reached": {
+    "describeName": "Garbage Collection:",
+    "itName": "Contents of query are kept after listen is removed, and GC threshold is not reached",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "triggerLruGC": 1000000000
+      },
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Contents of query are kept after listen is removed.": {
+    "describeName": "Garbage Collection:",
+    "itName": "Contents of query are kept after listen is removed.",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Contents of query are removed after listen is removed, and GC threshold is reached": {
+    "describeName": "Garbage Collection:",
+    "itName": "Contents of query are removed after listen is removed, and GC threshold is reached",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "triggerLruGC": 1
+      },
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 4
+        },
+        "expectedState": {
+          "activeTargets": {
+            "4": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/firebase-firestore/src/test/resources/json/index_spec_test.json b/firebase-firestore/src/test/resources/json/index_spec_test.json
new file mode 100644
index 00000000000..9e704e75be1
--- /dev/null
+++ b/firebase-firestore/src/test/resources/json/index_spec_test.json
@@ -0,0 +1,252 @@
+{
+  "Index Creation succeeds even if not primary": {
+    "describeName": "Client Side Index",
+    "itName": "Index Creation succeeds even if not primary",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "isPrimary": true
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedState": {
+          "isPrimary": false
+        }
+      },
+      {
+        "clientIndex": 1,
+        "setIndexConfiguration": {
+          "indexes": [
+            {
+              "collectionGroup": "restaurants",
+              "fields": [
+                {
+                  "fieldPath": "price",
+                  "order": "ASCENDING"
+                }
+              ],
+              "queryScope": "COLLECTION"
+            }
+          ]
+        },
+        "expectedState": {
+          "indexes": [
+            {
+              "collectionGroup": "restaurants",
+              "fields": [
+                {
+                  "fieldPath": {
+                    "len": 1,
+                    "offset": 0,
+                    "segments": [
+                      "price"
+                    ]
+                  },
+                  "kind": 0
+                }
+              ],
+              "indexId": -1,
+              "indexState": {
+                "offset": {
+                  "documentKey": {
+                    "path": {
+                      "len": 0,
+                      "offset": 0,
+                      "segments": [
+                      ]
+                    }
+                  },
+                  "largestBatchId": -1,
+                  "readTime": {
+                    "timestamp": {
+                      "nanoseconds": 0,
+                      "seconds": 0
+                    }
+                  }
+                },
+                "sequenceNumber": 0
+              }
+            }
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "indexes": [
+            {
+              "collectionGroup": "restaurants",
+              "fields": [
+                {
+                  "fieldPath": {
+                    "len": 1,
+                    "offset": 0,
+                    "segments": [
+                      "price"
+                    ]
+                  },
+                  "kind": 0
+                }
+              ],
+              "indexId": -1,
+              "indexState": {
+                "offset": {
+                  "documentKey": {
+                    "path": {
+                      "len": 0,
+                      "offset": 0,
+                      "segments": [
+                      ]
+                    }
+                  },
+                  "largestBatchId": -1,
+                  "readTime": {
+                    "timestamp": {
+                      "nanoseconds": 0,
+                      "seconds": 0
+                    }
+                  }
+                },
+                "sequenceNumber": 0
+              }
+            }
+          ]
+        }
+      }
+    ]
+  },
+  "Index Creation visible on all clients": {
+    "describeName": "Client Side Index",
+    "itName": "Index Creation visible on all clients",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "isPrimary": true
+        }
+      },
+      {
+        "clientIndex": 0,
+        "setIndexConfiguration": {
+          "indexes": [
+            {
+              "collectionGroup": "restaurants",
+              "fields": [
+                {
+                  "fieldPath": "price",
+                  "order": "ASCENDING"
+                }
+              ],
+              "queryScope": "COLLECTION"
+            }
+          ]
+        },
+        "expectedState": {
+          "indexes": [
+            {
+              "collectionGroup": "restaurants",
+              "fields": [
+                {
+                  "fieldPath": {
+                    "len": 1,
+                    "offset": 0,
+                    "segments": [
+                      "price"
+                    ]
+                  },
+                  "kind": 0
+                }
+              ],
+              "indexId": -1,
+              "indexState": {
+                "offset": {
+                  "documentKey": {
+                    "path": {
+                      "len": 0,
+                      "offset": 0,
+                      "segments": [
+                      ]
+                    }
+                  },
+                  "largestBatchId": -1,
+                  "readTime": {
+                    "timestamp": {
+                      "nanoseconds": 0,
+                      "seconds": 0
+                    }
+                  }
+                },
+                "sequenceNumber": 0
+              }
+            }
+          ]
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedState": {
+          "indexes": [
+            {
+              "collectionGroup": "restaurants",
+              "fields": [
+                {
+                  "fieldPath": {
+                    "len": 1,
+                    "offset": 0,
+                    "segments": [
+                      "price"
+                    ]
+                  },
+                  "kind": 0
+                }
+              ],
+              "indexId": -1,
+              "indexState": {
+                "offset": {
+                  "documentKey": {
+                    "path": {
+                      "len": 0,
+                      "offset": 0,
+                      "segments": [
+                      ]
+                    }
+                  },
+                  "largestBatchId": -1,
+                  "readTime": {
+                    "timestamp": {
+                      "nanoseconds": 0,
+                      "seconds": 0
+                    }
+                  }
+                },
+                "sequenceNumber": 0
+              }
+            }
+          ],
+          "isPrimary": false
+        }
+      }
+    ]
+  }
+}
diff --git a/firebase-firestore/src/test/resources/json/limbo_spec_test.json b/firebase-firestore/src/test/resources/json/limbo_spec_test.json
index 57f57e909e5..6cb27ecc40d 100644
--- a/firebase-firestore/src/test/resources/json/limbo_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/limbo_spec_test.json
@@ -7,7 +7,7 @@
     "config": {
       "maxConcurrentLimboResolutions": 1,
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -47,6 +47,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection1/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -81,6 +82,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection1/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -141,6 +143,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection1/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234,7 +237,8 @@
                   "path": "collection1/doc"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -279,7 +283,8 @@
                   "path": "collection1/doc"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -322,6 +327,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection2/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -356,6 +362,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection2/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -403,7 +410,8 @@
                   "path": "collection1/doc"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -445,6 +453,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection2/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -485,7 +494,8 @@
                   "path": "collection1/doc"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -567,7 +577,8 @@
                   "path": "collection1/doc"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -629,6 +640,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection2/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -669,7 +681,8 @@
                   "path": "collection1/doc"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "10": {
               "queries": [
@@ -768,7 +781,8 @@
                   "path": "collection1/doc"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "10": {
               "queries": [
@@ -858,7 +872,8 @@
                   "path": "collection1/doc"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -931,7 +946,8 @@
                   "path": "collection1/doc"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -965,7 +981,7 @@
     "config": {
       "maxConcurrentLimboResolutions": 1,
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1005,6 +1021,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection1/doc1",
               "options": {
                 "hasCommittedMutations": false,
@@ -1039,6 +1056,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection1/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1099,6 +1117,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection1/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1192,7 +1211,8 @@
                   "path": "collection1/doc1"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -1237,7 +1257,8 @@
                   "path": "collection1/doc1"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -1280,6 +1301,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection2/doc2",
               "options": {
                 "hasCommittedMutations": false,
@@ -1314,6 +1336,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection2/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1361,7 +1384,8 @@
                   "path": "collection1/doc1"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -1403,6 +1427,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection2/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1443,7 +1468,8 @@
                   "path": "collection1/doc1"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -1525,7 +1551,8 @@
                   "path": "collection1/doc1"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -1587,6 +1614,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection2/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1627,7 +1655,8 @@
                   "path": "collection1/doc1"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "10": {
               "queries": [
@@ -1726,7 +1755,8 @@
                   "path": "collection1/doc1"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "10": {
               "queries": [
@@ -1794,7 +1824,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1834,6 +1864,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -1868,6 +1899,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1928,6 +1960,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2021,7 +2054,8 @@
                   "path": "collection/doc"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -2065,6 +2099,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2105,7 +2140,8 @@
                   "path": "collection/doc"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -2187,7 +2223,8 @@
                   "path": "collection/doc"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -2237,7 +2274,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -2277,6 +2314,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -2288,6 +2326,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -2322,6 +2361,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2333,6 +2373,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2400,7 +2441,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -2450,6 +2492,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2491,7 +2534,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -2541,6 +2584,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -2575,6 +2619,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2618,6 +2663,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2627,7 +2673,7 @@
                   "matches": true,
                   "modified": true
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -2681,6 +2727,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2690,7 +2737,7 @@
                   "matches": true,
                   "modified": true
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "errorCode": 0,
@@ -2778,6 +2825,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2813,7 +2861,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -2860,6 +2909,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2902,7 +2952,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -2976,6 +3026,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -2987,6 +3038,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -3027,6 +3079,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3038,6 +3091,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3097,7 +3151,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -3194,6 +3249,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3217,7 +3273,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -3257,6 +3313,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -3291,6 +3348,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3363,7 +3421,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -3386,11 +3445,13 @@
         ]
       },
       {
-        "watchFilter": [
-          [
+        "watchFilter": {
+          "keys": [
+          ],
+          "targetIds": [
             1
           ]
-        ]
+        }
       },
       {
         "watchCurrent": [
@@ -3420,6 +3481,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3461,7 +3523,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -3501,6 +3563,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -3535,6 +3598,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3607,7 +3671,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -3657,6 +3722,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3699,7 +3765,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -3773,6 +3839,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -3784,6 +3851,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -3824,6 +3892,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3835,6 +3904,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3894,7 +3964,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -4009,7 +4080,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -4062,6 +4134,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4103,7 +4176,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -4153,6 +4226,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -4187,6 +4261,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4269,7 +4344,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -4300,6 +4376,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -4349,6 +4426,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4395,7 +4473,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -4445,6 +4523,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -4479,6 +4558,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4616,7 +4696,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -4669,6 +4750,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -4719,6 +4801,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4734,6 +4817,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4827,7 +4911,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -4889,6 +4973,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": true,
@@ -4900,6 +4985,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": true,
@@ -4949,6 +5035,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -4994,7 +5081,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -5031,6 +5119,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5042,6 +5131,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": true,
@@ -5082,7 +5172,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -5166,6 +5257,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5177,6 +5269,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": true,
@@ -5244,7 +5337,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -5294,6 +5387,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -5305,6 +5399,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -5316,6 +5411,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -5352,6 +5448,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5363,6 +5460,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5374,6 +5472,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5453,7 +5552,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -5477,7 +5577,8 @@
                   "path": "collection/c"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           }
         }
@@ -5588,7 +5689,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -5612,7 +5714,8 @@
                   "path": "collection/c"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           }
         }
@@ -5666,7 +5769,8 @@
                   "path": "collection/c"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           }
         }
@@ -5688,6 +5792,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5784,7 +5889,8 @@
                   "path": "collection/c"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           }
         }
@@ -5825,6 +5931,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5866,7 +5973,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -5906,6 +6013,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -5918,6 +6026,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -5953,6 +6062,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5965,6 +6075,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6028,6 +6139,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6092,6 +6204,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -6156,6 +6269,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6187,6 +6301,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6216,7 +6331,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -6249,6 +6365,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -6292,6 +6409,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -6313,6 +6431,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -6392,7 +6511,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -6432,6 +6551,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -6444,6 +6564,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -6479,6 +6600,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6491,6 +6613,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6554,6 +6677,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6618,6 +6742,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -6682,6 +6807,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6713,6 +6839,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6742,7 +6869,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -6813,6 +6941,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6857,6 +6986,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -6883,15 +7013,14 @@
       }
     ]
   },
-  "Limbo resolution throttling when a limbo listen is rejected.": {
+  "Limbo resolution should wait for full re-query result if there is an existence filter mismatch ": {
     "describeName": "Limbo Documents:",
-    "itName": "Limbo resolution throttling when a limbo listen is rejected.",
+    "itName": "Limbo resolution should wait for full re-query result if there is an existence filter mismatch ",
     "tags": [
     ],
     "config": {
-      "maxConcurrentLimboResolutions": 1,
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -6931,24 +7060,26 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "a"
+                "v": 1
               },
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "b"
+                "v": 2
               },
               "version": 1000
             }
@@ -6976,24 +7107,26 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "a"
+                  "v": 1
                 },
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "b"
+                  "v": 2
                 },
                 "version": 1000
               }
@@ -7012,33 +7145,7 @@
         ]
       },
       {
-        "watchReset": [
-          2
-        ]
-      },
-      {
-        "watchEntity": {
-          "docs": [
-          ],
-          "targets": [
-            2
-          ]
-        }
-      },
-      {
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-1001"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 2000
-        },
+        "enableNetwork": false,
         "expectedSnapshotEvents": [
           {
             "errorCode": 0,
@@ -7055,21 +7162,63 @@
         ],
         "expectedState": {
           "activeLimboDocs": [
-            "collection/a"
           ],
           "activeTargets": {
-            "1": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "enableNetwork": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
               "queries": [
                 {
                   "filters": [
                   ],
                   "orderBys": [
                   ],
-                  "path": "collection/a"
+                  "path": "collection"
                 }
               ],
-              "resumeToken": ""
-            },
+              "resumeToken": "resume-token-1000"
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchFilter": {
+          "keys": [
+            "collection/a"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedState": {
+          "activeTargets": {
             "2": {
               "queries": [
                 {
@@ -7080,92 +7229,111 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
             }
-          },
-          "enqueuedLimboDocs": [
-            "collection/b"
-          ]
+          }
         }
       },
       {
         "watchRemove": {
-          "cause": {
-            "code": 8
-          },
           "targetIds": [
-            1
+            2
+          ]
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
           ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-3000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 3000
         },
-        "expectedSnapshotEvents": [
-          {
-            "errorCode": 0,
-            "fromCache": true,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            },
-            "removed": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 1000
-              }
-            ]
-          }
-        ],
         "expectedState": {
           "activeLimboDocs": [
             "collection/b"
           ],
           "activeTargets": {
-            "2": {
+            "1": {
               "queries": [
                 {
                   "filters": [
                   ],
                   "orderBys": [
                   ],
-                  "path": "collection"
+                  "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
-            "3": {
+            "2": {
               "queries": [
                 {
                   "filters": [
                   ],
                   "orderBys": [
                   ],
-                  "path": "collection/b"
+                  "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
             }
-          },
-          "enqueuedLimboDocs": [
-          ]
+          }
         }
       },
       {
-        "watchRemove": {
-          "cause": {
-            "code": 8
-          },
+        "watchAck": [
+          1
+        ]
+      },
+      {
+        "watchCurrent": [
+          [
+            1
+          ],
+          "resume-token-3000"
+        ]
+      },
+      {
+        "watchSnapshot": {
           "targetIds": [
-            3
-          ]
+          ],
+          "version": 3000
         },
         "expectedSnapshotEvents": [
           {
@@ -7181,13 +7349,14 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "b"
+                  "v": 2
                 },
                 "version": 1000
               }
@@ -7208,24 +7377,23 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
             }
-          },
-          "enqueuedLimboDocs": [
-          ]
+          }
         }
       }
     ]
   },
-  "Limbo resolution throttling with all results at once from watch": {
+  "Limbo resolution throttling when a limbo listen is rejected.": {
     "describeName": "Limbo Documents:",
-    "itName": "Limbo resolution throttling with all results at once from watch",
+    "itName": "Limbo resolution throttling when a limbo listen is rejected.",
     "tags": [
     ],
     "config": {
-      "maxConcurrentLimboResolutions": 2,
+      "maxConcurrentLimboResolutions": 1,
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -7265,6 +7433,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -7276,6 +7445,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -7285,8 +7455,351 @@
                 "key": "b"
               },
               "version": 1000
-            },
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "b"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "watchReset": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1001"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+            "collection/a"
+          ],
+          "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/a"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          },
+          "enqueuedLimboDocs": [
+            "collection/b"
+          ]
+        }
+      },
+      {
+        "watchRemove": {
+          "cause": {
+            "code": 8
+          },
+          "targetIds": [
+            1
+          ]
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+            "collection/b"
+          ],
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            },
+            "3": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/b"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            }
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "watchRemove": {
+          "cause": {
+            "code": 8
+          },
+          "targetIds": [
+            3
+          ]
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "b"
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      }
+    ]
+  },
+  "Limbo resolution throttling with all results at once from watch": {
+    "describeName": "Limbo Documents:",
+    "itName": "Limbo resolution throttling with all results at once from watch",
+    "tags": [
+    ],
+    "config": {
+      "maxConcurrentLimboResolutions": 2,
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "b"
+              },
+              "version": 1000
+            },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -7298,6 +7811,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/d",
               "options": {
                 "hasCommittedMutations": false,
@@ -7309,6 +7823,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/e",
               "options": {
                 "hasCommittedMutations": false,
@@ -7343,6 +7858,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7354,6 +7870,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7365,6 +7882,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7376,6 +7894,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/d",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7387,6 +7906,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/e",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7469,7 +7989,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -7493,7 +8014,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           },
           "enqueuedLimboDocs": [
@@ -7549,6 +8071,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7560,6 +8083,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7601,7 +8125,8 @@
                   "path": "collection/c"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "7": {
               "queries": [
@@ -7613,7 +8138,8 @@
                   "path": "collection/d"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           },
           "enqueuedLimboDocs": [
@@ -7642,59 +8168,346 @@
       {
         "watchCurrent": [
           [
-            7
+            7
+          ],
+          "resume-token-2002"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2002
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "c"
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/d",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "d"
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+            "collection/e"
+          ],
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            },
+            "9": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/e"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            }
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "watchAck": [
+          9
+        ]
+      },
+      {
+        "watchCurrent": [
+          [
+            9
+          ],
+          "resume-token-2003"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2003
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/e",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "e"
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      }
+    ]
+  },
+  "Limbo resolution throttling with bloom filter application": {
+    "describeName": "Limbo Documents:",
+    "itName": "Limbo resolution throttling with bloom filter application",
+    "tags": [
+    ],
+    "config": {
+      "maxConcurrentLimboResolutions": 2,
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a1"
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/a2",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a2"
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/a3",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a3"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
           ],
-          "resume-token-2002"
+          "resume-token-1000"
         ]
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2002
+          "version": 1000
         },
         "expectedSnapshotEvents": [
           {
-            "errorCode": 0,
-            "fromCache": true,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            },
-            "removed": [
+            "added": [
               {
-                "key": "collection/c",
+                "createTime": 0,
+                "key": "collection/a1",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "c"
+                  "key": "a1"
                 },
                 "version": 1000
               },
               {
-                "key": "collection/d",
+                "createTime": 0,
+                "key": "collection/a2",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "d"
+                  "key": "a2"
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/a3",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a3"
                 },
                 "version": 1000
               }
-            ]
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "enableNetwork": false,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
           }
         ],
         "expectedState": {
           "activeLimboDocs": [
-            "collection/e"
           ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "enableNetwork": true,
+        "expectedState": {
           "activeTargets": {
             "2": {
               "queries": [
@@ -7706,75 +8519,165 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
-            },
-            "9": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection/e"
-                }
-              ],
-              "resumeToken": ""
+              "resumeToken": "resume-token-1000"
             }
-          },
-          "enqueuedLimboDocs": [
-          ]
+          }
         }
       },
       {
         "watchAck": [
-          9
+          2
         ]
       },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/b1",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "b1"
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b2",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "b2"
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b3",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "b3"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchFilter": {
+          "bloomFilter": {
+            "bits": {
+              "bitmap": "yABCEAeZURNRGAkgAQ==",
+              "padding": 4
+            },
+            "hashCount": 10
+          },
+          "keys": [
+            "collection/b1",
+            "collection/b2",
+            "collection/b3"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
       {
         "watchCurrent": [
           [
-            9
+            2
           ],
-          "resume-token-2003"
+          "resume-token-1001"
         ]
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2003
+          "version": 1001
         },
         "expectedSnapshotEvents": [
           {
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            },
-            "removed": [
+            "added": [
               {
-                "key": "collection/e",
+                "createTime": 0,
+                "key": "collection/b1",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "e"
+                  "key": "b1"
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b2",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "b2"
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b3",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "b3"
                 },
                 "version": 1000
               }
-            ]
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
           }
         ],
         "expectedState": {
           "activeLimboDocs": [
+            "collection/a1",
+            "collection/a2"
           ],
           "activeTargets": {
+            "1": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/a1"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
+            },
             "2": {
               "queries": [
                 {
@@ -7785,10 +8688,24 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "resume-token-1000"
+            },
+            "3": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection/a2"
+                }
+              ],
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           },
           "enqueuedLimboDocs": [
+            "collection/a3"
           ]
         }
       }
@@ -7802,7 +8719,7 @@
     "config": {
       "maxConcurrentLimboResolutions": 2,
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -7842,6 +8759,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a1",
               "options": {
                 "hasCommittedMutations": false,
@@ -7853,6 +8771,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/a2",
               "options": {
                 "hasCommittedMutations": false,
@@ -7864,6 +8783,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/a3",
               "options": {
                 "hasCommittedMutations": false,
@@ -7898,6 +8818,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7909,6 +8830,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/a2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7920,6 +8842,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/a3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7997,6 +8920,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b1",
               "options": {
                 "hasCommittedMutations": false,
@@ -8008,6 +8932,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b2",
               "options": {
                 "hasCommittedMutations": false,
@@ -8019,6 +8944,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b3",
               "options": {
                 "hasCommittedMutations": false,
@@ -8036,13 +8962,23 @@
         }
       },
       {
-        "watchFilter": [
+        "watchFilter": {
+          "keys": [
+            "collection/b1",
+            "collection/b2",
+            "collection/b3"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
           [
             2
           ],
-          "collection/b1",
-          "collection/b2",
-          "collection/b3"
+          "resume-token-1001"
         ]
       },
       {
@@ -8055,6 +8991,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8066,6 +9003,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8077,6 +9015,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8112,7 +9051,8 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
             }
           }
         }
@@ -8133,6 +9073,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b1",
               "options": {
                 "hasCommittedMutations": false,
@@ -8144,6 +9085,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b2",
               "options": {
                 "hasCommittedMutations": false,
@@ -8155,6 +9097,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b3",
               "options": {
                 "hasCommittedMutations": false,
@@ -8201,7 +9144,8 @@
                   "path": "collection/a1"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -8213,7 +9157,8 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
             },
             "3": {
               "queries": [
@@ -8225,7 +9170,8 @@
                   "path": "collection/a2"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           },
           "enqueuedLimboDocs": [
@@ -8279,6 +9225,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8290,6 +9237,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/a2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8318,7 +9266,8 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
             },
             "5": {
               "queries": [
@@ -8330,7 +9279,8 @@
                   "path": "collection/a3"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           },
           "enqueuedLimboDocs": [
@@ -8370,6 +9320,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8397,7 +9348,8 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
             }
           },
           "enqueuedLimboDocs": [
@@ -8414,7 +9366,7 @@
     "config": {
       "maxConcurrentLimboResolutions": 2,
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -8454,6 +9406,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -8465,6 +9418,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -8476,6 +9430,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -8487,6 +9442,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/d",
               "options": {
                 "hasCommittedMutations": false,
@@ -8498,6 +9454,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/e",
               "options": {
                 "hasCommittedMutations": false,
@@ -8532,6 +9489,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8543,6 +9501,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8554,6 +9513,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8565,6 +9525,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/d",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8576,6 +9537,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/e",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8658,7 +9620,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -8682,7 +9645,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           },
           "enqueuedLimboDocs": [
@@ -8730,6 +9694,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8771,7 +9736,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "5": {
               "queries": [
@@ -8783,7 +9749,8 @@
                   "path": "collection/c"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           },
           "enqueuedLimboDocs": [
@@ -8825,6 +9792,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8866,7 +9834,8 @@
                   "path": "collection/c"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "7": {
               "queries": [
@@ -8878,7 +9847,8 @@
                   "path": "collection/d"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           },
           "enqueuedLimboDocs": [
@@ -8919,6 +9889,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8960,7 +9931,8 @@
                   "path": "collection/d"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "9": {
               "queries": [
@@ -8972,7 +9944,8 @@
                   "path": "collection/e"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           },
           "enqueuedLimboDocs": [
@@ -9012,6 +9985,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/d",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9052,7 +10026,8 @@
                   "path": "collection/e"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           },
           "enqueuedLimboDocs": [
@@ -9087,6 +10062,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/e",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9131,7 +10107,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -9226,6 +10202,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -9237,6 +10214,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -9248,6 +10226,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -9288,6 +10267,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9299,6 +10279,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9310,6 +10291,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9354,6 +10336,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -9365,6 +10348,7 @@
               "version": 2000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -9376,6 +10360,7 @@
               "version": 2000
             },
             {
+              "createTime": 0,
               "key": "collection/d",
               "options": {
                 "hasCommittedMutations": false,
@@ -9423,7 +10408,8 @@
                   "path": "collection/c"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -9480,7 +10466,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -9575,6 +10561,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -9586,6 +10573,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -9597,6 +10585,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -9637,6 +10626,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9648,6 +10638,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9659,6 +10650,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9703,6 +10695,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -9714,6 +10707,7 @@
               "version": 2000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -9725,6 +10719,7 @@
               "version": 2000
             },
             {
+              "createTime": 0,
               "key": "collection/d",
               "options": {
                 "hasCommittedMutations": false,
@@ -9765,6 +10760,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/d",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9781,6 +10777,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9792,6 +10789,7 @@
                 "version": 2000
               },
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9818,6 +10816,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
diff --git a/firebase-firestore/src/test/resources/json/limit_spec_test.json b/firebase-firestore/src/test/resources/json/limit_spec_test.json
index 40e48205956..86ae7f214c9 100644
--- a/firebase-firestore/src/test/resources/json/limit_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/limit_spec_test.json
@@ -6,7 +6,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -50,6 +50,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -61,6 +62,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -95,6 +97,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -106,6 +109,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -141,6 +145,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -152,6 +157,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -213,7 +219,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -255,6 +262,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -280,6 +288,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -323,7 +332,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -418,6 +427,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -429,6 +439,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -449,6 +460,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -460,6 +472,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -502,6 +515,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -513,6 +527,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -540,6 +555,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -551,6 +567,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -581,6 +598,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -616,6 +634,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -641,6 +660,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -656,6 +676,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -725,7 +746,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -769,6 +790,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -780,6 +802,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -814,6 +837,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -825,6 +849,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -855,6 +880,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -875,6 +901,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -901,6 +928,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -926,6 +954,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -949,7 +978,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -993,6 +1022,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1004,6 +1034,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -1038,6 +1069,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1049,6 +1081,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1079,6 +1112,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -1113,6 +1147,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1138,6 +1173,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1181,7 +1217,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1225,6 +1261,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1236,6 +1273,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -1270,6 +1308,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1281,6 +1320,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1350,6 +1390,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1361,6 +1402,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1414,7 +1456,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1454,6 +1496,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1465,6 +1508,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -1476,6 +1520,7 @@
               "version": 1002
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -1510,6 +1555,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1521,6 +1567,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1532,6 +1579,7 @@
                 "version": 1002
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1600,6 +1648,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1611,6 +1660,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1672,6 +1722,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1683,6 +1734,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -1792,6 +1844,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1803,6 +1856,7 @@
                 "version": 1002
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1864,7 +1918,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1914,6 +1968,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1925,6 +1980,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -1936,6 +1992,7 @@
               "version": 1002
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -1970,6 +2027,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1981,6 +2039,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1992,6 +2051,7 @@
                 "version": 1002
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2064,6 +2124,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2075,6 +2136,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2138,6 +2200,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -2149,6 +2212,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -2261,6 +2325,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2272,6 +2337,7 @@
                 "version": 1002
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2335,7 +2401,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -2375,6 +2441,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -2386,6 +2453,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -2397,6 +2465,7 @@
               "version": 1002
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -2431,6 +2500,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2442,6 +2512,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2453,6 +2524,7 @@
                 "version": 1002
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2521,6 +2593,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2532,6 +2605,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2593,6 +2667,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -2604,6 +2679,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -2699,6 +2775,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2710,6 +2787,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2721,6 +2799,7 @@
                 "version": 1002
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2770,6 +2849,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -2807,6 +2887,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2849,6 +2930,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2860,6 +2942,7 @@
                 "version": 1002
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2934,7 +3017,7 @@
     ],
     "config": {
       "numClients": 3,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -3017,6 +3100,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -3028,6 +3112,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -3068,6 +3153,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3079,6 +3165,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3125,6 +3212,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3150,6 +3238,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3179,6 +3268,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -3200,6 +3290,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -3234,6 +3325,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3280,7 +3372,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -3363,6 +3455,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -3374,6 +3467,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -3414,6 +3508,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3425,6 +3520,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3460,6 +3556,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -3481,6 +3578,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -3512,6 +3610,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3537,6 +3636,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3560,7 +3660,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -3610,6 +3710,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -3621,6 +3722,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -3632,6 +3734,7 @@
               "version": 1002
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -3666,6 +3769,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3677,6 +3781,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3688,6 +3793,7 @@
                 "version": 1002
               },
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3760,6 +3866,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3771,6 +3878,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3836,6 +3944,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3866,6 +3975,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3889,7 +3999,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -3933,6 +4043,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -3944,6 +4055,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -3978,6 +4090,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3989,6 +4102,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4030,6 +4144,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4041,6 +4156,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4104,6 +4220,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -4115,6 +4232,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -4126,6 +4244,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -4137,6 +4256,7 @@
               "version": 1002
             },
             {
+              "createTime": 0,
               "key": "collection/d",
               "options": {
                 "hasCommittedMutations": false,
@@ -4148,6 +4268,7 @@
               "version": 1003
             },
             {
+              "createTime": 0,
               "key": "collection/e",
               "options": {
                 "hasCommittedMutations": false,
@@ -4159,6 +4280,7 @@
               "version": 1004
             },
             {
+              "createTime": 0,
               "key": "collection/f",
               "options": {
                 "hasCommittedMutations": false,
@@ -4193,6 +4315,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4204,6 +4327,7 @@
                 "version": 1002
               },
               {
+                "createTime": 0,
                 "key": "collection/d",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4215,6 +4339,7 @@
                 "version": 1003
               },
               {
+                "createTime": 0,
                 "key": "collection/e",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4226,6 +4351,7 @@
                 "version": 1004
               },
               {
+                "createTime": 0,
                 "key": "collection/f",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4259,6 +4385,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/e",
               "options": {
                 "hasCommittedMutations": false,
@@ -4270,6 +4397,7 @@
               "version": 1004
             },
             {
+              "createTime": 0,
               "key": "collection/f",
               "options": {
                 "hasCommittedMutations": false,
@@ -4332,7 +4460,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -4358,7 +4487,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -4408,6 +4538,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4423,6 +4554,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4448,6 +4580,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4491,7 +4624,8 @@
                   "path": "collection/b"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -4515,7 +4649,8 @@
                   "path": "collection/c"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           }
         }
@@ -4560,6 +4695,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4575,6 +4711,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/d",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4600,6 +4737,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4655,7 +4793,8 @@
                   "path": "collection/c"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "7": {
               "queries": [
@@ -4667,7 +4806,8 @@
                   "path": "collection/d"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           }
         }
@@ -4712,6 +4852,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4727,6 +4868,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/e",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4752,6 +4894,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4806,7 +4949,8 @@
                   "path": "collection/d"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             }
           }
         }
@@ -4851,6 +4995,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/d",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4866,6 +5011,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/f",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4891,6 +5037,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/d",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4954,7 +5101,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -5006,6 +5153,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -5040,6 +5188,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5118,6 +5267,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5175,6 +5325,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -5186,6 +5337,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -5220,6 +5372,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5295,7 +5448,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -5377,6 +5531,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5438,6 +5593,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -5455,11 +5611,21 @@
         }
       },
       {
-        "watchFilter": [
+        "watchFilter": {
+          "keys": [
+            "collection/b"
+          ],
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
           [
             2
           ],
-          "collection/b"
+          "resume-token-1004"
         ]
       },
       {
@@ -5486,7 +5652,8 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
             }
           }
         }
@@ -5507,6 +5674,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -5552,7 +5720,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -5570,7 +5739,8 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
             }
           }
         }
@@ -5598,6 +5768,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5627,6 +5798,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5660,7 +5832,8 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeExistenceFilterMismatch"
             }
           }
         }
@@ -5674,7 +5847,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -5726,6 +5899,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -5760,6 +5934,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5838,6 +6013,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5895,6 +6071,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -5906,6 +6083,7 @@
               "version": 2003
             },
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -5940,6 +6118,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5956,6 +6135,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6029,6 +6209,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
diff --git a/firebase-firestore/src/test/resources/json/listen_source_spec_test.json b/firebase-firestore/src/test/resources/json/listen_source_spec_test.json
new file mode 100644
index 00000000000..1912afc320f
--- /dev/null
+++ b/firebase-firestore/src/test/resources/json/listen_source_spec_test.json
@@ -0,0 +1,5895 @@
+{
+  "Clients can have multiple listeners with different sources": {
+    "describeName": "Listens source options:",
+    "itName": "Clients can have multiple listeners with different sources",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          },
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          },
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Contents of query are cleared when listen is removed.": {
+    "comment": "Explicitly tests eager GC behavior",
+    "describeName": "Listens source options:",
+    "itName": "Contents of query are cleared when listen is removed.",
+    "tags": [
+      "eager-gc"
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userSet": [
+          "collection/a",
+          {
+            "key": "a"
+          }
+        ]
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 0
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "writeAck": {
+          "version": 1000
+        },
+        "expectedState": {
+          "userCallbacks": {
+            "acknowledgedDocs": [
+              "collection/a"
+            ],
+            "rejectedDocs": [
+            ]
+          }
+        }
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 4
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      }
+    ]
+  },
+  "Documents are cleared when listen is removed.": {
+    "describeName": "Listens source options:",
+    "itName": "Documents are cleared when listen is removed.",
+    "tags": [
+      "eager-gc"
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userSet": [
+          "collection/a",
+          {
+            "matches": true
+          }
+        ]
+      },
+      {
+        "userSet": [
+          "collection/b",
+          {
+            "matches": true
+          }
+        ]
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+              [
+                "matches",
+                "==",
+                true
+              ]
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "matches": true
+                },
+                "version": 0
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "matches": true
+                },
+                "version": 0
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "query": {
+              "filters": [
+                [
+                  "matches",
+                  "==",
+                  true
+                ]
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "writeAck": {
+          "version": 1000
+        },
+        "expectedState": {
+          "userCallbacks": {
+            "acknowledgedDocs": [
+              "collection/a"
+            ],
+            "rejectedDocs": [
+            ]
+          }
+        }
+      },
+      {
+        "writeAck": {
+          "version": 2000
+        },
+        "expectedState": {
+          "userCallbacks": {
+            "acknowledgedDocs": [
+              "collection/b"
+            ],
+            "rejectedDocs": [
+            ]
+          }
+        }
+      },
+      {
+        "userSet": [
+          "collection/b",
+          {
+            "matches": false
+          }
+        ],
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "query": {
+              "filters": [
+                [
+                  "matches",
+                  "==",
+                  true
+                ]
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "matches": true
+                },
+                "version": 0
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+              [
+                "matches",
+                "==",
+                true
+              ]
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "writeAck": {
+          "version": 3000
+        },
+        "expectedState": {
+          "userCallbacks": {
+            "acknowledgedDocs": [
+              "collection/b"
+            ],
+            "rejectedDocs": [
+            ]
+          }
+        }
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 4
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "userUnlisten": [
+          4,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      }
+    ]
+  },
+  "Doesn't include unknown documents in cached result": {
+    "describeName": "Listens source options:",
+    "itName": "Doesn't include unknown documents in cached result",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userSet": [
+          "collection/exists",
+          {
+            "key": "a"
+          }
+        ]
+      },
+      {
+        "userPatch": [
+          "collection/unknown",
+          {
+            "key": "b"
+          }
+        ]
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/exists",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 0
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      }
+    ]
+  },
+  "Doesn't raise 'hasPendingWrites' for deletes": {
+    "describeName": "Listens source options:",
+    "itName": "Doesn't raise 'hasPendingWrites' for deletes",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "userDelete": "collection/a",
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "writeAck": {
+          "version": 2000
+        },
+        "expectedState": {
+          "userCallbacks": {
+            "acknowledgedDocs": [
+              "collection/a"
+            ],
+            "rejectedDocs": [
+            ]
+          }
+        }
+      }
+    ]
+  },
+  "Empty initial snapshot is raised from cache": {
+    "describeName": "Listens source options:",
+    "itName": "Empty initial snapshot is raised from cache",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      }
+    ]
+  },
+  "Empty-due-to-delete initial snapshot is raised from cache": {
+    "describeName": "Listens source options:",
+    "itName": "Empty-due-to-delete initial snapshot is raised from cache",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "userDelete": "collection/a"
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      }
+    ]
+  },
+  "Listeners with different source shares watch changes between primary and secondary clients": {
+    "describeName": "Listens source options:",
+    "itName": "Listeners with different source shares watch changes between primary and secondary clients",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 3,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 2,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 2,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 2,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      }
+    ]
+  },
+  "Local mutations notifies listeners sourced from cache in all tabs": {
+    "describeName": "Listens source options:",
+    "itName": "Local mutations notifies listeners sourced from cache in all tabs",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "userSet": [
+          "collection/a",
+          {
+            "key": "a"
+          }
+        ],
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 0
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 0
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Mirror queries being listened from different sources while listening to server in primary tab": {
+    "describeName": "Listens source options:",
+    "itName": "Mirror queries being listened from different sources while listening to server in primary tab",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToFirst",
+            "orderBys": [
+              [
+                "sort",
+                "asc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToFirst",
+                  "orderBys": [
+                    [
+                      "sort",
+                      "asc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "sort": 0
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "sort": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 0
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToFirst",
+              "orderBys": [
+                [
+                  "sort",
+                  "asc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToLast",
+            "orderBys": [
+              [
+                "sort",
+                "desc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 0
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToLast",
+              "orderBys": [
+                [
+                  "sort",
+                  "desc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "sort": -1
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": -1
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToFirst",
+              "orderBys": [
+                [
+                  "sort",
+                  "asc"
+                ]
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": -1
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToLast",
+              "orderBys": [
+                [
+                  "sort",
+                  "desc"
+                ]
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "Mirror queries being listened in different clients sourced from cache ": {
+    "describeName": "Listens source options:",
+    "itName": "Mirror queries being listened in different clients sourced from cache ",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "sort": 0
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "sort": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "sort": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 0
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToFirst",
+            "orderBys": [
+              [
+                "sort",
+                "asc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 4
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 0
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToFirst",
+              "orderBys": [
+                [
+                  "sort",
+                  "asc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToLast",
+            "orderBys": [
+              [
+                "sort",
+                "desc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 4
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 0
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToLast",
+              "orderBys": [
+                [
+                  "sort",
+                  "desc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "userUnlisten": [
+          4,
+          {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToFirst",
+            "orderBys": [
+              [
+                "sort",
+                "asc"
+              ]
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "userSet": [
+          "collection/c",
+          {
+            "sort": -1
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "sort": -1
+                },
+                "version": 0
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToLast",
+              "orderBys": [
+                [
+                  "sort",
+                  "desc"
+                ]
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "Mirror queries being listened in the same secondary client sourced from cache": {
+    "describeName": "Listens source options:",
+    "itName": "Mirror queries being listened in the same secondary client sourced from cache",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "sort": 0
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "sort": 1
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "sort": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 0
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToFirst",
+            "orderBys": [
+              [
+                "sort",
+                "asc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 4
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 0
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToFirst",
+              "orderBys": [
+                [
+                  "sort",
+                  "asc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToLast",
+            "orderBys": [
+              [
+                "sort",
+                "desc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 4
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 0
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToLast",
+              "orderBys": [
+                [
+                  "sort",
+                  "desc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 1,
+        "userUnlisten": [
+          4,
+          {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToFirst",
+            "orderBys": [
+              [
+                "sort",
+                "asc"
+              ]
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 1,
+        "userSet": [
+          "collection/c",
+          {
+            "sort": -1
+          }
+        ],
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "sort": -1
+                },
+                "version": 0
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToLast",
+              "orderBys": [
+                [
+                  "sort",
+                  "desc"
+                ]
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "Mirror queries from different sources while listening to server in secondary tab": {
+    "describeName": "Listens source options:",
+    "itName": "Mirror queries from different sources while listening to server in secondary tab",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToFirst",
+            "orderBys": [
+              [
+                "sort",
+                "asc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToFirst",
+                  "orderBys": [
+                    [
+                      "sort",
+                      "asc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToFirst",
+                  "orderBys": [
+                    [
+                      "sort",
+                      "asc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "sort": 0
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "sort": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 0
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToFirst",
+              "orderBys": [
+                [
+                  "sort",
+                  "asc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToLast",
+            "orderBys": [
+              [
+                "sort",
+                "desc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 0
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToLast",
+              "orderBys": [
+                [
+                  "sort",
+                  "desc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToFirst",
+                  "orderBys": [
+                    [
+                      "sort",
+                      "asc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "sort": -1
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": -1
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToLast",
+              "orderBys": [
+                [
+                  "sort",
+                  "desc"
+                ]
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": -1
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToFirst",
+              "orderBys": [
+                [
+                  "sort",
+                  "asc"
+                ]
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "sort": 1
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "Newer deleted docs from bundles should delete cached docs": {
+    "describeName": "Listens source options:",
+    "itName": "Newer deleted docs from bundles should delete cached docs",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "value": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "loadBundle": "127{\"metadata\":{\"id\":\"test-bundle\",\"createTime\":\"1970-01-01T00:00:00.003000000Z\",\"version\":1,\"totalDocuments\":1,\"totalBytes\":158}}155{\"documentMetadata\":{\"name\":\"projects/test-project/databases/(default)/documents/collection/a\",\"readTime\":\"1970-01-01T00:00:00.003000000Z\",\"exists\":false}}",
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "a"
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "Newer docs from bundles should keep not raise snapshot if there are unacknowledged writes": {
+    "describeName": "Listens source options:",
+    "itName": "Newer docs from bundles should keep not raise snapshot if there are unacknowledged writes",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "value": "a"
+              },
+              "version": 250
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-250"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 250
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "a"
+                },
+                "version": 250
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "a"
+                },
+                "version": 250
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "userPatch": [
+          "collection/a",
+          {
+            "value": "patched"
+          }
+        ],
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "modified": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "value": "patched"
+                },
+                "version": 0
+              }
+            ],
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "loadBundle": "127{\"metadata\":{\"id\":\"test-bundle\",\"createTime\":\"1970-01-01T00:00:00.001001000Z\",\"version\":1,\"totalDocuments\":1,\"totalBytes\":388}}154{\"documentMetadata\":{\"name\":\"projects/test-project/databases/(default)/documents/collection/a\",\"readTime\":\"1970-01-01T00:00:00.001001000Z\",\"exists\":true}}228{\"document\":{\"name\":\"projects/test-project/databases/(default)/documents/collection/a\",\"createTime\":\"1970-01-01T00:00:00.000250000Z\",\"updateTime\":\"1970-01-01T00:00:00.001001000Z\",\"fields\":{\"value\":{\"stringValue\":\"fromBundle\"}}}}"
+      }
+    ]
+  },
+  "Newer docs from bundles should overwrite cache": {
+    "describeName": "Listens source options:",
+    "itName": "Newer docs from bundles should overwrite cache",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "value": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "loadBundle": "127{\"metadata\":{\"id\":\"test-bundle\",\"createTime\":\"1970-01-01T00:00:00.003000000Z\",\"version\":1,\"totalDocuments\":1,\"totalBytes\":379}}154{\"documentMetadata\":{\"name\":\"projects/test-project/databases/(default)/documents/collection/a\",\"readTime\":\"1970-01-01T00:00:00.003000000Z\",\"exists\":true}}219{\"document\":{\"name\":\"projects/test-project/databases/(default)/documents/collection/a\",\"createTime\":\"1970-01-01T00:00:00.001999000Z\",\"updateTime\":\"1970-01-01T00:00:00.002999000Z\",\"fields\":{\"value\":{\"stringValue\":\"b\"}}}}",
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "modified": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "b"
+                },
+                "version": 2999
+              }
+            ],
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Newer docs from bundles should raise snapshot only when Watch catches up with acknowledged writes": {
+    "describeName": "Listens source options:",
+    "itName": "Newer docs from bundles should raise snapshot only when Watch catches up with acknowledged writes",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "value": "a"
+              },
+              "version": 250
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-250"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 250
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "a"
+                },
+                "version": 250
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "a"
+                },
+                "version": 250
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "userPatch": [
+          "collection/a",
+          {
+            "value": "patched"
+          }
+        ],
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "modified": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "value": "patched"
+                },
+                "version": 0
+              }
+            ],
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "writeAck": {
+          "version": 1000
+        },
+        "expectedState": {
+          "userCallbacks": {
+            "acknowledgedDocs": [
+              "collection/a"
+            ],
+            "rejectedDocs": [
+            ]
+          }
+        }
+      },
+      {
+        "loadBundle": "127{\"metadata\":{\"id\":\"test-bundle\",\"createTime\":\"1970-01-01T00:00:00.000500000Z\",\"version\":1,\"totalDocuments\":1,\"totalBytes\":379}}154{\"documentMetadata\":{\"name\":\"projects/test-project/databases/(default)/documents/collection/a\",\"readTime\":\"1970-01-01T00:00:00.000500000Z\",\"exists\":true}}219{\"document\":{\"name\":\"projects/test-project/databases/(default)/documents/collection/a\",\"createTime\":\"1970-01-01T00:00:00.000250000Z\",\"updateTime\":\"1970-01-01T00:00:00.000500000Z\",\"fields\":{\"value\":{\"stringValue\":\"b\"}}}}"
+      },
+      {
+        "loadBundle": "127{\"metadata\":{\"id\":\"test-bundle\",\"createTime\":\"1970-01-01T00:00:00.001001000Z\",\"version\":1,\"totalDocuments\":1,\"totalBytes\":388}}154{\"documentMetadata\":{\"name\":\"projects/test-project/databases/(default)/documents/collection/a\",\"readTime\":\"1970-01-01T00:00:00.001001000Z\",\"exists\":true}}228{\"document\":{\"name\":\"projects/test-project/databases/(default)/documents/collection/a\",\"createTime\":\"1970-01-01T00:00:00.000250000Z\",\"updateTime\":\"1970-01-01T00:00:00.001001000Z\",\"fields\":{\"value\":{\"stringValue\":\"fromBundle\"}}}}",
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "modified": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "fromBundle"
+                },
+                "version": 1001
+              }
+            ],
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Older deleted docs from bundles should do nothing": {
+    "describeName": "Listens source options:",
+    "itName": "Older deleted docs from bundles should do nothing",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "value": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "value": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "loadBundle": "127{\"metadata\":{\"id\":\"test-bundle\",\"createTime\":\"1970-01-01T00:00:00.000999000Z\",\"version\":1,\"totalDocuments\":1,\"totalBytes\":158}}155{\"documentMetadata\":{\"name\":\"projects/test-project/databases/(default)/documents/collection/a\",\"readTime\":\"1970-01-01T00:00:00.000999000Z\",\"exists\":false}}"
+      }
+    ]
+  },
+  "Primary client should not invoke watch request while all clients are listening to cache": {
+    "describeName": "Listens source options:",
+    "itName": "Primary client should not invoke watch request while all clients are listening to cache",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      }
+    ]
+  },
+  "Query is executed by primary client even if primary client only has listeners sourced from cache": {
+    "describeName": "Listens source options:",
+    "itName": "Query is executed by primary client even if primary client only has listeners sourced from cache",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Query only raises events in participating clients": {
+    "describeName": "Listens source options:",
+    "itName": "Query only raises events in participating clients",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 4,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 2,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 2,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 3,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 3,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 2,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 3,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Un-listen to listeners from different source": {
+    "describeName": "Listens source options:",
+    "itName": "Un-listen to listeners from different source",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "userSet": [
+          "collection/b",
+          {
+            "key": "b"
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "key": "b"
+                },
+                "version": 0
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      }
+    ]
+  },
+  "onSnapshotsInSync fires for multiple listeners": {
+    "describeName": "Listens source options:",
+    "itName": "onSnapshotsInSync fires for multiple listeners",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "userListen": {
+          "options": {
+            "source": "cache"
+          },
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "addSnapshotsInSyncListener": true,
+        "expectedSnapshotsInSyncEvents": 1
+      },
+      {
+        "userSet": [
+          "collection/a",
+          {
+            "v": 2
+          }
+        ],
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "modified": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "v": 2
+                },
+                "version": 0
+              }
+            ],
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedSnapshotsInSyncEvents": 1
+      },
+      {
+        "addSnapshotsInSyncListener": true,
+        "expectedSnapshotsInSyncEvents": 1
+      },
+      {
+        "addSnapshotsInSyncListener": true,
+        "expectedSnapshotsInSyncEvents": 1
+      },
+      {
+        "userSet": [
+          "collection/a",
+          {
+            "v": 3
+          }
+        ],
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "modified": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "v": 3
+                },
+                "version": 0
+              }
+            ],
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedSnapshotsInSyncEvents": 3
+      },
+      {
+        "removeSnapshotsInSyncListener": true
+      },
+      {
+        "userSet": [
+          "collection/a",
+          {
+            "v": 4
+          }
+        ],
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": true,
+            "modified": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "v": 4
+                },
+                "version": 0
+              }
+            ],
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedSnapshotsInSyncEvents": 2
+      }
+    ]
+  }
+}
diff --git a/firebase-firestore/src/test/resources/json/listen_spec_test.json b/firebase-firestore/src/test/resources/json/listen_spec_test.json
index 1af1ab6594a..7370a0cd675 100644
--- a/firebase-firestore/src/test/resources/json/listen_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/listen_spec_test.json
@@ -6,7 +6,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -99,6 +99,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -139,6 +140,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -221,6 +223,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -333,7 +336,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -438,6 +441,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -449,6 +453,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -483,6 +488,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -494,6 +500,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -525,6 +532,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -536,6 +544,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -610,6 +619,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -644,6 +654,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -673,6 +684,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -708,6 +720,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -719,6 +732,7 @@
                 "version": 2000
               },
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -847,7 +861,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -887,6 +901,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -921,6 +936,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -998,7 +1014,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1038,6 +1054,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1072,6 +1089,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1100,6 +1118,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -1126,6 +1145,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1161,7 +1181,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1219,6 +1239,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1230,6 +1251,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -1264,6 +1286,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1319,6 +1342,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1494,7 +1518,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1534,6 +1558,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "value": null,
               "version": 1000
@@ -1589,7 +1614,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1629,6 +1654,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1655,6 +1681,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1739,6 +1766,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1788,7 +1816,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1822,6 +1850,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/exists",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1871,7 +1900,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1911,6 +1940,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1945,6 +1975,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1985,6 +2016,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2017,6 +2049,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "value": null,
               "version": 2000
@@ -2043,7 +2076,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -2188,6 +2221,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection2/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -2231,6 +2265,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection2/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2257,19 +2292,16 @@
       }
     ]
   },
-  "Ensure correct query results with latency-compensated deletes": {
+  "Empty initial snapshot is raised from cache": {
     "describeName": "Listens:",
-    "itName": "Ensure correct query results with latency-compensated deletes",
+    "itName": "Empty initial snapshot is raised from cache",
     "tags": [
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": false
     },
     "steps": [
-      {
-        "userDelete": "collection/b"
-      },
       {
         "userListen": {
           "query": {
@@ -2306,28 +2338,6 @@
       {
         "watchEntity": {
           "docs": [
-            {
-              "key": "collection/a",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "a": true
-              },
-              "version": 1000
-            },
-            {
-              "key": "collection/b",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "b": true
-              },
-              "version": 1000
-            }
           ],
           "targets": [
             2
@@ -2350,19 +2360,6 @@
         },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "a": true
-                },
-                "version": 1000
-              }
-            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -2376,42 +2373,48 @@
           }
         ]
       },
+      {
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
       {
         "userListen": {
           "query": {
             "filters": [
             ],
-            "limit": 10,
-            "limitType": "LimitToFirst",
             "orderBys": [
             ],
             "path": "collection"
           },
-          "targetId": 4
+          "targetId": 2
         },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "a": true
-                },
-                "version": 1000
-              }
-            ],
             "errorCode": 0,
             "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
               ],
-              "limit": 10,
-              "limitType": "LimitToFirst",
               "orderBys": [
               ],
               "path": "collection"
@@ -2430,38 +2433,73 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
-            },
-            "4": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "limit": 10,
-                  "limitType": "LimitToFirst",
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": ""
+              "resumeToken": "resume-token-1000"
             }
           }
         }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
       }
     ]
   },
-  "Ignores update from inactive target": {
+  "Empty initial snapshot is raised from cache in multiple tabs": {
     "describeName": "Listens:",
-    "itName": "Ignores update from inactive target",
+    "itName": "Empty initial snapshot is raised from cache in multiple tabs",
     "tags": [
+      "multi-client"
     ],
     "config": {
-      "numClients": 1,
-      "useGarbageCollection": false
+      "numClients": 2,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
         "userListen": {
           "query": {
             "filters": [
@@ -2490,24 +2528,15 @@
         }
       },
       {
+        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
+        "clientIndex": 0,
         "watchEntity": {
           "docs": [
-            {
-              "key": "collection/a",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "key": "a"
-              },
-              "version": 1000
-            }
           ],
           "targets": [
             2
@@ -2515,6 +2544,7 @@
         }
       },
       {
+        "clientIndex": 0,
         "watchCurrent": [
           [
             2
@@ -2523,6 +2553,7 @@
         ]
       },
       {
+        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
@@ -2530,19 +2561,6 @@
         },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 1000
-              }
-            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -2557,6 +2575,7 @@
         ]
       },
       {
+        "clientIndex": 0,
         "userUnlisten": [
           2,
           {
@@ -2573,33 +2592,7 @@
         }
       },
       {
-        "watchEntity": {
-          "docs": [
-            {
-              "key": "collection/b",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "key": "b"
-              },
-              "version": 2000
-            }
-          ],
-          "targets": [
-            2
-          ]
-        }
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 2000
-        }
-      },
-      {
+        "clientIndex": 0,
         "watchRemove": {
           "targetIds": [
             2
@@ -2607,6 +2600,11 @@
         }
       },
       {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
         "userListen": {
           "query": {
             "filters": [
@@ -2619,19 +2617,6 @@
         },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 1000
-              }
-            ],
             "errorCode": 0,
             "fromCache": true,
             "hasPendingWrites": false,
@@ -2656,50 +2641,111 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-1000"
+              "resumeToken": ""
             }
           }
         }
-      }
-    ]
-  },
-  "Individual (deleted) documents cannot revert": {
-    "describeName": "Listens:",
-    "itName": "Individual (deleted) documents cannot revert",
-    "tags": [
-    ],
-    "config": {
-      "numClients": 1,
-      "useGarbageCollection": false
-    },
-    "steps": [
+      },
       {
-        "userListen": {
-          "query": {
-            "filters": [
-              [
-                "visible",
-                "==",
-                true
-              ]
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          },
-          "targetId": 2
-        },
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Empty-due-to-delete initial snapshot is raised from cache": {
+    "describeName": "Listens:",
+    "itName": "Empty-due-to-delete initial snapshot is raised from cache",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
         "expectedState": {
           "activeTargets": {
             "2": {
               "queries": [
                 {
                   "filters": [
-                    [
-                      "visible",
-                      "==",
-                      true
-                    ]
                   ],
                   "orderBys": [
                   ],
@@ -2720,14 +2766,14 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "v": "v1000",
-                "visible": true
+                "v": 1
               },
               "version": 1000
             }
@@ -2755,14 +2801,14 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "v": "v1000",
-                  "visible": true
+                  "v": 1
                 },
                 "version": 1000
               }
@@ -2772,11 +2818,6 @@
             "hasPendingWrites": false,
             "query": {
               "filters": [
-                [
-                  "visible",
-                  "==",
-                  true
-                ]
               ],
               "orderBys": [
               ],
@@ -2790,11 +2831,6 @@
           2,
           {
             "filters": [
-              [
-                "visible",
-                "==",
-                true
-              ]
             ],
             "orderBys": [
             ],
@@ -2813,6 +2849,9 @@
           ]
         }
       },
+      {
+        "userDelete": "collection/a"
+      },
       {
         "userListen": {
           "query": {
@@ -2822,24 +2861,10 @@
             ],
             "path": "collection"
           },
-          "targetId": 4
+          "targetId": 2
         },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "v": "v1000",
-                  "visible": true
-                },
-                "version": 1000
-              }
-            ],
             "errorCode": 0,
             "fromCache": true,
             "hasPendingWrites": false,
@@ -2854,7 +2879,53 @@
         ],
         "expectedState": {
           "activeTargets": {
-            "4": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          }
+        }
+      }
+    ]
+  },
+  "Empty-due-to-delete initial snapshot is raised from cache in multiple tabs": {
+    "describeName": "Listens:",
+    "itName": "Empty-due-to-delete initial snapshot is raised from cache in multiple tabs",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
               "queries": [
                 {
                   "filters": [
@@ -2870,70 +2941,82 @@
         }
       },
       {
+        "clientIndex": 0,
         "watchAck": [
-          4
+          2
         ]
       },
       {
+        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
-              "value": null,
-              "version": 3000
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "v": 1
+              },
+              "version": 1000
             }
           ],
-          "removedTargets": [
-            4
+          "targets": [
+            2
           ]
         }
       },
       {
+        "clientIndex": 0,
         "watchCurrent": [
           [
-            4
+            2
           ],
-          "resume-token-4000"
+          "resume-token-1000"
         ]
       },
       {
+        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 4000
+          "version": 1000
         },
         "expectedSnapshotEvents": [
           {
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            },
-            "removed": [
+            "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "v": "v1000",
-                  "visible": true
+                  "v": 1
                 },
                 "version": 1000
               }
-            ]
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
           }
         ]
       },
       {
+        "clientIndex": 0,
         "userUnlisten": [
-          4,
+          2,
           {
             "filters": [
             ],
@@ -2948,21 +3031,26 @@
         }
       },
       {
+        "clientIndex": 0,
         "watchRemove": {
           "targetIds": [
-            4
+            2
           ]
         }
       },
       {
+        "clientIndex": 0,
+        "userDelete": "collection/a"
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
         "userListen": {
           "query": {
             "filters": [
-              [
-                "visible",
-                "==",
-                true
-              ]
             ],
             "orderBys": [
             ],
@@ -2970,130 +3058,43 @@
           },
           "targetId": 2
         },
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                    [
-                      "visible",
-                      "==",
-                      true
-                    ]
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": "resume-token-1000"
-            }
-          }
-        }
-      },
-      {
-        "watchAck": [
-          2
-        ]
-      },
-      {
-        "watchEntity": {
-          "docs": [
-            {
-              "key": "collection/a",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "v": "v2000",
-                "visible": false
-              },
-              "version": 2000
-            }
-          ],
-          "removedTargets": [
-            2
-          ]
-        }
-      },
-      {
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-5000"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 5000
-        },
         "expectedSnapshotEvents": [
           {
             "errorCode": 0,
-            "fromCache": false,
+            "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
-                [
-                  "visible",
-                  "==",
-                  true
-                ]
               ],
               "orderBys": [
               ],
               "path": "collection"
             }
           }
-        ]
-      },
-      {
-        "userUnlisten": [
-          2,
-          {
-            "filters": [
-              [
-                "visible",
-                "==",
-                true
-              ]
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          }
         ],
         "expectedState": {
           "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
           }
         }
       },
       {
-        "watchRemove": {
-          "targetIds": [
-            2
-          ]
-        }
-      },
-      {
-        "userListen": {
-          "query": {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          },
-          "targetId": 4
-        },
+        "clientIndex": 0,
+        "drainQueue": true,
         "expectedState": {
           "activeTargets": {
-            "4": {
+            "2": {
               "queries": [
                 {
                   "filters": [
@@ -3103,39 +3104,68 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-4000"
+              "resumeToken": "resume-token-1000"
             }
           }
         }
       },
       {
+        "clientIndex": 0,
+        "writeAck": {
+          "version": 2000
+        },
+        "expectedState": {
+          "userCallbacks": {
+            "acknowledgedDocs": [
+              "collection/a"
+            ],
+            "rejectedDocs": [
+            ]
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
         "watchAck": [
-          4
+          2
         ]
       },
       {
+        "clientIndex": 0,
         "watchEntity": {
           "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "value": null,
+              "version": 2000
+            }
           ],
           "targets": [
-            4
+            2
           ]
         }
       },
       {
+        "clientIndex": 0,
         "watchCurrent": [
           [
-            4
+            2
           ],
-          "resume-token-6000"
+          "resume-token-2000"
         ]
       },
       {
+        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 6000
-        },
+          "version": 2000
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
         "expectedSnapshotEvents": [
           {
             "errorCode": 0,
@@ -3153,25 +3183,23 @@
       }
     ]
   },
-  "Individual documents cannot revert": {
+  "Ensure correct query results with latency-compensated deletes": {
     "describeName": "Listens:",
-    "itName": "Individual documents cannot revert",
+    "itName": "Ensure correct query results with latency-compensated deletes",
     "tags": [
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": true
     },
     "steps": [
+      {
+        "userDelete": "collection/b"
+      },
       {
         "userListen": {
           "query": {
             "filters": [
-              [
-                "visible",
-                "==",
-                true
-              ]
             ],
             "orderBys": [
             ],
@@ -3185,11 +3213,6 @@
               "queries": [
                 {
                   "filters": [
-                    [
-                      "visible",
-                      "==",
-                      true
-                    ]
                   ],
                   "orderBys": [
                   ],
@@ -3210,14 +3233,26 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "v": "v1000",
-                "visible": true
+                "a": true
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "b": true
               },
               "version": 1000
             }
@@ -3245,14 +3280,14 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "v": "v1000",
-                  "visible": true
+                  "a": true
                 },
                 "version": 1000
               }
@@ -3262,11 +3297,6 @@
             "hasPendingWrites": false,
             "query": {
               "filters": [
-                [
-                  "visible",
-                  "==",
-                  true
-                ]
               ],
               "orderBys": [
               ],
@@ -3275,39 +3305,13 @@
           }
         ]
       },
-      {
-        "userUnlisten": [
-          2,
-          {
-            "filters": [
-              [
-                "visible",
-                "==",
-                true
-              ]
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          }
-        ],
-        "expectedState": {
-          "activeTargets": {
-          }
-        }
-      },
-      {
-        "watchRemove": {
-          "targetIds": [
-            2
-          ]
-        }
-      },
       {
         "userListen": {
           "query": {
             "filters": [
             ],
+            "limit": 10,
+            "limitType": "LimitToFirst",
             "orderBys": [
             ],
             "path": "collection"
@@ -3318,14 +3322,14 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "v": "v1000",
-                  "visible": true
+                  "a": true
                 },
                 "version": 1000
               }
@@ -3336,6 +3340,8 @@
             "query": {
               "filters": [
               ],
+              "limit": 10,
+              "limitType": "LimitToFirst",
               "orderBys": [
               ],
               "path": "collection"
@@ -3344,11 +3350,25 @@
         ],
         "expectedState": {
           "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            },
             "4": {
               "queries": [
                 {
                   "filters": [
                   ],
+                  "limit": 10,
+                  "limitType": "LimitToFirst",
                   "orderBys": [
                   ],
                   "path": "collection"
@@ -3358,66 +3378,106 @@
             }
           }
         }
-      },
-      {
-        "watchAck": [
-          4
-        ]
-      },
+      }
+    ]
+  },
+  "ExpectedCount in listen request should work after coming back online": {
+    "describeName": "Listens:",
+    "itName": "ExpectedCount in listen request should work after coming back online",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
       {
-        "watchEntity": {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "v": "v3000",
-                "visible": false
+                "key": "a"
               },
-              "version": 3000
+              "version": 1000
             }
           ],
           "targets": [
-            4
+            2
           ]
         }
       },
       {
         "watchCurrent": [
           [
-            4
+            2
           ],
-          "resume-token-4000"
+          "resume-token-1000"
         ]
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 4000
+          "version": 1000
         },
         "expectedSnapshotEvents": [
           {
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "modified": [
+            "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "v": "v3000",
-                  "visible": false
+                  "key": "a"
                 },
-                "version": 3000
+                "version": 1000
               }
             ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
             "query": {
               "filters": [
               ],
@@ -3429,37 +3489,65 @@
         ]
       },
       {
-        "userUnlisten": [
-          4,
+        "enableNetwork": false,
+        "expectedSnapshotEvents": [
           {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
           }
         ],
         "expectedState": {
+          "activeLimboDocs": [
+          ],
           "activeTargets": {
-          }
+          },
+          "enqueuedLimboDocs": [
+          ]
         }
       },
       {
-        "watchRemove": {
-          "targetIds": [
-            4
-          ]
+        "enableNetwork": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          }
         }
-      },
+      }
+    ]
+  },
+  "Ignores update from inactive target": {
+    "describeName": "Listens:",
+    "itName": "Ignores update from inactive target",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
       {
         "userListen": {
           "query": {
             "filters": [
-              [
-                "visible",
-                "==",
-                true
-              ]
             ],
             "orderBys": [
             ],
@@ -3473,18 +3561,13 @@
               "queries": [
                 {
                   "filters": [
-                    [
-                      "visible",
-                      "==",
-                      true
-                    ]
                   ],
                   "orderBys": [
                   ],
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-1000"
+              "resumeToken": ""
             }
           }
         }
@@ -3498,19 +3581,19 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "v": "v2000",
-                "visible": false
+                "key": "a"
               },
-              "version": 2000
+              "version": 1000
             }
           ],
-          "removedTargets": [
+          "targets": [
             2
           ]
         }
@@ -3520,27 +3603,36 @@
           [
             2
           ],
-          "resume-token-5000"
+          "resume-token-1000"
         ]
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 5000
+          "version": 1000
         },
         "expectedSnapshotEvents": [
           {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
             "query": {
               "filters": [
-                [
-                  "visible",
-                  "==",
-                  true
-                ]
               ],
               "orderBys": [
               ],
@@ -3554,11 +3646,6 @@
           2,
           {
             "filters": [
-              [
-                "visible",
-                "==",
-                true
-              ]
             ],
             "orderBys": [
             ],
@@ -3570,6 +3657,34 @@
           }
         }
       },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "b"
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        }
+      },
       {
         "watchRemove": {
           "targetIds": [
@@ -3586,22 +3701,22 @@
             ],
             "path": "collection"
           },
-          "targetId": 4
+          "targetId": 2
         },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "v": "v3000",
-                  "visible": false
+                  "key": "a"
                 },
-                "version": 3000
+                "version": 1000
               }
             ],
             "errorCode": 0,
@@ -3618,7 +3733,7 @@
         ],
         "expectedState": {
           "activeTargets": {
-            "4": {
+            "2": {
               "queries": [
                 {
                   "filters": [
@@ -3628,79 +3743,32 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-4000"
+              "resumeToken": "resume-token-1000"
             }
           }
         }
-      },
-      {
-        "watchAck": [
-          4
-        ]
-      },
-      {
-        "watchEntity": {
-          "docs": [
-          ],
-          "targets": [
-            4
-          ]
-        }
-      },
-      {
-        "watchCurrent": [
-          [
-            4
-          ],
-          "resume-token-6000"
-        ]
-      },
-      {
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 6000
-        },
-        "expectedSnapshotEvents": [
-          {
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          }
-        ]
       }
     ]
   },
-  "Listen is established in new primary tab": {
+  "Individual (deleted) documents cannot revert": {
     "describeName": "Listens:",
-    "itName": "Listen is established in new primary tab",
+    "itName": "Individual (deleted) documents cannot revert",
     "tags": [
-      "multi-client"
     ],
     "config": {
-      "numClients": 3,
-      "useGarbageCollection": false
+      "numClients": 1,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
-        "clientIndex": 0,
-        "drainQueue": true,
-        "expectedState": {
-          "isPrimary": true
-        }
-      },
-      {
-        "clientIndex": 0,
         "userListen": {
           "query": {
             "filters": [
+              [
+                "visible",
+                "==",
+                true
+              ]
             ],
             "orderBys": [
             ],
@@ -3714,6 +3782,11 @@
               "queries": [
                 {
                   "filters": [
+                    [
+                      "visible",
+                      "==",
+                      true
+                    ]
                   ],
                   "orderBys": [
                   ],
@@ -3726,23 +3799,23 @@
         }
       },
       {
-        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
-        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "a"
+                "v": "v1000",
+                "visible": true
               },
               "version": 1000
             }
@@ -3753,7 +3826,6 @@
         }
       },
       {
-        "clientIndex": 0,
         "watchCurrent": [
           [
             2
@@ -3762,7 +3834,6 @@
         ]
       },
       {
-        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
@@ -3772,13 +3843,15 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "a"
+                  "v": "v1000",
+                  "visible": true
                 },
                 "version": 1000
               }
@@ -3788,6 +3861,11 @@
             "hasPendingWrites": false,
             "query": {
               "filters": [
+                [
+                  "visible",
+                  "==",
+                  true
+                ]
               ],
               "orderBys": [
               ],
@@ -3797,15 +3875,34 @@
         ]
       },
       {
-        "clientIndex": 1,
-        "drainQueue": true
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+              [
+                "visible",
+                "==",
+                true
+              ]
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
       },
       {
-        "clientIndex": 2,
-        "drainQueue": true
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
       },
       {
-        "clientIndex": 2,
         "userListen": {
           "query": {
             "filters": [
@@ -3814,25 +3911,27 @@
             ],
             "path": "collection"
           },
-          "targetId": 2
+          "targetId": 4
         },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "a"
+                  "v": "v1000",
+                  "visible": true
                 },
                 "version": 1000
               }
             ],
             "errorCode": 0,
-            "fromCache": false,
+            "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -3845,7 +3944,7 @@
         ],
         "expectedState": {
           "activeTargets": {
-            "2": {
+            "4": {
               "queries": [
                 {
                   "filters": [
@@ -3861,108 +3960,41 @@
         }
       },
       {
-        "clientIndex": 0,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 0,
-        "shutdown": true,
-        "expectedState": {
-          "activeLimboDocs": [
-          ],
-          "activeTargets": {
-          },
-          "enqueuedLimboDocs": [
-          ]
-        }
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 1,
-        "runTimer": "client_metadata_refresh",
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": "resume-token-1000"
-            }
-          },
-          "isPrimary": true
-        }
-      },
-      {
-        "clientIndex": 1,
         "watchAck": [
-          2
+          4
         ]
       },
       {
-        "clientIndex": 1,
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/b",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "key": "b"
-              },
-              "version": 2000
+              "createTime": 0,
+              "key": "collection/a",
+              "value": null,
+              "version": 3000
             }
           ],
-          "targets": [
-            2
+          "removedTargets": [
+            4
           ]
         }
       },
       {
-        "clientIndex": 1,
         "watchCurrent": [
           [
-            2
+            4
           ],
-          "resume-token-2000"
+          "resume-token-4000"
         ]
       },
       {
-        "clientIndex": 1,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2000
-        }
-      },
-      {
-        "clientIndex": 2,
-        "drainQueue": true,
+          "version": 4000
+        },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "b"
-                },
-                "version": 2000
-              }
-            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -3972,39 +4004,57 @@
               "orderBys": [
               ],
               "path": "collection"
-            }
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": "v1000",
+                  "visible": true
+                },
+                "version": 1000
+              }
+            ]
           }
         ]
-      }
-    ]
-  },
-  "Listen is established in newly started primary": {
-    "describeName": "Listens:",
-    "itName": "Listen is established in newly started primary",
-    "tags": [
-      "multi-client"
-    ],
-    "config": {
-      "numClients": 3,
-      "useGarbageCollection": false
-    },
-    "steps": [
+      },
       {
-        "clientIndex": 0,
-        "drainQueue": true,
+        "userUnlisten": [
+          4,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
         "expectedState": {
-          "isPrimary": true
+          "activeTargets": {
+          }
         }
       },
       {
-        "clientIndex": 1,
-        "drainQueue": true
+        "watchRemove": {
+          "targetIds": [
+            4
+          ]
+        }
       },
       {
-        "clientIndex": 1,
         "userListen": {
           "query": {
             "filters": [
+              [
+                "visible",
+                "==",
+                true
+              ]
             ],
             "orderBys": [
             ],
@@ -4012,110 +4062,100 @@
           },
           "targetId": 2
         },
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+                [
+                  "visible",
+                  "==",
+                  true
+                ]
               ],
-              "resumeToken": ""
+              "orderBys": [
+              ],
+              "path": "collection"
             }
           }
-        }
-      },
-      {
-        "clientIndex": 0,
-        "drainQueue": true,
+        ],
         "expectedState": {
           "activeTargets": {
             "2": {
               "queries": [
                 {
                   "filters": [
+                    [
+                      "visible",
+                      "==",
+                      true
+                    ]
                   ],
                   "orderBys": [
                   ],
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "resume-token-1000"
             }
           }
         }
       },
       {
-        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
-        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "a"
+                "v": "v2000",
+                "visible": false
               },
-              "version": 1000
+              "version": 2000
             }
           ],
-          "targets": [
+          "removedTargets": [
             2
           ]
         }
       },
       {
-        "clientIndex": 0,
         "watchCurrent": [
           [
             2
           ],
-          "resume-token-1000"
+          "resume-token-5000"
         ]
       },
       {
-        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 1000
-        }
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true,
+          "version": 5000
+        },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 1000
-              }
-            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
             "query": {
               "filters": [
+                [
+                  "visible",
+                  "==",
+                  true
+                ]
               ],
               "orderBys": [
               ],
@@ -4125,27 +4165,61 @@
         ]
       },
       {
-        "clientIndex": 0,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 0,
-        "shutdown": true,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+              [
+                "visible",
+                "==",
+                true
+              ]
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
         "expectedState": {
-          "activeLimboDocs": [
-          ],
           "activeTargets": {
-          },
-          "enqueuedLimboDocs": [
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
           ]
         }
       },
       {
-        "clientIndex": 2,
-        "drainQueue": true,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 4
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
         "expectedState": {
           "activeTargets": {
-            "2": {
+            "4": {
               "queries": [
                 {
                   "filters": [
@@ -4155,74 +4229,41 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-1000"
+              "resumeToken": "resume-token-4000"
             }
-          },
-          "isPrimary": true
+          }
         }
       },
       {
-        "clientIndex": 2,
         "watchAck": [
-          2
+          4
         ]
       },
       {
-        "clientIndex": 2,
         "watchEntity": {
           "docs": [
-            {
-              "key": "collection/b",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "key": "b"
-              },
-              "version": 2000
-            }
           ],
           "targets": [
-            2
+            4
           ]
         }
       },
       {
-        "clientIndex": 2,
         "watchCurrent": [
           [
-            2
+            4
           ],
-          "resume-token-2000"
+          "resume-token-6000"
         ]
       },
       {
-        "clientIndex": 2,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2000
-        }
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true,
+          "version": 6000
+        },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "b"
-                },
-                "version": 2000
-              }
-            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -4238,33 +4279,25 @@
       }
     ]
   },
-  "Listen is re-listened to after primary tab failover": {
+  "Individual documents cannot revert": {
     "describeName": "Listens:",
-    "itName": "Listen is re-listened to after primary tab failover",
+    "itName": "Individual documents cannot revert",
     "tags": [
-      "multi-client"
     ],
     "config": {
-      "numClients": 3,
-      "useGarbageCollection": false
+      "numClients": 1,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
-        "clientIndex": 0,
-        "drainQueue": true,
-        "expectedState": {
-          "isPrimary": true
-        }
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 1,
         "userListen": {
           "query": {
             "filters": [
+              [
+                "visible",
+                "==",
+                true
+              ]
             ],
             "orderBys": [
             ],
@@ -4278,6 +4311,11 @@
               "queries": [
                 {
                   "filters": [
+                    [
+                      "visible",
+                      "==",
+                      true
+                    ]
                   ],
                   "orderBys": [
                   ],
@@ -4290,43 +4328,23 @@
         }
       },
       {
-        "clientIndex": 0,
-        "drainQueue": true,
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": ""
-            }
-          }
-        }
-      },
-      {
-        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
-        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "a"
+                "v": "v1000",
+                "visible": true
               },
               "version": 1000
             }
@@ -4337,7 +4355,6 @@
         }
       },
       {
-        "clientIndex": 0,
         "watchCurrent": [
           [
             2
@@ -4346,27 +4363,24 @@
         ]
       },
       {
-        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
           "version": 1000
-        }
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true,
+        },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "a"
+                  "v": "v1000",
+                  "visible": true
                 },
                 "version": 1000
               }
@@ -4376,6 +4390,11 @@
             "hasPendingWrites": false,
             "query": {
               "filters": [
+                [
+                  "visible",
+                  "==",
+                  true
+                ]
               ],
               "orderBys": [
               ],
@@ -4385,11 +4404,34 @@
         ]
       },
       {
-        "clientIndex": 2,
-        "drainQueue": true
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+              [
+                "visible",
+                "==",
+                true
+              ]
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
       },
       {
-        "clientIndex": 2,
         "userListen": {
           "query": {
             "filters": [
@@ -4398,25 +4440,27 @@
             ],
             "path": "collection"
           },
-          "targetId": 2
+          "targetId": 4
         },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "a"
+                  "v": "v1000",
+                  "visible": true
                 },
                 "version": 1000
               }
             ],
             "errorCode": 0,
-            "fromCache": false,
+            "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -4429,7 +4473,7 @@
         ],
         "expectedState": {
           "activeTargets": {
-            "2": {
+            "4": {
               "queries": [
                 {
                   "filters": [
@@ -4445,107 +4489,66 @@
         }
       },
       {
-        "clientIndex": 0,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 0,
-        "shutdown": true,
-        "expectedState": {
-          "activeLimboDocs": [
-          ],
-          "activeTargets": {
-          },
-          "enqueuedLimboDocs": [
-          ]
-        }
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 1,
-        "runTimer": "client_metadata_refresh",
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": "resume-token-1000"
-            }
-          },
-          "isPrimary": true
-        }
-      },
-      {
-        "clientIndex": 1,
         "watchAck": [
-          2
+          4
         ]
       },
       {
-        "clientIndex": 1,
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/b",
+              "createTime": 0,
+              "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "b"
+                "v": "v3000",
+                "visible": false
               },
-              "version": 2000
+              "version": 3000
             }
           ],
           "targets": [
-            2
+            4
           ]
         }
       },
       {
-        "clientIndex": 1,
         "watchCurrent": [
           [
-            2
+            4
           ],
-          "resume-token-2000"
+          "resume-token-4000"
         ]
       },
       {
-        "clientIndex": 1,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2000
+          "version": 4000
         },
         "expectedSnapshotEvents": [
           {
-            "added": [
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "modified": [
               {
-                "key": "collection/b",
+                "createTime": 0,
+                "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "b"
+                  "v": "v3000",
+                  "visible": false
                 },
-                "version": 2000
+                "version": 3000
               }
             ],
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
             "query": {
               "filters": [
               ],
@@ -4557,52 +4560,37 @@
         ]
       },
       {
-        "clientIndex": 2,
-        "drainQueue": true,
-        "expectedSnapshotEvents": [
+        "userUnlisten": [
+          4,
           {
-            "added": [
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "b"
-                },
-                "version": 2000
-              }
+            "filters": [
             ],
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
+            "orderBys": [
+            ],
+            "path": "collection"
           }
-        ]
-      }
-    ]
-  },
-  "Listens are reestablished after network disconnect": {
-    "describeName": "Listens:",
-    "itName": "Listens are reestablished after network disconnect",
-    "tags": [
-    ],
-    "config": {
-      "numClients": 1,
-      "useGarbageCollection": true
-    },
-    "steps": [
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            4
+          ]
+        }
+      },
       {
         "userListen": {
           "query": {
             "filters": [
+              [
+                "visible",
+                "==",
+                true
+              ]
             ],
             "orderBys": [
             ],
@@ -4610,22 +4598,45 @@
           },
           "targetId": 2
         },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+                [
+                  "visible",
+                  "==",
+                  true
+                ]
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
         "expectedState": {
           "activeTargets": {
             "2": {
               "queries": [
                 {
                   "filters": [
+                    [
+                      "visible",
+                      "==",
+                      true
+                    ]
                   ],
                   "orderBys": [
                   ],
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "resume-token-1000"
             }
-          },
-          "watchStreamRequestCount": 1
+          }
         }
       },
       {
@@ -4637,18 +4648,20 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "a"
+                "v": "v2000",
+                "visible": false
               },
-              "version": 1000
+              "version": 2000
             }
           ],
-          "targets": [
+          "removedTargets": [
             2
           ]
         }
@@ -4658,35 +4671,27 @@
           [
             2
           ],
-          "resume-token-1000"
+          "resume-token-5000"
         ]
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 1000
+          "version": 5000
         },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 1000
-              }
-            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
             "query": {
               "filters": [
+                [
+                  "visible",
+                  "==",
+                  true
+                ]
               ],
               "orderBys": [
               ],
@@ -4696,9 +4701,61 @@
         ]
       },
       {
-        "enableNetwork": false,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+              [
+                "visible",
+                "==",
+                true
+              ]
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 4
+        },
         "expectedSnapshotEvents": [
           {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "v": "v3000",
+                  "visible": false
+                },
+                "version": 3000
+              }
+            ],
             "errorCode": 0,
             "fromCache": true,
             "hasPendingWrites": false,
@@ -4712,19 +4769,8 @@
           }
         ],
         "expectedState": {
-          "activeLimboDocs": [
-          ],
           "activeTargets": {
-          },
-          "enqueuedLimboDocs": [
-          ]
-        }
-      },
-      {
-        "enableNetwork": true,
-        "expectedState": {
-          "activeTargets": {
-            "2": {
+            "4": {
               "queries": [
                 {
                   "filters": [
@@ -4734,66 +4780,41 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-1000"
+              "resumeToken": "resume-token-4000"
             }
-          },
-          "watchStreamRequestCount": 2
+          }
         }
       },
       {
         "watchAck": [
-          2
+          4
         ]
       },
       {
         "watchEntity": {
           "docs": [
-            {
-              "key": "collection/b",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "key": "b"
-              },
-              "version": 2000
-            }
           ],
           "targets": [
-            2
+            4
           ]
         }
       },
       {
         "watchCurrent": [
           [
-            2
+            4
           ],
-          "resume-token-2000"
+          "resume-token-6000"
         ]
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2000
+          "version": 6000
         },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "b"
-                },
-                "version": 2000
-              }
-            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -4809,89 +4830,31 @@
       }
     ]
   },
-  "Mirror queries from different secondary client": {
+  "Listen is established in new primary tab": {
     "describeName": "Listens:",
-    "itName": "Mirror queries from different secondary client",
+    "itName": "Listen is established in new primary tab",
     "tags": [
       "multi-client"
     ],
     "config": {
       "numClients": 3,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
         "clientIndex": 0,
-        "drainQueue": true
-      },
-      {
-        "applyClientState": {
-          "visibility": "visible"
-        },
-        "clientIndex": 0
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 1,
-        "userListen": {
-          "query": {
-            "filters": [
-            ],
-            "limit": 2,
-            "limitType": "LimitToFirst",
-            "orderBys": [
-              [
-                "val",
-                "asc"
-              ]
-            ],
-            "path": "collection"
-          },
-          "targetId": 2
-        },
+        "drainQueue": true,
         "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "limit": 2,
-                  "limitType": "LimitToFirst",
-                  "orderBys": [
-                    [
-                      "val",
-                      "asc"
-                    ]
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": ""
-            }
-          }
+          "isPrimary": true
         }
       },
       {
-        "clientIndex": 2,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 2,
+        "clientIndex": 0,
         "userListen": {
           "query": {
             "filters": [
             ],
-            "limit": 2,
-            "limitType": "LimitToLast",
             "orderBys": [
-              [
-                "val",
-                "desc"
-              ]
             ],
             "path": "collection"
           },
@@ -4904,52 +4867,7 @@
                 {
                   "filters": [
                   ],
-                  "limit": 2,
-                  "limitType": "LimitToLast",
-                  "orderBys": [
-                    [
-                      "val",
-                      "desc"
-                    ]
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": ""
-            }
-          }
-        }
-      },
-      {
-        "clientIndex": 0,
-        "drainQueue": true,
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "limit": 2,
-                  "limitType": "LimitToLast",
-                  "orderBys": [
-                    [
-                      "val",
-                      "desc"
-                    ]
-                  ],
-                  "path": "collection"
-                },
-                {
-                  "filters": [
-                  ],
-                  "limit": 2,
-                  "limitType": "LimitToFirst",
                   "orderBys": [
-                    [
-                      "val",
-                      "asc"
-                    ]
                   ],
                   "path": "collection"
                 }
@@ -4970,24 +4888,14 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "val": 0
-              },
-              "version": 1000
-            },
-            {
-              "key": "collection/b",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "val": 1
+                "key": "a"
               },
               "version": 1000
             }
@@ -5012,33 +4920,19 @@
           "targetIds": [
           ],
           "version": 1000
-        }
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true,
+        },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "val": 0
-                },
-                "version": 1000
-              },
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "val": 1
+                  "key": "a"
                 },
                 "version": 1000
               }
@@ -5049,44 +4943,45 @@
             "query": {
               "filters": [
               ],
-              "limit": 2,
-              "limitType": "LimitToFirst",
               "orderBys": [
-                [
-                  "val",
-                  "asc"
-                ]
               ],
               "path": "collection"
             }
           }
         ]
       },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
       {
         "clientIndex": 2,
-        "drainQueue": true,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 2,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "val": 1
-                },
-                "version": 1000
-              },
-              {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "val": 0
+                  "key": "a"
                 },
                 "version": 1000
               }
@@ -5097,45 +4992,12 @@
             "query": {
               "filters": [
               ],
-              "limit": 2,
-              "limitType": "LimitToLast",
               "orderBys": [
-                [
-                  "val",
-                  "desc"
-                ]
               ],
               "path": "collection"
             }
           }
-        ]
-      },
-      {
-        "clientIndex": 2,
-        "userUnlisten": [
-          2,
-          {
-            "filters": [
-            ],
-            "limit": 2,
-            "limitType": "LimitToLast",
-            "orderBys": [
-              [
-                "val",
-                "desc"
-              ]
-            ],
-            "path": "collection"
-          }
         ],
-        "expectedState": {
-          "activeTargets": {
-          }
-        }
-      },
-      {
-        "clientIndex": 0,
-        "drainQueue": true,
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -5143,13 +5005,7 @@
                 {
                   "filters": [
                   ],
-                  "limit": 2,
-                  "limitType": "LimitToFirst",
                   "orderBys": [
-                    [
-                      "val",
-                      "asc"
-                    ]
                   ],
                   "path": "collection"
                 }
@@ -5161,16 +5017,64 @@
       },
       {
         "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "shutdown": true,
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "runTimer": "client_metadata_refresh",
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          },
+          "isPrimary": true
+        }
+      },
+      {
+        "clientIndex": 1,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 1,
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/c",
+              "createTime": 0,
+              "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "val": 0
+                "key": "b"
               },
               "version": 2000
             }
@@ -5181,7 +5085,16 @@
         }
       },
       {
-        "clientIndex": 0,
+        "clientIndex": 1,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "clientIndex": 1,
         "watchSnapshot": {
           "targetIds": [
           ],
@@ -5189,19 +5102,20 @@
         }
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 2,
         "drainQueue": true,
         "expectedSnapshotEvents": [
           {
             "added": [
               {
-                "key": "collection/c",
+                "createTime": 0,
+                "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "val": 0
+                  "key": "b"
                 },
                 "version": 2000
               }
@@ -5212,94 +5126,31 @@
             "query": {
               "filters": [
               ],
-              "limit": 2,
-              "limitType": "LimitToFirst",
               "orderBys": [
-                [
-                  "val",
-                  "asc"
-                ]
               ],
               "path": "collection"
-            },
-            "removed": [
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "val": 1
-                },
-                "version": 1000
-              }
-            ]
+            }
           }
         ]
       }
     ]
   },
-  "Mirror queries from primary and secondary client": {
+  "Listen is established in newly started primary": {
     "describeName": "Listens:",
-    "itName": "Mirror queries from primary and secondary client",
+    "itName": "Listen is established in newly started primary",
     "tags": [
       "multi-client"
     ],
     "config": {
-      "numClients": 2,
-      "useGarbageCollection": false
+      "numClients": 3,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
         "clientIndex": 0,
-        "drainQueue": true
-      },
-      {
-        "applyClientState": {
-          "visibility": "visible"
-        },
-        "clientIndex": 0
-      },
-      {
-        "clientIndex": 0,
-        "userListen": {
-          "query": {
-            "filters": [
-            ],
-            "limit": 2,
-            "limitType": "LimitToFirst",
-            "orderBys": [
-              [
-                "val",
-                "asc"
-              ]
-            ],
-            "path": "collection"
-          },
-          "targetId": 2
-        },
+        "drainQueue": true,
         "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "limit": 2,
-                  "limitType": "LimitToFirst",
-                  "orderBys": [
-                    [
-                      "val",
-                      "asc"
-                    ]
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": ""
-            }
-          }
+          "isPrimary": true
         }
       },
       {
@@ -5312,13 +5163,7 @@
           "query": {
             "filters": [
             ],
-            "limit": 2,
-            "limitType": "LimitToLast",
             "orderBys": [
-              [
-                "val",
-                "desc"
-              ]
             ],
             "path": "collection"
           },
@@ -5331,13 +5176,7 @@
                 {
                   "filters": [
                   ],
-                  "limit": 2,
-                  "limitType": "LimitToLast",
                   "orderBys": [
-                    [
-                      "val",
-                      "desc"
-                    ]
                   ],
                   "path": "collection"
                 }
@@ -5357,26 +5196,7 @@
                 {
                   "filters": [
                   ],
-                  "limit": 2,
-                  "limitType": "LimitToLast",
-                  "orderBys": [
-                    [
-                      "val",
-                      "desc"
-                    ]
-                  ],
-                  "path": "collection"
-                },
-                {
-                  "filters": [
-                  ],
-                  "limit": 2,
-                  "limitType": "LimitToFirst",
                   "orderBys": [
-                    [
-                      "val",
-                      "asc"
-                    ]
                   ],
                   "path": "collection"
                 }
@@ -5397,24 +5217,14 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "val": 0
-              },
-              "version": 1000
-            },
-            {
-              "key": "collection/b",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "val": 1
+                "key": "a"
               },
               "version": 1000
             }
@@ -5439,29 +5249,23 @@
           "targetIds": [
           ],
           "version": 1000
-        },
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "val": 0
-                },
-                "version": 1000
-              },
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "val": 1
+                  "key": "a"
                 },
                 "version": 1000
               }
@@ -5472,13 +5276,7 @@
             "query": {
               "filters": [
               ],
-              "limit": 2,
-              "limitType": "LimitToFirst",
               "orderBys": [
-                [
-                  "val",
-                  "asc"
-                ]
               ],
               "path": "collection"
             }
@@ -5486,32 +5284,104 @@
         ]
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "shutdown": true,
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "clientIndex": 2,
         "drainQueue": true,
-        "expectedSnapshotEvents": [
-          {
-            "added": [
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "val": 1
-                },
-                "version": 1000
-              },
-              {
-                "key": "collection/a",
-                "options": {
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          },
+          "isPrimary": true
+        }
+      },
+      {
+        "clientIndex": 2,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 2,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "b"
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 2,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "clientIndex": 2,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "val": 0
+                  "key": "b"
                 },
-                "version": 1000
+                "version": 2000
               }
             ],
             "errorCode": 0,
@@ -5520,39 +5390,63 @@
             "query": {
               "filters": [
               ],
-              "limit": 2,
-              "limitType": "LimitToLast",
               "orderBys": [
-                [
-                  "val",
-                  "desc"
-                ]
               ],
               "path": "collection"
             }
           }
         ]
+      }
+    ]
+  },
+  "Listen is re-listened to after primary tab failover": {
+    "describeName": "Listens:",
+    "itName": "Listen is re-listened to after primary tab failover",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 3,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "isPrimary": true
+        }
       },
       {
         "clientIndex": 1,
-        "userUnlisten": [
-          2,
-          {
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "query": {
             "filters": [
             ],
-            "limit": 2,
-            "limitType": "LimitToLast",
             "orderBys": [
-              [
-                "val",
-                "desc"
-              ]
             ],
             "path": "collection"
-          }
-        ],
+          },
+          "targetId": 2
+        },
         "expectedState": {
           "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
           }
         }
       },
@@ -5566,13 +5460,7 @@
                 {
                   "filters": [
                   ],
-                  "limit": 2,
-                  "limitType": "LimitToFirst",
                   "orderBys": [
-                    [
-                      "val",
-                      "asc"
-                    ]
                   ],
                   "path": "collection"
                 }
@@ -5582,20 +5470,27 @@
           }
         }
       },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
       {
         "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/c",
+              "createTime": 0,
+              "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "val": 0
+                "key": "a"
               },
-              "version": 2000
+              "version": 1000
             }
           ],
           "targets": [
@@ -5603,26 +5498,40 @@
           ]
         }
       },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
       {
         "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2000
-        },
+          "version": 1000
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
         "expectedSnapshotEvents": [
           {
             "added": [
               {
-                "key": "collection/c",
+                "createTime": 0,
+                "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "val": 0
+                  "key": "a"
                 },
-                "version": 2000
+                "version": 1000
               }
             ],
             "errorCode": 0,
@@ -5631,49 +5540,24 @@
             "query": {
               "filters": [
               ],
-              "limit": 2,
-              "limitType": "LimitToFirst",
               "orderBys": [
-                [
-                  "val",
-                  "asc"
-                ]
               ],
               "path": "collection"
-            },
-            "removed": [
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "val": 1
-                },
-                "version": 1000
-              }
-            ]
+            }
           }
         ]
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 2,
         "drainQueue": true
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 2,
         "userListen": {
           "query": {
             "filters": [
             ],
-            "limit": 2,
-            "limitType": "LimitToLast",
             "orderBys": [
-              [
-                "val",
-                "desc"
-              ]
             ],
             "path": "collection"
           },
@@ -5683,24 +5567,14 @@
           {
             "added": [
               {
-                "key": "collection/c",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "val": 0
-                },
-                "version": 2000
-              },
-              {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "val": 0
+                  "key": "a"
                 },
                 "version": 1000
               }
@@ -5711,13 +5585,7 @@
             "query": {
               "filters": [
               ],
-              "limit": 2,
-              "limitType": "LimitToLast",
               "orderBys": [
-                [
-                  "val",
-                  "desc"
-                ]
               ],
               "path": "collection"
             }
@@ -5730,13 +5598,7 @@
                 {
                   "filters": [
                   ],
-                  "limit": 2,
-                  "limitType": "LimitToLast",
                   "orderBys": [
-                    [
-                      "val",
-                      "desc"
-                    ]
                   ],
                   "path": "collection"
                 }
@@ -5748,7 +5610,27 @@
       },
       {
         "clientIndex": 0,
-        "drainQueue": true,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "shutdown": true,
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "runTimer": "client_metadata_refresh",
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -5756,12 +5638,1321 @@
                 {
                   "filters": [
                   ],
-                  "limit": 2,
-                  "limitType": "LimitToLast",
                   "orderBys": [
-                    [
-                      "val",
-                      "desc"
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          },
+          "isPrimary": true
+        }
+      },
+      {
+        "clientIndex": 1,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "b"
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 1,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "b"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 2,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "b"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Listens are reestablished after network disconnect": {
+    "describeName": "Listens:",
+    "itName": "Listens are reestablished after network disconnect",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": true
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          },
+          "watchStreamRequestCount": 1
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "enableNetwork": false,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "enableNetwork": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          },
+          "watchStreamRequestCount": 2
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "b"
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "b"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Mirror queries from different secondary client": {
+    "describeName": "Listens:",
+    "itName": "Mirror queries from different secondary client",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 3,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToFirst",
+            "orderBys": [
+              [
+                "val",
+                "asc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToFirst",
+                  "orderBys": [
+                    [
+                      "val",
+                      "asc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 2,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 2,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToLast",
+            "orderBys": [
+              [
+                "val",
+                "desc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToLast",
+                  "orderBys": [
+                    [
+                      "val",
+                      "desc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToLast",
+                  "orderBys": [
+                    [
+                      "val",
+                      "desc"
+                    ]
+                  ],
+                  "path": "collection"
+                },
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToFirst",
+                  "orderBys": [
+                    [
+                      "val",
+                      "asc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "val": 0
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "val": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 0
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToFirst",
+              "orderBys": [
+                [
+                  "val",
+                  "asc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 2,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 0
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToLast",
+              "orderBys": [
+                [
+                  "val",
+                  "desc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 2,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToLast",
+            "orderBys": [
+              [
+                "val",
+                "desc"
+              ]
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToFirst",
+                  "orderBys": [
+                    [
+                      "val",
+                      "asc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "val": 0
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 0
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToFirst",
+              "orderBys": [
+                [
+                  "val",
+                  "asc"
+                ]
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 1
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "Mirror queries from primary and secondary client": {
+    "describeName": "Listens:",
+    "itName": "Mirror queries from primary and secondary client",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToFirst",
+            "orderBys": [
+              [
+                "val",
+                "asc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToFirst",
+                  "orderBys": [
+                    [
+                      "val",
+                      "asc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToLast",
+            "orderBys": [
+              [
+                "val",
+                "desc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToLast",
+                  "orderBys": [
+                    [
+                      "val",
+                      "desc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToLast",
+                  "orderBys": [
+                    [
+                      "val",
+                      "desc"
+                    ]
+                  ],
+                  "path": "collection"
+                },
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToFirst",
+                  "orderBys": [
+                    [
+                      "val",
+                      "asc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "val": 0
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "val": 1
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 0
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 1
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToFirst",
+              "orderBys": [
+                [
+                  "val",
+                  "asc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 1
+                },
+                "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 0
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToLast",
+              "orderBys": [
+                [
+                  "val",
+                  "desc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToLast",
+            "orderBys": [
+              [
+                "val",
+                "desc"
+              ]
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToFirst",
+                  "orderBys": [
+                    [
+                      "val",
+                      "asc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "val": 0
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 0
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToFirst",
+              "orderBys": [
+                [
+                  "val",
+                  "asc"
+                ]
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 1
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "limit": 2,
+            "limitType": "LimitToLast",
+            "orderBys": [
+              [
+                "val",
+                "desc"
+              ]
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 0
+                },
+                "version": 2000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "val": 0
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "limit": 2,
+              "limitType": "LimitToLast",
+              "orderBys": [
+                [
+                  "val",
+                  "desc"
+                ]
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToLast",
+                  "orderBys": [
+                    [
+                      "val",
+                      "desc"
+                    ]
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "limit": 2,
+                  "limitType": "LimitToLast",
+                  "orderBys": [
+                    [
+                      "val",
+                      "desc"
                     ]
                   ],
                   "path": "collection"
@@ -5831,6 +7022,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/d",
               "options": {
                 "hasCommittedMutations": false,
@@ -5862,6 +7054,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/d",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5891,6 +7084,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5946,7 +7140,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -6108,6 +7302,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -6119,6 +7314,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -6159,6 +7355,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6170,6 +7367,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6201,6 +7399,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6212,6 +7411,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6314,6 +7514,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -6345,6 +7546,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6374,6 +7576,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -6429,7 +7632,7 @@
     ],
     "config": {
       "numClients": 3,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -6674,18 +7877,274 @@
               ],
               "orderBys": [
               ],
-              "path": "collection"
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "New client uses existing online state": {
+    "describeName": "Listens:",
+    "itName": "New client uses existing online state",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 3,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "enableNetwork": false,
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "enableNetwork": false,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "clientIndex": 2,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 2,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
             }
           }
-        ]
+        }
       },
       {
-        "clientIndex": 1,
-        "drainQueue": true,
+        "clientIndex": 2,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
         "expectedSnapshotEvents": [
           {
             "errorCode": 0,
-            "fromCache": false,
+            "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -6695,19 +8154,35 @@
               "path": "collection"
             }
           }
-        ]
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
       }
     ]
   },
-  "New client uses existing online state": {
+  "Offline state doesn't persist if primary is shut down": {
     "describeName": "Listens:",
-    "itName": "New client uses existing online state",
+    "itName": "Offline state doesn't persist if primary is shut down",
     "tags": [
       "multi-client"
     ],
     "config": {
-      "numClients": 3,
-      "useGarbageCollection": false
+      "numClients": 2,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -6745,40 +8220,11 @@
       },
       {
         "clientIndex": 0,
-        "watchAck": [
-          2
-        ]
-      },
-      {
-        "clientIndex": 0,
-        "watchEntity": {
-          "docs": [
-          ],
-          "targets": [
-            2
-          ]
-        }
-      },
-      {
-        "clientIndex": 0,
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-1000"
-        ]
-      },
-      {
-        "clientIndex": 0,
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 1000
-        },
+        "enableNetwork": false,
         "expectedSnapshotEvents": [
           {
             "errorCode": 0,
-            "fromCache": false,
+            "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -6788,15 +8234,19 @@
               "path": "collection"
             }
           }
-        ]
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true
+        ],
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
       },
       {
-        "clientIndex": 1,
-        "enableNetwork": false,
+        "clientIndex": 0,
+        "shutdown": true,
         "expectedState": {
           "activeLimboDocs": [
           ],
@@ -6806,6 +8256,10 @@
           ]
         }
       },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
       {
         "clientIndex": 1,
         "userListen": {
@@ -6818,20 +8272,47 @@
           },
           "targetId": 2
         },
-        "expectedSnapshotEvents": [
-          {
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
               ],
-              "path": "collection"
+              "resumeToken": ""
             }
           }
-        ],
+        }
+      }
+    ]
+  },
+  "Omits global resume tokens for a short while": {
+    "describeName": "Listens:",
+    "itName": "Omits global resume tokens for a short while",
+    "tags": [
+      "durable-persistence"
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -6850,16 +8331,63 @@
         }
       },
       {
-        "clientIndex": 0,
-        "drainQueue": true
+        "watchAck": [
+          2
+        ]
       },
       {
-        "clientIndex": 0,
-        "enableNetwork": false,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
         "expectedSnapshotEvents": [
           {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
             "errorCode": 0,
-            "fromCache": true,
+            "fromCache": false,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -6869,7 +8397,18 @@
               "path": "collection"
             }
           }
-        ],
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "resumeToken": "resume-token-2000",
+          "targetIds": [
+          ],
+          "version": 2000
+        }
+      },
+      {
+        "restart": true,
         "expectedState": {
           "activeLimboDocs": [
           ],
@@ -6880,11 +8419,6 @@
         }
       },
       {
-        "clientIndex": 2,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 2,
         "userListen": {
           "query": {
             "filters": [
@@ -6897,6 +8431,20 @@
         },
         "expectedSnapshotEvents": [
           {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
             "errorCode": 0,
             "fromCache": true,
             "hasPendingWrites": false,
@@ -6921,27 +8469,34 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "resume-token-1000"
             }
           }
         }
       },
       {
-        "clientIndex": 2,
-        "userListen": {
-          "query": {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          },
-          "targetId": 2
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-3000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 3000
         },
         "expectedSnapshotEvents": [
           {
             "errorCode": 0,
-            "fromCache": true,
+            "fromCache": false,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -6951,43 +8506,22 @@
               "path": "collection"
             }
           }
-        ],
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": ""
-            }
-          }
-        }
+        ]
       }
     ]
   },
-  "Offline state doesn't persist if primary is shut down": {
+  "Persists global resume tokens if the snapshot is old enough": {
     "describeName": "Listens:",
-    "itName": "Offline state doesn't persist if primary is shut down",
+    "itName": "Persists global resume tokens if the snapshot is old enough",
     "tags": [
-      "multi-client"
+      "durable-persistence"
     ],
     "config": {
-      "numClients": 2,
-      "useGarbageCollection": false
+      "numClients": 1,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
-        "clientIndex": 0,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 0,
         "userListen": {
           "query": {
             "filters": [
@@ -7016,12 +8550,63 @@
         }
       },
       {
-        "clientIndex": 0,
-        "enableNetwork": false,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
         "expectedSnapshotEvents": [
           {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
             "errorCode": 0,
-            "fromCache": true,
+            "fromCache": false,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -7031,19 +8616,18 @@
               "path": "collection"
             }
           }
-        ],
-        "expectedState": {
-          "activeLimboDocs": [
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "resumeToken": "resume-token-minutes-later",
+          "targetIds": [
           ],
-          "activeTargets": {
-          },
-          "enqueuedLimboDocs": [
-          ]
+          "version": 300001000
         }
       },
       {
-        "clientIndex": 0,
-        "shutdown": true,
+        "restart": true,
         "expectedState": {
           "activeLimboDocs": [
           ],
@@ -7054,11 +8638,6 @@
         }
       },
       {
-        "clientIndex": 1,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 1,
         "userListen": {
           "query": {
             "filters": [
@@ -7069,6 +8648,34 @@
           },
           "targetId": 2
         },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -7081,22 +8688,55 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "resume-token-minutes-later"
             }
           }
         }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-even-later"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 300002000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
       }
     ]
   },
-  "Omits global resume tokens for a short while": {
+  "Persists global resume tokens on unlisten": {
     "describeName": "Listens:",
-    "itName": "Omits global resume tokens for a short while",
+    "itName": "Persists global resume tokens on unlisten",
     "tags": [
-      "durable-persistence"
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -7136,6 +8776,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -7170,6 +8811,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7203,13 +8845,25 @@
         }
       },
       {
-        "restart": true,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
         "expectedState": {
-          "activeLimboDocs": [
-          ],
           "activeTargets": {
-          },
-          "enqueuedLimboDocs": [
+          }
+        }
+      },
+      {
+        "watchRemove": {
+          "targetIds": [
+            2
           ]
         }
       },
@@ -7228,6 +8882,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7263,7 +8918,7 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-1000"
+              "resumeToken": "resume-token-2000"
             }
           }
         }
@@ -7304,15 +8959,14 @@
       }
     ]
   },
-  "Persists global resume tokens if the snapshot is old enough": {
+  "Persists resume token sent with target": {
     "describeName": "Listens:",
-    "itName": "Persists global resume tokens if the snapshot is old enough",
+    "itName": "Persists resume token sent with target",
     "tags": [
-      "durable-persistence"
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -7338,20 +8992,59 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "watchEntity": {
+          "docs": [
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
             }
           }
-        }
-      },
-      {
-        "watchAck": [
-          2
         ]
       },
       {
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -7360,7 +9053,7 @@
               "value": {
                 "key": "a"
               },
-              "version": 1000
+              "version": 2000
             }
           ],
           "targets": [
@@ -7369,23 +9062,25 @@
         }
       },
       {
-        "watchCurrent": [
-          [
+        "watchSnapshot": {
+          "resumeToken": "resume-token-2000",
+          "targetIds": [
             2
           ],
-          "resume-token-1000"
-        ]
+          "version": 2000
+        }
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 1000
+          "version": 2000
         },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7394,7 +9089,7 @@
                 "value": {
                   "key": "a"
                 },
-                "version": 1000
+                "version": 2000
               }
             ],
             "errorCode": 0,
@@ -7411,21 +9106,25 @@
         ]
       },
       {
-        "watchSnapshot": {
-          "resumeToken": "resume-token-minutes-later",
-          "targetIds": [
-          ],
-          "version": 300001000
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
         }
       },
       {
-        "restart": true,
-        "expectedState": {
-          "activeLimboDocs": [
-          ],
-          "activeTargets": {
-          },
-          "enqueuedLimboDocs": [
+        "watchRemove": {
+          "targetIds": [
+            2
           ]
         }
       },
@@ -7444,6 +9143,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7452,7 +9152,7 @@
                 "value": {
                   "key": "a"
                 },
-                "version": 1000
+                "version": 2000
               }
             ],
             "errorCode": 0,
@@ -7479,7 +9179,7 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-minutes-later"
+              "resumeToken": "resume-token-2000"
             }
           }
         }
@@ -7489,19 +9189,28 @@
           2
         ]
       },
+      {
+        "watchEntity": {
+          "docs": [
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
       {
         "watchCurrent": [
           [
             2
           ],
-          "resume-token-even-later"
+          "resume-token-3000"
         ]
       },
       {
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 300002000
+          "version": 3000
         },
         "expectedSnapshotEvents": [
           {
@@ -7520,17 +9229,23 @@
       }
     ]
   },
-  "Persists global resume tokens on unlisten": {
+  "Previous primary immediately regains primary lease": {
     "describeName": "Listens:",
-    "itName": "Persists global resume tokens on unlisten",
+    "itName": "Previous primary immediately regains primary lease",
     "tags": [
+      "multi-client"
     ],
     "config": {
-      "numClients": 1,
-      "useGarbageCollection": false
+      "numClients": 2,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
         "userListen": {
           "query": {
             "filters": [
@@ -7559,24 +9274,15 @@
         }
       },
       {
+        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
+        "clientIndex": 0,
         "watchEntity": {
           "docs": [
-            {
-              "key": "collection/a",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "key": "a"
-              },
-              "version": 1000
-            }
           ],
           "targets": [
             2
@@ -7584,6 +9290,7 @@
         }
       },
       {
+        "clientIndex": 0,
         "watchCurrent": [
           [
             2
@@ -7592,6 +9299,7 @@
         ]
       },
       {
+        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
@@ -7599,19 +9307,6 @@
         },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 1000
-              }
-            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -7626,74 +9321,14 @@
         ]
       },
       {
-        "watchSnapshot": {
-          "resumeToken": "resume-token-2000",
-          "targetIds": [
-          ],
-          "version": 2000
-        }
-      },
-      {
-        "userUnlisten": [
-          2,
-          {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          }
-        ],
-        "expectedState": {
-          "activeTargets": {
-          }
-        }
-      },
-      {
-        "watchRemove": {
-          "targetIds": [
-            2
-          ]
-        }
+        "clientIndex": 1,
+        "drainQueue": true
       },
       {
-        "userListen": {
-          "query": {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          },
-          "targetId": 2
+        "applyClientState": {
+          "primary": true
         },
-        "expectedSnapshotEvents": [
-          {
-            "added": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 1000
-              }
-            ],
-            "errorCode": 0,
-            "fromCache": true,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          }
-        ],
+        "clientIndex": 1,
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -7706,32 +9341,95 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-2000"
+              "resumeToken": "resume-token-1000"
             }
-          }
+          },
+          "isPrimary": true
         }
       },
       {
+        "clientIndex": 1,
         "watchAck": [
           2
         ]
       },
       {
+        "clientIndex": 1,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 1,
         "watchCurrent": [
           [
             2
           ],
-          "resume-token-3000"
+          "resume-token-2000"
         ]
       },
       {
+        "clientIndex": 1,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 3000
-        },
+          "version": 2000
+        }
+      },
+      {
+        "clientIndex": 1,
+        "shutdown": true,
+        "expectedState": {
+          "activeLimboDocs": [
+          ],
+          "activeTargets": {
+          },
+          "enqueuedLimboDocs": [
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "isPrimary": true
+        }
+      },
+      {
+        "clientIndex": 0,
+        "runTimer": "client_metadata_refresh",
         "expectedSnapshotEvents": [
           {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -7740,24 +9438,54 @@
               ],
               "orderBys": [
               ],
-              "path": "collection"
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-2000"
             }
-          }
-        ]
+          },
+          "isPrimary": true
+        }
       }
     ]
   },
-  "Persists resume token sent with target": {
+  "Query bounces between primaries": {
     "describeName": "Listens:",
-    "itName": "Persists resume token sent with target",
+    "itName": "Query bounces between primaries",
     "tags": [
+      "multi-client"
     ],
     "config": {
-      "numClients": 1,
-      "useGarbageCollection": false
+      "numClients": 3,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedState": {
+          "isPrimary": true
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
         "userListen": {
           "query": {
             "filters": [
@@ -7786,13 +9514,47 @@
         }
       },
       {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 1,
         "watchAck": [
           2
         ]
       },
       {
+        "clientIndex": 1,
         "watchEntity": {
           "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
           ],
           "targets": [
             2
@@ -7800,6 +9562,7 @@
         }
       },
       {
+        "clientIndex": 1,
         "watchCurrent": [
           [
             2
@@ -7808,13 +9571,32 @@
         ]
       },
       {
+        "clientIndex": 1,
         "watchSnapshot": {
           "targetIds": [
           ],
           "version": 1000
-        },
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
         "expectedSnapshotEvents": [
           {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -7829,16 +9611,66 @@
         ]
       },
       {
+        "clientIndex": 2,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "primary": true
+        },
+        "clientIndex": 2,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          },
+          "isPrimary": true
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "runTimer": "client_metadata_refresh",
+        "expectedState": {
+          "isPrimary": false
+        }
+      },
+      {
+        "clientIndex": 2,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 2,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 2,
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/a",
+              "createTime": 0,
+              "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "a"
+                "key": "b"
               },
               "version": 2000
             }
@@ -7849,31 +9681,37 @@
         }
       },
       {
-        "watchSnapshot": {
-          "resumeToken": "resume-token-2000",
-          "targetIds": [
+        "clientIndex": 2,
+        "watchCurrent": [
+          [
             2
           ],
-          "version": 2000
-        }
+          "resume-token-2000"
+        ]
       },
       {
+        "clientIndex": 2,
         "watchSnapshot": {
           "targetIds": [
           ],
           "version": 2000
-        },
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
         "expectedSnapshotEvents": [
           {
             "added": [
               {
-                "key": "collection/a",
+                "createTime": 0,
+                "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "a"
+                  "key": "b"
                 },
                 "version": 2000
               }
@@ -7892,66 +9730,14 @@
         ]
       },
       {
-        "userUnlisten": [
-          2,
-          {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          }
-        ],
-        "expectedState": {
-          "activeTargets": {
-          }
-        }
-      },
-      {
-        "watchRemove": {
-          "targetIds": [
-            2
-          ]
-        }
+        "clientIndex": 1,
+        "drainQueue": true
       },
       {
-        "userListen": {
-          "query": {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          },
-          "targetId": 2
+        "applyClientState": {
+          "primary": true
         },
-        "expectedSnapshotEvents": [
-          {
-            "added": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 2000
-              }
-            ],
-            "errorCode": 0,
-            "fromCache": true,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          }
-        ],
+        "clientIndex": 1,
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -7966,17 +9752,32 @@
               ],
               "resumeToken": "resume-token-2000"
             }
-          }
+          },
+          "isPrimary": true
         }
       },
       {
+        "clientIndex": 1,
         "watchAck": [
           2
         ]
       },
       {
+        "clientIndex": 1,
         "watchEntity": {
           "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "c"
+              },
+              "version": 3000
+            }
           ],
           "targets": [
             2
@@ -7984,6 +9785,7 @@
         }
       },
       {
+        "clientIndex": 1,
         "watchCurrent": [
           [
             2
@@ -7992,13 +9794,32 @@
         ]
       },
       {
+        "clientIndex": 1,
         "watchSnapshot": {
           "targetIds": [
           ],
           "version": 3000
-        },
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
         "expectedSnapshotEvents": [
           {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "c"
+                },
+                "version": 3000
+              }
+            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -8014,15 +9835,15 @@
       }
     ]
   },
-  "Previous primary immediately regains primary lease": {
+  "Query is executed by primary client": {
     "describeName": "Listens:",
-    "itName": "Previous primary immediately regains primary lease",
+    "itName": "Query is executed by primary client",
     "tags": [
       "multi-client"
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -8030,7 +9851,17 @@
         "drainQueue": true
       },
       {
-        "clientIndex": 0,
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
         "userListen": {
           "query": {
             "filters": [
@@ -8060,60 +9891,7 @@
       },
       {
         "clientIndex": 0,
-        "watchAck": [
-          2
-        ]
-      },
-      {
-        "clientIndex": 0,
-        "watchEntity": {
-          "docs": [
-          ],
-          "targets": [
-            2
-          ]
-        }
-      },
-      {
-        "clientIndex": 0,
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-1000"
-        ]
-      },
-      {
-        "clientIndex": 0,
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 1000
-        },
-        "expectedSnapshotEvents": [
-          {
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          }
-        ]
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true
-      },
-      {
-        "applyClientState": {
-          "primary": true
-        },
-        "clientIndex": 1,
+        "drainQueue": true,
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -8126,23 +9904,23 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-1000"
+              "resumeToken": ""
             }
-          },
-          "isPrimary": true
+          }
         }
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -8151,7 +9929,7 @@
               "value": {
                 "key": "a"
               },
-              "version": 2000
+              "version": 1000
             }
           ],
           "targets": [
@@ -8160,48 +9938,21 @@
         }
       },
       {
-        "clientIndex": 1,
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-2000"
-        ]
-      },
-      {
-        "clientIndex": 1,
+        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2000
+          "version": 1000
         }
       },
       {
         "clientIndex": 1,
-        "shutdown": true,
-        "expectedState": {
-          "activeLimboDocs": [
-          ],
-          "activeTargets": {
-          },
-          "enqueuedLimboDocs": [
-          ]
-        }
-      },
-      {
-        "clientIndex": 0,
         "drainQueue": true,
-        "expectedState": {
-          "isPrimary": true
-        }
-      },
-      {
-        "clientIndex": 0,
-        "runTimer": "client_metadata_refresh",
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8210,11 +9961,11 @@
                 "value": {
                   "key": "a"
                 },
-                "version": 2000
+                "version": 1000
               }
             ],
             "errorCode": 0,
-            "fromCache": false,
+            "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -8224,51 +9975,73 @@
               "path": "collection"
             }
           }
-        ],
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
               ],
-              "resumeToken": "resume-token-2000"
+              "orderBys": [
+              ],
+              "path": "collection"
             }
-          },
-          "isPrimary": true
-        }
+          }
+        ]
       }
     ]
   },
-  "Query bounces between primaries": {
+  "Query is joined by primary client": {
     "describeName": "Listens:",
-    "itName": "Query bounces between primaries",
+    "itName": "Query is joined by primary client",
     "tags": [
       "multi-client"
     ],
     "config": {
-      "numClients": 3,
-      "useGarbageCollection": false
+      "numClients": 2,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
-        "clientIndex": 1,
+        "clientIndex": 0,
         "drainQueue": true,
         "expectedState": {
           "isPrimary": true
         }
       },
       {
-        "clientIndex": 0,
+        "clientIndex": 1,
         "drainQueue": true
       },
       {
-        "clientIndex": 0,
+        "clientIndex": 1,
         "userListen": {
           "query": {
             "filters": [
@@ -8297,7 +10070,7 @@
         }
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 0,
         "drainQueue": true,
         "expectedState": {
           "activeTargets": {
@@ -8311,31 +10084,107 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-100"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 100
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
             }
           }
-        }
+        ]
       },
       {
-        "clientIndex": 1,
-        "watchAck": [
-          2
-        ]
+        "clientIndex": 0,
+        "drainQueue": true
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/a",
+              "createTime": 0,
+              "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "a"
+                "key": "b"
               },
-              "version": 1000
+              "version": 2000
             }
           ],
           "targets": [
@@ -8344,29 +10193,30 @@
         }
       },
       {
-        "clientIndex": 1,
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-1000"
-        ]
-      },
-      {
-        "clientIndex": 1,
+        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 1000
+          "version": 2000
         }
       },
       {
         "clientIndex": 0,
-        "drainQueue": true,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8376,6 +10226,18 @@
                   "key": "a"
                 },
                 "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "b"
+                },
+                "version": 2000
               }
             ],
             "errorCode": 0,
@@ -8389,17 +10251,7 @@
               "path": "collection"
             }
           }
-        ]
-      },
-      {
-        "clientIndex": 2,
-        "drainQueue": true
-      },
-      {
-        "applyClientState": {
-          "primary": true
-        },
-        "clientIndex": 2,
+        ],
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -8412,47 +10264,26 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-1000"
+              "resumeToken": ""
             }
-          },
-          "isPrimary": true
-        }
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 1,
-        "runTimer": "client_metadata_refresh",
-        "expectedState": {
-          "isPrimary": false
+          }
         }
       },
       {
-        "clientIndex": 2,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 2,
-        "watchAck": [
-          2
-        ]
-      },
-      {
-        "clientIndex": 2,
+        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/b",
+              "createTime": 0,
+              "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "b"
+                "key": "c"
               },
-              "version": 2000
+              "version": 3000
             }
           ],
           "targets": [
@@ -8461,29 +10292,49 @@
         }
       },
       {
-        "clientIndex": 2,
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-2000"
-        ]
-      },
-      {
-        "clientIndex": 2,
+        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2000
-        }
+          "version": 3000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "c"
+                },
+                "version": 3000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
       },
       {
-        "clientIndex": 0,
+        "clientIndex": 1,
         "drainQueue": true,
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8505,18 +10356,114 @@
               ],
               "path": "collection"
             }
+          },
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "c"
+                },
+                "version": 3000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
           }
         ]
+      }
+    ]
+  },
+  "Query is rejected and re-listened to": {
+    "describeName": "Listens:",
+    "itName": "Query is rejected and re-listened to",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
       },
       {
-        "clientIndex": 1,
-        "drainQueue": true
+        "watchRemove": {
+          "cause": {
+            "code": 8
+          },
+          "targetIds": [
+            2
+          ]
+        },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 8,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
       },
       {
-        "applyClientState": {
-          "primary": true
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
         },
-        "clientIndex": 1,
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -8529,33 +10476,19 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": "resume-token-2000"
+              "resumeToken": ""
             }
-          },
-          "isPrimary": true
+          }
         }
       },
       {
-        "clientIndex": 1,
         "watchAck": [
           2
         ]
       },
       {
-        "clientIndex": 1,
         "watchEntity": {
           "docs": [
-            {
-              "key": "collection/c",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "key": "c"
-              },
-              "version": 3000
-            }
           ],
           "targets": [
             2
@@ -8563,40 +10496,21 @@
         }
       },
       {
-        "clientIndex": 1,
         "watchCurrent": [
           [
             2
           ],
-          "resume-token-3000"
+          "resume-token-1000"
         ]
       },
       {
-        "clientIndex": 1,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 3000
-        }
-      },
-      {
-        "clientIndex": 0,
-        "drainQueue": true,
+          "version": 1000
+        },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/c",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "c"
-                },
-                "version": 3000
-              }
-            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -8612,15 +10526,15 @@
       }
     ]
   },
-  "Query is executed by primary client": {
+  "Query is rejected and re-listened to by secondary client": {
     "describeName": "Listens:",
-    "itName": "Query is executed by primary client",
+    "itName": "Query is rejected and re-listened to by secondary client",
     "tags": [
       "multi-client"
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -8686,6 +10600,88 @@
           }
         }
       },
+      {
+        "clientIndex": 0,
+        "watchRemove": {
+          "cause": {
+            "code": 8
+          },
+          "targetIds": [
+            2
+          ]
+        },
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 8,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
       {
         "clientIndex": 0,
         "watchAck": [
@@ -8696,23 +10692,21 @@
         "clientIndex": 0,
         "watchEntity": {
           "docs": [
-            {
-              "key": "collection/a",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "key": "a"
-              },
-              "version": 1000
-            }
           ],
           "targets": [
             2
           ]
         }
       },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
       {
         "clientIndex": 0,
         "watchSnapshot": {
@@ -8726,21 +10720,8 @@
         "drainQueue": true,
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 1000
-              }
-            ],
             "errorCode": 0,
-            "fromCache": true,
+            "fromCache": false,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -8751,26 +10732,96 @@
             }
           }
         ]
-      },
+      }
+    ]
+  },
+  "Query is rejected by primary client": {
+    "describeName": "Listens:",
+    "itName": "Query is rejected by primary client",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
       {
         "clientIndex": 0,
         "drainQueue": true
       },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
       {
         "clientIndex": 0,
-        "watchCurrent": [
-          [
-            2
-          ],
-          "resume-token-2000"
-        ]
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
       },
       {
         "clientIndex": 0,
-        "watchSnapshot": {
+        "watchRemove": {
+          "cause": {
+            "code": 8
+          },
           "targetIds": [
-          ],
-          "version": 2000
+            2
+          ]
+        },
+        "expectedState": {
+          "activeTargets": {
+          }
         }
       },
       {
@@ -8778,7 +10829,7 @@
         "drainQueue": true,
         "expectedSnapshotEvents": [
           {
-            "errorCode": 0,
+            "errorCode": 8,
             "fromCache": false,
             "hasPendingWrites": false,
             "query": {
@@ -8793,23 +10844,26 @@
       }
     ]
   },
-  "Query is joined by primary client": {
+  "Query is resumed by secondary client": {
     "describeName": "Listens:",
-    "itName": "Query is joined by primary client",
+    "itName": "Query is resumed by secondary client",
     "tags": [
       "multi-client"
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
         "clientIndex": 0,
-        "drainQueue": true,
-        "expectedState": {
-          "isPrimary": true
-        }
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
       },
       {
         "clientIndex": 1,
@@ -8875,6 +10929,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -8897,7 +10952,7 @@
           [
             2
           ],
-          "resume-token-100"
+          "resume-token-1000"
         ]
       },
       {
@@ -8905,7 +10960,7 @@
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 100
+          "version": 1000
         }
       },
       {
@@ -8915,6 +10970,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8940,40 +10996,44 @@
         ]
       },
       {
-        "clientIndex": 0,
-        "drainQueue": true
+        "clientIndex": 1,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
       },
       {
         "clientIndex": 0,
-        "watchEntity": {
-          "docs": [
-            {
-              "key": "collection/b",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "key": "b"
-              },
-              "version": 2000
-            }
-          ],
-          "targets": [
-            2
-          ]
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+          }
         }
       },
       {
         "clientIndex": 0,
-        "watchSnapshot": {
+        "watchRemove": {
           "targetIds": [
-          ],
-          "version": 2000
+            2
+          ]
         }
       },
       {
-        "clientIndex": 0,
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
         "userListen": {
           "query": {
             "filters": [
@@ -8988,6 +11048,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8997,21 +11058,10 @@
                   "key": "a"
                 },
                 "version": 1000
-              },
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "b"
-                },
-                "version": 2000
               }
             ],
             "errorCode": 0,
-            "fromCache": false,
+            "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -9039,20 +11089,47 @@
           }
         }
       },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-1000"
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
       {
         "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/c",
+              "createTime": 0,
+              "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "c"
+                "key": "a"
               },
-              "version": 3000
+              "version": 2000
             }
           ],
           "targets": [
@@ -9062,147 +11139,41 @@
       },
       {
         "clientIndex": 0,
-        "watchSnapshot": {
-          "targetIds": [
+        "watchCurrent": [
+          [
+            2
           ],
-          "version": 3000
-        },
-        "expectedSnapshotEvents": [
-          {
-            "added": [
-              {
-                "key": "collection/c",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "c"
-                },
-                "version": 3000
-              }
-            ],
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          }
+          "resume-token-2000"
         ]
       },
       {
-        "clientIndex": 1,
-        "drainQueue": true,
-        "expectedSnapshotEvents": [
-          {
-            "added": [
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "b"
-                },
-                "version": 2000
-              }
-            ],
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          },
-          {
-            "added": [
-              {
-                "key": "collection/c",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "c"
-                },
-                "version": 3000
-              }
-            ],
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "Query is rejected and re-listened to": {
-    "describeName": "Listens:",
-    "itName": "Query is rejected and re-listened to",
-    "tags": [
-    ],
-    "config": {
-      "numClients": 1,
-      "useGarbageCollection": false
-    },
-    "steps": [
-      {
-        "userListen": {
-          "query": {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          },
-          "targetId": 2
-        },
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": ""
-            }
-          }
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
         }
       },
       {
-        "watchRemove": {
-          "cause": {
-            "code": 8
-          },
-          "targetIds": [
-            2
-          ]
-        },
+        "clientIndex": 1,
+        "drainQueue": true,
         "expectedSnapshotEvents": [
           {
-            "errorCode": 8,
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
             "query": {
@@ -9213,13 +11184,33 @@
               "path": "collection"
             }
           }
-        ],
-        "expectedState": {
-          "activeTargets": {
-          }
-        }
+        ]
+      }
+    ]
+  },
+  "Query is shared between primary and secondary client": {
+    "describeName": "Listens:",
+    "itName": "Query is shared between primary and secondary client",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 3,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
       },
       {
+        "clientIndex": 0,
         "userListen": {
           "query": {
             "filters": [
@@ -9248,13 +11239,27 @@
         }
       },
       {
+        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
+        "clientIndex": 0,
         "watchEntity": {
           "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
           ],
           "targets": [
             2
@@ -9262,6 +11267,7 @@
         }
       },
       {
+        "clientIndex": 0,
         "watchCurrent": [
           [
             2
@@ -9270,6 +11276,7 @@
         ]
       },
       {
+        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
@@ -9277,6 +11284,20 @@
         },
         "expectedSnapshotEvents": [
           {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -9289,29 +11310,6 @@
             }
           }
         ]
-      }
-    ]
-  },
-  "Query is rejected and re-listened to by secondary client": {
-    "describeName": "Listens:",
-    "itName": "Query is rejected and re-listened to by secondary client",
-    "tags": [
-      "multi-client"
-    ],
-    "config": {
-      "numClients": 2,
-      "useGarbageCollection": false
-    },
-    "steps": [
-      {
-        "clientIndex": 0,
-        "drainQueue": true
-      },
-      {
-        "applyClientState": {
-          "visibility": "visible"
-        },
-        "clientIndex": 0
       },
       {
         "clientIndex": 1,
@@ -9329,6 +11327,34 @@
           },
           "targetId": 2
         },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -9347,8 +11373,49 @@
         }
       },
       {
-        "clientIndex": 0,
-        "drainQueue": true,
+        "clientIndex": 2,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 2,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -9368,25 +11435,118 @@
       },
       {
         "clientIndex": 0,
-        "watchRemove": {
-          "cause": {
-            "code": 8
-          },
-          "targetIds": [
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
             2
           ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
         },
-        "expectedState": {
-          "activeTargets": {
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
           }
-        }
+        ]
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 2,
         "drainQueue": true,
         "expectedSnapshotEvents": [
           {
-            "errorCode": 8,
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
             "query": {
@@ -9398,9 +11558,32 @@
             }
           }
         ]
+      }
+    ]
+  },
+  "Query is unlistened to by primary client": {
+    "describeName": "Listens:",
+    "itName": "Query is unlistened to by primary client",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true
       },
       {
-        "clientIndex": 1,
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 0,
         "userListen": {
           "query": {
             "filters": [
@@ -9428,26 +11611,6 @@
           }
         }
       },
-      {
-        "clientIndex": 0,
-        "drainQueue": true,
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": ""
-            }
-          }
-        }
-      },
       {
         "clientIndex": 0,
         "watchAck": [
@@ -9458,6 +11621,18 @@
         "clientIndex": 0,
         "watchEntity": {
           "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
           ],
           "targets": [
             2
@@ -9479,13 +11654,23 @@
           "targetIds": [
           ],
           "version": 1000
-        }
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true,
+        },
         "expectedSnapshotEvents": [
           {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -9498,29 +11683,6 @@
             }
           }
         ]
-      }
-    ]
-  },
-  "Query is rejected by primary client": {
-    "describeName": "Listens:",
-    "itName": "Query is rejected by primary client",
-    "tags": [
-      "multi-client"
-    ],
-    "config": {
-      "numClients": 2,
-      "useGarbageCollection": false
-    },
-    "steps": [
-      {
-        "clientIndex": 0,
-        "drainQueue": true
-      },
-      {
-        "applyClientState": {
-          "visibility": "visible"
-        },
-        "clientIndex": 0
       },
       {
         "clientIndex": 1,
@@ -9538,6 +11700,34 @@
           },
           "targetId": 2
         },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -9557,7 +11747,20 @@
       },
       {
         "clientIndex": 0,
-        "drainQueue": true,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -9577,17 +11780,32 @@
       },
       {
         "clientIndex": 0,
-        "watchRemove": {
-          "cause": {
-            "code": 8
-          },
-          "targetIds": [
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/b",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
             2
           ]
-        },
-        "expectedState": {
-          "activeTargets": {
-          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
         }
       },
       {
@@ -9595,7 +11813,21 @@
         "drainQueue": true,
         "expectedSnapshotEvents": [
           {
-            "errorCode": 8,
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
             "query": {
@@ -9607,18 +11839,43 @@
             }
           }
         ]
+      },
+      {
+        "clientIndex": 1,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
       }
     ]
   },
-  "Query is resumed by secondary client": {
+  "Query only raises events in participating clients": {
     "describeName": "Listens:",
-    "itName": "Query is resumed by secondary client",
+    "itName": "Query only raises events in participating clients",
     "tags": [
       "multi-client"
     ],
     "config": {
-      "numClients": 2,
-      "useGarbageCollection": false
+      "numClients": 4,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -9629,14 +11886,51 @@
         "applyClientState": {
           "visibility": "visible"
         },
-        "clientIndex": 0
+        "clientIndex": 0
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 2,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 2,
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 3,
         "drainQueue": true
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 3,
         "userListen": {
           "query": {
             "filters": [
@@ -9695,6 +11989,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -9730,11 +12025,16 @@
       },
       {
         "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 2,
         "drainQueue": true,
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9760,38 +12060,159 @@
         ]
       },
       {
-        "clientIndex": 1,
-        "userUnlisten": [
-          2,
+        "clientIndex": 3,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
           {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "Query recovers after primary takeover": {
+    "describeName": "Listens:",
+    "itName": "Query recovers after primary takeover",
+    "tags": [
+      "multi-client"
+    ],
+    "config": {
+      "numClients": 2,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
+        "expectedState": {
+          "isPrimary": true
+        }
+      },
+      {
+        "clientIndex": 0,
+        "userListen": {
+          "query": {
             "filters": [
             ],
             "orderBys": [
             ],
             "path": "collection"
-          }
-        ],
+          },
+          "targetId": 2
+        },
         "expectedState": {
           "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
           }
         }
       },
       {
         "clientIndex": 0,
-        "drainQueue": true,
-        "expectedState": {
-          "activeTargets": {
-          }
-        }
+        "watchAck": [
+          2
+        ]
       },
       {
         "clientIndex": 0,
-        "watchRemove": {
-          "targetIds": [
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            }
+          ],
+          "targets": [
             2
           ]
         }
       },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1000"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
       {
         "clientIndex": 1,
         "drainQueue": true
@@ -9812,6 +12233,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9824,7 +12246,7 @@
               }
             ],
             "errorCode": 0,
-            "fromCache": true,
+            "fromCache": false,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -9853,8 +12275,10 @@
         }
       },
       {
-        "clientIndex": 0,
-        "drainQueue": true,
+        "applyClientState": {
+          "primary": true
+        },
+        "clientIndex": 1,
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -9869,29 +12293,106 @@
               ],
               "resumeToken": "resume-token-1000"
             }
-          }
+          },
+          "isPrimary": true
         }
       },
       {
-        "clientIndex": 0,
+        "clientIndex": 1,
         "watchAck": [
           2
         ]
       },
       {
-        "clientIndex": 0,
+        "clientIndex": 1,
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "a"
+                "key": "b"
+              },
+              "version": 2000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 1,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 2000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "b"
+                },
+                "version": 2000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/c",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "c"
               },
-              "version": 2000
+              "version": 3000
             }
           ],
           "targets": [
@@ -9900,38 +12401,74 @@
         }
       },
       {
-        "clientIndex": 0,
-        "watchCurrent": [
-          [
-            2
+        "clientIndex": 1,
+        "watchSnapshot": {
+          "targetIds": [
           ],
-          "resume-token-2000"
+          "version": 3000
+        },
+        "expectedSnapshotEvents": [
+          {
+            "added": [
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "c"
+                },
+                "version": 3000
+              }
+            ],
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
         ]
       },
       {
         "clientIndex": 0,
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 2000
-        }
+        "drainQueue": true
       },
       {
-        "clientIndex": 1,
-        "drainQueue": true,
+        "clientIndex": 0,
+        "runTimer": "client_metadata_refresh",
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "a"
+                  "key": "b"
                 },
                 "version": 2000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/c",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "c"
+                },
+                "version": 3000
               }
             ],
             "errorCode": 0,
@@ -9945,33 +12482,24 @@
               "path": "collection"
             }
           }
-        ]
+        ],
+        "expectedState": {
+          "isPrimary": false
+        }
       }
     ]
   },
-  "Query is shared between primary and secondary client": {
+  "Re-opens target without existence filter": {
     "describeName": "Listens:",
-    "itName": "Query is shared between primary and secondary client",
+    "itName": "Re-opens target without existence filter",
     "tags": [
-      "multi-client"
     ],
     "config": {
-      "numClients": 3,
-      "useGarbageCollection": false
+      "numClients": 1,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
-        "clientIndex": 0,
-        "drainQueue": true
-      },
-      {
-        "applyClientState": {
-          "visibility": "visible"
-        },
-        "clientIndex": 0
-      },
-      {
-        "clientIndex": 0,
         "userListen": {
           "query": {
             "filters": [
@@ -10000,16 +12528,15 @@
         }
       },
       {
-        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
-        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -10027,7 +12554,6 @@
         }
       },
       {
-        "clientIndex": 0,
         "watchCurrent": [
           [
             2
@@ -10036,7 +12562,6 @@
         ]
       },
       {
-        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
@@ -10046,6 +12571,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10071,71 +12597,29 @@
         ]
       },
       {
-        "clientIndex": 1,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 1,
-        "userListen": {
-          "query": {
+        "userUnlisten": [
+          2,
+          {
             "filters": [
             ],
             "orderBys": [
             ],
             "path": "collection"
-          },
-          "targetId": 2
-        },
-        "expectedSnapshotEvents": [
-          {
-            "added": [
-              {
-                "key": "collection/a",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 1000
-              }
-            ],
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
           }
         ],
         "expectedState": {
           "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
-              ],
-              "resumeToken": ""
-            }
           }
         }
       },
       {
-        "clientIndex": 2,
-        "drainQueue": true
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
       },
       {
-        "clientIndex": 2,
         "userListen": {
           "query": {
             "filters": [
@@ -10150,6 +12634,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10162,7 +12647,7 @@
               }
             ],
             "errorCode": 0,
-            "fromCache": false,
+            "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -10185,38 +12670,40 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "resume-token-1000"
             }
           }
         }
       },
       {
-        "clientIndex": 0,
-        "drainQueue": true
+        "watchAck": [
+          2
+        ]
       },
       {
-        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/b",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "key": "a"
-              },
+              "createTime": 0,
+              "key": "collection/a",
+              "value": null,
               "version": 2000
             }
           ],
-          "targets": [
+          "removedTargets": [
             2
           ]
         }
       },
       {
-        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-2000"
+        ]
+      },
+      {
         "watchSnapshot": {
           "targetIds": [
           ],
@@ -10224,50 +12711,6 @@
         },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 2000
-              }
-            ],
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          }
-        ]
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true,
-        "expectedSnapshotEvents": [
-          {
-            "added": [
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 2000
-              }
-            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -10277,66 +12720,37 @@
               "orderBys": [
               ],
               "path": "collection"
-            }
-          }
-        ]
-      },
-      {
-        "clientIndex": 2,
-        "drainQueue": true,
-        "expectedSnapshotEvents": [
-          {
-            "added": [
+            },
+            "removed": [
               {
-                "key": "collection/b",
+                "createTime": 0,
+                "key": "collection/a",
                 "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 2000
-              }
-            ],
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "a"
+                },
+                "version": 1000
+              }
+            ]
           }
         ]
       }
     ]
   },
-  "Query is unlistened to by primary client": {
+  "Resuming a query should specify expectedCount that does not include pending mutations": {
     "describeName": "Listens:",
-    "itName": "Query is unlistened to by primary client",
+    "itName": "Resuming a query should specify expectedCount that does not include pending mutations",
     "tags": [
-      "multi-client"
     ],
     "config": {
-      "numClients": 2,
-      "useGarbageCollection": false
+      "numClients": 1,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
-        "clientIndex": 0,
-        "drainQueue": true
-      },
-      {
-        "applyClientState": {
-          "visibility": "visible"
-        },
-        "clientIndex": 0
-      },
-      {
-        "clientIndex": 0,
         "userListen": {
           "query": {
             "filters": [
@@ -10365,16 +12779,15 @@
         }
       },
       {
-        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
-        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -10392,7 +12805,6 @@
         }
       },
       {
-        "clientIndex": 0,
         "watchCurrent": [
           [
             2
@@ -10401,7 +12813,6 @@
         ]
       },
       {
-        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
@@ -10411,6 +12822,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10436,11 +12848,30 @@
         ]
       },
       {
-        "clientIndex": 1,
-        "drainQueue": true
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "userSet": [
+          "collection/b",
+          {
+            "key": "b"
+          }
+        ]
       },
       {
-        "clientIndex": 1,
         "userListen": {
           "query": {
             "filters": [
@@ -10455,6 +12886,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10464,11 +12896,23 @@
                   "key": "a"
                 },
                 "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": true
+                },
+                "value": {
+                  "key": "b"
+                },
+                "version": 0
               }
             ],
             "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
+            "fromCache": true,
+            "hasPendingWrites": true,
             "query": {
               "filters": [
               ],
@@ -10490,27 +12934,34 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "resume-token-1000"
             }
           }
         }
-      },
-      {
-        "clientIndex": 0,
-        "drainQueue": true
-      },
+      }
+    ]
+  },
+  "Resuming a query should specify expectedCount when adding the target": {
+    "describeName": "Listens:",
+    "itName": "Resuming a query should specify expectedCount when adding the target",
+    "tags": [
+    ],
+    "config": {
+      "numClients": 1,
+      "useEagerGCForMemory": false
+    },
+    "steps": [
       {
-        "clientIndex": 0,
-        "userUnlisten": [
-          2,
-          {
+        "userListen": {
+          "query": {
             "filters": [
             ],
             "orderBys": [
             ],
             "path": "collection"
-          }
-        ],
+          },
+          "targetId": 2
+        },
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -10529,20 +12980,13 @@
         }
       },
       {
-        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
         "watchEntity": {
           "docs": [
-            {
-              "key": "collection/b",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "key": "a"
-              },
-              "version": 2000
-            }
           ],
           "targets": [
             2
@@ -10550,31 +12994,21 @@
         }
       },
       {
-        "clientIndex": 0,
-        "watchSnapshot": {
-          "targetIds": [
+        "watchCurrent": [
+          [
+            2
           ],
-          "version": 2000
-        }
+          "resume-token-1000"
+        ]
       },
       {
-        "clientIndex": 1,
-        "drainQueue": true,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1000
+        },
         "expectedSnapshotEvents": [
           {
-            "added": [
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "a"
-                },
-                "version": 2000
-              }
-            ],
             "errorCode": 0,
             "fromCache": false,
             "hasPendingWrites": false,
@@ -10589,7 +13023,6 @@
         ]
       },
       {
-        "clientIndex": 1,
         "userUnlisten": [
           2,
           {
@@ -10606,46 +13039,13 @@
         }
       },
       {
-        "clientIndex": 0,
-        "drainQueue": true,
-        "expectedState": {
-          "activeTargets": {
-          }
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
         }
-      }
-    ]
-  },
-  "Query only raises events in participating clients": {
-    "describeName": "Listens:",
-    "itName": "Query only raises events in participating clients",
-    "tags": [
-      "multi-client"
-    ],
-    "config": {
-      "numClients": 4,
-      "useGarbageCollection": false
-    },
-    "steps": [
-      {
-        "clientIndex": 0,
-        "drainQueue": true
-      },
-      {
-        "applyClientState": {
-          "visibility": "visible"
-        },
-        "clientIndex": 0
       },
       {
-        "clientIndex": 1,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 2,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 2,
         "userListen": {
           "query": {
             "filters": [
@@ -10656,59 +13056,20 @@
           },
           "targetId": 2
         },
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
               ],
-              "resumeToken": ""
-            }
-          }
-        }
-      },
-      {
-        "clientIndex": 3,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 3,
-        "userListen": {
-          "query": {
-            "filters": [
-            ],
-            "orderBys": [
-            ],
-            "path": "collection"
-          },
-          "targetId": 2
-        },
-        "expectedState": {
-          "activeTargets": {
-            "2": {
-              "queries": [
-                {
-                  "filters": [
-                  ],
-                  "orderBys": [
-                  ],
-                  "path": "collection"
-                }
+              "orderBys": [
               ],
-              "resumeToken": ""
+              "path": "collection"
             }
           }
-        }
-      },
-      {
-        "clientIndex": 0,
-        "drainQueue": true,
+        ],
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -10721,29 +13082,40 @@
                   "path": "collection"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "resume-token-1000"
             }
           }
         }
       },
       {
-        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
-        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/a",
+              "createTime": 0,
+              "key": "collection/a",
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "a"
+              },
+              "version": 1000
+            },
+            {
+              "createTime": 0,
+              "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "a"
+                "key": "b"
               },
               "version": 1000
             }
@@ -10754,33 +13126,24 @@
         }
       },
       {
-        "clientIndex": 0,
         "watchCurrent": [
           [
             2
           ],
-          "resume-token-1000"
+          "resume-token-2000"
         ]
       },
       {
-        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 1000
-        }
-      },
-      {
-        "clientIndex": 1,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 2,
-        "drainQueue": true,
+          "version": 2000
+        },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10790,6 +13153,18 @@
                   "key": "a"
                 },
                 "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "b"
+                },
+                "version": 1000
               }
             ],
             "errorCode": 0,
@@ -10806,12 +13181,37 @@
         ]
       },
       {
-        "clientIndex": 3,
-        "drainQueue": true,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "userListen": {
+          "query": {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          },
+          "targetId": 2
+        },
         "expectedSnapshotEvents": [
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10821,10 +13221,22 @@
                   "key": "a"
                 },
                 "version": 1000
+              },
+              {
+                "createTime": 0,
+                "key": "collection/b",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "b"
+                },
+                "version": 1000
               }
             ],
             "errorCode": 0,
-            "fromCache": false,
+            "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -10834,24 +13246,46 @@
               "path": "collection"
             }
           }
-        ]
+        ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": "resume-token-2000"
+            }
+          }
+        }
       }
     ]
   },
-  "Query recovers after primary takeover": {
+  "Secondary client advances query state with global snapshot from primary": {
     "describeName": "Listens:",
-    "itName": "Query recovers after primary takeover",
+    "itName": "Secondary client advances query state with global snapshot from primary",
     "tags": [
       "multi-client"
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
         "clientIndex": 0,
-        "drainQueue": true,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0,
         "expectedState": {
           "isPrimary": true
         }
@@ -10896,13 +13330,14 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "a"
+                "key": "1"
               },
               "version": 1000
             }
@@ -10932,13 +13367,14 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "a"
+                  "key": "1"
                 },
                 "version": 1000
               }
@@ -10956,6 +13392,31 @@
           }
         ]
       },
+      {
+        "clientIndex": 0,
+        "userUnlisten": [
+          2,
+          {
+            "filters": [
+            ],
+            "orderBys": [
+            ],
+            "path": "collection"
+          }
+        ],
+        "expectedState": {
+          "activeTargets": {
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchRemove": {
+          "targetIds": [
+            2
+          ]
+        }
+      },
       {
         "clientIndex": 1,
         "drainQueue": true
@@ -10976,19 +13437,20 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "a"
+                  "key": "1"
                 },
                 "version": 1000
               }
             ],
             "errorCode": 0,
-            "fromCache": false,
+            "fromCache": true,
             "hasPendingWrites": false,
             "query": {
               "filters": [
@@ -11017,10 +13479,8 @@
         }
       },
       {
-        "applyClientState": {
-          "primary": true
-        },
-        "clientIndex": 1,
+        "clientIndex": 0,
+        "drainQueue": true,
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -11035,29 +13495,145 @@
               ],
               "resumeToken": "resume-token-1000"
             }
-          },
-          "isPrimary": true
+          }
         }
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
-              "key": "collection/b",
+              "createTime": 0,
+              "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "b"
+                "key": "1"
               },
+              "version": 1000
+            }
+          ],
+          "targets": [
+            2
+          ]
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchCurrent": [
+          [
+            2
+          ],
+          "resume-token-1500"
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchSnapshot": {
+          "targetIds": [
+          ],
+          "version": 1500
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "userDelete": "collection/a"
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            },
+            "removed": [
+              {
+                "createTime": 0,
+                "key": "collection/a",
+                "options": {
+                  "hasCommittedMutations": false,
+                  "hasLocalMutations": false
+                },
+                "value": {
+                  "key": "1"
+                },
+                "version": 1000
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "writeAck": {
+          "version": 2000
+        },
+        "expectedState": {
+          "userCallbacks": {
+            "acknowledgedDocs": [
+              "collection/a"
+            ],
+            "rejectedDocs": [
+            ]
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "watchAck": [
+          2
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "watchEntity": {
+          "docs": [
+            {
+              "createTime": 0,
+              "key": "collection/a",
+              "value": null,
               "version": 2000
             }
           ],
@@ -11067,7 +13643,7 @@
         }
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 0,
         "watchCurrent": [
           [
             2
@@ -11076,140 +13652,52 @@
         ]
       },
       {
-        "clientIndex": 1,
+        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
           "version": 2000
-        },
-        "expectedSnapshotEvents": [
-          {
-            "added": [
-              {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "b"
-                },
-                "version": 2000
-              }
-            ],
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
-          }
-        ]
-      },
-      {
-        "clientIndex": 0,
-        "drainQueue": true
+        }
       },
       {
         "clientIndex": 1,
         "drainQueue": true
       },
       {
-        "clientIndex": 1,
-        "watchEntity": {
-          "docs": [
-            {
-              "key": "collection/c",
-              "options": {
-                "hasCommittedMutations": false,
-                "hasLocalMutations": false
-              },
-              "value": {
-                "key": "c"
-              },
-              "version": 3000
-            }
-          ],
-          "targets": [
-            2
-          ]
-        }
+        "clientIndex": 0,
+        "drainQueue": true
       },
       {
-        "clientIndex": 1,
-        "watchSnapshot": {
-          "targetIds": [
-          ],
-          "version": 3000
-        },
-        "expectedSnapshotEvents": [
+        "clientIndex": 0,
+        "userSet": [
+          "collection/a",
           {
-            "added": [
-              {
-                "key": "collection/c",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "c"
-                },
-                "version": 3000
-              }
-            ],
-            "errorCode": 0,
-            "fromCache": false,
-            "hasPendingWrites": false,
-            "query": {
-              "filters": [
-              ],
-              "orderBys": [
-              ],
-              "path": "collection"
-            }
+            "key": "2"
           }
         ]
       },
       {
-        "clientIndex": 0,
-        "drainQueue": true
-      },
-      {
-        "clientIndex": 0,
-        "runTimer": "client_metadata_refresh",
+        "clientIndex": 1,
+        "drainQueue": true,
         "expectedSnapshotEvents": [
           {
             "added": [
               {
-                "key": "collection/b",
-                "options": {
-                  "hasCommittedMutations": false,
-                  "hasLocalMutations": false
-                },
-                "value": {
-                  "key": "b"
-                },
-                "version": 2000
-              },
-              {
-                "key": "collection/c",
+                "createTime": 0,
+                "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
-                  "hasLocalMutations": false
+                  "hasLocalMutations": true
                 },
                 "value": {
-                  "key": "c"
+                  "key": "2"
                 },
-                "version": 3000
+                "version": 0
               }
             ],
             "errorCode": 0,
             "fromCache": false,
-            "hasPendingWrites": false,
+            "hasPendingWrites": true,
             "query": {
               "filters": [
               ],
@@ -11218,24 +13706,36 @@
               "path": "collection"
             }
           }
-        ],
-        "expectedState": {
-          "isPrimary": false
-        }
+        ]
       }
     ]
   },
-  "Re-opens target without existence filter": {
+  "Secondary client raises latency compensated snapshot from primary mutation": {
     "describeName": "Listens:",
-    "itName": "Re-opens target without existence filter",
+    "itName": "Secondary client raises latency compensated snapshot from primary mutation",
     "tags": [
+      "multi-client"
     ],
     "config": {
-      "numClients": 1,
-      "useGarbageCollection": false
+      "numClients": 2,
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "applyClientState": {
+          "visibility": "visible"
+        },
+        "clientIndex": 0,
+        "expectedState": {
+          "isPrimary": true
+        }
+      },
+      {
+        "clientIndex": 0,
         "userListen": {
           "query": {
             "filters": [
@@ -11264,21 +13764,24 @@
         }
       },
       {
+        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
+        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
                 "hasLocalMutations": false
               },
               "value": {
-                "key": "a"
+                "key": "1"
               },
               "version": 1000
             }
@@ -11289,6 +13792,7 @@
         }
       },
       {
+        "clientIndex": 0,
         "watchCurrent": [
           [
             2
@@ -11297,6 +13801,7 @@
         ]
       },
       {
+        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
@@ -11306,13 +13811,14 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "a"
+                  "key": "1"
                 },
                 "version": 1000
               }
@@ -11331,6 +13837,7 @@
         ]
       },
       {
+        "clientIndex": 0,
         "userUnlisten": [
           2,
           {
@@ -11347,6 +13854,7 @@
         }
       },
       {
+        "clientIndex": 0,
         "watchRemove": {
           "targetIds": [
             2
@@ -11354,6 +13862,11 @@
         }
       },
       {
+        "clientIndex": 1,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 1,
         "userListen": {
           "query": {
             "filters": [
@@ -11368,13 +13881,14 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
                   "hasLocalMutations": false
                 },
                 "value": {
-                  "key": "a"
+                  "key": "1"
                 },
                 "version": 1000
               }
@@ -11391,6 +13905,26 @@
             }
           }
         ],
+        "expectedState": {
+          "activeTargets": {
+            "2": {
+              "queries": [
+                {
+                  "filters": [
+                  ],
+                  "orderBys": [
+                  ],
+                  "path": "collection"
+                }
+              ],
+              "resumeToken": ""
+            }
+          }
+        }
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true,
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -11409,38 +13943,53 @@
         }
       },
       {
+        "clientIndex": 0,
         "watchAck": [
           2
         ]
       },
       {
+        "clientIndex": 0,
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
-              "value": null,
-              "version": 2000
+              "options": {
+                "hasCommittedMutations": false,
+                "hasLocalMutations": false
+              },
+              "value": {
+                "key": "1"
+              },
+              "version": 1000
             }
           ],
-          "removedTargets": [
+          "targets": [
             2
           ]
         }
       },
       {
+        "clientIndex": 0,
         "watchCurrent": [
           [
             2
           ],
-          "resume-token-2000"
+          "resume-token-1500"
         ]
       },
       {
+        "clientIndex": 0,
         "watchSnapshot": {
           "targetIds": [
           ],
-          "version": 2000
-        },
+          "version": 1500
+        }
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
         "expectedSnapshotEvents": [
           {
             "errorCode": 0,
@@ -11452,20 +14001,52 @@
               "orderBys": [
               ],
               "path": "collection"
-            },
-            "removed": [
+            }
+          }
+        ]
+      },
+      {
+        "clientIndex": 0,
+        "drainQueue": true
+      },
+      {
+        "clientIndex": 0,
+        "userSet": [
+          "collection/a",
+          {
+            "key": "2"
+          }
+        ]
+      },
+      {
+        "clientIndex": 1,
+        "drainQueue": true,
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": false,
+            "hasPendingWrites": true,
+            "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
-                  "hasLocalMutations": false
+                  "hasLocalMutations": true
                 },
                 "value": {
-                  "key": "a"
+                  "key": "2"
                 },
-                "version": 1000
+                "version": 0
               }
-            ]
+            ],
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
           }
         ]
       }
@@ -11479,7 +14060,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -11715,7 +14296,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -11853,6 +14434,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -11884,6 +14466,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11955,7 +14538,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -11995,6 +14578,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -12006,6 +14590,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -12040,6 +14625,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12051,6 +14637,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12113,6 +14700,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12124,6 +14712,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12195,6 +14784,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12268,6 +14858,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12320,6 +14911,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12370,7 +14962,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -12461,6 +15053,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -12525,6 +15118,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -12561,6 +15155,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12594,7 +15189,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -12634,6 +15229,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -12668,6 +15264,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12708,6 +15305,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12726,6 +15324,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -12767,6 +15366,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -12794,6 +15394,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -12820,6 +15421,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12853,7 +15455,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -12893,6 +15495,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -12927,6 +15530,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12955,6 +15559,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -12984,6 +15589,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13043,6 +15649,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13092,6 +15699,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -13127,6 +15735,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -13174,7 +15783,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -13214,6 +15823,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -13248,6 +15858,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13276,6 +15887,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -13305,6 +15917,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13352,6 +15965,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13401,6 +16015,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -13436,6 +16051,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -13482,7 +16098,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -13567,6 +16183,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection1/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -13587,6 +16204,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection2/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -13661,6 +16279,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection2/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13694,7 +16313,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -13767,7 +16386,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -13911,7 +16530,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -13951,6 +16570,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -13985,6 +16605,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14027,6 +16648,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14035,7 +16657,7 @@
                 "value": {
                   "v": 2
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -14053,6 +16675,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -14087,6 +16710,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14127,7 +16751,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -14167,6 +16791,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -14201,6 +16826,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14243,6 +16869,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14251,7 +16878,7 @@
                 "value": {
                   "v": 2
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -14287,6 +16914,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14295,7 +16923,7 @@
                 "value": {
                   "v": 3
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -14326,6 +16954,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14334,7 +16963,7 @@
                 "value": {
                   "v": 4
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -14357,7 +16986,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -14397,6 +17026,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -14431,6 +17061,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14470,6 +17101,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14531,6 +17163,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -14594,6 +17227,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14602,7 +17236,7 @@
                 "value": {
                   "v": 2
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -14619,6 +17253,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14627,7 +17262,7 @@
                 "value": {
                   "v": 2
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -14645,6 +17280,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -14680,6 +17316,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14705,6 +17342,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14745,7 +17383,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -14765,7 +17403,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
diff --git a/firebase-firestore/src/test/resources/json/offline_spec_test.json b/firebase-firestore/src/test/resources/json/offline_spec_test.json
index eb8a35f3074..c93ef8349d2 100644
--- a/firebase-firestore/src/test/resources/json/offline_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/offline_spec_test.json
@@ -6,7 +6,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -101,7 +101,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -169,7 +169,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -250,7 +250,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -361,7 +361,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -478,7 +478,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -553,6 +553,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -587,6 +588,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -666,7 +668,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -805,7 +807,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -845,6 +847,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -879,6 +882,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1003,7 +1007,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1043,6 +1047,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1077,6 +1082,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1149,7 +1155,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -1186,7 +1193,8 @@
                   "path": "collection/a"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "2": {
               "queries": [
@@ -1283,6 +1291,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1326,7 +1335,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
diff --git a/firebase-firestore/src/test/resources/json/orderby_spec_test.json b/firebase-firestore/src/test/resources/json/orderby_spec_test.json
index 858919c3721..ba8750f9032 100644
--- a/firebase-firestore/src/test/resources/json/orderby_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/orderby_spec_test.json
@@ -6,7 +6,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -53,6 +53,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -111,6 +112,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -145,6 +147,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -154,7 +157,7 @@
                   "key": "b",
                   "sort": 2
                 },
-                "version": 1001
+                "version": 0
               }
             ],
             "errorCode": 0,
@@ -183,7 +186,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -231,6 +234,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -243,6 +247,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -278,6 +283,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -290,6 +296,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -365,6 +372,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -377,6 +385,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
diff --git a/firebase-firestore/src/test/resources/json/perf_spec_test.json b/firebase-firestore/src/test/resources/json/perf_spec_test.json
index 5276fb92fb9..65e2283c64b 100644
--- a/firebase-firestore/src/test/resources/json/perf_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/perf_spec_test.json
@@ -7,7 +7,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -55,6 +55,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc0",
               "options": {
                 "hasCommittedMutations": false,
@@ -75,6 +76,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc1",
               "options": {
                 "hasCommittedMutations": false,
@@ -95,6 +97,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc2",
               "options": {
                 "hasCommittedMutations": false,
@@ -115,6 +118,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc3",
               "options": {
                 "hasCommittedMutations": false,
@@ -135,6 +139,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc4",
               "options": {
                 "hasCommittedMutations": false,
@@ -155,6 +160,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc5",
               "options": {
                 "hasCommittedMutations": false,
@@ -175,6 +181,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc6",
               "options": {
                 "hasCommittedMutations": false,
@@ -195,6 +202,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc7",
               "options": {
                 "hasCommittedMutations": false,
@@ -215,6 +223,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc8",
               "options": {
                 "hasCommittedMutations": false,
@@ -235,6 +244,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc9",
               "options": {
                 "hasCommittedMutations": false,
@@ -255,6 +265,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc10",
               "options": {
                 "hasCommittedMutations": false,
@@ -275,6 +286,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc11",
               "options": {
                 "hasCommittedMutations": false,
@@ -295,6 +307,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc12",
               "options": {
                 "hasCommittedMutations": false,
@@ -315,6 +328,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc13",
               "options": {
                 "hasCommittedMutations": false,
@@ -335,6 +349,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc14",
               "options": {
                 "hasCommittedMutations": false,
@@ -355,6 +370,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc15",
               "options": {
                 "hasCommittedMutations": false,
@@ -375,6 +391,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc16",
               "options": {
                 "hasCommittedMutations": false,
@@ -395,6 +412,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc17",
               "options": {
                 "hasCommittedMutations": false,
@@ -415,6 +433,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc18",
               "options": {
                 "hasCommittedMutations": false,
@@ -435,6 +454,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc19",
               "options": {
                 "hasCommittedMutations": false,
@@ -455,6 +475,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc20",
               "options": {
                 "hasCommittedMutations": false,
@@ -475,6 +496,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc21",
               "options": {
                 "hasCommittedMutations": false,
@@ -495,6 +517,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc22",
               "options": {
                 "hasCommittedMutations": false,
@@ -515,6 +538,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc23",
               "options": {
                 "hasCommittedMutations": false,
@@ -535,6 +559,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc24",
               "options": {
                 "hasCommittedMutations": false,
@@ -555,6 +580,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc25",
               "options": {
                 "hasCommittedMutations": false,
@@ -575,6 +601,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc26",
               "options": {
                 "hasCommittedMutations": false,
@@ -595,6 +622,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc27",
               "options": {
                 "hasCommittedMutations": false,
@@ -615,6 +643,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc28",
               "options": {
                 "hasCommittedMutations": false,
@@ -635,6 +664,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc29",
               "options": {
                 "hasCommittedMutations": false,
@@ -655,6 +685,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc30",
               "options": {
                 "hasCommittedMutations": false,
@@ -675,6 +706,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc31",
               "options": {
                 "hasCommittedMutations": false,
@@ -695,6 +727,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc32",
               "options": {
                 "hasCommittedMutations": false,
@@ -715,6 +748,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc33",
               "options": {
                 "hasCommittedMutations": false,
@@ -735,6 +769,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc34",
               "options": {
                 "hasCommittedMutations": false,
@@ -755,6 +790,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc35",
               "options": {
                 "hasCommittedMutations": false,
@@ -775,6 +811,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc36",
               "options": {
                 "hasCommittedMutations": false,
@@ -795,6 +832,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc37",
               "options": {
                 "hasCommittedMutations": false,
@@ -815,6 +853,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc38",
               "options": {
                 "hasCommittedMutations": false,
@@ -835,6 +874,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc39",
               "options": {
                 "hasCommittedMutations": false,
@@ -855,6 +895,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc40",
               "options": {
                 "hasCommittedMutations": false,
@@ -875,6 +916,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc41",
               "options": {
                 "hasCommittedMutations": false,
@@ -895,6 +937,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc42",
               "options": {
                 "hasCommittedMutations": false,
@@ -915,6 +958,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc43",
               "options": {
                 "hasCommittedMutations": false,
@@ -935,6 +979,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc44",
               "options": {
                 "hasCommittedMutations": false,
@@ -955,6 +1000,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc45",
               "options": {
                 "hasCommittedMutations": false,
@@ -975,6 +1021,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc46",
               "options": {
                 "hasCommittedMutations": false,
@@ -995,6 +1042,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc47",
               "options": {
                 "hasCommittedMutations": false,
@@ -1015,6 +1063,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc48",
               "options": {
                 "hasCommittedMutations": false,
@@ -1035,6 +1084,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc49",
               "options": {
                 "hasCommittedMutations": false,
@@ -1055,6 +1105,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc50",
               "options": {
                 "hasCommittedMutations": false,
@@ -1075,6 +1126,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc51",
               "options": {
                 "hasCommittedMutations": false,
@@ -1095,6 +1147,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc52",
               "options": {
                 "hasCommittedMutations": false,
@@ -1115,6 +1168,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc53",
               "options": {
                 "hasCommittedMutations": false,
@@ -1135,6 +1189,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc54",
               "options": {
                 "hasCommittedMutations": false,
@@ -1155,6 +1210,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc55",
               "options": {
                 "hasCommittedMutations": false,
@@ -1175,6 +1231,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc56",
               "options": {
                 "hasCommittedMutations": false,
@@ -1195,6 +1252,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc57",
               "options": {
                 "hasCommittedMutations": false,
@@ -1215,6 +1273,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc58",
               "options": {
                 "hasCommittedMutations": false,
@@ -1235,6 +1294,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc59",
               "options": {
                 "hasCommittedMutations": false,
@@ -1255,6 +1315,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc60",
               "options": {
                 "hasCommittedMutations": false,
@@ -1275,6 +1336,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc61",
               "options": {
                 "hasCommittedMutations": false,
@@ -1295,6 +1357,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc62",
               "options": {
                 "hasCommittedMutations": false,
@@ -1315,6 +1378,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc63",
               "options": {
                 "hasCommittedMutations": false,
@@ -1335,6 +1399,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc64",
               "options": {
                 "hasCommittedMutations": false,
@@ -1355,6 +1420,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc65",
               "options": {
                 "hasCommittedMutations": false,
@@ -1375,6 +1441,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc66",
               "options": {
                 "hasCommittedMutations": false,
@@ -1395,6 +1462,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc67",
               "options": {
                 "hasCommittedMutations": false,
@@ -1415,6 +1483,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc68",
               "options": {
                 "hasCommittedMutations": false,
@@ -1435,6 +1504,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc69",
               "options": {
                 "hasCommittedMutations": false,
@@ -1455,6 +1525,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc70",
               "options": {
                 "hasCommittedMutations": false,
@@ -1475,6 +1546,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc71",
               "options": {
                 "hasCommittedMutations": false,
@@ -1495,6 +1567,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc72",
               "options": {
                 "hasCommittedMutations": false,
@@ -1515,6 +1588,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc73",
               "options": {
                 "hasCommittedMutations": false,
@@ -1535,6 +1609,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc74",
               "options": {
                 "hasCommittedMutations": false,
@@ -1555,6 +1630,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc75",
               "options": {
                 "hasCommittedMutations": false,
@@ -1575,6 +1651,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc76",
               "options": {
                 "hasCommittedMutations": false,
@@ -1595,6 +1672,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc77",
               "options": {
                 "hasCommittedMutations": false,
@@ -1615,6 +1693,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc78",
               "options": {
                 "hasCommittedMutations": false,
@@ -1635,6 +1714,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc79",
               "options": {
                 "hasCommittedMutations": false,
@@ -1655,6 +1735,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc80",
               "options": {
                 "hasCommittedMutations": false,
@@ -1675,6 +1756,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc81",
               "options": {
                 "hasCommittedMutations": false,
@@ -1695,6 +1777,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc82",
               "options": {
                 "hasCommittedMutations": false,
@@ -1715,6 +1798,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc83",
               "options": {
                 "hasCommittedMutations": false,
@@ -1735,6 +1819,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc84",
               "options": {
                 "hasCommittedMutations": false,
@@ -1755,6 +1840,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc85",
               "options": {
                 "hasCommittedMutations": false,
@@ -1775,6 +1861,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc86",
               "options": {
                 "hasCommittedMutations": false,
@@ -1795,6 +1882,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc87",
               "options": {
                 "hasCommittedMutations": false,
@@ -1815,6 +1903,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc88",
               "options": {
                 "hasCommittedMutations": false,
@@ -1835,6 +1924,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc89",
               "options": {
                 "hasCommittedMutations": false,
@@ -1855,6 +1945,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc90",
               "options": {
                 "hasCommittedMutations": false,
@@ -1875,6 +1966,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc91",
               "options": {
                 "hasCommittedMutations": false,
@@ -1895,6 +1987,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc92",
               "options": {
                 "hasCommittedMutations": false,
@@ -1915,6 +2008,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc93",
               "options": {
                 "hasCommittedMutations": false,
@@ -1935,6 +2029,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc94",
               "options": {
                 "hasCommittedMutations": false,
@@ -1955,6 +2050,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc95",
               "options": {
                 "hasCommittedMutations": false,
@@ -1975,6 +2071,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc96",
               "options": {
                 "hasCommittedMutations": false,
@@ -1995,6 +2092,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc97",
               "options": {
                 "hasCommittedMutations": false,
@@ -2015,6 +2113,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc98",
               "options": {
                 "hasCommittedMutations": false,
@@ -2035,6 +2134,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc99",
               "options": {
                 "hasCommittedMutations": false,
@@ -2055,6 +2155,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc100",
               "options": {
                 "hasCommittedMutations": false,
@@ -2075,6 +2176,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc101",
               "options": {
                 "hasCommittedMutations": false,
@@ -2095,6 +2197,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc102",
               "options": {
                 "hasCommittedMutations": false,
@@ -2115,6 +2218,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc103",
               "options": {
                 "hasCommittedMutations": false,
@@ -2135,6 +2239,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc104",
               "options": {
                 "hasCommittedMutations": false,
@@ -2155,6 +2260,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc105",
               "options": {
                 "hasCommittedMutations": false,
@@ -2175,6 +2281,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc106",
               "options": {
                 "hasCommittedMutations": false,
@@ -2195,6 +2302,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc107",
               "options": {
                 "hasCommittedMutations": false,
@@ -2215,6 +2323,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc108",
               "options": {
                 "hasCommittedMutations": false,
@@ -2235,6 +2344,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc109",
               "options": {
                 "hasCommittedMutations": false,
@@ -2255,6 +2365,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc110",
               "options": {
                 "hasCommittedMutations": false,
@@ -2275,6 +2386,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc111",
               "options": {
                 "hasCommittedMutations": false,
@@ -2295,6 +2407,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc112",
               "options": {
                 "hasCommittedMutations": false,
@@ -2315,6 +2428,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc113",
               "options": {
                 "hasCommittedMutations": false,
@@ -2335,6 +2449,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc114",
               "options": {
                 "hasCommittedMutations": false,
@@ -2355,6 +2470,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc115",
               "options": {
                 "hasCommittedMutations": false,
@@ -2375,6 +2491,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc116",
               "options": {
                 "hasCommittedMutations": false,
@@ -2395,6 +2512,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc117",
               "options": {
                 "hasCommittedMutations": false,
@@ -2415,6 +2533,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc118",
               "options": {
                 "hasCommittedMutations": false,
@@ -2435,6 +2554,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc119",
               "options": {
                 "hasCommittedMutations": false,
@@ -2455,6 +2575,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc120",
               "options": {
                 "hasCommittedMutations": false,
@@ -2475,6 +2596,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc121",
               "options": {
                 "hasCommittedMutations": false,
@@ -2495,6 +2617,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc122",
               "options": {
                 "hasCommittedMutations": false,
@@ -2515,6 +2638,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc123",
               "options": {
                 "hasCommittedMutations": false,
@@ -2535,6 +2659,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc124",
               "options": {
                 "hasCommittedMutations": false,
@@ -2555,6 +2680,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc125",
               "options": {
                 "hasCommittedMutations": false,
@@ -2575,6 +2701,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc126",
               "options": {
                 "hasCommittedMutations": false,
@@ -2595,6 +2722,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc127",
               "options": {
                 "hasCommittedMutations": false,
@@ -2615,6 +2743,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc128",
               "options": {
                 "hasCommittedMutations": false,
@@ -2635,6 +2764,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc129",
               "options": {
                 "hasCommittedMutations": false,
@@ -2655,6 +2785,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc130",
               "options": {
                 "hasCommittedMutations": false,
@@ -2675,6 +2806,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc131",
               "options": {
                 "hasCommittedMutations": false,
@@ -2695,6 +2827,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc132",
               "options": {
                 "hasCommittedMutations": false,
@@ -2715,6 +2848,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc133",
               "options": {
                 "hasCommittedMutations": false,
@@ -2735,6 +2869,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc134",
               "options": {
                 "hasCommittedMutations": false,
@@ -2755,6 +2890,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc135",
               "options": {
                 "hasCommittedMutations": false,
@@ -2775,6 +2911,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc136",
               "options": {
                 "hasCommittedMutations": false,
@@ -2795,6 +2932,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc137",
               "options": {
                 "hasCommittedMutations": false,
@@ -2815,6 +2953,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc138",
               "options": {
                 "hasCommittedMutations": false,
@@ -2835,6 +2974,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc139",
               "options": {
                 "hasCommittedMutations": false,
@@ -2855,6 +2995,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc140",
               "options": {
                 "hasCommittedMutations": false,
@@ -2875,6 +3016,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc141",
               "options": {
                 "hasCommittedMutations": false,
@@ -2895,6 +3037,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc142",
               "options": {
                 "hasCommittedMutations": false,
@@ -2915,6 +3058,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc143",
               "options": {
                 "hasCommittedMutations": false,
@@ -2935,6 +3079,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc144",
               "options": {
                 "hasCommittedMutations": false,
@@ -2955,6 +3100,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc145",
               "options": {
                 "hasCommittedMutations": false,
@@ -2975,6 +3121,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc146",
               "options": {
                 "hasCommittedMutations": false,
@@ -2995,6 +3142,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc147",
               "options": {
                 "hasCommittedMutations": false,
@@ -3015,6 +3163,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc148",
               "options": {
                 "hasCommittedMutations": false,
@@ -3035,6 +3184,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc149",
               "options": {
                 "hasCommittedMutations": false,
@@ -3055,6 +3205,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc150",
               "options": {
                 "hasCommittedMutations": false,
@@ -3075,6 +3226,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc151",
               "options": {
                 "hasCommittedMutations": false,
@@ -3095,6 +3247,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc152",
               "options": {
                 "hasCommittedMutations": false,
@@ -3115,6 +3268,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc153",
               "options": {
                 "hasCommittedMutations": false,
@@ -3135,6 +3289,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc154",
               "options": {
                 "hasCommittedMutations": false,
@@ -3155,6 +3310,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc155",
               "options": {
                 "hasCommittedMutations": false,
@@ -3175,6 +3331,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc156",
               "options": {
                 "hasCommittedMutations": false,
@@ -3195,6 +3352,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc157",
               "options": {
                 "hasCommittedMutations": false,
@@ -3215,6 +3373,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc158",
               "options": {
                 "hasCommittedMutations": false,
@@ -3235,6 +3394,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc159",
               "options": {
                 "hasCommittedMutations": false,
@@ -3255,6 +3415,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc160",
               "options": {
                 "hasCommittedMutations": false,
@@ -3275,6 +3436,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc161",
               "options": {
                 "hasCommittedMutations": false,
@@ -3295,6 +3457,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc162",
               "options": {
                 "hasCommittedMutations": false,
@@ -3315,6 +3478,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc163",
               "options": {
                 "hasCommittedMutations": false,
@@ -3335,6 +3499,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc164",
               "options": {
                 "hasCommittedMutations": false,
@@ -3355,6 +3520,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc165",
               "options": {
                 "hasCommittedMutations": false,
@@ -3375,6 +3541,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc166",
               "options": {
                 "hasCommittedMutations": false,
@@ -3395,6 +3562,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc167",
               "options": {
                 "hasCommittedMutations": false,
@@ -3415,6 +3583,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc168",
               "options": {
                 "hasCommittedMutations": false,
@@ -3435,6 +3604,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc169",
               "options": {
                 "hasCommittedMutations": false,
@@ -3455,6 +3625,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc170",
               "options": {
                 "hasCommittedMutations": false,
@@ -3475,6 +3646,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc171",
               "options": {
                 "hasCommittedMutations": false,
@@ -3495,6 +3667,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc172",
               "options": {
                 "hasCommittedMutations": false,
@@ -3515,6 +3688,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc173",
               "options": {
                 "hasCommittedMutations": false,
@@ -3535,6 +3709,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc174",
               "options": {
                 "hasCommittedMutations": false,
@@ -3555,6 +3730,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc175",
               "options": {
                 "hasCommittedMutations": false,
@@ -3575,6 +3751,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc176",
               "options": {
                 "hasCommittedMutations": false,
@@ -3595,6 +3772,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc177",
               "options": {
                 "hasCommittedMutations": false,
@@ -3615,6 +3793,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc178",
               "options": {
                 "hasCommittedMutations": false,
@@ -3635,6 +3814,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc179",
               "options": {
                 "hasCommittedMutations": false,
@@ -3655,6 +3835,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc180",
               "options": {
                 "hasCommittedMutations": false,
@@ -3675,6 +3856,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc181",
               "options": {
                 "hasCommittedMutations": false,
@@ -3695,6 +3877,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc182",
               "options": {
                 "hasCommittedMutations": false,
@@ -3715,6 +3898,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc183",
               "options": {
                 "hasCommittedMutations": false,
@@ -3735,6 +3919,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc184",
               "options": {
                 "hasCommittedMutations": false,
@@ -3755,6 +3940,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc185",
               "options": {
                 "hasCommittedMutations": false,
@@ -3775,6 +3961,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc186",
               "options": {
                 "hasCommittedMutations": false,
@@ -3795,6 +3982,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc187",
               "options": {
                 "hasCommittedMutations": false,
@@ -3815,6 +4003,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc188",
               "options": {
                 "hasCommittedMutations": false,
@@ -3835,6 +4024,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc189",
               "options": {
                 "hasCommittedMutations": false,
@@ -3855,6 +4045,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc190",
               "options": {
                 "hasCommittedMutations": false,
@@ -3875,6 +4066,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc191",
               "options": {
                 "hasCommittedMutations": false,
@@ -3895,6 +4087,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc192",
               "options": {
                 "hasCommittedMutations": false,
@@ -3915,6 +4108,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc193",
               "options": {
                 "hasCommittedMutations": false,
@@ -3935,6 +4129,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc194",
               "options": {
                 "hasCommittedMutations": false,
@@ -3955,6 +4150,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc195",
               "options": {
                 "hasCommittedMutations": false,
@@ -3975,6 +4171,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc196",
               "options": {
                 "hasCommittedMutations": false,
@@ -3995,6 +4192,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc197",
               "options": {
                 "hasCommittedMutations": false,
@@ -4015,6 +4213,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc198",
               "options": {
                 "hasCommittedMutations": false,
@@ -4035,6 +4234,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc199",
               "options": {
                 "hasCommittedMutations": false,
@@ -4055,6 +4255,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc200",
               "options": {
                 "hasCommittedMutations": false,
@@ -4075,6 +4276,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc201",
               "options": {
                 "hasCommittedMutations": false,
@@ -4095,6 +4297,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc202",
               "options": {
                 "hasCommittedMutations": false,
@@ -4115,6 +4318,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc203",
               "options": {
                 "hasCommittedMutations": false,
@@ -4135,6 +4339,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc204",
               "options": {
                 "hasCommittedMutations": false,
@@ -4155,6 +4360,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc205",
               "options": {
                 "hasCommittedMutations": false,
@@ -4175,6 +4381,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc206",
               "options": {
                 "hasCommittedMutations": false,
@@ -4195,6 +4402,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc207",
               "options": {
                 "hasCommittedMutations": false,
@@ -4215,6 +4423,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc208",
               "options": {
                 "hasCommittedMutations": false,
@@ -4235,6 +4444,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc209",
               "options": {
                 "hasCommittedMutations": false,
@@ -4255,6 +4465,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc210",
               "options": {
                 "hasCommittedMutations": false,
@@ -4275,6 +4486,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc211",
               "options": {
                 "hasCommittedMutations": false,
@@ -4295,6 +4507,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc212",
               "options": {
                 "hasCommittedMutations": false,
@@ -4315,6 +4528,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc213",
               "options": {
                 "hasCommittedMutations": false,
@@ -4335,6 +4549,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc214",
               "options": {
                 "hasCommittedMutations": false,
@@ -4355,6 +4570,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc215",
               "options": {
                 "hasCommittedMutations": false,
@@ -4375,6 +4591,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc216",
               "options": {
                 "hasCommittedMutations": false,
@@ -4395,6 +4612,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc217",
               "options": {
                 "hasCommittedMutations": false,
@@ -4415,6 +4633,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc218",
               "options": {
                 "hasCommittedMutations": false,
@@ -4435,6 +4654,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc219",
               "options": {
                 "hasCommittedMutations": false,
@@ -4455,6 +4675,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc220",
               "options": {
                 "hasCommittedMutations": false,
@@ -4475,6 +4696,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc221",
               "options": {
                 "hasCommittedMutations": false,
@@ -4495,6 +4717,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc222",
               "options": {
                 "hasCommittedMutations": false,
@@ -4515,6 +4738,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc223",
               "options": {
                 "hasCommittedMutations": false,
@@ -4535,6 +4759,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc224",
               "options": {
                 "hasCommittedMutations": false,
@@ -4555,6 +4780,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc225",
               "options": {
                 "hasCommittedMutations": false,
@@ -4575,6 +4801,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc226",
               "options": {
                 "hasCommittedMutations": false,
@@ -4595,6 +4822,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc227",
               "options": {
                 "hasCommittedMutations": false,
@@ -4615,6 +4843,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc228",
               "options": {
                 "hasCommittedMutations": false,
@@ -4635,6 +4864,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc229",
               "options": {
                 "hasCommittedMutations": false,
@@ -4655,6 +4885,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc230",
               "options": {
                 "hasCommittedMutations": false,
@@ -4675,6 +4906,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc231",
               "options": {
                 "hasCommittedMutations": false,
@@ -4695,6 +4927,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc232",
               "options": {
                 "hasCommittedMutations": false,
@@ -4715,6 +4948,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc233",
               "options": {
                 "hasCommittedMutations": false,
@@ -4735,6 +4969,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc234",
               "options": {
                 "hasCommittedMutations": false,
@@ -4755,6 +4990,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc235",
               "options": {
                 "hasCommittedMutations": false,
@@ -4775,6 +5011,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc236",
               "options": {
                 "hasCommittedMutations": false,
@@ -4795,6 +5032,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc237",
               "options": {
                 "hasCommittedMutations": false,
@@ -4815,6 +5053,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc238",
               "options": {
                 "hasCommittedMutations": false,
@@ -4835,6 +5074,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc239",
               "options": {
                 "hasCommittedMutations": false,
@@ -4855,6 +5095,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc240",
               "options": {
                 "hasCommittedMutations": false,
@@ -4875,6 +5116,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc241",
               "options": {
                 "hasCommittedMutations": false,
@@ -4895,6 +5137,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc242",
               "options": {
                 "hasCommittedMutations": false,
@@ -4915,6 +5158,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc243",
               "options": {
                 "hasCommittedMutations": false,
@@ -4935,6 +5179,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc244",
               "options": {
                 "hasCommittedMutations": false,
@@ -4955,6 +5200,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc245",
               "options": {
                 "hasCommittedMutations": false,
@@ -4975,6 +5221,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc246",
               "options": {
                 "hasCommittedMutations": false,
@@ -4995,6 +5242,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc247",
               "options": {
                 "hasCommittedMutations": false,
@@ -5015,6 +5263,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc248",
               "options": {
                 "hasCommittedMutations": false,
@@ -5035,6 +5284,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc249",
               "options": {
                 "hasCommittedMutations": false,
@@ -5055,6 +5305,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc250",
               "options": {
                 "hasCommittedMutations": false,
@@ -5075,6 +5326,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc251",
               "options": {
                 "hasCommittedMutations": false,
@@ -5095,6 +5347,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc252",
               "options": {
                 "hasCommittedMutations": false,
@@ -5115,6 +5368,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc253",
               "options": {
                 "hasCommittedMutations": false,
@@ -5135,6 +5389,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc254",
               "options": {
                 "hasCommittedMutations": false,
@@ -5155,6 +5410,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc255",
               "options": {
                 "hasCommittedMutations": false,
@@ -5175,6 +5431,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc256",
               "options": {
                 "hasCommittedMutations": false,
@@ -5195,6 +5452,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc257",
               "options": {
                 "hasCommittedMutations": false,
@@ -5215,6 +5473,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc258",
               "options": {
                 "hasCommittedMutations": false,
@@ -5235,6 +5494,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc259",
               "options": {
                 "hasCommittedMutations": false,
@@ -5255,6 +5515,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc260",
               "options": {
                 "hasCommittedMutations": false,
@@ -5275,6 +5536,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc261",
               "options": {
                 "hasCommittedMutations": false,
@@ -5295,6 +5557,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc262",
               "options": {
                 "hasCommittedMutations": false,
@@ -5315,6 +5578,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc263",
               "options": {
                 "hasCommittedMutations": false,
@@ -5335,6 +5599,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc264",
               "options": {
                 "hasCommittedMutations": false,
@@ -5355,6 +5620,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc265",
               "options": {
                 "hasCommittedMutations": false,
@@ -5375,6 +5641,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc266",
               "options": {
                 "hasCommittedMutations": false,
@@ -5395,6 +5662,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc267",
               "options": {
                 "hasCommittedMutations": false,
@@ -5415,6 +5683,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc268",
               "options": {
                 "hasCommittedMutations": false,
@@ -5435,6 +5704,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc269",
               "options": {
                 "hasCommittedMutations": false,
@@ -5455,6 +5725,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc270",
               "options": {
                 "hasCommittedMutations": false,
@@ -5475,6 +5746,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc271",
               "options": {
                 "hasCommittedMutations": false,
@@ -5495,6 +5767,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc272",
               "options": {
                 "hasCommittedMutations": false,
@@ -5515,6 +5788,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc273",
               "options": {
                 "hasCommittedMutations": false,
@@ -5535,6 +5809,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc274",
               "options": {
                 "hasCommittedMutations": false,
@@ -5555,6 +5830,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc275",
               "options": {
                 "hasCommittedMutations": false,
@@ -5575,6 +5851,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc276",
               "options": {
                 "hasCommittedMutations": false,
@@ -5595,6 +5872,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc277",
               "options": {
                 "hasCommittedMutations": false,
@@ -5615,6 +5893,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc278",
               "options": {
                 "hasCommittedMutations": false,
@@ -5635,6 +5914,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc279",
               "options": {
                 "hasCommittedMutations": false,
@@ -5655,6 +5935,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc280",
               "options": {
                 "hasCommittedMutations": false,
@@ -5675,6 +5956,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc281",
               "options": {
                 "hasCommittedMutations": false,
@@ -5695,6 +5977,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc282",
               "options": {
                 "hasCommittedMutations": false,
@@ -5715,6 +5998,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc283",
               "options": {
                 "hasCommittedMutations": false,
@@ -5735,6 +6019,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc284",
               "options": {
                 "hasCommittedMutations": false,
@@ -5755,6 +6040,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc285",
               "options": {
                 "hasCommittedMutations": false,
@@ -5775,6 +6061,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc286",
               "options": {
                 "hasCommittedMutations": false,
@@ -5795,6 +6082,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc287",
               "options": {
                 "hasCommittedMutations": false,
@@ -5815,6 +6103,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc288",
               "options": {
                 "hasCommittedMutations": false,
@@ -5835,6 +6124,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc289",
               "options": {
                 "hasCommittedMutations": false,
@@ -5855,6 +6145,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc290",
               "options": {
                 "hasCommittedMutations": false,
@@ -5875,6 +6166,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc291",
               "options": {
                 "hasCommittedMutations": false,
@@ -5895,6 +6187,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc292",
               "options": {
                 "hasCommittedMutations": false,
@@ -5915,6 +6208,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc293",
               "options": {
                 "hasCommittedMutations": false,
@@ -5935,6 +6229,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc294",
               "options": {
                 "hasCommittedMutations": false,
@@ -5955,6 +6250,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc295",
               "options": {
                 "hasCommittedMutations": false,
@@ -5975,6 +6271,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc296",
               "options": {
                 "hasCommittedMutations": false,
@@ -5995,6 +6292,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc297",
               "options": {
                 "hasCommittedMutations": false,
@@ -6015,6 +6313,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc298",
               "options": {
                 "hasCommittedMutations": false,
@@ -6035,6 +6334,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc299",
               "options": {
                 "hasCommittedMutations": false,
@@ -6055,6 +6355,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc300",
               "options": {
                 "hasCommittedMutations": false,
@@ -6075,6 +6376,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc301",
               "options": {
                 "hasCommittedMutations": false,
@@ -6095,6 +6397,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc302",
               "options": {
                 "hasCommittedMutations": false,
@@ -6115,6 +6418,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc303",
               "options": {
                 "hasCommittedMutations": false,
@@ -6135,6 +6439,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc304",
               "options": {
                 "hasCommittedMutations": false,
@@ -6155,6 +6460,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc305",
               "options": {
                 "hasCommittedMutations": false,
@@ -6175,6 +6481,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc306",
               "options": {
                 "hasCommittedMutations": false,
@@ -6195,6 +6502,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc307",
               "options": {
                 "hasCommittedMutations": false,
@@ -6215,6 +6523,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc308",
               "options": {
                 "hasCommittedMutations": false,
@@ -6235,6 +6544,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc309",
               "options": {
                 "hasCommittedMutations": false,
@@ -6255,6 +6565,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc310",
               "options": {
                 "hasCommittedMutations": false,
@@ -6275,6 +6586,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc311",
               "options": {
                 "hasCommittedMutations": false,
@@ -6295,6 +6607,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc312",
               "options": {
                 "hasCommittedMutations": false,
@@ -6315,6 +6628,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc313",
               "options": {
                 "hasCommittedMutations": false,
@@ -6335,6 +6649,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc314",
               "options": {
                 "hasCommittedMutations": false,
@@ -6355,6 +6670,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc315",
               "options": {
                 "hasCommittedMutations": false,
@@ -6375,6 +6691,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc316",
               "options": {
                 "hasCommittedMutations": false,
@@ -6395,6 +6712,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc317",
               "options": {
                 "hasCommittedMutations": false,
@@ -6415,6 +6733,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc318",
               "options": {
                 "hasCommittedMutations": false,
@@ -6435,6 +6754,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc319",
               "options": {
                 "hasCommittedMutations": false,
@@ -6455,6 +6775,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc320",
               "options": {
                 "hasCommittedMutations": false,
@@ -6475,6 +6796,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc321",
               "options": {
                 "hasCommittedMutations": false,
@@ -6495,6 +6817,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc322",
               "options": {
                 "hasCommittedMutations": false,
@@ -6515,6 +6838,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc323",
               "options": {
                 "hasCommittedMutations": false,
@@ -6535,6 +6859,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc324",
               "options": {
                 "hasCommittedMutations": false,
@@ -6555,6 +6880,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc325",
               "options": {
                 "hasCommittedMutations": false,
@@ -6575,6 +6901,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc326",
               "options": {
                 "hasCommittedMutations": false,
@@ -6595,6 +6922,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc327",
               "options": {
                 "hasCommittedMutations": false,
@@ -6615,6 +6943,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc328",
               "options": {
                 "hasCommittedMutations": false,
@@ -6635,6 +6964,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc329",
               "options": {
                 "hasCommittedMutations": false,
@@ -6655,6 +6985,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc330",
               "options": {
                 "hasCommittedMutations": false,
@@ -6675,6 +7006,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc331",
               "options": {
                 "hasCommittedMutations": false,
@@ -6695,6 +7027,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc332",
               "options": {
                 "hasCommittedMutations": false,
@@ -6715,6 +7048,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc333",
               "options": {
                 "hasCommittedMutations": false,
@@ -6735,6 +7069,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc334",
               "options": {
                 "hasCommittedMutations": false,
@@ -6755,6 +7090,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc335",
               "options": {
                 "hasCommittedMutations": false,
@@ -6775,6 +7111,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc336",
               "options": {
                 "hasCommittedMutations": false,
@@ -6795,6 +7132,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc337",
               "options": {
                 "hasCommittedMutations": false,
@@ -6815,6 +7153,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc338",
               "options": {
                 "hasCommittedMutations": false,
@@ -6835,6 +7174,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc339",
               "options": {
                 "hasCommittedMutations": false,
@@ -6855,6 +7195,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc340",
               "options": {
                 "hasCommittedMutations": false,
@@ -6875,6 +7216,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc341",
               "options": {
                 "hasCommittedMutations": false,
@@ -6895,6 +7237,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc342",
               "options": {
                 "hasCommittedMutations": false,
@@ -6915,6 +7258,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc343",
               "options": {
                 "hasCommittedMutations": false,
@@ -6935,6 +7279,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc344",
               "options": {
                 "hasCommittedMutations": false,
@@ -6955,6 +7300,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc345",
               "options": {
                 "hasCommittedMutations": false,
@@ -6975,6 +7321,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc346",
               "options": {
                 "hasCommittedMutations": false,
@@ -6995,6 +7342,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc347",
               "options": {
                 "hasCommittedMutations": false,
@@ -7015,6 +7363,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc348",
               "options": {
                 "hasCommittedMutations": false,
@@ -7035,6 +7384,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc349",
               "options": {
                 "hasCommittedMutations": false,
@@ -7055,6 +7405,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc350",
               "options": {
                 "hasCommittedMutations": false,
@@ -7075,6 +7426,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc351",
               "options": {
                 "hasCommittedMutations": false,
@@ -7095,6 +7447,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc352",
               "options": {
                 "hasCommittedMutations": false,
@@ -7115,6 +7468,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc353",
               "options": {
                 "hasCommittedMutations": false,
@@ -7135,6 +7489,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc354",
               "options": {
                 "hasCommittedMutations": false,
@@ -7155,6 +7510,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc355",
               "options": {
                 "hasCommittedMutations": false,
@@ -7175,6 +7531,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc356",
               "options": {
                 "hasCommittedMutations": false,
@@ -7195,6 +7552,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc357",
               "options": {
                 "hasCommittedMutations": false,
@@ -7215,6 +7573,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc358",
               "options": {
                 "hasCommittedMutations": false,
@@ -7235,6 +7594,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc359",
               "options": {
                 "hasCommittedMutations": false,
@@ -7255,6 +7615,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc360",
               "options": {
                 "hasCommittedMutations": false,
@@ -7275,6 +7636,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc361",
               "options": {
                 "hasCommittedMutations": false,
@@ -7295,6 +7657,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc362",
               "options": {
                 "hasCommittedMutations": false,
@@ -7315,6 +7678,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc363",
               "options": {
                 "hasCommittedMutations": false,
@@ -7335,6 +7699,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc364",
               "options": {
                 "hasCommittedMutations": false,
@@ -7355,6 +7720,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc365",
               "options": {
                 "hasCommittedMutations": false,
@@ -7375,6 +7741,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc366",
               "options": {
                 "hasCommittedMutations": false,
@@ -7395,6 +7762,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc367",
               "options": {
                 "hasCommittedMutations": false,
@@ -7415,6 +7783,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc368",
               "options": {
                 "hasCommittedMutations": false,
@@ -7435,6 +7804,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc369",
               "options": {
                 "hasCommittedMutations": false,
@@ -7455,6 +7825,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc370",
               "options": {
                 "hasCommittedMutations": false,
@@ -7475,6 +7846,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc371",
               "options": {
                 "hasCommittedMutations": false,
@@ -7495,6 +7867,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc372",
               "options": {
                 "hasCommittedMutations": false,
@@ -7515,6 +7888,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc373",
               "options": {
                 "hasCommittedMutations": false,
@@ -7535,6 +7909,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc374",
               "options": {
                 "hasCommittedMutations": false,
@@ -7555,6 +7930,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc375",
               "options": {
                 "hasCommittedMutations": false,
@@ -7575,6 +7951,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc376",
               "options": {
                 "hasCommittedMutations": false,
@@ -7595,6 +7972,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc377",
               "options": {
                 "hasCommittedMutations": false,
@@ -7615,6 +7993,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc378",
               "options": {
                 "hasCommittedMutations": false,
@@ -7635,6 +8014,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc379",
               "options": {
                 "hasCommittedMutations": false,
@@ -7655,6 +8035,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc380",
               "options": {
                 "hasCommittedMutations": false,
@@ -7675,6 +8056,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc381",
               "options": {
                 "hasCommittedMutations": false,
@@ -7695,6 +8077,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc382",
               "options": {
                 "hasCommittedMutations": false,
@@ -7715,6 +8098,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc383",
               "options": {
                 "hasCommittedMutations": false,
@@ -7735,6 +8119,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc384",
               "options": {
                 "hasCommittedMutations": false,
@@ -7755,6 +8140,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc385",
               "options": {
                 "hasCommittedMutations": false,
@@ -7775,6 +8161,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc386",
               "options": {
                 "hasCommittedMutations": false,
@@ -7795,6 +8182,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc387",
               "options": {
                 "hasCommittedMutations": false,
@@ -7815,6 +8203,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc388",
               "options": {
                 "hasCommittedMutations": false,
@@ -7835,6 +8224,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc389",
               "options": {
                 "hasCommittedMutations": false,
@@ -7855,6 +8245,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc390",
               "options": {
                 "hasCommittedMutations": false,
@@ -7875,6 +8266,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc391",
               "options": {
                 "hasCommittedMutations": false,
@@ -7895,6 +8287,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc392",
               "options": {
                 "hasCommittedMutations": false,
@@ -7915,6 +8308,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc393",
               "options": {
                 "hasCommittedMutations": false,
@@ -7935,6 +8329,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc394",
               "options": {
                 "hasCommittedMutations": false,
@@ -7955,6 +8350,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc395",
               "options": {
                 "hasCommittedMutations": false,
@@ -7975,6 +8371,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc396",
               "options": {
                 "hasCommittedMutations": false,
@@ -7995,6 +8392,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc397",
               "options": {
                 "hasCommittedMutations": false,
@@ -8015,6 +8413,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc398",
               "options": {
                 "hasCommittedMutations": false,
@@ -8035,6 +8434,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc399",
               "options": {
                 "hasCommittedMutations": false,
@@ -8055,6 +8455,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc400",
               "options": {
                 "hasCommittedMutations": false,
@@ -8075,6 +8476,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc401",
               "options": {
                 "hasCommittedMutations": false,
@@ -8095,6 +8497,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc402",
               "options": {
                 "hasCommittedMutations": false,
@@ -8115,6 +8518,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc403",
               "options": {
                 "hasCommittedMutations": false,
@@ -8135,6 +8539,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc404",
               "options": {
                 "hasCommittedMutations": false,
@@ -8155,6 +8560,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc405",
               "options": {
                 "hasCommittedMutations": false,
@@ -8175,6 +8581,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc406",
               "options": {
                 "hasCommittedMutations": false,
@@ -8195,6 +8602,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc407",
               "options": {
                 "hasCommittedMutations": false,
@@ -8215,6 +8623,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc408",
               "options": {
                 "hasCommittedMutations": false,
@@ -8235,6 +8644,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc409",
               "options": {
                 "hasCommittedMutations": false,
@@ -8255,6 +8665,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc410",
               "options": {
                 "hasCommittedMutations": false,
@@ -8275,6 +8686,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc411",
               "options": {
                 "hasCommittedMutations": false,
@@ -8295,6 +8707,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc412",
               "options": {
                 "hasCommittedMutations": false,
@@ -8315,6 +8728,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc413",
               "options": {
                 "hasCommittedMutations": false,
@@ -8335,6 +8749,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc414",
               "options": {
                 "hasCommittedMutations": false,
@@ -8355,6 +8770,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc415",
               "options": {
                 "hasCommittedMutations": false,
@@ -8375,6 +8791,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc416",
               "options": {
                 "hasCommittedMutations": false,
@@ -8395,6 +8812,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc417",
               "options": {
                 "hasCommittedMutations": false,
@@ -8415,6 +8833,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc418",
               "options": {
                 "hasCommittedMutations": false,
@@ -8435,6 +8854,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc419",
               "options": {
                 "hasCommittedMutations": false,
@@ -8455,6 +8875,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc420",
               "options": {
                 "hasCommittedMutations": false,
@@ -8475,6 +8896,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc421",
               "options": {
                 "hasCommittedMutations": false,
@@ -8495,6 +8917,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc422",
               "options": {
                 "hasCommittedMutations": false,
@@ -8515,6 +8938,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc423",
               "options": {
                 "hasCommittedMutations": false,
@@ -8535,6 +8959,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc424",
               "options": {
                 "hasCommittedMutations": false,
@@ -8555,6 +8980,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc425",
               "options": {
                 "hasCommittedMutations": false,
@@ -8575,6 +9001,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc426",
               "options": {
                 "hasCommittedMutations": false,
@@ -8595,6 +9022,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc427",
               "options": {
                 "hasCommittedMutations": false,
@@ -8615,6 +9043,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc428",
               "options": {
                 "hasCommittedMutations": false,
@@ -8635,6 +9064,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc429",
               "options": {
                 "hasCommittedMutations": false,
@@ -8655,6 +9085,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc430",
               "options": {
                 "hasCommittedMutations": false,
@@ -8675,6 +9106,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc431",
               "options": {
                 "hasCommittedMutations": false,
@@ -8695,6 +9127,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc432",
               "options": {
                 "hasCommittedMutations": false,
@@ -8715,6 +9148,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc433",
               "options": {
                 "hasCommittedMutations": false,
@@ -8735,6 +9169,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc434",
               "options": {
                 "hasCommittedMutations": false,
@@ -8755,6 +9190,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc435",
               "options": {
                 "hasCommittedMutations": false,
@@ -8775,6 +9211,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc436",
               "options": {
                 "hasCommittedMutations": false,
@@ -8795,6 +9232,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc437",
               "options": {
                 "hasCommittedMutations": false,
@@ -8815,6 +9253,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc438",
               "options": {
                 "hasCommittedMutations": false,
@@ -8835,6 +9274,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc439",
               "options": {
                 "hasCommittedMutations": false,
@@ -8855,6 +9295,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc440",
               "options": {
                 "hasCommittedMutations": false,
@@ -8875,6 +9316,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc441",
               "options": {
                 "hasCommittedMutations": false,
@@ -8895,6 +9337,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc442",
               "options": {
                 "hasCommittedMutations": false,
@@ -8915,6 +9358,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc443",
               "options": {
                 "hasCommittedMutations": false,
@@ -8935,6 +9379,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc444",
               "options": {
                 "hasCommittedMutations": false,
@@ -8955,6 +9400,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc445",
               "options": {
                 "hasCommittedMutations": false,
@@ -8975,6 +9421,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc446",
               "options": {
                 "hasCommittedMutations": false,
@@ -8995,6 +9442,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc447",
               "options": {
                 "hasCommittedMutations": false,
@@ -9015,6 +9463,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc448",
               "options": {
                 "hasCommittedMutations": false,
@@ -9035,6 +9484,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc449",
               "options": {
                 "hasCommittedMutations": false,
@@ -9055,6 +9505,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc450",
               "options": {
                 "hasCommittedMutations": false,
@@ -9075,6 +9526,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc451",
               "options": {
                 "hasCommittedMutations": false,
@@ -9095,6 +9547,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc452",
               "options": {
                 "hasCommittedMutations": false,
@@ -9115,6 +9568,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc453",
               "options": {
                 "hasCommittedMutations": false,
@@ -9135,6 +9589,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc454",
               "options": {
                 "hasCommittedMutations": false,
@@ -9155,6 +9610,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc455",
               "options": {
                 "hasCommittedMutations": false,
@@ -9175,6 +9631,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc456",
               "options": {
                 "hasCommittedMutations": false,
@@ -9195,6 +9652,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc457",
               "options": {
                 "hasCommittedMutations": false,
@@ -9215,6 +9673,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc458",
               "options": {
                 "hasCommittedMutations": false,
@@ -9235,6 +9694,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc459",
               "options": {
                 "hasCommittedMutations": false,
@@ -9255,6 +9715,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc460",
               "options": {
                 "hasCommittedMutations": false,
@@ -9275,6 +9736,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc461",
               "options": {
                 "hasCommittedMutations": false,
@@ -9295,6 +9757,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc462",
               "options": {
                 "hasCommittedMutations": false,
@@ -9315,6 +9778,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc463",
               "options": {
                 "hasCommittedMutations": false,
@@ -9335,6 +9799,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc464",
               "options": {
                 "hasCommittedMutations": false,
@@ -9355,6 +9820,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc465",
               "options": {
                 "hasCommittedMutations": false,
@@ -9375,6 +9841,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc466",
               "options": {
                 "hasCommittedMutations": false,
@@ -9395,6 +9862,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc467",
               "options": {
                 "hasCommittedMutations": false,
@@ -9415,6 +9883,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc468",
               "options": {
                 "hasCommittedMutations": false,
@@ -9435,6 +9904,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc469",
               "options": {
                 "hasCommittedMutations": false,
@@ -9455,6 +9925,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc470",
               "options": {
                 "hasCommittedMutations": false,
@@ -9475,6 +9946,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc471",
               "options": {
                 "hasCommittedMutations": false,
@@ -9495,6 +9967,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc472",
               "options": {
                 "hasCommittedMutations": false,
@@ -9515,6 +9988,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc473",
               "options": {
                 "hasCommittedMutations": false,
@@ -9535,6 +10009,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc474",
               "options": {
                 "hasCommittedMutations": false,
@@ -9555,6 +10030,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc475",
               "options": {
                 "hasCommittedMutations": false,
@@ -9575,6 +10051,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc476",
               "options": {
                 "hasCommittedMutations": false,
@@ -9595,6 +10072,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc477",
               "options": {
                 "hasCommittedMutations": false,
@@ -9615,6 +10093,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc478",
               "options": {
                 "hasCommittedMutations": false,
@@ -9635,6 +10114,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc479",
               "options": {
                 "hasCommittedMutations": false,
@@ -9655,6 +10135,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc480",
               "options": {
                 "hasCommittedMutations": false,
@@ -9675,6 +10156,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc481",
               "options": {
                 "hasCommittedMutations": false,
@@ -9695,6 +10177,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc482",
               "options": {
                 "hasCommittedMutations": false,
@@ -9715,6 +10198,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc483",
               "options": {
                 "hasCommittedMutations": false,
@@ -9735,6 +10219,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc484",
               "options": {
                 "hasCommittedMutations": false,
@@ -9755,6 +10240,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc485",
               "options": {
                 "hasCommittedMutations": false,
@@ -9775,6 +10261,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc486",
               "options": {
                 "hasCommittedMutations": false,
@@ -9795,6 +10282,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc487",
               "options": {
                 "hasCommittedMutations": false,
@@ -9815,6 +10303,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc488",
               "options": {
                 "hasCommittedMutations": false,
@@ -9835,6 +10324,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc489",
               "options": {
                 "hasCommittedMutations": false,
@@ -9855,6 +10345,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc490",
               "options": {
                 "hasCommittedMutations": false,
@@ -9875,6 +10366,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc491",
               "options": {
                 "hasCommittedMutations": false,
@@ -9895,6 +10387,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc492",
               "options": {
                 "hasCommittedMutations": false,
@@ -9915,6 +10408,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc493",
               "options": {
                 "hasCommittedMutations": false,
@@ -9935,6 +10429,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc494",
               "options": {
                 "hasCommittedMutations": false,
@@ -9955,6 +10450,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc495",
               "options": {
                 "hasCommittedMutations": false,
@@ -9975,6 +10471,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc496",
               "options": {
                 "hasCommittedMutations": false,
@@ -9995,6 +10492,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc497",
               "options": {
                 "hasCommittedMutations": false,
@@ -10015,6 +10513,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc498",
               "options": {
                 "hasCommittedMutations": false,
@@ -10035,6 +10534,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc499",
               "options": {
                 "hasCommittedMutations": false,
@@ -10069,6 +10569,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10080,6 +10581,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10091,6 +10593,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10102,6 +10605,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/doc3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10113,6 +10617,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/doc4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10124,6 +10629,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/doc5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10135,6 +10641,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/doc6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10146,6 +10653,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/doc7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10157,6 +10665,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/doc8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10168,6 +10677,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/doc9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10179,6 +10689,7 @@
                 "version": 11
               },
               {
+                "createTime": 0,
                 "key": "collection/doc10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10190,6 +10701,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/doc11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10201,6 +10713,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/doc12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10212,6 +10725,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/doc13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10223,6 +10737,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/doc14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10234,6 +10749,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/doc15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10245,6 +10761,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/doc16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10256,6 +10773,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/doc17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10267,6 +10785,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/doc18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10278,6 +10797,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/doc19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10289,6 +10809,7 @@
                 "version": 21
               },
               {
+                "createTime": 0,
                 "key": "collection/doc20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10300,6 +10821,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/doc21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10311,6 +10833,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/doc22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10322,6 +10845,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/doc23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10333,6 +10857,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/doc24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10344,6 +10869,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/doc25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10355,6 +10881,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/doc26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10366,6 +10893,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/doc27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10377,6 +10905,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/doc28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10388,6 +10917,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/doc29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10399,6 +10929,7 @@
                 "version": 31
               },
               {
+                "createTime": 0,
                 "key": "collection/doc30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10410,6 +10941,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/doc31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10421,6 +10953,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/doc32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10432,6 +10965,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/doc33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10443,6 +10977,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/doc34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10454,6 +10989,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/doc35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10465,6 +11001,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/doc36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10476,6 +11013,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/doc37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10487,6 +11025,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/doc38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10498,6 +11037,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/doc39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10509,6 +11049,7 @@
                 "version": 41
               },
               {
+                "createTime": 0,
                 "key": "collection/doc40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10520,6 +11061,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/doc41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10531,6 +11073,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/doc42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10542,6 +11085,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/doc43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10553,6 +11097,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/doc44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10564,6 +11109,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/doc45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10575,6 +11121,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/doc46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10586,6 +11133,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/doc47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10597,6 +11145,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/doc48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10608,6 +11157,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/doc49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10619,6 +11169,7 @@
                 "version": 51
               },
               {
+                "createTime": 0,
                 "key": "collection/doc50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10630,6 +11181,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/doc51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10641,6 +11193,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/doc52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10652,6 +11205,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/doc53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10663,6 +11217,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/doc54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10674,6 +11229,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/doc55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10685,6 +11241,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/doc56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10696,6 +11253,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/doc57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10707,6 +11265,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/doc58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10718,6 +11277,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/doc59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10729,6 +11289,7 @@
                 "version": 61
               },
               {
+                "createTime": 0,
                 "key": "collection/doc60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10740,6 +11301,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/doc61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10751,6 +11313,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/doc62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10762,6 +11325,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/doc63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10773,6 +11337,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/doc64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10784,6 +11349,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/doc65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10795,6 +11361,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/doc66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10806,6 +11373,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/doc67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10817,6 +11385,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/doc68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10828,6 +11397,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/doc69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10839,6 +11409,7 @@
                 "version": 71
               },
               {
+                "createTime": 0,
                 "key": "collection/doc70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10850,6 +11421,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/doc71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10861,6 +11433,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/doc72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10872,6 +11445,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/doc73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10883,6 +11457,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/doc74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10894,6 +11469,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/doc75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10905,6 +11481,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/doc76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10916,6 +11493,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/doc77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10927,6 +11505,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/doc78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10938,6 +11517,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/doc79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10949,6 +11529,7 @@
                 "version": 81
               },
               {
+                "createTime": 0,
                 "key": "collection/doc80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10960,6 +11541,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/doc81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10971,6 +11553,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/doc82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10982,6 +11565,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/doc83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10993,6 +11577,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/doc84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11004,6 +11589,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/doc85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11015,6 +11601,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/doc86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11026,6 +11613,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/doc87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11037,6 +11625,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/doc88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11048,6 +11637,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/doc89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11059,6 +11649,7 @@
                 "version": 91
               },
               {
+                "createTime": 0,
                 "key": "collection/doc90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11070,6 +11661,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/doc91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11081,6 +11673,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/doc92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11092,6 +11685,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/doc93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11103,6 +11697,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/doc94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11114,6 +11709,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/doc95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11125,6 +11721,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/doc96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11136,6 +11733,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/doc97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11147,6 +11745,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/doc98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11158,6 +11757,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/doc99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11169,6 +11769,7 @@
                 "version": 101
               },
               {
+                "createTime": 0,
                 "key": "collection/doc100",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11180,6 +11781,7 @@
                 "version": 102
               },
               {
+                "createTime": 0,
                 "key": "collection/doc101",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11191,6 +11793,7 @@
                 "version": 103
               },
               {
+                "createTime": 0,
                 "key": "collection/doc102",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11202,6 +11805,7 @@
                 "version": 104
               },
               {
+                "createTime": 0,
                 "key": "collection/doc103",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11213,6 +11817,7 @@
                 "version": 105
               },
               {
+                "createTime": 0,
                 "key": "collection/doc104",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11224,6 +11829,7 @@
                 "version": 106
               },
               {
+                "createTime": 0,
                 "key": "collection/doc105",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11235,6 +11841,7 @@
                 "version": 107
               },
               {
+                "createTime": 0,
                 "key": "collection/doc106",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11246,6 +11853,7 @@
                 "version": 108
               },
               {
+                "createTime": 0,
                 "key": "collection/doc107",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11257,6 +11865,7 @@
                 "version": 109
               },
               {
+                "createTime": 0,
                 "key": "collection/doc108",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11268,6 +11877,7 @@
                 "version": 110
               },
               {
+                "createTime": 0,
                 "key": "collection/doc109",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11279,6 +11889,7 @@
                 "version": 111
               },
               {
+                "createTime": 0,
                 "key": "collection/doc110",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11290,6 +11901,7 @@
                 "version": 112
               },
               {
+                "createTime": 0,
                 "key": "collection/doc111",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11301,6 +11913,7 @@
                 "version": 113
               },
               {
+                "createTime": 0,
                 "key": "collection/doc112",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11312,6 +11925,7 @@
                 "version": 114
               },
               {
+                "createTime": 0,
                 "key": "collection/doc113",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11323,6 +11937,7 @@
                 "version": 115
               },
               {
+                "createTime": 0,
                 "key": "collection/doc114",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11334,6 +11949,7 @@
                 "version": 116
               },
               {
+                "createTime": 0,
                 "key": "collection/doc115",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11345,6 +11961,7 @@
                 "version": 117
               },
               {
+                "createTime": 0,
                 "key": "collection/doc116",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11356,6 +11973,7 @@
                 "version": 118
               },
               {
+                "createTime": 0,
                 "key": "collection/doc117",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11367,6 +11985,7 @@
                 "version": 119
               },
               {
+                "createTime": 0,
                 "key": "collection/doc118",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11378,6 +11997,7 @@
                 "version": 120
               },
               {
+                "createTime": 0,
                 "key": "collection/doc119",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11389,6 +12009,7 @@
                 "version": 121
               },
               {
+                "createTime": 0,
                 "key": "collection/doc120",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11400,6 +12021,7 @@
                 "version": 122
               },
               {
+                "createTime": 0,
                 "key": "collection/doc121",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11411,6 +12033,7 @@
                 "version": 123
               },
               {
+                "createTime": 0,
                 "key": "collection/doc122",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11422,6 +12045,7 @@
                 "version": 124
               },
               {
+                "createTime": 0,
                 "key": "collection/doc123",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11433,6 +12057,7 @@
                 "version": 125
               },
               {
+                "createTime": 0,
                 "key": "collection/doc124",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11444,6 +12069,7 @@
                 "version": 126
               },
               {
+                "createTime": 0,
                 "key": "collection/doc125",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11455,6 +12081,7 @@
                 "version": 127
               },
               {
+                "createTime": 0,
                 "key": "collection/doc126",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11466,6 +12093,7 @@
                 "version": 128
               },
               {
+                "createTime": 0,
                 "key": "collection/doc127",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11477,6 +12105,7 @@
                 "version": 129
               },
               {
+                "createTime": 0,
                 "key": "collection/doc128",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11488,6 +12117,7 @@
                 "version": 130
               },
               {
+                "createTime": 0,
                 "key": "collection/doc129",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11499,6 +12129,7 @@
                 "version": 131
               },
               {
+                "createTime": 0,
                 "key": "collection/doc130",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11510,6 +12141,7 @@
                 "version": 132
               },
               {
+                "createTime": 0,
                 "key": "collection/doc131",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11521,6 +12153,7 @@
                 "version": 133
               },
               {
+                "createTime": 0,
                 "key": "collection/doc132",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11532,6 +12165,7 @@
                 "version": 134
               },
               {
+                "createTime": 0,
                 "key": "collection/doc133",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11543,6 +12177,7 @@
                 "version": 135
               },
               {
+                "createTime": 0,
                 "key": "collection/doc134",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11554,6 +12189,7 @@
                 "version": 136
               },
               {
+                "createTime": 0,
                 "key": "collection/doc135",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11565,6 +12201,7 @@
                 "version": 137
               },
               {
+                "createTime": 0,
                 "key": "collection/doc136",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11576,6 +12213,7 @@
                 "version": 138
               },
               {
+                "createTime": 0,
                 "key": "collection/doc137",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11587,6 +12225,7 @@
                 "version": 139
               },
               {
+                "createTime": 0,
                 "key": "collection/doc138",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11598,6 +12237,7 @@
                 "version": 140
               },
               {
+                "createTime": 0,
                 "key": "collection/doc139",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11609,6 +12249,7 @@
                 "version": 141
               },
               {
+                "createTime": 0,
                 "key": "collection/doc140",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11620,6 +12261,7 @@
                 "version": 142
               },
               {
+                "createTime": 0,
                 "key": "collection/doc141",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11631,6 +12273,7 @@
                 "version": 143
               },
               {
+                "createTime": 0,
                 "key": "collection/doc142",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11642,6 +12285,7 @@
                 "version": 144
               },
               {
+                "createTime": 0,
                 "key": "collection/doc143",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11653,6 +12297,7 @@
                 "version": 145
               },
               {
+                "createTime": 0,
                 "key": "collection/doc144",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11664,6 +12309,7 @@
                 "version": 146
               },
               {
+                "createTime": 0,
                 "key": "collection/doc145",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11675,6 +12321,7 @@
                 "version": 147
               },
               {
+                "createTime": 0,
                 "key": "collection/doc146",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11686,6 +12333,7 @@
                 "version": 148
               },
               {
+                "createTime": 0,
                 "key": "collection/doc147",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11697,6 +12345,7 @@
                 "version": 149
               },
               {
+                "createTime": 0,
                 "key": "collection/doc148",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11708,6 +12357,7 @@
                 "version": 150
               },
               {
+                "createTime": 0,
                 "key": "collection/doc149",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11719,6 +12369,7 @@
                 "version": 151
               },
               {
+                "createTime": 0,
                 "key": "collection/doc150",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11730,6 +12381,7 @@
                 "version": 152
               },
               {
+                "createTime": 0,
                 "key": "collection/doc151",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11741,6 +12393,7 @@
                 "version": 153
               },
               {
+                "createTime": 0,
                 "key": "collection/doc152",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11752,6 +12405,7 @@
                 "version": 154
               },
               {
+                "createTime": 0,
                 "key": "collection/doc153",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11763,6 +12417,7 @@
                 "version": 155
               },
               {
+                "createTime": 0,
                 "key": "collection/doc154",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11774,6 +12429,7 @@
                 "version": 156
               },
               {
+                "createTime": 0,
                 "key": "collection/doc155",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11785,6 +12441,7 @@
                 "version": 157
               },
               {
+                "createTime": 0,
                 "key": "collection/doc156",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11796,6 +12453,7 @@
                 "version": 158
               },
               {
+                "createTime": 0,
                 "key": "collection/doc157",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11807,6 +12465,7 @@
                 "version": 159
               },
               {
+                "createTime": 0,
                 "key": "collection/doc158",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11818,6 +12477,7 @@
                 "version": 160
               },
               {
+                "createTime": 0,
                 "key": "collection/doc159",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11829,6 +12489,7 @@
                 "version": 161
               },
               {
+                "createTime": 0,
                 "key": "collection/doc160",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11840,6 +12501,7 @@
                 "version": 162
               },
               {
+                "createTime": 0,
                 "key": "collection/doc161",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11851,6 +12513,7 @@
                 "version": 163
               },
               {
+                "createTime": 0,
                 "key": "collection/doc162",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11862,6 +12525,7 @@
                 "version": 164
               },
               {
+                "createTime": 0,
                 "key": "collection/doc163",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11873,6 +12537,7 @@
                 "version": 165
               },
               {
+                "createTime": 0,
                 "key": "collection/doc164",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11884,6 +12549,7 @@
                 "version": 166
               },
               {
+                "createTime": 0,
                 "key": "collection/doc165",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11895,6 +12561,7 @@
                 "version": 167
               },
               {
+                "createTime": 0,
                 "key": "collection/doc166",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11906,6 +12573,7 @@
                 "version": 168
               },
               {
+                "createTime": 0,
                 "key": "collection/doc167",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11917,6 +12585,7 @@
                 "version": 169
               },
               {
+                "createTime": 0,
                 "key": "collection/doc168",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11928,6 +12597,7 @@
                 "version": 170
               },
               {
+                "createTime": 0,
                 "key": "collection/doc169",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11939,6 +12609,7 @@
                 "version": 171
               },
               {
+                "createTime": 0,
                 "key": "collection/doc170",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11950,6 +12621,7 @@
                 "version": 172
               },
               {
+                "createTime": 0,
                 "key": "collection/doc171",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11961,6 +12633,7 @@
                 "version": 173
               },
               {
+                "createTime": 0,
                 "key": "collection/doc172",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11972,6 +12645,7 @@
                 "version": 174
               },
               {
+                "createTime": 0,
                 "key": "collection/doc173",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11983,6 +12657,7 @@
                 "version": 175
               },
               {
+                "createTime": 0,
                 "key": "collection/doc174",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11994,6 +12669,7 @@
                 "version": 176
               },
               {
+                "createTime": 0,
                 "key": "collection/doc175",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12005,6 +12681,7 @@
                 "version": 177
               },
               {
+                "createTime": 0,
                 "key": "collection/doc176",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12016,6 +12693,7 @@
                 "version": 178
               },
               {
+                "createTime": 0,
                 "key": "collection/doc177",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12027,6 +12705,7 @@
                 "version": 179
               },
               {
+                "createTime": 0,
                 "key": "collection/doc178",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12038,6 +12717,7 @@
                 "version": 180
               },
               {
+                "createTime": 0,
                 "key": "collection/doc179",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12049,6 +12729,7 @@
                 "version": 181
               },
               {
+                "createTime": 0,
                 "key": "collection/doc180",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12060,6 +12741,7 @@
                 "version": 182
               },
               {
+                "createTime": 0,
                 "key": "collection/doc181",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12071,6 +12753,7 @@
                 "version": 183
               },
               {
+                "createTime": 0,
                 "key": "collection/doc182",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12082,6 +12765,7 @@
                 "version": 184
               },
               {
+                "createTime": 0,
                 "key": "collection/doc183",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12093,6 +12777,7 @@
                 "version": 185
               },
               {
+                "createTime": 0,
                 "key": "collection/doc184",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12104,6 +12789,7 @@
                 "version": 186
               },
               {
+                "createTime": 0,
                 "key": "collection/doc185",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12115,6 +12801,7 @@
                 "version": 187
               },
               {
+                "createTime": 0,
                 "key": "collection/doc186",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12126,6 +12813,7 @@
                 "version": 188
               },
               {
+                "createTime": 0,
                 "key": "collection/doc187",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12137,6 +12825,7 @@
                 "version": 189
               },
               {
+                "createTime": 0,
                 "key": "collection/doc188",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12148,6 +12837,7 @@
                 "version": 190
               },
               {
+                "createTime": 0,
                 "key": "collection/doc189",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12159,6 +12849,7 @@
                 "version": 191
               },
               {
+                "createTime": 0,
                 "key": "collection/doc190",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12170,6 +12861,7 @@
                 "version": 192
               },
               {
+                "createTime": 0,
                 "key": "collection/doc191",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12181,6 +12873,7 @@
                 "version": 193
               },
               {
+                "createTime": 0,
                 "key": "collection/doc192",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12192,6 +12885,7 @@
                 "version": 194
               },
               {
+                "createTime": 0,
                 "key": "collection/doc193",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12203,6 +12897,7 @@
                 "version": 195
               },
               {
+                "createTime": 0,
                 "key": "collection/doc194",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12214,6 +12909,7 @@
                 "version": 196
               },
               {
+                "createTime": 0,
                 "key": "collection/doc195",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12225,6 +12921,7 @@
                 "version": 197
               },
               {
+                "createTime": 0,
                 "key": "collection/doc196",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12236,6 +12933,7 @@
                 "version": 198
               },
               {
+                "createTime": 0,
                 "key": "collection/doc197",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12247,6 +12945,7 @@
                 "version": 199
               },
               {
+                "createTime": 0,
                 "key": "collection/doc198",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12258,6 +12957,7 @@
                 "version": 200
               },
               {
+                "createTime": 0,
                 "key": "collection/doc199",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12269,6 +12969,7 @@
                 "version": 201
               },
               {
+                "createTime": 0,
                 "key": "collection/doc200",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12280,6 +12981,7 @@
                 "version": 202
               },
               {
+                "createTime": 0,
                 "key": "collection/doc201",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12291,6 +12993,7 @@
                 "version": 203
               },
               {
+                "createTime": 0,
                 "key": "collection/doc202",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12302,6 +13005,7 @@
                 "version": 204
               },
               {
+                "createTime": 0,
                 "key": "collection/doc203",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12313,6 +13017,7 @@
                 "version": 205
               },
               {
+                "createTime": 0,
                 "key": "collection/doc204",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12324,6 +13029,7 @@
                 "version": 206
               },
               {
+                "createTime": 0,
                 "key": "collection/doc205",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12335,6 +13041,7 @@
                 "version": 207
               },
               {
+                "createTime": 0,
                 "key": "collection/doc206",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12346,6 +13053,7 @@
                 "version": 208
               },
               {
+                "createTime": 0,
                 "key": "collection/doc207",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12357,6 +13065,7 @@
                 "version": 209
               },
               {
+                "createTime": 0,
                 "key": "collection/doc208",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12368,6 +13077,7 @@
                 "version": 210
               },
               {
+                "createTime": 0,
                 "key": "collection/doc209",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12379,6 +13089,7 @@
                 "version": 211
               },
               {
+                "createTime": 0,
                 "key": "collection/doc210",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12390,6 +13101,7 @@
                 "version": 212
               },
               {
+                "createTime": 0,
                 "key": "collection/doc211",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12401,6 +13113,7 @@
                 "version": 213
               },
               {
+                "createTime": 0,
                 "key": "collection/doc212",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12412,6 +13125,7 @@
                 "version": 214
               },
               {
+                "createTime": 0,
                 "key": "collection/doc213",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12423,6 +13137,7 @@
                 "version": 215
               },
               {
+                "createTime": 0,
                 "key": "collection/doc214",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12434,6 +13149,7 @@
                 "version": 216
               },
               {
+                "createTime": 0,
                 "key": "collection/doc215",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12445,6 +13161,7 @@
                 "version": 217
               },
               {
+                "createTime": 0,
                 "key": "collection/doc216",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12456,6 +13173,7 @@
                 "version": 218
               },
               {
+                "createTime": 0,
                 "key": "collection/doc217",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12467,6 +13185,7 @@
                 "version": 219
               },
               {
+                "createTime": 0,
                 "key": "collection/doc218",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12478,6 +13197,7 @@
                 "version": 220
               },
               {
+                "createTime": 0,
                 "key": "collection/doc219",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12489,6 +13209,7 @@
                 "version": 221
               },
               {
+                "createTime": 0,
                 "key": "collection/doc220",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12500,6 +13221,7 @@
                 "version": 222
               },
               {
+                "createTime": 0,
                 "key": "collection/doc221",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12511,6 +13233,7 @@
                 "version": 223
               },
               {
+                "createTime": 0,
                 "key": "collection/doc222",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12522,6 +13245,7 @@
                 "version": 224
               },
               {
+                "createTime": 0,
                 "key": "collection/doc223",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12533,6 +13257,7 @@
                 "version": 225
               },
               {
+                "createTime": 0,
                 "key": "collection/doc224",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12544,6 +13269,7 @@
                 "version": 226
               },
               {
+                "createTime": 0,
                 "key": "collection/doc225",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12555,6 +13281,7 @@
                 "version": 227
               },
               {
+                "createTime": 0,
                 "key": "collection/doc226",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12566,6 +13293,7 @@
                 "version": 228
               },
               {
+                "createTime": 0,
                 "key": "collection/doc227",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12577,6 +13305,7 @@
                 "version": 229
               },
               {
+                "createTime": 0,
                 "key": "collection/doc228",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12588,6 +13317,7 @@
                 "version": 230
               },
               {
+                "createTime": 0,
                 "key": "collection/doc229",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12599,6 +13329,7 @@
                 "version": 231
               },
               {
+                "createTime": 0,
                 "key": "collection/doc230",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12610,6 +13341,7 @@
                 "version": 232
               },
               {
+                "createTime": 0,
                 "key": "collection/doc231",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12621,6 +13353,7 @@
                 "version": 233
               },
               {
+                "createTime": 0,
                 "key": "collection/doc232",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12632,6 +13365,7 @@
                 "version": 234
               },
               {
+                "createTime": 0,
                 "key": "collection/doc233",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12643,6 +13377,7 @@
                 "version": 235
               },
               {
+                "createTime": 0,
                 "key": "collection/doc234",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12654,6 +13389,7 @@
                 "version": 236
               },
               {
+                "createTime": 0,
                 "key": "collection/doc235",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12665,6 +13401,7 @@
                 "version": 237
               },
               {
+                "createTime": 0,
                 "key": "collection/doc236",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12676,6 +13413,7 @@
                 "version": 238
               },
               {
+                "createTime": 0,
                 "key": "collection/doc237",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12687,6 +13425,7 @@
                 "version": 239
               },
               {
+                "createTime": 0,
                 "key": "collection/doc238",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12698,6 +13437,7 @@
                 "version": 240
               },
               {
+                "createTime": 0,
                 "key": "collection/doc239",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12709,6 +13449,7 @@
                 "version": 241
               },
               {
+                "createTime": 0,
                 "key": "collection/doc240",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12720,6 +13461,7 @@
                 "version": 242
               },
               {
+                "createTime": 0,
                 "key": "collection/doc241",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12731,6 +13473,7 @@
                 "version": 243
               },
               {
+                "createTime": 0,
                 "key": "collection/doc242",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12742,6 +13485,7 @@
                 "version": 244
               },
               {
+                "createTime": 0,
                 "key": "collection/doc243",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12753,6 +13497,7 @@
                 "version": 245
               },
               {
+                "createTime": 0,
                 "key": "collection/doc244",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12764,6 +13509,7 @@
                 "version": 246
               },
               {
+                "createTime": 0,
                 "key": "collection/doc245",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12775,6 +13521,7 @@
                 "version": 247
               },
               {
+                "createTime": 0,
                 "key": "collection/doc246",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12786,6 +13533,7 @@
                 "version": 248
               },
               {
+                "createTime": 0,
                 "key": "collection/doc247",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12797,6 +13545,7 @@
                 "version": 249
               },
               {
+                "createTime": 0,
                 "key": "collection/doc248",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12808,6 +13557,7 @@
                 "version": 250
               },
               {
+                "createTime": 0,
                 "key": "collection/doc249",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12819,6 +13569,7 @@
                 "version": 251
               },
               {
+                "createTime": 0,
                 "key": "collection/doc250",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12830,6 +13581,7 @@
                 "version": 252
               },
               {
+                "createTime": 0,
                 "key": "collection/doc251",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12841,6 +13593,7 @@
                 "version": 253
               },
               {
+                "createTime": 0,
                 "key": "collection/doc252",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12852,6 +13605,7 @@
                 "version": 254
               },
               {
+                "createTime": 0,
                 "key": "collection/doc253",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12863,6 +13617,7 @@
                 "version": 255
               },
               {
+                "createTime": 0,
                 "key": "collection/doc254",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12874,6 +13629,7 @@
                 "version": 256
               },
               {
+                "createTime": 0,
                 "key": "collection/doc255",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12885,6 +13641,7 @@
                 "version": 257
               },
               {
+                "createTime": 0,
                 "key": "collection/doc256",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12896,6 +13653,7 @@
                 "version": 258
               },
               {
+                "createTime": 0,
                 "key": "collection/doc257",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12907,6 +13665,7 @@
                 "version": 259
               },
               {
+                "createTime": 0,
                 "key": "collection/doc258",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12918,6 +13677,7 @@
                 "version": 260
               },
               {
+                "createTime": 0,
                 "key": "collection/doc259",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12929,6 +13689,7 @@
                 "version": 261
               },
               {
+                "createTime": 0,
                 "key": "collection/doc260",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12940,6 +13701,7 @@
                 "version": 262
               },
               {
+                "createTime": 0,
                 "key": "collection/doc261",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12951,6 +13713,7 @@
                 "version": 263
               },
               {
+                "createTime": 0,
                 "key": "collection/doc262",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12962,6 +13725,7 @@
                 "version": 264
               },
               {
+                "createTime": 0,
                 "key": "collection/doc263",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12973,6 +13737,7 @@
                 "version": 265
               },
               {
+                "createTime": 0,
                 "key": "collection/doc264",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12984,6 +13749,7 @@
                 "version": 266
               },
               {
+                "createTime": 0,
                 "key": "collection/doc265",
                 "options": {
                   "hasCommittedMutations": false,
@@ -12995,6 +13761,7 @@
                 "version": 267
               },
               {
+                "createTime": 0,
                 "key": "collection/doc266",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13006,6 +13773,7 @@
                 "version": 268
               },
               {
+                "createTime": 0,
                 "key": "collection/doc267",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13017,6 +13785,7 @@
                 "version": 269
               },
               {
+                "createTime": 0,
                 "key": "collection/doc268",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13028,6 +13797,7 @@
                 "version": 270
               },
               {
+                "createTime": 0,
                 "key": "collection/doc269",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13039,6 +13809,7 @@
                 "version": 271
               },
               {
+                "createTime": 0,
                 "key": "collection/doc270",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13050,6 +13821,7 @@
                 "version": 272
               },
               {
+                "createTime": 0,
                 "key": "collection/doc271",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13061,6 +13833,7 @@
                 "version": 273
               },
               {
+                "createTime": 0,
                 "key": "collection/doc272",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13072,6 +13845,7 @@
                 "version": 274
               },
               {
+                "createTime": 0,
                 "key": "collection/doc273",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13083,6 +13857,7 @@
                 "version": 275
               },
               {
+                "createTime": 0,
                 "key": "collection/doc274",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13094,6 +13869,7 @@
                 "version": 276
               },
               {
+                "createTime": 0,
                 "key": "collection/doc275",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13105,6 +13881,7 @@
                 "version": 277
               },
               {
+                "createTime": 0,
                 "key": "collection/doc276",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13116,6 +13893,7 @@
                 "version": 278
               },
               {
+                "createTime": 0,
                 "key": "collection/doc277",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13127,6 +13905,7 @@
                 "version": 279
               },
               {
+                "createTime": 0,
                 "key": "collection/doc278",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13138,6 +13917,7 @@
                 "version": 280
               },
               {
+                "createTime": 0,
                 "key": "collection/doc279",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13149,6 +13929,7 @@
                 "version": 281
               },
               {
+                "createTime": 0,
                 "key": "collection/doc280",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13160,6 +13941,7 @@
                 "version": 282
               },
               {
+                "createTime": 0,
                 "key": "collection/doc281",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13171,6 +13953,7 @@
                 "version": 283
               },
               {
+                "createTime": 0,
                 "key": "collection/doc282",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13182,6 +13965,7 @@
                 "version": 284
               },
               {
+                "createTime": 0,
                 "key": "collection/doc283",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13193,6 +13977,7 @@
                 "version": 285
               },
               {
+                "createTime": 0,
                 "key": "collection/doc284",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13204,6 +13989,7 @@
                 "version": 286
               },
               {
+                "createTime": 0,
                 "key": "collection/doc285",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13215,6 +14001,7 @@
                 "version": 287
               },
               {
+                "createTime": 0,
                 "key": "collection/doc286",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13226,6 +14013,7 @@
                 "version": 288
               },
               {
+                "createTime": 0,
                 "key": "collection/doc287",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13237,6 +14025,7 @@
                 "version": 289
               },
               {
+                "createTime": 0,
                 "key": "collection/doc288",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13248,6 +14037,7 @@
                 "version": 290
               },
               {
+                "createTime": 0,
                 "key": "collection/doc289",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13259,6 +14049,7 @@
                 "version": 291
               },
               {
+                "createTime": 0,
                 "key": "collection/doc290",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13270,6 +14061,7 @@
                 "version": 292
               },
               {
+                "createTime": 0,
                 "key": "collection/doc291",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13281,6 +14073,7 @@
                 "version": 293
               },
               {
+                "createTime": 0,
                 "key": "collection/doc292",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13292,6 +14085,7 @@
                 "version": 294
               },
               {
+                "createTime": 0,
                 "key": "collection/doc293",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13303,6 +14097,7 @@
                 "version": 295
               },
               {
+                "createTime": 0,
                 "key": "collection/doc294",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13314,6 +14109,7 @@
                 "version": 296
               },
               {
+                "createTime": 0,
                 "key": "collection/doc295",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13325,6 +14121,7 @@
                 "version": 297
               },
               {
+                "createTime": 0,
                 "key": "collection/doc296",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13336,6 +14133,7 @@
                 "version": 298
               },
               {
+                "createTime": 0,
                 "key": "collection/doc297",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13347,6 +14145,7 @@
                 "version": 299
               },
               {
+                "createTime": 0,
                 "key": "collection/doc298",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13358,6 +14157,7 @@
                 "version": 300
               },
               {
+                "createTime": 0,
                 "key": "collection/doc299",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13369,6 +14169,7 @@
                 "version": 301
               },
               {
+                "createTime": 0,
                 "key": "collection/doc300",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13380,6 +14181,7 @@
                 "version": 302
               },
               {
+                "createTime": 0,
                 "key": "collection/doc301",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13391,6 +14193,7 @@
                 "version": 303
               },
               {
+                "createTime": 0,
                 "key": "collection/doc302",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13402,6 +14205,7 @@
                 "version": 304
               },
               {
+                "createTime": 0,
                 "key": "collection/doc303",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13413,6 +14217,7 @@
                 "version": 305
               },
               {
+                "createTime": 0,
                 "key": "collection/doc304",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13424,6 +14229,7 @@
                 "version": 306
               },
               {
+                "createTime": 0,
                 "key": "collection/doc305",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13435,6 +14241,7 @@
                 "version": 307
               },
               {
+                "createTime": 0,
                 "key": "collection/doc306",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13446,6 +14253,7 @@
                 "version": 308
               },
               {
+                "createTime": 0,
                 "key": "collection/doc307",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13457,6 +14265,7 @@
                 "version": 309
               },
               {
+                "createTime": 0,
                 "key": "collection/doc308",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13468,6 +14277,7 @@
                 "version": 310
               },
               {
+                "createTime": 0,
                 "key": "collection/doc309",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13479,6 +14289,7 @@
                 "version": 311
               },
               {
+                "createTime": 0,
                 "key": "collection/doc310",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13490,6 +14301,7 @@
                 "version": 312
               },
               {
+                "createTime": 0,
                 "key": "collection/doc311",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13501,6 +14313,7 @@
                 "version": 313
               },
               {
+                "createTime": 0,
                 "key": "collection/doc312",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13512,6 +14325,7 @@
                 "version": 314
               },
               {
+                "createTime": 0,
                 "key": "collection/doc313",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13523,6 +14337,7 @@
                 "version": 315
               },
               {
+                "createTime": 0,
                 "key": "collection/doc314",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13534,6 +14349,7 @@
                 "version": 316
               },
               {
+                "createTime": 0,
                 "key": "collection/doc315",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13545,6 +14361,7 @@
                 "version": 317
               },
               {
+                "createTime": 0,
                 "key": "collection/doc316",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13556,6 +14373,7 @@
                 "version": 318
               },
               {
+                "createTime": 0,
                 "key": "collection/doc317",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13567,6 +14385,7 @@
                 "version": 319
               },
               {
+                "createTime": 0,
                 "key": "collection/doc318",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13578,6 +14397,7 @@
                 "version": 320
               },
               {
+                "createTime": 0,
                 "key": "collection/doc319",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13589,6 +14409,7 @@
                 "version": 321
               },
               {
+                "createTime": 0,
                 "key": "collection/doc320",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13600,6 +14421,7 @@
                 "version": 322
               },
               {
+                "createTime": 0,
                 "key": "collection/doc321",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13611,6 +14433,7 @@
                 "version": 323
               },
               {
+                "createTime": 0,
                 "key": "collection/doc322",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13622,6 +14445,7 @@
                 "version": 324
               },
               {
+                "createTime": 0,
                 "key": "collection/doc323",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13633,6 +14457,7 @@
                 "version": 325
               },
               {
+                "createTime": 0,
                 "key": "collection/doc324",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13644,6 +14469,7 @@
                 "version": 326
               },
               {
+                "createTime": 0,
                 "key": "collection/doc325",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13655,6 +14481,7 @@
                 "version": 327
               },
               {
+                "createTime": 0,
                 "key": "collection/doc326",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13666,6 +14493,7 @@
                 "version": 328
               },
               {
+                "createTime": 0,
                 "key": "collection/doc327",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13677,6 +14505,7 @@
                 "version": 329
               },
               {
+                "createTime": 0,
                 "key": "collection/doc328",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13688,6 +14517,7 @@
                 "version": 330
               },
               {
+                "createTime": 0,
                 "key": "collection/doc329",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13699,6 +14529,7 @@
                 "version": 331
               },
               {
+                "createTime": 0,
                 "key": "collection/doc330",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13710,6 +14541,7 @@
                 "version": 332
               },
               {
+                "createTime": 0,
                 "key": "collection/doc331",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13721,6 +14553,7 @@
                 "version": 333
               },
               {
+                "createTime": 0,
                 "key": "collection/doc332",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13732,6 +14565,7 @@
                 "version": 334
               },
               {
+                "createTime": 0,
                 "key": "collection/doc333",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13743,6 +14577,7 @@
                 "version": 335
               },
               {
+                "createTime": 0,
                 "key": "collection/doc334",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13754,6 +14589,7 @@
                 "version": 336
               },
               {
+                "createTime": 0,
                 "key": "collection/doc335",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13765,6 +14601,7 @@
                 "version": 337
               },
               {
+                "createTime": 0,
                 "key": "collection/doc336",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13776,6 +14613,7 @@
                 "version": 338
               },
               {
+                "createTime": 0,
                 "key": "collection/doc337",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13787,6 +14625,7 @@
                 "version": 339
               },
               {
+                "createTime": 0,
                 "key": "collection/doc338",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13798,6 +14637,7 @@
                 "version": 340
               },
               {
+                "createTime": 0,
                 "key": "collection/doc339",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13809,6 +14649,7 @@
                 "version": 341
               },
               {
+                "createTime": 0,
                 "key": "collection/doc340",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13820,6 +14661,7 @@
                 "version": 342
               },
               {
+                "createTime": 0,
                 "key": "collection/doc341",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13831,6 +14673,7 @@
                 "version": 343
               },
               {
+                "createTime": 0,
                 "key": "collection/doc342",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13842,6 +14685,7 @@
                 "version": 344
               },
               {
+                "createTime": 0,
                 "key": "collection/doc343",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13853,6 +14697,7 @@
                 "version": 345
               },
               {
+                "createTime": 0,
                 "key": "collection/doc344",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13864,6 +14709,7 @@
                 "version": 346
               },
               {
+                "createTime": 0,
                 "key": "collection/doc345",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13875,6 +14721,7 @@
                 "version": 347
               },
               {
+                "createTime": 0,
                 "key": "collection/doc346",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13886,6 +14733,7 @@
                 "version": 348
               },
               {
+                "createTime": 0,
                 "key": "collection/doc347",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13897,6 +14745,7 @@
                 "version": 349
               },
               {
+                "createTime": 0,
                 "key": "collection/doc348",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13908,6 +14757,7 @@
                 "version": 350
               },
               {
+                "createTime": 0,
                 "key": "collection/doc349",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13919,6 +14769,7 @@
                 "version": 351
               },
               {
+                "createTime": 0,
                 "key": "collection/doc350",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13930,6 +14781,7 @@
                 "version": 352
               },
               {
+                "createTime": 0,
                 "key": "collection/doc351",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13941,6 +14793,7 @@
                 "version": 353
               },
               {
+                "createTime": 0,
                 "key": "collection/doc352",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13952,6 +14805,7 @@
                 "version": 354
               },
               {
+                "createTime": 0,
                 "key": "collection/doc353",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13963,6 +14817,7 @@
                 "version": 355
               },
               {
+                "createTime": 0,
                 "key": "collection/doc354",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13974,6 +14829,7 @@
                 "version": 356
               },
               {
+                "createTime": 0,
                 "key": "collection/doc355",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13985,6 +14841,7 @@
                 "version": 357
               },
               {
+                "createTime": 0,
                 "key": "collection/doc356",
                 "options": {
                   "hasCommittedMutations": false,
@@ -13996,6 +14853,7 @@
                 "version": 358
               },
               {
+                "createTime": 0,
                 "key": "collection/doc357",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14007,6 +14865,7 @@
                 "version": 359
               },
               {
+                "createTime": 0,
                 "key": "collection/doc358",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14018,6 +14877,7 @@
                 "version": 360
               },
               {
+                "createTime": 0,
                 "key": "collection/doc359",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14029,6 +14889,7 @@
                 "version": 361
               },
               {
+                "createTime": 0,
                 "key": "collection/doc360",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14040,6 +14901,7 @@
                 "version": 362
               },
               {
+                "createTime": 0,
                 "key": "collection/doc361",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14051,6 +14913,7 @@
                 "version": 363
               },
               {
+                "createTime": 0,
                 "key": "collection/doc362",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14062,6 +14925,7 @@
                 "version": 364
               },
               {
+                "createTime": 0,
                 "key": "collection/doc363",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14073,6 +14937,7 @@
                 "version": 365
               },
               {
+                "createTime": 0,
                 "key": "collection/doc364",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14084,6 +14949,7 @@
                 "version": 366
               },
               {
+                "createTime": 0,
                 "key": "collection/doc365",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14095,6 +14961,7 @@
                 "version": 367
               },
               {
+                "createTime": 0,
                 "key": "collection/doc366",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14106,6 +14973,7 @@
                 "version": 368
               },
               {
+                "createTime": 0,
                 "key": "collection/doc367",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14117,6 +14985,7 @@
                 "version": 369
               },
               {
+                "createTime": 0,
                 "key": "collection/doc368",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14128,6 +14997,7 @@
                 "version": 370
               },
               {
+                "createTime": 0,
                 "key": "collection/doc369",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14139,6 +15009,7 @@
                 "version": 371
               },
               {
+                "createTime": 0,
                 "key": "collection/doc370",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14150,6 +15021,7 @@
                 "version": 372
               },
               {
+                "createTime": 0,
                 "key": "collection/doc371",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14161,6 +15033,7 @@
                 "version": 373
               },
               {
+                "createTime": 0,
                 "key": "collection/doc372",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14172,6 +15045,7 @@
                 "version": 374
               },
               {
+                "createTime": 0,
                 "key": "collection/doc373",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14183,6 +15057,7 @@
                 "version": 375
               },
               {
+                "createTime": 0,
                 "key": "collection/doc374",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14194,6 +15069,7 @@
                 "version": 376
               },
               {
+                "createTime": 0,
                 "key": "collection/doc375",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14205,6 +15081,7 @@
                 "version": 377
               },
               {
+                "createTime": 0,
                 "key": "collection/doc376",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14216,6 +15093,7 @@
                 "version": 378
               },
               {
+                "createTime": 0,
                 "key": "collection/doc377",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14227,6 +15105,7 @@
                 "version": 379
               },
               {
+                "createTime": 0,
                 "key": "collection/doc378",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14238,6 +15117,7 @@
                 "version": 380
               },
               {
+                "createTime": 0,
                 "key": "collection/doc379",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14249,6 +15129,7 @@
                 "version": 381
               },
               {
+                "createTime": 0,
                 "key": "collection/doc380",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14260,6 +15141,7 @@
                 "version": 382
               },
               {
+                "createTime": 0,
                 "key": "collection/doc381",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14271,6 +15153,7 @@
                 "version": 383
               },
               {
+                "createTime": 0,
                 "key": "collection/doc382",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14282,6 +15165,7 @@
                 "version": 384
               },
               {
+                "createTime": 0,
                 "key": "collection/doc383",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14293,6 +15177,7 @@
                 "version": 385
               },
               {
+                "createTime": 0,
                 "key": "collection/doc384",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14304,6 +15189,7 @@
                 "version": 386
               },
               {
+                "createTime": 0,
                 "key": "collection/doc385",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14315,6 +15201,7 @@
                 "version": 387
               },
               {
+                "createTime": 0,
                 "key": "collection/doc386",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14326,6 +15213,7 @@
                 "version": 388
               },
               {
+                "createTime": 0,
                 "key": "collection/doc387",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14337,6 +15225,7 @@
                 "version": 389
               },
               {
+                "createTime": 0,
                 "key": "collection/doc388",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14348,6 +15237,7 @@
                 "version": 390
               },
               {
+                "createTime": 0,
                 "key": "collection/doc389",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14359,6 +15249,7 @@
                 "version": 391
               },
               {
+                "createTime": 0,
                 "key": "collection/doc390",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14370,6 +15261,7 @@
                 "version": 392
               },
               {
+                "createTime": 0,
                 "key": "collection/doc391",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14381,6 +15273,7 @@
                 "version": 393
               },
               {
+                "createTime": 0,
                 "key": "collection/doc392",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14392,6 +15285,7 @@
                 "version": 394
               },
               {
+                "createTime": 0,
                 "key": "collection/doc393",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14403,6 +15297,7 @@
                 "version": 395
               },
               {
+                "createTime": 0,
                 "key": "collection/doc394",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14414,6 +15309,7 @@
                 "version": 396
               },
               {
+                "createTime": 0,
                 "key": "collection/doc395",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14425,6 +15321,7 @@
                 "version": 397
               },
               {
+                "createTime": 0,
                 "key": "collection/doc396",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14436,6 +15333,7 @@
                 "version": 398
               },
               {
+                "createTime": 0,
                 "key": "collection/doc397",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14447,6 +15345,7 @@
                 "version": 399
               },
               {
+                "createTime": 0,
                 "key": "collection/doc398",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14458,6 +15357,7 @@
                 "version": 400
               },
               {
+                "createTime": 0,
                 "key": "collection/doc399",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14469,6 +15369,7 @@
                 "version": 401
               },
               {
+                "createTime": 0,
                 "key": "collection/doc400",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14480,6 +15381,7 @@
                 "version": 402
               },
               {
+                "createTime": 0,
                 "key": "collection/doc401",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14491,6 +15393,7 @@
                 "version": 403
               },
               {
+                "createTime": 0,
                 "key": "collection/doc402",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14502,6 +15405,7 @@
                 "version": 404
               },
               {
+                "createTime": 0,
                 "key": "collection/doc403",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14513,6 +15417,7 @@
                 "version": 405
               },
               {
+                "createTime": 0,
                 "key": "collection/doc404",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14524,6 +15429,7 @@
                 "version": 406
               },
               {
+                "createTime": 0,
                 "key": "collection/doc405",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14535,6 +15441,7 @@
                 "version": 407
               },
               {
+                "createTime": 0,
                 "key": "collection/doc406",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14546,6 +15453,7 @@
                 "version": 408
               },
               {
+                "createTime": 0,
                 "key": "collection/doc407",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14557,6 +15465,7 @@
                 "version": 409
               },
               {
+                "createTime": 0,
                 "key": "collection/doc408",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14568,6 +15477,7 @@
                 "version": 410
               },
               {
+                "createTime": 0,
                 "key": "collection/doc409",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14579,6 +15489,7 @@
                 "version": 411
               },
               {
+                "createTime": 0,
                 "key": "collection/doc410",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14590,6 +15501,7 @@
                 "version": 412
               },
               {
+                "createTime": 0,
                 "key": "collection/doc411",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14601,6 +15513,7 @@
                 "version": 413
               },
               {
+                "createTime": 0,
                 "key": "collection/doc412",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14612,6 +15525,7 @@
                 "version": 414
               },
               {
+                "createTime": 0,
                 "key": "collection/doc413",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14623,6 +15537,7 @@
                 "version": 415
               },
               {
+                "createTime": 0,
                 "key": "collection/doc414",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14634,6 +15549,7 @@
                 "version": 416
               },
               {
+                "createTime": 0,
                 "key": "collection/doc415",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14645,6 +15561,7 @@
                 "version": 417
               },
               {
+                "createTime": 0,
                 "key": "collection/doc416",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14656,6 +15573,7 @@
                 "version": 418
               },
               {
+                "createTime": 0,
                 "key": "collection/doc417",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14667,6 +15585,7 @@
                 "version": 419
               },
               {
+                "createTime": 0,
                 "key": "collection/doc418",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14678,6 +15597,7 @@
                 "version": 420
               },
               {
+                "createTime": 0,
                 "key": "collection/doc419",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14689,6 +15609,7 @@
                 "version": 421
               },
               {
+                "createTime": 0,
                 "key": "collection/doc420",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14700,6 +15621,7 @@
                 "version": 422
               },
               {
+                "createTime": 0,
                 "key": "collection/doc421",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14711,6 +15633,7 @@
                 "version": 423
               },
               {
+                "createTime": 0,
                 "key": "collection/doc422",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14722,6 +15645,7 @@
                 "version": 424
               },
               {
+                "createTime": 0,
                 "key": "collection/doc423",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14733,6 +15657,7 @@
                 "version": 425
               },
               {
+                "createTime": 0,
                 "key": "collection/doc424",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14744,6 +15669,7 @@
                 "version": 426
               },
               {
+                "createTime": 0,
                 "key": "collection/doc425",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14755,6 +15681,7 @@
                 "version": 427
               },
               {
+                "createTime": 0,
                 "key": "collection/doc426",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14766,6 +15693,7 @@
                 "version": 428
               },
               {
+                "createTime": 0,
                 "key": "collection/doc427",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14777,6 +15705,7 @@
                 "version": 429
               },
               {
+                "createTime": 0,
                 "key": "collection/doc428",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14788,6 +15717,7 @@
                 "version": 430
               },
               {
+                "createTime": 0,
                 "key": "collection/doc429",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14799,6 +15729,7 @@
                 "version": 431
               },
               {
+                "createTime": 0,
                 "key": "collection/doc430",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14810,6 +15741,7 @@
                 "version": 432
               },
               {
+                "createTime": 0,
                 "key": "collection/doc431",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14821,6 +15753,7 @@
                 "version": 433
               },
               {
+                "createTime": 0,
                 "key": "collection/doc432",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14832,6 +15765,7 @@
                 "version": 434
               },
               {
+                "createTime": 0,
                 "key": "collection/doc433",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14843,6 +15777,7 @@
                 "version": 435
               },
               {
+                "createTime": 0,
                 "key": "collection/doc434",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14854,6 +15789,7 @@
                 "version": 436
               },
               {
+                "createTime": 0,
                 "key": "collection/doc435",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14865,6 +15801,7 @@
                 "version": 437
               },
               {
+                "createTime": 0,
                 "key": "collection/doc436",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14876,6 +15813,7 @@
                 "version": 438
               },
               {
+                "createTime": 0,
                 "key": "collection/doc437",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14887,6 +15825,7 @@
                 "version": 439
               },
               {
+                "createTime": 0,
                 "key": "collection/doc438",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14898,6 +15837,7 @@
                 "version": 440
               },
               {
+                "createTime": 0,
                 "key": "collection/doc439",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14909,6 +15849,7 @@
                 "version": 441
               },
               {
+                "createTime": 0,
                 "key": "collection/doc440",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14920,6 +15861,7 @@
                 "version": 442
               },
               {
+                "createTime": 0,
                 "key": "collection/doc441",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14931,6 +15873,7 @@
                 "version": 443
               },
               {
+                "createTime": 0,
                 "key": "collection/doc442",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14942,6 +15885,7 @@
                 "version": 444
               },
               {
+                "createTime": 0,
                 "key": "collection/doc443",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14953,6 +15897,7 @@
                 "version": 445
               },
               {
+                "createTime": 0,
                 "key": "collection/doc444",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14964,6 +15909,7 @@
                 "version": 446
               },
               {
+                "createTime": 0,
                 "key": "collection/doc445",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14975,6 +15921,7 @@
                 "version": 447
               },
               {
+                "createTime": 0,
                 "key": "collection/doc446",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14986,6 +15933,7 @@
                 "version": 448
               },
               {
+                "createTime": 0,
                 "key": "collection/doc447",
                 "options": {
                   "hasCommittedMutations": false,
@@ -14997,6 +15945,7 @@
                 "version": 449
               },
               {
+                "createTime": 0,
                 "key": "collection/doc448",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15008,6 +15957,7 @@
                 "version": 450
               },
               {
+                "createTime": 0,
                 "key": "collection/doc449",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15019,6 +15969,7 @@
                 "version": 451
               },
               {
+                "createTime": 0,
                 "key": "collection/doc450",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15030,6 +15981,7 @@
                 "version": 452
               },
               {
+                "createTime": 0,
                 "key": "collection/doc451",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15041,6 +15993,7 @@
                 "version": 453
               },
               {
+                "createTime": 0,
                 "key": "collection/doc452",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15052,6 +16005,7 @@
                 "version": 454
               },
               {
+                "createTime": 0,
                 "key": "collection/doc453",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15063,6 +16017,7 @@
                 "version": 455
               },
               {
+                "createTime": 0,
                 "key": "collection/doc454",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15074,6 +16029,7 @@
                 "version": 456
               },
               {
+                "createTime": 0,
                 "key": "collection/doc455",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15085,6 +16041,7 @@
                 "version": 457
               },
               {
+                "createTime": 0,
                 "key": "collection/doc456",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15096,6 +16053,7 @@
                 "version": 458
               },
               {
+                "createTime": 0,
                 "key": "collection/doc457",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15107,6 +16065,7 @@
                 "version": 459
               },
               {
+                "createTime": 0,
                 "key": "collection/doc458",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15118,6 +16077,7 @@
                 "version": 460
               },
               {
+                "createTime": 0,
                 "key": "collection/doc459",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15129,6 +16089,7 @@
                 "version": 461
               },
               {
+                "createTime": 0,
                 "key": "collection/doc460",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15140,6 +16101,7 @@
                 "version": 462
               },
               {
+                "createTime": 0,
                 "key": "collection/doc461",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15151,6 +16113,7 @@
                 "version": 463
               },
               {
+                "createTime": 0,
                 "key": "collection/doc462",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15162,6 +16125,7 @@
                 "version": 464
               },
               {
+                "createTime": 0,
                 "key": "collection/doc463",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15173,6 +16137,7 @@
                 "version": 465
               },
               {
+                "createTime": 0,
                 "key": "collection/doc464",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15184,6 +16149,7 @@
                 "version": 466
               },
               {
+                "createTime": 0,
                 "key": "collection/doc465",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15195,6 +16161,7 @@
                 "version": 467
               },
               {
+                "createTime": 0,
                 "key": "collection/doc466",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15206,6 +16173,7 @@
                 "version": 468
               },
               {
+                "createTime": 0,
                 "key": "collection/doc467",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15217,6 +16185,7 @@
                 "version": 469
               },
               {
+                "createTime": 0,
                 "key": "collection/doc468",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15228,6 +16197,7 @@
                 "version": 470
               },
               {
+                "createTime": 0,
                 "key": "collection/doc469",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15239,6 +16209,7 @@
                 "version": 471
               },
               {
+                "createTime": 0,
                 "key": "collection/doc470",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15250,6 +16221,7 @@
                 "version": 472
               },
               {
+                "createTime": 0,
                 "key": "collection/doc471",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15261,6 +16233,7 @@
                 "version": 473
               },
               {
+                "createTime": 0,
                 "key": "collection/doc472",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15272,6 +16245,7 @@
                 "version": 474
               },
               {
+                "createTime": 0,
                 "key": "collection/doc473",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15283,6 +16257,7 @@
                 "version": 475
               },
               {
+                "createTime": 0,
                 "key": "collection/doc474",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15294,6 +16269,7 @@
                 "version": 476
               },
               {
+                "createTime": 0,
                 "key": "collection/doc475",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15305,6 +16281,7 @@
                 "version": 477
               },
               {
+                "createTime": 0,
                 "key": "collection/doc476",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15316,6 +16293,7 @@
                 "version": 478
               },
               {
+                "createTime": 0,
                 "key": "collection/doc477",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15327,6 +16305,7 @@
                 "version": 479
               },
               {
+                "createTime": 0,
                 "key": "collection/doc478",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15338,6 +16317,7 @@
                 "version": 480
               },
               {
+                "createTime": 0,
                 "key": "collection/doc479",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15349,6 +16329,7 @@
                 "version": 481
               },
               {
+                "createTime": 0,
                 "key": "collection/doc480",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15360,6 +16341,7 @@
                 "version": 482
               },
               {
+                "createTime": 0,
                 "key": "collection/doc481",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15371,6 +16353,7 @@
                 "version": 483
               },
               {
+                "createTime": 0,
                 "key": "collection/doc482",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15382,6 +16365,7 @@
                 "version": 484
               },
               {
+                "createTime": 0,
                 "key": "collection/doc483",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15393,6 +16377,7 @@
                 "version": 485
               },
               {
+                "createTime": 0,
                 "key": "collection/doc484",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15404,6 +16389,7 @@
                 "version": 486
               },
               {
+                "createTime": 0,
                 "key": "collection/doc485",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15415,6 +16401,7 @@
                 "version": 487
               },
               {
+                "createTime": 0,
                 "key": "collection/doc486",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15426,6 +16413,7 @@
                 "version": 488
               },
               {
+                "createTime": 0,
                 "key": "collection/doc487",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15437,6 +16425,7 @@
                 "version": 489
               },
               {
+                "createTime": 0,
                 "key": "collection/doc488",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15448,6 +16437,7 @@
                 "version": 490
               },
               {
+                "createTime": 0,
                 "key": "collection/doc489",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15459,6 +16449,7 @@
                 "version": 491
               },
               {
+                "createTime": 0,
                 "key": "collection/doc490",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15470,6 +16461,7 @@
                 "version": 492
               },
               {
+                "createTime": 0,
                 "key": "collection/doc491",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15481,6 +16473,7 @@
                 "version": 493
               },
               {
+                "createTime": 0,
                 "key": "collection/doc492",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15492,6 +16485,7 @@
                 "version": 494
               },
               {
+                "createTime": 0,
                 "key": "collection/doc493",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15503,6 +16497,7 @@
                 "version": 495
               },
               {
+                "createTime": 0,
                 "key": "collection/doc494",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15514,6 +16509,7 @@
                 "version": 496
               },
               {
+                "createTime": 0,
                 "key": "collection/doc495",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15525,6 +16521,7 @@
                 "version": 497
               },
               {
+                "createTime": 0,
                 "key": "collection/doc496",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15536,6 +16533,7 @@
                 "version": 498
               },
               {
+                "createTime": 0,
                 "key": "collection/doc497",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15547,6 +16545,7 @@
                 "version": 499
               },
               {
+                "createTime": 0,
                 "key": "collection/doc498",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15558,6 +16557,7 @@
                 "version": 500
               },
               {
+                "createTime": 0,
                 "key": "collection/doc499",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15638,6 +16638,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15649,6 +16650,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15660,6 +16662,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15671,6 +16674,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/doc3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15682,6 +16686,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/doc4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15693,6 +16698,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/doc5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15704,6 +16710,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/doc6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15715,6 +16722,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/doc7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15726,6 +16734,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/doc8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15737,6 +16746,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/doc9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15848,6 +16858,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15859,6 +16870,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/doc11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15870,6 +16882,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/doc12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15881,6 +16894,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/doc13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15892,6 +16906,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/doc14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15903,6 +16918,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/doc15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15914,6 +16930,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/doc16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15925,6 +16942,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/doc17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15936,6 +16954,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/doc18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -15947,6 +16966,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/doc19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16058,6 +17078,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16069,6 +17090,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/doc21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16080,6 +17102,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/doc22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16091,6 +17114,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/doc23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16102,6 +17126,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/doc24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16113,6 +17138,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/doc25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16124,6 +17150,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/doc26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16135,6 +17162,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/doc27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16146,6 +17174,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/doc28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16157,6 +17186,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/doc29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16268,6 +17298,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16279,6 +17310,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/doc31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16290,6 +17322,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/doc32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16301,6 +17334,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/doc33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16312,6 +17346,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/doc34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16323,6 +17358,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/doc35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16334,6 +17370,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/doc36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16345,6 +17382,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/doc37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16356,6 +17394,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/doc38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16367,6 +17406,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/doc39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16478,6 +17518,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16489,6 +17530,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/doc41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16500,6 +17542,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/doc42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16511,6 +17554,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/doc43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16522,6 +17566,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/doc44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16533,6 +17578,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/doc45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16544,6 +17590,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/doc46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16555,6 +17602,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/doc47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16566,6 +17614,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/doc48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16577,6 +17626,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/doc49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16688,6 +17738,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16699,6 +17750,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/doc51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16710,6 +17762,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/doc52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16721,6 +17774,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/doc53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16732,6 +17786,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/doc54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16743,6 +17798,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/doc55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16754,6 +17810,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/doc56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16765,6 +17822,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/doc57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16776,6 +17834,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/doc58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16787,6 +17846,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/doc59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16898,6 +17958,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16909,6 +17970,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/doc61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16920,6 +17982,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/doc62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16931,6 +17994,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/doc63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16942,6 +18006,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/doc64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16953,6 +18018,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/doc65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16964,6 +18030,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/doc66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16975,6 +18042,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/doc67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16986,6 +18054,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/doc68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -16997,6 +18066,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/doc69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17108,6 +18178,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17119,6 +18190,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/doc71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17130,6 +18202,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/doc72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17141,6 +18214,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/doc73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17152,6 +18226,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/doc74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17163,6 +18238,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/doc75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17174,6 +18250,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/doc76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17185,6 +18262,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/doc77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17196,6 +18274,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/doc78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17207,6 +18286,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/doc79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17318,6 +18398,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17329,6 +18410,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/doc81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17340,6 +18422,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/doc82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17351,6 +18434,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/doc83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17362,6 +18446,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/doc84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17373,6 +18458,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/doc85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17384,6 +18470,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/doc86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17395,6 +18482,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/doc87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17406,6 +18494,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/doc88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17417,6 +18506,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/doc89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17528,6 +18618,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17539,6 +18630,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/doc91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17550,6 +18642,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/doc92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17561,6 +18654,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/doc93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17572,6 +18666,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/doc94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17583,6 +18678,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/doc95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17594,6 +18690,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/doc96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17605,6 +18702,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/doc97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17616,6 +18714,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/doc98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17627,6 +18726,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/doc99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17738,6 +18838,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17749,6 +18850,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17760,6 +18862,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17771,6 +18874,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/doc3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17782,6 +18886,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/doc4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17793,6 +18898,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/doc5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17804,6 +18910,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/doc6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17815,6 +18922,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/doc7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17826,6 +18934,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/doc8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17837,6 +18946,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/doc9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17948,6 +19058,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17959,6 +19070,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/doc11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17970,6 +19082,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/doc12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17981,6 +19094,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/doc13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -17992,6 +19106,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/doc14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18003,6 +19118,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/doc15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18014,6 +19130,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/doc16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18025,6 +19142,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/doc17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18036,6 +19154,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/doc18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18047,6 +19166,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/doc19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18158,6 +19278,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18169,6 +19290,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/doc21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18180,6 +19302,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/doc22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18191,6 +19314,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/doc23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18202,6 +19326,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/doc24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18213,6 +19338,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/doc25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18224,6 +19350,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/doc26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18235,6 +19362,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/doc27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18246,6 +19374,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/doc28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18257,6 +19386,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/doc29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18368,6 +19498,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18379,6 +19510,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/doc31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18390,6 +19522,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/doc32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18401,6 +19534,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/doc33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18412,6 +19546,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/doc34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18423,6 +19558,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/doc35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18434,6 +19570,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/doc36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18445,6 +19582,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/doc37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18456,6 +19594,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/doc38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18467,6 +19606,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/doc39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18578,6 +19718,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18589,6 +19730,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/doc41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18600,6 +19742,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/doc42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18611,6 +19754,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/doc43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18622,6 +19766,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/doc44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18633,6 +19778,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/doc45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18644,6 +19790,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/doc46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18655,6 +19802,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/doc47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18666,6 +19814,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/doc48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18677,6 +19826,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/doc49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18788,6 +19938,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18799,6 +19950,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/doc51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18810,6 +19962,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/doc52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18821,6 +19974,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/doc53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18832,6 +19986,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/doc54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18843,6 +19998,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/doc55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18854,6 +20010,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/doc56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18865,6 +20022,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/doc57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18876,6 +20034,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/doc58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18887,6 +20046,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/doc59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -18998,6 +20158,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19009,6 +20170,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/doc61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19020,6 +20182,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/doc62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19031,6 +20194,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/doc63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19042,6 +20206,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/doc64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19053,6 +20218,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/doc65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19064,6 +20230,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/doc66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19075,6 +20242,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/doc67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19086,6 +20254,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/doc68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19097,6 +20266,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/doc69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19208,6 +20378,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19219,6 +20390,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/doc71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19230,6 +20402,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/doc72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19241,6 +20414,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/doc73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19252,6 +20426,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/doc74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19263,6 +20438,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/doc75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19274,6 +20450,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/doc76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19285,6 +20462,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/doc77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19296,6 +20474,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/doc78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19307,6 +20486,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/doc79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19418,6 +20598,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19429,6 +20610,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/doc81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19440,6 +20622,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/doc82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19451,6 +20634,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/doc83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19462,6 +20646,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/doc84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19473,6 +20658,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/doc85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19484,6 +20670,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/doc86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19495,6 +20682,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/doc87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19506,6 +20694,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/doc88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19517,6 +20706,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/doc89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19628,6 +20818,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19639,6 +20830,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/doc91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19650,6 +20842,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/doc92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19661,6 +20854,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/doc93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19672,6 +20866,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/doc94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19683,6 +20878,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/doc95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19694,6 +20890,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/doc96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19705,6 +20902,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/doc97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19716,6 +20914,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/doc98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19727,6 +20926,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/doc99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19838,6 +21038,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19849,6 +21050,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19860,6 +21062,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19871,6 +21074,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/doc3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19882,6 +21086,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/doc4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19893,6 +21098,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/doc5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19904,6 +21110,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/doc6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19915,6 +21122,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/doc7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19926,6 +21134,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/doc8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -19937,6 +21146,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/doc9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20048,6 +21258,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20059,6 +21270,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/doc11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20070,6 +21282,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/doc12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20081,6 +21294,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/doc13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20092,6 +21306,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/doc14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20103,6 +21318,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/doc15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20114,6 +21330,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/doc16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20125,6 +21342,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/doc17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20136,6 +21354,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/doc18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20147,6 +21366,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/doc19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20258,6 +21478,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20269,6 +21490,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/doc21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20280,6 +21502,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/doc22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20291,6 +21514,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/doc23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20302,6 +21526,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/doc24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20313,6 +21538,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/doc25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20324,6 +21550,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/doc26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20335,6 +21562,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/doc27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20346,6 +21574,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/doc28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20357,6 +21586,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/doc29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20468,6 +21698,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20479,6 +21710,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/doc31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20490,6 +21722,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/doc32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20501,6 +21734,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/doc33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20512,6 +21746,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/doc34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20523,6 +21758,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/doc35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20534,6 +21770,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/doc36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20545,6 +21782,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/doc37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20556,6 +21794,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/doc38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20567,6 +21806,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/doc39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20678,6 +21918,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20689,6 +21930,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/doc41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20700,6 +21942,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/doc42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20711,6 +21954,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/doc43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20722,6 +21966,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/doc44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20733,6 +21978,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/doc45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20744,6 +21990,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/doc46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20755,6 +22002,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/doc47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20766,6 +22014,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/doc48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20777,6 +22026,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/doc49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20888,6 +22138,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20899,6 +22150,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/doc51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20910,6 +22162,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/doc52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20921,6 +22174,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/doc53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20932,6 +22186,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/doc54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20943,6 +22198,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/doc55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20954,6 +22210,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/doc56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20965,6 +22222,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/doc57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20976,6 +22234,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/doc58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -20987,6 +22246,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/doc59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21098,6 +22358,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21109,6 +22370,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/doc61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21120,6 +22382,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/doc62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21131,6 +22394,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/doc63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21142,6 +22406,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/doc64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21153,6 +22418,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/doc65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21164,6 +22430,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/doc66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21175,6 +22442,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/doc67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21186,6 +22454,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/doc68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21197,6 +22466,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/doc69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21308,6 +22578,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21319,6 +22590,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/doc71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21330,6 +22602,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/doc72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21341,6 +22614,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/doc73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21352,6 +22626,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/doc74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21363,6 +22638,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/doc75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21374,6 +22650,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/doc76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21385,6 +22662,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/doc77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21396,6 +22674,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/doc78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21407,6 +22686,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/doc79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21518,6 +22798,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21529,6 +22810,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/doc81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21540,6 +22822,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/doc82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21551,6 +22834,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/doc83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21562,6 +22846,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/doc84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21573,6 +22858,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/doc85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21584,6 +22870,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/doc86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21595,6 +22882,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/doc87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21606,6 +22894,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/doc88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21617,6 +22906,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/doc89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21728,6 +23018,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21739,6 +23030,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/doc91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21750,6 +23042,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/doc92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21761,6 +23054,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/doc93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21772,6 +23066,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/doc94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21783,6 +23078,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/doc95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21794,6 +23090,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/doc96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21805,6 +23102,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/doc97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21816,6 +23114,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/doc98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21827,6 +23126,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/doc99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21938,6 +23238,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21949,6 +23250,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21960,6 +23262,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21971,6 +23274,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/doc3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21982,6 +23286,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/doc4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -21993,6 +23298,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/doc5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22004,6 +23310,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/doc6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22015,6 +23322,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/doc7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22026,6 +23334,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/doc8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22037,6 +23346,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/doc9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22148,6 +23458,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22159,6 +23470,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/doc11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22170,6 +23482,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/doc12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22181,6 +23494,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/doc13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22192,6 +23506,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/doc14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22203,6 +23518,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/doc15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22214,6 +23530,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/doc16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22225,6 +23542,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/doc17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22236,6 +23554,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/doc18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22247,6 +23566,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/doc19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22358,6 +23678,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22369,6 +23690,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/doc21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22380,6 +23702,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/doc22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22391,6 +23714,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/doc23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22402,6 +23726,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/doc24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22413,6 +23738,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/doc25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22424,6 +23750,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/doc26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22435,6 +23762,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/doc27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22446,6 +23774,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/doc28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22457,6 +23786,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/doc29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22568,6 +23898,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22579,6 +23910,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/doc31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22590,6 +23922,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/doc32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22601,6 +23934,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/doc33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22612,6 +23946,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/doc34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22623,6 +23958,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/doc35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22634,6 +23970,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/doc36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22645,6 +23982,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/doc37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22656,6 +23994,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/doc38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22667,6 +24006,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/doc39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22778,6 +24118,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22789,6 +24130,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/doc41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22800,6 +24142,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/doc42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22811,6 +24154,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/doc43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22822,6 +24166,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/doc44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22833,6 +24178,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/doc45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22844,6 +24190,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/doc46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22855,6 +24202,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/doc47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22866,6 +24214,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/doc48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22877,6 +24226,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/doc49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22988,6 +24338,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -22999,6 +24350,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/doc51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23010,6 +24362,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/doc52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23021,6 +24374,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/doc53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23032,6 +24386,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/doc54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23043,6 +24398,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/doc55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23054,6 +24410,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/doc56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23065,6 +24422,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/doc57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23076,6 +24434,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/doc58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23087,6 +24446,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/doc59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23198,6 +24558,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23209,6 +24570,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/doc61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23220,6 +24582,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/doc62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23231,6 +24594,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/doc63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23242,6 +24606,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/doc64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23253,6 +24618,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/doc65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23264,6 +24630,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/doc66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23275,6 +24642,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/doc67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23286,6 +24654,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/doc68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23297,6 +24666,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/doc69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23408,6 +24778,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23419,6 +24790,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/doc71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23430,6 +24802,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/doc72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23441,6 +24814,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/doc73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23452,6 +24826,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/doc74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23463,6 +24838,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/doc75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23474,6 +24850,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/doc76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23485,6 +24862,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/doc77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23496,6 +24874,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/doc78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23507,6 +24886,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/doc79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23618,6 +24998,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23629,6 +25010,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/doc81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23640,6 +25022,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/doc82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23651,6 +25034,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/doc83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23662,6 +25046,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/doc84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23673,6 +25058,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/doc85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23684,6 +25070,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/doc86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23695,6 +25082,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/doc87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23706,6 +25094,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/doc88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23717,6 +25106,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/doc89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23828,6 +25218,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23839,6 +25230,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/doc91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23850,6 +25242,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/doc92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23861,6 +25254,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/doc93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23872,6 +25266,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/doc94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23883,6 +25278,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/doc95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23894,6 +25290,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/doc96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23905,6 +25302,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/doc97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23916,6 +25314,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/doc98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -23927,6 +25326,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/doc99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24038,6 +25438,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24049,6 +25450,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24060,6 +25462,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24071,6 +25474,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/doc3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24082,6 +25486,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/doc4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24093,6 +25498,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/doc5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24104,6 +25510,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/doc6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24115,6 +25522,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/doc7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24126,6 +25534,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/doc8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24137,6 +25546,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/doc9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24248,6 +25658,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24259,6 +25670,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/doc11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24270,6 +25682,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/doc12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24281,6 +25694,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/doc13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24292,6 +25706,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/doc14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24303,6 +25718,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/doc15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24314,6 +25730,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/doc16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24325,6 +25742,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/doc17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24336,6 +25754,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/doc18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24347,6 +25766,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/doc19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24458,6 +25878,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24469,6 +25890,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/doc21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24480,6 +25902,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/doc22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24491,6 +25914,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/doc23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24502,6 +25926,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/doc24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24513,6 +25938,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/doc25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24524,6 +25950,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/doc26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24535,6 +25962,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/doc27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24546,6 +25974,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/doc28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24557,6 +25986,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/doc29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24668,6 +26098,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24679,6 +26110,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/doc31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24690,6 +26122,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/doc32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24701,6 +26134,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/doc33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24712,6 +26146,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/doc34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24723,6 +26158,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/doc35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24734,6 +26170,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/doc36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24745,6 +26182,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/doc37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24756,6 +26194,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/doc38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24767,6 +26206,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/doc39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24878,6 +26318,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24889,6 +26330,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/doc41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24900,6 +26342,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/doc42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24911,6 +26354,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/doc43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24922,6 +26366,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/doc44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24933,6 +26378,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/doc45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24944,6 +26390,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/doc46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24955,6 +26402,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/doc47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24966,6 +26414,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/doc48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -24977,6 +26426,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/doc49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25088,6 +26538,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25099,6 +26550,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/doc51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25110,6 +26562,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/doc52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25121,6 +26574,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/doc53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25132,6 +26586,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/doc54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25143,6 +26598,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/doc55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25154,6 +26610,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/doc56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25165,6 +26622,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/doc57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25176,6 +26634,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/doc58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25187,6 +26646,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/doc59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25298,6 +26758,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25309,6 +26770,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/doc61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25320,6 +26782,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/doc62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25331,6 +26794,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/doc63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25342,6 +26806,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/doc64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25353,6 +26818,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/doc65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25364,6 +26830,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/doc66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25375,6 +26842,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/doc67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25386,6 +26854,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/doc68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25397,6 +26866,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/doc69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25508,6 +26978,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25519,6 +26990,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/doc71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25530,6 +27002,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/doc72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25541,6 +27014,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/doc73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25552,6 +27026,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/doc74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25563,6 +27038,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/doc75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25574,6 +27050,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/doc76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25585,6 +27062,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/doc77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25596,6 +27074,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/doc78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25607,6 +27086,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/doc79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25718,6 +27198,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25729,6 +27210,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/doc81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25740,6 +27222,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/doc82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25751,6 +27234,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/doc83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25762,6 +27246,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/doc84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25773,6 +27258,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/doc85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25784,6 +27270,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/doc86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25795,6 +27282,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/doc87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25806,6 +27294,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/doc88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25817,6 +27306,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/doc89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25928,6 +27418,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25939,6 +27430,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/doc91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25950,6 +27442,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/doc92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25961,6 +27454,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/doc93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25972,6 +27466,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/doc94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25983,6 +27478,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/doc95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -25994,6 +27490,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/doc96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26005,6 +27502,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/doc97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26016,6 +27514,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/doc98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26027,6 +27526,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/doc99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26138,6 +27638,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26149,6 +27650,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26160,6 +27662,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26171,6 +27674,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/doc3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26182,6 +27686,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/doc4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26193,6 +27698,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/doc5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26204,6 +27710,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/doc6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26215,6 +27722,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/doc7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26226,6 +27734,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/doc8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26237,6 +27746,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/doc9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26348,6 +27858,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26359,6 +27870,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/doc11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26370,6 +27882,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/doc12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26381,6 +27894,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/doc13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26392,6 +27906,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/doc14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26403,6 +27918,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/doc15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26414,6 +27930,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/doc16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26425,6 +27942,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/doc17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26436,6 +27954,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/doc18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26447,6 +27966,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/doc19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26558,6 +28078,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26569,6 +28090,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/doc21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26580,6 +28102,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/doc22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26591,6 +28114,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/doc23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26602,6 +28126,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/doc24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26613,6 +28138,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/doc25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26624,6 +28150,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/doc26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26635,6 +28162,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/doc27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26646,6 +28174,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/doc28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26657,6 +28186,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/doc29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26768,6 +28298,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26779,6 +28310,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/doc31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26790,6 +28322,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/doc32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26801,6 +28334,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/doc33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26812,6 +28346,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/doc34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26823,6 +28358,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/doc35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26834,6 +28370,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/doc36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26845,6 +28382,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/doc37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26856,6 +28394,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/doc38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26867,6 +28406,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/doc39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26978,6 +28518,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -26989,6 +28530,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/doc41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27000,6 +28542,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/doc42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27011,6 +28554,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/doc43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27022,6 +28566,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/doc44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27033,6 +28578,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/doc45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27044,6 +28590,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/doc46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27055,6 +28602,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/doc47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27066,6 +28614,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/doc48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27077,6 +28626,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/doc49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27188,6 +28738,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27199,6 +28750,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/doc51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27210,6 +28762,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/doc52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27221,6 +28774,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/doc53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27232,6 +28786,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/doc54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27243,6 +28798,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/doc55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27254,6 +28810,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/doc56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27265,6 +28822,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/doc57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27276,6 +28834,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/doc58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27287,6 +28846,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/doc59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27398,6 +28958,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27409,6 +28970,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/doc61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27420,6 +28982,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/doc62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27431,6 +28994,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/doc63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27442,6 +29006,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/doc64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27453,6 +29018,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/doc65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27464,6 +29030,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/doc66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27475,6 +29042,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/doc67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27486,6 +29054,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/doc68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27497,6 +29066,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/doc69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27608,6 +29178,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27619,6 +29190,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/doc71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27630,6 +29202,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/doc72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27641,6 +29214,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/doc73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27652,6 +29226,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/doc74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27663,6 +29238,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/doc75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27674,6 +29250,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/doc76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27685,6 +29262,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/doc77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27696,6 +29274,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/doc78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27707,6 +29286,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/doc79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27818,6 +29398,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27829,6 +29410,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/doc81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27840,6 +29422,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/doc82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27851,6 +29434,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/doc83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27862,6 +29446,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/doc84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27873,6 +29458,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/doc85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27884,6 +29470,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/doc86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27895,6 +29482,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/doc87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27906,6 +29494,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/doc88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -27917,6 +29506,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/doc89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28028,6 +29618,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28039,6 +29630,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/doc91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28050,6 +29642,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/doc92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28061,6 +29654,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/doc93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28072,6 +29666,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/doc94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28083,6 +29678,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/doc95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28094,6 +29690,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/doc96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28105,6 +29702,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/doc97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28116,6 +29714,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/doc98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28127,6 +29726,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/doc99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28238,6 +29838,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28249,6 +29850,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28260,6 +29862,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28271,6 +29874,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/doc3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28282,6 +29886,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/doc4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28293,6 +29898,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/doc5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28304,6 +29910,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/doc6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28315,6 +29922,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/doc7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28326,6 +29934,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/doc8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28337,6 +29946,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/doc9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28448,6 +30058,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28459,6 +30070,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/doc11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28470,6 +30082,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/doc12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28481,6 +30094,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/doc13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28492,6 +30106,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/doc14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28503,6 +30118,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/doc15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28514,6 +30130,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/doc16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28525,6 +30142,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/doc17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28536,6 +30154,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/doc18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28547,6 +30166,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/doc19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28658,6 +30278,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28669,6 +30290,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/doc21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28680,6 +30302,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/doc22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28691,6 +30314,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/doc23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28702,6 +30326,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/doc24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28713,6 +30338,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/doc25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28724,6 +30350,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/doc26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28735,6 +30362,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/doc27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28746,6 +30374,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/doc28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28757,6 +30386,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/doc29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28868,6 +30498,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28879,6 +30510,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/doc31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28890,6 +30522,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/doc32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28901,6 +30534,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/doc33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28912,6 +30546,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/doc34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28923,6 +30558,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/doc35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28934,6 +30570,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/doc36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28945,6 +30582,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/doc37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28956,6 +30594,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/doc38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -28967,6 +30606,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/doc39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29078,6 +30718,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29089,6 +30730,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/doc41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29100,6 +30742,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/doc42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29111,6 +30754,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/doc43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29122,6 +30766,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/doc44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29133,6 +30778,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/doc45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29144,6 +30790,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/doc46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29155,6 +30802,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/doc47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29166,6 +30814,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/doc48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29177,6 +30826,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/doc49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29288,6 +30938,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29299,6 +30950,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/doc51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29310,6 +30962,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/doc52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29321,6 +30974,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/doc53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29332,6 +30986,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/doc54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29343,6 +30998,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/doc55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29354,6 +31010,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/doc56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29365,6 +31022,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/doc57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29376,6 +31034,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/doc58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29387,6 +31046,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/doc59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29498,6 +31158,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29509,6 +31170,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/doc61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29520,6 +31182,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/doc62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29531,6 +31194,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/doc63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29542,6 +31206,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/doc64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29553,6 +31218,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/doc65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29564,6 +31230,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/doc66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29575,6 +31242,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/doc67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29586,6 +31254,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/doc68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29597,6 +31266,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/doc69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29708,6 +31378,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29719,6 +31390,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/doc71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29730,6 +31402,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/doc72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29741,6 +31414,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/doc73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29752,6 +31426,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/doc74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29763,6 +31438,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/doc75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29774,6 +31450,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/doc76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29785,6 +31462,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/doc77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29796,6 +31474,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/doc78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29807,6 +31486,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/doc79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29918,6 +31598,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29929,6 +31610,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/doc81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29940,6 +31622,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/doc82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29951,6 +31634,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/doc83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29962,6 +31646,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/doc84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29973,6 +31658,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/doc85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29984,6 +31670,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/doc86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -29995,6 +31682,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/doc87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30006,6 +31694,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/doc88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30017,6 +31706,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/doc89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30128,6 +31818,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30139,6 +31830,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/doc91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30150,6 +31842,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/doc92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30161,6 +31854,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/doc93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30172,6 +31866,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/doc94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30183,6 +31878,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/doc95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30194,6 +31890,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/doc96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30205,6 +31902,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/doc97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30216,6 +31914,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/doc98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30227,6 +31926,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/doc99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30338,6 +32038,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30349,6 +32050,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30360,6 +32062,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30371,6 +32074,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/doc3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30382,6 +32086,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/doc4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30393,6 +32098,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/doc5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30404,6 +32110,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/doc6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30415,6 +32122,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/doc7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30426,6 +32134,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/doc8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30437,6 +32146,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/doc9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30548,6 +32258,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30559,6 +32270,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/doc11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30570,6 +32282,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/doc12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30581,6 +32294,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/doc13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30592,6 +32306,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/doc14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30603,6 +32318,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/doc15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30614,6 +32330,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/doc16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30625,6 +32342,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/doc17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30636,6 +32354,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/doc18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30647,6 +32366,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/doc19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30758,6 +32478,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30769,6 +32490,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/doc21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30780,6 +32502,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/doc22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30791,6 +32514,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/doc23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30802,6 +32526,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/doc24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30813,6 +32538,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/doc25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30824,6 +32550,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/doc26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30835,6 +32562,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/doc27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30846,6 +32574,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/doc28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30857,6 +32586,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/doc29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30968,6 +32698,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30979,6 +32710,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/doc31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -30990,6 +32722,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/doc32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31001,6 +32734,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/doc33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31012,6 +32746,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/doc34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31023,6 +32758,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/doc35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31034,6 +32770,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/doc36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31045,6 +32782,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/doc37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31056,6 +32794,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/doc38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31067,6 +32806,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/doc39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31178,6 +32918,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31189,6 +32930,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/doc41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31200,6 +32942,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/doc42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31211,6 +32954,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/doc43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31222,6 +32966,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/doc44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31233,6 +32978,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/doc45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31244,6 +32990,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/doc46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31255,6 +33002,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/doc47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31266,6 +33014,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/doc48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31277,6 +33026,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/doc49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31388,6 +33138,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31399,6 +33150,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/doc51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31410,6 +33162,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/doc52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31421,6 +33174,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/doc53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31432,6 +33186,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/doc54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31443,6 +33198,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/doc55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31454,6 +33210,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/doc56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31465,6 +33222,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/doc57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31476,6 +33234,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/doc58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31487,6 +33246,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/doc59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31598,6 +33358,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31609,6 +33370,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/doc61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31620,6 +33382,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/doc62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31631,6 +33394,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/doc63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31642,6 +33406,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/doc64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31653,6 +33418,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/doc65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31664,6 +33430,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/doc66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31675,6 +33442,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/doc67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31686,6 +33454,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/doc68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31697,6 +33466,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/doc69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31808,6 +33578,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31819,6 +33590,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/doc71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31830,6 +33602,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/doc72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31841,6 +33614,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/doc73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31852,6 +33626,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/doc74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31863,6 +33638,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/doc75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31874,6 +33650,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/doc76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31885,6 +33662,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/doc77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31896,6 +33674,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/doc78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -31907,6 +33686,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/doc79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32018,6 +33798,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32029,6 +33810,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/doc81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32040,6 +33822,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/doc82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32051,6 +33834,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/doc83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32062,6 +33846,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/doc84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32073,6 +33858,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/doc85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32084,6 +33870,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/doc86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32095,6 +33882,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/doc87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32106,6 +33894,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/doc88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32117,6 +33906,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/doc89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32228,6 +34018,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32239,6 +34030,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/doc91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32250,6 +34042,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/doc92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32261,6 +34054,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/doc93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32272,6 +34066,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/doc94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32283,6 +34078,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/doc95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32294,6 +34090,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/doc96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32305,6 +34102,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/doc97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32316,6 +34114,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/doc98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32327,6 +34126,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/doc99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32438,6 +34238,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32449,6 +34250,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32460,6 +34262,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32471,6 +34274,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/doc3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32482,6 +34286,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/doc4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32493,6 +34298,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/doc5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32504,6 +34310,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/doc6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32515,6 +34322,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/doc7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32526,6 +34334,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/doc8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32537,6 +34346,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/doc9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32648,6 +34458,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32659,6 +34470,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/doc11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32670,6 +34482,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/doc12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32681,6 +34494,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/doc13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32692,6 +34506,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/doc14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32703,6 +34518,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/doc15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32714,6 +34530,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/doc16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32725,6 +34542,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/doc17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32736,6 +34554,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/doc18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32747,6 +34566,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/doc19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32858,6 +34678,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32869,6 +34690,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/doc21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32880,6 +34702,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/doc22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32891,6 +34714,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/doc23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32902,6 +34726,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/doc24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32913,6 +34738,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/doc25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32924,6 +34750,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/doc26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32935,6 +34762,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/doc27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32946,6 +34774,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/doc28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -32957,6 +34786,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/doc29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33068,6 +34898,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33079,6 +34910,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/doc31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33090,6 +34922,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/doc32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33101,6 +34934,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/doc33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33112,6 +34946,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/doc34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33123,6 +34958,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/doc35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33134,6 +34970,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/doc36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33145,6 +34982,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/doc37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33156,6 +34994,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/doc38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33167,6 +35006,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/doc39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33278,6 +35118,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33289,6 +35130,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/doc41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33300,6 +35142,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/doc42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33311,6 +35154,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/doc43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33322,6 +35166,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/doc44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33333,6 +35178,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/doc45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33344,6 +35190,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/doc46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33355,6 +35202,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/doc47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33366,6 +35214,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/doc48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33377,6 +35226,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/doc49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33488,6 +35338,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33499,6 +35350,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/doc51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33510,6 +35362,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/doc52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33521,6 +35374,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/doc53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33532,6 +35386,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/doc54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33543,6 +35398,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/doc55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33554,6 +35410,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/doc56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33565,6 +35422,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/doc57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33576,6 +35434,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/doc58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33587,6 +35446,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/doc59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33698,6 +35558,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33709,6 +35570,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/doc61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33720,6 +35582,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/doc62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33731,6 +35594,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/doc63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33742,6 +35606,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/doc64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33753,6 +35618,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/doc65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33764,6 +35630,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/doc66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33775,6 +35642,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/doc67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33786,6 +35654,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/doc68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33797,6 +35666,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/doc69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33908,6 +35778,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33919,6 +35790,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/doc71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33930,6 +35802,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/doc72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33941,6 +35814,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/doc73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33952,6 +35826,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/doc74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33963,6 +35838,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/doc75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33974,6 +35850,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/doc76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33985,6 +35862,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/doc77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -33996,6 +35874,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/doc78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34007,6 +35886,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/doc79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34118,6 +35998,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34129,6 +36010,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/doc81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34140,6 +36022,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/doc82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34151,6 +36034,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/doc83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34162,6 +36046,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/doc84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34173,6 +36058,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/doc85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34184,6 +36070,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/doc86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34195,6 +36082,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/doc87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34206,6 +36094,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/doc88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34217,6 +36106,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/doc89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34328,6 +36218,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34339,6 +36230,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/doc91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34350,6 +36242,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/doc92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34361,6 +36254,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/doc93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34372,6 +36266,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/doc94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34383,6 +36278,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/doc95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34394,6 +36290,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/doc96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34405,6 +36302,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/doc97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34416,6 +36314,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/doc98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34427,6 +36326,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/doc99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34538,6 +36438,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34549,6 +36450,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/doc1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34560,6 +36462,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/doc2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34571,6 +36474,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/doc3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34582,6 +36486,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/doc4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34593,6 +36498,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/doc5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34604,6 +36510,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/doc6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34615,6 +36522,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/doc7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34626,6 +36534,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/doc8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34637,6 +36546,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/doc9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34748,6 +36658,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34759,6 +36670,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/doc11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34770,6 +36682,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/doc12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34781,6 +36694,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/doc13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34792,6 +36706,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/doc14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34803,6 +36718,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/doc15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34814,6 +36730,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/doc16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34825,6 +36742,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/doc17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34836,6 +36754,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/doc18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34847,6 +36766,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/doc19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34958,6 +36878,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34969,6 +36890,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/doc21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34980,6 +36902,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/doc22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -34991,6 +36914,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/doc23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35002,6 +36926,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/doc24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35013,6 +36938,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/doc25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35024,6 +36950,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/doc26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35035,6 +36962,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/doc27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35046,6 +36974,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/doc28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35057,6 +36986,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/doc29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35168,6 +37098,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35179,6 +37110,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/doc31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35190,6 +37122,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/doc32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35201,6 +37134,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/doc33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35212,6 +37146,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/doc34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35223,6 +37158,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/doc35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35234,6 +37170,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/doc36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35245,6 +37182,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/doc37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35256,6 +37194,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/doc38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35267,6 +37206,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/doc39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35378,6 +37318,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35389,6 +37330,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/doc41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35400,6 +37342,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/doc42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35411,6 +37354,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/doc43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35422,6 +37366,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/doc44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35433,6 +37378,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/doc45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35444,6 +37390,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/doc46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35455,6 +37402,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/doc47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35466,6 +37414,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/doc48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35477,6 +37426,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/doc49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35588,6 +37538,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35599,6 +37550,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/doc51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35610,6 +37562,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/doc52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35621,6 +37574,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/doc53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35632,6 +37586,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/doc54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35643,6 +37598,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/doc55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35654,6 +37610,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/doc56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35665,6 +37622,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/doc57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35676,6 +37634,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/doc58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35687,6 +37646,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/doc59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35798,6 +37758,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35809,6 +37770,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/doc61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35820,6 +37782,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/doc62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35831,6 +37794,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/doc63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35842,6 +37806,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/doc64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35853,6 +37818,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/doc65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35864,6 +37830,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/doc66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35875,6 +37842,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/doc67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35886,6 +37854,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/doc68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -35897,6 +37866,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/doc69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36008,6 +37978,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36019,6 +37990,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/doc71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36030,6 +38002,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/doc72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36041,6 +38014,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/doc73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36052,6 +38026,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/doc74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36063,6 +38038,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/doc75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36074,6 +38050,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/doc76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36085,6 +38062,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/doc77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36096,6 +38074,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/doc78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36107,6 +38086,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/doc79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36218,6 +38198,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36229,6 +38210,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/doc81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36240,6 +38222,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/doc82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36251,6 +38234,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/doc83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36262,6 +38246,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/doc84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36273,6 +38258,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/doc85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36284,6 +38270,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/doc86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36295,6 +38282,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/doc87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36306,6 +38294,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/doc88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36317,6 +38306,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/doc89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36428,6 +38418,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36439,6 +38430,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/doc91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36450,6 +38442,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/doc92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36461,6 +38454,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/doc93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36472,6 +38466,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/doc94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36483,6 +38478,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/doc95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36494,6 +38490,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/doc96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36505,6 +38502,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/doc97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36516,6 +38514,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/doc98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36527,6 +38526,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/doc99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -36623,7 +38623,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -36856,7 +38856,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -36946,6 +38946,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -36957,6 +38958,7 @@
               "version": 2
             },
             {
+              "createTime": 0,
               "key": "collection/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -36968,6 +38970,7 @@
               "version": 3
             },
             {
+              "createTime": 0,
               "key": "collection/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -36979,6 +38982,7 @@
               "version": 4
             },
             {
+              "createTime": 0,
               "key": "collection/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -36990,6 +38994,7 @@
               "version": 5
             },
             {
+              "createTime": 0,
               "key": "collection/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -37001,6 +39006,7 @@
               "version": 6
             },
             {
+              "createTime": 0,
               "key": "collection/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -37012,6 +39018,7 @@
               "version": 7
             },
             {
+              "createTime": 0,
               "key": "collection/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -37023,6 +39030,7 @@
               "version": 8
             },
             {
+              "createTime": 0,
               "key": "collection/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -37034,6 +39042,7 @@
               "version": 9
             },
             {
+              "createTime": 0,
               "key": "collection/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -37045,6 +39054,7 @@
               "version": 10
             },
             {
+              "createTime": 0,
               "key": "collection/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -37056,6 +39066,7 @@
               "version": 11
             },
             {
+              "createTime": 0,
               "key": "collection/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -37067,6 +39078,7 @@
               "version": 12
             },
             {
+              "createTime": 0,
               "key": "collection/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -37078,6 +39090,7 @@
               "version": 13
             },
             {
+              "createTime": 0,
               "key": "collection/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -37089,6 +39102,7 @@
               "version": 14
             },
             {
+              "createTime": 0,
               "key": "collection/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -37100,6 +39114,7 @@
               "version": 15
             },
             {
+              "createTime": 0,
               "key": "collection/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -37111,6 +39126,7 @@
               "version": 16
             },
             {
+              "createTime": 0,
               "key": "collection/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -37122,6 +39138,7 @@
               "version": 17
             },
             {
+              "createTime": 0,
               "key": "collection/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -37133,6 +39150,7 @@
               "version": 18
             },
             {
+              "createTime": 0,
               "key": "collection/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -37144,6 +39162,7 @@
               "version": 19
             },
             {
+              "createTime": 0,
               "key": "collection/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -37155,6 +39174,7 @@
               "version": 20
             },
             {
+              "createTime": 0,
               "key": "collection/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -37166,6 +39186,7 @@
               "version": 21
             },
             {
+              "createTime": 0,
               "key": "collection/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -37177,6 +39198,7 @@
               "version": 22
             },
             {
+              "createTime": 0,
               "key": "collection/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -37188,6 +39210,7 @@
               "version": 23
             },
             {
+              "createTime": 0,
               "key": "collection/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -37199,6 +39222,7 @@
               "version": 24
             },
             {
+              "createTime": 0,
               "key": "collection/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -37210,6 +39234,7 @@
               "version": 25
             },
             {
+              "createTime": 0,
               "key": "collection/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -37221,6 +39246,7 @@
               "version": 26
             },
             {
+              "createTime": 0,
               "key": "collection/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -37232,6 +39258,7 @@
               "version": 27
             },
             {
+              "createTime": 0,
               "key": "collection/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -37243,6 +39270,7 @@
               "version": 28
             },
             {
+              "createTime": 0,
               "key": "collection/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -37254,6 +39282,7 @@
               "version": 29
             },
             {
+              "createTime": 0,
               "key": "collection/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -37265,6 +39294,7 @@
               "version": 30
             },
             {
+              "createTime": 0,
               "key": "collection/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -37276,6 +39306,7 @@
               "version": 31
             },
             {
+              "createTime": 0,
               "key": "collection/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -37287,6 +39318,7 @@
               "version": 32
             },
             {
+              "createTime": 0,
               "key": "collection/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -37298,6 +39330,7 @@
               "version": 33
             },
             {
+              "createTime": 0,
               "key": "collection/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -37309,6 +39342,7 @@
               "version": 34
             },
             {
+              "createTime": 0,
               "key": "collection/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -37320,6 +39354,7 @@
               "version": 35
             },
             {
+              "createTime": 0,
               "key": "collection/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -37331,6 +39366,7 @@
               "version": 36
             },
             {
+              "createTime": 0,
               "key": "collection/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -37342,6 +39378,7 @@
               "version": 37
             },
             {
+              "createTime": 0,
               "key": "collection/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -37353,6 +39390,7 @@
               "version": 38
             },
             {
+              "createTime": 0,
               "key": "collection/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -37364,6 +39402,7 @@
               "version": 39
             },
             {
+              "createTime": 0,
               "key": "collection/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -37375,6 +39414,7 @@
               "version": 40
             },
             {
+              "createTime": 0,
               "key": "collection/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -37386,6 +39426,7 @@
               "version": 41
             },
             {
+              "createTime": 0,
               "key": "collection/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -37397,6 +39438,7 @@
               "version": 42
             },
             {
+              "createTime": 0,
               "key": "collection/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -37408,6 +39450,7 @@
               "version": 43
             },
             {
+              "createTime": 0,
               "key": "collection/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -37419,6 +39462,7 @@
               "version": 44
             },
             {
+              "createTime": 0,
               "key": "collection/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -37430,6 +39474,7 @@
               "version": 45
             },
             {
+              "createTime": 0,
               "key": "collection/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -37441,6 +39486,7 @@
               "version": 46
             },
             {
+              "createTime": 0,
               "key": "collection/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -37452,6 +39498,7 @@
               "version": 47
             },
             {
+              "createTime": 0,
               "key": "collection/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -37463,6 +39510,7 @@
               "version": 48
             },
             {
+              "createTime": 0,
               "key": "collection/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -37474,6 +39522,7 @@
               "version": 49
             },
             {
+              "createTime": 0,
               "key": "collection/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -37485,6 +39534,7 @@
               "version": 50
             },
             {
+              "createTime": 0,
               "key": "collection/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -37496,6 +39546,7 @@
               "version": 51
             },
             {
+              "createTime": 0,
               "key": "collection/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -37507,6 +39558,7 @@
               "version": 52
             },
             {
+              "createTime": 0,
               "key": "collection/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -37518,6 +39570,7 @@
               "version": 53
             },
             {
+              "createTime": 0,
               "key": "collection/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -37529,6 +39582,7 @@
               "version": 54
             },
             {
+              "createTime": 0,
               "key": "collection/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -37540,6 +39594,7 @@
               "version": 55
             },
             {
+              "createTime": 0,
               "key": "collection/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -37551,6 +39606,7 @@
               "version": 56
             },
             {
+              "createTime": 0,
               "key": "collection/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -37562,6 +39618,7 @@
               "version": 57
             },
             {
+              "createTime": 0,
               "key": "collection/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -37573,6 +39630,7 @@
               "version": 58
             },
             {
+              "createTime": 0,
               "key": "collection/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -37584,6 +39642,7 @@
               "version": 59
             },
             {
+              "createTime": 0,
               "key": "collection/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -37595,6 +39654,7 @@
               "version": 60
             },
             {
+              "createTime": 0,
               "key": "collection/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -37606,6 +39666,7 @@
               "version": 61
             },
             {
+              "createTime": 0,
               "key": "collection/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -37617,6 +39678,7 @@
               "version": 62
             },
             {
+              "createTime": 0,
               "key": "collection/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -37628,6 +39690,7 @@
               "version": 63
             },
             {
+              "createTime": 0,
               "key": "collection/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -37639,6 +39702,7 @@
               "version": 64
             },
             {
+              "createTime": 0,
               "key": "collection/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -37650,6 +39714,7 @@
               "version": 65
             },
             {
+              "createTime": 0,
               "key": "collection/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -37661,6 +39726,7 @@
               "version": 66
             },
             {
+              "createTime": 0,
               "key": "collection/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -37672,6 +39738,7 @@
               "version": 67
             },
             {
+              "createTime": 0,
               "key": "collection/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -37683,6 +39750,7 @@
               "version": 68
             },
             {
+              "createTime": 0,
               "key": "collection/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -37694,6 +39762,7 @@
               "version": 69
             },
             {
+              "createTime": 0,
               "key": "collection/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -37705,6 +39774,7 @@
               "version": 70
             },
             {
+              "createTime": 0,
               "key": "collection/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -37716,6 +39786,7 @@
               "version": 71
             },
             {
+              "createTime": 0,
               "key": "collection/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -37727,6 +39798,7 @@
               "version": 72
             },
             {
+              "createTime": 0,
               "key": "collection/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -37738,6 +39810,7 @@
               "version": 73
             },
             {
+              "createTime": 0,
               "key": "collection/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -37749,6 +39822,7 @@
               "version": 74
             },
             {
+              "createTime": 0,
               "key": "collection/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -37760,6 +39834,7 @@
               "version": 75
             },
             {
+              "createTime": 0,
               "key": "collection/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -37771,6 +39846,7 @@
               "version": 76
             },
             {
+              "createTime": 0,
               "key": "collection/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -37782,6 +39858,7 @@
               "version": 77
             },
             {
+              "createTime": 0,
               "key": "collection/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -37793,6 +39870,7 @@
               "version": 78
             },
             {
+              "createTime": 0,
               "key": "collection/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -37804,6 +39882,7 @@
               "version": 79
             },
             {
+              "createTime": 0,
               "key": "collection/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -37815,6 +39894,7 @@
               "version": 80
             },
             {
+              "createTime": 0,
               "key": "collection/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -37826,6 +39906,7 @@
               "version": 81
             },
             {
+              "createTime": 0,
               "key": "collection/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -37837,6 +39918,7 @@
               "version": 82
             },
             {
+              "createTime": 0,
               "key": "collection/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -37848,6 +39930,7 @@
               "version": 83
             },
             {
+              "createTime": 0,
               "key": "collection/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -37859,6 +39942,7 @@
               "version": 84
             },
             {
+              "createTime": 0,
               "key": "collection/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -37870,6 +39954,7 @@
               "version": 85
             },
             {
+              "createTime": 0,
               "key": "collection/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -37881,6 +39966,7 @@
               "version": 86
             },
             {
+              "createTime": 0,
               "key": "collection/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -37892,6 +39978,7 @@
               "version": 87
             },
             {
+              "createTime": 0,
               "key": "collection/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -37903,6 +39990,7 @@
               "version": 88
             },
             {
+              "createTime": 0,
               "key": "collection/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -37914,6 +40002,7 @@
               "version": 89
             },
             {
+              "createTime": 0,
               "key": "collection/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -37925,6 +40014,7 @@
               "version": 90
             },
             {
+              "createTime": 0,
               "key": "collection/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -37936,6 +40026,7 @@
               "version": 91
             },
             {
+              "createTime": 0,
               "key": "collection/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -37947,6 +40038,7 @@
               "version": 92
             },
             {
+              "createTime": 0,
               "key": "collection/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -37958,6 +40050,7 @@
               "version": 93
             },
             {
+              "createTime": 0,
               "key": "collection/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -37969,6 +40062,7 @@
               "version": 94
             },
             {
+              "createTime": 0,
               "key": "collection/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -37980,6 +40074,7 @@
               "version": 95
             },
             {
+              "createTime": 0,
               "key": "collection/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -37991,6 +40086,7 @@
               "version": 96
             },
             {
+              "createTime": 0,
               "key": "collection/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -38002,6 +40098,7 @@
               "version": 97
             },
             {
+              "createTime": 0,
               "key": "collection/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -38013,6 +40110,7 @@
               "version": 98
             },
             {
+              "createTime": 0,
               "key": "collection/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -38024,6 +40122,7 @@
               "version": 99
             },
             {
+              "createTime": 0,
               "key": "collection/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -38035,6 +40134,7 @@
               "version": 100
             },
             {
+              "createTime": 0,
               "key": "collection/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -38061,6 +40161,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38072,6 +40173,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38083,6 +40185,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38094,6 +40197,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38105,6 +40209,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38116,6 +40221,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38127,6 +40233,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38138,6 +40245,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38149,6 +40257,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38160,6 +40269,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38171,6 +40281,7 @@
                 "version": 11
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38182,6 +40293,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38193,6 +40305,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38204,6 +40317,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38215,6 +40329,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38226,6 +40341,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38237,6 +40353,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38248,6 +40365,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38259,6 +40377,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38270,6 +40389,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38281,6 +40401,7 @@
                 "version": 21
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38292,6 +40413,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38303,6 +40425,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38314,6 +40437,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38325,6 +40449,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38336,6 +40461,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38347,6 +40473,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38358,6 +40485,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38369,6 +40497,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38380,6 +40509,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38391,6 +40521,7 @@
                 "version": 31
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38402,6 +40533,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38413,6 +40545,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38424,6 +40557,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38435,6 +40569,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38446,6 +40581,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38457,6 +40593,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38468,6 +40605,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38479,6 +40617,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38490,6 +40629,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38501,6 +40641,7 @@
                 "version": 41
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38512,6 +40653,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38523,6 +40665,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38534,6 +40677,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38545,6 +40689,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38556,6 +40701,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38567,6 +40713,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38578,6 +40725,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38589,6 +40737,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38600,6 +40749,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38611,6 +40761,7 @@
                 "version": 51
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38622,6 +40773,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38633,6 +40785,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38644,6 +40797,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38655,6 +40809,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38666,6 +40821,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38677,6 +40833,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38688,6 +40845,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38699,6 +40857,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38710,6 +40869,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38721,6 +40881,7 @@
                 "version": 61
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38732,6 +40893,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38743,6 +40905,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38754,6 +40917,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38765,6 +40929,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38776,6 +40941,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38787,6 +40953,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38798,6 +40965,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38809,6 +40977,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38820,6 +40989,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38831,6 +41001,7 @@
                 "version": 71
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38842,6 +41013,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38853,6 +41025,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38864,6 +41037,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38875,6 +41049,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38886,6 +41061,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38897,6 +41073,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38908,6 +41085,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38919,6 +41097,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38930,6 +41109,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38941,6 +41121,7 @@
                 "version": 81
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38952,6 +41133,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38963,6 +41145,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38974,6 +41157,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38985,6 +41169,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -38996,6 +41181,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39007,6 +41193,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39018,6 +41205,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39029,6 +41217,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39040,6 +41229,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39051,6 +41241,7 @@
                 "version": 91
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39062,6 +41253,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39073,6 +41265,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39084,6 +41277,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39095,6 +41289,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39106,6 +41301,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39117,6 +41313,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39128,6 +41325,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39139,6 +41337,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39150,6 +41349,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -39182,6 +41382,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -39193,6 +41394,7 @@
               "version": 103
             },
             {
+              "createTime": 0,
               "key": "collection/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -39204,6 +41406,7 @@
               "version": 104
             },
             {
+              "createTime": 0,
               "key": "collection/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -39215,6 +41418,7 @@
               "version": 105
             },
             {
+              "createTime": 0,
               "key": "collection/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -39226,6 +41430,7 @@
               "version": 106
             },
             {
+              "createTime": 0,
               "key": "collection/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -39237,6 +41442,7 @@
               "version": 107
             },
             {
+              "createTime": 0,
               "key": "collection/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -39248,6 +41454,7 @@
               "version": 108
             },
             {
+              "createTime": 0,
               "key": "collection/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -39259,6 +41466,7 @@
               "version": 109
             },
             {
+              "createTime": 0,
               "key": "collection/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -39270,6 +41478,7 @@
               "version": 110
             },
             {
+              "createTime": 0,
               "key": "collection/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -39281,6 +41490,7 @@
               "version": 111
             },
             {
+              "createTime": 0,
               "key": "collection/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -39292,6 +41502,7 @@
               "version": 112
             },
             {
+              "createTime": 0,
               "key": "collection/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -39303,6 +41514,7 @@
               "version": 113
             },
             {
+              "createTime": 0,
               "key": "collection/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -39314,6 +41526,7 @@
               "version": 114
             },
             {
+              "createTime": 0,
               "key": "collection/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -39325,6 +41538,7 @@
               "version": 115
             },
             {
+              "createTime": 0,
               "key": "collection/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -39336,6 +41550,7 @@
               "version": 116
             },
             {
+              "createTime": 0,
               "key": "collection/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -39347,6 +41562,7 @@
               "version": 117
             },
             {
+              "createTime": 0,
               "key": "collection/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -39358,6 +41574,7 @@
               "version": 118
             },
             {
+              "createTime": 0,
               "key": "collection/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -39369,6 +41586,7 @@
               "version": 119
             },
             {
+              "createTime": 0,
               "key": "collection/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -39380,6 +41598,7 @@
               "version": 120
             },
             {
+              "createTime": 0,
               "key": "collection/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -39391,6 +41610,7 @@
               "version": 121
             },
             {
+              "createTime": 0,
               "key": "collection/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -39402,6 +41622,7 @@
               "version": 122
             },
             {
+              "createTime": 0,
               "key": "collection/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -39413,6 +41634,7 @@
               "version": 123
             },
             {
+              "createTime": 0,
               "key": "collection/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -39424,6 +41646,7 @@
               "version": 124
             },
             {
+              "createTime": 0,
               "key": "collection/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -39435,6 +41658,7 @@
               "version": 125
             },
             {
+              "createTime": 0,
               "key": "collection/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -39446,6 +41670,7 @@
               "version": 126
             },
             {
+              "createTime": 0,
               "key": "collection/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -39457,6 +41682,7 @@
               "version": 127
             },
             {
+              "createTime": 0,
               "key": "collection/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -39468,6 +41694,7 @@
               "version": 128
             },
             {
+              "createTime": 0,
               "key": "collection/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -39479,6 +41706,7 @@
               "version": 129
             },
             {
+              "createTime": 0,
               "key": "collection/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -39490,6 +41718,7 @@
               "version": 130
             },
             {
+              "createTime": 0,
               "key": "collection/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -39501,6 +41730,7 @@
               "version": 131
             },
             {
+              "createTime": 0,
               "key": "collection/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -39512,6 +41742,7 @@
               "version": 132
             },
             {
+              "createTime": 0,
               "key": "collection/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -39523,6 +41754,7 @@
               "version": 133
             },
             {
+              "createTime": 0,
               "key": "collection/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -39534,6 +41766,7 @@
               "version": 134
             },
             {
+              "createTime": 0,
               "key": "collection/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -39545,6 +41778,7 @@
               "version": 135
             },
             {
+              "createTime": 0,
               "key": "collection/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -39556,6 +41790,7 @@
               "version": 136
             },
             {
+              "createTime": 0,
               "key": "collection/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -39567,6 +41802,7 @@
               "version": 137
             },
             {
+              "createTime": 0,
               "key": "collection/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -39578,6 +41814,7 @@
               "version": 138
             },
             {
+              "createTime": 0,
               "key": "collection/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -39589,6 +41826,7 @@
               "version": 139
             },
             {
+              "createTime": 0,
               "key": "collection/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -39600,6 +41838,7 @@
               "version": 140
             },
             {
+              "createTime": 0,
               "key": "collection/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -39611,6 +41850,7 @@
               "version": 141
             },
             {
+              "createTime": 0,
               "key": "collection/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -39622,6 +41862,7 @@
               "version": 142
             },
             {
+              "createTime": 0,
               "key": "collection/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -39633,6 +41874,7 @@
               "version": 143
             },
             {
+              "createTime": 0,
               "key": "collection/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -39644,6 +41886,7 @@
               "version": 144
             },
             {
+              "createTime": 0,
               "key": "collection/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -39655,6 +41898,7 @@
               "version": 145
             },
             {
+              "createTime": 0,
               "key": "collection/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -39666,6 +41910,7 @@
               "version": 146
             },
             {
+              "createTime": 0,
               "key": "collection/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -39677,6 +41922,7 @@
               "version": 147
             },
             {
+              "createTime": 0,
               "key": "collection/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -39688,6 +41934,7 @@
               "version": 148
             },
             {
+              "createTime": 0,
               "key": "collection/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -39699,6 +41946,7 @@
               "version": 149
             },
             {
+              "createTime": 0,
               "key": "collection/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -39710,6 +41958,7 @@
               "version": 150
             },
             {
+              "createTime": 0,
               "key": "collection/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -39721,6 +41970,7 @@
               "version": 151
             },
             {
+              "createTime": 0,
               "key": "collection/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -39732,6 +41982,7 @@
               "version": 152
             },
             {
+              "createTime": 0,
               "key": "collection/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -39743,6 +41994,7 @@
               "version": 153
             },
             {
+              "createTime": 0,
               "key": "collection/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -39754,6 +42006,7 @@
               "version": 154
             },
             {
+              "createTime": 0,
               "key": "collection/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -39765,6 +42018,7 @@
               "version": 155
             },
             {
+              "createTime": 0,
               "key": "collection/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -39776,6 +42030,7 @@
               "version": 156
             },
             {
+              "createTime": 0,
               "key": "collection/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -39787,6 +42042,7 @@
               "version": 157
             },
             {
+              "createTime": 0,
               "key": "collection/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -39798,6 +42054,7 @@
               "version": 158
             },
             {
+              "createTime": 0,
               "key": "collection/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -39809,6 +42066,7 @@
               "version": 159
             },
             {
+              "createTime": 0,
               "key": "collection/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -39820,6 +42078,7 @@
               "version": 160
             },
             {
+              "createTime": 0,
               "key": "collection/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -39831,6 +42090,7 @@
               "version": 161
             },
             {
+              "createTime": 0,
               "key": "collection/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -39842,6 +42102,7 @@
               "version": 162
             },
             {
+              "createTime": 0,
               "key": "collection/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -39853,6 +42114,7 @@
               "version": 163
             },
             {
+              "createTime": 0,
               "key": "collection/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -39864,6 +42126,7 @@
               "version": 164
             },
             {
+              "createTime": 0,
               "key": "collection/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -39875,6 +42138,7 @@
               "version": 165
             },
             {
+              "createTime": 0,
               "key": "collection/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -39886,6 +42150,7 @@
               "version": 166
             },
             {
+              "createTime": 0,
               "key": "collection/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -39897,6 +42162,7 @@
               "version": 167
             },
             {
+              "createTime": 0,
               "key": "collection/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -39908,6 +42174,7 @@
               "version": 168
             },
             {
+              "createTime": 0,
               "key": "collection/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -39919,6 +42186,7 @@
               "version": 169
             },
             {
+              "createTime": 0,
               "key": "collection/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -39930,6 +42198,7 @@
               "version": 170
             },
             {
+              "createTime": 0,
               "key": "collection/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -39941,6 +42210,7 @@
               "version": 171
             },
             {
+              "createTime": 0,
               "key": "collection/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -39952,6 +42222,7 @@
               "version": 172
             },
             {
+              "createTime": 0,
               "key": "collection/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -39963,6 +42234,7 @@
               "version": 173
             },
             {
+              "createTime": 0,
               "key": "collection/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -39974,6 +42246,7 @@
               "version": 174
             },
             {
+              "createTime": 0,
               "key": "collection/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -39985,6 +42258,7 @@
               "version": 175
             },
             {
+              "createTime": 0,
               "key": "collection/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -39996,6 +42270,7 @@
               "version": 176
             },
             {
+              "createTime": 0,
               "key": "collection/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -40007,6 +42282,7 @@
               "version": 177
             },
             {
+              "createTime": 0,
               "key": "collection/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -40018,6 +42294,7 @@
               "version": 178
             },
             {
+              "createTime": 0,
               "key": "collection/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -40029,6 +42306,7 @@
               "version": 179
             },
             {
+              "createTime": 0,
               "key": "collection/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -40040,6 +42318,7 @@
               "version": 180
             },
             {
+              "createTime": 0,
               "key": "collection/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -40051,6 +42330,7 @@
               "version": 181
             },
             {
+              "createTime": 0,
               "key": "collection/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -40062,6 +42342,7 @@
               "version": 182
             },
             {
+              "createTime": 0,
               "key": "collection/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -40073,6 +42354,7 @@
               "version": 183
             },
             {
+              "createTime": 0,
               "key": "collection/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -40084,6 +42366,7 @@
               "version": 184
             },
             {
+              "createTime": 0,
               "key": "collection/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -40095,6 +42378,7 @@
               "version": 185
             },
             {
+              "createTime": 0,
               "key": "collection/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -40106,6 +42390,7 @@
               "version": 186
             },
             {
+              "createTime": 0,
               "key": "collection/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -40117,6 +42402,7 @@
               "version": 187
             },
             {
+              "createTime": 0,
               "key": "collection/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -40128,6 +42414,7 @@
               "version": 188
             },
             {
+              "createTime": 0,
               "key": "collection/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -40139,6 +42426,7 @@
               "version": 189
             },
             {
+              "createTime": 0,
               "key": "collection/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -40150,6 +42438,7 @@
               "version": 190
             },
             {
+              "createTime": 0,
               "key": "collection/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -40161,6 +42450,7 @@
               "version": 191
             },
             {
+              "createTime": 0,
               "key": "collection/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -40172,6 +42462,7 @@
               "version": 192
             },
             {
+              "createTime": 0,
               "key": "collection/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -40183,6 +42474,7 @@
               "version": 193
             },
             {
+              "createTime": 0,
               "key": "collection/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -40194,6 +42486,7 @@
               "version": 194
             },
             {
+              "createTime": 0,
               "key": "collection/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -40205,6 +42498,7 @@
               "version": 195
             },
             {
+              "createTime": 0,
               "key": "collection/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -40216,6 +42510,7 @@
               "version": 196
             },
             {
+              "createTime": 0,
               "key": "collection/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -40227,6 +42522,7 @@
               "version": 197
             },
             {
+              "createTime": 0,
               "key": "collection/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -40238,6 +42534,7 @@
               "version": 198
             },
             {
+              "createTime": 0,
               "key": "collection/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -40249,6 +42546,7 @@
               "version": 199
             },
             {
+              "createTime": 0,
               "key": "collection/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -40260,6 +42558,7 @@
               "version": 200
             },
             {
+              "createTime": 0,
               "key": "collection/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -40271,6 +42570,7 @@
               "version": 201
             },
             {
+              "createTime": 0,
               "key": "collection/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -40300,6 +42600,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40311,6 +42612,7 @@
                 "version": 103
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40322,6 +42624,7 @@
                 "version": 104
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40333,6 +42636,7 @@
                 "version": 105
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40344,6 +42648,7 @@
                 "version": 106
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40355,6 +42660,7 @@
                 "version": 107
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40366,6 +42672,7 @@
                 "version": 108
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40377,6 +42684,7 @@
                 "version": 109
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40388,6 +42696,7 @@
                 "version": 110
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40399,6 +42708,7 @@
                 "version": 111
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40410,6 +42720,7 @@
                 "version": 112
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40421,6 +42732,7 @@
                 "version": 113
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40432,6 +42744,7 @@
                 "version": 114
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40443,6 +42756,7 @@
                 "version": 115
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40454,6 +42768,7 @@
                 "version": 116
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40465,6 +42780,7 @@
                 "version": 117
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40476,6 +42792,7 @@
                 "version": 118
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40487,6 +42804,7 @@
                 "version": 119
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40498,6 +42816,7 @@
                 "version": 120
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40509,6 +42828,7 @@
                 "version": 121
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40520,6 +42840,7 @@
                 "version": 122
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40531,6 +42852,7 @@
                 "version": 123
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40542,6 +42864,7 @@
                 "version": 124
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40553,6 +42876,7 @@
                 "version": 125
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40564,6 +42888,7 @@
                 "version": 126
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40575,6 +42900,7 @@
                 "version": 127
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40586,6 +42912,7 @@
                 "version": 128
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40597,6 +42924,7 @@
                 "version": 129
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40608,6 +42936,7 @@
                 "version": 130
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40619,6 +42948,7 @@
                 "version": 131
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40630,6 +42960,7 @@
                 "version": 132
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40641,6 +42972,7 @@
                 "version": 133
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40652,6 +42984,7 @@
                 "version": 134
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40663,6 +42996,7 @@
                 "version": 135
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40674,6 +43008,7 @@
                 "version": 136
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40685,6 +43020,7 @@
                 "version": 137
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40696,6 +43032,7 @@
                 "version": 138
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40707,6 +43044,7 @@
                 "version": 139
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40718,6 +43056,7 @@
                 "version": 140
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40729,6 +43068,7 @@
                 "version": 141
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40740,6 +43080,7 @@
                 "version": 142
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40751,6 +43092,7 @@
                 "version": 143
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40762,6 +43104,7 @@
                 "version": 144
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40773,6 +43116,7 @@
                 "version": 145
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40784,6 +43128,7 @@
                 "version": 146
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40795,6 +43140,7 @@
                 "version": 147
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40806,6 +43152,7 @@
                 "version": 148
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40817,6 +43164,7 @@
                 "version": 149
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40828,6 +43176,7 @@
                 "version": 150
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40839,6 +43188,7 @@
                 "version": 151
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40850,6 +43200,7 @@
                 "version": 152
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40861,6 +43212,7 @@
                 "version": 153
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40872,6 +43224,7 @@
                 "version": 154
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40883,6 +43236,7 @@
                 "version": 155
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40894,6 +43248,7 @@
                 "version": 156
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40905,6 +43260,7 @@
                 "version": 157
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40916,6 +43272,7 @@
                 "version": 158
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40927,6 +43284,7 @@
                 "version": 159
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40938,6 +43296,7 @@
                 "version": 160
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40949,6 +43308,7 @@
                 "version": 161
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40960,6 +43320,7 @@
                 "version": 162
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40971,6 +43332,7 @@
                 "version": 163
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40982,6 +43344,7 @@
                 "version": 164
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -40993,6 +43356,7 @@
                 "version": 165
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41004,6 +43368,7 @@
                 "version": 166
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41015,6 +43380,7 @@
                 "version": 167
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41026,6 +43392,7 @@
                 "version": 168
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41037,6 +43404,7 @@
                 "version": 169
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41048,6 +43416,7 @@
                 "version": 170
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41059,6 +43428,7 @@
                 "version": 171
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41070,6 +43440,7 @@
                 "version": 172
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41081,6 +43452,7 @@
                 "version": 173
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41092,6 +43464,7 @@
                 "version": 174
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41103,6 +43476,7 @@
                 "version": 175
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41114,6 +43488,7 @@
                 "version": 176
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41125,6 +43500,7 @@
                 "version": 177
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41136,6 +43512,7 @@
                 "version": 178
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41147,6 +43524,7 @@
                 "version": 179
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41158,6 +43536,7 @@
                 "version": 180
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41169,6 +43548,7 @@
                 "version": 181
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41180,6 +43560,7 @@
                 "version": 182
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41191,6 +43572,7 @@
                 "version": 183
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41202,6 +43584,7 @@
                 "version": 184
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41213,6 +43596,7 @@
                 "version": 185
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41224,6 +43608,7 @@
                 "version": 186
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41235,6 +43620,7 @@
                 "version": 187
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41246,6 +43632,7 @@
                 "version": 188
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41257,6 +43644,7 @@
                 "version": 189
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41268,6 +43656,7 @@
                 "version": 190
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41279,6 +43668,7 @@
                 "version": 191
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41290,6 +43680,7 @@
                 "version": 192
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41301,6 +43692,7 @@
                 "version": 193
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41312,6 +43704,7 @@
                 "version": 194
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41323,6 +43716,7 @@
                 "version": 195
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41334,6 +43728,7 @@
                 "version": 196
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41345,6 +43740,7 @@
                 "version": 197
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41356,6 +43752,7 @@
                 "version": 198
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41367,6 +43764,7 @@
                 "version": 199
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41378,6 +43776,7 @@
                 "version": 200
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41389,6 +43788,7 @@
                 "version": 201
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -41418,6 +43818,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -41429,6 +43830,7 @@
               "version": 204
             },
             {
+              "createTime": 0,
               "key": "collection/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -41440,6 +43842,7 @@
               "version": 205
             },
             {
+              "createTime": 0,
               "key": "collection/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -41451,6 +43854,7 @@
               "version": 206
             },
             {
+              "createTime": 0,
               "key": "collection/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -41462,6 +43866,7 @@
               "version": 207
             },
             {
+              "createTime": 0,
               "key": "collection/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -41473,6 +43878,7 @@
               "version": 208
             },
             {
+              "createTime": 0,
               "key": "collection/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -41484,6 +43890,7 @@
               "version": 209
             },
             {
+              "createTime": 0,
               "key": "collection/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -41495,6 +43902,7 @@
               "version": 210
             },
             {
+              "createTime": 0,
               "key": "collection/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -41506,6 +43914,7 @@
               "version": 211
             },
             {
+              "createTime": 0,
               "key": "collection/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -41517,6 +43926,7 @@
               "version": 212
             },
             {
+              "createTime": 0,
               "key": "collection/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -41528,6 +43938,7 @@
               "version": 213
             },
             {
+              "createTime": 0,
               "key": "collection/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -41539,6 +43950,7 @@
               "version": 214
             },
             {
+              "createTime": 0,
               "key": "collection/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -41550,6 +43962,7 @@
               "version": 215
             },
             {
+              "createTime": 0,
               "key": "collection/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -41561,6 +43974,7 @@
               "version": 216
             },
             {
+              "createTime": 0,
               "key": "collection/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -41572,6 +43986,7 @@
               "version": 217
             },
             {
+              "createTime": 0,
               "key": "collection/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -41583,6 +43998,7 @@
               "version": 218
             },
             {
+              "createTime": 0,
               "key": "collection/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -41594,6 +44010,7 @@
               "version": 219
             },
             {
+              "createTime": 0,
               "key": "collection/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -41605,6 +44022,7 @@
               "version": 220
             },
             {
+              "createTime": 0,
               "key": "collection/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -41616,6 +44034,7 @@
               "version": 221
             },
             {
+              "createTime": 0,
               "key": "collection/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -41627,6 +44046,7 @@
               "version": 222
             },
             {
+              "createTime": 0,
               "key": "collection/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -41638,6 +44058,7 @@
               "version": 223
             },
             {
+              "createTime": 0,
               "key": "collection/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -41649,6 +44070,7 @@
               "version": 224
             },
             {
+              "createTime": 0,
               "key": "collection/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -41660,6 +44082,7 @@
               "version": 225
             },
             {
+              "createTime": 0,
               "key": "collection/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -41671,6 +44094,7 @@
               "version": 226
             },
             {
+              "createTime": 0,
               "key": "collection/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -41682,6 +44106,7 @@
               "version": 227
             },
             {
+              "createTime": 0,
               "key": "collection/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -41693,6 +44118,7 @@
               "version": 228
             },
             {
+              "createTime": 0,
               "key": "collection/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -41704,6 +44130,7 @@
               "version": 229
             },
             {
+              "createTime": 0,
               "key": "collection/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -41715,6 +44142,7 @@
               "version": 230
             },
             {
+              "createTime": 0,
               "key": "collection/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -41726,6 +44154,7 @@
               "version": 231
             },
             {
+              "createTime": 0,
               "key": "collection/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -41737,6 +44166,7 @@
               "version": 232
             },
             {
+              "createTime": 0,
               "key": "collection/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -41748,6 +44178,7 @@
               "version": 233
             },
             {
+              "createTime": 0,
               "key": "collection/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -41759,6 +44190,7 @@
               "version": 234
             },
             {
+              "createTime": 0,
               "key": "collection/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -41770,6 +44202,7 @@
               "version": 235
             },
             {
+              "createTime": 0,
               "key": "collection/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -41781,6 +44214,7 @@
               "version": 236
             },
             {
+              "createTime": 0,
               "key": "collection/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -41792,6 +44226,7 @@
               "version": 237
             },
             {
+              "createTime": 0,
               "key": "collection/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -41803,6 +44238,7 @@
               "version": 238
             },
             {
+              "createTime": 0,
               "key": "collection/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -41814,6 +44250,7 @@
               "version": 239
             },
             {
+              "createTime": 0,
               "key": "collection/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -41825,6 +44262,7 @@
               "version": 240
             },
             {
+              "createTime": 0,
               "key": "collection/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -41836,6 +44274,7 @@
               "version": 241
             },
             {
+              "createTime": 0,
               "key": "collection/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -41847,6 +44286,7 @@
               "version": 242
             },
             {
+              "createTime": 0,
               "key": "collection/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -41858,6 +44298,7 @@
               "version": 243
             },
             {
+              "createTime": 0,
               "key": "collection/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -41869,6 +44310,7 @@
               "version": 244
             },
             {
+              "createTime": 0,
               "key": "collection/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -41880,6 +44322,7 @@
               "version": 245
             },
             {
+              "createTime": 0,
               "key": "collection/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -41891,6 +44334,7 @@
               "version": 246
             },
             {
+              "createTime": 0,
               "key": "collection/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -41902,6 +44346,7 @@
               "version": 247
             },
             {
+              "createTime": 0,
               "key": "collection/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -41913,6 +44358,7 @@
               "version": 248
             },
             {
+              "createTime": 0,
               "key": "collection/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -41924,6 +44370,7 @@
               "version": 249
             },
             {
+              "createTime": 0,
               "key": "collection/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -41935,6 +44382,7 @@
               "version": 250
             },
             {
+              "createTime": 0,
               "key": "collection/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -41946,6 +44394,7 @@
               "version": 251
             },
             {
+              "createTime": 0,
               "key": "collection/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -41957,6 +44406,7 @@
               "version": 252
             },
             {
+              "createTime": 0,
               "key": "collection/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -41968,6 +44418,7 @@
               "version": 253
             },
             {
+              "createTime": 0,
               "key": "collection/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -41979,6 +44430,7 @@
               "version": 254
             },
             {
+              "createTime": 0,
               "key": "collection/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -41990,6 +44442,7 @@
               "version": 255
             },
             {
+              "createTime": 0,
               "key": "collection/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -42001,6 +44454,7 @@
               "version": 256
             },
             {
+              "createTime": 0,
               "key": "collection/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -42012,6 +44466,7 @@
               "version": 257
             },
             {
+              "createTime": 0,
               "key": "collection/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -42023,6 +44478,7 @@
               "version": 258
             },
             {
+              "createTime": 0,
               "key": "collection/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -42034,6 +44490,7 @@
               "version": 259
             },
             {
+              "createTime": 0,
               "key": "collection/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -42045,6 +44502,7 @@
               "version": 260
             },
             {
+              "createTime": 0,
               "key": "collection/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -42056,6 +44514,7 @@
               "version": 261
             },
             {
+              "createTime": 0,
               "key": "collection/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -42067,6 +44526,7 @@
               "version": 262
             },
             {
+              "createTime": 0,
               "key": "collection/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -42078,6 +44538,7 @@
               "version": 263
             },
             {
+              "createTime": 0,
               "key": "collection/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -42089,6 +44550,7 @@
               "version": 264
             },
             {
+              "createTime": 0,
               "key": "collection/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -42100,6 +44562,7 @@
               "version": 265
             },
             {
+              "createTime": 0,
               "key": "collection/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -42111,6 +44574,7 @@
               "version": 266
             },
             {
+              "createTime": 0,
               "key": "collection/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -42122,6 +44586,7 @@
               "version": 267
             },
             {
+              "createTime": 0,
               "key": "collection/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -42133,6 +44598,7 @@
               "version": 268
             },
             {
+              "createTime": 0,
               "key": "collection/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -42144,6 +44610,7 @@
               "version": 269
             },
             {
+              "createTime": 0,
               "key": "collection/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -42155,6 +44622,7 @@
               "version": 270
             },
             {
+              "createTime": 0,
               "key": "collection/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -42166,6 +44634,7 @@
               "version": 271
             },
             {
+              "createTime": 0,
               "key": "collection/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -42177,6 +44646,7 @@
               "version": 272
             },
             {
+              "createTime": 0,
               "key": "collection/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -42188,6 +44658,7 @@
               "version": 273
             },
             {
+              "createTime": 0,
               "key": "collection/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -42199,6 +44670,7 @@
               "version": 274
             },
             {
+              "createTime": 0,
               "key": "collection/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -42210,6 +44682,7 @@
               "version": 275
             },
             {
+              "createTime": 0,
               "key": "collection/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -42221,6 +44694,7 @@
               "version": 276
             },
             {
+              "createTime": 0,
               "key": "collection/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -42232,6 +44706,7 @@
               "version": 277
             },
             {
+              "createTime": 0,
               "key": "collection/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -42243,6 +44718,7 @@
               "version": 278
             },
             {
+              "createTime": 0,
               "key": "collection/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -42254,6 +44730,7 @@
               "version": 279
             },
             {
+              "createTime": 0,
               "key": "collection/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -42265,6 +44742,7 @@
               "version": 280
             },
             {
+              "createTime": 0,
               "key": "collection/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -42276,6 +44754,7 @@
               "version": 281
             },
             {
+              "createTime": 0,
               "key": "collection/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -42287,6 +44766,7 @@
               "version": 282
             },
             {
+              "createTime": 0,
               "key": "collection/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -42298,6 +44778,7 @@
               "version": 283
             },
             {
+              "createTime": 0,
               "key": "collection/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -42309,6 +44790,7 @@
               "version": 284
             },
             {
+              "createTime": 0,
               "key": "collection/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -42320,6 +44802,7 @@
               "version": 285
             },
             {
+              "createTime": 0,
               "key": "collection/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -42331,6 +44814,7 @@
               "version": 286
             },
             {
+              "createTime": 0,
               "key": "collection/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -42342,6 +44826,7 @@
               "version": 287
             },
             {
+              "createTime": 0,
               "key": "collection/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -42353,6 +44838,7 @@
               "version": 288
             },
             {
+              "createTime": 0,
               "key": "collection/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -42364,6 +44850,7 @@
               "version": 289
             },
             {
+              "createTime": 0,
               "key": "collection/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -42375,6 +44862,7 @@
               "version": 290
             },
             {
+              "createTime": 0,
               "key": "collection/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -42386,6 +44874,7 @@
               "version": 291
             },
             {
+              "createTime": 0,
               "key": "collection/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -42397,6 +44886,7 @@
               "version": 292
             },
             {
+              "createTime": 0,
               "key": "collection/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -42408,6 +44898,7 @@
               "version": 293
             },
             {
+              "createTime": 0,
               "key": "collection/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -42419,6 +44910,7 @@
               "version": 294
             },
             {
+              "createTime": 0,
               "key": "collection/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -42430,6 +44922,7 @@
               "version": 295
             },
             {
+              "createTime": 0,
               "key": "collection/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -42441,6 +44934,7 @@
               "version": 296
             },
             {
+              "createTime": 0,
               "key": "collection/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -42452,6 +44946,7 @@
               "version": 297
             },
             {
+              "createTime": 0,
               "key": "collection/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -42463,6 +44958,7 @@
               "version": 298
             },
             {
+              "createTime": 0,
               "key": "collection/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -42474,6 +44970,7 @@
               "version": 299
             },
             {
+              "createTime": 0,
               "key": "collection/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -42485,6 +44982,7 @@
               "version": 300
             },
             {
+              "createTime": 0,
               "key": "collection/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -42496,6 +44994,7 @@
               "version": 301
             },
             {
+              "createTime": 0,
               "key": "collection/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -42507,6 +45006,7 @@
               "version": 302
             },
             {
+              "createTime": 0,
               "key": "collection/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -42536,6 +45036,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42547,6 +45048,7 @@
                 "version": 204
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42558,6 +45060,7 @@
                 "version": 205
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42569,6 +45072,7 @@
                 "version": 206
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42580,6 +45084,7 @@
                 "version": 207
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42591,6 +45096,7 @@
                 "version": 208
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42602,6 +45108,7 @@
                 "version": 209
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42613,6 +45120,7 @@
                 "version": 210
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42624,6 +45132,7 @@
                 "version": 211
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42635,6 +45144,7 @@
                 "version": 212
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42646,6 +45156,7 @@
                 "version": 213
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42657,6 +45168,7 @@
                 "version": 214
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42668,6 +45180,7 @@
                 "version": 215
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42679,6 +45192,7 @@
                 "version": 216
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42690,6 +45204,7 @@
                 "version": 217
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42701,6 +45216,7 @@
                 "version": 218
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42712,6 +45228,7 @@
                 "version": 219
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42723,6 +45240,7 @@
                 "version": 220
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42734,6 +45252,7 @@
                 "version": 221
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42745,6 +45264,7 @@
                 "version": 222
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42756,6 +45276,7 @@
                 "version": 223
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42767,6 +45288,7 @@
                 "version": 224
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42778,6 +45300,7 @@
                 "version": 225
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42789,6 +45312,7 @@
                 "version": 226
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42800,6 +45324,7 @@
                 "version": 227
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42811,6 +45336,7 @@
                 "version": 228
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42822,6 +45348,7 @@
                 "version": 229
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42833,6 +45360,7 @@
                 "version": 230
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42844,6 +45372,7 @@
                 "version": 231
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42855,6 +45384,7 @@
                 "version": 232
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42866,6 +45396,7 @@
                 "version": 233
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42877,6 +45408,7 @@
                 "version": 234
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42888,6 +45420,7 @@
                 "version": 235
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42899,6 +45432,7 @@
                 "version": 236
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42910,6 +45444,7 @@
                 "version": 237
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42921,6 +45456,7 @@
                 "version": 238
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42932,6 +45468,7 @@
                 "version": 239
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42943,6 +45480,7 @@
                 "version": 240
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42954,6 +45492,7 @@
                 "version": 241
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42965,6 +45504,7 @@
                 "version": 242
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42976,6 +45516,7 @@
                 "version": 243
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42987,6 +45528,7 @@
                 "version": 244
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -42998,6 +45540,7 @@
                 "version": 245
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43009,6 +45552,7 @@
                 "version": 246
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43020,6 +45564,7 @@
                 "version": 247
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43031,6 +45576,7 @@
                 "version": 248
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43042,6 +45588,7 @@
                 "version": 249
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43053,6 +45600,7 @@
                 "version": 250
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43064,6 +45612,7 @@
                 "version": 251
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43075,6 +45624,7 @@
                 "version": 252
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43086,6 +45636,7 @@
                 "version": 253
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43097,6 +45648,7 @@
                 "version": 254
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43108,6 +45660,7 @@
                 "version": 255
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43119,6 +45672,7 @@
                 "version": 256
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43130,6 +45684,7 @@
                 "version": 257
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43141,6 +45696,7 @@
                 "version": 258
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43152,6 +45708,7 @@
                 "version": 259
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43163,6 +45720,7 @@
                 "version": 260
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43174,6 +45732,7 @@
                 "version": 261
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43185,6 +45744,7 @@
                 "version": 262
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43196,6 +45756,7 @@
                 "version": 263
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43207,6 +45768,7 @@
                 "version": 264
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43218,6 +45780,7 @@
                 "version": 265
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43229,6 +45792,7 @@
                 "version": 266
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43240,6 +45804,7 @@
                 "version": 267
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43251,6 +45816,7 @@
                 "version": 268
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43262,6 +45828,7 @@
                 "version": 269
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43273,6 +45840,7 @@
                 "version": 270
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43284,6 +45852,7 @@
                 "version": 271
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43295,6 +45864,7 @@
                 "version": 272
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43306,6 +45876,7 @@
                 "version": 273
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43317,6 +45888,7 @@
                 "version": 274
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43328,6 +45900,7 @@
                 "version": 275
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43339,6 +45912,7 @@
                 "version": 276
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43350,6 +45924,7 @@
                 "version": 277
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43361,6 +45936,7 @@
                 "version": 278
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43372,6 +45948,7 @@
                 "version": 279
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43383,6 +45960,7 @@
                 "version": 280
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43394,6 +45972,7 @@
                 "version": 281
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43405,6 +45984,7 @@
                 "version": 282
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43416,6 +45996,7 @@
                 "version": 283
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43427,6 +46008,7 @@
                 "version": 284
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43438,6 +46020,7 @@
                 "version": 285
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43449,6 +46032,7 @@
                 "version": 286
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43460,6 +46044,7 @@
                 "version": 287
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43471,6 +46056,7 @@
                 "version": 288
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43482,6 +46068,7 @@
                 "version": 289
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43493,6 +46080,7 @@
                 "version": 290
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43504,6 +46092,7 @@
                 "version": 291
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43515,6 +46104,7 @@
                 "version": 292
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43526,6 +46116,7 @@
                 "version": 293
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43537,6 +46128,7 @@
                 "version": 294
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43548,6 +46140,7 @@
                 "version": 295
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43559,6 +46152,7 @@
                 "version": 296
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43570,6 +46164,7 @@
                 "version": 297
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43581,6 +46176,7 @@
                 "version": 298
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43592,6 +46188,7 @@
                 "version": 299
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43603,6 +46200,7 @@
                 "version": 300
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43614,6 +46212,7 @@
                 "version": 301
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43625,6 +46224,7 @@
                 "version": 302
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -43654,6 +46254,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -43665,6 +46266,7 @@
               "version": 305
             },
             {
+              "createTime": 0,
               "key": "collection/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -43676,6 +46278,7 @@
               "version": 306
             },
             {
+              "createTime": 0,
               "key": "collection/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -43687,6 +46290,7 @@
               "version": 307
             },
             {
+              "createTime": 0,
               "key": "collection/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -43698,6 +46302,7 @@
               "version": 308
             },
             {
+              "createTime": 0,
               "key": "collection/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -43709,6 +46314,7 @@
               "version": 309
             },
             {
+              "createTime": 0,
               "key": "collection/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -43720,6 +46326,7 @@
               "version": 310
             },
             {
+              "createTime": 0,
               "key": "collection/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -43731,6 +46338,7 @@
               "version": 311
             },
             {
+              "createTime": 0,
               "key": "collection/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -43742,6 +46350,7 @@
               "version": 312
             },
             {
+              "createTime": 0,
               "key": "collection/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -43753,6 +46362,7 @@
               "version": 313
             },
             {
+              "createTime": 0,
               "key": "collection/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -43764,6 +46374,7 @@
               "version": 314
             },
             {
+              "createTime": 0,
               "key": "collection/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -43775,6 +46386,7 @@
               "version": 315
             },
             {
+              "createTime": 0,
               "key": "collection/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -43786,6 +46398,7 @@
               "version": 316
             },
             {
+              "createTime": 0,
               "key": "collection/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -43797,6 +46410,7 @@
               "version": 317
             },
             {
+              "createTime": 0,
               "key": "collection/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -43808,6 +46422,7 @@
               "version": 318
             },
             {
+              "createTime": 0,
               "key": "collection/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -43819,6 +46434,7 @@
               "version": 319
             },
             {
+              "createTime": 0,
               "key": "collection/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -43830,6 +46446,7 @@
               "version": 320
             },
             {
+              "createTime": 0,
               "key": "collection/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -43841,6 +46458,7 @@
               "version": 321
             },
             {
+              "createTime": 0,
               "key": "collection/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -43852,6 +46470,7 @@
               "version": 322
             },
             {
+              "createTime": 0,
               "key": "collection/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -43863,6 +46482,7 @@
               "version": 323
             },
             {
+              "createTime": 0,
               "key": "collection/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -43874,6 +46494,7 @@
               "version": 324
             },
             {
+              "createTime": 0,
               "key": "collection/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -43885,6 +46506,7 @@
               "version": 325
             },
             {
+              "createTime": 0,
               "key": "collection/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -43896,6 +46518,7 @@
               "version": 326
             },
             {
+              "createTime": 0,
               "key": "collection/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -43907,6 +46530,7 @@
               "version": 327
             },
             {
+              "createTime": 0,
               "key": "collection/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -43918,6 +46542,7 @@
               "version": 328
             },
             {
+              "createTime": 0,
               "key": "collection/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -43929,6 +46554,7 @@
               "version": 329
             },
             {
+              "createTime": 0,
               "key": "collection/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -43940,6 +46566,7 @@
               "version": 330
             },
             {
+              "createTime": 0,
               "key": "collection/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -43951,6 +46578,7 @@
               "version": 331
             },
             {
+              "createTime": 0,
               "key": "collection/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -43962,6 +46590,7 @@
               "version": 332
             },
             {
+              "createTime": 0,
               "key": "collection/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -43973,6 +46602,7 @@
               "version": 333
             },
             {
+              "createTime": 0,
               "key": "collection/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -43984,6 +46614,7 @@
               "version": 334
             },
             {
+              "createTime": 0,
               "key": "collection/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -43995,6 +46626,7 @@
               "version": 335
             },
             {
+              "createTime": 0,
               "key": "collection/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -44006,6 +46638,7 @@
               "version": 336
             },
             {
+              "createTime": 0,
               "key": "collection/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -44017,6 +46650,7 @@
               "version": 337
             },
             {
+              "createTime": 0,
               "key": "collection/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -44028,6 +46662,7 @@
               "version": 338
             },
             {
+              "createTime": 0,
               "key": "collection/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -44039,6 +46674,7 @@
               "version": 339
             },
             {
+              "createTime": 0,
               "key": "collection/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -44050,6 +46686,7 @@
               "version": 340
             },
             {
+              "createTime": 0,
               "key": "collection/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -44061,6 +46698,7 @@
               "version": 341
             },
             {
+              "createTime": 0,
               "key": "collection/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -44072,6 +46710,7 @@
               "version": 342
             },
             {
+              "createTime": 0,
               "key": "collection/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -44083,6 +46722,7 @@
               "version": 343
             },
             {
+              "createTime": 0,
               "key": "collection/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -44094,6 +46734,7 @@
               "version": 344
             },
             {
+              "createTime": 0,
               "key": "collection/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -44105,6 +46746,7 @@
               "version": 345
             },
             {
+              "createTime": 0,
               "key": "collection/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -44116,6 +46758,7 @@
               "version": 346
             },
             {
+              "createTime": 0,
               "key": "collection/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -44127,6 +46770,7 @@
               "version": 347
             },
             {
+              "createTime": 0,
               "key": "collection/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -44138,6 +46782,7 @@
               "version": 348
             },
             {
+              "createTime": 0,
               "key": "collection/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -44149,6 +46794,7 @@
               "version": 349
             },
             {
+              "createTime": 0,
               "key": "collection/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -44160,6 +46806,7 @@
               "version": 350
             },
             {
+              "createTime": 0,
               "key": "collection/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -44171,6 +46818,7 @@
               "version": 351
             },
             {
+              "createTime": 0,
               "key": "collection/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -44182,6 +46830,7 @@
               "version": 352
             },
             {
+              "createTime": 0,
               "key": "collection/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -44193,6 +46842,7 @@
               "version": 353
             },
             {
+              "createTime": 0,
               "key": "collection/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -44204,6 +46854,7 @@
               "version": 354
             },
             {
+              "createTime": 0,
               "key": "collection/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -44215,6 +46866,7 @@
               "version": 355
             },
             {
+              "createTime": 0,
               "key": "collection/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -44226,6 +46878,7 @@
               "version": 356
             },
             {
+              "createTime": 0,
               "key": "collection/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -44237,6 +46890,7 @@
               "version": 357
             },
             {
+              "createTime": 0,
               "key": "collection/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -44248,6 +46902,7 @@
               "version": 358
             },
             {
+              "createTime": 0,
               "key": "collection/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -44259,6 +46914,7 @@
               "version": 359
             },
             {
+              "createTime": 0,
               "key": "collection/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -44270,6 +46926,7 @@
               "version": 360
             },
             {
+              "createTime": 0,
               "key": "collection/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -44281,6 +46938,7 @@
               "version": 361
             },
             {
+              "createTime": 0,
               "key": "collection/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -44292,6 +46950,7 @@
               "version": 362
             },
             {
+              "createTime": 0,
               "key": "collection/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -44303,6 +46962,7 @@
               "version": 363
             },
             {
+              "createTime": 0,
               "key": "collection/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -44314,6 +46974,7 @@
               "version": 364
             },
             {
+              "createTime": 0,
               "key": "collection/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -44325,6 +46986,7 @@
               "version": 365
             },
             {
+              "createTime": 0,
               "key": "collection/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -44336,6 +46998,7 @@
               "version": 366
             },
             {
+              "createTime": 0,
               "key": "collection/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -44347,6 +47010,7 @@
               "version": 367
             },
             {
+              "createTime": 0,
               "key": "collection/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -44358,6 +47022,7 @@
               "version": 368
             },
             {
+              "createTime": 0,
               "key": "collection/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -44369,6 +47034,7 @@
               "version": 369
             },
             {
+              "createTime": 0,
               "key": "collection/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -44380,6 +47046,7 @@
               "version": 370
             },
             {
+              "createTime": 0,
               "key": "collection/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -44391,6 +47058,7 @@
               "version": 371
             },
             {
+              "createTime": 0,
               "key": "collection/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -44402,6 +47070,7 @@
               "version": 372
             },
             {
+              "createTime": 0,
               "key": "collection/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -44413,6 +47082,7 @@
               "version": 373
             },
             {
+              "createTime": 0,
               "key": "collection/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -44424,6 +47094,7 @@
               "version": 374
             },
             {
+              "createTime": 0,
               "key": "collection/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -44435,6 +47106,7 @@
               "version": 375
             },
             {
+              "createTime": 0,
               "key": "collection/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -44446,6 +47118,7 @@
               "version": 376
             },
             {
+              "createTime": 0,
               "key": "collection/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -44457,6 +47130,7 @@
               "version": 377
             },
             {
+              "createTime": 0,
               "key": "collection/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -44468,6 +47142,7 @@
               "version": 378
             },
             {
+              "createTime": 0,
               "key": "collection/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -44479,6 +47154,7 @@
               "version": 379
             },
             {
+              "createTime": 0,
               "key": "collection/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -44490,6 +47166,7 @@
               "version": 380
             },
             {
+              "createTime": 0,
               "key": "collection/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -44501,6 +47178,7 @@
               "version": 381
             },
             {
+              "createTime": 0,
               "key": "collection/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -44512,6 +47190,7 @@
               "version": 382
             },
             {
+              "createTime": 0,
               "key": "collection/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -44523,6 +47202,7 @@
               "version": 383
             },
             {
+              "createTime": 0,
               "key": "collection/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -44534,6 +47214,7 @@
               "version": 384
             },
             {
+              "createTime": 0,
               "key": "collection/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -44545,6 +47226,7 @@
               "version": 385
             },
             {
+              "createTime": 0,
               "key": "collection/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -44556,6 +47238,7 @@
               "version": 386
             },
             {
+              "createTime": 0,
               "key": "collection/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -44567,6 +47250,7 @@
               "version": 387
             },
             {
+              "createTime": 0,
               "key": "collection/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -44578,6 +47262,7 @@
               "version": 388
             },
             {
+              "createTime": 0,
               "key": "collection/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -44589,6 +47274,7 @@
               "version": 389
             },
             {
+              "createTime": 0,
               "key": "collection/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -44600,6 +47286,7 @@
               "version": 390
             },
             {
+              "createTime": 0,
               "key": "collection/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -44611,6 +47298,7 @@
               "version": 391
             },
             {
+              "createTime": 0,
               "key": "collection/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -44622,6 +47310,7 @@
               "version": 392
             },
             {
+              "createTime": 0,
               "key": "collection/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -44633,6 +47322,7 @@
               "version": 393
             },
             {
+              "createTime": 0,
               "key": "collection/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -44644,6 +47334,7 @@
               "version": 394
             },
             {
+              "createTime": 0,
               "key": "collection/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -44655,6 +47346,7 @@
               "version": 395
             },
             {
+              "createTime": 0,
               "key": "collection/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -44666,6 +47358,7 @@
               "version": 396
             },
             {
+              "createTime": 0,
               "key": "collection/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -44677,6 +47370,7 @@
               "version": 397
             },
             {
+              "createTime": 0,
               "key": "collection/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -44688,6 +47382,7 @@
               "version": 398
             },
             {
+              "createTime": 0,
               "key": "collection/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -44699,6 +47394,7 @@
               "version": 399
             },
             {
+              "createTime": 0,
               "key": "collection/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -44710,6 +47406,7 @@
               "version": 400
             },
             {
+              "createTime": 0,
               "key": "collection/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -44721,6 +47418,7 @@
               "version": 401
             },
             {
+              "createTime": 0,
               "key": "collection/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -44732,6 +47430,7 @@
               "version": 402
             },
             {
+              "createTime": 0,
               "key": "collection/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -44743,6 +47442,7 @@
               "version": 403
             },
             {
+              "createTime": 0,
               "key": "collection/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -44772,6 +47472,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44783,6 +47484,7 @@
                 "version": 305
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44794,6 +47496,7 @@
                 "version": 306
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44805,6 +47508,7 @@
                 "version": 307
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44816,6 +47520,7 @@
                 "version": 308
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44827,6 +47532,7 @@
                 "version": 309
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44838,6 +47544,7 @@
                 "version": 310
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44849,6 +47556,7 @@
                 "version": 311
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44860,6 +47568,7 @@
                 "version": 312
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44871,6 +47580,7 @@
                 "version": 313
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44882,6 +47592,7 @@
                 "version": 314
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44893,6 +47604,7 @@
                 "version": 315
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44904,6 +47616,7 @@
                 "version": 316
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44915,6 +47628,7 @@
                 "version": 317
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44926,6 +47640,7 @@
                 "version": 318
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44937,6 +47652,7 @@
                 "version": 319
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44948,6 +47664,7 @@
                 "version": 320
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44959,6 +47676,7 @@
                 "version": 321
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44970,6 +47688,7 @@
                 "version": 322
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44981,6 +47700,7 @@
                 "version": 323
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -44992,6 +47712,7 @@
                 "version": 324
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45003,6 +47724,7 @@
                 "version": 325
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45014,6 +47736,7 @@
                 "version": 326
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45025,6 +47748,7 @@
                 "version": 327
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45036,6 +47760,7 @@
                 "version": 328
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45047,6 +47772,7 @@
                 "version": 329
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45058,6 +47784,7 @@
                 "version": 330
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45069,6 +47796,7 @@
                 "version": 331
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45080,6 +47808,7 @@
                 "version": 332
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45091,6 +47820,7 @@
                 "version": 333
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45102,6 +47832,7 @@
                 "version": 334
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45113,6 +47844,7 @@
                 "version": 335
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45124,6 +47856,7 @@
                 "version": 336
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45135,6 +47868,7 @@
                 "version": 337
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45146,6 +47880,7 @@
                 "version": 338
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45157,6 +47892,7 @@
                 "version": 339
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45168,6 +47904,7 @@
                 "version": 340
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45179,6 +47916,7 @@
                 "version": 341
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45190,6 +47928,7 @@
                 "version": 342
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45201,6 +47940,7 @@
                 "version": 343
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45212,6 +47952,7 @@
                 "version": 344
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45223,6 +47964,7 @@
                 "version": 345
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45234,6 +47976,7 @@
                 "version": 346
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45245,6 +47988,7 @@
                 "version": 347
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45256,6 +48000,7 @@
                 "version": 348
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45267,6 +48012,7 @@
                 "version": 349
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45278,6 +48024,7 @@
                 "version": 350
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45289,6 +48036,7 @@
                 "version": 351
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45300,6 +48048,7 @@
                 "version": 352
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45311,6 +48060,7 @@
                 "version": 353
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45322,6 +48072,7 @@
                 "version": 354
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45333,6 +48084,7 @@
                 "version": 355
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45344,6 +48096,7 @@
                 "version": 356
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45355,6 +48108,7 @@
                 "version": 357
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45366,6 +48120,7 @@
                 "version": 358
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45377,6 +48132,7 @@
                 "version": 359
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45388,6 +48144,7 @@
                 "version": 360
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45399,6 +48156,7 @@
                 "version": 361
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45410,6 +48168,7 @@
                 "version": 362
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45421,6 +48180,7 @@
                 "version": 363
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45432,6 +48192,7 @@
                 "version": 364
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45443,6 +48204,7 @@
                 "version": 365
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45454,6 +48216,7 @@
                 "version": 366
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45465,6 +48228,7 @@
                 "version": 367
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45476,6 +48240,7 @@
                 "version": 368
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45487,6 +48252,7 @@
                 "version": 369
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45498,6 +48264,7 @@
                 "version": 370
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45509,6 +48276,7 @@
                 "version": 371
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45520,6 +48288,7 @@
                 "version": 372
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45531,6 +48300,7 @@
                 "version": 373
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45542,6 +48312,7 @@
                 "version": 374
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45553,6 +48324,7 @@
                 "version": 375
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45564,6 +48336,7 @@
                 "version": 376
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45575,6 +48348,7 @@
                 "version": 377
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45586,6 +48360,7 @@
                 "version": 378
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45597,6 +48372,7 @@
                 "version": 379
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45608,6 +48384,7 @@
                 "version": 380
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45619,6 +48396,7 @@
                 "version": 381
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45630,6 +48408,7 @@
                 "version": 382
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45641,6 +48420,7 @@
                 "version": 383
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45652,6 +48432,7 @@
                 "version": 384
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45663,6 +48444,7 @@
                 "version": 385
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45674,6 +48456,7 @@
                 "version": 386
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45685,6 +48468,7 @@
                 "version": 387
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45696,6 +48480,7 @@
                 "version": 388
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45707,6 +48492,7 @@
                 "version": 389
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45718,6 +48504,7 @@
                 "version": 390
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45729,6 +48516,7 @@
                 "version": 391
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45740,6 +48528,7 @@
                 "version": 392
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45751,6 +48540,7 @@
                 "version": 393
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45762,6 +48552,7 @@
                 "version": 394
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45773,6 +48564,7 @@
                 "version": 395
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45784,6 +48576,7 @@
                 "version": 396
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45795,6 +48588,7 @@
                 "version": 397
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45806,6 +48600,7 @@
                 "version": 398
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45817,6 +48612,7 @@
                 "version": 399
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45828,6 +48624,7 @@
                 "version": 400
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45839,6 +48636,7 @@
                 "version": 401
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45850,6 +48648,7 @@
                 "version": 402
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45861,6 +48660,7 @@
                 "version": 403
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -45890,6 +48690,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -45901,6 +48702,7 @@
               "version": 406
             },
             {
+              "createTime": 0,
               "key": "collection/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -45912,6 +48714,7 @@
               "version": 407
             },
             {
+              "createTime": 0,
               "key": "collection/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -45923,6 +48726,7 @@
               "version": 408
             },
             {
+              "createTime": 0,
               "key": "collection/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -45934,6 +48738,7 @@
               "version": 409
             },
             {
+              "createTime": 0,
               "key": "collection/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -45945,6 +48750,7 @@
               "version": 410
             },
             {
+              "createTime": 0,
               "key": "collection/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -45956,6 +48762,7 @@
               "version": 411
             },
             {
+              "createTime": 0,
               "key": "collection/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -45967,6 +48774,7 @@
               "version": 412
             },
             {
+              "createTime": 0,
               "key": "collection/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -45978,6 +48786,7 @@
               "version": 413
             },
             {
+              "createTime": 0,
               "key": "collection/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -45989,6 +48798,7 @@
               "version": 414
             },
             {
+              "createTime": 0,
               "key": "collection/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -46000,6 +48810,7 @@
               "version": 415
             },
             {
+              "createTime": 0,
               "key": "collection/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -46011,6 +48822,7 @@
               "version": 416
             },
             {
+              "createTime": 0,
               "key": "collection/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -46022,6 +48834,7 @@
               "version": 417
             },
             {
+              "createTime": 0,
               "key": "collection/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -46033,6 +48846,7 @@
               "version": 418
             },
             {
+              "createTime": 0,
               "key": "collection/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -46044,6 +48858,7 @@
               "version": 419
             },
             {
+              "createTime": 0,
               "key": "collection/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -46055,6 +48870,7 @@
               "version": 420
             },
             {
+              "createTime": 0,
               "key": "collection/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -46066,6 +48882,7 @@
               "version": 421
             },
             {
+              "createTime": 0,
               "key": "collection/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -46077,6 +48894,7 @@
               "version": 422
             },
             {
+              "createTime": 0,
               "key": "collection/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -46088,6 +48906,7 @@
               "version": 423
             },
             {
+              "createTime": 0,
               "key": "collection/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -46099,6 +48918,7 @@
               "version": 424
             },
             {
+              "createTime": 0,
               "key": "collection/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -46110,6 +48930,7 @@
               "version": 425
             },
             {
+              "createTime": 0,
               "key": "collection/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -46121,6 +48942,7 @@
               "version": 426
             },
             {
+              "createTime": 0,
               "key": "collection/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -46132,6 +48954,7 @@
               "version": 427
             },
             {
+              "createTime": 0,
               "key": "collection/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -46143,6 +48966,7 @@
               "version": 428
             },
             {
+              "createTime": 0,
               "key": "collection/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -46154,6 +48978,7 @@
               "version": 429
             },
             {
+              "createTime": 0,
               "key": "collection/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -46165,6 +48990,7 @@
               "version": 430
             },
             {
+              "createTime": 0,
               "key": "collection/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -46176,6 +49002,7 @@
               "version": 431
             },
             {
+              "createTime": 0,
               "key": "collection/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -46187,6 +49014,7 @@
               "version": 432
             },
             {
+              "createTime": 0,
               "key": "collection/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -46198,6 +49026,7 @@
               "version": 433
             },
             {
+              "createTime": 0,
               "key": "collection/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -46209,6 +49038,7 @@
               "version": 434
             },
             {
+              "createTime": 0,
               "key": "collection/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -46220,6 +49050,7 @@
               "version": 435
             },
             {
+              "createTime": 0,
               "key": "collection/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -46231,6 +49062,7 @@
               "version": 436
             },
             {
+              "createTime": 0,
               "key": "collection/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -46242,6 +49074,7 @@
               "version": 437
             },
             {
+              "createTime": 0,
               "key": "collection/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -46253,6 +49086,7 @@
               "version": 438
             },
             {
+              "createTime": 0,
               "key": "collection/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -46264,6 +49098,7 @@
               "version": 439
             },
             {
+              "createTime": 0,
               "key": "collection/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -46275,6 +49110,7 @@
               "version": 440
             },
             {
+              "createTime": 0,
               "key": "collection/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -46286,6 +49122,7 @@
               "version": 441
             },
             {
+              "createTime": 0,
               "key": "collection/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -46297,6 +49134,7 @@
               "version": 442
             },
             {
+              "createTime": 0,
               "key": "collection/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -46308,6 +49146,7 @@
               "version": 443
             },
             {
+              "createTime": 0,
               "key": "collection/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -46319,6 +49158,7 @@
               "version": 444
             },
             {
+              "createTime": 0,
               "key": "collection/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -46330,6 +49170,7 @@
               "version": 445
             },
             {
+              "createTime": 0,
               "key": "collection/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -46341,6 +49182,7 @@
               "version": 446
             },
             {
+              "createTime": 0,
               "key": "collection/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -46352,6 +49194,7 @@
               "version": 447
             },
             {
+              "createTime": 0,
               "key": "collection/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -46363,6 +49206,7 @@
               "version": 448
             },
             {
+              "createTime": 0,
               "key": "collection/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -46374,6 +49218,7 @@
               "version": 449
             },
             {
+              "createTime": 0,
               "key": "collection/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -46385,6 +49230,7 @@
               "version": 450
             },
             {
+              "createTime": 0,
               "key": "collection/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -46396,6 +49242,7 @@
               "version": 451
             },
             {
+              "createTime": 0,
               "key": "collection/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -46407,6 +49254,7 @@
               "version": 452
             },
             {
+              "createTime": 0,
               "key": "collection/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -46418,6 +49266,7 @@
               "version": 453
             },
             {
+              "createTime": 0,
               "key": "collection/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -46429,6 +49278,7 @@
               "version": 454
             },
             {
+              "createTime": 0,
               "key": "collection/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -46440,6 +49290,7 @@
               "version": 455
             },
             {
+              "createTime": 0,
               "key": "collection/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -46451,6 +49302,7 @@
               "version": 456
             },
             {
+              "createTime": 0,
               "key": "collection/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -46462,6 +49314,7 @@
               "version": 457
             },
             {
+              "createTime": 0,
               "key": "collection/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -46473,6 +49326,7 @@
               "version": 458
             },
             {
+              "createTime": 0,
               "key": "collection/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -46484,6 +49338,7 @@
               "version": 459
             },
             {
+              "createTime": 0,
               "key": "collection/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -46495,6 +49350,7 @@
               "version": 460
             },
             {
+              "createTime": 0,
               "key": "collection/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -46506,6 +49362,7 @@
               "version": 461
             },
             {
+              "createTime": 0,
               "key": "collection/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -46517,6 +49374,7 @@
               "version": 462
             },
             {
+              "createTime": 0,
               "key": "collection/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -46528,6 +49386,7 @@
               "version": 463
             },
             {
+              "createTime": 0,
               "key": "collection/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -46539,6 +49398,7 @@
               "version": 464
             },
             {
+              "createTime": 0,
               "key": "collection/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -46550,6 +49410,7 @@
               "version": 465
             },
             {
+              "createTime": 0,
               "key": "collection/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -46561,6 +49422,7 @@
               "version": 466
             },
             {
+              "createTime": 0,
               "key": "collection/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -46572,6 +49434,7 @@
               "version": 467
             },
             {
+              "createTime": 0,
               "key": "collection/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -46583,6 +49446,7 @@
               "version": 468
             },
             {
+              "createTime": 0,
               "key": "collection/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -46594,6 +49458,7 @@
               "version": 469
             },
             {
+              "createTime": 0,
               "key": "collection/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -46605,6 +49470,7 @@
               "version": 470
             },
             {
+              "createTime": 0,
               "key": "collection/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -46616,6 +49482,7 @@
               "version": 471
             },
             {
+              "createTime": 0,
               "key": "collection/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -46627,6 +49494,7 @@
               "version": 472
             },
             {
+              "createTime": 0,
               "key": "collection/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -46638,6 +49506,7 @@
               "version": 473
             },
             {
+              "createTime": 0,
               "key": "collection/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -46649,6 +49518,7 @@
               "version": 474
             },
             {
+              "createTime": 0,
               "key": "collection/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -46660,6 +49530,7 @@
               "version": 475
             },
             {
+              "createTime": 0,
               "key": "collection/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -46671,6 +49542,7 @@
               "version": 476
             },
             {
+              "createTime": 0,
               "key": "collection/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -46682,6 +49554,7 @@
               "version": 477
             },
             {
+              "createTime": 0,
               "key": "collection/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -46693,6 +49566,7 @@
               "version": 478
             },
             {
+              "createTime": 0,
               "key": "collection/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -46704,6 +49578,7 @@
               "version": 479
             },
             {
+              "createTime": 0,
               "key": "collection/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -46715,6 +49590,7 @@
               "version": 480
             },
             {
+              "createTime": 0,
               "key": "collection/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -46726,6 +49602,7 @@
               "version": 481
             },
             {
+              "createTime": 0,
               "key": "collection/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -46737,6 +49614,7 @@
               "version": 482
             },
             {
+              "createTime": 0,
               "key": "collection/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -46748,6 +49626,7 @@
               "version": 483
             },
             {
+              "createTime": 0,
               "key": "collection/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -46759,6 +49638,7 @@
               "version": 484
             },
             {
+              "createTime": 0,
               "key": "collection/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -46770,6 +49650,7 @@
               "version": 485
             },
             {
+              "createTime": 0,
               "key": "collection/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -46781,6 +49662,7 @@
               "version": 486
             },
             {
+              "createTime": 0,
               "key": "collection/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -46792,6 +49674,7 @@
               "version": 487
             },
             {
+              "createTime": 0,
               "key": "collection/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -46803,6 +49686,7 @@
               "version": 488
             },
             {
+              "createTime": 0,
               "key": "collection/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -46814,6 +49698,7 @@
               "version": 489
             },
             {
+              "createTime": 0,
               "key": "collection/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -46825,6 +49710,7 @@
               "version": 490
             },
             {
+              "createTime": 0,
               "key": "collection/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -46836,6 +49722,7 @@
               "version": 491
             },
             {
+              "createTime": 0,
               "key": "collection/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -46847,6 +49734,7 @@
               "version": 492
             },
             {
+              "createTime": 0,
               "key": "collection/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -46858,6 +49746,7 @@
               "version": 493
             },
             {
+              "createTime": 0,
               "key": "collection/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -46869,6 +49758,7 @@
               "version": 494
             },
             {
+              "createTime": 0,
               "key": "collection/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -46880,6 +49770,7 @@
               "version": 495
             },
             {
+              "createTime": 0,
               "key": "collection/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -46891,6 +49782,7 @@
               "version": 496
             },
             {
+              "createTime": 0,
               "key": "collection/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -46902,6 +49794,7 @@
               "version": 497
             },
             {
+              "createTime": 0,
               "key": "collection/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -46913,6 +49806,7 @@
               "version": 498
             },
             {
+              "createTime": 0,
               "key": "collection/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -46924,6 +49818,7 @@
               "version": 499
             },
             {
+              "createTime": 0,
               "key": "collection/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -46935,6 +49830,7 @@
               "version": 500
             },
             {
+              "createTime": 0,
               "key": "collection/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -46946,6 +49842,7 @@
               "version": 501
             },
             {
+              "createTime": 0,
               "key": "collection/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -46957,6 +49854,7 @@
               "version": 502
             },
             {
+              "createTime": 0,
               "key": "collection/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -46968,6 +49866,7 @@
               "version": 503
             },
             {
+              "createTime": 0,
               "key": "collection/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -46979,6 +49878,7 @@
               "version": 504
             },
             {
+              "createTime": 0,
               "key": "collection/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -47008,6 +49908,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47019,6 +49920,7 @@
                 "version": 406
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47030,6 +49932,7 @@
                 "version": 407
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47041,6 +49944,7 @@
                 "version": 408
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47052,6 +49956,7 @@
                 "version": 409
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47063,6 +49968,7 @@
                 "version": 410
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47074,6 +49980,7 @@
                 "version": 411
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47085,6 +49992,7 @@
                 "version": 412
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47096,6 +50004,7 @@
                 "version": 413
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47107,6 +50016,7 @@
                 "version": 414
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47118,6 +50028,7 @@
                 "version": 415
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47129,6 +50040,7 @@
                 "version": 416
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47140,6 +50052,7 @@
                 "version": 417
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47151,6 +50064,7 @@
                 "version": 418
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47162,6 +50076,7 @@
                 "version": 419
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47173,6 +50088,7 @@
                 "version": 420
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47184,6 +50100,7 @@
                 "version": 421
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47195,6 +50112,7 @@
                 "version": 422
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47206,6 +50124,7 @@
                 "version": 423
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47217,6 +50136,7 @@
                 "version": 424
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47228,6 +50148,7 @@
                 "version": 425
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47239,6 +50160,7 @@
                 "version": 426
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47250,6 +50172,7 @@
                 "version": 427
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47261,6 +50184,7 @@
                 "version": 428
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47272,6 +50196,7 @@
                 "version": 429
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47283,6 +50208,7 @@
                 "version": 430
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47294,6 +50220,7 @@
                 "version": 431
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47305,6 +50232,7 @@
                 "version": 432
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47316,6 +50244,7 @@
                 "version": 433
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47327,6 +50256,7 @@
                 "version": 434
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47338,6 +50268,7 @@
                 "version": 435
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47349,6 +50280,7 @@
                 "version": 436
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47360,6 +50292,7 @@
                 "version": 437
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47371,6 +50304,7 @@
                 "version": 438
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47382,6 +50316,7 @@
                 "version": 439
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47393,6 +50328,7 @@
                 "version": 440
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47404,6 +50340,7 @@
                 "version": 441
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47415,6 +50352,7 @@
                 "version": 442
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47426,6 +50364,7 @@
                 "version": 443
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47437,6 +50376,7 @@
                 "version": 444
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47448,6 +50388,7 @@
                 "version": 445
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47459,6 +50400,7 @@
                 "version": 446
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47470,6 +50412,7 @@
                 "version": 447
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47481,6 +50424,7 @@
                 "version": 448
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47492,6 +50436,7 @@
                 "version": 449
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47503,6 +50448,7 @@
                 "version": 450
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47514,6 +50460,7 @@
                 "version": 451
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47525,6 +50472,7 @@
                 "version": 452
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47536,6 +50484,7 @@
                 "version": 453
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47547,6 +50496,7 @@
                 "version": 454
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47558,6 +50508,7 @@
                 "version": 455
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47569,6 +50520,7 @@
                 "version": 456
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47580,6 +50532,7 @@
                 "version": 457
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47591,6 +50544,7 @@
                 "version": 458
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47602,6 +50556,7 @@
                 "version": 459
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47613,6 +50568,7 @@
                 "version": 460
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47624,6 +50580,7 @@
                 "version": 461
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47635,6 +50592,7 @@
                 "version": 462
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47646,6 +50604,7 @@
                 "version": 463
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47657,6 +50616,7 @@
                 "version": 464
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47668,6 +50628,7 @@
                 "version": 465
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47679,6 +50640,7 @@
                 "version": 466
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47690,6 +50652,7 @@
                 "version": 467
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47701,6 +50664,7 @@
                 "version": 468
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47712,6 +50676,7 @@
                 "version": 469
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47723,6 +50688,7 @@
                 "version": 470
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47734,6 +50700,7 @@
                 "version": 471
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47745,6 +50712,7 @@
                 "version": 472
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47756,6 +50724,7 @@
                 "version": 473
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47767,6 +50736,7 @@
                 "version": 474
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47778,6 +50748,7 @@
                 "version": 475
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47789,6 +50760,7 @@
                 "version": 476
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47800,6 +50772,7 @@
                 "version": 477
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47811,6 +50784,7 @@
                 "version": 478
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47822,6 +50796,7 @@
                 "version": 479
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47833,6 +50808,7 @@
                 "version": 480
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47844,6 +50820,7 @@
                 "version": 481
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47855,6 +50832,7 @@
                 "version": 482
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47866,6 +50844,7 @@
                 "version": 483
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47877,6 +50856,7 @@
                 "version": 484
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47888,6 +50868,7 @@
                 "version": 485
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47899,6 +50880,7 @@
                 "version": 486
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47910,6 +50892,7 @@
                 "version": 487
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47921,6 +50904,7 @@
                 "version": 488
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47932,6 +50916,7 @@
                 "version": 489
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47943,6 +50928,7 @@
                 "version": 490
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47954,6 +50940,7 @@
                 "version": 491
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47965,6 +50952,7 @@
                 "version": 492
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47976,6 +50964,7 @@
                 "version": 493
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47987,6 +50976,7 @@
                 "version": 494
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -47998,6 +50988,7 @@
                 "version": 495
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -48009,6 +51000,7 @@
                 "version": 496
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -48020,6 +51012,7 @@
                 "version": 497
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -48031,6 +51024,7 @@
                 "version": 498
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -48042,6 +51036,7 @@
                 "version": 499
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -48053,6 +51048,7 @@
                 "version": 500
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -48064,6 +51060,7 @@
                 "version": 501
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -48075,6 +51072,7 @@
                 "version": 502
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -48086,6 +51084,7 @@
                 "version": 503
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -48097,6 +51096,7 @@
                 "version": 504
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -48126,6 +51126,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -48137,6 +51138,7 @@
               "version": 507
             },
             {
+              "createTime": 0,
               "key": "collection/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -48148,6 +51150,7 @@
               "version": 508
             },
             {
+              "createTime": 0,
               "key": "collection/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -48159,6 +51162,7 @@
               "version": 509
             },
             {
+              "createTime": 0,
               "key": "collection/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -48170,6 +51174,7 @@
               "version": 510
             },
             {
+              "createTime": 0,
               "key": "collection/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -48181,6 +51186,7 @@
               "version": 511
             },
             {
+              "createTime": 0,
               "key": "collection/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -48192,6 +51198,7 @@
               "version": 512
             },
             {
+              "createTime": 0,
               "key": "collection/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -48203,6 +51210,7 @@
               "version": 513
             },
             {
+              "createTime": 0,
               "key": "collection/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -48214,6 +51222,7 @@
               "version": 514
             },
             {
+              "createTime": 0,
               "key": "collection/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -48225,6 +51234,7 @@
               "version": 515
             },
             {
+              "createTime": 0,
               "key": "collection/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -48236,6 +51246,7 @@
               "version": 516
             },
             {
+              "createTime": 0,
               "key": "collection/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -48247,6 +51258,7 @@
               "version": 517
             },
             {
+              "createTime": 0,
               "key": "collection/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -48258,6 +51270,7 @@
               "version": 518
             },
             {
+              "createTime": 0,
               "key": "collection/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -48269,6 +51282,7 @@
               "version": 519
             },
             {
+              "createTime": 0,
               "key": "collection/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -48280,6 +51294,7 @@
               "version": 520
             },
             {
+              "createTime": 0,
               "key": "collection/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -48291,6 +51306,7 @@
               "version": 521
             },
             {
+              "createTime": 0,
               "key": "collection/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -48302,6 +51318,7 @@
               "version": 522
             },
             {
+              "createTime": 0,
               "key": "collection/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -48313,6 +51330,7 @@
               "version": 523
             },
             {
+              "createTime": 0,
               "key": "collection/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -48324,6 +51342,7 @@
               "version": 524
             },
             {
+              "createTime": 0,
               "key": "collection/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -48335,6 +51354,7 @@
               "version": 525
             },
             {
+              "createTime": 0,
               "key": "collection/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -48346,6 +51366,7 @@
               "version": 526
             },
             {
+              "createTime": 0,
               "key": "collection/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -48357,6 +51378,7 @@
               "version": 527
             },
             {
+              "createTime": 0,
               "key": "collection/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -48368,6 +51390,7 @@
               "version": 528
             },
             {
+              "createTime": 0,
               "key": "collection/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -48379,6 +51402,7 @@
               "version": 529
             },
             {
+              "createTime": 0,
               "key": "collection/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -48390,6 +51414,7 @@
               "version": 530
             },
             {
+              "createTime": 0,
               "key": "collection/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -48401,6 +51426,7 @@
               "version": 531
             },
             {
+              "createTime": 0,
               "key": "collection/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -48412,6 +51438,7 @@
               "version": 532
             },
             {
+              "createTime": 0,
               "key": "collection/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -48423,6 +51450,7 @@
               "version": 533
             },
             {
+              "createTime": 0,
               "key": "collection/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -48434,6 +51462,7 @@
               "version": 534
             },
             {
+              "createTime": 0,
               "key": "collection/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -48445,6 +51474,7 @@
               "version": 535
             },
             {
+              "createTime": 0,
               "key": "collection/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -48456,6 +51486,7 @@
               "version": 536
             },
             {
+              "createTime": 0,
               "key": "collection/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -48467,6 +51498,7 @@
               "version": 537
             },
             {
+              "createTime": 0,
               "key": "collection/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -48478,6 +51510,7 @@
               "version": 538
             },
             {
+              "createTime": 0,
               "key": "collection/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -48489,6 +51522,7 @@
               "version": 539
             },
             {
+              "createTime": 0,
               "key": "collection/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -48500,6 +51534,7 @@
               "version": 540
             },
             {
+              "createTime": 0,
               "key": "collection/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -48511,6 +51546,7 @@
               "version": 541
             },
             {
+              "createTime": 0,
               "key": "collection/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -48522,6 +51558,7 @@
               "version": 542
             },
             {
+              "createTime": 0,
               "key": "collection/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -48533,6 +51570,7 @@
               "version": 543
             },
             {
+              "createTime": 0,
               "key": "collection/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -48544,6 +51582,7 @@
               "version": 544
             },
             {
+              "createTime": 0,
               "key": "collection/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -48555,6 +51594,7 @@
               "version": 545
             },
             {
+              "createTime": 0,
               "key": "collection/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -48566,6 +51606,7 @@
               "version": 546
             },
             {
+              "createTime": 0,
               "key": "collection/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -48577,6 +51618,7 @@
               "version": 547
             },
             {
+              "createTime": 0,
               "key": "collection/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -48588,6 +51630,7 @@
               "version": 548
             },
             {
+              "createTime": 0,
               "key": "collection/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -48599,6 +51642,7 @@
               "version": 549
             },
             {
+              "createTime": 0,
               "key": "collection/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -48610,6 +51654,7 @@
               "version": 550
             },
             {
+              "createTime": 0,
               "key": "collection/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -48621,6 +51666,7 @@
               "version": 551
             },
             {
+              "createTime": 0,
               "key": "collection/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -48632,6 +51678,7 @@
               "version": 552
             },
             {
+              "createTime": 0,
               "key": "collection/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -48643,6 +51690,7 @@
               "version": 553
             },
             {
+              "createTime": 0,
               "key": "collection/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -48654,6 +51702,7 @@
               "version": 554
             },
             {
+              "createTime": 0,
               "key": "collection/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -48665,6 +51714,7 @@
               "version": 555
             },
             {
+              "createTime": 0,
               "key": "collection/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -48676,6 +51726,7 @@
               "version": 556
             },
             {
+              "createTime": 0,
               "key": "collection/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -48687,6 +51738,7 @@
               "version": 557
             },
             {
+              "createTime": 0,
               "key": "collection/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -48698,6 +51750,7 @@
               "version": 558
             },
             {
+              "createTime": 0,
               "key": "collection/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -48709,6 +51762,7 @@
               "version": 559
             },
             {
+              "createTime": 0,
               "key": "collection/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -48720,6 +51774,7 @@
               "version": 560
             },
             {
+              "createTime": 0,
               "key": "collection/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -48731,6 +51786,7 @@
               "version": 561
             },
             {
+              "createTime": 0,
               "key": "collection/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -48742,6 +51798,7 @@
               "version": 562
             },
             {
+              "createTime": 0,
               "key": "collection/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -48753,6 +51810,7 @@
               "version": 563
             },
             {
+              "createTime": 0,
               "key": "collection/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -48764,6 +51822,7 @@
               "version": 564
             },
             {
+              "createTime": 0,
               "key": "collection/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -48775,6 +51834,7 @@
               "version": 565
             },
             {
+              "createTime": 0,
               "key": "collection/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -48786,6 +51846,7 @@
               "version": 566
             },
             {
+              "createTime": 0,
               "key": "collection/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -48797,6 +51858,7 @@
               "version": 567
             },
             {
+              "createTime": 0,
               "key": "collection/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -48808,6 +51870,7 @@
               "version": 568
             },
             {
+              "createTime": 0,
               "key": "collection/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -48819,6 +51882,7 @@
               "version": 569
             },
             {
+              "createTime": 0,
               "key": "collection/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -48830,6 +51894,7 @@
               "version": 570
             },
             {
+              "createTime": 0,
               "key": "collection/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -48841,6 +51906,7 @@
               "version": 571
             },
             {
+              "createTime": 0,
               "key": "collection/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -48852,6 +51918,7 @@
               "version": 572
             },
             {
+              "createTime": 0,
               "key": "collection/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -48863,6 +51930,7 @@
               "version": 573
             },
             {
+              "createTime": 0,
               "key": "collection/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -48874,6 +51942,7 @@
               "version": 574
             },
             {
+              "createTime": 0,
               "key": "collection/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -48885,6 +51954,7 @@
               "version": 575
             },
             {
+              "createTime": 0,
               "key": "collection/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -48896,6 +51966,7 @@
               "version": 576
             },
             {
+              "createTime": 0,
               "key": "collection/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -48907,6 +51978,7 @@
               "version": 577
             },
             {
+              "createTime": 0,
               "key": "collection/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -48918,6 +51990,7 @@
               "version": 578
             },
             {
+              "createTime": 0,
               "key": "collection/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -48929,6 +52002,7 @@
               "version": 579
             },
             {
+              "createTime": 0,
               "key": "collection/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -48940,6 +52014,7 @@
               "version": 580
             },
             {
+              "createTime": 0,
               "key": "collection/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -48951,6 +52026,7 @@
               "version": 581
             },
             {
+              "createTime": 0,
               "key": "collection/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -48962,6 +52038,7 @@
               "version": 582
             },
             {
+              "createTime": 0,
               "key": "collection/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -48973,6 +52050,7 @@
               "version": 583
             },
             {
+              "createTime": 0,
               "key": "collection/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -48984,6 +52062,7 @@
               "version": 584
             },
             {
+              "createTime": 0,
               "key": "collection/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -48995,6 +52074,7 @@
               "version": 585
             },
             {
+              "createTime": 0,
               "key": "collection/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -49006,6 +52086,7 @@
               "version": 586
             },
             {
+              "createTime": 0,
               "key": "collection/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -49017,6 +52098,7 @@
               "version": 587
             },
             {
+              "createTime": 0,
               "key": "collection/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -49028,6 +52110,7 @@
               "version": 588
             },
             {
+              "createTime": 0,
               "key": "collection/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -49039,6 +52122,7 @@
               "version": 589
             },
             {
+              "createTime": 0,
               "key": "collection/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -49050,6 +52134,7 @@
               "version": 590
             },
             {
+              "createTime": 0,
               "key": "collection/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -49061,6 +52146,7 @@
               "version": 591
             },
             {
+              "createTime": 0,
               "key": "collection/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -49072,6 +52158,7 @@
               "version": 592
             },
             {
+              "createTime": 0,
               "key": "collection/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -49083,6 +52170,7 @@
               "version": 593
             },
             {
+              "createTime": 0,
               "key": "collection/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -49094,6 +52182,7 @@
               "version": 594
             },
             {
+              "createTime": 0,
               "key": "collection/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -49105,6 +52194,7 @@
               "version": 595
             },
             {
+              "createTime": 0,
               "key": "collection/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -49116,6 +52206,7 @@
               "version": 596
             },
             {
+              "createTime": 0,
               "key": "collection/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -49127,6 +52218,7 @@
               "version": 597
             },
             {
+              "createTime": 0,
               "key": "collection/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -49138,6 +52230,7 @@
               "version": 598
             },
             {
+              "createTime": 0,
               "key": "collection/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -49149,6 +52242,7 @@
               "version": 599
             },
             {
+              "createTime": 0,
               "key": "collection/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -49160,6 +52254,7 @@
               "version": 600
             },
             {
+              "createTime": 0,
               "key": "collection/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -49171,6 +52266,7 @@
               "version": 601
             },
             {
+              "createTime": 0,
               "key": "collection/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -49182,6 +52278,7 @@
               "version": 602
             },
             {
+              "createTime": 0,
               "key": "collection/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -49193,6 +52290,7 @@
               "version": 603
             },
             {
+              "createTime": 0,
               "key": "collection/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -49204,6 +52302,7 @@
               "version": 604
             },
             {
+              "createTime": 0,
               "key": "collection/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -49215,6 +52314,7 @@
               "version": 605
             },
             {
+              "createTime": 0,
               "key": "collection/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -49244,6 +52344,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49255,6 +52356,7 @@
                 "version": 507
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49266,6 +52368,7 @@
                 "version": 508
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49277,6 +52380,7 @@
                 "version": 509
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49288,6 +52392,7 @@
                 "version": 510
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49299,6 +52404,7 @@
                 "version": 511
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49310,6 +52416,7 @@
                 "version": 512
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49321,6 +52428,7 @@
                 "version": 513
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49332,6 +52440,7 @@
                 "version": 514
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49343,6 +52452,7 @@
                 "version": 515
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49354,6 +52464,7 @@
                 "version": 516
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49365,6 +52476,7 @@
                 "version": 517
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49376,6 +52488,7 @@
                 "version": 518
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49387,6 +52500,7 @@
                 "version": 519
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49398,6 +52512,7 @@
                 "version": 520
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49409,6 +52524,7 @@
                 "version": 521
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49420,6 +52536,7 @@
                 "version": 522
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49431,6 +52548,7 @@
                 "version": 523
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49442,6 +52560,7 @@
                 "version": 524
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49453,6 +52572,7 @@
                 "version": 525
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49464,6 +52584,7 @@
                 "version": 526
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49475,6 +52596,7 @@
                 "version": 527
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49486,6 +52608,7 @@
                 "version": 528
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49497,6 +52620,7 @@
                 "version": 529
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49508,6 +52632,7 @@
                 "version": 530
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49519,6 +52644,7 @@
                 "version": 531
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49530,6 +52656,7 @@
                 "version": 532
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49541,6 +52668,7 @@
                 "version": 533
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49552,6 +52680,7 @@
                 "version": 534
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49563,6 +52692,7 @@
                 "version": 535
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49574,6 +52704,7 @@
                 "version": 536
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49585,6 +52716,7 @@
                 "version": 537
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49596,6 +52728,7 @@
                 "version": 538
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49607,6 +52740,7 @@
                 "version": 539
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49618,6 +52752,7 @@
                 "version": 540
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49629,6 +52764,7 @@
                 "version": 541
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49640,6 +52776,7 @@
                 "version": 542
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49651,6 +52788,7 @@
                 "version": 543
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49662,6 +52800,7 @@
                 "version": 544
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49673,6 +52812,7 @@
                 "version": 545
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49684,6 +52824,7 @@
                 "version": 546
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49695,6 +52836,7 @@
                 "version": 547
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49706,6 +52848,7 @@
                 "version": 548
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49717,6 +52860,7 @@
                 "version": 549
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49728,6 +52872,7 @@
                 "version": 550
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49739,6 +52884,7 @@
                 "version": 551
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49750,6 +52896,7 @@
                 "version": 552
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49761,6 +52908,7 @@
                 "version": 553
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49772,6 +52920,7 @@
                 "version": 554
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49783,6 +52932,7 @@
                 "version": 555
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49794,6 +52944,7 @@
                 "version": 556
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49805,6 +52956,7 @@
                 "version": 557
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49816,6 +52968,7 @@
                 "version": 558
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49827,6 +52980,7 @@
                 "version": 559
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49838,6 +52992,7 @@
                 "version": 560
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49849,6 +53004,7 @@
                 "version": 561
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49860,6 +53016,7 @@
                 "version": 562
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49871,6 +53028,7 @@
                 "version": 563
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49882,6 +53040,7 @@
                 "version": 564
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49893,6 +53052,7 @@
                 "version": 565
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49904,6 +53064,7 @@
                 "version": 566
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49915,6 +53076,7 @@
                 "version": 567
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49926,6 +53088,7 @@
                 "version": 568
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49937,6 +53100,7 @@
                 "version": 569
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49948,6 +53112,7 @@
                 "version": 570
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49959,6 +53124,7 @@
                 "version": 571
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49970,6 +53136,7 @@
                 "version": 572
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49981,6 +53148,7 @@
                 "version": 573
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -49992,6 +53160,7 @@
                 "version": 574
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50003,6 +53172,7 @@
                 "version": 575
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50014,6 +53184,7 @@
                 "version": 576
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50025,6 +53196,7 @@
                 "version": 577
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50036,6 +53208,7 @@
                 "version": 578
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50047,6 +53220,7 @@
                 "version": 579
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50058,6 +53232,7 @@
                 "version": 580
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50069,6 +53244,7 @@
                 "version": 581
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50080,6 +53256,7 @@
                 "version": 582
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50091,6 +53268,7 @@
                 "version": 583
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50102,6 +53280,7 @@
                 "version": 584
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50113,6 +53292,7 @@
                 "version": 585
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50124,6 +53304,7 @@
                 "version": 586
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50135,6 +53316,7 @@
                 "version": 587
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50146,6 +53328,7 @@
                 "version": 588
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50157,6 +53340,7 @@
                 "version": 589
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50168,6 +53352,7 @@
                 "version": 590
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50179,6 +53364,7 @@
                 "version": 591
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50190,6 +53376,7 @@
                 "version": 592
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50201,6 +53388,7 @@
                 "version": 593
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50212,6 +53400,7 @@
                 "version": 594
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50223,6 +53412,7 @@
                 "version": 595
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50234,6 +53424,7 @@
                 "version": 596
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50245,6 +53436,7 @@
                 "version": 597
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50256,6 +53448,7 @@
                 "version": 598
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50267,6 +53460,7 @@
                 "version": 599
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50278,6 +53472,7 @@
                 "version": 600
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50289,6 +53484,7 @@
                 "version": 601
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50300,6 +53496,7 @@
                 "version": 602
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50311,6 +53508,7 @@
                 "version": 603
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50322,6 +53520,7 @@
                 "version": 604
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50333,6 +53532,7 @@
                 "version": 605
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -50362,6 +53562,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -50373,6 +53574,7 @@
               "version": 608
             },
             {
+              "createTime": 0,
               "key": "collection/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -50384,6 +53586,7 @@
               "version": 609
             },
             {
+              "createTime": 0,
               "key": "collection/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -50395,6 +53598,7 @@
               "version": 610
             },
             {
+              "createTime": 0,
               "key": "collection/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -50406,6 +53610,7 @@
               "version": 611
             },
             {
+              "createTime": 0,
               "key": "collection/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -50417,6 +53622,7 @@
               "version": 612
             },
             {
+              "createTime": 0,
               "key": "collection/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -50428,6 +53634,7 @@
               "version": 613
             },
             {
+              "createTime": 0,
               "key": "collection/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -50439,6 +53646,7 @@
               "version": 614
             },
             {
+              "createTime": 0,
               "key": "collection/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -50450,6 +53658,7 @@
               "version": 615
             },
             {
+              "createTime": 0,
               "key": "collection/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -50461,6 +53670,7 @@
               "version": 616
             },
             {
+              "createTime": 0,
               "key": "collection/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -50472,6 +53682,7 @@
               "version": 617
             },
             {
+              "createTime": 0,
               "key": "collection/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -50483,6 +53694,7 @@
               "version": 618
             },
             {
+              "createTime": 0,
               "key": "collection/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -50494,6 +53706,7 @@
               "version": 619
             },
             {
+              "createTime": 0,
               "key": "collection/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -50505,6 +53718,7 @@
               "version": 620
             },
             {
+              "createTime": 0,
               "key": "collection/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -50516,6 +53730,7 @@
               "version": 621
             },
             {
+              "createTime": 0,
               "key": "collection/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -50527,6 +53742,7 @@
               "version": 622
             },
             {
+              "createTime": 0,
               "key": "collection/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -50538,6 +53754,7 @@
               "version": 623
             },
             {
+              "createTime": 0,
               "key": "collection/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -50549,6 +53766,7 @@
               "version": 624
             },
             {
+              "createTime": 0,
               "key": "collection/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -50560,6 +53778,7 @@
               "version": 625
             },
             {
+              "createTime": 0,
               "key": "collection/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -50571,6 +53790,7 @@
               "version": 626
             },
             {
+              "createTime": 0,
               "key": "collection/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -50582,6 +53802,7 @@
               "version": 627
             },
             {
+              "createTime": 0,
               "key": "collection/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -50593,6 +53814,7 @@
               "version": 628
             },
             {
+              "createTime": 0,
               "key": "collection/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -50604,6 +53826,7 @@
               "version": 629
             },
             {
+              "createTime": 0,
               "key": "collection/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -50615,6 +53838,7 @@
               "version": 630
             },
             {
+              "createTime": 0,
               "key": "collection/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -50626,6 +53850,7 @@
               "version": 631
             },
             {
+              "createTime": 0,
               "key": "collection/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -50637,6 +53862,7 @@
               "version": 632
             },
             {
+              "createTime": 0,
               "key": "collection/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -50648,6 +53874,7 @@
               "version": 633
             },
             {
+              "createTime": 0,
               "key": "collection/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -50659,6 +53886,7 @@
               "version": 634
             },
             {
+              "createTime": 0,
               "key": "collection/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -50670,6 +53898,7 @@
               "version": 635
             },
             {
+              "createTime": 0,
               "key": "collection/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -50681,6 +53910,7 @@
               "version": 636
             },
             {
+              "createTime": 0,
               "key": "collection/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -50692,6 +53922,7 @@
               "version": 637
             },
             {
+              "createTime": 0,
               "key": "collection/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -50703,6 +53934,7 @@
               "version": 638
             },
             {
+              "createTime": 0,
               "key": "collection/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -50714,6 +53946,7 @@
               "version": 639
             },
             {
+              "createTime": 0,
               "key": "collection/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -50725,6 +53958,7 @@
               "version": 640
             },
             {
+              "createTime": 0,
               "key": "collection/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -50736,6 +53970,7 @@
               "version": 641
             },
             {
+              "createTime": 0,
               "key": "collection/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -50747,6 +53982,7 @@
               "version": 642
             },
             {
+              "createTime": 0,
               "key": "collection/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -50758,6 +53994,7 @@
               "version": 643
             },
             {
+              "createTime": 0,
               "key": "collection/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -50769,6 +54006,7 @@
               "version": 644
             },
             {
+              "createTime": 0,
               "key": "collection/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -50780,6 +54018,7 @@
               "version": 645
             },
             {
+              "createTime": 0,
               "key": "collection/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -50791,6 +54030,7 @@
               "version": 646
             },
             {
+              "createTime": 0,
               "key": "collection/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -50802,6 +54042,7 @@
               "version": 647
             },
             {
+              "createTime": 0,
               "key": "collection/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -50813,6 +54054,7 @@
               "version": 648
             },
             {
+              "createTime": 0,
               "key": "collection/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -50824,6 +54066,7 @@
               "version": 649
             },
             {
+              "createTime": 0,
               "key": "collection/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -50835,6 +54078,7 @@
               "version": 650
             },
             {
+              "createTime": 0,
               "key": "collection/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -50846,6 +54090,7 @@
               "version": 651
             },
             {
+              "createTime": 0,
               "key": "collection/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -50857,6 +54102,7 @@
               "version": 652
             },
             {
+              "createTime": 0,
               "key": "collection/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -50868,6 +54114,7 @@
               "version": 653
             },
             {
+              "createTime": 0,
               "key": "collection/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -50879,6 +54126,7 @@
               "version": 654
             },
             {
+              "createTime": 0,
               "key": "collection/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -50890,6 +54138,7 @@
               "version": 655
             },
             {
+              "createTime": 0,
               "key": "collection/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -50901,6 +54150,7 @@
               "version": 656
             },
             {
+              "createTime": 0,
               "key": "collection/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -50912,6 +54162,7 @@
               "version": 657
             },
             {
+              "createTime": 0,
               "key": "collection/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -50923,6 +54174,7 @@
               "version": 658
             },
             {
+              "createTime": 0,
               "key": "collection/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -50934,6 +54186,7 @@
               "version": 659
             },
             {
+              "createTime": 0,
               "key": "collection/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -50945,6 +54198,7 @@
               "version": 660
             },
             {
+              "createTime": 0,
               "key": "collection/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -50956,6 +54210,7 @@
               "version": 661
             },
             {
+              "createTime": 0,
               "key": "collection/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -50967,6 +54222,7 @@
               "version": 662
             },
             {
+              "createTime": 0,
               "key": "collection/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -50978,6 +54234,7 @@
               "version": 663
             },
             {
+              "createTime": 0,
               "key": "collection/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -50989,6 +54246,7 @@
               "version": 664
             },
             {
+              "createTime": 0,
               "key": "collection/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -51000,6 +54258,7 @@
               "version": 665
             },
             {
+              "createTime": 0,
               "key": "collection/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -51011,6 +54270,7 @@
               "version": 666
             },
             {
+              "createTime": 0,
               "key": "collection/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -51022,6 +54282,7 @@
               "version": 667
             },
             {
+              "createTime": 0,
               "key": "collection/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -51033,6 +54294,7 @@
               "version": 668
             },
             {
+              "createTime": 0,
               "key": "collection/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -51044,6 +54306,7 @@
               "version": 669
             },
             {
+              "createTime": 0,
               "key": "collection/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -51055,6 +54318,7 @@
               "version": 670
             },
             {
+              "createTime": 0,
               "key": "collection/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -51066,6 +54330,7 @@
               "version": 671
             },
             {
+              "createTime": 0,
               "key": "collection/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -51077,6 +54342,7 @@
               "version": 672
             },
             {
+              "createTime": 0,
               "key": "collection/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -51088,6 +54354,7 @@
               "version": 673
             },
             {
+              "createTime": 0,
               "key": "collection/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -51099,6 +54366,7 @@
               "version": 674
             },
             {
+              "createTime": 0,
               "key": "collection/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -51110,6 +54378,7 @@
               "version": 675
             },
             {
+              "createTime": 0,
               "key": "collection/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -51121,6 +54390,7 @@
               "version": 676
             },
             {
+              "createTime": 0,
               "key": "collection/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -51132,6 +54402,7 @@
               "version": 677
             },
             {
+              "createTime": 0,
               "key": "collection/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -51143,6 +54414,7 @@
               "version": 678
             },
             {
+              "createTime": 0,
               "key": "collection/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -51154,6 +54426,7 @@
               "version": 679
             },
             {
+              "createTime": 0,
               "key": "collection/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -51165,6 +54438,7 @@
               "version": 680
             },
             {
+              "createTime": 0,
               "key": "collection/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -51176,6 +54450,7 @@
               "version": 681
             },
             {
+              "createTime": 0,
               "key": "collection/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -51187,6 +54462,7 @@
               "version": 682
             },
             {
+              "createTime": 0,
               "key": "collection/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -51198,6 +54474,7 @@
               "version": 683
             },
             {
+              "createTime": 0,
               "key": "collection/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -51209,6 +54486,7 @@
               "version": 684
             },
             {
+              "createTime": 0,
               "key": "collection/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -51220,6 +54498,7 @@
               "version": 685
             },
             {
+              "createTime": 0,
               "key": "collection/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -51231,6 +54510,7 @@
               "version": 686
             },
             {
+              "createTime": 0,
               "key": "collection/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -51242,6 +54522,7 @@
               "version": 687
             },
             {
+              "createTime": 0,
               "key": "collection/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -51253,6 +54534,7 @@
               "version": 688
             },
             {
+              "createTime": 0,
               "key": "collection/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -51264,6 +54546,7 @@
               "version": 689
             },
             {
+              "createTime": 0,
               "key": "collection/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -51275,6 +54558,7 @@
               "version": 690
             },
             {
+              "createTime": 0,
               "key": "collection/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -51286,6 +54570,7 @@
               "version": 691
             },
             {
+              "createTime": 0,
               "key": "collection/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -51297,6 +54582,7 @@
               "version": 692
             },
             {
+              "createTime": 0,
               "key": "collection/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -51308,6 +54594,7 @@
               "version": 693
             },
             {
+              "createTime": 0,
               "key": "collection/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -51319,6 +54606,7 @@
               "version": 694
             },
             {
+              "createTime": 0,
               "key": "collection/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -51330,6 +54618,7 @@
               "version": 695
             },
             {
+              "createTime": 0,
               "key": "collection/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -51341,6 +54630,7 @@
               "version": 696
             },
             {
+              "createTime": 0,
               "key": "collection/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -51352,6 +54642,7 @@
               "version": 697
             },
             {
+              "createTime": 0,
               "key": "collection/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -51363,6 +54654,7 @@
               "version": 698
             },
             {
+              "createTime": 0,
               "key": "collection/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -51374,6 +54666,7 @@
               "version": 699
             },
             {
+              "createTime": 0,
               "key": "collection/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -51385,6 +54678,7 @@
               "version": 700
             },
             {
+              "createTime": 0,
               "key": "collection/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -51396,6 +54690,7 @@
               "version": 701
             },
             {
+              "createTime": 0,
               "key": "collection/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -51407,6 +54702,7 @@
               "version": 702
             },
             {
+              "createTime": 0,
               "key": "collection/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -51418,6 +54714,7 @@
               "version": 703
             },
             {
+              "createTime": 0,
               "key": "collection/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -51429,6 +54726,7 @@
               "version": 704
             },
             {
+              "createTime": 0,
               "key": "collection/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -51440,6 +54738,7 @@
               "version": 705
             },
             {
+              "createTime": 0,
               "key": "collection/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -51451,6 +54750,7 @@
               "version": 706
             },
             {
+              "createTime": 0,
               "key": "collection/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -51480,6 +54780,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51491,6 +54792,7 @@
                 "version": 608
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51502,6 +54804,7 @@
                 "version": 609
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51513,6 +54816,7 @@
                 "version": 610
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51524,6 +54828,7 @@
                 "version": 611
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51535,6 +54840,7 @@
                 "version": 612
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51546,6 +54852,7 @@
                 "version": 613
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51557,6 +54864,7 @@
                 "version": 614
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51568,6 +54876,7 @@
                 "version": 615
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51579,6 +54888,7 @@
                 "version": 616
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51590,6 +54900,7 @@
                 "version": 617
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51601,6 +54912,7 @@
                 "version": 618
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51612,6 +54924,7 @@
                 "version": 619
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51623,6 +54936,7 @@
                 "version": 620
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51634,6 +54948,7 @@
                 "version": 621
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51645,6 +54960,7 @@
                 "version": 622
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51656,6 +54972,7 @@
                 "version": 623
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51667,6 +54984,7 @@
                 "version": 624
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51678,6 +54996,7 @@
                 "version": 625
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51689,6 +55008,7 @@
                 "version": 626
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51700,6 +55020,7 @@
                 "version": 627
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51711,6 +55032,7 @@
                 "version": 628
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51722,6 +55044,7 @@
                 "version": 629
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51733,6 +55056,7 @@
                 "version": 630
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51744,6 +55068,7 @@
                 "version": 631
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51755,6 +55080,7 @@
                 "version": 632
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51766,6 +55092,7 @@
                 "version": 633
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51777,6 +55104,7 @@
                 "version": 634
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51788,6 +55116,7 @@
                 "version": 635
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51799,6 +55128,7 @@
                 "version": 636
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51810,6 +55140,7 @@
                 "version": 637
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51821,6 +55152,7 @@
                 "version": 638
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51832,6 +55164,7 @@
                 "version": 639
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51843,6 +55176,7 @@
                 "version": 640
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51854,6 +55188,7 @@
                 "version": 641
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51865,6 +55200,7 @@
                 "version": 642
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51876,6 +55212,7 @@
                 "version": 643
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51887,6 +55224,7 @@
                 "version": 644
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51898,6 +55236,7 @@
                 "version": 645
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51909,6 +55248,7 @@
                 "version": 646
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51920,6 +55260,7 @@
                 "version": 647
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51931,6 +55272,7 @@
                 "version": 648
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51942,6 +55284,7 @@
                 "version": 649
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51953,6 +55296,7 @@
                 "version": 650
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51964,6 +55308,7 @@
                 "version": 651
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51975,6 +55320,7 @@
                 "version": 652
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51986,6 +55332,7 @@
                 "version": 653
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -51997,6 +55344,7 @@
                 "version": 654
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52008,6 +55356,7 @@
                 "version": 655
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52019,6 +55368,7 @@
                 "version": 656
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52030,6 +55380,7 @@
                 "version": 657
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52041,6 +55392,7 @@
                 "version": 658
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52052,6 +55404,7 @@
                 "version": 659
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52063,6 +55416,7 @@
                 "version": 660
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52074,6 +55428,7 @@
                 "version": 661
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52085,6 +55440,7 @@
                 "version": 662
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52096,6 +55452,7 @@
                 "version": 663
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52107,6 +55464,7 @@
                 "version": 664
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52118,6 +55476,7 @@
                 "version": 665
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52129,6 +55488,7 @@
                 "version": 666
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52140,6 +55500,7 @@
                 "version": 667
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52151,6 +55512,7 @@
                 "version": 668
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52162,6 +55524,7 @@
                 "version": 669
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52173,6 +55536,7 @@
                 "version": 670
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52184,6 +55548,7 @@
                 "version": 671
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52195,6 +55560,7 @@
                 "version": 672
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52206,6 +55572,7 @@
                 "version": 673
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52217,6 +55584,7 @@
                 "version": 674
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52228,6 +55596,7 @@
                 "version": 675
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52239,6 +55608,7 @@
                 "version": 676
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52250,6 +55620,7 @@
                 "version": 677
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52261,6 +55632,7 @@
                 "version": 678
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52272,6 +55644,7 @@
                 "version": 679
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52283,6 +55656,7 @@
                 "version": 680
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52294,6 +55668,7 @@
                 "version": 681
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52305,6 +55680,7 @@
                 "version": 682
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52316,6 +55692,7 @@
                 "version": 683
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52327,6 +55704,7 @@
                 "version": 684
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52338,6 +55716,7 @@
                 "version": 685
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52349,6 +55728,7 @@
                 "version": 686
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52360,6 +55740,7 @@
                 "version": 687
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52371,6 +55752,7 @@
                 "version": 688
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52382,6 +55764,7 @@
                 "version": 689
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52393,6 +55776,7 @@
                 "version": 690
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52404,6 +55788,7 @@
                 "version": 691
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52415,6 +55800,7 @@
                 "version": 692
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52426,6 +55812,7 @@
                 "version": 693
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52437,6 +55824,7 @@
                 "version": 694
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52448,6 +55836,7 @@
                 "version": 695
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52459,6 +55848,7 @@
                 "version": 696
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52470,6 +55860,7 @@
                 "version": 697
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52481,6 +55872,7 @@
                 "version": 698
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52492,6 +55884,7 @@
                 "version": 699
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52503,6 +55896,7 @@
                 "version": 700
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52514,6 +55908,7 @@
                 "version": 701
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52525,6 +55920,7 @@
                 "version": 702
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52536,6 +55932,7 @@
                 "version": 703
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52547,6 +55944,7 @@
                 "version": 704
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52558,6 +55956,7 @@
                 "version": 705
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52569,6 +55968,7 @@
                 "version": 706
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -52598,6 +55998,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -52609,6 +56010,7 @@
               "version": 709
             },
             {
+              "createTime": 0,
               "key": "collection/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -52620,6 +56022,7 @@
               "version": 710
             },
             {
+              "createTime": 0,
               "key": "collection/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -52631,6 +56034,7 @@
               "version": 711
             },
             {
+              "createTime": 0,
               "key": "collection/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -52642,6 +56046,7 @@
               "version": 712
             },
             {
+              "createTime": 0,
               "key": "collection/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -52653,6 +56058,7 @@
               "version": 713
             },
             {
+              "createTime": 0,
               "key": "collection/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -52664,6 +56070,7 @@
               "version": 714
             },
             {
+              "createTime": 0,
               "key": "collection/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -52675,6 +56082,7 @@
               "version": 715
             },
             {
+              "createTime": 0,
               "key": "collection/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -52686,6 +56094,7 @@
               "version": 716
             },
             {
+              "createTime": 0,
               "key": "collection/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -52697,6 +56106,7 @@
               "version": 717
             },
             {
+              "createTime": 0,
               "key": "collection/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -52708,6 +56118,7 @@
               "version": 718
             },
             {
+              "createTime": 0,
               "key": "collection/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -52719,6 +56130,7 @@
               "version": 719
             },
             {
+              "createTime": 0,
               "key": "collection/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -52730,6 +56142,7 @@
               "version": 720
             },
             {
+              "createTime": 0,
               "key": "collection/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -52741,6 +56154,7 @@
               "version": 721
             },
             {
+              "createTime": 0,
               "key": "collection/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -52752,6 +56166,7 @@
               "version": 722
             },
             {
+              "createTime": 0,
               "key": "collection/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -52763,6 +56178,7 @@
               "version": 723
             },
             {
+              "createTime": 0,
               "key": "collection/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -52774,6 +56190,7 @@
               "version": 724
             },
             {
+              "createTime": 0,
               "key": "collection/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -52785,6 +56202,7 @@
               "version": 725
             },
             {
+              "createTime": 0,
               "key": "collection/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -52796,6 +56214,7 @@
               "version": 726
             },
             {
+              "createTime": 0,
               "key": "collection/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -52807,6 +56226,7 @@
               "version": 727
             },
             {
+              "createTime": 0,
               "key": "collection/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -52818,6 +56238,7 @@
               "version": 728
             },
             {
+              "createTime": 0,
               "key": "collection/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -52829,6 +56250,7 @@
               "version": 729
             },
             {
+              "createTime": 0,
               "key": "collection/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -52840,6 +56262,7 @@
               "version": 730
             },
             {
+              "createTime": 0,
               "key": "collection/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -52851,6 +56274,7 @@
               "version": 731
             },
             {
+              "createTime": 0,
               "key": "collection/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -52862,6 +56286,7 @@
               "version": 732
             },
             {
+              "createTime": 0,
               "key": "collection/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -52873,6 +56298,7 @@
               "version": 733
             },
             {
+              "createTime": 0,
               "key": "collection/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -52884,6 +56310,7 @@
               "version": 734
             },
             {
+              "createTime": 0,
               "key": "collection/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -52895,6 +56322,7 @@
               "version": 735
             },
             {
+              "createTime": 0,
               "key": "collection/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -52906,6 +56334,7 @@
               "version": 736
             },
             {
+              "createTime": 0,
               "key": "collection/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -52917,6 +56346,7 @@
               "version": 737
             },
             {
+              "createTime": 0,
               "key": "collection/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -52928,6 +56358,7 @@
               "version": 738
             },
             {
+              "createTime": 0,
               "key": "collection/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -52939,6 +56370,7 @@
               "version": 739
             },
             {
+              "createTime": 0,
               "key": "collection/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -52950,6 +56382,7 @@
               "version": 740
             },
             {
+              "createTime": 0,
               "key": "collection/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -52961,6 +56394,7 @@
               "version": 741
             },
             {
+              "createTime": 0,
               "key": "collection/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -52972,6 +56406,7 @@
               "version": 742
             },
             {
+              "createTime": 0,
               "key": "collection/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -52983,6 +56418,7 @@
               "version": 743
             },
             {
+              "createTime": 0,
               "key": "collection/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -52994,6 +56430,7 @@
               "version": 744
             },
             {
+              "createTime": 0,
               "key": "collection/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -53005,6 +56442,7 @@
               "version": 745
             },
             {
+              "createTime": 0,
               "key": "collection/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -53016,6 +56454,7 @@
               "version": 746
             },
             {
+              "createTime": 0,
               "key": "collection/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -53027,6 +56466,7 @@
               "version": 747
             },
             {
+              "createTime": 0,
               "key": "collection/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -53038,6 +56478,7 @@
               "version": 748
             },
             {
+              "createTime": 0,
               "key": "collection/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -53049,6 +56490,7 @@
               "version": 749
             },
             {
+              "createTime": 0,
               "key": "collection/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -53060,6 +56502,7 @@
               "version": 750
             },
             {
+              "createTime": 0,
               "key": "collection/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -53071,6 +56514,7 @@
               "version": 751
             },
             {
+              "createTime": 0,
               "key": "collection/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -53082,6 +56526,7 @@
               "version": 752
             },
             {
+              "createTime": 0,
               "key": "collection/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -53093,6 +56538,7 @@
               "version": 753
             },
             {
+              "createTime": 0,
               "key": "collection/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -53104,6 +56550,7 @@
               "version": 754
             },
             {
+              "createTime": 0,
               "key": "collection/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -53115,6 +56562,7 @@
               "version": 755
             },
             {
+              "createTime": 0,
               "key": "collection/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -53126,6 +56574,7 @@
               "version": 756
             },
             {
+              "createTime": 0,
               "key": "collection/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -53137,6 +56586,7 @@
               "version": 757
             },
             {
+              "createTime": 0,
               "key": "collection/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -53148,6 +56598,7 @@
               "version": 758
             },
             {
+              "createTime": 0,
               "key": "collection/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -53159,6 +56610,7 @@
               "version": 759
             },
             {
+              "createTime": 0,
               "key": "collection/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -53170,6 +56622,7 @@
               "version": 760
             },
             {
+              "createTime": 0,
               "key": "collection/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -53181,6 +56634,7 @@
               "version": 761
             },
             {
+              "createTime": 0,
               "key": "collection/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -53192,6 +56646,7 @@
               "version": 762
             },
             {
+              "createTime": 0,
               "key": "collection/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -53203,6 +56658,7 @@
               "version": 763
             },
             {
+              "createTime": 0,
               "key": "collection/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -53214,6 +56670,7 @@
               "version": 764
             },
             {
+              "createTime": 0,
               "key": "collection/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -53225,6 +56682,7 @@
               "version": 765
             },
             {
+              "createTime": 0,
               "key": "collection/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -53236,6 +56694,7 @@
               "version": 766
             },
             {
+              "createTime": 0,
               "key": "collection/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -53247,6 +56706,7 @@
               "version": 767
             },
             {
+              "createTime": 0,
               "key": "collection/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -53258,6 +56718,7 @@
               "version": 768
             },
             {
+              "createTime": 0,
               "key": "collection/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -53269,6 +56730,7 @@
               "version": 769
             },
             {
+              "createTime": 0,
               "key": "collection/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -53280,6 +56742,7 @@
               "version": 770
             },
             {
+              "createTime": 0,
               "key": "collection/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -53291,6 +56754,7 @@
               "version": 771
             },
             {
+              "createTime": 0,
               "key": "collection/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -53302,6 +56766,7 @@
               "version": 772
             },
             {
+              "createTime": 0,
               "key": "collection/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -53313,6 +56778,7 @@
               "version": 773
             },
             {
+              "createTime": 0,
               "key": "collection/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -53324,6 +56790,7 @@
               "version": 774
             },
             {
+              "createTime": 0,
               "key": "collection/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -53335,6 +56802,7 @@
               "version": 775
             },
             {
+              "createTime": 0,
               "key": "collection/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -53346,6 +56814,7 @@
               "version": 776
             },
             {
+              "createTime": 0,
               "key": "collection/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -53357,6 +56826,7 @@
               "version": 777
             },
             {
+              "createTime": 0,
               "key": "collection/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -53368,6 +56838,7 @@
               "version": 778
             },
             {
+              "createTime": 0,
               "key": "collection/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -53379,6 +56850,7 @@
               "version": 779
             },
             {
+              "createTime": 0,
               "key": "collection/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -53390,6 +56862,7 @@
               "version": 780
             },
             {
+              "createTime": 0,
               "key": "collection/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -53401,6 +56874,7 @@
               "version": 781
             },
             {
+              "createTime": 0,
               "key": "collection/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -53412,6 +56886,7 @@
               "version": 782
             },
             {
+              "createTime": 0,
               "key": "collection/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -53423,6 +56898,7 @@
               "version": 783
             },
             {
+              "createTime": 0,
               "key": "collection/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -53434,6 +56910,7 @@
               "version": 784
             },
             {
+              "createTime": 0,
               "key": "collection/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -53445,6 +56922,7 @@
               "version": 785
             },
             {
+              "createTime": 0,
               "key": "collection/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -53456,6 +56934,7 @@
               "version": 786
             },
             {
+              "createTime": 0,
               "key": "collection/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -53467,6 +56946,7 @@
               "version": 787
             },
             {
+              "createTime": 0,
               "key": "collection/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -53478,6 +56958,7 @@
               "version": 788
             },
             {
+              "createTime": 0,
               "key": "collection/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -53489,6 +56970,7 @@
               "version": 789
             },
             {
+              "createTime": 0,
               "key": "collection/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -53500,6 +56982,7 @@
               "version": 790
             },
             {
+              "createTime": 0,
               "key": "collection/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -53511,6 +56994,7 @@
               "version": 791
             },
             {
+              "createTime": 0,
               "key": "collection/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -53522,6 +57006,7 @@
               "version": 792
             },
             {
+              "createTime": 0,
               "key": "collection/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -53533,6 +57018,7 @@
               "version": 793
             },
             {
+              "createTime": 0,
               "key": "collection/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -53544,6 +57030,7 @@
               "version": 794
             },
             {
+              "createTime": 0,
               "key": "collection/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -53555,6 +57042,7 @@
               "version": 795
             },
             {
+              "createTime": 0,
               "key": "collection/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -53566,6 +57054,7 @@
               "version": 796
             },
             {
+              "createTime": 0,
               "key": "collection/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -53577,6 +57066,7 @@
               "version": 797
             },
             {
+              "createTime": 0,
               "key": "collection/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -53588,6 +57078,7 @@
               "version": 798
             },
             {
+              "createTime": 0,
               "key": "collection/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -53599,6 +57090,7 @@
               "version": 799
             },
             {
+              "createTime": 0,
               "key": "collection/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -53610,6 +57102,7 @@
               "version": 800
             },
             {
+              "createTime": 0,
               "key": "collection/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -53621,6 +57114,7 @@
               "version": 801
             },
             {
+              "createTime": 0,
               "key": "collection/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -53632,6 +57126,7 @@
               "version": 802
             },
             {
+              "createTime": 0,
               "key": "collection/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -53643,6 +57138,7 @@
               "version": 803
             },
             {
+              "createTime": 0,
               "key": "collection/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -53654,6 +57150,7 @@
               "version": 804
             },
             {
+              "createTime": 0,
               "key": "collection/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -53665,6 +57162,7 @@
               "version": 805
             },
             {
+              "createTime": 0,
               "key": "collection/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -53676,6 +57174,7 @@
               "version": 806
             },
             {
+              "createTime": 0,
               "key": "collection/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -53687,6 +57186,7 @@
               "version": 807
             },
             {
+              "createTime": 0,
               "key": "collection/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -53716,6 +57216,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53727,6 +57228,7 @@
                 "version": 709
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53738,6 +57240,7 @@
                 "version": 710
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53749,6 +57252,7 @@
                 "version": 711
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53760,6 +57264,7 @@
                 "version": 712
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53771,6 +57276,7 @@
                 "version": 713
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53782,6 +57288,7 @@
                 "version": 714
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53793,6 +57300,7 @@
                 "version": 715
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53804,6 +57312,7 @@
                 "version": 716
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53815,6 +57324,7 @@
                 "version": 717
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53826,6 +57336,7 @@
                 "version": 718
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53837,6 +57348,7 @@
                 "version": 719
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53848,6 +57360,7 @@
                 "version": 720
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53859,6 +57372,7 @@
                 "version": 721
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53870,6 +57384,7 @@
                 "version": 722
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53881,6 +57396,7 @@
                 "version": 723
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53892,6 +57408,7 @@
                 "version": 724
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53903,6 +57420,7 @@
                 "version": 725
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53914,6 +57432,7 @@
                 "version": 726
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53925,6 +57444,7 @@
                 "version": 727
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53936,6 +57456,7 @@
                 "version": 728
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53947,6 +57468,7 @@
                 "version": 729
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53958,6 +57480,7 @@
                 "version": 730
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53969,6 +57492,7 @@
                 "version": 731
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53980,6 +57504,7 @@
                 "version": 732
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -53991,6 +57516,7 @@
                 "version": 733
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54002,6 +57528,7 @@
                 "version": 734
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54013,6 +57540,7 @@
                 "version": 735
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54024,6 +57552,7 @@
                 "version": 736
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54035,6 +57564,7 @@
                 "version": 737
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54046,6 +57576,7 @@
                 "version": 738
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54057,6 +57588,7 @@
                 "version": 739
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54068,6 +57600,7 @@
                 "version": 740
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54079,6 +57612,7 @@
                 "version": 741
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54090,6 +57624,7 @@
                 "version": 742
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54101,6 +57636,7 @@
                 "version": 743
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54112,6 +57648,7 @@
                 "version": 744
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54123,6 +57660,7 @@
                 "version": 745
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54134,6 +57672,7 @@
                 "version": 746
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54145,6 +57684,7 @@
                 "version": 747
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54156,6 +57696,7 @@
                 "version": 748
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54167,6 +57708,7 @@
                 "version": 749
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54178,6 +57720,7 @@
                 "version": 750
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54189,6 +57732,7 @@
                 "version": 751
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54200,6 +57744,7 @@
                 "version": 752
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54211,6 +57756,7 @@
                 "version": 753
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54222,6 +57768,7 @@
                 "version": 754
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54233,6 +57780,7 @@
                 "version": 755
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54244,6 +57792,7 @@
                 "version": 756
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54255,6 +57804,7 @@
                 "version": 757
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54266,6 +57816,7 @@
                 "version": 758
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54277,6 +57828,7 @@
                 "version": 759
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54288,6 +57840,7 @@
                 "version": 760
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54299,6 +57852,7 @@
                 "version": 761
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54310,6 +57864,7 @@
                 "version": 762
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54321,6 +57876,7 @@
                 "version": 763
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54332,6 +57888,7 @@
                 "version": 764
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54343,6 +57900,7 @@
                 "version": 765
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54354,6 +57912,7 @@
                 "version": 766
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54365,6 +57924,7 @@
                 "version": 767
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54376,6 +57936,7 @@
                 "version": 768
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54387,6 +57948,7 @@
                 "version": 769
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54398,6 +57960,7 @@
                 "version": 770
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54409,6 +57972,7 @@
                 "version": 771
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54420,6 +57984,7 @@
                 "version": 772
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54431,6 +57996,7 @@
                 "version": 773
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54442,6 +58008,7 @@
                 "version": 774
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54453,6 +58020,7 @@
                 "version": 775
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54464,6 +58032,7 @@
                 "version": 776
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54475,6 +58044,7 @@
                 "version": 777
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54486,6 +58056,7 @@
                 "version": 778
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54497,6 +58068,7 @@
                 "version": 779
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54508,6 +58080,7 @@
                 "version": 780
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54519,6 +58092,7 @@
                 "version": 781
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54530,6 +58104,7 @@
                 "version": 782
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54541,6 +58116,7 @@
                 "version": 783
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54552,6 +58128,7 @@
                 "version": 784
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54563,6 +58140,7 @@
                 "version": 785
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54574,6 +58152,7 @@
                 "version": 786
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54585,6 +58164,7 @@
                 "version": 787
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54596,6 +58176,7 @@
                 "version": 788
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54607,6 +58188,7 @@
                 "version": 789
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54618,6 +58200,7 @@
                 "version": 790
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54629,6 +58212,7 @@
                 "version": 791
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54640,6 +58224,7 @@
                 "version": 792
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54651,6 +58236,7 @@
                 "version": 793
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54662,6 +58248,7 @@
                 "version": 794
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54673,6 +58260,7 @@
                 "version": 795
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54684,6 +58272,7 @@
                 "version": 796
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54695,6 +58284,7 @@
                 "version": 797
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54706,6 +58296,7 @@
                 "version": 798
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54717,6 +58308,7 @@
                 "version": 799
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54728,6 +58320,7 @@
                 "version": 800
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54739,6 +58332,7 @@
                 "version": 801
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54750,6 +58344,7 @@
                 "version": 802
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54761,6 +58356,7 @@
                 "version": 803
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54772,6 +58368,7 @@
                 "version": 804
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54783,6 +58380,7 @@
                 "version": 805
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54794,6 +58392,7 @@
                 "version": 806
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54805,6 +58404,7 @@
                 "version": 807
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -54834,6 +58434,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -54845,6 +58446,7 @@
               "version": 810
             },
             {
+              "createTime": 0,
               "key": "collection/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -54856,6 +58458,7 @@
               "version": 811
             },
             {
+              "createTime": 0,
               "key": "collection/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -54867,6 +58470,7 @@
               "version": 812
             },
             {
+              "createTime": 0,
               "key": "collection/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -54878,6 +58482,7 @@
               "version": 813
             },
             {
+              "createTime": 0,
               "key": "collection/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -54889,6 +58494,7 @@
               "version": 814
             },
             {
+              "createTime": 0,
               "key": "collection/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -54900,6 +58506,7 @@
               "version": 815
             },
             {
+              "createTime": 0,
               "key": "collection/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -54911,6 +58518,7 @@
               "version": 816
             },
             {
+              "createTime": 0,
               "key": "collection/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -54922,6 +58530,7 @@
               "version": 817
             },
             {
+              "createTime": 0,
               "key": "collection/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -54933,6 +58542,7 @@
               "version": 818
             },
             {
+              "createTime": 0,
               "key": "collection/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -54944,6 +58554,7 @@
               "version": 819
             },
             {
+              "createTime": 0,
               "key": "collection/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -54955,6 +58566,7 @@
               "version": 820
             },
             {
+              "createTime": 0,
               "key": "collection/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -54966,6 +58578,7 @@
               "version": 821
             },
             {
+              "createTime": 0,
               "key": "collection/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -54977,6 +58590,7 @@
               "version": 822
             },
             {
+              "createTime": 0,
               "key": "collection/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -54988,6 +58602,7 @@
               "version": 823
             },
             {
+              "createTime": 0,
               "key": "collection/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -54999,6 +58614,7 @@
               "version": 824
             },
             {
+              "createTime": 0,
               "key": "collection/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -55010,6 +58626,7 @@
               "version": 825
             },
             {
+              "createTime": 0,
               "key": "collection/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -55021,6 +58638,7 @@
               "version": 826
             },
             {
+              "createTime": 0,
               "key": "collection/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -55032,6 +58650,7 @@
               "version": 827
             },
             {
+              "createTime": 0,
               "key": "collection/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -55043,6 +58662,7 @@
               "version": 828
             },
             {
+              "createTime": 0,
               "key": "collection/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -55054,6 +58674,7 @@
               "version": 829
             },
             {
+              "createTime": 0,
               "key": "collection/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -55065,6 +58686,7 @@
               "version": 830
             },
             {
+              "createTime": 0,
               "key": "collection/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -55076,6 +58698,7 @@
               "version": 831
             },
             {
+              "createTime": 0,
               "key": "collection/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -55087,6 +58710,7 @@
               "version": 832
             },
             {
+              "createTime": 0,
               "key": "collection/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -55098,6 +58722,7 @@
               "version": 833
             },
             {
+              "createTime": 0,
               "key": "collection/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -55109,6 +58734,7 @@
               "version": 834
             },
             {
+              "createTime": 0,
               "key": "collection/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -55120,6 +58746,7 @@
               "version": 835
             },
             {
+              "createTime": 0,
               "key": "collection/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -55131,6 +58758,7 @@
               "version": 836
             },
             {
+              "createTime": 0,
               "key": "collection/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -55142,6 +58770,7 @@
               "version": 837
             },
             {
+              "createTime": 0,
               "key": "collection/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -55153,6 +58782,7 @@
               "version": 838
             },
             {
+              "createTime": 0,
               "key": "collection/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -55164,6 +58794,7 @@
               "version": 839
             },
             {
+              "createTime": 0,
               "key": "collection/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -55175,6 +58806,7 @@
               "version": 840
             },
             {
+              "createTime": 0,
               "key": "collection/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -55186,6 +58818,7 @@
               "version": 841
             },
             {
+              "createTime": 0,
               "key": "collection/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -55197,6 +58830,7 @@
               "version": 842
             },
             {
+              "createTime": 0,
               "key": "collection/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -55208,6 +58842,7 @@
               "version": 843
             },
             {
+              "createTime": 0,
               "key": "collection/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -55219,6 +58854,7 @@
               "version": 844
             },
             {
+              "createTime": 0,
               "key": "collection/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -55230,6 +58866,7 @@
               "version": 845
             },
             {
+              "createTime": 0,
               "key": "collection/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -55241,6 +58878,7 @@
               "version": 846
             },
             {
+              "createTime": 0,
               "key": "collection/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -55252,6 +58890,7 @@
               "version": 847
             },
             {
+              "createTime": 0,
               "key": "collection/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -55263,6 +58902,7 @@
               "version": 848
             },
             {
+              "createTime": 0,
               "key": "collection/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -55274,6 +58914,7 @@
               "version": 849
             },
             {
+              "createTime": 0,
               "key": "collection/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -55285,6 +58926,7 @@
               "version": 850
             },
             {
+              "createTime": 0,
               "key": "collection/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -55296,6 +58938,7 @@
               "version": 851
             },
             {
+              "createTime": 0,
               "key": "collection/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -55307,6 +58950,7 @@
               "version": 852
             },
             {
+              "createTime": 0,
               "key": "collection/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -55318,6 +58962,7 @@
               "version": 853
             },
             {
+              "createTime": 0,
               "key": "collection/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -55329,6 +58974,7 @@
               "version": 854
             },
             {
+              "createTime": 0,
               "key": "collection/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -55340,6 +58986,7 @@
               "version": 855
             },
             {
+              "createTime": 0,
               "key": "collection/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -55351,6 +58998,7 @@
               "version": 856
             },
             {
+              "createTime": 0,
               "key": "collection/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -55362,6 +59010,7 @@
               "version": 857
             },
             {
+              "createTime": 0,
               "key": "collection/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -55373,6 +59022,7 @@
               "version": 858
             },
             {
+              "createTime": 0,
               "key": "collection/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -55384,6 +59034,7 @@
               "version": 859
             },
             {
+              "createTime": 0,
               "key": "collection/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -55395,6 +59046,7 @@
               "version": 860
             },
             {
+              "createTime": 0,
               "key": "collection/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -55406,6 +59058,7 @@
               "version": 861
             },
             {
+              "createTime": 0,
               "key": "collection/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -55417,6 +59070,7 @@
               "version": 862
             },
             {
+              "createTime": 0,
               "key": "collection/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -55428,6 +59082,7 @@
               "version": 863
             },
             {
+              "createTime": 0,
               "key": "collection/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -55439,6 +59094,7 @@
               "version": 864
             },
             {
+              "createTime": 0,
               "key": "collection/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -55450,6 +59106,7 @@
               "version": 865
             },
             {
+              "createTime": 0,
               "key": "collection/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -55461,6 +59118,7 @@
               "version": 866
             },
             {
+              "createTime": 0,
               "key": "collection/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -55472,6 +59130,7 @@
               "version": 867
             },
             {
+              "createTime": 0,
               "key": "collection/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -55483,6 +59142,7 @@
               "version": 868
             },
             {
+              "createTime": 0,
               "key": "collection/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -55494,6 +59154,7 @@
               "version": 869
             },
             {
+              "createTime": 0,
               "key": "collection/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -55505,6 +59166,7 @@
               "version": 870
             },
             {
+              "createTime": 0,
               "key": "collection/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -55516,6 +59178,7 @@
               "version": 871
             },
             {
+              "createTime": 0,
               "key": "collection/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -55527,6 +59190,7 @@
               "version": 872
             },
             {
+              "createTime": 0,
               "key": "collection/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -55538,6 +59202,7 @@
               "version": 873
             },
             {
+              "createTime": 0,
               "key": "collection/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -55549,6 +59214,7 @@
               "version": 874
             },
             {
+              "createTime": 0,
               "key": "collection/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -55560,6 +59226,7 @@
               "version": 875
             },
             {
+              "createTime": 0,
               "key": "collection/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -55571,6 +59238,7 @@
               "version": 876
             },
             {
+              "createTime": 0,
               "key": "collection/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -55582,6 +59250,7 @@
               "version": 877
             },
             {
+              "createTime": 0,
               "key": "collection/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -55593,6 +59262,7 @@
               "version": 878
             },
             {
+              "createTime": 0,
               "key": "collection/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -55604,6 +59274,7 @@
               "version": 879
             },
             {
+              "createTime": 0,
               "key": "collection/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -55615,6 +59286,7 @@
               "version": 880
             },
             {
+              "createTime": 0,
               "key": "collection/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -55626,6 +59298,7 @@
               "version": 881
             },
             {
+              "createTime": 0,
               "key": "collection/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -55637,6 +59310,7 @@
               "version": 882
             },
             {
+              "createTime": 0,
               "key": "collection/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -55648,6 +59322,7 @@
               "version": 883
             },
             {
+              "createTime": 0,
               "key": "collection/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -55659,6 +59334,7 @@
               "version": 884
             },
             {
+              "createTime": 0,
               "key": "collection/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -55670,6 +59346,7 @@
               "version": 885
             },
             {
+              "createTime": 0,
               "key": "collection/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -55681,6 +59358,7 @@
               "version": 886
             },
             {
+              "createTime": 0,
               "key": "collection/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -55692,6 +59370,7 @@
               "version": 887
             },
             {
+              "createTime": 0,
               "key": "collection/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -55703,6 +59382,7 @@
               "version": 888
             },
             {
+              "createTime": 0,
               "key": "collection/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -55714,6 +59394,7 @@
               "version": 889
             },
             {
+              "createTime": 0,
               "key": "collection/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -55725,6 +59406,7 @@
               "version": 890
             },
             {
+              "createTime": 0,
               "key": "collection/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -55736,6 +59418,7 @@
               "version": 891
             },
             {
+              "createTime": 0,
               "key": "collection/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -55747,6 +59430,7 @@
               "version": 892
             },
             {
+              "createTime": 0,
               "key": "collection/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -55758,6 +59442,7 @@
               "version": 893
             },
             {
+              "createTime": 0,
               "key": "collection/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -55769,6 +59454,7 @@
               "version": 894
             },
             {
+              "createTime": 0,
               "key": "collection/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -55780,6 +59466,7 @@
               "version": 895
             },
             {
+              "createTime": 0,
               "key": "collection/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -55791,6 +59478,7 @@
               "version": 896
             },
             {
+              "createTime": 0,
               "key": "collection/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -55802,6 +59490,7 @@
               "version": 897
             },
             {
+              "createTime": 0,
               "key": "collection/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -55813,6 +59502,7 @@
               "version": 898
             },
             {
+              "createTime": 0,
               "key": "collection/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -55824,6 +59514,7 @@
               "version": 899
             },
             {
+              "createTime": 0,
               "key": "collection/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -55835,6 +59526,7 @@
               "version": 900
             },
             {
+              "createTime": 0,
               "key": "collection/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -55846,6 +59538,7 @@
               "version": 901
             },
             {
+              "createTime": 0,
               "key": "collection/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -55857,6 +59550,7 @@
               "version": 902
             },
             {
+              "createTime": 0,
               "key": "collection/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -55868,6 +59562,7 @@
               "version": 903
             },
             {
+              "createTime": 0,
               "key": "collection/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -55879,6 +59574,7 @@
               "version": 904
             },
             {
+              "createTime": 0,
               "key": "collection/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -55890,6 +59586,7 @@
               "version": 905
             },
             {
+              "createTime": 0,
               "key": "collection/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -55901,6 +59598,7 @@
               "version": 906
             },
             {
+              "createTime": 0,
               "key": "collection/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -55912,6 +59610,7 @@
               "version": 907
             },
             {
+              "createTime": 0,
               "key": "collection/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -55923,6 +59622,7 @@
               "version": 908
             },
             {
+              "createTime": 0,
               "key": "collection/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -55952,6 +59652,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -55963,6 +59664,7 @@
                 "version": 810
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -55974,6 +59676,7 @@
                 "version": 811
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -55985,6 +59688,7 @@
                 "version": 812
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -55996,6 +59700,7 @@
                 "version": 813
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56007,6 +59712,7 @@
                 "version": 814
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56018,6 +59724,7 @@
                 "version": 815
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56029,6 +59736,7 @@
                 "version": 816
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56040,6 +59748,7 @@
                 "version": 817
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56051,6 +59760,7 @@
                 "version": 818
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56062,6 +59772,7 @@
                 "version": 819
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56073,6 +59784,7 @@
                 "version": 820
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56084,6 +59796,7 @@
                 "version": 821
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56095,6 +59808,7 @@
                 "version": 822
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56106,6 +59820,7 @@
                 "version": 823
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56117,6 +59832,7 @@
                 "version": 824
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56128,6 +59844,7 @@
                 "version": 825
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56139,6 +59856,7 @@
                 "version": 826
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56150,6 +59868,7 @@
                 "version": 827
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56161,6 +59880,7 @@
                 "version": 828
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56172,6 +59892,7 @@
                 "version": 829
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56183,6 +59904,7 @@
                 "version": 830
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56194,6 +59916,7 @@
                 "version": 831
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56205,6 +59928,7 @@
                 "version": 832
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56216,6 +59940,7 @@
                 "version": 833
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56227,6 +59952,7 @@
                 "version": 834
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56238,6 +59964,7 @@
                 "version": 835
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56249,6 +59976,7 @@
                 "version": 836
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56260,6 +59988,7 @@
                 "version": 837
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56271,6 +60000,7 @@
                 "version": 838
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56282,6 +60012,7 @@
                 "version": 839
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56293,6 +60024,7 @@
                 "version": 840
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56304,6 +60036,7 @@
                 "version": 841
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56315,6 +60048,7 @@
                 "version": 842
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56326,6 +60060,7 @@
                 "version": 843
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56337,6 +60072,7 @@
                 "version": 844
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56348,6 +60084,7 @@
                 "version": 845
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56359,6 +60096,7 @@
                 "version": 846
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56370,6 +60108,7 @@
                 "version": 847
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56381,6 +60120,7 @@
                 "version": 848
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56392,6 +60132,7 @@
                 "version": 849
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56403,6 +60144,7 @@
                 "version": 850
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56414,6 +60156,7 @@
                 "version": 851
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56425,6 +60168,7 @@
                 "version": 852
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56436,6 +60180,7 @@
                 "version": 853
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56447,6 +60192,7 @@
                 "version": 854
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56458,6 +60204,7 @@
                 "version": 855
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56469,6 +60216,7 @@
                 "version": 856
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56480,6 +60228,7 @@
                 "version": 857
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56491,6 +60240,7 @@
                 "version": 858
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56502,6 +60252,7 @@
                 "version": 859
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56513,6 +60264,7 @@
                 "version": 860
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56524,6 +60276,7 @@
                 "version": 861
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56535,6 +60288,7 @@
                 "version": 862
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56546,6 +60300,7 @@
                 "version": 863
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56557,6 +60312,7 @@
                 "version": 864
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56568,6 +60324,7 @@
                 "version": 865
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56579,6 +60336,7 @@
                 "version": 866
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56590,6 +60348,7 @@
                 "version": 867
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56601,6 +60360,7 @@
                 "version": 868
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56612,6 +60372,7 @@
                 "version": 869
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56623,6 +60384,7 @@
                 "version": 870
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56634,6 +60396,7 @@
                 "version": 871
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56645,6 +60408,7 @@
                 "version": 872
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56656,6 +60420,7 @@
                 "version": 873
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56667,6 +60432,7 @@
                 "version": 874
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56678,6 +60444,7 @@
                 "version": 875
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56689,6 +60456,7 @@
                 "version": 876
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56700,6 +60468,7 @@
                 "version": 877
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56711,6 +60480,7 @@
                 "version": 878
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56722,6 +60492,7 @@
                 "version": 879
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56733,6 +60504,7 @@
                 "version": 880
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56744,6 +60516,7 @@
                 "version": 881
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56755,6 +60528,7 @@
                 "version": 882
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56766,6 +60540,7 @@
                 "version": 883
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56777,6 +60552,7 @@
                 "version": 884
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56788,6 +60564,7 @@
                 "version": 885
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56799,6 +60576,7 @@
                 "version": 886
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56810,6 +60588,7 @@
                 "version": 887
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56821,6 +60600,7 @@
                 "version": 888
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56832,6 +60612,7 @@
                 "version": 889
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56843,6 +60624,7 @@
                 "version": 890
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56854,6 +60636,7 @@
                 "version": 891
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56865,6 +60648,7 @@
                 "version": 892
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56876,6 +60660,7 @@
                 "version": 893
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56887,6 +60672,7 @@
                 "version": 894
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56898,6 +60684,7 @@
                 "version": 895
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56909,6 +60696,7 @@
                 "version": 896
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56920,6 +60708,7 @@
                 "version": 897
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56931,6 +60720,7 @@
                 "version": 898
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56942,6 +60732,7 @@
                 "version": 899
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56953,6 +60744,7 @@
                 "version": 900
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56964,6 +60756,7 @@
                 "version": 901
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56975,6 +60768,7 @@
                 "version": 902
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56986,6 +60780,7 @@
                 "version": 903
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -56997,6 +60792,7 @@
                 "version": 904
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -57008,6 +60804,7 @@
                 "version": 905
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -57019,6 +60816,7 @@
                 "version": 906
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -57030,6 +60828,7 @@
                 "version": 907
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -57041,6 +60840,7 @@
                 "version": 908
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -57070,6 +60870,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -57081,6 +60882,7 @@
               "version": 911
             },
             {
+              "createTime": 0,
               "key": "collection/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -57092,6 +60894,7 @@
               "version": 912
             },
             {
+              "createTime": 0,
               "key": "collection/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -57103,6 +60906,7 @@
               "version": 913
             },
             {
+              "createTime": 0,
               "key": "collection/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -57114,6 +60918,7 @@
               "version": 914
             },
             {
+              "createTime": 0,
               "key": "collection/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -57125,6 +60930,7 @@
               "version": 915
             },
             {
+              "createTime": 0,
               "key": "collection/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -57136,6 +60942,7 @@
               "version": 916
             },
             {
+              "createTime": 0,
               "key": "collection/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -57147,6 +60954,7 @@
               "version": 917
             },
             {
+              "createTime": 0,
               "key": "collection/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -57158,6 +60966,7 @@
               "version": 918
             },
             {
+              "createTime": 0,
               "key": "collection/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -57169,6 +60978,7 @@
               "version": 919
             },
             {
+              "createTime": 0,
               "key": "collection/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -57180,6 +60990,7 @@
               "version": 920
             },
             {
+              "createTime": 0,
               "key": "collection/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -57191,6 +61002,7 @@
               "version": 921
             },
             {
+              "createTime": 0,
               "key": "collection/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -57202,6 +61014,7 @@
               "version": 922
             },
             {
+              "createTime": 0,
               "key": "collection/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -57213,6 +61026,7 @@
               "version": 923
             },
             {
+              "createTime": 0,
               "key": "collection/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -57224,6 +61038,7 @@
               "version": 924
             },
             {
+              "createTime": 0,
               "key": "collection/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -57235,6 +61050,7 @@
               "version": 925
             },
             {
+              "createTime": 0,
               "key": "collection/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -57246,6 +61062,7 @@
               "version": 926
             },
             {
+              "createTime": 0,
               "key": "collection/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -57257,6 +61074,7 @@
               "version": 927
             },
             {
+              "createTime": 0,
               "key": "collection/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -57268,6 +61086,7 @@
               "version": 928
             },
             {
+              "createTime": 0,
               "key": "collection/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -57279,6 +61098,7 @@
               "version": 929
             },
             {
+              "createTime": 0,
               "key": "collection/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -57290,6 +61110,7 @@
               "version": 930
             },
             {
+              "createTime": 0,
               "key": "collection/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -57301,6 +61122,7 @@
               "version": 931
             },
             {
+              "createTime": 0,
               "key": "collection/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -57312,6 +61134,7 @@
               "version": 932
             },
             {
+              "createTime": 0,
               "key": "collection/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -57323,6 +61146,7 @@
               "version": 933
             },
             {
+              "createTime": 0,
               "key": "collection/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -57334,6 +61158,7 @@
               "version": 934
             },
             {
+              "createTime": 0,
               "key": "collection/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -57345,6 +61170,7 @@
               "version": 935
             },
             {
+              "createTime": 0,
               "key": "collection/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -57356,6 +61182,7 @@
               "version": 936
             },
             {
+              "createTime": 0,
               "key": "collection/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -57367,6 +61194,7 @@
               "version": 937
             },
             {
+              "createTime": 0,
               "key": "collection/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -57378,6 +61206,7 @@
               "version": 938
             },
             {
+              "createTime": 0,
               "key": "collection/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -57389,6 +61218,7 @@
               "version": 939
             },
             {
+              "createTime": 0,
               "key": "collection/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -57400,6 +61230,7 @@
               "version": 940
             },
             {
+              "createTime": 0,
               "key": "collection/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -57411,6 +61242,7 @@
               "version": 941
             },
             {
+              "createTime": 0,
               "key": "collection/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -57422,6 +61254,7 @@
               "version": 942
             },
             {
+              "createTime": 0,
               "key": "collection/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -57433,6 +61266,7 @@
               "version": 943
             },
             {
+              "createTime": 0,
               "key": "collection/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -57444,6 +61278,7 @@
               "version": 944
             },
             {
+              "createTime": 0,
               "key": "collection/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -57455,6 +61290,7 @@
               "version": 945
             },
             {
+              "createTime": 0,
               "key": "collection/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -57466,6 +61302,7 @@
               "version": 946
             },
             {
+              "createTime": 0,
               "key": "collection/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -57477,6 +61314,7 @@
               "version": 947
             },
             {
+              "createTime": 0,
               "key": "collection/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -57488,6 +61326,7 @@
               "version": 948
             },
             {
+              "createTime": 0,
               "key": "collection/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -57499,6 +61338,7 @@
               "version": 949
             },
             {
+              "createTime": 0,
               "key": "collection/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -57510,6 +61350,7 @@
               "version": 950
             },
             {
+              "createTime": 0,
               "key": "collection/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -57521,6 +61362,7 @@
               "version": 951
             },
             {
+              "createTime": 0,
               "key": "collection/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -57532,6 +61374,7 @@
               "version": 952
             },
             {
+              "createTime": 0,
               "key": "collection/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -57543,6 +61386,7 @@
               "version": 953
             },
             {
+              "createTime": 0,
               "key": "collection/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -57554,6 +61398,7 @@
               "version": 954
             },
             {
+              "createTime": 0,
               "key": "collection/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -57565,6 +61410,7 @@
               "version": 955
             },
             {
+              "createTime": 0,
               "key": "collection/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -57576,6 +61422,7 @@
               "version": 956
             },
             {
+              "createTime": 0,
               "key": "collection/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -57587,6 +61434,7 @@
               "version": 957
             },
             {
+              "createTime": 0,
               "key": "collection/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -57598,6 +61446,7 @@
               "version": 958
             },
             {
+              "createTime": 0,
               "key": "collection/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -57609,6 +61458,7 @@
               "version": 959
             },
             {
+              "createTime": 0,
               "key": "collection/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -57620,6 +61470,7 @@
               "version": 960
             },
             {
+              "createTime": 0,
               "key": "collection/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -57631,6 +61482,7 @@
               "version": 961
             },
             {
+              "createTime": 0,
               "key": "collection/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -57642,6 +61494,7 @@
               "version": 962
             },
             {
+              "createTime": 0,
               "key": "collection/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -57653,6 +61506,7 @@
               "version": 963
             },
             {
+              "createTime": 0,
               "key": "collection/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -57664,6 +61518,7 @@
               "version": 964
             },
             {
+              "createTime": 0,
               "key": "collection/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -57675,6 +61530,7 @@
               "version": 965
             },
             {
+              "createTime": 0,
               "key": "collection/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -57686,6 +61542,7 @@
               "version": 966
             },
             {
+              "createTime": 0,
               "key": "collection/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -57697,6 +61554,7 @@
               "version": 967
             },
             {
+              "createTime": 0,
               "key": "collection/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -57708,6 +61566,7 @@
               "version": 968
             },
             {
+              "createTime": 0,
               "key": "collection/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -57719,6 +61578,7 @@
               "version": 969
             },
             {
+              "createTime": 0,
               "key": "collection/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -57730,6 +61590,7 @@
               "version": 970
             },
             {
+              "createTime": 0,
               "key": "collection/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -57741,6 +61602,7 @@
               "version": 971
             },
             {
+              "createTime": 0,
               "key": "collection/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -57752,6 +61614,7 @@
               "version": 972
             },
             {
+              "createTime": 0,
               "key": "collection/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -57763,6 +61626,7 @@
               "version": 973
             },
             {
+              "createTime": 0,
               "key": "collection/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -57774,6 +61638,7 @@
               "version": 974
             },
             {
+              "createTime": 0,
               "key": "collection/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -57785,6 +61650,7 @@
               "version": 975
             },
             {
+              "createTime": 0,
               "key": "collection/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -57796,6 +61662,7 @@
               "version": 976
             },
             {
+              "createTime": 0,
               "key": "collection/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -57807,6 +61674,7 @@
               "version": 977
             },
             {
+              "createTime": 0,
               "key": "collection/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -57818,6 +61686,7 @@
               "version": 978
             },
             {
+              "createTime": 0,
               "key": "collection/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -57829,6 +61698,7 @@
               "version": 979
             },
             {
+              "createTime": 0,
               "key": "collection/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -57840,6 +61710,7 @@
               "version": 980
             },
             {
+              "createTime": 0,
               "key": "collection/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -57851,6 +61722,7 @@
               "version": 981
             },
             {
+              "createTime": 0,
               "key": "collection/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -57862,6 +61734,7 @@
               "version": 982
             },
             {
+              "createTime": 0,
               "key": "collection/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -57873,6 +61746,7 @@
               "version": 983
             },
             {
+              "createTime": 0,
               "key": "collection/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -57884,6 +61758,7 @@
               "version": 984
             },
             {
+              "createTime": 0,
               "key": "collection/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -57895,6 +61770,7 @@
               "version": 985
             },
             {
+              "createTime": 0,
               "key": "collection/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -57906,6 +61782,7 @@
               "version": 986
             },
             {
+              "createTime": 0,
               "key": "collection/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -57917,6 +61794,7 @@
               "version": 987
             },
             {
+              "createTime": 0,
               "key": "collection/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -57928,6 +61806,7 @@
               "version": 988
             },
             {
+              "createTime": 0,
               "key": "collection/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -57939,6 +61818,7 @@
               "version": 989
             },
             {
+              "createTime": 0,
               "key": "collection/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -57950,6 +61830,7 @@
               "version": 990
             },
             {
+              "createTime": 0,
               "key": "collection/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -57961,6 +61842,7 @@
               "version": 991
             },
             {
+              "createTime": 0,
               "key": "collection/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -57972,6 +61854,7 @@
               "version": 992
             },
             {
+              "createTime": 0,
               "key": "collection/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -57983,6 +61866,7 @@
               "version": 993
             },
             {
+              "createTime": 0,
               "key": "collection/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -57994,6 +61878,7 @@
               "version": 994
             },
             {
+              "createTime": 0,
               "key": "collection/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -58005,6 +61890,7 @@
               "version": 995
             },
             {
+              "createTime": 0,
               "key": "collection/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -58016,6 +61902,7 @@
               "version": 996
             },
             {
+              "createTime": 0,
               "key": "collection/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -58027,6 +61914,7 @@
               "version": 997
             },
             {
+              "createTime": 0,
               "key": "collection/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -58038,6 +61926,7 @@
               "version": 998
             },
             {
+              "createTime": 0,
               "key": "collection/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -58049,6 +61938,7 @@
               "version": 999
             },
             {
+              "createTime": 0,
               "key": "collection/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -58060,6 +61950,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -58071,6 +61962,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -58082,6 +61974,7 @@
               "version": 1002
             },
             {
+              "createTime": 0,
               "key": "collection/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -58093,6 +61986,7 @@
               "version": 1003
             },
             {
+              "createTime": 0,
               "key": "collection/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -58104,6 +61998,7 @@
               "version": 1004
             },
             {
+              "createTime": 0,
               "key": "collection/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -58115,6 +62010,7 @@
               "version": 1005
             },
             {
+              "createTime": 0,
               "key": "collection/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -58126,6 +62022,7 @@
               "version": 1006
             },
             {
+              "createTime": 0,
               "key": "collection/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -58137,6 +62034,7 @@
               "version": 1007
             },
             {
+              "createTime": 0,
               "key": "collection/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -58148,6 +62046,7 @@
               "version": 1008
             },
             {
+              "createTime": 0,
               "key": "collection/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -58159,6 +62058,7 @@
               "version": 1009
             },
             {
+              "createTime": 0,
               "key": "collection/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -58188,6 +62088,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58199,6 +62100,7 @@
                 "version": 911
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58210,6 +62112,7 @@
                 "version": 912
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58221,6 +62124,7 @@
                 "version": 913
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58232,6 +62136,7 @@
                 "version": 914
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58243,6 +62148,7 @@
                 "version": 915
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58254,6 +62160,7 @@
                 "version": 916
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58265,6 +62172,7 @@
                 "version": 917
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58276,6 +62184,7 @@
                 "version": 918
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58287,6 +62196,7 @@
                 "version": 919
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58298,6 +62208,7 @@
                 "version": 920
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58309,6 +62220,7 @@
                 "version": 921
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58320,6 +62232,7 @@
                 "version": 922
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58331,6 +62244,7 @@
                 "version": 923
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58342,6 +62256,7 @@
                 "version": 924
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58353,6 +62268,7 @@
                 "version": 925
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58364,6 +62280,7 @@
                 "version": 926
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58375,6 +62292,7 @@
                 "version": 927
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58386,6 +62304,7 @@
                 "version": 928
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58397,6 +62316,7 @@
                 "version": 929
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58408,6 +62328,7 @@
                 "version": 930
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58419,6 +62340,7 @@
                 "version": 931
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58430,6 +62352,7 @@
                 "version": 932
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58441,6 +62364,7 @@
                 "version": 933
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58452,6 +62376,7 @@
                 "version": 934
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58463,6 +62388,7 @@
                 "version": 935
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58474,6 +62400,7 @@
                 "version": 936
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58485,6 +62412,7 @@
                 "version": 937
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58496,6 +62424,7 @@
                 "version": 938
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58507,6 +62436,7 @@
                 "version": 939
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58518,6 +62448,7 @@
                 "version": 940
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58529,6 +62460,7 @@
                 "version": 941
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58540,6 +62472,7 @@
                 "version": 942
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58551,6 +62484,7 @@
                 "version": 943
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58562,6 +62496,7 @@
                 "version": 944
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58573,6 +62508,7 @@
                 "version": 945
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58584,6 +62520,7 @@
                 "version": 946
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58595,6 +62532,7 @@
                 "version": 947
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58606,6 +62544,7 @@
                 "version": 948
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58617,6 +62556,7 @@
                 "version": 949
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58628,6 +62568,7 @@
                 "version": 950
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58639,6 +62580,7 @@
                 "version": 951
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58650,6 +62592,7 @@
                 "version": 952
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58661,6 +62604,7 @@
                 "version": 953
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58672,6 +62616,7 @@
                 "version": 954
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58683,6 +62628,7 @@
                 "version": 955
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58694,6 +62640,7 @@
                 "version": 956
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58705,6 +62652,7 @@
                 "version": 957
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58716,6 +62664,7 @@
                 "version": 958
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58727,6 +62676,7 @@
                 "version": 959
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58738,6 +62688,7 @@
                 "version": 960
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58749,6 +62700,7 @@
                 "version": 961
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58760,6 +62712,7 @@
                 "version": 962
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58771,6 +62724,7 @@
                 "version": 963
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58782,6 +62736,7 @@
                 "version": 964
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58793,6 +62748,7 @@
                 "version": 965
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58804,6 +62760,7 @@
                 "version": 966
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58815,6 +62772,7 @@
                 "version": 967
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58826,6 +62784,7 @@
                 "version": 968
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58837,6 +62796,7 @@
                 "version": 969
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58848,6 +62808,7 @@
                 "version": 970
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58859,6 +62820,7 @@
                 "version": 971
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58870,6 +62832,7 @@
                 "version": 972
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58881,6 +62844,7 @@
                 "version": 973
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58892,6 +62856,7 @@
                 "version": 974
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58903,6 +62868,7 @@
                 "version": 975
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58914,6 +62880,7 @@
                 "version": 976
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58925,6 +62892,7 @@
                 "version": 977
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58936,6 +62904,7 @@
                 "version": 978
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58947,6 +62916,7 @@
                 "version": 979
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58958,6 +62928,7 @@
                 "version": 980
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58969,6 +62940,7 @@
                 "version": 981
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58980,6 +62952,7 @@
                 "version": 982
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -58991,6 +62964,7 @@
                 "version": 983
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59002,6 +62976,7 @@
                 "version": 984
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59013,6 +62988,7 @@
                 "version": 985
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59024,6 +63000,7 @@
                 "version": 986
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59035,6 +63012,7 @@
                 "version": 987
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59046,6 +63024,7 @@
                 "version": 988
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59057,6 +63036,7 @@
                 "version": 989
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59068,6 +63048,7 @@
                 "version": 990
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59079,6 +63060,7 @@
                 "version": 991
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59090,6 +63072,7 @@
                 "version": 992
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59101,6 +63084,7 @@
                 "version": 993
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59112,6 +63096,7 @@
                 "version": 994
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59123,6 +63108,7 @@
                 "version": 995
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59134,6 +63120,7 @@
                 "version": 996
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59145,6 +63132,7 @@
                 "version": 997
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59156,6 +63144,7 @@
                 "version": 998
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59167,6 +63156,7 @@
                 "version": 999
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59178,6 +63168,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59189,6 +63180,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59200,6 +63192,7 @@
                 "version": 1002
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59211,6 +63204,7 @@
                 "version": 1003
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59222,6 +63216,7 @@
                 "version": 1004
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59233,6 +63228,7 @@
                 "version": 1005
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59244,6 +63240,7 @@
                 "version": 1006
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59255,6 +63252,7 @@
                 "version": 1007
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59266,6 +63264,7 @@
                 "version": 1008
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59277,6 +63276,7 @@
                 "version": 1009
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -59312,7 +63312,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -59360,6 +63360,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/1/coll/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -59371,6 +63372,7 @@
               "version": 2
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -59382,6 +63384,7 @@
               "version": 3
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -59393,6 +63396,7 @@
               "version": 4
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -59404,6 +63408,7 @@
               "version": 5
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -59415,6 +63420,7 @@
               "version": 6
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -59426,6 +63432,7 @@
               "version": 7
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -59437,6 +63444,7 @@
               "version": 8
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -59448,6 +63456,7 @@
               "version": 9
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -59459,6 +63468,7 @@
               "version": 10
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -59470,6 +63480,7 @@
               "version": 11
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -59481,6 +63492,7 @@
               "version": 12
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -59492,6 +63504,7 @@
               "version": 13
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -59503,6 +63516,7 @@
               "version": 14
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -59514,6 +63528,7 @@
               "version": 15
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -59525,6 +63540,7 @@
               "version": 16
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -59536,6 +63552,7 @@
               "version": 17
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -59547,6 +63564,7 @@
               "version": 18
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -59558,6 +63576,7 @@
               "version": 19
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -59569,6 +63588,7 @@
               "version": 20
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -59580,6 +63600,7 @@
               "version": 21
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -59591,6 +63612,7 @@
               "version": 22
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -59602,6 +63624,7 @@
               "version": 23
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -59613,6 +63636,7 @@
               "version": 24
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -59624,6 +63648,7 @@
               "version": 25
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -59635,6 +63660,7 @@
               "version": 26
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -59646,6 +63672,7 @@
               "version": 27
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -59657,6 +63684,7 @@
               "version": 28
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -59668,6 +63696,7 @@
               "version": 29
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -59679,6 +63708,7 @@
               "version": 30
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -59690,6 +63720,7 @@
               "version": 31
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -59701,6 +63732,7 @@
               "version": 32
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -59712,6 +63744,7 @@
               "version": 33
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -59723,6 +63756,7 @@
               "version": 34
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -59734,6 +63768,7 @@
               "version": 35
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -59745,6 +63780,7 @@
               "version": 36
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -59756,6 +63792,7 @@
               "version": 37
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -59767,6 +63804,7 @@
               "version": 38
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -59778,6 +63816,7 @@
               "version": 39
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -59789,6 +63828,7 @@
               "version": 40
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -59800,6 +63840,7 @@
               "version": 41
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -59811,6 +63852,7 @@
               "version": 42
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -59822,6 +63864,7 @@
               "version": 43
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -59833,6 +63876,7 @@
               "version": 44
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -59844,6 +63888,7 @@
               "version": 45
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -59855,6 +63900,7 @@
               "version": 46
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -59866,6 +63912,7 @@
               "version": 47
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -59877,6 +63924,7 @@
               "version": 48
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -59888,6 +63936,7 @@
               "version": 49
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -59899,6 +63948,7 @@
               "version": 50
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -59910,6 +63960,7 @@
               "version": 51
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -59921,6 +63972,7 @@
               "version": 52
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -59932,6 +63984,7 @@
               "version": 53
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -59943,6 +63996,7 @@
               "version": 54
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -59954,6 +64008,7 @@
               "version": 55
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -59965,6 +64020,7 @@
               "version": 56
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -59976,6 +64032,7 @@
               "version": 57
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -59987,6 +64044,7 @@
               "version": 58
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -59998,6 +64056,7 @@
               "version": 59
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -60009,6 +64068,7 @@
               "version": 60
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -60020,6 +64080,7 @@
               "version": 61
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -60031,6 +64092,7 @@
               "version": 62
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -60042,6 +64104,7 @@
               "version": 63
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -60053,6 +64116,7 @@
               "version": 64
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -60064,6 +64128,7 @@
               "version": 65
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -60075,6 +64140,7 @@
               "version": 66
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -60086,6 +64152,7 @@
               "version": 67
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -60097,6 +64164,7 @@
               "version": 68
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -60108,6 +64176,7 @@
               "version": 69
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -60119,6 +64188,7 @@
               "version": 70
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -60130,6 +64200,7 @@
               "version": 71
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -60141,6 +64212,7 @@
               "version": 72
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -60152,6 +64224,7 @@
               "version": 73
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -60163,6 +64236,7 @@
               "version": 74
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -60174,6 +64248,7 @@
               "version": 75
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -60185,6 +64260,7 @@
               "version": 76
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -60196,6 +64272,7 @@
               "version": 77
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -60207,6 +64284,7 @@
               "version": 78
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -60218,6 +64296,7 @@
               "version": 79
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -60229,6 +64308,7 @@
               "version": 80
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -60240,6 +64320,7 @@
               "version": 81
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -60251,6 +64332,7 @@
               "version": 82
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -60262,6 +64344,7 @@
               "version": 83
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -60273,6 +64356,7 @@
               "version": 84
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -60284,6 +64368,7 @@
               "version": 85
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -60295,6 +64380,7 @@
               "version": 86
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -60306,6 +64392,7 @@
               "version": 87
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -60317,6 +64404,7 @@
               "version": 88
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -60328,6 +64416,7 @@
               "version": 89
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -60339,6 +64428,7 @@
               "version": 90
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -60350,6 +64440,7 @@
               "version": 91
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -60361,6 +64452,7 @@
               "version": 92
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -60372,6 +64464,7 @@
               "version": 93
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -60383,6 +64476,7 @@
               "version": 94
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -60394,6 +64488,7 @@
               "version": 95
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -60405,6 +64500,7 @@
               "version": 96
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -60416,6 +64512,7 @@
               "version": 97
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -60427,6 +64524,7 @@
               "version": 98
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -60438,6 +64536,7 @@
               "version": 99
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -60449,6 +64548,7 @@
               "version": 100
             },
             {
+              "createTime": 0,
               "key": "collection/1/coll/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -60483,6 +64583,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60494,6 +64595,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60505,6 +64607,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60516,6 +64619,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60527,6 +64631,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60538,6 +64643,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60549,6 +64655,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60560,6 +64667,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60571,6 +64679,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60582,6 +64691,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60593,6 +64703,7 @@
                 "version": 11
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60604,6 +64715,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60615,6 +64727,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60626,6 +64739,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60637,6 +64751,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60648,6 +64763,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60659,6 +64775,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60670,6 +64787,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60681,6 +64799,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60692,6 +64811,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60703,6 +64823,7 @@
                 "version": 21
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60714,6 +64835,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60725,6 +64847,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60736,6 +64859,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60747,6 +64871,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60758,6 +64883,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60769,6 +64895,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60780,6 +64907,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60791,6 +64919,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60802,6 +64931,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60813,6 +64943,7 @@
                 "version": 31
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60824,6 +64955,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60835,6 +64967,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60846,6 +64979,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60857,6 +64991,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60868,6 +65003,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60879,6 +65015,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60890,6 +65027,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60901,6 +65039,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60912,6 +65051,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60923,6 +65063,7 @@
                 "version": 41
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60934,6 +65075,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60945,6 +65087,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60956,6 +65099,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60967,6 +65111,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60978,6 +65123,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -60989,6 +65135,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61000,6 +65147,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61011,6 +65159,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61022,6 +65171,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61033,6 +65183,7 @@
                 "version": 51
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61044,6 +65195,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61055,6 +65207,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61066,6 +65219,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61077,6 +65231,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61088,6 +65243,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61099,6 +65255,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61110,6 +65267,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61121,6 +65279,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61132,6 +65291,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61143,6 +65303,7 @@
                 "version": 61
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61154,6 +65315,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61165,6 +65327,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61176,6 +65339,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61187,6 +65351,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61198,6 +65363,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61209,6 +65375,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61220,6 +65387,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61231,6 +65399,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61242,6 +65411,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61253,6 +65423,7 @@
                 "version": 71
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61264,6 +65435,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61275,6 +65447,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61286,6 +65459,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61297,6 +65471,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61308,6 +65483,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61319,6 +65495,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61330,6 +65507,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61341,6 +65519,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61352,6 +65531,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61363,6 +65543,7 @@
                 "version": 81
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61374,6 +65555,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61385,6 +65567,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61396,6 +65579,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61407,6 +65591,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61418,6 +65603,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61429,6 +65615,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61440,6 +65627,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61451,6 +65639,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61462,6 +65651,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61473,6 +65663,7 @@
                 "version": 91
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61484,6 +65675,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61495,6 +65687,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61506,6 +65699,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61517,6 +65711,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61528,6 +65723,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61539,6 +65735,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61550,6 +65747,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61561,6 +65759,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61572,6 +65771,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61646,6 +65846,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61657,6 +65858,7 @@
                 "version": 2
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61668,6 +65870,7 @@
                 "version": 3
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61679,6 +65882,7 @@
                 "version": 4
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61690,6 +65894,7 @@
                 "version": 5
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61701,6 +65906,7 @@
                 "version": 6
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61712,6 +65918,7 @@
                 "version": 7
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61723,6 +65930,7 @@
                 "version": 8
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61734,6 +65942,7 @@
                 "version": 9
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61745,6 +65954,7 @@
                 "version": 10
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61756,6 +65966,7 @@
                 "version": 11
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61767,6 +65978,7 @@
                 "version": 12
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61778,6 +65990,7 @@
                 "version": 13
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61789,6 +66002,7 @@
                 "version": 14
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61800,6 +66014,7 @@
                 "version": 15
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61811,6 +66026,7 @@
                 "version": 16
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61822,6 +66038,7 @@
                 "version": 17
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61833,6 +66050,7 @@
                 "version": 18
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61844,6 +66062,7 @@
                 "version": 19
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61855,6 +66074,7 @@
                 "version": 20
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61866,6 +66086,7 @@
                 "version": 21
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61877,6 +66098,7 @@
                 "version": 22
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61888,6 +66110,7 @@
                 "version": 23
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61899,6 +66122,7 @@
                 "version": 24
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61910,6 +66134,7 @@
                 "version": 25
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61921,6 +66146,7 @@
                 "version": 26
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61932,6 +66158,7 @@
                 "version": 27
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61943,6 +66170,7 @@
                 "version": 28
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61954,6 +66182,7 @@
                 "version": 29
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61965,6 +66194,7 @@
                 "version": 30
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61976,6 +66206,7 @@
                 "version": 31
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61987,6 +66218,7 @@
                 "version": 32
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -61998,6 +66230,7 @@
                 "version": 33
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62009,6 +66242,7 @@
                 "version": 34
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62020,6 +66254,7 @@
                 "version": 35
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62031,6 +66266,7 @@
                 "version": 36
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62042,6 +66278,7 @@
                 "version": 37
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62053,6 +66290,7 @@
                 "version": 38
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62064,6 +66302,7 @@
                 "version": 39
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62075,6 +66314,7 @@
                 "version": 40
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62086,6 +66326,7 @@
                 "version": 41
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62097,6 +66338,7 @@
                 "version": 42
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62108,6 +66350,7 @@
                 "version": 43
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62119,6 +66362,7 @@
                 "version": 44
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62130,6 +66374,7 @@
                 "version": 45
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62141,6 +66386,7 @@
                 "version": 46
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62152,6 +66398,7 @@
                 "version": 47
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62163,6 +66410,7 @@
                 "version": 48
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62174,6 +66422,7 @@
                 "version": 49
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62185,6 +66434,7 @@
                 "version": 50
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62196,6 +66446,7 @@
                 "version": 51
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62207,6 +66458,7 @@
                 "version": 52
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62218,6 +66470,7 @@
                 "version": 53
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62229,6 +66482,7 @@
                 "version": 54
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62240,6 +66494,7 @@
                 "version": 55
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62251,6 +66506,7 @@
                 "version": 56
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62262,6 +66518,7 @@
                 "version": 57
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62273,6 +66530,7 @@
                 "version": 58
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62284,6 +66542,7 @@
                 "version": 59
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62295,6 +66554,7 @@
                 "version": 60
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62306,6 +66566,7 @@
                 "version": 61
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62317,6 +66578,7 @@
                 "version": 62
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62328,6 +66590,7 @@
                 "version": 63
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62339,6 +66602,7 @@
                 "version": 64
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62350,6 +66614,7 @@
                 "version": 65
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62361,6 +66626,7 @@
                 "version": 66
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62372,6 +66638,7 @@
                 "version": 67
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62383,6 +66650,7 @@
                 "version": 68
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62394,6 +66662,7 @@
                 "version": 69
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62405,6 +66674,7 @@
                 "version": 70
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62416,6 +66686,7 @@
                 "version": 71
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62427,6 +66698,7 @@
                 "version": 72
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62438,6 +66710,7 @@
                 "version": 73
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62449,6 +66722,7 @@
                 "version": 74
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62460,6 +66734,7 @@
                 "version": 75
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62471,6 +66746,7 @@
                 "version": 76
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62482,6 +66758,7 @@
                 "version": 77
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62493,6 +66770,7 @@
                 "version": 78
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62504,6 +66782,7 @@
                 "version": 79
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62515,6 +66794,7 @@
                 "version": 80
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62526,6 +66806,7 @@
                 "version": 81
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62537,6 +66818,7 @@
                 "version": 82
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62548,6 +66830,7 @@
                 "version": 83
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62559,6 +66842,7 @@
                 "version": 84
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62570,6 +66854,7 @@
                 "version": 85
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62581,6 +66866,7 @@
                 "version": 86
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62592,6 +66878,7 @@
                 "version": 87
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62603,6 +66890,7 @@
                 "version": 88
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62614,6 +66902,7 @@
                 "version": 89
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62625,6 +66914,7 @@
                 "version": 90
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62636,6 +66926,7 @@
                 "version": 91
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62647,6 +66938,7 @@
                 "version": 92
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62658,6 +66950,7 @@
                 "version": 93
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62669,6 +66962,7 @@
                 "version": 94
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62680,6 +66974,7 @@
                 "version": 95
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62691,6 +66986,7 @@
                 "version": 96
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62702,6 +66998,7 @@
                 "version": 97
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62713,6 +67010,7 @@
                 "version": 98
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62724,6 +67022,7 @@
                 "version": 99
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62735,6 +67034,7 @@
                 "version": 100
               },
               {
+                "createTime": 0,
                 "key": "collection/1/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -62902,6 +67202,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/2/coll/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -62913,6 +67214,7 @@
               "version": 104
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -62924,6 +67226,7 @@
               "version": 105
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -62935,6 +67238,7 @@
               "version": 106
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -62946,6 +67250,7 @@
               "version": 107
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -62957,6 +67262,7 @@
               "version": 108
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -62968,6 +67274,7 @@
               "version": 109
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -62979,6 +67286,7 @@
               "version": 110
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -62990,6 +67298,7 @@
               "version": 111
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -63001,6 +67310,7 @@
               "version": 112
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -63012,6 +67322,7 @@
               "version": 113
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -63023,6 +67334,7 @@
               "version": 114
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -63034,6 +67346,7 @@
               "version": 115
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -63045,6 +67358,7 @@
               "version": 116
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -63056,6 +67370,7 @@
               "version": 117
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -63067,6 +67382,7 @@
               "version": 118
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -63078,6 +67394,7 @@
               "version": 119
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -63089,6 +67406,7 @@
               "version": 120
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -63100,6 +67418,7 @@
               "version": 121
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -63111,6 +67430,7 @@
               "version": 122
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -63122,6 +67442,7 @@
               "version": 123
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -63133,6 +67454,7 @@
               "version": 124
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -63144,6 +67466,7 @@
               "version": 125
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -63155,6 +67478,7 @@
               "version": 126
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -63166,6 +67490,7 @@
               "version": 127
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -63177,6 +67502,7 @@
               "version": 128
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -63188,6 +67514,7 @@
               "version": 129
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -63199,6 +67526,7 @@
               "version": 130
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -63210,6 +67538,7 @@
               "version": 131
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -63221,6 +67550,7 @@
               "version": 132
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -63232,6 +67562,7 @@
               "version": 133
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -63243,6 +67574,7 @@
               "version": 134
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -63254,6 +67586,7 @@
               "version": 135
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -63265,6 +67598,7 @@
               "version": 136
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -63276,6 +67610,7 @@
               "version": 137
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -63287,6 +67622,7 @@
               "version": 138
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -63298,6 +67634,7 @@
               "version": 139
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -63309,6 +67646,7 @@
               "version": 140
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -63320,6 +67658,7 @@
               "version": 141
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -63331,6 +67670,7 @@
               "version": 142
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -63342,6 +67682,7 @@
               "version": 143
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -63353,6 +67694,7 @@
               "version": 144
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -63364,6 +67706,7 @@
               "version": 145
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -63375,6 +67718,7 @@
               "version": 146
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -63386,6 +67730,7 @@
               "version": 147
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -63397,6 +67742,7 @@
               "version": 148
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -63408,6 +67754,7 @@
               "version": 149
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -63419,6 +67766,7 @@
               "version": 150
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -63430,6 +67778,7 @@
               "version": 151
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -63441,6 +67790,7 @@
               "version": 152
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -63452,6 +67802,7 @@
               "version": 153
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -63463,6 +67814,7 @@
               "version": 154
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -63474,6 +67826,7 @@
               "version": 155
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -63485,6 +67838,7 @@
               "version": 156
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -63496,6 +67850,7 @@
               "version": 157
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -63507,6 +67862,7 @@
               "version": 158
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -63518,6 +67874,7 @@
               "version": 159
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -63529,6 +67886,7 @@
               "version": 160
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -63540,6 +67898,7 @@
               "version": 161
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -63551,6 +67910,7 @@
               "version": 162
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -63562,6 +67922,7 @@
               "version": 163
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -63573,6 +67934,7 @@
               "version": 164
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -63584,6 +67946,7 @@
               "version": 165
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -63595,6 +67958,7 @@
               "version": 166
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -63606,6 +67970,7 @@
               "version": 167
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -63617,6 +67982,7 @@
               "version": 168
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -63628,6 +67994,7 @@
               "version": 169
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -63639,6 +68006,7 @@
               "version": 170
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -63650,6 +68018,7 @@
               "version": 171
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -63661,6 +68030,7 @@
               "version": 172
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -63672,6 +68042,7 @@
               "version": 173
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -63683,6 +68054,7 @@
               "version": 174
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -63694,6 +68066,7 @@
               "version": 175
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -63705,6 +68078,7 @@
               "version": 176
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -63716,6 +68090,7 @@
               "version": 177
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -63727,6 +68102,7 @@
               "version": 178
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -63738,6 +68114,7 @@
               "version": 179
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -63749,6 +68126,7 @@
               "version": 180
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -63760,6 +68138,7 @@
               "version": 181
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -63771,6 +68150,7 @@
               "version": 182
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -63782,6 +68162,7 @@
               "version": 183
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -63793,6 +68174,7 @@
               "version": 184
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -63804,6 +68186,7 @@
               "version": 185
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -63815,6 +68198,7 @@
               "version": 186
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -63826,6 +68210,7 @@
               "version": 187
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -63837,6 +68222,7 @@
               "version": 188
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -63848,6 +68234,7 @@
               "version": 189
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -63859,6 +68246,7 @@
               "version": 190
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -63870,6 +68258,7 @@
               "version": 191
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -63881,6 +68270,7 @@
               "version": 192
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -63892,6 +68282,7 @@
               "version": 193
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -63903,6 +68294,7 @@
               "version": 194
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -63914,6 +68306,7 @@
               "version": 195
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -63925,6 +68318,7 @@
               "version": 196
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -63936,6 +68330,7 @@
               "version": 197
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -63947,6 +68342,7 @@
               "version": 198
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -63958,6 +68354,7 @@
               "version": 199
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -63969,6 +68366,7 @@
               "version": 200
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -63980,6 +68378,7 @@
               "version": 201
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -63991,6 +68390,7 @@
               "version": 202
             },
             {
+              "createTime": 0,
               "key": "collection/2/coll/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -64025,6 +68425,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64036,6 +68437,7 @@
                 "version": 104
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64047,6 +68449,7 @@
                 "version": 105
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64058,6 +68461,7 @@
                 "version": 106
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64069,6 +68473,7 @@
                 "version": 107
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64080,6 +68485,7 @@
                 "version": 108
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64091,6 +68497,7 @@
                 "version": 109
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64102,6 +68509,7 @@
                 "version": 110
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64113,6 +68521,7 @@
                 "version": 111
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64124,6 +68533,7 @@
                 "version": 112
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64135,6 +68545,7 @@
                 "version": 113
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64146,6 +68557,7 @@
                 "version": 114
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64157,6 +68569,7 @@
                 "version": 115
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64168,6 +68581,7 @@
                 "version": 116
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64179,6 +68593,7 @@
                 "version": 117
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64190,6 +68605,7 @@
                 "version": 118
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64201,6 +68617,7 @@
                 "version": 119
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64212,6 +68629,7 @@
                 "version": 120
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64223,6 +68641,7 @@
                 "version": 121
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64234,6 +68653,7 @@
                 "version": 122
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64245,6 +68665,7 @@
                 "version": 123
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64256,6 +68677,7 @@
                 "version": 124
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64267,6 +68689,7 @@
                 "version": 125
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64278,6 +68701,7 @@
                 "version": 126
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64289,6 +68713,7 @@
                 "version": 127
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64300,6 +68725,7 @@
                 "version": 128
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64311,6 +68737,7 @@
                 "version": 129
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64322,6 +68749,7 @@
                 "version": 130
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64333,6 +68761,7 @@
                 "version": 131
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64344,6 +68773,7 @@
                 "version": 132
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64355,6 +68785,7 @@
                 "version": 133
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64366,6 +68797,7 @@
                 "version": 134
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64377,6 +68809,7 @@
                 "version": 135
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64388,6 +68821,7 @@
                 "version": 136
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64399,6 +68833,7 @@
                 "version": 137
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64410,6 +68845,7 @@
                 "version": 138
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64421,6 +68857,7 @@
                 "version": 139
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64432,6 +68869,7 @@
                 "version": 140
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64443,6 +68881,7 @@
                 "version": 141
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64454,6 +68893,7 @@
                 "version": 142
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64465,6 +68905,7 @@
                 "version": 143
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64476,6 +68917,7 @@
                 "version": 144
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64487,6 +68929,7 @@
                 "version": 145
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64498,6 +68941,7 @@
                 "version": 146
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64509,6 +68953,7 @@
                 "version": 147
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64520,6 +68965,7 @@
                 "version": 148
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64531,6 +68977,7 @@
                 "version": 149
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64542,6 +68989,7 @@
                 "version": 150
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64553,6 +69001,7 @@
                 "version": 151
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64564,6 +69013,7 @@
                 "version": 152
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64575,6 +69025,7 @@
                 "version": 153
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64586,6 +69037,7 @@
                 "version": 154
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64597,6 +69049,7 @@
                 "version": 155
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64608,6 +69061,7 @@
                 "version": 156
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64619,6 +69073,7 @@
                 "version": 157
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64630,6 +69085,7 @@
                 "version": 158
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64641,6 +69097,7 @@
                 "version": 159
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64652,6 +69109,7 @@
                 "version": 160
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64663,6 +69121,7 @@
                 "version": 161
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64674,6 +69133,7 @@
                 "version": 162
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64685,6 +69145,7 @@
                 "version": 163
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64696,6 +69157,7 @@
                 "version": 164
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64707,6 +69169,7 @@
                 "version": 165
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64718,6 +69181,7 @@
                 "version": 166
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64729,6 +69193,7 @@
                 "version": 167
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64740,6 +69205,7 @@
                 "version": 168
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64751,6 +69217,7 @@
                 "version": 169
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64762,6 +69229,7 @@
                 "version": 170
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64773,6 +69241,7 @@
                 "version": 171
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64784,6 +69253,7 @@
                 "version": 172
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64795,6 +69265,7 @@
                 "version": 173
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64806,6 +69277,7 @@
                 "version": 174
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64817,6 +69289,7 @@
                 "version": 175
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64828,6 +69301,7 @@
                 "version": 176
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64839,6 +69313,7 @@
                 "version": 177
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64850,6 +69325,7 @@
                 "version": 178
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64861,6 +69337,7 @@
                 "version": 179
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64872,6 +69349,7 @@
                 "version": 180
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64883,6 +69361,7 @@
                 "version": 181
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64894,6 +69373,7 @@
                 "version": 182
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64905,6 +69385,7 @@
                 "version": 183
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64916,6 +69397,7 @@
                 "version": 184
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64927,6 +69409,7 @@
                 "version": 185
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64938,6 +69421,7 @@
                 "version": 186
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64949,6 +69433,7 @@
                 "version": 187
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64960,6 +69445,7 @@
                 "version": 188
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64971,6 +69457,7 @@
                 "version": 189
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64982,6 +69469,7 @@
                 "version": 190
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -64993,6 +69481,7 @@
                 "version": 191
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65004,6 +69493,7 @@
                 "version": 192
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65015,6 +69505,7 @@
                 "version": 193
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65026,6 +69517,7 @@
                 "version": 194
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65037,6 +69529,7 @@
                 "version": 195
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65048,6 +69541,7 @@
                 "version": 196
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65059,6 +69553,7 @@
                 "version": 197
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65070,6 +69565,7 @@
                 "version": 198
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65081,6 +69577,7 @@
                 "version": 199
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65092,6 +69589,7 @@
                 "version": 200
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65103,6 +69601,7 @@
                 "version": 201
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65114,6 +69613,7 @@
                 "version": 202
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65188,6 +69688,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65199,6 +69700,7 @@
                 "version": 104
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65210,6 +69712,7 @@
                 "version": 105
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65221,6 +69724,7 @@
                 "version": 106
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65232,6 +69736,7 @@
                 "version": 107
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65243,6 +69748,7 @@
                 "version": 108
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65254,6 +69760,7 @@
                 "version": 109
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65265,6 +69772,7 @@
                 "version": 110
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65276,6 +69784,7 @@
                 "version": 111
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65287,6 +69796,7 @@
                 "version": 112
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65298,6 +69808,7 @@
                 "version": 113
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65309,6 +69820,7 @@
                 "version": 114
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65320,6 +69832,7 @@
                 "version": 115
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65331,6 +69844,7 @@
                 "version": 116
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65342,6 +69856,7 @@
                 "version": 117
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65353,6 +69868,7 @@
                 "version": 118
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65364,6 +69880,7 @@
                 "version": 119
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65375,6 +69892,7 @@
                 "version": 120
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65386,6 +69904,7 @@
                 "version": 121
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65397,6 +69916,7 @@
                 "version": 122
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65408,6 +69928,7 @@
                 "version": 123
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65419,6 +69940,7 @@
                 "version": 124
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65430,6 +69952,7 @@
                 "version": 125
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65441,6 +69964,7 @@
                 "version": 126
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65452,6 +69976,7 @@
                 "version": 127
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65463,6 +69988,7 @@
                 "version": 128
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65474,6 +70000,7 @@
                 "version": 129
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65485,6 +70012,7 @@
                 "version": 130
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65496,6 +70024,7 @@
                 "version": 131
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65507,6 +70036,7 @@
                 "version": 132
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65518,6 +70048,7 @@
                 "version": 133
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65529,6 +70060,7 @@
                 "version": 134
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65540,6 +70072,7 @@
                 "version": 135
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65551,6 +70084,7 @@
                 "version": 136
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65562,6 +70096,7 @@
                 "version": 137
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65573,6 +70108,7 @@
                 "version": 138
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65584,6 +70120,7 @@
                 "version": 139
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65595,6 +70132,7 @@
                 "version": 140
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65606,6 +70144,7 @@
                 "version": 141
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65617,6 +70156,7 @@
                 "version": 142
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65628,6 +70168,7 @@
                 "version": 143
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65639,6 +70180,7 @@
                 "version": 144
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65650,6 +70192,7 @@
                 "version": 145
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65661,6 +70204,7 @@
                 "version": 146
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65672,6 +70216,7 @@
                 "version": 147
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65683,6 +70228,7 @@
                 "version": 148
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65694,6 +70240,7 @@
                 "version": 149
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65705,6 +70252,7 @@
                 "version": 150
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65716,6 +70264,7 @@
                 "version": 151
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65727,6 +70276,7 @@
                 "version": 152
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65738,6 +70288,7 @@
                 "version": 153
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65749,6 +70300,7 @@
                 "version": 154
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65760,6 +70312,7 @@
                 "version": 155
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65771,6 +70324,7 @@
                 "version": 156
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65782,6 +70336,7 @@
                 "version": 157
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65793,6 +70348,7 @@
                 "version": 158
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65804,6 +70360,7 @@
                 "version": 159
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65815,6 +70372,7 @@
                 "version": 160
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65826,6 +70384,7 @@
                 "version": 161
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65837,6 +70396,7 @@
                 "version": 162
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65848,6 +70408,7 @@
                 "version": 163
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65859,6 +70420,7 @@
                 "version": 164
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65870,6 +70432,7 @@
                 "version": 165
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65881,6 +70444,7 @@
                 "version": 166
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65892,6 +70456,7 @@
                 "version": 167
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65903,6 +70468,7 @@
                 "version": 168
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65914,6 +70480,7 @@
                 "version": 169
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65925,6 +70492,7 @@
                 "version": 170
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65936,6 +70504,7 @@
                 "version": 171
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65947,6 +70516,7 @@
                 "version": 172
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65958,6 +70528,7 @@
                 "version": 173
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65969,6 +70540,7 @@
                 "version": 174
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65980,6 +70552,7 @@
                 "version": 175
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -65991,6 +70564,7 @@
                 "version": 176
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66002,6 +70576,7 @@
                 "version": 177
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66013,6 +70588,7 @@
                 "version": 178
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66024,6 +70600,7 @@
                 "version": 179
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66035,6 +70612,7 @@
                 "version": 180
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66046,6 +70624,7 @@
                 "version": 181
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66057,6 +70636,7 @@
                 "version": 182
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66068,6 +70648,7 @@
                 "version": 183
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66079,6 +70660,7 @@
                 "version": 184
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66090,6 +70672,7 @@
                 "version": 185
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66101,6 +70684,7 @@
                 "version": 186
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66112,6 +70696,7 @@
                 "version": 187
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66123,6 +70708,7 @@
                 "version": 188
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66134,6 +70720,7 @@
                 "version": 189
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66145,6 +70732,7 @@
                 "version": 190
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66156,6 +70744,7 @@
                 "version": 191
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66167,6 +70756,7 @@
                 "version": 192
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66178,6 +70768,7 @@
                 "version": 193
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66189,6 +70780,7 @@
                 "version": 194
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66200,6 +70792,7 @@
                 "version": 195
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66211,6 +70804,7 @@
                 "version": 196
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66222,6 +70816,7 @@
                 "version": 197
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66233,6 +70828,7 @@
                 "version": 198
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66244,6 +70840,7 @@
                 "version": 199
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66255,6 +70852,7 @@
                 "version": 200
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66266,6 +70864,7 @@
                 "version": 201
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66277,6 +70876,7 @@
                 "version": 202
               },
               {
+                "createTime": 0,
                 "key": "collection/2/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -66444,6 +71044,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/3/coll/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -66455,6 +71056,7 @@
               "version": 206
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -66466,6 +71068,7 @@
               "version": 207
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -66477,6 +71080,7 @@
               "version": 208
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -66488,6 +71092,7 @@
               "version": 209
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -66499,6 +71104,7 @@
               "version": 210
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -66510,6 +71116,7 @@
               "version": 211
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -66521,6 +71128,7 @@
               "version": 212
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -66532,6 +71140,7 @@
               "version": 213
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -66543,6 +71152,7 @@
               "version": 214
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -66554,6 +71164,7 @@
               "version": 215
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -66565,6 +71176,7 @@
               "version": 216
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -66576,6 +71188,7 @@
               "version": 217
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -66587,6 +71200,7 @@
               "version": 218
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -66598,6 +71212,7 @@
               "version": 219
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -66609,6 +71224,7 @@
               "version": 220
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -66620,6 +71236,7 @@
               "version": 221
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -66631,6 +71248,7 @@
               "version": 222
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -66642,6 +71260,7 @@
               "version": 223
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -66653,6 +71272,7 @@
               "version": 224
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -66664,6 +71284,7 @@
               "version": 225
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -66675,6 +71296,7 @@
               "version": 226
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -66686,6 +71308,7 @@
               "version": 227
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -66697,6 +71320,7 @@
               "version": 228
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -66708,6 +71332,7 @@
               "version": 229
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -66719,6 +71344,7 @@
               "version": 230
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -66730,6 +71356,7 @@
               "version": 231
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -66741,6 +71368,7 @@
               "version": 232
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -66752,6 +71380,7 @@
               "version": 233
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -66763,6 +71392,7 @@
               "version": 234
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -66774,6 +71404,7 @@
               "version": 235
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -66785,6 +71416,7 @@
               "version": 236
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -66796,6 +71428,7 @@
               "version": 237
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -66807,6 +71440,7 @@
               "version": 238
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -66818,6 +71452,7 @@
               "version": 239
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -66829,6 +71464,7 @@
               "version": 240
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -66840,6 +71476,7 @@
               "version": 241
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -66851,6 +71488,7 @@
               "version": 242
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -66862,6 +71500,7 @@
               "version": 243
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -66873,6 +71512,7 @@
               "version": 244
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -66884,6 +71524,7 @@
               "version": 245
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -66895,6 +71536,7 @@
               "version": 246
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -66906,6 +71548,7 @@
               "version": 247
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -66917,6 +71560,7 @@
               "version": 248
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -66928,6 +71572,7 @@
               "version": 249
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -66939,6 +71584,7 @@
               "version": 250
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -66950,6 +71596,7 @@
               "version": 251
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -66961,6 +71608,7 @@
               "version": 252
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -66972,6 +71620,7 @@
               "version": 253
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -66983,6 +71632,7 @@
               "version": 254
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -66994,6 +71644,7 @@
               "version": 255
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -67005,6 +71656,7 @@
               "version": 256
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -67016,6 +71668,7 @@
               "version": 257
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -67027,6 +71680,7 @@
               "version": 258
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -67038,6 +71692,7 @@
               "version": 259
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -67049,6 +71704,7 @@
               "version": 260
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -67060,6 +71716,7 @@
               "version": 261
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -67071,6 +71728,7 @@
               "version": 262
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -67082,6 +71740,7 @@
               "version": 263
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -67093,6 +71752,7 @@
               "version": 264
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -67104,6 +71764,7 @@
               "version": 265
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -67115,6 +71776,7 @@
               "version": 266
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -67126,6 +71788,7 @@
               "version": 267
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -67137,6 +71800,7 @@
               "version": 268
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -67148,6 +71812,7 @@
               "version": 269
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -67159,6 +71824,7 @@
               "version": 270
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -67170,6 +71836,7 @@
               "version": 271
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -67181,6 +71848,7 @@
               "version": 272
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -67192,6 +71860,7 @@
               "version": 273
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -67203,6 +71872,7 @@
               "version": 274
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -67214,6 +71884,7 @@
               "version": 275
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -67225,6 +71896,7 @@
               "version": 276
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -67236,6 +71908,7 @@
               "version": 277
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -67247,6 +71920,7 @@
               "version": 278
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -67258,6 +71932,7 @@
               "version": 279
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -67269,6 +71944,7 @@
               "version": 280
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -67280,6 +71956,7 @@
               "version": 281
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -67291,6 +71968,7 @@
               "version": 282
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -67302,6 +71980,7 @@
               "version": 283
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -67313,6 +71992,7 @@
               "version": 284
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -67324,6 +72004,7 @@
               "version": 285
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -67335,6 +72016,7 @@
               "version": 286
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -67346,6 +72028,7 @@
               "version": 287
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -67357,6 +72040,7 @@
               "version": 288
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -67368,6 +72052,7 @@
               "version": 289
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -67379,6 +72064,7 @@
               "version": 290
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -67390,6 +72076,7 @@
               "version": 291
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -67401,6 +72088,7 @@
               "version": 292
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -67412,6 +72100,7 @@
               "version": 293
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -67423,6 +72112,7 @@
               "version": 294
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -67434,6 +72124,7 @@
               "version": 295
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -67445,6 +72136,7 @@
               "version": 296
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -67456,6 +72148,7 @@
               "version": 297
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -67467,6 +72160,7 @@
               "version": 298
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -67478,6 +72172,7 @@
               "version": 299
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -67489,6 +72184,7 @@
               "version": 300
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -67500,6 +72196,7 @@
               "version": 301
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -67511,6 +72208,7 @@
               "version": 302
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -67522,6 +72220,7 @@
               "version": 303
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -67533,6 +72232,7 @@
               "version": 304
             },
             {
+              "createTime": 0,
               "key": "collection/3/coll/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -67567,6 +72267,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67578,6 +72279,7 @@
                 "version": 206
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67589,6 +72291,7 @@
                 "version": 207
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67600,6 +72303,7 @@
                 "version": 208
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67611,6 +72315,7 @@
                 "version": 209
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67622,6 +72327,7 @@
                 "version": 210
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67633,6 +72339,7 @@
                 "version": 211
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67644,6 +72351,7 @@
                 "version": 212
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67655,6 +72363,7 @@
                 "version": 213
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67666,6 +72375,7 @@
                 "version": 214
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67677,6 +72387,7 @@
                 "version": 215
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67688,6 +72399,7 @@
                 "version": 216
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67699,6 +72411,7 @@
                 "version": 217
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67710,6 +72423,7 @@
                 "version": 218
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67721,6 +72435,7 @@
                 "version": 219
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67732,6 +72447,7 @@
                 "version": 220
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67743,6 +72459,7 @@
                 "version": 221
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67754,6 +72471,7 @@
                 "version": 222
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67765,6 +72483,7 @@
                 "version": 223
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67776,6 +72495,7 @@
                 "version": 224
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67787,6 +72507,7 @@
                 "version": 225
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67798,6 +72519,7 @@
                 "version": 226
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67809,6 +72531,7 @@
                 "version": 227
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67820,6 +72543,7 @@
                 "version": 228
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67831,6 +72555,7 @@
                 "version": 229
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67842,6 +72567,7 @@
                 "version": 230
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67853,6 +72579,7 @@
                 "version": 231
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67864,6 +72591,7 @@
                 "version": 232
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67875,6 +72603,7 @@
                 "version": 233
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67886,6 +72615,7 @@
                 "version": 234
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67897,6 +72627,7 @@
                 "version": 235
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67908,6 +72639,7 @@
                 "version": 236
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67919,6 +72651,7 @@
                 "version": 237
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67930,6 +72663,7 @@
                 "version": 238
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67941,6 +72675,7 @@
                 "version": 239
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67952,6 +72687,7 @@
                 "version": 240
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67963,6 +72699,7 @@
                 "version": 241
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67974,6 +72711,7 @@
                 "version": 242
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67985,6 +72723,7 @@
                 "version": 243
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -67996,6 +72735,7 @@
                 "version": 244
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68007,6 +72747,7 @@
                 "version": 245
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68018,6 +72759,7 @@
                 "version": 246
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68029,6 +72771,7 @@
                 "version": 247
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68040,6 +72783,7 @@
                 "version": 248
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68051,6 +72795,7 @@
                 "version": 249
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68062,6 +72807,7 @@
                 "version": 250
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68073,6 +72819,7 @@
                 "version": 251
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68084,6 +72831,7 @@
                 "version": 252
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68095,6 +72843,7 @@
                 "version": 253
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68106,6 +72855,7 @@
                 "version": 254
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68117,6 +72867,7 @@
                 "version": 255
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68128,6 +72879,7 @@
                 "version": 256
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68139,6 +72891,7 @@
                 "version": 257
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68150,6 +72903,7 @@
                 "version": 258
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68161,6 +72915,7 @@
                 "version": 259
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68172,6 +72927,7 @@
                 "version": 260
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68183,6 +72939,7 @@
                 "version": 261
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68194,6 +72951,7 @@
                 "version": 262
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68205,6 +72963,7 @@
                 "version": 263
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68216,6 +72975,7 @@
                 "version": 264
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68227,6 +72987,7 @@
                 "version": 265
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68238,6 +72999,7 @@
                 "version": 266
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68249,6 +73011,7 @@
                 "version": 267
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68260,6 +73023,7 @@
                 "version": 268
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68271,6 +73035,7 @@
                 "version": 269
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68282,6 +73047,7 @@
                 "version": 270
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68293,6 +73059,7 @@
                 "version": 271
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68304,6 +73071,7 @@
                 "version": 272
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68315,6 +73083,7 @@
                 "version": 273
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68326,6 +73095,7 @@
                 "version": 274
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68337,6 +73107,7 @@
                 "version": 275
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68348,6 +73119,7 @@
                 "version": 276
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68359,6 +73131,7 @@
                 "version": 277
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68370,6 +73143,7 @@
                 "version": 278
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68381,6 +73155,7 @@
                 "version": 279
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68392,6 +73167,7 @@
                 "version": 280
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68403,6 +73179,7 @@
                 "version": 281
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68414,6 +73191,7 @@
                 "version": 282
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68425,6 +73203,7 @@
                 "version": 283
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68436,6 +73215,7 @@
                 "version": 284
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68447,6 +73227,7 @@
                 "version": 285
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68458,6 +73239,7 @@
                 "version": 286
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68469,6 +73251,7 @@
                 "version": 287
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68480,6 +73263,7 @@
                 "version": 288
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68491,6 +73275,7 @@
                 "version": 289
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68502,6 +73287,7 @@
                 "version": 290
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68513,6 +73299,7 @@
                 "version": 291
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68524,6 +73311,7 @@
                 "version": 292
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68535,6 +73323,7 @@
                 "version": 293
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68546,6 +73335,7 @@
                 "version": 294
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68557,6 +73347,7 @@
                 "version": 295
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68568,6 +73359,7 @@
                 "version": 296
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68579,6 +73371,7 @@
                 "version": 297
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68590,6 +73383,7 @@
                 "version": 298
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68601,6 +73395,7 @@
                 "version": 299
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68612,6 +73407,7 @@
                 "version": 300
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68623,6 +73419,7 @@
                 "version": 301
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68634,6 +73431,7 @@
                 "version": 302
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68645,6 +73443,7 @@
                 "version": 303
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68656,6 +73455,7 @@
                 "version": 304
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68730,6 +73530,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68741,6 +73542,7 @@
                 "version": 206
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68752,6 +73554,7 @@
                 "version": 207
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68763,6 +73566,7 @@
                 "version": 208
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68774,6 +73578,7 @@
                 "version": 209
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68785,6 +73590,7 @@
                 "version": 210
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68796,6 +73602,7 @@
                 "version": 211
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68807,6 +73614,7 @@
                 "version": 212
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68818,6 +73626,7 @@
                 "version": 213
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68829,6 +73638,7 @@
                 "version": 214
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68840,6 +73650,7 @@
                 "version": 215
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68851,6 +73662,7 @@
                 "version": 216
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68862,6 +73674,7 @@
                 "version": 217
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68873,6 +73686,7 @@
                 "version": 218
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68884,6 +73698,7 @@
                 "version": 219
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68895,6 +73710,7 @@
                 "version": 220
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68906,6 +73722,7 @@
                 "version": 221
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68917,6 +73734,7 @@
                 "version": 222
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68928,6 +73746,7 @@
                 "version": 223
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68939,6 +73758,7 @@
                 "version": 224
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68950,6 +73770,7 @@
                 "version": 225
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68961,6 +73782,7 @@
                 "version": 226
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68972,6 +73794,7 @@
                 "version": 227
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68983,6 +73806,7 @@
                 "version": 228
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -68994,6 +73818,7 @@
                 "version": 229
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69005,6 +73830,7 @@
                 "version": 230
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69016,6 +73842,7 @@
                 "version": 231
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69027,6 +73854,7 @@
                 "version": 232
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69038,6 +73866,7 @@
                 "version": 233
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69049,6 +73878,7 @@
                 "version": 234
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69060,6 +73890,7 @@
                 "version": 235
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69071,6 +73902,7 @@
                 "version": 236
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69082,6 +73914,7 @@
                 "version": 237
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69093,6 +73926,7 @@
                 "version": 238
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69104,6 +73938,7 @@
                 "version": 239
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69115,6 +73950,7 @@
                 "version": 240
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69126,6 +73962,7 @@
                 "version": 241
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69137,6 +73974,7 @@
                 "version": 242
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69148,6 +73986,7 @@
                 "version": 243
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69159,6 +73998,7 @@
                 "version": 244
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69170,6 +74010,7 @@
                 "version": 245
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69181,6 +74022,7 @@
                 "version": 246
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69192,6 +74034,7 @@
                 "version": 247
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69203,6 +74046,7 @@
                 "version": 248
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69214,6 +74058,7 @@
                 "version": 249
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69225,6 +74070,7 @@
                 "version": 250
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69236,6 +74082,7 @@
                 "version": 251
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69247,6 +74094,7 @@
                 "version": 252
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69258,6 +74106,7 @@
                 "version": 253
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69269,6 +74118,7 @@
                 "version": 254
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69280,6 +74130,7 @@
                 "version": 255
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69291,6 +74142,7 @@
                 "version": 256
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69302,6 +74154,7 @@
                 "version": 257
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69313,6 +74166,7 @@
                 "version": 258
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69324,6 +74178,7 @@
                 "version": 259
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69335,6 +74190,7 @@
                 "version": 260
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69346,6 +74202,7 @@
                 "version": 261
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69357,6 +74214,7 @@
                 "version": 262
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69368,6 +74226,7 @@
                 "version": 263
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69379,6 +74238,7 @@
                 "version": 264
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69390,6 +74250,7 @@
                 "version": 265
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69401,6 +74262,7 @@
                 "version": 266
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69412,6 +74274,7 @@
                 "version": 267
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69423,6 +74286,7 @@
                 "version": 268
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69434,6 +74298,7 @@
                 "version": 269
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69445,6 +74310,7 @@
                 "version": 270
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69456,6 +74322,7 @@
                 "version": 271
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69467,6 +74334,7 @@
                 "version": 272
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69478,6 +74346,7 @@
                 "version": 273
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69489,6 +74358,7 @@
                 "version": 274
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69500,6 +74370,7 @@
                 "version": 275
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69511,6 +74382,7 @@
                 "version": 276
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69522,6 +74394,7 @@
                 "version": 277
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69533,6 +74406,7 @@
                 "version": 278
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69544,6 +74418,7 @@
                 "version": 279
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69555,6 +74430,7 @@
                 "version": 280
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69566,6 +74442,7 @@
                 "version": 281
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69577,6 +74454,7 @@
                 "version": 282
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69588,6 +74466,7 @@
                 "version": 283
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69599,6 +74478,7 @@
                 "version": 284
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69610,6 +74490,7 @@
                 "version": 285
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69621,6 +74502,7 @@
                 "version": 286
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69632,6 +74514,7 @@
                 "version": 287
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69643,6 +74526,7 @@
                 "version": 288
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69654,6 +74538,7 @@
                 "version": 289
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69665,6 +74550,7 @@
                 "version": 290
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69676,6 +74562,7 @@
                 "version": 291
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69687,6 +74574,7 @@
                 "version": 292
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69698,6 +74586,7 @@
                 "version": 293
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69709,6 +74598,7 @@
                 "version": 294
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69720,6 +74610,7 @@
                 "version": 295
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69731,6 +74622,7 @@
                 "version": 296
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69742,6 +74634,7 @@
                 "version": 297
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69753,6 +74646,7 @@
                 "version": 298
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69764,6 +74658,7 @@
                 "version": 299
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69775,6 +74670,7 @@
                 "version": 300
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69786,6 +74682,7 @@
                 "version": 301
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69797,6 +74694,7 @@
                 "version": 302
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69808,6 +74706,7 @@
                 "version": 303
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69819,6 +74718,7 @@
                 "version": 304
               },
               {
+                "createTime": 0,
                 "key": "collection/3/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -69986,6 +74886,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/4/coll/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -69997,6 +74898,7 @@
               "version": 308
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -70008,6 +74910,7 @@
               "version": 309
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -70019,6 +74922,7 @@
               "version": 310
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -70030,6 +74934,7 @@
               "version": 311
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -70041,6 +74946,7 @@
               "version": 312
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -70052,6 +74958,7 @@
               "version": 313
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -70063,6 +74970,7 @@
               "version": 314
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -70074,6 +74982,7 @@
               "version": 315
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -70085,6 +74994,7 @@
               "version": 316
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -70096,6 +75006,7 @@
               "version": 317
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -70107,6 +75018,7 @@
               "version": 318
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -70118,6 +75030,7 @@
               "version": 319
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -70129,6 +75042,7 @@
               "version": 320
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -70140,6 +75054,7 @@
               "version": 321
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -70151,6 +75066,7 @@
               "version": 322
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -70162,6 +75078,7 @@
               "version": 323
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -70173,6 +75090,7 @@
               "version": 324
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -70184,6 +75102,7 @@
               "version": 325
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -70195,6 +75114,7 @@
               "version": 326
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -70206,6 +75126,7 @@
               "version": 327
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -70217,6 +75138,7 @@
               "version": 328
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -70228,6 +75150,7 @@
               "version": 329
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -70239,6 +75162,7 @@
               "version": 330
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -70250,6 +75174,7 @@
               "version": 331
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -70261,6 +75186,7 @@
               "version": 332
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -70272,6 +75198,7 @@
               "version": 333
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -70283,6 +75210,7 @@
               "version": 334
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -70294,6 +75222,7 @@
               "version": 335
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -70305,6 +75234,7 @@
               "version": 336
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -70316,6 +75246,7 @@
               "version": 337
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -70327,6 +75258,7 @@
               "version": 338
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -70338,6 +75270,7 @@
               "version": 339
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -70349,6 +75282,7 @@
               "version": 340
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -70360,6 +75294,7 @@
               "version": 341
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -70371,6 +75306,7 @@
               "version": 342
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -70382,6 +75318,7 @@
               "version": 343
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -70393,6 +75330,7 @@
               "version": 344
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -70404,6 +75342,7 @@
               "version": 345
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -70415,6 +75354,7 @@
               "version": 346
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -70426,6 +75366,7 @@
               "version": 347
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -70437,6 +75378,7 @@
               "version": 348
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -70448,6 +75390,7 @@
               "version": 349
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -70459,6 +75402,7 @@
               "version": 350
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -70470,6 +75414,7 @@
               "version": 351
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -70481,6 +75426,7 @@
               "version": 352
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -70492,6 +75438,7 @@
               "version": 353
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -70503,6 +75450,7 @@
               "version": 354
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -70514,6 +75462,7 @@
               "version": 355
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -70525,6 +75474,7 @@
               "version": 356
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -70536,6 +75486,7 @@
               "version": 357
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -70547,6 +75498,7 @@
               "version": 358
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -70558,6 +75510,7 @@
               "version": 359
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -70569,6 +75522,7 @@
               "version": 360
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -70580,6 +75534,7 @@
               "version": 361
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -70591,6 +75546,7 @@
               "version": 362
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -70602,6 +75558,7 @@
               "version": 363
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -70613,6 +75570,7 @@
               "version": 364
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -70624,6 +75582,7 @@
               "version": 365
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -70635,6 +75594,7 @@
               "version": 366
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -70646,6 +75606,7 @@
               "version": 367
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -70657,6 +75618,7 @@
               "version": 368
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -70668,6 +75630,7 @@
               "version": 369
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -70679,6 +75642,7 @@
               "version": 370
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -70690,6 +75654,7 @@
               "version": 371
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -70701,6 +75666,7 @@
               "version": 372
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -70712,6 +75678,7 @@
               "version": 373
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -70723,6 +75690,7 @@
               "version": 374
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -70734,6 +75702,7 @@
               "version": 375
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -70745,6 +75714,7 @@
               "version": 376
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -70756,6 +75726,7 @@
               "version": 377
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -70767,6 +75738,7 @@
               "version": 378
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -70778,6 +75750,7 @@
               "version": 379
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -70789,6 +75762,7 @@
               "version": 380
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -70800,6 +75774,7 @@
               "version": 381
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -70811,6 +75786,7 @@
               "version": 382
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -70822,6 +75798,7 @@
               "version": 383
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -70833,6 +75810,7 @@
               "version": 384
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -70844,6 +75822,7 @@
               "version": 385
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -70855,6 +75834,7 @@
               "version": 386
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -70866,6 +75846,7 @@
               "version": 387
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -70877,6 +75858,7 @@
               "version": 388
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -70888,6 +75870,7 @@
               "version": 389
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -70899,6 +75882,7 @@
               "version": 390
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -70910,6 +75894,7 @@
               "version": 391
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -70921,6 +75906,7 @@
               "version": 392
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -70932,6 +75918,7 @@
               "version": 393
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -70943,6 +75930,7 @@
               "version": 394
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -70954,6 +75942,7 @@
               "version": 395
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -70965,6 +75954,7 @@
               "version": 396
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -70976,6 +75966,7 @@
               "version": 397
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -70987,6 +75978,7 @@
               "version": 398
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -70998,6 +75990,7 @@
               "version": 399
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -71009,6 +76002,7 @@
               "version": 400
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -71020,6 +76014,7 @@
               "version": 401
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -71031,6 +76026,7 @@
               "version": 402
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -71042,6 +76038,7 @@
               "version": 403
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -71053,6 +76050,7 @@
               "version": 404
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -71064,6 +76062,7 @@
               "version": 405
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -71075,6 +76074,7 @@
               "version": 406
             },
             {
+              "createTime": 0,
               "key": "collection/4/coll/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -71109,6 +76109,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71120,6 +76121,7 @@
                 "version": 308
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71131,6 +76133,7 @@
                 "version": 309
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71142,6 +76145,7 @@
                 "version": 310
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71153,6 +76157,7 @@
                 "version": 311
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71164,6 +76169,7 @@
                 "version": 312
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71175,6 +76181,7 @@
                 "version": 313
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71186,6 +76193,7 @@
                 "version": 314
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71197,6 +76205,7 @@
                 "version": 315
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71208,6 +76217,7 @@
                 "version": 316
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71219,6 +76229,7 @@
                 "version": 317
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71230,6 +76241,7 @@
                 "version": 318
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71241,6 +76253,7 @@
                 "version": 319
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71252,6 +76265,7 @@
                 "version": 320
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71263,6 +76277,7 @@
                 "version": 321
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71274,6 +76289,7 @@
                 "version": 322
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71285,6 +76301,7 @@
                 "version": 323
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71296,6 +76313,7 @@
                 "version": 324
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71307,6 +76325,7 @@
                 "version": 325
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71318,6 +76337,7 @@
                 "version": 326
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71329,6 +76349,7 @@
                 "version": 327
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71340,6 +76361,7 @@
                 "version": 328
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71351,6 +76373,7 @@
                 "version": 329
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71362,6 +76385,7 @@
                 "version": 330
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71373,6 +76397,7 @@
                 "version": 331
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71384,6 +76409,7 @@
                 "version": 332
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71395,6 +76421,7 @@
                 "version": 333
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71406,6 +76433,7 @@
                 "version": 334
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71417,6 +76445,7 @@
                 "version": 335
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71428,6 +76457,7 @@
                 "version": 336
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71439,6 +76469,7 @@
                 "version": 337
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71450,6 +76481,7 @@
                 "version": 338
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71461,6 +76493,7 @@
                 "version": 339
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71472,6 +76505,7 @@
                 "version": 340
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71483,6 +76517,7 @@
                 "version": 341
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71494,6 +76529,7 @@
                 "version": 342
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71505,6 +76541,7 @@
                 "version": 343
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71516,6 +76553,7 @@
                 "version": 344
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71527,6 +76565,7 @@
                 "version": 345
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71538,6 +76577,7 @@
                 "version": 346
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71549,6 +76589,7 @@
                 "version": 347
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71560,6 +76601,7 @@
                 "version": 348
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71571,6 +76613,7 @@
                 "version": 349
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71582,6 +76625,7 @@
                 "version": 350
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71593,6 +76637,7 @@
                 "version": 351
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71604,6 +76649,7 @@
                 "version": 352
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71615,6 +76661,7 @@
                 "version": 353
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71626,6 +76673,7 @@
                 "version": 354
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71637,6 +76685,7 @@
                 "version": 355
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71648,6 +76697,7 @@
                 "version": 356
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71659,6 +76709,7 @@
                 "version": 357
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71670,6 +76721,7 @@
                 "version": 358
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71681,6 +76733,7 @@
                 "version": 359
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71692,6 +76745,7 @@
                 "version": 360
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71703,6 +76757,7 @@
                 "version": 361
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71714,6 +76769,7 @@
                 "version": 362
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71725,6 +76781,7 @@
                 "version": 363
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71736,6 +76793,7 @@
                 "version": 364
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71747,6 +76805,7 @@
                 "version": 365
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71758,6 +76817,7 @@
                 "version": 366
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71769,6 +76829,7 @@
                 "version": 367
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71780,6 +76841,7 @@
                 "version": 368
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71791,6 +76853,7 @@
                 "version": 369
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71802,6 +76865,7 @@
                 "version": 370
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71813,6 +76877,7 @@
                 "version": 371
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71824,6 +76889,7 @@
                 "version": 372
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71835,6 +76901,7 @@
                 "version": 373
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71846,6 +76913,7 @@
                 "version": 374
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71857,6 +76925,7 @@
                 "version": 375
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71868,6 +76937,7 @@
                 "version": 376
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71879,6 +76949,7 @@
                 "version": 377
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71890,6 +76961,7 @@
                 "version": 378
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71901,6 +76973,7 @@
                 "version": 379
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71912,6 +76985,7 @@
                 "version": 380
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71923,6 +76997,7 @@
                 "version": 381
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71934,6 +77009,7 @@
                 "version": 382
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71945,6 +77021,7 @@
                 "version": 383
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71956,6 +77033,7 @@
                 "version": 384
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71967,6 +77045,7 @@
                 "version": 385
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71978,6 +77057,7 @@
                 "version": 386
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -71989,6 +77069,7 @@
                 "version": 387
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72000,6 +77081,7 @@
                 "version": 388
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72011,6 +77093,7 @@
                 "version": 389
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72022,6 +77105,7 @@
                 "version": 390
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72033,6 +77117,7 @@
                 "version": 391
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72044,6 +77129,7 @@
                 "version": 392
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72055,6 +77141,7 @@
                 "version": 393
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72066,6 +77153,7 @@
                 "version": 394
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72077,6 +77165,7 @@
                 "version": 395
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72088,6 +77177,7 @@
                 "version": 396
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72099,6 +77189,7 @@
                 "version": 397
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72110,6 +77201,7 @@
                 "version": 398
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72121,6 +77213,7 @@
                 "version": 399
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72132,6 +77225,7 @@
                 "version": 400
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72143,6 +77237,7 @@
                 "version": 401
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72154,6 +77249,7 @@
                 "version": 402
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72165,6 +77261,7 @@
                 "version": 403
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72176,6 +77273,7 @@
                 "version": 404
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72187,6 +77285,7 @@
                 "version": 405
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72198,6 +77297,7 @@
                 "version": 406
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72272,6 +77372,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72283,6 +77384,7 @@
                 "version": 308
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72294,6 +77396,7 @@
                 "version": 309
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72305,6 +77408,7 @@
                 "version": 310
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72316,6 +77420,7 @@
                 "version": 311
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72327,6 +77432,7 @@
                 "version": 312
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72338,6 +77444,7 @@
                 "version": 313
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72349,6 +77456,7 @@
                 "version": 314
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72360,6 +77468,7 @@
                 "version": 315
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72371,6 +77480,7 @@
                 "version": 316
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72382,6 +77492,7 @@
                 "version": 317
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72393,6 +77504,7 @@
                 "version": 318
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72404,6 +77516,7 @@
                 "version": 319
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72415,6 +77528,7 @@
                 "version": 320
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72426,6 +77540,7 @@
                 "version": 321
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72437,6 +77552,7 @@
                 "version": 322
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72448,6 +77564,7 @@
                 "version": 323
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72459,6 +77576,7 @@
                 "version": 324
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72470,6 +77588,7 @@
                 "version": 325
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72481,6 +77600,7 @@
                 "version": 326
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72492,6 +77612,7 @@
                 "version": 327
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72503,6 +77624,7 @@
                 "version": 328
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72514,6 +77636,7 @@
                 "version": 329
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72525,6 +77648,7 @@
                 "version": 330
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72536,6 +77660,7 @@
                 "version": 331
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72547,6 +77672,7 @@
                 "version": 332
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72558,6 +77684,7 @@
                 "version": 333
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72569,6 +77696,7 @@
                 "version": 334
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72580,6 +77708,7 @@
                 "version": 335
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72591,6 +77720,7 @@
                 "version": 336
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72602,6 +77732,7 @@
                 "version": 337
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72613,6 +77744,7 @@
                 "version": 338
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72624,6 +77756,7 @@
                 "version": 339
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72635,6 +77768,7 @@
                 "version": 340
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72646,6 +77780,7 @@
                 "version": 341
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72657,6 +77792,7 @@
                 "version": 342
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72668,6 +77804,7 @@
                 "version": 343
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72679,6 +77816,7 @@
                 "version": 344
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72690,6 +77828,7 @@
                 "version": 345
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72701,6 +77840,7 @@
                 "version": 346
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72712,6 +77852,7 @@
                 "version": 347
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72723,6 +77864,7 @@
                 "version": 348
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72734,6 +77876,7 @@
                 "version": 349
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72745,6 +77888,7 @@
                 "version": 350
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72756,6 +77900,7 @@
                 "version": 351
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72767,6 +77912,7 @@
                 "version": 352
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72778,6 +77924,7 @@
                 "version": 353
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72789,6 +77936,7 @@
                 "version": 354
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72800,6 +77948,7 @@
                 "version": 355
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72811,6 +77960,7 @@
                 "version": 356
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72822,6 +77972,7 @@
                 "version": 357
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72833,6 +77984,7 @@
                 "version": 358
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72844,6 +77996,7 @@
                 "version": 359
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72855,6 +78008,7 @@
                 "version": 360
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72866,6 +78020,7 @@
                 "version": 361
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72877,6 +78032,7 @@
                 "version": 362
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72888,6 +78044,7 @@
                 "version": 363
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72899,6 +78056,7 @@
                 "version": 364
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72910,6 +78068,7 @@
                 "version": 365
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72921,6 +78080,7 @@
                 "version": 366
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72932,6 +78092,7 @@
                 "version": 367
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72943,6 +78104,7 @@
                 "version": 368
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72954,6 +78116,7 @@
                 "version": 369
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72965,6 +78128,7 @@
                 "version": 370
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72976,6 +78140,7 @@
                 "version": 371
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72987,6 +78152,7 @@
                 "version": 372
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -72998,6 +78164,7 @@
                 "version": 373
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73009,6 +78176,7 @@
                 "version": 374
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73020,6 +78188,7 @@
                 "version": 375
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73031,6 +78200,7 @@
                 "version": 376
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73042,6 +78212,7 @@
                 "version": 377
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73053,6 +78224,7 @@
                 "version": 378
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73064,6 +78236,7 @@
                 "version": 379
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73075,6 +78248,7 @@
                 "version": 380
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73086,6 +78260,7 @@
                 "version": 381
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73097,6 +78272,7 @@
                 "version": 382
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73108,6 +78284,7 @@
                 "version": 383
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73119,6 +78296,7 @@
                 "version": 384
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73130,6 +78308,7 @@
                 "version": 385
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73141,6 +78320,7 @@
                 "version": 386
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73152,6 +78332,7 @@
                 "version": 387
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73163,6 +78344,7 @@
                 "version": 388
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73174,6 +78356,7 @@
                 "version": 389
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73185,6 +78368,7 @@
                 "version": 390
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73196,6 +78380,7 @@
                 "version": 391
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73207,6 +78392,7 @@
                 "version": 392
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73218,6 +78404,7 @@
                 "version": 393
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73229,6 +78416,7 @@
                 "version": 394
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73240,6 +78428,7 @@
                 "version": 395
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73251,6 +78440,7 @@
                 "version": 396
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73262,6 +78452,7 @@
                 "version": 397
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73273,6 +78464,7 @@
                 "version": 398
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73284,6 +78476,7 @@
                 "version": 399
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73295,6 +78488,7 @@
                 "version": 400
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73306,6 +78500,7 @@
                 "version": 401
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73317,6 +78512,7 @@
                 "version": 402
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73328,6 +78524,7 @@
                 "version": 403
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73339,6 +78536,7 @@
                 "version": 404
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73350,6 +78548,7 @@
                 "version": 405
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73361,6 +78560,7 @@
                 "version": 406
               },
               {
+                "createTime": 0,
                 "key": "collection/4/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -73528,6 +78728,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/5/coll/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -73539,6 +78740,7 @@
               "version": 410
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -73550,6 +78752,7 @@
               "version": 411
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -73561,6 +78764,7 @@
               "version": 412
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -73572,6 +78776,7 @@
               "version": 413
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -73583,6 +78788,7 @@
               "version": 414
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -73594,6 +78800,7 @@
               "version": 415
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -73605,6 +78812,7 @@
               "version": 416
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -73616,6 +78824,7 @@
               "version": 417
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -73627,6 +78836,7 @@
               "version": 418
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -73638,6 +78848,7 @@
               "version": 419
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -73649,6 +78860,7 @@
               "version": 420
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -73660,6 +78872,7 @@
               "version": 421
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -73671,6 +78884,7 @@
               "version": 422
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -73682,6 +78896,7 @@
               "version": 423
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -73693,6 +78908,7 @@
               "version": 424
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -73704,6 +78920,7 @@
               "version": 425
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -73715,6 +78932,7 @@
               "version": 426
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -73726,6 +78944,7 @@
               "version": 427
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -73737,6 +78956,7 @@
               "version": 428
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -73748,6 +78968,7 @@
               "version": 429
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -73759,6 +78980,7 @@
               "version": 430
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -73770,6 +78992,7 @@
               "version": 431
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -73781,6 +79004,7 @@
               "version": 432
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -73792,6 +79016,7 @@
               "version": 433
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -73803,6 +79028,7 @@
               "version": 434
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -73814,6 +79040,7 @@
               "version": 435
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -73825,6 +79052,7 @@
               "version": 436
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -73836,6 +79064,7 @@
               "version": 437
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -73847,6 +79076,7 @@
               "version": 438
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -73858,6 +79088,7 @@
               "version": 439
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -73869,6 +79100,7 @@
               "version": 440
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -73880,6 +79112,7 @@
               "version": 441
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -73891,6 +79124,7 @@
               "version": 442
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -73902,6 +79136,7 @@
               "version": 443
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -73913,6 +79148,7 @@
               "version": 444
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -73924,6 +79160,7 @@
               "version": 445
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -73935,6 +79172,7 @@
               "version": 446
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -73946,6 +79184,7 @@
               "version": 447
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -73957,6 +79196,7 @@
               "version": 448
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -73968,6 +79208,7 @@
               "version": 449
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -73979,6 +79220,7 @@
               "version": 450
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -73990,6 +79232,7 @@
               "version": 451
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -74001,6 +79244,7 @@
               "version": 452
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -74012,6 +79256,7 @@
               "version": 453
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -74023,6 +79268,7 @@
               "version": 454
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -74034,6 +79280,7 @@
               "version": 455
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -74045,6 +79292,7 @@
               "version": 456
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -74056,6 +79304,7 @@
               "version": 457
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -74067,6 +79316,7 @@
               "version": 458
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -74078,6 +79328,7 @@
               "version": 459
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -74089,6 +79340,7 @@
               "version": 460
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -74100,6 +79352,7 @@
               "version": 461
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -74111,6 +79364,7 @@
               "version": 462
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -74122,6 +79376,7 @@
               "version": 463
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -74133,6 +79388,7 @@
               "version": 464
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -74144,6 +79400,7 @@
               "version": 465
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -74155,6 +79412,7 @@
               "version": 466
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -74166,6 +79424,7 @@
               "version": 467
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -74177,6 +79436,7 @@
               "version": 468
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -74188,6 +79448,7 @@
               "version": 469
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -74199,6 +79460,7 @@
               "version": 470
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -74210,6 +79472,7 @@
               "version": 471
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -74221,6 +79484,7 @@
               "version": 472
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -74232,6 +79496,7 @@
               "version": 473
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -74243,6 +79508,7 @@
               "version": 474
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -74254,6 +79520,7 @@
               "version": 475
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -74265,6 +79532,7 @@
               "version": 476
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -74276,6 +79544,7 @@
               "version": 477
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -74287,6 +79556,7 @@
               "version": 478
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -74298,6 +79568,7 @@
               "version": 479
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -74309,6 +79580,7 @@
               "version": 480
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -74320,6 +79592,7 @@
               "version": 481
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -74331,6 +79604,7 @@
               "version": 482
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -74342,6 +79616,7 @@
               "version": 483
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -74353,6 +79628,7 @@
               "version": 484
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -74364,6 +79640,7 @@
               "version": 485
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -74375,6 +79652,7 @@
               "version": 486
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -74386,6 +79664,7 @@
               "version": 487
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -74397,6 +79676,7 @@
               "version": 488
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -74408,6 +79688,7 @@
               "version": 489
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -74419,6 +79700,7 @@
               "version": 490
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -74430,6 +79712,7 @@
               "version": 491
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -74441,6 +79724,7 @@
               "version": 492
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -74452,6 +79736,7 @@
               "version": 493
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -74463,6 +79748,7 @@
               "version": 494
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -74474,6 +79760,7 @@
               "version": 495
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -74485,6 +79772,7 @@
               "version": 496
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -74496,6 +79784,7 @@
               "version": 497
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -74507,6 +79796,7 @@
               "version": 498
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -74518,6 +79808,7 @@
               "version": 499
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -74529,6 +79820,7 @@
               "version": 500
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -74540,6 +79832,7 @@
               "version": 501
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -74551,6 +79844,7 @@
               "version": 502
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -74562,6 +79856,7 @@
               "version": 503
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -74573,6 +79868,7 @@
               "version": 504
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -74584,6 +79880,7 @@
               "version": 505
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -74595,6 +79892,7 @@
               "version": 506
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -74606,6 +79904,7 @@
               "version": 507
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -74617,6 +79916,7 @@
               "version": 508
             },
             {
+              "createTime": 0,
               "key": "collection/5/coll/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -74651,6 +79951,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74662,6 +79963,7 @@
                 "version": 410
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74673,6 +79975,7 @@
                 "version": 411
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74684,6 +79987,7 @@
                 "version": 412
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74695,6 +79999,7 @@
                 "version": 413
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74706,6 +80011,7 @@
                 "version": 414
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74717,6 +80023,7 @@
                 "version": 415
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74728,6 +80035,7 @@
                 "version": 416
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74739,6 +80047,7 @@
                 "version": 417
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74750,6 +80059,7 @@
                 "version": 418
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74761,6 +80071,7 @@
                 "version": 419
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74772,6 +80083,7 @@
                 "version": 420
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74783,6 +80095,7 @@
                 "version": 421
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74794,6 +80107,7 @@
                 "version": 422
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74805,6 +80119,7 @@
                 "version": 423
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74816,6 +80131,7 @@
                 "version": 424
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74827,6 +80143,7 @@
                 "version": 425
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74838,6 +80155,7 @@
                 "version": 426
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74849,6 +80167,7 @@
                 "version": 427
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74860,6 +80179,7 @@
                 "version": 428
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74871,6 +80191,7 @@
                 "version": 429
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74882,6 +80203,7 @@
                 "version": 430
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74893,6 +80215,7 @@
                 "version": 431
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74904,6 +80227,7 @@
                 "version": 432
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74915,6 +80239,7 @@
                 "version": 433
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74926,6 +80251,7 @@
                 "version": 434
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74937,6 +80263,7 @@
                 "version": 435
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74948,6 +80275,7 @@
                 "version": 436
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74959,6 +80287,7 @@
                 "version": 437
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74970,6 +80299,7 @@
                 "version": 438
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74981,6 +80311,7 @@
                 "version": 439
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -74992,6 +80323,7 @@
                 "version": 440
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75003,6 +80335,7 @@
                 "version": 441
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75014,6 +80347,7 @@
                 "version": 442
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75025,6 +80359,7 @@
                 "version": 443
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75036,6 +80371,7 @@
                 "version": 444
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75047,6 +80383,7 @@
                 "version": 445
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75058,6 +80395,7 @@
                 "version": 446
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75069,6 +80407,7 @@
                 "version": 447
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75080,6 +80419,7 @@
                 "version": 448
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75091,6 +80431,7 @@
                 "version": 449
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75102,6 +80443,7 @@
                 "version": 450
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75113,6 +80455,7 @@
                 "version": 451
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75124,6 +80467,7 @@
                 "version": 452
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75135,6 +80479,7 @@
                 "version": 453
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75146,6 +80491,7 @@
                 "version": 454
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75157,6 +80503,7 @@
                 "version": 455
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75168,6 +80515,7 @@
                 "version": 456
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75179,6 +80527,7 @@
                 "version": 457
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75190,6 +80539,7 @@
                 "version": 458
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75201,6 +80551,7 @@
                 "version": 459
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75212,6 +80563,7 @@
                 "version": 460
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75223,6 +80575,7 @@
                 "version": 461
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75234,6 +80587,7 @@
                 "version": 462
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75245,6 +80599,7 @@
                 "version": 463
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75256,6 +80611,7 @@
                 "version": 464
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75267,6 +80623,7 @@
                 "version": 465
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75278,6 +80635,7 @@
                 "version": 466
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75289,6 +80647,7 @@
                 "version": 467
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75300,6 +80659,7 @@
                 "version": 468
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75311,6 +80671,7 @@
                 "version": 469
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75322,6 +80683,7 @@
                 "version": 470
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75333,6 +80695,7 @@
                 "version": 471
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75344,6 +80707,7 @@
                 "version": 472
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75355,6 +80719,7 @@
                 "version": 473
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75366,6 +80731,7 @@
                 "version": 474
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75377,6 +80743,7 @@
                 "version": 475
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75388,6 +80755,7 @@
                 "version": 476
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75399,6 +80767,7 @@
                 "version": 477
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75410,6 +80779,7 @@
                 "version": 478
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75421,6 +80791,7 @@
                 "version": 479
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75432,6 +80803,7 @@
                 "version": 480
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75443,6 +80815,7 @@
                 "version": 481
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75454,6 +80827,7 @@
                 "version": 482
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75465,6 +80839,7 @@
                 "version": 483
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75476,6 +80851,7 @@
                 "version": 484
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75487,6 +80863,7 @@
                 "version": 485
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75498,6 +80875,7 @@
                 "version": 486
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75509,6 +80887,7 @@
                 "version": 487
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75520,6 +80899,7 @@
                 "version": 488
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75531,6 +80911,7 @@
                 "version": 489
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75542,6 +80923,7 @@
                 "version": 490
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75553,6 +80935,7 @@
                 "version": 491
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75564,6 +80947,7 @@
                 "version": 492
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75575,6 +80959,7 @@
                 "version": 493
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75586,6 +80971,7 @@
                 "version": 494
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75597,6 +80983,7 @@
                 "version": 495
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75608,6 +80995,7 @@
                 "version": 496
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75619,6 +81007,7 @@
                 "version": 497
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75630,6 +81019,7 @@
                 "version": 498
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75641,6 +81031,7 @@
                 "version": 499
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75652,6 +81043,7 @@
                 "version": 500
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75663,6 +81055,7 @@
                 "version": 501
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75674,6 +81067,7 @@
                 "version": 502
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75685,6 +81079,7 @@
                 "version": 503
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75696,6 +81091,7 @@
                 "version": 504
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75707,6 +81103,7 @@
                 "version": 505
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75718,6 +81115,7 @@
                 "version": 506
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75729,6 +81127,7 @@
                 "version": 507
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75740,6 +81139,7 @@
                 "version": 508
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75814,6 +81214,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75825,6 +81226,7 @@
                 "version": 410
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75836,6 +81238,7 @@
                 "version": 411
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75847,6 +81250,7 @@
                 "version": 412
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75858,6 +81262,7 @@
                 "version": 413
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75869,6 +81274,7 @@
                 "version": 414
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75880,6 +81286,7 @@
                 "version": 415
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75891,6 +81298,7 @@
                 "version": 416
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75902,6 +81310,7 @@
                 "version": 417
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75913,6 +81322,7 @@
                 "version": 418
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75924,6 +81334,7 @@
                 "version": 419
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75935,6 +81346,7 @@
                 "version": 420
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75946,6 +81358,7 @@
                 "version": 421
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75957,6 +81370,7 @@
                 "version": 422
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75968,6 +81382,7 @@
                 "version": 423
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75979,6 +81394,7 @@
                 "version": 424
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -75990,6 +81406,7 @@
                 "version": 425
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76001,6 +81418,7 @@
                 "version": 426
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76012,6 +81430,7 @@
                 "version": 427
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76023,6 +81442,7 @@
                 "version": 428
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76034,6 +81454,7 @@
                 "version": 429
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76045,6 +81466,7 @@
                 "version": 430
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76056,6 +81478,7 @@
                 "version": 431
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76067,6 +81490,7 @@
                 "version": 432
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76078,6 +81502,7 @@
                 "version": 433
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76089,6 +81514,7 @@
                 "version": 434
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76100,6 +81526,7 @@
                 "version": 435
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76111,6 +81538,7 @@
                 "version": 436
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76122,6 +81550,7 @@
                 "version": 437
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76133,6 +81562,7 @@
                 "version": 438
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76144,6 +81574,7 @@
                 "version": 439
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76155,6 +81586,7 @@
                 "version": 440
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76166,6 +81598,7 @@
                 "version": 441
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76177,6 +81610,7 @@
                 "version": 442
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76188,6 +81622,7 @@
                 "version": 443
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76199,6 +81634,7 @@
                 "version": 444
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76210,6 +81646,7 @@
                 "version": 445
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76221,6 +81658,7 @@
                 "version": 446
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76232,6 +81670,7 @@
                 "version": 447
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76243,6 +81682,7 @@
                 "version": 448
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76254,6 +81694,7 @@
                 "version": 449
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76265,6 +81706,7 @@
                 "version": 450
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76276,6 +81718,7 @@
                 "version": 451
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76287,6 +81730,7 @@
                 "version": 452
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76298,6 +81742,7 @@
                 "version": 453
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76309,6 +81754,7 @@
                 "version": 454
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76320,6 +81766,7 @@
                 "version": 455
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76331,6 +81778,7 @@
                 "version": 456
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76342,6 +81790,7 @@
                 "version": 457
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76353,6 +81802,7 @@
                 "version": 458
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76364,6 +81814,7 @@
                 "version": 459
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76375,6 +81826,7 @@
                 "version": 460
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76386,6 +81838,7 @@
                 "version": 461
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76397,6 +81850,7 @@
                 "version": 462
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76408,6 +81862,7 @@
                 "version": 463
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76419,6 +81874,7 @@
                 "version": 464
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76430,6 +81886,7 @@
                 "version": 465
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76441,6 +81898,7 @@
                 "version": 466
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76452,6 +81910,7 @@
                 "version": 467
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76463,6 +81922,7 @@
                 "version": 468
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76474,6 +81934,7 @@
                 "version": 469
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76485,6 +81946,7 @@
                 "version": 470
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76496,6 +81958,7 @@
                 "version": 471
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76507,6 +81970,7 @@
                 "version": 472
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76518,6 +81982,7 @@
                 "version": 473
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76529,6 +81994,7 @@
                 "version": 474
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76540,6 +82006,7 @@
                 "version": 475
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76551,6 +82018,7 @@
                 "version": 476
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76562,6 +82030,7 @@
                 "version": 477
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76573,6 +82042,7 @@
                 "version": 478
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76584,6 +82054,7 @@
                 "version": 479
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76595,6 +82066,7 @@
                 "version": 480
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76606,6 +82078,7 @@
                 "version": 481
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76617,6 +82090,7 @@
                 "version": 482
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76628,6 +82102,7 @@
                 "version": 483
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76639,6 +82114,7 @@
                 "version": 484
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76650,6 +82126,7 @@
                 "version": 485
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76661,6 +82138,7 @@
                 "version": 486
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76672,6 +82150,7 @@
                 "version": 487
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76683,6 +82162,7 @@
                 "version": 488
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76694,6 +82174,7 @@
                 "version": 489
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76705,6 +82186,7 @@
                 "version": 490
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76716,6 +82198,7 @@
                 "version": 491
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76727,6 +82210,7 @@
                 "version": 492
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76738,6 +82222,7 @@
                 "version": 493
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76749,6 +82234,7 @@
                 "version": 494
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76760,6 +82246,7 @@
                 "version": 495
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76771,6 +82258,7 @@
                 "version": 496
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76782,6 +82270,7 @@
                 "version": 497
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76793,6 +82282,7 @@
                 "version": 498
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76804,6 +82294,7 @@
                 "version": 499
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76815,6 +82306,7 @@
                 "version": 500
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76826,6 +82318,7 @@
                 "version": 501
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76837,6 +82330,7 @@
                 "version": 502
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76848,6 +82342,7 @@
                 "version": 503
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76859,6 +82354,7 @@
                 "version": 504
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76870,6 +82366,7 @@
                 "version": 505
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76881,6 +82378,7 @@
                 "version": 506
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76892,6 +82390,7 @@
                 "version": 507
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -76903,6 +82402,7 @@
                 "version": 508
               },
               {
+                "createTime": 0,
                 "key": "collection/5/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -77070,6 +82570,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/6/coll/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -77081,6 +82582,7 @@
               "version": 512
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -77092,6 +82594,7 @@
               "version": 513
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -77103,6 +82606,7 @@
               "version": 514
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -77114,6 +82618,7 @@
               "version": 515
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -77125,6 +82630,7 @@
               "version": 516
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -77136,6 +82642,7 @@
               "version": 517
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -77147,6 +82654,7 @@
               "version": 518
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -77158,6 +82666,7 @@
               "version": 519
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -77169,6 +82678,7 @@
               "version": 520
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -77180,6 +82690,7 @@
               "version": 521
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -77191,6 +82702,7 @@
               "version": 522
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -77202,6 +82714,7 @@
               "version": 523
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -77213,6 +82726,7 @@
               "version": 524
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -77224,6 +82738,7 @@
               "version": 525
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -77235,6 +82750,7 @@
               "version": 526
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -77246,6 +82762,7 @@
               "version": 527
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -77257,6 +82774,7 @@
               "version": 528
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -77268,6 +82786,7 @@
               "version": 529
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -77279,6 +82798,7 @@
               "version": 530
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -77290,6 +82810,7 @@
               "version": 531
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -77301,6 +82822,7 @@
               "version": 532
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -77312,6 +82834,7 @@
               "version": 533
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -77323,6 +82846,7 @@
               "version": 534
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -77334,6 +82858,7 @@
               "version": 535
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -77345,6 +82870,7 @@
               "version": 536
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -77356,6 +82882,7 @@
               "version": 537
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -77367,6 +82894,7 @@
               "version": 538
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -77378,6 +82906,7 @@
               "version": 539
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -77389,6 +82918,7 @@
               "version": 540
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -77400,6 +82930,7 @@
               "version": 541
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -77411,6 +82942,7 @@
               "version": 542
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -77422,6 +82954,7 @@
               "version": 543
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -77433,6 +82966,7 @@
               "version": 544
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -77444,6 +82978,7 @@
               "version": 545
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -77455,6 +82990,7 @@
               "version": 546
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -77466,6 +83002,7 @@
               "version": 547
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -77477,6 +83014,7 @@
               "version": 548
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -77488,6 +83026,7 @@
               "version": 549
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -77499,6 +83038,7 @@
               "version": 550
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -77510,6 +83050,7 @@
               "version": 551
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -77521,6 +83062,7 @@
               "version": 552
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -77532,6 +83074,7 @@
               "version": 553
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -77543,6 +83086,7 @@
               "version": 554
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -77554,6 +83098,7 @@
               "version": 555
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -77565,6 +83110,7 @@
               "version": 556
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -77576,6 +83122,7 @@
               "version": 557
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -77587,6 +83134,7 @@
               "version": 558
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -77598,6 +83146,7 @@
               "version": 559
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -77609,6 +83158,7 @@
               "version": 560
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -77620,6 +83170,7 @@
               "version": 561
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -77631,6 +83182,7 @@
               "version": 562
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -77642,6 +83194,7 @@
               "version": 563
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -77653,6 +83206,7 @@
               "version": 564
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -77664,6 +83218,7 @@
               "version": 565
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -77675,6 +83230,7 @@
               "version": 566
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -77686,6 +83242,7 @@
               "version": 567
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -77697,6 +83254,7 @@
               "version": 568
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -77708,6 +83266,7 @@
               "version": 569
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -77719,6 +83278,7 @@
               "version": 570
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -77730,6 +83290,7 @@
               "version": 571
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -77741,6 +83302,7 @@
               "version": 572
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -77752,6 +83314,7 @@
               "version": 573
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -77763,6 +83326,7 @@
               "version": 574
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -77774,6 +83338,7 @@
               "version": 575
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -77785,6 +83350,7 @@
               "version": 576
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -77796,6 +83362,7 @@
               "version": 577
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -77807,6 +83374,7 @@
               "version": 578
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -77818,6 +83386,7 @@
               "version": 579
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -77829,6 +83398,7 @@
               "version": 580
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -77840,6 +83410,7 @@
               "version": 581
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -77851,6 +83422,7 @@
               "version": 582
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -77862,6 +83434,7 @@
               "version": 583
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -77873,6 +83446,7 @@
               "version": 584
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -77884,6 +83458,7 @@
               "version": 585
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -77895,6 +83470,7 @@
               "version": 586
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -77906,6 +83482,7 @@
               "version": 587
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -77917,6 +83494,7 @@
               "version": 588
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -77928,6 +83506,7 @@
               "version": 589
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -77939,6 +83518,7 @@
               "version": 590
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -77950,6 +83530,7 @@
               "version": 591
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -77961,6 +83542,7 @@
               "version": 592
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -77972,6 +83554,7 @@
               "version": 593
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -77983,6 +83566,7 @@
               "version": 594
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -77994,6 +83578,7 @@
               "version": 595
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -78005,6 +83590,7 @@
               "version": 596
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -78016,6 +83602,7 @@
               "version": 597
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -78027,6 +83614,7 @@
               "version": 598
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -78038,6 +83626,7 @@
               "version": 599
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -78049,6 +83638,7 @@
               "version": 600
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -78060,6 +83650,7 @@
               "version": 601
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -78071,6 +83662,7 @@
               "version": 602
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -78082,6 +83674,7 @@
               "version": 603
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -78093,6 +83686,7 @@
               "version": 604
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -78104,6 +83698,7 @@
               "version": 605
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -78115,6 +83710,7 @@
               "version": 606
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -78126,6 +83722,7 @@
               "version": 607
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -78137,6 +83734,7 @@
               "version": 608
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -78148,6 +83746,7 @@
               "version": 609
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -78159,6 +83758,7 @@
               "version": 610
             },
             {
+              "createTime": 0,
               "key": "collection/6/coll/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -78193,6 +83793,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78204,6 +83805,7 @@
                 "version": 512
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78215,6 +83817,7 @@
                 "version": 513
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78226,6 +83829,7 @@
                 "version": 514
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78237,6 +83841,7 @@
                 "version": 515
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78248,6 +83853,7 @@
                 "version": 516
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78259,6 +83865,7 @@
                 "version": 517
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78270,6 +83877,7 @@
                 "version": 518
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78281,6 +83889,7 @@
                 "version": 519
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78292,6 +83901,7 @@
                 "version": 520
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78303,6 +83913,7 @@
                 "version": 521
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78314,6 +83925,7 @@
                 "version": 522
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78325,6 +83937,7 @@
                 "version": 523
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78336,6 +83949,7 @@
                 "version": 524
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78347,6 +83961,7 @@
                 "version": 525
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78358,6 +83973,7 @@
                 "version": 526
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78369,6 +83985,7 @@
                 "version": 527
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78380,6 +83997,7 @@
                 "version": 528
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78391,6 +84009,7 @@
                 "version": 529
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78402,6 +84021,7 @@
                 "version": 530
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78413,6 +84033,7 @@
                 "version": 531
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78424,6 +84045,7 @@
                 "version": 532
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78435,6 +84057,7 @@
                 "version": 533
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78446,6 +84069,7 @@
                 "version": 534
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78457,6 +84081,7 @@
                 "version": 535
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78468,6 +84093,7 @@
                 "version": 536
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78479,6 +84105,7 @@
                 "version": 537
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78490,6 +84117,7 @@
                 "version": 538
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78501,6 +84129,7 @@
                 "version": 539
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78512,6 +84141,7 @@
                 "version": 540
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78523,6 +84153,7 @@
                 "version": 541
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78534,6 +84165,7 @@
                 "version": 542
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78545,6 +84177,7 @@
                 "version": 543
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78556,6 +84189,7 @@
                 "version": 544
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78567,6 +84201,7 @@
                 "version": 545
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78578,6 +84213,7 @@
                 "version": 546
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78589,6 +84225,7 @@
                 "version": 547
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78600,6 +84237,7 @@
                 "version": 548
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78611,6 +84249,7 @@
                 "version": 549
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78622,6 +84261,7 @@
                 "version": 550
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78633,6 +84273,7 @@
                 "version": 551
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78644,6 +84285,7 @@
                 "version": 552
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78655,6 +84297,7 @@
                 "version": 553
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78666,6 +84309,7 @@
                 "version": 554
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78677,6 +84321,7 @@
                 "version": 555
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78688,6 +84333,7 @@
                 "version": 556
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78699,6 +84345,7 @@
                 "version": 557
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78710,6 +84357,7 @@
                 "version": 558
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78721,6 +84369,7 @@
                 "version": 559
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78732,6 +84381,7 @@
                 "version": 560
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78743,6 +84393,7 @@
                 "version": 561
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78754,6 +84405,7 @@
                 "version": 562
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78765,6 +84417,7 @@
                 "version": 563
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78776,6 +84429,7 @@
                 "version": 564
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78787,6 +84441,7 @@
                 "version": 565
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78798,6 +84453,7 @@
                 "version": 566
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78809,6 +84465,7 @@
                 "version": 567
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78820,6 +84477,7 @@
                 "version": 568
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78831,6 +84489,7 @@
                 "version": 569
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78842,6 +84501,7 @@
                 "version": 570
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78853,6 +84513,7 @@
                 "version": 571
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78864,6 +84525,7 @@
                 "version": 572
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78875,6 +84537,7 @@
                 "version": 573
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78886,6 +84549,7 @@
                 "version": 574
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78897,6 +84561,7 @@
                 "version": 575
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78908,6 +84573,7 @@
                 "version": 576
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78919,6 +84585,7 @@
                 "version": 577
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78930,6 +84597,7 @@
                 "version": 578
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78941,6 +84609,7 @@
                 "version": 579
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78952,6 +84621,7 @@
                 "version": 580
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78963,6 +84633,7 @@
                 "version": 581
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78974,6 +84645,7 @@
                 "version": 582
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78985,6 +84657,7 @@
                 "version": 583
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -78996,6 +84669,7 @@
                 "version": 584
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79007,6 +84681,7 @@
                 "version": 585
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79018,6 +84693,7 @@
                 "version": 586
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79029,6 +84705,7 @@
                 "version": 587
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79040,6 +84717,7 @@
                 "version": 588
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79051,6 +84729,7 @@
                 "version": 589
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79062,6 +84741,7 @@
                 "version": 590
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79073,6 +84753,7 @@
                 "version": 591
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79084,6 +84765,7 @@
                 "version": 592
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79095,6 +84777,7 @@
                 "version": 593
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79106,6 +84789,7 @@
                 "version": 594
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79117,6 +84801,7 @@
                 "version": 595
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79128,6 +84813,7 @@
                 "version": 596
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79139,6 +84825,7 @@
                 "version": 597
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79150,6 +84837,7 @@
                 "version": 598
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79161,6 +84849,7 @@
                 "version": 599
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79172,6 +84861,7 @@
                 "version": 600
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79183,6 +84873,7 @@
                 "version": 601
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79194,6 +84885,7 @@
                 "version": 602
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79205,6 +84897,7 @@
                 "version": 603
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79216,6 +84909,7 @@
                 "version": 604
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79227,6 +84921,7 @@
                 "version": 605
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79238,6 +84933,7 @@
                 "version": 606
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79249,6 +84945,7 @@
                 "version": 607
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79260,6 +84957,7 @@
                 "version": 608
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79271,6 +84969,7 @@
                 "version": 609
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79282,6 +84981,7 @@
                 "version": 610
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79356,6 +85056,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79367,6 +85068,7 @@
                 "version": 512
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79378,6 +85080,7 @@
                 "version": 513
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79389,6 +85092,7 @@
                 "version": 514
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79400,6 +85104,7 @@
                 "version": 515
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79411,6 +85116,7 @@
                 "version": 516
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79422,6 +85128,7 @@
                 "version": 517
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79433,6 +85140,7 @@
                 "version": 518
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79444,6 +85152,7 @@
                 "version": 519
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79455,6 +85164,7 @@
                 "version": 520
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79466,6 +85176,7 @@
                 "version": 521
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79477,6 +85188,7 @@
                 "version": 522
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79488,6 +85200,7 @@
                 "version": 523
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79499,6 +85212,7 @@
                 "version": 524
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79510,6 +85224,7 @@
                 "version": 525
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79521,6 +85236,7 @@
                 "version": 526
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79532,6 +85248,7 @@
                 "version": 527
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79543,6 +85260,7 @@
                 "version": 528
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79554,6 +85272,7 @@
                 "version": 529
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79565,6 +85284,7 @@
                 "version": 530
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79576,6 +85296,7 @@
                 "version": 531
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79587,6 +85308,7 @@
                 "version": 532
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79598,6 +85320,7 @@
                 "version": 533
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79609,6 +85332,7 @@
                 "version": 534
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79620,6 +85344,7 @@
                 "version": 535
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79631,6 +85356,7 @@
                 "version": 536
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79642,6 +85368,7 @@
                 "version": 537
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79653,6 +85380,7 @@
                 "version": 538
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79664,6 +85392,7 @@
                 "version": 539
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79675,6 +85404,7 @@
                 "version": 540
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79686,6 +85416,7 @@
                 "version": 541
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79697,6 +85428,7 @@
                 "version": 542
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79708,6 +85440,7 @@
                 "version": 543
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79719,6 +85452,7 @@
                 "version": 544
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79730,6 +85464,7 @@
                 "version": 545
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79741,6 +85476,7 @@
                 "version": 546
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79752,6 +85488,7 @@
                 "version": 547
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79763,6 +85500,7 @@
                 "version": 548
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79774,6 +85512,7 @@
                 "version": 549
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79785,6 +85524,7 @@
                 "version": 550
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79796,6 +85536,7 @@
                 "version": 551
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79807,6 +85548,7 @@
                 "version": 552
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79818,6 +85560,7 @@
                 "version": 553
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79829,6 +85572,7 @@
                 "version": 554
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79840,6 +85584,7 @@
                 "version": 555
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79851,6 +85596,7 @@
                 "version": 556
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79862,6 +85608,7 @@
                 "version": 557
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79873,6 +85620,7 @@
                 "version": 558
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79884,6 +85632,7 @@
                 "version": 559
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79895,6 +85644,7 @@
                 "version": 560
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79906,6 +85656,7 @@
                 "version": 561
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79917,6 +85668,7 @@
                 "version": 562
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79928,6 +85680,7 @@
                 "version": 563
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79939,6 +85692,7 @@
                 "version": 564
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79950,6 +85704,7 @@
                 "version": 565
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79961,6 +85716,7 @@
                 "version": 566
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79972,6 +85728,7 @@
                 "version": 567
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79983,6 +85740,7 @@
                 "version": 568
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -79994,6 +85752,7 @@
                 "version": 569
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80005,6 +85764,7 @@
                 "version": 570
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80016,6 +85776,7 @@
                 "version": 571
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80027,6 +85788,7 @@
                 "version": 572
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80038,6 +85800,7 @@
                 "version": 573
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80049,6 +85812,7 @@
                 "version": 574
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80060,6 +85824,7 @@
                 "version": 575
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80071,6 +85836,7 @@
                 "version": 576
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80082,6 +85848,7 @@
                 "version": 577
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80093,6 +85860,7 @@
                 "version": 578
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80104,6 +85872,7 @@
                 "version": 579
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80115,6 +85884,7 @@
                 "version": 580
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80126,6 +85896,7 @@
                 "version": 581
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80137,6 +85908,7 @@
                 "version": 582
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80148,6 +85920,7 @@
                 "version": 583
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80159,6 +85932,7 @@
                 "version": 584
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80170,6 +85944,7 @@
                 "version": 585
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80181,6 +85956,7 @@
                 "version": 586
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80192,6 +85968,7 @@
                 "version": 587
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80203,6 +85980,7 @@
                 "version": 588
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80214,6 +85992,7 @@
                 "version": 589
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80225,6 +86004,7 @@
                 "version": 590
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80236,6 +86016,7 @@
                 "version": 591
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80247,6 +86028,7 @@
                 "version": 592
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80258,6 +86040,7 @@
                 "version": 593
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80269,6 +86052,7 @@
                 "version": 594
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80280,6 +86064,7 @@
                 "version": 595
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80291,6 +86076,7 @@
                 "version": 596
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80302,6 +86088,7 @@
                 "version": 597
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80313,6 +86100,7 @@
                 "version": 598
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80324,6 +86112,7 @@
                 "version": 599
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80335,6 +86124,7 @@
                 "version": 600
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80346,6 +86136,7 @@
                 "version": 601
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80357,6 +86148,7 @@
                 "version": 602
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80368,6 +86160,7 @@
                 "version": 603
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80379,6 +86172,7 @@
                 "version": 604
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80390,6 +86184,7 @@
                 "version": 605
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80401,6 +86196,7 @@
                 "version": 606
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80412,6 +86208,7 @@
                 "version": 607
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80423,6 +86220,7 @@
                 "version": 608
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80434,6 +86232,7 @@
                 "version": 609
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80445,6 +86244,7 @@
                 "version": 610
               },
               {
+                "createTime": 0,
                 "key": "collection/6/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -80612,6 +86412,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/7/coll/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -80623,6 +86424,7 @@
               "version": 614
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -80634,6 +86436,7 @@
               "version": 615
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -80645,6 +86448,7 @@
               "version": 616
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -80656,6 +86460,7 @@
               "version": 617
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -80667,6 +86472,7 @@
               "version": 618
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -80678,6 +86484,7 @@
               "version": 619
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -80689,6 +86496,7 @@
               "version": 620
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -80700,6 +86508,7 @@
               "version": 621
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -80711,6 +86520,7 @@
               "version": 622
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -80722,6 +86532,7 @@
               "version": 623
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -80733,6 +86544,7 @@
               "version": 624
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -80744,6 +86556,7 @@
               "version": 625
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -80755,6 +86568,7 @@
               "version": 626
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -80766,6 +86580,7 @@
               "version": 627
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -80777,6 +86592,7 @@
               "version": 628
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -80788,6 +86604,7 @@
               "version": 629
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -80799,6 +86616,7 @@
               "version": 630
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -80810,6 +86628,7 @@
               "version": 631
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -80821,6 +86640,7 @@
               "version": 632
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -80832,6 +86652,7 @@
               "version": 633
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -80843,6 +86664,7 @@
               "version": 634
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -80854,6 +86676,7 @@
               "version": 635
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -80865,6 +86688,7 @@
               "version": 636
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -80876,6 +86700,7 @@
               "version": 637
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -80887,6 +86712,7 @@
               "version": 638
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -80898,6 +86724,7 @@
               "version": 639
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -80909,6 +86736,7 @@
               "version": 640
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -80920,6 +86748,7 @@
               "version": 641
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -80931,6 +86760,7 @@
               "version": 642
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -80942,6 +86772,7 @@
               "version": 643
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -80953,6 +86784,7 @@
               "version": 644
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -80964,6 +86796,7 @@
               "version": 645
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -80975,6 +86808,7 @@
               "version": 646
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -80986,6 +86820,7 @@
               "version": 647
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -80997,6 +86832,7 @@
               "version": 648
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -81008,6 +86844,7 @@
               "version": 649
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -81019,6 +86856,7 @@
               "version": 650
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -81030,6 +86868,7 @@
               "version": 651
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -81041,6 +86880,7 @@
               "version": 652
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -81052,6 +86892,7 @@
               "version": 653
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -81063,6 +86904,7 @@
               "version": 654
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -81074,6 +86916,7 @@
               "version": 655
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -81085,6 +86928,7 @@
               "version": 656
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -81096,6 +86940,7 @@
               "version": 657
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -81107,6 +86952,7 @@
               "version": 658
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -81118,6 +86964,7 @@
               "version": 659
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -81129,6 +86976,7 @@
               "version": 660
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -81140,6 +86988,7 @@
               "version": 661
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -81151,6 +87000,7 @@
               "version": 662
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -81162,6 +87012,7 @@
               "version": 663
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -81173,6 +87024,7 @@
               "version": 664
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -81184,6 +87036,7 @@
               "version": 665
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -81195,6 +87048,7 @@
               "version": 666
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -81206,6 +87060,7 @@
               "version": 667
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -81217,6 +87072,7 @@
               "version": 668
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -81228,6 +87084,7 @@
               "version": 669
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -81239,6 +87096,7 @@
               "version": 670
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -81250,6 +87108,7 @@
               "version": 671
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -81261,6 +87120,7 @@
               "version": 672
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -81272,6 +87132,7 @@
               "version": 673
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -81283,6 +87144,7 @@
               "version": 674
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -81294,6 +87156,7 @@
               "version": 675
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -81305,6 +87168,7 @@
               "version": 676
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -81316,6 +87180,7 @@
               "version": 677
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -81327,6 +87192,7 @@
               "version": 678
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -81338,6 +87204,7 @@
               "version": 679
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -81349,6 +87216,7 @@
               "version": 680
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -81360,6 +87228,7 @@
               "version": 681
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -81371,6 +87240,7 @@
               "version": 682
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -81382,6 +87252,7 @@
               "version": 683
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -81393,6 +87264,7 @@
               "version": 684
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -81404,6 +87276,7 @@
               "version": 685
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -81415,6 +87288,7 @@
               "version": 686
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -81426,6 +87300,7 @@
               "version": 687
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -81437,6 +87312,7 @@
               "version": 688
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -81448,6 +87324,7 @@
               "version": 689
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -81459,6 +87336,7 @@
               "version": 690
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -81470,6 +87348,7 @@
               "version": 691
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -81481,6 +87360,7 @@
               "version": 692
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -81492,6 +87372,7 @@
               "version": 693
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -81503,6 +87384,7 @@
               "version": 694
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -81514,6 +87396,7 @@
               "version": 695
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -81525,6 +87408,7 @@
               "version": 696
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -81536,6 +87420,7 @@
               "version": 697
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -81547,6 +87432,7 @@
               "version": 698
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -81558,6 +87444,7 @@
               "version": 699
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -81569,6 +87456,7 @@
               "version": 700
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -81580,6 +87468,7 @@
               "version": 701
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -81591,6 +87480,7 @@
               "version": 702
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -81602,6 +87492,7 @@
               "version": 703
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -81613,6 +87504,7 @@
               "version": 704
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -81624,6 +87516,7 @@
               "version": 705
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -81635,6 +87528,7 @@
               "version": 706
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -81646,6 +87540,7 @@
               "version": 707
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -81657,6 +87552,7 @@
               "version": 708
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -81668,6 +87564,7 @@
               "version": 709
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -81679,6 +87576,7 @@
               "version": 710
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -81690,6 +87588,7 @@
               "version": 711
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -81701,6 +87600,7 @@
               "version": 712
             },
             {
+              "createTime": 0,
               "key": "collection/7/coll/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -81735,6 +87635,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81746,6 +87647,7 @@
                 "version": 614
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81757,6 +87659,7 @@
                 "version": 615
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81768,6 +87671,7 @@
                 "version": 616
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81779,6 +87683,7 @@
                 "version": 617
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81790,6 +87695,7 @@
                 "version": 618
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81801,6 +87707,7 @@
                 "version": 619
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81812,6 +87719,7 @@
                 "version": 620
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81823,6 +87731,7 @@
                 "version": 621
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81834,6 +87743,7 @@
                 "version": 622
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81845,6 +87755,7 @@
                 "version": 623
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81856,6 +87767,7 @@
                 "version": 624
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81867,6 +87779,7 @@
                 "version": 625
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81878,6 +87791,7 @@
                 "version": 626
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81889,6 +87803,7 @@
                 "version": 627
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81900,6 +87815,7 @@
                 "version": 628
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81911,6 +87827,7 @@
                 "version": 629
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81922,6 +87839,7 @@
                 "version": 630
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81933,6 +87851,7 @@
                 "version": 631
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81944,6 +87863,7 @@
                 "version": 632
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81955,6 +87875,7 @@
                 "version": 633
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81966,6 +87887,7 @@
                 "version": 634
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81977,6 +87899,7 @@
                 "version": 635
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81988,6 +87911,7 @@
                 "version": 636
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -81999,6 +87923,7 @@
                 "version": 637
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82010,6 +87935,7 @@
                 "version": 638
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82021,6 +87947,7 @@
                 "version": 639
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82032,6 +87959,7 @@
                 "version": 640
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82043,6 +87971,7 @@
                 "version": 641
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82054,6 +87983,7 @@
                 "version": 642
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82065,6 +87995,7 @@
                 "version": 643
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82076,6 +88007,7 @@
                 "version": 644
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82087,6 +88019,7 @@
                 "version": 645
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82098,6 +88031,7 @@
                 "version": 646
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82109,6 +88043,7 @@
                 "version": 647
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82120,6 +88055,7 @@
                 "version": 648
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82131,6 +88067,7 @@
                 "version": 649
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82142,6 +88079,7 @@
                 "version": 650
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82153,6 +88091,7 @@
                 "version": 651
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82164,6 +88103,7 @@
                 "version": 652
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82175,6 +88115,7 @@
                 "version": 653
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82186,6 +88127,7 @@
                 "version": 654
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82197,6 +88139,7 @@
                 "version": 655
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82208,6 +88151,7 @@
                 "version": 656
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82219,6 +88163,7 @@
                 "version": 657
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82230,6 +88175,7 @@
                 "version": 658
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82241,6 +88187,7 @@
                 "version": 659
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82252,6 +88199,7 @@
                 "version": 660
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82263,6 +88211,7 @@
                 "version": 661
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82274,6 +88223,7 @@
                 "version": 662
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82285,6 +88235,7 @@
                 "version": 663
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82296,6 +88247,7 @@
                 "version": 664
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82307,6 +88259,7 @@
                 "version": 665
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82318,6 +88271,7 @@
                 "version": 666
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82329,6 +88283,7 @@
                 "version": 667
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82340,6 +88295,7 @@
                 "version": 668
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82351,6 +88307,7 @@
                 "version": 669
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82362,6 +88319,7 @@
                 "version": 670
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82373,6 +88331,7 @@
                 "version": 671
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82384,6 +88343,7 @@
                 "version": 672
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82395,6 +88355,7 @@
                 "version": 673
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82406,6 +88367,7 @@
                 "version": 674
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82417,6 +88379,7 @@
                 "version": 675
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82428,6 +88391,7 @@
                 "version": 676
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82439,6 +88403,7 @@
                 "version": 677
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82450,6 +88415,7 @@
                 "version": 678
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82461,6 +88427,7 @@
                 "version": 679
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82472,6 +88439,7 @@
                 "version": 680
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82483,6 +88451,7 @@
                 "version": 681
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82494,6 +88463,7 @@
                 "version": 682
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82505,6 +88475,7 @@
                 "version": 683
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82516,6 +88487,7 @@
                 "version": 684
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82527,6 +88499,7 @@
                 "version": 685
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82538,6 +88511,7 @@
                 "version": 686
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82549,6 +88523,7 @@
                 "version": 687
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82560,6 +88535,7 @@
                 "version": 688
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82571,6 +88547,7 @@
                 "version": 689
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82582,6 +88559,7 @@
                 "version": 690
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82593,6 +88571,7 @@
                 "version": 691
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82604,6 +88583,7 @@
                 "version": 692
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82615,6 +88595,7 @@
                 "version": 693
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82626,6 +88607,7 @@
                 "version": 694
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82637,6 +88619,7 @@
                 "version": 695
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82648,6 +88631,7 @@
                 "version": 696
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82659,6 +88643,7 @@
                 "version": 697
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82670,6 +88655,7 @@
                 "version": 698
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82681,6 +88667,7 @@
                 "version": 699
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82692,6 +88679,7 @@
                 "version": 700
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82703,6 +88691,7 @@
                 "version": 701
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82714,6 +88703,7 @@
                 "version": 702
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82725,6 +88715,7 @@
                 "version": 703
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82736,6 +88727,7 @@
                 "version": 704
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82747,6 +88739,7 @@
                 "version": 705
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82758,6 +88751,7 @@
                 "version": 706
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82769,6 +88763,7 @@
                 "version": 707
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82780,6 +88775,7 @@
                 "version": 708
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82791,6 +88787,7 @@
                 "version": 709
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82802,6 +88799,7 @@
                 "version": 710
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82813,6 +88811,7 @@
                 "version": 711
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82824,6 +88823,7 @@
                 "version": 712
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82898,6 +88898,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82909,6 +88910,7 @@
                 "version": 614
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82920,6 +88922,7 @@
                 "version": 615
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82931,6 +88934,7 @@
                 "version": 616
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82942,6 +88946,7 @@
                 "version": 617
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82953,6 +88958,7 @@
                 "version": 618
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82964,6 +88970,7 @@
                 "version": 619
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82975,6 +88982,7 @@
                 "version": 620
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82986,6 +88994,7 @@
                 "version": 621
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -82997,6 +89006,7 @@
                 "version": 622
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83008,6 +89018,7 @@
                 "version": 623
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83019,6 +89030,7 @@
                 "version": 624
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83030,6 +89042,7 @@
                 "version": 625
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83041,6 +89054,7 @@
                 "version": 626
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83052,6 +89066,7 @@
                 "version": 627
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83063,6 +89078,7 @@
                 "version": 628
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83074,6 +89090,7 @@
                 "version": 629
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83085,6 +89102,7 @@
                 "version": 630
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83096,6 +89114,7 @@
                 "version": 631
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83107,6 +89126,7 @@
                 "version": 632
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83118,6 +89138,7 @@
                 "version": 633
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83129,6 +89150,7 @@
                 "version": 634
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83140,6 +89162,7 @@
                 "version": 635
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83151,6 +89174,7 @@
                 "version": 636
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83162,6 +89186,7 @@
                 "version": 637
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83173,6 +89198,7 @@
                 "version": 638
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83184,6 +89210,7 @@
                 "version": 639
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83195,6 +89222,7 @@
                 "version": 640
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83206,6 +89234,7 @@
                 "version": 641
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83217,6 +89246,7 @@
                 "version": 642
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83228,6 +89258,7 @@
                 "version": 643
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83239,6 +89270,7 @@
                 "version": 644
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83250,6 +89282,7 @@
                 "version": 645
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83261,6 +89294,7 @@
                 "version": 646
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83272,6 +89306,7 @@
                 "version": 647
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83283,6 +89318,7 @@
                 "version": 648
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83294,6 +89330,7 @@
                 "version": 649
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83305,6 +89342,7 @@
                 "version": 650
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83316,6 +89354,7 @@
                 "version": 651
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83327,6 +89366,7 @@
                 "version": 652
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83338,6 +89378,7 @@
                 "version": 653
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83349,6 +89390,7 @@
                 "version": 654
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83360,6 +89402,7 @@
                 "version": 655
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83371,6 +89414,7 @@
                 "version": 656
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83382,6 +89426,7 @@
                 "version": 657
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83393,6 +89438,7 @@
                 "version": 658
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83404,6 +89450,7 @@
                 "version": 659
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83415,6 +89462,7 @@
                 "version": 660
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83426,6 +89474,7 @@
                 "version": 661
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83437,6 +89486,7 @@
                 "version": 662
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83448,6 +89498,7 @@
                 "version": 663
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83459,6 +89510,7 @@
                 "version": 664
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83470,6 +89522,7 @@
                 "version": 665
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83481,6 +89534,7 @@
                 "version": 666
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83492,6 +89546,7 @@
                 "version": 667
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83503,6 +89558,7 @@
                 "version": 668
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83514,6 +89570,7 @@
                 "version": 669
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83525,6 +89582,7 @@
                 "version": 670
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83536,6 +89594,7 @@
                 "version": 671
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83547,6 +89606,7 @@
                 "version": 672
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83558,6 +89618,7 @@
                 "version": 673
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83569,6 +89630,7 @@
                 "version": 674
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83580,6 +89642,7 @@
                 "version": 675
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83591,6 +89654,7 @@
                 "version": 676
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83602,6 +89666,7 @@
                 "version": 677
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83613,6 +89678,7 @@
                 "version": 678
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83624,6 +89690,7 @@
                 "version": 679
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83635,6 +89702,7 @@
                 "version": 680
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83646,6 +89714,7 @@
                 "version": 681
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83657,6 +89726,7 @@
                 "version": 682
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83668,6 +89738,7 @@
                 "version": 683
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83679,6 +89750,7 @@
                 "version": 684
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83690,6 +89762,7 @@
                 "version": 685
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83701,6 +89774,7 @@
                 "version": 686
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83712,6 +89786,7 @@
                 "version": 687
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83723,6 +89798,7 @@
                 "version": 688
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83734,6 +89810,7 @@
                 "version": 689
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83745,6 +89822,7 @@
                 "version": 690
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83756,6 +89834,7 @@
                 "version": 691
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83767,6 +89846,7 @@
                 "version": 692
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83778,6 +89858,7 @@
                 "version": 693
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83789,6 +89870,7 @@
                 "version": 694
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83800,6 +89882,7 @@
                 "version": 695
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83811,6 +89894,7 @@
                 "version": 696
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83822,6 +89906,7 @@
                 "version": 697
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83833,6 +89918,7 @@
                 "version": 698
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83844,6 +89930,7 @@
                 "version": 699
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83855,6 +89942,7 @@
                 "version": 700
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83866,6 +89954,7 @@
                 "version": 701
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83877,6 +89966,7 @@
                 "version": 702
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83888,6 +89978,7 @@
                 "version": 703
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83899,6 +89990,7 @@
                 "version": 704
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83910,6 +90002,7 @@
                 "version": 705
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83921,6 +90014,7 @@
                 "version": 706
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83932,6 +90026,7 @@
                 "version": 707
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83943,6 +90038,7 @@
                 "version": 708
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83954,6 +90050,7 @@
                 "version": 709
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83965,6 +90062,7 @@
                 "version": 710
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83976,6 +90074,7 @@
                 "version": 711
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -83987,6 +90086,7 @@
                 "version": 712
               },
               {
+                "createTime": 0,
                 "key": "collection/7/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -84154,6 +90254,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/8/coll/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -84165,6 +90266,7 @@
               "version": 716
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -84176,6 +90278,7 @@
               "version": 717
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -84187,6 +90290,7 @@
               "version": 718
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -84198,6 +90302,7 @@
               "version": 719
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -84209,6 +90314,7 @@
               "version": 720
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -84220,6 +90326,7 @@
               "version": 721
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -84231,6 +90338,7 @@
               "version": 722
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -84242,6 +90350,7 @@
               "version": 723
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -84253,6 +90362,7 @@
               "version": 724
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -84264,6 +90374,7 @@
               "version": 725
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -84275,6 +90386,7 @@
               "version": 726
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -84286,6 +90398,7 @@
               "version": 727
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -84297,6 +90410,7 @@
               "version": 728
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -84308,6 +90422,7 @@
               "version": 729
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -84319,6 +90434,7 @@
               "version": 730
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -84330,6 +90446,7 @@
               "version": 731
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -84341,6 +90458,7 @@
               "version": 732
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -84352,6 +90470,7 @@
               "version": 733
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -84363,6 +90482,7 @@
               "version": 734
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -84374,6 +90494,7 @@
               "version": 735
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -84385,6 +90506,7 @@
               "version": 736
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -84396,6 +90518,7 @@
               "version": 737
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -84407,6 +90530,7 @@
               "version": 738
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -84418,6 +90542,7 @@
               "version": 739
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -84429,6 +90554,7 @@
               "version": 740
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -84440,6 +90566,7 @@
               "version": 741
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -84451,6 +90578,7 @@
               "version": 742
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -84462,6 +90590,7 @@
               "version": 743
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -84473,6 +90602,7 @@
               "version": 744
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -84484,6 +90614,7 @@
               "version": 745
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -84495,6 +90626,7 @@
               "version": 746
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -84506,6 +90638,7 @@
               "version": 747
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -84517,6 +90650,7 @@
               "version": 748
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -84528,6 +90662,7 @@
               "version": 749
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -84539,6 +90674,7 @@
               "version": 750
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -84550,6 +90686,7 @@
               "version": 751
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -84561,6 +90698,7 @@
               "version": 752
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -84572,6 +90710,7 @@
               "version": 753
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -84583,6 +90722,7 @@
               "version": 754
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -84594,6 +90734,7 @@
               "version": 755
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -84605,6 +90746,7 @@
               "version": 756
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -84616,6 +90758,7 @@
               "version": 757
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -84627,6 +90770,7 @@
               "version": 758
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -84638,6 +90782,7 @@
               "version": 759
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -84649,6 +90794,7 @@
               "version": 760
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -84660,6 +90806,7 @@
               "version": 761
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -84671,6 +90818,7 @@
               "version": 762
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -84682,6 +90830,7 @@
               "version": 763
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -84693,6 +90842,7 @@
               "version": 764
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -84704,6 +90854,7 @@
               "version": 765
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -84715,6 +90866,7 @@
               "version": 766
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -84726,6 +90878,7 @@
               "version": 767
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -84737,6 +90890,7 @@
               "version": 768
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -84748,6 +90902,7 @@
               "version": 769
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -84759,6 +90914,7 @@
               "version": 770
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -84770,6 +90926,7 @@
               "version": 771
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -84781,6 +90938,7 @@
               "version": 772
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -84792,6 +90950,7 @@
               "version": 773
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -84803,6 +90962,7 @@
               "version": 774
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -84814,6 +90974,7 @@
               "version": 775
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -84825,6 +90986,7 @@
               "version": 776
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -84836,6 +90998,7 @@
               "version": 777
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -84847,6 +91010,7 @@
               "version": 778
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -84858,6 +91022,7 @@
               "version": 779
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -84869,6 +91034,7 @@
               "version": 780
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -84880,6 +91046,7 @@
               "version": 781
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -84891,6 +91058,7 @@
               "version": 782
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -84902,6 +91070,7 @@
               "version": 783
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -84913,6 +91082,7 @@
               "version": 784
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -84924,6 +91094,7 @@
               "version": 785
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -84935,6 +91106,7 @@
               "version": 786
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -84946,6 +91118,7 @@
               "version": 787
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -84957,6 +91130,7 @@
               "version": 788
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -84968,6 +91142,7 @@
               "version": 789
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -84979,6 +91154,7 @@
               "version": 790
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -84990,6 +91166,7 @@
               "version": 791
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -85001,6 +91178,7 @@
               "version": 792
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -85012,6 +91190,7 @@
               "version": 793
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -85023,6 +91202,7 @@
               "version": 794
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -85034,6 +91214,7 @@
               "version": 795
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -85045,6 +91226,7 @@
               "version": 796
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -85056,6 +91238,7 @@
               "version": 797
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -85067,6 +91250,7 @@
               "version": 798
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -85078,6 +91262,7 @@
               "version": 799
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -85089,6 +91274,7 @@
               "version": 800
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -85100,6 +91286,7 @@
               "version": 801
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -85111,6 +91298,7 @@
               "version": 802
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -85122,6 +91310,7 @@
               "version": 803
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -85133,6 +91322,7 @@
               "version": 804
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -85144,6 +91334,7 @@
               "version": 805
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -85155,6 +91346,7 @@
               "version": 806
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -85166,6 +91358,7 @@
               "version": 807
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -85177,6 +91370,7 @@
               "version": 808
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -85188,6 +91382,7 @@
               "version": 809
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -85199,6 +91394,7 @@
               "version": 810
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -85210,6 +91406,7 @@
               "version": 811
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -85221,6 +91418,7 @@
               "version": 812
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -85232,6 +91430,7 @@
               "version": 813
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -85243,6 +91442,7 @@
               "version": 814
             },
             {
+              "createTime": 0,
               "key": "collection/8/coll/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -85277,6 +91477,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85288,6 +91489,7 @@
                 "version": 716
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85299,6 +91501,7 @@
                 "version": 717
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85310,6 +91513,7 @@
                 "version": 718
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85321,6 +91525,7 @@
                 "version": 719
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85332,6 +91537,7 @@
                 "version": 720
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85343,6 +91549,7 @@
                 "version": 721
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85354,6 +91561,7 @@
                 "version": 722
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85365,6 +91573,7 @@
                 "version": 723
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85376,6 +91585,7 @@
                 "version": 724
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85387,6 +91597,7 @@
                 "version": 725
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85398,6 +91609,7 @@
                 "version": 726
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85409,6 +91621,7 @@
                 "version": 727
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85420,6 +91633,7 @@
                 "version": 728
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85431,6 +91645,7 @@
                 "version": 729
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85442,6 +91657,7 @@
                 "version": 730
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85453,6 +91669,7 @@
                 "version": 731
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85464,6 +91681,7 @@
                 "version": 732
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85475,6 +91693,7 @@
                 "version": 733
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85486,6 +91705,7 @@
                 "version": 734
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85497,6 +91717,7 @@
                 "version": 735
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85508,6 +91729,7 @@
                 "version": 736
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85519,6 +91741,7 @@
                 "version": 737
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85530,6 +91753,7 @@
                 "version": 738
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85541,6 +91765,7 @@
                 "version": 739
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85552,6 +91777,7 @@
                 "version": 740
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85563,6 +91789,7 @@
                 "version": 741
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85574,6 +91801,7 @@
                 "version": 742
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85585,6 +91813,7 @@
                 "version": 743
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85596,6 +91825,7 @@
                 "version": 744
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85607,6 +91837,7 @@
                 "version": 745
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85618,6 +91849,7 @@
                 "version": 746
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85629,6 +91861,7 @@
                 "version": 747
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85640,6 +91873,7 @@
                 "version": 748
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85651,6 +91885,7 @@
                 "version": 749
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85662,6 +91897,7 @@
                 "version": 750
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85673,6 +91909,7 @@
                 "version": 751
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85684,6 +91921,7 @@
                 "version": 752
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85695,6 +91933,7 @@
                 "version": 753
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85706,6 +91945,7 @@
                 "version": 754
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85717,6 +91957,7 @@
                 "version": 755
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85728,6 +91969,7 @@
                 "version": 756
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85739,6 +91981,7 @@
                 "version": 757
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85750,6 +91993,7 @@
                 "version": 758
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85761,6 +92005,7 @@
                 "version": 759
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85772,6 +92017,7 @@
                 "version": 760
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85783,6 +92029,7 @@
                 "version": 761
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85794,6 +92041,7 @@
                 "version": 762
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85805,6 +92053,7 @@
                 "version": 763
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85816,6 +92065,7 @@
                 "version": 764
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85827,6 +92077,7 @@
                 "version": 765
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85838,6 +92089,7 @@
                 "version": 766
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85849,6 +92101,7 @@
                 "version": 767
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85860,6 +92113,7 @@
                 "version": 768
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85871,6 +92125,7 @@
                 "version": 769
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85882,6 +92137,7 @@
                 "version": 770
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85893,6 +92149,7 @@
                 "version": 771
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85904,6 +92161,7 @@
                 "version": 772
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85915,6 +92173,7 @@
                 "version": 773
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85926,6 +92185,7 @@
                 "version": 774
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85937,6 +92197,7 @@
                 "version": 775
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85948,6 +92209,7 @@
                 "version": 776
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85959,6 +92221,7 @@
                 "version": 777
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85970,6 +92233,7 @@
                 "version": 778
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85981,6 +92245,7 @@
                 "version": 779
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -85992,6 +92257,7 @@
                 "version": 780
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86003,6 +92269,7 @@
                 "version": 781
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86014,6 +92281,7 @@
                 "version": 782
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86025,6 +92293,7 @@
                 "version": 783
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86036,6 +92305,7 @@
                 "version": 784
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86047,6 +92317,7 @@
                 "version": 785
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86058,6 +92329,7 @@
                 "version": 786
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86069,6 +92341,7 @@
                 "version": 787
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86080,6 +92353,7 @@
                 "version": 788
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86091,6 +92365,7 @@
                 "version": 789
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86102,6 +92377,7 @@
                 "version": 790
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86113,6 +92389,7 @@
                 "version": 791
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86124,6 +92401,7 @@
                 "version": 792
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86135,6 +92413,7 @@
                 "version": 793
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86146,6 +92425,7 @@
                 "version": 794
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86157,6 +92437,7 @@
                 "version": 795
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86168,6 +92449,7 @@
                 "version": 796
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86179,6 +92461,7 @@
                 "version": 797
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86190,6 +92473,7 @@
                 "version": 798
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86201,6 +92485,7 @@
                 "version": 799
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86212,6 +92497,7 @@
                 "version": 800
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86223,6 +92509,7 @@
                 "version": 801
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86234,6 +92521,7 @@
                 "version": 802
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86245,6 +92533,7 @@
                 "version": 803
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86256,6 +92545,7 @@
                 "version": 804
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86267,6 +92557,7 @@
                 "version": 805
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86278,6 +92569,7 @@
                 "version": 806
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86289,6 +92581,7 @@
                 "version": 807
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86300,6 +92593,7 @@
                 "version": 808
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86311,6 +92605,7 @@
                 "version": 809
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86322,6 +92617,7 @@
                 "version": 810
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86333,6 +92629,7 @@
                 "version": 811
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86344,6 +92641,7 @@
                 "version": 812
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86355,6 +92653,7 @@
                 "version": 813
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86366,6 +92665,7 @@
                 "version": 814
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86440,6 +92740,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86451,6 +92752,7 @@
                 "version": 716
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86462,6 +92764,7 @@
                 "version": 717
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86473,6 +92776,7 @@
                 "version": 718
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86484,6 +92788,7 @@
                 "version": 719
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86495,6 +92800,7 @@
                 "version": 720
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86506,6 +92812,7 @@
                 "version": 721
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86517,6 +92824,7 @@
                 "version": 722
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86528,6 +92836,7 @@
                 "version": 723
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86539,6 +92848,7 @@
                 "version": 724
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86550,6 +92860,7 @@
                 "version": 725
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86561,6 +92872,7 @@
                 "version": 726
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86572,6 +92884,7 @@
                 "version": 727
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86583,6 +92896,7 @@
                 "version": 728
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86594,6 +92908,7 @@
                 "version": 729
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86605,6 +92920,7 @@
                 "version": 730
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86616,6 +92932,7 @@
                 "version": 731
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86627,6 +92944,7 @@
                 "version": 732
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86638,6 +92956,7 @@
                 "version": 733
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86649,6 +92968,7 @@
                 "version": 734
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86660,6 +92980,7 @@
                 "version": 735
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86671,6 +92992,7 @@
                 "version": 736
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86682,6 +93004,7 @@
                 "version": 737
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86693,6 +93016,7 @@
                 "version": 738
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86704,6 +93028,7 @@
                 "version": 739
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86715,6 +93040,7 @@
                 "version": 740
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86726,6 +93052,7 @@
                 "version": 741
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86737,6 +93064,7 @@
                 "version": 742
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86748,6 +93076,7 @@
                 "version": 743
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86759,6 +93088,7 @@
                 "version": 744
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86770,6 +93100,7 @@
                 "version": 745
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86781,6 +93112,7 @@
                 "version": 746
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86792,6 +93124,7 @@
                 "version": 747
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86803,6 +93136,7 @@
                 "version": 748
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86814,6 +93148,7 @@
                 "version": 749
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86825,6 +93160,7 @@
                 "version": 750
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86836,6 +93172,7 @@
                 "version": 751
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86847,6 +93184,7 @@
                 "version": 752
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86858,6 +93196,7 @@
                 "version": 753
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86869,6 +93208,7 @@
                 "version": 754
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86880,6 +93220,7 @@
                 "version": 755
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86891,6 +93232,7 @@
                 "version": 756
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86902,6 +93244,7 @@
                 "version": 757
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86913,6 +93256,7 @@
                 "version": 758
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86924,6 +93268,7 @@
                 "version": 759
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86935,6 +93280,7 @@
                 "version": 760
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86946,6 +93292,7 @@
                 "version": 761
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86957,6 +93304,7 @@
                 "version": 762
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86968,6 +93316,7 @@
                 "version": 763
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86979,6 +93328,7 @@
                 "version": 764
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -86990,6 +93340,7 @@
                 "version": 765
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87001,6 +93352,7 @@
                 "version": 766
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87012,6 +93364,7 @@
                 "version": 767
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87023,6 +93376,7 @@
                 "version": 768
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87034,6 +93388,7 @@
                 "version": 769
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87045,6 +93400,7 @@
                 "version": 770
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87056,6 +93412,7 @@
                 "version": 771
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87067,6 +93424,7 @@
                 "version": 772
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87078,6 +93436,7 @@
                 "version": 773
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87089,6 +93448,7 @@
                 "version": 774
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87100,6 +93460,7 @@
                 "version": 775
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87111,6 +93472,7 @@
                 "version": 776
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87122,6 +93484,7 @@
                 "version": 777
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87133,6 +93496,7 @@
                 "version": 778
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87144,6 +93508,7 @@
                 "version": 779
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87155,6 +93520,7 @@
                 "version": 780
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87166,6 +93532,7 @@
                 "version": 781
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87177,6 +93544,7 @@
                 "version": 782
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87188,6 +93556,7 @@
                 "version": 783
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87199,6 +93568,7 @@
                 "version": 784
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87210,6 +93580,7 @@
                 "version": 785
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87221,6 +93592,7 @@
                 "version": 786
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87232,6 +93604,7 @@
                 "version": 787
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87243,6 +93616,7 @@
                 "version": 788
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87254,6 +93628,7 @@
                 "version": 789
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87265,6 +93640,7 @@
                 "version": 790
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87276,6 +93652,7 @@
                 "version": 791
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87287,6 +93664,7 @@
                 "version": 792
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87298,6 +93676,7 @@
                 "version": 793
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87309,6 +93688,7 @@
                 "version": 794
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87320,6 +93700,7 @@
                 "version": 795
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87331,6 +93712,7 @@
                 "version": 796
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87342,6 +93724,7 @@
                 "version": 797
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87353,6 +93736,7 @@
                 "version": 798
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87364,6 +93748,7 @@
                 "version": 799
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87375,6 +93760,7 @@
                 "version": 800
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87386,6 +93772,7 @@
                 "version": 801
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87397,6 +93784,7 @@
                 "version": 802
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87408,6 +93796,7 @@
                 "version": 803
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87419,6 +93808,7 @@
                 "version": 804
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87430,6 +93820,7 @@
                 "version": 805
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87441,6 +93832,7 @@
                 "version": 806
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87452,6 +93844,7 @@
                 "version": 807
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87463,6 +93856,7 @@
                 "version": 808
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87474,6 +93868,7 @@
                 "version": 809
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87485,6 +93880,7 @@
                 "version": 810
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87496,6 +93892,7 @@
                 "version": 811
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87507,6 +93904,7 @@
                 "version": 812
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87518,6 +93916,7 @@
                 "version": 813
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87529,6 +93928,7 @@
                 "version": 814
               },
               {
+                "createTime": 0,
                 "key": "collection/8/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -87696,6 +94096,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/9/coll/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -87707,6 +94108,7 @@
               "version": 818
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -87718,6 +94120,7 @@
               "version": 819
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -87729,6 +94132,7 @@
               "version": 820
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -87740,6 +94144,7 @@
               "version": 821
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -87751,6 +94156,7 @@
               "version": 822
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -87762,6 +94168,7 @@
               "version": 823
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -87773,6 +94180,7 @@
               "version": 824
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -87784,6 +94192,7 @@
               "version": 825
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -87795,6 +94204,7 @@
               "version": 826
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -87806,6 +94216,7 @@
               "version": 827
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -87817,6 +94228,7 @@
               "version": 828
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -87828,6 +94240,7 @@
               "version": 829
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -87839,6 +94252,7 @@
               "version": 830
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -87850,6 +94264,7 @@
               "version": 831
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -87861,6 +94276,7 @@
               "version": 832
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -87872,6 +94288,7 @@
               "version": 833
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -87883,6 +94300,7 @@
               "version": 834
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -87894,6 +94312,7 @@
               "version": 835
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -87905,6 +94324,7 @@
               "version": 836
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -87916,6 +94336,7 @@
               "version": 837
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -87927,6 +94348,7 @@
               "version": 838
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -87938,6 +94360,7 @@
               "version": 839
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -87949,6 +94372,7 @@
               "version": 840
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -87960,6 +94384,7 @@
               "version": 841
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -87971,6 +94396,7 @@
               "version": 842
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -87982,6 +94408,7 @@
               "version": 843
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -87993,6 +94420,7 @@
               "version": 844
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -88004,6 +94432,7 @@
               "version": 845
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -88015,6 +94444,7 @@
               "version": 846
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -88026,6 +94456,7 @@
               "version": 847
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -88037,6 +94468,7 @@
               "version": 848
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -88048,6 +94480,7 @@
               "version": 849
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -88059,6 +94492,7 @@
               "version": 850
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -88070,6 +94504,7 @@
               "version": 851
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -88081,6 +94516,7 @@
               "version": 852
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -88092,6 +94528,7 @@
               "version": 853
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -88103,6 +94540,7 @@
               "version": 854
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -88114,6 +94552,7 @@
               "version": 855
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -88125,6 +94564,7 @@
               "version": 856
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -88136,6 +94576,7 @@
               "version": 857
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -88147,6 +94588,7 @@
               "version": 858
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -88158,6 +94600,7 @@
               "version": 859
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -88169,6 +94612,7 @@
               "version": 860
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -88180,6 +94624,7 @@
               "version": 861
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -88191,6 +94636,7 @@
               "version": 862
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -88202,6 +94648,7 @@
               "version": 863
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -88213,6 +94660,7 @@
               "version": 864
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -88224,6 +94672,7 @@
               "version": 865
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -88235,6 +94684,7 @@
               "version": 866
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -88246,6 +94696,7 @@
               "version": 867
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -88257,6 +94708,7 @@
               "version": 868
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -88268,6 +94720,7 @@
               "version": 869
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -88279,6 +94732,7 @@
               "version": 870
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -88290,6 +94744,7 @@
               "version": 871
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -88301,6 +94756,7 @@
               "version": 872
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -88312,6 +94768,7 @@
               "version": 873
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -88323,6 +94780,7 @@
               "version": 874
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -88334,6 +94792,7 @@
               "version": 875
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -88345,6 +94804,7 @@
               "version": 876
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -88356,6 +94816,7 @@
               "version": 877
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -88367,6 +94828,7 @@
               "version": 878
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -88378,6 +94840,7 @@
               "version": 879
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -88389,6 +94852,7 @@
               "version": 880
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -88400,6 +94864,7 @@
               "version": 881
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -88411,6 +94876,7 @@
               "version": 882
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -88422,6 +94888,7 @@
               "version": 883
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -88433,6 +94900,7 @@
               "version": 884
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -88444,6 +94912,7 @@
               "version": 885
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -88455,6 +94924,7 @@
               "version": 886
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -88466,6 +94936,7 @@
               "version": 887
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -88477,6 +94948,7 @@
               "version": 888
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -88488,6 +94960,7 @@
               "version": 889
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -88499,6 +94972,7 @@
               "version": 890
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -88510,6 +94984,7 @@
               "version": 891
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -88521,6 +94996,7 @@
               "version": 892
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -88532,6 +95008,7 @@
               "version": 893
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -88543,6 +95020,7 @@
               "version": 894
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -88554,6 +95032,7 @@
               "version": 895
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -88565,6 +95044,7 @@
               "version": 896
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -88576,6 +95056,7 @@
               "version": 897
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -88587,6 +95068,7 @@
               "version": 898
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -88598,6 +95080,7 @@
               "version": 899
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -88609,6 +95092,7 @@
               "version": 900
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -88620,6 +95104,7 @@
               "version": 901
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -88631,6 +95116,7 @@
               "version": 902
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -88642,6 +95128,7 @@
               "version": 903
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -88653,6 +95140,7 @@
               "version": 904
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -88664,6 +95152,7 @@
               "version": 905
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -88675,6 +95164,7 @@
               "version": 906
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -88686,6 +95176,7 @@
               "version": 907
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -88697,6 +95188,7 @@
               "version": 908
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -88708,6 +95200,7 @@
               "version": 909
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -88719,6 +95212,7 @@
               "version": 910
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -88730,6 +95224,7 @@
               "version": 911
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -88741,6 +95236,7 @@
               "version": 912
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -88752,6 +95248,7 @@
               "version": 913
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -88763,6 +95260,7 @@
               "version": 914
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -88774,6 +95272,7 @@
               "version": 915
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -88785,6 +95284,7 @@
               "version": 916
             },
             {
+              "createTime": 0,
               "key": "collection/9/coll/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -88819,6 +95319,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88830,6 +95331,7 @@
                 "version": 818
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88841,6 +95343,7 @@
                 "version": 819
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88852,6 +95355,7 @@
                 "version": 820
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88863,6 +95367,7 @@
                 "version": 821
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88874,6 +95379,7 @@
                 "version": 822
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88885,6 +95391,7 @@
                 "version": 823
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88896,6 +95403,7 @@
                 "version": 824
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88907,6 +95415,7 @@
                 "version": 825
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88918,6 +95427,7 @@
                 "version": 826
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88929,6 +95439,7 @@
                 "version": 827
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88940,6 +95451,7 @@
                 "version": 828
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88951,6 +95463,7 @@
                 "version": 829
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88962,6 +95475,7 @@
                 "version": 830
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88973,6 +95487,7 @@
                 "version": 831
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88984,6 +95499,7 @@
                 "version": 832
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -88995,6 +95511,7 @@
                 "version": 833
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89006,6 +95523,7 @@
                 "version": 834
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89017,6 +95535,7 @@
                 "version": 835
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89028,6 +95547,7 @@
                 "version": 836
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89039,6 +95559,7 @@
                 "version": 837
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89050,6 +95571,7 @@
                 "version": 838
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89061,6 +95583,7 @@
                 "version": 839
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89072,6 +95595,7 @@
                 "version": 840
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89083,6 +95607,7 @@
                 "version": 841
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89094,6 +95619,7 @@
                 "version": 842
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89105,6 +95631,7 @@
                 "version": 843
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89116,6 +95643,7 @@
                 "version": 844
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89127,6 +95655,7 @@
                 "version": 845
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89138,6 +95667,7 @@
                 "version": 846
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89149,6 +95679,7 @@
                 "version": 847
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89160,6 +95691,7 @@
                 "version": 848
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89171,6 +95703,7 @@
                 "version": 849
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89182,6 +95715,7 @@
                 "version": 850
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89193,6 +95727,7 @@
                 "version": 851
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89204,6 +95739,7 @@
                 "version": 852
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89215,6 +95751,7 @@
                 "version": 853
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89226,6 +95763,7 @@
                 "version": 854
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89237,6 +95775,7 @@
                 "version": 855
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89248,6 +95787,7 @@
                 "version": 856
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89259,6 +95799,7 @@
                 "version": 857
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89270,6 +95811,7 @@
                 "version": 858
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89281,6 +95823,7 @@
                 "version": 859
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89292,6 +95835,7 @@
                 "version": 860
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89303,6 +95847,7 @@
                 "version": 861
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89314,6 +95859,7 @@
                 "version": 862
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89325,6 +95871,7 @@
                 "version": 863
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89336,6 +95883,7 @@
                 "version": 864
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89347,6 +95895,7 @@
                 "version": 865
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89358,6 +95907,7 @@
                 "version": 866
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89369,6 +95919,7 @@
                 "version": 867
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89380,6 +95931,7 @@
                 "version": 868
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89391,6 +95943,7 @@
                 "version": 869
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89402,6 +95955,7 @@
                 "version": 870
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89413,6 +95967,7 @@
                 "version": 871
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89424,6 +95979,7 @@
                 "version": 872
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89435,6 +95991,7 @@
                 "version": 873
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89446,6 +96003,7 @@
                 "version": 874
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89457,6 +96015,7 @@
                 "version": 875
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89468,6 +96027,7 @@
                 "version": 876
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89479,6 +96039,7 @@
                 "version": 877
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89490,6 +96051,7 @@
                 "version": 878
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89501,6 +96063,7 @@
                 "version": 879
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89512,6 +96075,7 @@
                 "version": 880
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89523,6 +96087,7 @@
                 "version": 881
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89534,6 +96099,7 @@
                 "version": 882
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89545,6 +96111,7 @@
                 "version": 883
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89556,6 +96123,7 @@
                 "version": 884
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89567,6 +96135,7 @@
                 "version": 885
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89578,6 +96147,7 @@
                 "version": 886
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89589,6 +96159,7 @@
                 "version": 887
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89600,6 +96171,7 @@
                 "version": 888
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89611,6 +96183,7 @@
                 "version": 889
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89622,6 +96195,7 @@
                 "version": 890
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89633,6 +96207,7 @@
                 "version": 891
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89644,6 +96219,7 @@
                 "version": 892
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89655,6 +96231,7 @@
                 "version": 893
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89666,6 +96243,7 @@
                 "version": 894
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89677,6 +96255,7 @@
                 "version": 895
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89688,6 +96267,7 @@
                 "version": 896
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89699,6 +96279,7 @@
                 "version": 897
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89710,6 +96291,7 @@
                 "version": 898
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89721,6 +96303,7 @@
                 "version": 899
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89732,6 +96315,7 @@
                 "version": 900
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89743,6 +96327,7 @@
                 "version": 901
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89754,6 +96339,7 @@
                 "version": 902
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89765,6 +96351,7 @@
                 "version": 903
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89776,6 +96363,7 @@
                 "version": 904
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89787,6 +96375,7 @@
                 "version": 905
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89798,6 +96387,7 @@
                 "version": 906
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89809,6 +96399,7 @@
                 "version": 907
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89820,6 +96411,7 @@
                 "version": 908
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89831,6 +96423,7 @@
                 "version": 909
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89842,6 +96435,7 @@
                 "version": 910
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89853,6 +96447,7 @@
                 "version": 911
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89864,6 +96459,7 @@
                 "version": 912
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89875,6 +96471,7 @@
                 "version": 913
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89886,6 +96483,7 @@
                 "version": 914
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89897,6 +96495,7 @@
                 "version": 915
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89908,6 +96507,7 @@
                 "version": 916
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89982,6 +96582,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -89993,6 +96594,7 @@
                 "version": 818
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90004,6 +96606,7 @@
                 "version": 819
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90015,6 +96618,7 @@
                 "version": 820
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90026,6 +96630,7 @@
                 "version": 821
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90037,6 +96642,7 @@
                 "version": 822
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90048,6 +96654,7 @@
                 "version": 823
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90059,6 +96666,7 @@
                 "version": 824
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90070,6 +96678,7 @@
                 "version": 825
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90081,6 +96690,7 @@
                 "version": 826
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90092,6 +96702,7 @@
                 "version": 827
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90103,6 +96714,7 @@
                 "version": 828
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90114,6 +96726,7 @@
                 "version": 829
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90125,6 +96738,7 @@
                 "version": 830
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90136,6 +96750,7 @@
                 "version": 831
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90147,6 +96762,7 @@
                 "version": 832
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90158,6 +96774,7 @@
                 "version": 833
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90169,6 +96786,7 @@
                 "version": 834
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90180,6 +96798,7 @@
                 "version": 835
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90191,6 +96810,7 @@
                 "version": 836
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90202,6 +96822,7 @@
                 "version": 837
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90213,6 +96834,7 @@
                 "version": 838
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90224,6 +96846,7 @@
                 "version": 839
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90235,6 +96858,7 @@
                 "version": 840
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90246,6 +96870,7 @@
                 "version": 841
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90257,6 +96882,7 @@
                 "version": 842
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90268,6 +96894,7 @@
                 "version": 843
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90279,6 +96906,7 @@
                 "version": 844
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90290,6 +96918,7 @@
                 "version": 845
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90301,6 +96930,7 @@
                 "version": 846
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90312,6 +96942,7 @@
                 "version": 847
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90323,6 +96954,7 @@
                 "version": 848
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90334,6 +96966,7 @@
                 "version": 849
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90345,6 +96978,7 @@
                 "version": 850
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90356,6 +96990,7 @@
                 "version": 851
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90367,6 +97002,7 @@
                 "version": 852
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90378,6 +97014,7 @@
                 "version": 853
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90389,6 +97026,7 @@
                 "version": 854
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90400,6 +97038,7 @@
                 "version": 855
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90411,6 +97050,7 @@
                 "version": 856
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90422,6 +97062,7 @@
                 "version": 857
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90433,6 +97074,7 @@
                 "version": 858
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90444,6 +97086,7 @@
                 "version": 859
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90455,6 +97098,7 @@
                 "version": 860
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90466,6 +97110,7 @@
                 "version": 861
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90477,6 +97122,7 @@
                 "version": 862
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90488,6 +97134,7 @@
                 "version": 863
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90499,6 +97146,7 @@
                 "version": 864
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90510,6 +97158,7 @@
                 "version": 865
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90521,6 +97170,7 @@
                 "version": 866
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90532,6 +97182,7 @@
                 "version": 867
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90543,6 +97194,7 @@
                 "version": 868
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90554,6 +97206,7 @@
                 "version": 869
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90565,6 +97218,7 @@
                 "version": 870
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90576,6 +97230,7 @@
                 "version": 871
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90587,6 +97242,7 @@
                 "version": 872
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90598,6 +97254,7 @@
                 "version": 873
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90609,6 +97266,7 @@
                 "version": 874
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90620,6 +97278,7 @@
                 "version": 875
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90631,6 +97290,7 @@
                 "version": 876
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90642,6 +97302,7 @@
                 "version": 877
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90653,6 +97314,7 @@
                 "version": 878
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90664,6 +97326,7 @@
                 "version": 879
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90675,6 +97338,7 @@
                 "version": 880
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90686,6 +97350,7 @@
                 "version": 881
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90697,6 +97362,7 @@
                 "version": 882
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90708,6 +97374,7 @@
                 "version": 883
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90719,6 +97386,7 @@
                 "version": 884
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90730,6 +97398,7 @@
                 "version": 885
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90741,6 +97410,7 @@
                 "version": 886
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90752,6 +97422,7 @@
                 "version": 887
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90763,6 +97434,7 @@
                 "version": 888
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90774,6 +97446,7 @@
                 "version": 889
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90785,6 +97458,7 @@
                 "version": 890
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90796,6 +97470,7 @@
                 "version": 891
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90807,6 +97482,7 @@
                 "version": 892
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90818,6 +97494,7 @@
                 "version": 893
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90829,6 +97506,7 @@
                 "version": 894
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90840,6 +97518,7 @@
                 "version": 895
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90851,6 +97530,7 @@
                 "version": 896
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90862,6 +97542,7 @@
                 "version": 897
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90873,6 +97554,7 @@
                 "version": 898
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90884,6 +97566,7 @@
                 "version": 899
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90895,6 +97578,7 @@
                 "version": 900
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90906,6 +97590,7 @@
                 "version": 901
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90917,6 +97602,7 @@
                 "version": 902
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90928,6 +97614,7 @@
                 "version": 903
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90939,6 +97626,7 @@
                 "version": 904
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90950,6 +97638,7 @@
                 "version": 905
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90961,6 +97650,7 @@
                 "version": 906
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90972,6 +97662,7 @@
                 "version": 907
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90983,6 +97674,7 @@
                 "version": 908
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -90994,6 +97686,7 @@
                 "version": 909
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -91005,6 +97698,7 @@
                 "version": 910
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -91016,6 +97710,7 @@
                 "version": 911
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -91027,6 +97722,7 @@
                 "version": 912
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -91038,6 +97734,7 @@
                 "version": 913
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -91049,6 +97746,7 @@
                 "version": 914
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -91060,6 +97758,7 @@
                 "version": 915
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -91071,6 +97770,7 @@
                 "version": 916
               },
               {
+                "createTime": 0,
                 "key": "collection/9/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -91238,6 +97938,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/10/coll/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -91249,6 +97950,7 @@
               "version": 920
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -91260,6 +97962,7 @@
               "version": 921
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -91271,6 +97974,7 @@
               "version": 922
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -91282,6 +97986,7 @@
               "version": 923
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -91293,6 +97998,7 @@
               "version": 924
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -91304,6 +98010,7 @@
               "version": 925
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -91315,6 +98022,7 @@
               "version": 926
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -91326,6 +98034,7 @@
               "version": 927
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -91337,6 +98046,7 @@
               "version": 928
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -91348,6 +98058,7 @@
               "version": 929
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/10",
               "options": {
                 "hasCommittedMutations": false,
@@ -91359,6 +98070,7 @@
               "version": 930
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/11",
               "options": {
                 "hasCommittedMutations": false,
@@ -91370,6 +98082,7 @@
               "version": 931
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/12",
               "options": {
                 "hasCommittedMutations": false,
@@ -91381,6 +98094,7 @@
               "version": 932
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/13",
               "options": {
                 "hasCommittedMutations": false,
@@ -91392,6 +98106,7 @@
               "version": 933
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/14",
               "options": {
                 "hasCommittedMutations": false,
@@ -91403,6 +98118,7 @@
               "version": 934
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/15",
               "options": {
                 "hasCommittedMutations": false,
@@ -91414,6 +98130,7 @@
               "version": 935
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/16",
               "options": {
                 "hasCommittedMutations": false,
@@ -91425,6 +98142,7 @@
               "version": 936
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/17",
               "options": {
                 "hasCommittedMutations": false,
@@ -91436,6 +98154,7 @@
               "version": 937
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/18",
               "options": {
                 "hasCommittedMutations": false,
@@ -91447,6 +98166,7 @@
               "version": 938
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/19",
               "options": {
                 "hasCommittedMutations": false,
@@ -91458,6 +98178,7 @@
               "version": 939
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/20",
               "options": {
                 "hasCommittedMutations": false,
@@ -91469,6 +98190,7 @@
               "version": 940
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/21",
               "options": {
                 "hasCommittedMutations": false,
@@ -91480,6 +98202,7 @@
               "version": 941
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/22",
               "options": {
                 "hasCommittedMutations": false,
@@ -91491,6 +98214,7 @@
               "version": 942
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/23",
               "options": {
                 "hasCommittedMutations": false,
@@ -91502,6 +98226,7 @@
               "version": 943
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/24",
               "options": {
                 "hasCommittedMutations": false,
@@ -91513,6 +98238,7 @@
               "version": 944
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/25",
               "options": {
                 "hasCommittedMutations": false,
@@ -91524,6 +98250,7 @@
               "version": 945
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/26",
               "options": {
                 "hasCommittedMutations": false,
@@ -91535,6 +98262,7 @@
               "version": 946
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/27",
               "options": {
                 "hasCommittedMutations": false,
@@ -91546,6 +98274,7 @@
               "version": 947
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/28",
               "options": {
                 "hasCommittedMutations": false,
@@ -91557,6 +98286,7 @@
               "version": 948
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/29",
               "options": {
                 "hasCommittedMutations": false,
@@ -91568,6 +98298,7 @@
               "version": 949
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/30",
               "options": {
                 "hasCommittedMutations": false,
@@ -91579,6 +98310,7 @@
               "version": 950
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/31",
               "options": {
                 "hasCommittedMutations": false,
@@ -91590,6 +98322,7 @@
               "version": 951
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/32",
               "options": {
                 "hasCommittedMutations": false,
@@ -91601,6 +98334,7 @@
               "version": 952
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/33",
               "options": {
                 "hasCommittedMutations": false,
@@ -91612,6 +98346,7 @@
               "version": 953
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/34",
               "options": {
                 "hasCommittedMutations": false,
@@ -91623,6 +98358,7 @@
               "version": 954
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/35",
               "options": {
                 "hasCommittedMutations": false,
@@ -91634,6 +98370,7 @@
               "version": 955
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/36",
               "options": {
                 "hasCommittedMutations": false,
@@ -91645,6 +98382,7 @@
               "version": 956
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/37",
               "options": {
                 "hasCommittedMutations": false,
@@ -91656,6 +98394,7 @@
               "version": 957
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/38",
               "options": {
                 "hasCommittedMutations": false,
@@ -91667,6 +98406,7 @@
               "version": 958
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/39",
               "options": {
                 "hasCommittedMutations": false,
@@ -91678,6 +98418,7 @@
               "version": 959
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/40",
               "options": {
                 "hasCommittedMutations": false,
@@ -91689,6 +98430,7 @@
               "version": 960
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/41",
               "options": {
                 "hasCommittedMutations": false,
@@ -91700,6 +98442,7 @@
               "version": 961
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/42",
               "options": {
                 "hasCommittedMutations": false,
@@ -91711,6 +98454,7 @@
               "version": 962
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/43",
               "options": {
                 "hasCommittedMutations": false,
@@ -91722,6 +98466,7 @@
               "version": 963
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/44",
               "options": {
                 "hasCommittedMutations": false,
@@ -91733,6 +98478,7 @@
               "version": 964
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/45",
               "options": {
                 "hasCommittedMutations": false,
@@ -91744,6 +98490,7 @@
               "version": 965
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/46",
               "options": {
                 "hasCommittedMutations": false,
@@ -91755,6 +98502,7 @@
               "version": 966
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/47",
               "options": {
                 "hasCommittedMutations": false,
@@ -91766,6 +98514,7 @@
               "version": 967
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/48",
               "options": {
                 "hasCommittedMutations": false,
@@ -91777,6 +98526,7 @@
               "version": 968
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/49",
               "options": {
                 "hasCommittedMutations": false,
@@ -91788,6 +98538,7 @@
               "version": 969
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/50",
               "options": {
                 "hasCommittedMutations": false,
@@ -91799,6 +98550,7 @@
               "version": 970
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/51",
               "options": {
                 "hasCommittedMutations": false,
@@ -91810,6 +98562,7 @@
               "version": 971
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/52",
               "options": {
                 "hasCommittedMutations": false,
@@ -91821,6 +98574,7 @@
               "version": 972
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/53",
               "options": {
                 "hasCommittedMutations": false,
@@ -91832,6 +98586,7 @@
               "version": 973
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/54",
               "options": {
                 "hasCommittedMutations": false,
@@ -91843,6 +98598,7 @@
               "version": 974
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/55",
               "options": {
                 "hasCommittedMutations": false,
@@ -91854,6 +98610,7 @@
               "version": 975
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/56",
               "options": {
                 "hasCommittedMutations": false,
@@ -91865,6 +98622,7 @@
               "version": 976
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/57",
               "options": {
                 "hasCommittedMutations": false,
@@ -91876,6 +98634,7 @@
               "version": 977
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/58",
               "options": {
                 "hasCommittedMutations": false,
@@ -91887,6 +98646,7 @@
               "version": 978
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/59",
               "options": {
                 "hasCommittedMutations": false,
@@ -91898,6 +98658,7 @@
               "version": 979
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/60",
               "options": {
                 "hasCommittedMutations": false,
@@ -91909,6 +98670,7 @@
               "version": 980
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/61",
               "options": {
                 "hasCommittedMutations": false,
@@ -91920,6 +98682,7 @@
               "version": 981
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/62",
               "options": {
                 "hasCommittedMutations": false,
@@ -91931,6 +98694,7 @@
               "version": 982
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/63",
               "options": {
                 "hasCommittedMutations": false,
@@ -91942,6 +98706,7 @@
               "version": 983
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/64",
               "options": {
                 "hasCommittedMutations": false,
@@ -91953,6 +98718,7 @@
               "version": 984
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/65",
               "options": {
                 "hasCommittedMutations": false,
@@ -91964,6 +98730,7 @@
               "version": 985
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/66",
               "options": {
                 "hasCommittedMutations": false,
@@ -91975,6 +98742,7 @@
               "version": 986
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/67",
               "options": {
                 "hasCommittedMutations": false,
@@ -91986,6 +98754,7 @@
               "version": 987
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/68",
               "options": {
                 "hasCommittedMutations": false,
@@ -91997,6 +98766,7 @@
               "version": 988
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/69",
               "options": {
                 "hasCommittedMutations": false,
@@ -92008,6 +98778,7 @@
               "version": 989
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/70",
               "options": {
                 "hasCommittedMutations": false,
@@ -92019,6 +98790,7 @@
               "version": 990
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/71",
               "options": {
                 "hasCommittedMutations": false,
@@ -92030,6 +98802,7 @@
               "version": 991
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/72",
               "options": {
                 "hasCommittedMutations": false,
@@ -92041,6 +98814,7 @@
               "version": 992
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/73",
               "options": {
                 "hasCommittedMutations": false,
@@ -92052,6 +98826,7 @@
               "version": 993
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/74",
               "options": {
                 "hasCommittedMutations": false,
@@ -92063,6 +98838,7 @@
               "version": 994
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/75",
               "options": {
                 "hasCommittedMutations": false,
@@ -92074,6 +98850,7 @@
               "version": 995
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/76",
               "options": {
                 "hasCommittedMutations": false,
@@ -92085,6 +98862,7 @@
               "version": 996
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/77",
               "options": {
                 "hasCommittedMutations": false,
@@ -92096,6 +98874,7 @@
               "version": 997
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/78",
               "options": {
                 "hasCommittedMutations": false,
@@ -92107,6 +98886,7 @@
               "version": 998
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/79",
               "options": {
                 "hasCommittedMutations": false,
@@ -92118,6 +98898,7 @@
               "version": 999
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/80",
               "options": {
                 "hasCommittedMutations": false,
@@ -92129,6 +98910,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/81",
               "options": {
                 "hasCommittedMutations": false,
@@ -92140,6 +98922,7 @@
               "version": 1001
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/82",
               "options": {
                 "hasCommittedMutations": false,
@@ -92151,6 +98934,7 @@
               "version": 1002
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/83",
               "options": {
                 "hasCommittedMutations": false,
@@ -92162,6 +98946,7 @@
               "version": 1003
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/84",
               "options": {
                 "hasCommittedMutations": false,
@@ -92173,6 +98958,7 @@
               "version": 1004
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/85",
               "options": {
                 "hasCommittedMutations": false,
@@ -92184,6 +98970,7 @@
               "version": 1005
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/86",
               "options": {
                 "hasCommittedMutations": false,
@@ -92195,6 +98982,7 @@
               "version": 1006
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/87",
               "options": {
                 "hasCommittedMutations": false,
@@ -92206,6 +98994,7 @@
               "version": 1007
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/88",
               "options": {
                 "hasCommittedMutations": false,
@@ -92217,6 +99006,7 @@
               "version": 1008
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/89",
               "options": {
                 "hasCommittedMutations": false,
@@ -92228,6 +99018,7 @@
               "version": 1009
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/90",
               "options": {
                 "hasCommittedMutations": false,
@@ -92239,6 +99030,7 @@
               "version": 1010
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/91",
               "options": {
                 "hasCommittedMutations": false,
@@ -92250,6 +99042,7 @@
               "version": 1011
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/92",
               "options": {
                 "hasCommittedMutations": false,
@@ -92261,6 +99054,7 @@
               "version": 1012
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/93",
               "options": {
                 "hasCommittedMutations": false,
@@ -92272,6 +99066,7 @@
               "version": 1013
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/94",
               "options": {
                 "hasCommittedMutations": false,
@@ -92283,6 +99078,7 @@
               "version": 1014
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/95",
               "options": {
                 "hasCommittedMutations": false,
@@ -92294,6 +99090,7 @@
               "version": 1015
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/96",
               "options": {
                 "hasCommittedMutations": false,
@@ -92305,6 +99102,7 @@
               "version": 1016
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/97",
               "options": {
                 "hasCommittedMutations": false,
@@ -92316,6 +99114,7 @@
               "version": 1017
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/98",
               "options": {
                 "hasCommittedMutations": false,
@@ -92327,6 +99126,7 @@
               "version": 1018
             },
             {
+              "createTime": 0,
               "key": "collection/10/coll/99",
               "options": {
                 "hasCommittedMutations": false,
@@ -92361,6 +99161,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92372,6 +99173,7 @@
                 "version": 920
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92383,6 +99185,7 @@
                 "version": 921
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92394,6 +99197,7 @@
                 "version": 922
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92405,6 +99209,7 @@
                 "version": 923
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92416,6 +99221,7 @@
                 "version": 924
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92427,6 +99233,7 @@
                 "version": 925
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92438,6 +99245,7 @@
                 "version": 926
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92449,6 +99257,7 @@
                 "version": 927
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92460,6 +99269,7 @@
                 "version": 928
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92471,6 +99281,7 @@
                 "version": 929
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92482,6 +99293,7 @@
                 "version": 930
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92493,6 +99305,7 @@
                 "version": 931
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92504,6 +99317,7 @@
                 "version": 932
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92515,6 +99329,7 @@
                 "version": 933
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92526,6 +99341,7 @@
                 "version": 934
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92537,6 +99353,7 @@
                 "version": 935
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92548,6 +99365,7 @@
                 "version": 936
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92559,6 +99377,7 @@
                 "version": 937
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92570,6 +99389,7 @@
                 "version": 938
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92581,6 +99401,7 @@
                 "version": 939
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92592,6 +99413,7 @@
                 "version": 940
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92603,6 +99425,7 @@
                 "version": 941
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92614,6 +99437,7 @@
                 "version": 942
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92625,6 +99449,7 @@
                 "version": 943
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92636,6 +99461,7 @@
                 "version": 944
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92647,6 +99473,7 @@
                 "version": 945
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92658,6 +99485,7 @@
                 "version": 946
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92669,6 +99497,7 @@
                 "version": 947
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92680,6 +99509,7 @@
                 "version": 948
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92691,6 +99521,7 @@
                 "version": 949
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92702,6 +99533,7 @@
                 "version": 950
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92713,6 +99545,7 @@
                 "version": 951
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92724,6 +99557,7 @@
                 "version": 952
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92735,6 +99569,7 @@
                 "version": 953
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92746,6 +99581,7 @@
                 "version": 954
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92757,6 +99593,7 @@
                 "version": 955
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92768,6 +99605,7 @@
                 "version": 956
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92779,6 +99617,7 @@
                 "version": 957
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92790,6 +99629,7 @@
                 "version": 958
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92801,6 +99641,7 @@
                 "version": 959
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92812,6 +99653,7 @@
                 "version": 960
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92823,6 +99665,7 @@
                 "version": 961
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92834,6 +99677,7 @@
                 "version": 962
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92845,6 +99689,7 @@
                 "version": 963
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92856,6 +99701,7 @@
                 "version": 964
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92867,6 +99713,7 @@
                 "version": 965
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92878,6 +99725,7 @@
                 "version": 966
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92889,6 +99737,7 @@
                 "version": 967
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92900,6 +99749,7 @@
                 "version": 968
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92911,6 +99761,7 @@
                 "version": 969
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92922,6 +99773,7 @@
                 "version": 970
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92933,6 +99785,7 @@
                 "version": 971
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92944,6 +99797,7 @@
                 "version": 972
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92955,6 +99809,7 @@
                 "version": 973
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92966,6 +99821,7 @@
                 "version": 974
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92977,6 +99833,7 @@
                 "version": 975
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92988,6 +99845,7 @@
                 "version": 976
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -92999,6 +99857,7 @@
                 "version": 977
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93010,6 +99869,7 @@
                 "version": 978
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93021,6 +99881,7 @@
                 "version": 979
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93032,6 +99893,7 @@
                 "version": 980
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93043,6 +99905,7 @@
                 "version": 981
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93054,6 +99917,7 @@
                 "version": 982
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93065,6 +99929,7 @@
                 "version": 983
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93076,6 +99941,7 @@
                 "version": 984
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93087,6 +99953,7 @@
                 "version": 985
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93098,6 +99965,7 @@
                 "version": 986
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93109,6 +99977,7 @@
                 "version": 987
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93120,6 +99989,7 @@
                 "version": 988
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93131,6 +100001,7 @@
                 "version": 989
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93142,6 +100013,7 @@
                 "version": 990
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93153,6 +100025,7 @@
                 "version": 991
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93164,6 +100037,7 @@
                 "version": 992
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93175,6 +100049,7 @@
                 "version": 993
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93186,6 +100061,7 @@
                 "version": 994
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93197,6 +100073,7 @@
                 "version": 995
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93208,6 +100085,7 @@
                 "version": 996
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93219,6 +100097,7 @@
                 "version": 997
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93230,6 +100109,7 @@
                 "version": 998
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93241,6 +100121,7 @@
                 "version": 999
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93252,6 +100133,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93263,6 +100145,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93274,6 +100157,7 @@
                 "version": 1002
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93285,6 +100169,7 @@
                 "version": 1003
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93296,6 +100181,7 @@
                 "version": 1004
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93307,6 +100193,7 @@
                 "version": 1005
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93318,6 +100205,7 @@
                 "version": 1006
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93329,6 +100217,7 @@
                 "version": 1007
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93340,6 +100229,7 @@
                 "version": 1008
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93351,6 +100241,7 @@
                 "version": 1009
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93362,6 +100253,7 @@
                 "version": 1010
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93373,6 +100265,7 @@
                 "version": 1011
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93384,6 +100277,7 @@
                 "version": 1012
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93395,6 +100289,7 @@
                 "version": 1013
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93406,6 +100301,7 @@
                 "version": 1014
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93417,6 +100313,7 @@
                 "version": 1015
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93428,6 +100325,7 @@
                 "version": 1016
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93439,6 +100337,7 @@
                 "version": 1017
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93450,6 +100349,7 @@
                 "version": 1018
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93524,6 +100424,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93535,6 +100436,7 @@
                 "version": 920
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93546,6 +100448,7 @@
                 "version": 921
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93557,6 +100460,7 @@
                 "version": 922
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93568,6 +100472,7 @@
                 "version": 923
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93579,6 +100484,7 @@
                 "version": 924
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93590,6 +100496,7 @@
                 "version": 925
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93601,6 +100508,7 @@
                 "version": 926
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93612,6 +100520,7 @@
                 "version": 927
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93623,6 +100532,7 @@
                 "version": 928
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93634,6 +100544,7 @@
                 "version": 929
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93645,6 +100556,7 @@
                 "version": 930
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93656,6 +100568,7 @@
                 "version": 931
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93667,6 +100580,7 @@
                 "version": 932
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93678,6 +100592,7 @@
                 "version": 933
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93689,6 +100604,7 @@
                 "version": 934
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93700,6 +100616,7 @@
                 "version": 935
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93711,6 +100628,7 @@
                 "version": 936
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93722,6 +100640,7 @@
                 "version": 937
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93733,6 +100652,7 @@
                 "version": 938
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93744,6 +100664,7 @@
                 "version": 939
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93755,6 +100676,7 @@
                 "version": 940
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93766,6 +100688,7 @@
                 "version": 941
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93777,6 +100700,7 @@
                 "version": 942
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93788,6 +100712,7 @@
                 "version": 943
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93799,6 +100724,7 @@
                 "version": 944
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93810,6 +100736,7 @@
                 "version": 945
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93821,6 +100748,7 @@
                 "version": 946
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93832,6 +100760,7 @@
                 "version": 947
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93843,6 +100772,7 @@
                 "version": 948
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93854,6 +100784,7 @@
                 "version": 949
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93865,6 +100796,7 @@
                 "version": 950
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93876,6 +100808,7 @@
                 "version": 951
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93887,6 +100820,7 @@
                 "version": 952
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93898,6 +100832,7 @@
                 "version": 953
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93909,6 +100844,7 @@
                 "version": 954
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93920,6 +100856,7 @@
                 "version": 955
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93931,6 +100868,7 @@
                 "version": 956
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93942,6 +100880,7 @@
                 "version": 957
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93953,6 +100892,7 @@
                 "version": 958
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93964,6 +100904,7 @@
                 "version": 959
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93975,6 +100916,7 @@
                 "version": 960
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93986,6 +100928,7 @@
                 "version": 961
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -93997,6 +100940,7 @@
                 "version": 962
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94008,6 +100952,7 @@
                 "version": 963
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94019,6 +100964,7 @@
                 "version": 964
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94030,6 +100976,7 @@
                 "version": 965
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94041,6 +100988,7 @@
                 "version": 966
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94052,6 +101000,7 @@
                 "version": 967
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94063,6 +101012,7 @@
                 "version": 968
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94074,6 +101024,7 @@
                 "version": 969
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94085,6 +101036,7 @@
                 "version": 970
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94096,6 +101048,7 @@
                 "version": 971
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94107,6 +101060,7 @@
                 "version": 972
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94118,6 +101072,7 @@
                 "version": 973
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94129,6 +101084,7 @@
                 "version": 974
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94140,6 +101096,7 @@
                 "version": 975
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94151,6 +101108,7 @@
                 "version": 976
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94162,6 +101120,7 @@
                 "version": 977
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94173,6 +101132,7 @@
                 "version": 978
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94184,6 +101144,7 @@
                 "version": 979
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94195,6 +101156,7 @@
                 "version": 980
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94206,6 +101168,7 @@
                 "version": 981
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94217,6 +101180,7 @@
                 "version": 982
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94228,6 +101192,7 @@
                 "version": 983
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94239,6 +101204,7 @@
                 "version": 984
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94250,6 +101216,7 @@
                 "version": 985
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94261,6 +101228,7 @@
                 "version": 986
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94272,6 +101240,7 @@
                 "version": 987
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94283,6 +101252,7 @@
                 "version": 988
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94294,6 +101264,7 @@
                 "version": 989
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94305,6 +101276,7 @@
                 "version": 990
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94316,6 +101288,7 @@
                 "version": 991
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94327,6 +101300,7 @@
                 "version": 992
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94338,6 +101312,7 @@
                 "version": 993
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94349,6 +101324,7 @@
                 "version": 994
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94360,6 +101336,7 @@
                 "version": 995
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94371,6 +101348,7 @@
                 "version": 996
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94382,6 +101360,7 @@
                 "version": 997
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94393,6 +101372,7 @@
                 "version": 998
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94404,6 +101384,7 @@
                 "version": 999
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94415,6 +101396,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94426,6 +101408,7 @@
                 "version": 1001
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94437,6 +101420,7 @@
                 "version": 1002
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94448,6 +101432,7 @@
                 "version": 1003
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94459,6 +101444,7 @@
                 "version": 1004
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94470,6 +101456,7 @@
                 "version": 1005
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94481,6 +101468,7 @@
                 "version": 1006
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94492,6 +101480,7 @@
                 "version": 1007
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94503,6 +101492,7 @@
                 "version": 1008
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94514,6 +101504,7 @@
                 "version": 1009
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94525,6 +101516,7 @@
                 "version": 1010
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94536,6 +101528,7 @@
                 "version": 1011
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94547,6 +101540,7 @@
                 "version": 1012
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94558,6 +101552,7 @@
                 "version": 1013
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94569,6 +101564,7 @@
                 "version": 1014
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94580,6 +101576,7 @@
                 "version": 1015
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94591,6 +101588,7 @@
                 "version": 1016
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94602,6 +101600,7 @@
                 "version": 1017
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94613,6 +101612,7 @@
                 "version": 1018
               },
               {
+                "createTime": 0,
                 "key": "collection/10/coll/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -94745,7 +101745,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -100927,6 +107927,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/1/coll/matches",
               "options": {
                 "hasCommittedMutations": false,
@@ -100977,6 +107978,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101007,6 +108009,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101037,6 +108040,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101067,6 +108071,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101097,6 +108102,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101127,6 +108133,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101157,6 +108164,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101187,6 +108195,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101217,6 +108226,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101247,6 +108257,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101277,6 +108288,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101307,6 +108319,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101337,6 +108350,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101367,6 +108381,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101397,6 +108412,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101427,6 +108443,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101457,6 +108474,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101487,6 +108505,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101517,6 +108536,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101547,6 +108567,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101577,6 +108598,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101607,6 +108629,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101637,6 +108660,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101667,6 +108691,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -101697,6 +108722,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -113705,6 +120731,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/2/coll/matches",
               "options": {
                 "hasCommittedMutations": false,
@@ -113755,6 +120782,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -113785,6 +120813,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -113815,6 +120844,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -113845,6 +120875,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -113875,6 +120906,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -113905,6 +120937,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -113935,6 +120968,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -113965,6 +120999,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -113995,6 +121030,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114025,6 +121061,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114055,6 +121092,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114085,6 +121123,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114115,6 +121154,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114145,6 +121185,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114175,6 +121216,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114205,6 +121247,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114235,6 +121278,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114265,6 +121309,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114295,6 +121340,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114325,6 +121371,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114355,6 +121402,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114385,6 +121433,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114415,6 +121464,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114445,6 +121495,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -114475,6 +121526,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126483,6 +133535,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/3/coll/matches",
               "options": {
                 "hasCommittedMutations": false,
@@ -126533,6 +133586,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126563,6 +133617,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126593,6 +133648,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126623,6 +133679,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126653,6 +133710,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126683,6 +133741,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126713,6 +133772,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126743,6 +133803,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126773,6 +133834,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126803,6 +133865,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126833,6 +133896,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126863,6 +133927,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126893,6 +133958,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126923,6 +133989,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126953,6 +134020,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126983,6 +134051,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -127013,6 +134082,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -127043,6 +134113,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -127073,6 +134144,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -127103,6 +134175,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -127133,6 +134206,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -127163,6 +134237,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -127193,6 +134268,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -127223,6 +134299,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -127253,6 +134330,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139261,6 +146339,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/4/coll/matches",
               "options": {
                 "hasCommittedMutations": false,
@@ -139311,6 +146390,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139341,6 +146421,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139371,6 +146452,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139401,6 +146483,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139431,6 +146514,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139461,6 +146545,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139491,6 +146576,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139521,6 +146607,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139551,6 +146638,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139581,6 +146669,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139611,6 +146700,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139641,6 +146731,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139671,6 +146762,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139701,6 +146793,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139731,6 +146824,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139761,6 +146855,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139791,6 +146886,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139821,6 +146917,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139851,6 +146948,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139881,6 +146979,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139911,6 +147010,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139941,6 +147041,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -139971,6 +147072,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -140001,6 +147103,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -140031,6 +147134,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152039,6 +159143,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/5/coll/matches",
               "options": {
                 "hasCommittedMutations": false,
@@ -152089,6 +159194,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152119,6 +159225,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152149,6 +159256,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152179,6 +159287,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152209,6 +159318,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152239,6 +159349,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152269,6 +159380,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152299,6 +159411,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152329,6 +159442,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152359,6 +159473,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152389,6 +159504,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152419,6 +159535,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152449,6 +159566,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152479,6 +159597,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152509,6 +159628,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152539,6 +159659,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152569,6 +159690,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152599,6 +159721,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152629,6 +159752,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152659,6 +159783,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152689,6 +159814,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152719,6 +159845,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152749,6 +159876,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152779,6 +159907,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -152809,6 +159938,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -164817,6 +171947,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/6/coll/matches",
               "options": {
                 "hasCommittedMutations": false,
@@ -164867,6 +171998,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -164897,6 +172029,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -164927,6 +172060,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -164957,6 +172091,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -164987,6 +172122,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165017,6 +172153,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165047,6 +172184,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165077,6 +172215,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165107,6 +172246,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165137,6 +172277,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165167,6 +172308,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165197,6 +172339,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165227,6 +172370,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165257,6 +172401,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165287,6 +172432,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165317,6 +172463,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165347,6 +172494,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165377,6 +172525,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165407,6 +172556,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165437,6 +172587,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165467,6 +172618,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165497,6 +172649,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165527,6 +172680,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165557,6 +172711,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -165587,6 +172742,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -177595,6 +184751,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/7/coll/matches",
               "options": {
                 "hasCommittedMutations": false,
@@ -177645,6 +184802,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -177675,6 +184833,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -177705,6 +184864,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -177735,6 +184895,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -177765,6 +184926,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -177795,6 +184957,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -177825,6 +184988,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -177855,6 +185019,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -177885,6 +185050,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -177915,6 +185081,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -177945,6 +185112,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -177975,6 +185143,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178005,6 +185174,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178035,6 +185205,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178065,6 +185236,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178095,6 +185267,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178125,6 +185298,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178155,6 +185329,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178185,6 +185360,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178215,6 +185391,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178245,6 +185422,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178275,6 +185453,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178305,6 +185484,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178335,6 +185515,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -178365,6 +185546,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190373,6 +197555,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/8/coll/matches",
               "options": {
                 "hasCommittedMutations": false,
@@ -190423,6 +197606,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190453,6 +197637,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190483,6 +197668,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190513,6 +197699,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190543,6 +197730,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190573,6 +197761,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190603,6 +197792,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190633,6 +197823,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190663,6 +197854,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190693,6 +197885,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190723,6 +197916,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190753,6 +197947,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190783,6 +197978,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190813,6 +198009,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190843,6 +198040,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190873,6 +198071,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190903,6 +198102,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190933,6 +198133,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190963,6 +198164,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -190993,6 +198195,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -191023,6 +198226,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -191053,6 +198257,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -191083,6 +198288,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -191113,6 +198319,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -191143,6 +198350,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203151,6 +210359,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/9/coll/matches",
               "options": {
                 "hasCommittedMutations": false,
@@ -203201,6 +210410,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203231,6 +210441,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203261,6 +210472,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203291,6 +210503,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203321,6 +210534,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203351,6 +210565,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203381,6 +210596,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203411,6 +210627,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203441,6 +210658,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203471,6 +210689,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203501,6 +210720,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203531,6 +210751,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203561,6 +210782,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203591,6 +210813,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203621,6 +210844,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203651,6 +210875,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203681,6 +210906,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203711,6 +210937,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203741,6 +210968,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203771,6 +210999,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203801,6 +211030,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203831,6 +211061,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203861,6 +211092,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203891,6 +211123,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -203921,6 +211154,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -215929,6 +223163,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/10/coll/matches",
               "options": {
                 "hasCommittedMutations": false,
@@ -215979,6 +223214,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216009,6 +223245,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216039,6 +223276,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216069,6 +223307,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216099,6 +223338,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216129,6 +223369,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216159,6 +223400,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216189,6 +223431,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216219,6 +223462,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216249,6 +223493,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216279,6 +223524,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216309,6 +223555,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216339,6 +223586,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216369,6 +223617,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216399,6 +223648,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216429,6 +223679,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216459,6 +223710,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216489,6 +223741,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216519,6 +223772,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216549,6 +223803,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216579,6 +223834,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216609,6 +223865,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216639,6 +223896,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216669,6 +223927,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216699,6 +223958,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/10/coll/matches",
                 "options": {
                   "hasCommittedMutations": false,
@@ -222538,7 +229798,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -222580,6 +229840,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -222627,6 +229888,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/0",
               "options": {
                 "hasCommittedMutations": false,
@@ -222664,6 +229926,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -222747,6 +230010,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -222794,6 +230058,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -222831,6 +230096,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -222914,6 +230180,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -222961,6 +230228,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -222998,6 +230266,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223081,6 +230350,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223128,6 +230398,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -223165,6 +230436,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223248,6 +230520,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223295,6 +230568,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/4",
               "options": {
                 "hasCommittedMutations": false,
@@ -223332,6 +230606,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223415,6 +230690,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223462,6 +230738,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/5",
               "options": {
                 "hasCommittedMutations": false,
@@ -223499,6 +230776,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223582,6 +230860,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223629,6 +230908,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/6",
               "options": {
                 "hasCommittedMutations": false,
@@ -223666,6 +230946,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223749,6 +231030,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223796,6 +231078,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/7",
               "options": {
                 "hasCommittedMutations": false,
@@ -223833,6 +231116,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223916,6 +231200,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -223963,6 +231248,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/8",
               "options": {
                 "hasCommittedMutations": false,
@@ -224000,6 +231286,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224083,6 +231370,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224130,6 +231418,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/9",
               "options": {
                 "hasCommittedMutations": false,
@@ -224167,6 +231456,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224221,7 +231511,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -224263,6 +231553,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224310,6 +231601,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -224347,6 +231639,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224382,6 +231675,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224390,7 +231684,7 @@
                 "value": {
                   "v": 1
                 },
-                "version": 2
+                "version": 0
               }
             ],
             "query": {
@@ -224421,6 +231715,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -224450,6 +231745,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224485,6 +231781,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224493,7 +231790,7 @@
                 "value": {
                   "v": 2
                 },
-                "version": 4
+                "version": 0
               }
             ],
             "query": {
@@ -224524,6 +231821,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -224553,6 +231851,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224588,6 +231887,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224596,7 +231896,7 @@
                 "value": {
                   "v": 3
                 },
-                "version": 6
+                "version": 0
               }
             ],
             "query": {
@@ -224627,6 +231927,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -224656,6 +231957,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224691,6 +231993,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224699,7 +232002,7 @@
                 "value": {
                   "v": 4
                 },
-                "version": 8
+                "version": 0
               }
             ],
             "query": {
@@ -224730,6 +232033,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -224759,6 +232063,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224794,6 +232099,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224802,7 +232108,7 @@
                 "value": {
                   "v": 5
                 },
-                "version": 10
+                "version": 0
               }
             ],
             "query": {
@@ -224833,6 +232139,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -224862,6 +232169,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224897,6 +232205,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -224905,7 +232214,7 @@
                 "value": {
                   "v": 6
                 },
-                "version": 12
+                "version": 0
               }
             ],
             "query": {
@@ -224936,6 +232245,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -224965,6 +232275,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -225000,6 +232311,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -225008,7 +232320,7 @@
                 "value": {
                   "v": 7
                 },
-                "version": 14
+                "version": 0
               }
             ],
             "query": {
@@ -225039,6 +232351,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -225068,6 +232381,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -225103,6 +232417,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -225111,7 +232426,7 @@
                 "value": {
                   "v": 8
                 },
-                "version": 16
+                "version": 0
               }
             ],
             "query": {
@@ -225142,6 +232457,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -225171,6 +232487,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -225206,6 +232523,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -225214,7 +232532,7 @@
                 "value": {
                   "v": 9
                 },
-                "version": 18
+                "version": 0
               }
             ],
             "query": {
@@ -225245,6 +232563,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -225274,6 +232593,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -225309,6 +232629,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -225317,7 +232638,7 @@
                 "value": {
                   "v": 10
                 },
-                "version": 20
+                "version": 0
               }
             ],
             "query": {
@@ -225348,6 +232669,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -225377,6 +232699,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -225408,7 +232731,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -225649,7 +232972,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -226471,6 +233794,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226482,6 +233806,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226493,6 +233818,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226504,6 +233830,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226515,6 +233842,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226526,6 +233854,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226537,6 +233866,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226548,6 +233878,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226559,6 +233890,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226570,6 +233902,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226581,6 +233914,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226592,6 +233926,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226603,6 +233938,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226614,6 +233950,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226625,6 +233962,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226636,6 +233974,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226647,6 +233986,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226658,6 +233998,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226669,6 +234010,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226680,6 +234022,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226691,6 +234034,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226702,6 +234046,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226713,6 +234058,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226724,6 +234070,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226735,6 +234082,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226746,6 +234094,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226757,6 +234106,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226768,6 +234118,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226779,6 +234130,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226790,6 +234142,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226801,6 +234154,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226812,6 +234166,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226823,6 +234178,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226834,6 +234190,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226845,6 +234202,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226856,6 +234214,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226867,6 +234226,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226878,6 +234238,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226889,6 +234250,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226900,6 +234262,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226911,6 +234274,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226922,6 +234286,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226933,6 +234298,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226944,6 +234310,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226955,6 +234322,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226966,6 +234334,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226977,6 +234346,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226988,6 +234358,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -226999,6 +234370,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227010,6 +234382,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227021,6 +234394,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227032,6 +234406,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227043,6 +234418,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227054,6 +234430,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227065,6 +234442,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227076,6 +234454,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227087,6 +234466,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227098,6 +234478,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227109,6 +234490,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227120,6 +234502,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227131,6 +234514,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227142,6 +234526,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227153,6 +234538,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227164,6 +234550,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227175,6 +234562,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227186,6 +234574,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227197,6 +234586,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227208,6 +234598,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227219,6 +234610,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227230,6 +234622,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227241,6 +234634,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227252,6 +234646,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227263,6 +234658,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227274,6 +234670,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227285,6 +234682,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227296,6 +234694,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227307,6 +234706,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227318,6 +234718,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227329,6 +234730,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227340,6 +234742,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227351,6 +234754,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227362,6 +234766,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227373,6 +234778,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227384,6 +234790,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227395,6 +234802,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227406,6 +234814,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227417,6 +234826,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227428,6 +234838,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227439,6 +234850,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227450,6 +234862,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227461,6 +234874,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227472,6 +234886,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227483,6 +234898,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227494,6 +234910,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227505,6 +234922,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227516,6 +234934,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227527,6 +234946,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227538,6 +234958,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227549,6 +234970,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227560,6 +234982,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227647,6 +235070,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227658,6 +235082,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227669,6 +235094,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227680,6 +235106,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227691,6 +235118,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227702,6 +235130,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227713,6 +235142,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227724,6 +235154,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227735,6 +235166,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227746,6 +235178,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227757,6 +235190,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227768,6 +235202,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227779,6 +235214,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227790,6 +235226,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227801,6 +235238,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227812,6 +235250,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227823,6 +235262,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227834,6 +235274,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227845,6 +235286,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227856,6 +235298,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227867,6 +235310,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227878,6 +235322,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227889,6 +235334,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227900,6 +235346,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227911,6 +235358,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227922,6 +235370,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227933,6 +235382,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227944,6 +235394,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227955,6 +235406,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227966,6 +235418,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227977,6 +235430,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227988,6 +235442,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -227999,6 +235454,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228010,6 +235466,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228021,6 +235478,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228032,6 +235490,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228043,6 +235502,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228054,6 +235514,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228065,6 +235526,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228076,6 +235538,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228087,6 +235550,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228098,6 +235562,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228109,6 +235574,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228120,6 +235586,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228131,6 +235598,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228142,6 +235610,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228153,6 +235622,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228164,6 +235634,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228175,6 +235646,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228186,6 +235658,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228197,6 +235670,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228208,6 +235682,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228219,6 +235694,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228230,6 +235706,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228241,6 +235718,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228252,6 +235730,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228263,6 +235742,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228274,6 +235754,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228285,6 +235766,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228296,6 +235778,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228307,6 +235790,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228318,6 +235802,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228329,6 +235814,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228340,6 +235826,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228351,6 +235838,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228362,6 +235850,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228373,6 +235862,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228384,6 +235874,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228395,6 +235886,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228406,6 +235898,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228417,6 +235910,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228428,6 +235922,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228439,6 +235934,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228450,6 +235946,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228461,6 +235958,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228472,6 +235970,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228483,6 +235982,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228494,6 +235994,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228505,6 +236006,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228516,6 +236018,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228527,6 +236030,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228538,6 +236042,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228549,6 +236054,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228560,6 +236066,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228571,6 +236078,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228582,6 +236090,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228593,6 +236102,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228604,6 +236114,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228615,6 +236126,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228626,6 +236138,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228637,6 +236150,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228648,6 +236162,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228659,6 +236174,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228670,6 +236186,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228681,6 +236198,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228692,6 +236210,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228703,6 +236222,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228714,6 +236234,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228725,6 +236246,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228736,6 +236258,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228823,6 +236346,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228834,6 +236358,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228845,6 +236370,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228856,6 +236382,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228867,6 +236394,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228878,6 +236406,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228889,6 +236418,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228900,6 +236430,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228911,6 +236442,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228922,6 +236454,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228933,6 +236466,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228944,6 +236478,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228955,6 +236490,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228966,6 +236502,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228977,6 +236514,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228988,6 +236526,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -228999,6 +236538,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229010,6 +236550,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229021,6 +236562,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229032,6 +236574,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229043,6 +236586,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229054,6 +236598,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229065,6 +236610,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229076,6 +236622,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229087,6 +236634,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229098,6 +236646,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229109,6 +236658,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229120,6 +236670,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229131,6 +236682,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229142,6 +236694,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229153,6 +236706,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229164,6 +236718,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229175,6 +236730,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229186,6 +236742,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229197,6 +236754,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229208,6 +236766,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229219,6 +236778,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229230,6 +236790,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229241,6 +236802,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229252,6 +236814,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229263,6 +236826,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229274,6 +236838,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229285,6 +236850,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229296,6 +236862,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229307,6 +236874,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229318,6 +236886,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229329,6 +236898,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229340,6 +236910,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229351,6 +236922,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229362,6 +236934,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229373,6 +236946,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229384,6 +236958,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229395,6 +236970,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229406,6 +236982,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229417,6 +236994,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229428,6 +237006,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229439,6 +237018,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229450,6 +237030,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229461,6 +237042,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229472,6 +237054,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229483,6 +237066,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229494,6 +237078,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229505,6 +237090,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229516,6 +237102,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229527,6 +237114,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229538,6 +237126,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229549,6 +237138,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229560,6 +237150,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229571,6 +237162,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229582,6 +237174,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229593,6 +237186,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229604,6 +237198,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229615,6 +237210,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229626,6 +237222,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229637,6 +237234,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229648,6 +237246,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229659,6 +237258,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229670,6 +237270,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229681,6 +237282,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229692,6 +237294,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229703,6 +237306,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229714,6 +237318,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229725,6 +237330,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229736,6 +237342,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229747,6 +237354,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229758,6 +237366,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229769,6 +237378,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229780,6 +237390,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229791,6 +237402,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229802,6 +237414,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229813,6 +237426,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229824,6 +237438,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229835,6 +237450,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229846,6 +237462,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229857,6 +237474,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229868,6 +237486,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229879,6 +237498,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229890,6 +237510,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229901,6 +237522,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229912,6 +237534,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -229999,6 +237622,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230010,6 +237634,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230021,6 +237646,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230032,6 +237658,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230043,6 +237670,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230054,6 +237682,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230065,6 +237694,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230076,6 +237706,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230087,6 +237718,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230098,6 +237730,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230109,6 +237742,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230120,6 +237754,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230131,6 +237766,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230142,6 +237778,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230153,6 +237790,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230164,6 +237802,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230175,6 +237814,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230186,6 +237826,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230197,6 +237838,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230208,6 +237850,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230219,6 +237862,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230230,6 +237874,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230241,6 +237886,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230252,6 +237898,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230263,6 +237910,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230274,6 +237922,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230285,6 +237934,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230296,6 +237946,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230307,6 +237958,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230318,6 +237970,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230329,6 +237982,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230340,6 +237994,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230351,6 +238006,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230362,6 +238018,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230373,6 +238030,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230384,6 +238042,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230395,6 +238054,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230406,6 +238066,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230417,6 +238078,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230428,6 +238090,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230439,6 +238102,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230450,6 +238114,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230461,6 +238126,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230472,6 +238138,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230483,6 +238150,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230494,6 +238162,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230505,6 +238174,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230516,6 +238186,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230527,6 +238198,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230538,6 +238210,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230549,6 +238222,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230560,6 +238234,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230571,6 +238246,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230582,6 +238258,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230593,6 +238270,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230604,6 +238282,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230615,6 +238294,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230626,6 +238306,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230637,6 +238318,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230648,6 +238330,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230659,6 +238342,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230670,6 +238354,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230681,6 +238366,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230692,6 +238378,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230703,6 +238390,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230714,6 +238402,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230725,6 +238414,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230736,6 +238426,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230747,6 +238438,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230758,6 +238450,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230769,6 +238462,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230780,6 +238474,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230791,6 +238486,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230802,6 +238498,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230813,6 +238510,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230824,6 +238522,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230835,6 +238534,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230846,6 +238546,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230857,6 +238558,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230868,6 +238570,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230879,6 +238582,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230890,6 +238594,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230901,6 +238606,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230912,6 +238618,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230923,6 +238630,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230934,6 +238642,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230945,6 +238654,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230956,6 +238666,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230967,6 +238678,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230978,6 +238690,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -230989,6 +238702,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231000,6 +238714,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231011,6 +238726,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231022,6 +238738,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231033,6 +238750,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231044,6 +238762,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231055,6 +238774,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231066,6 +238786,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231077,6 +238798,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231088,6 +238810,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231175,6 +238898,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231186,6 +238910,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231197,6 +238922,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231208,6 +238934,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231219,6 +238946,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231230,6 +238958,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231241,6 +238970,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231252,6 +238982,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231263,6 +238994,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231274,6 +239006,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231285,6 +239018,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231296,6 +239030,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231307,6 +239042,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231318,6 +239054,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231329,6 +239066,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231340,6 +239078,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231351,6 +239090,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231362,6 +239102,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231373,6 +239114,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231384,6 +239126,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231395,6 +239138,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231406,6 +239150,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231417,6 +239162,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231428,6 +239174,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231439,6 +239186,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231450,6 +239198,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231461,6 +239210,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231472,6 +239222,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231483,6 +239234,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231494,6 +239246,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231505,6 +239258,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231516,6 +239270,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231527,6 +239282,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231538,6 +239294,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231549,6 +239306,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231560,6 +239318,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231571,6 +239330,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231582,6 +239342,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231593,6 +239354,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231604,6 +239366,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231615,6 +239378,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231626,6 +239390,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231637,6 +239402,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231648,6 +239414,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231659,6 +239426,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231670,6 +239438,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231681,6 +239450,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231692,6 +239462,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231703,6 +239474,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231714,6 +239486,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231725,6 +239498,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231736,6 +239510,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231747,6 +239522,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231758,6 +239534,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231769,6 +239546,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231780,6 +239558,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231791,6 +239570,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231802,6 +239582,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231813,6 +239594,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231824,6 +239606,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231835,6 +239618,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231846,6 +239630,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231857,6 +239642,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231868,6 +239654,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231879,6 +239666,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231890,6 +239678,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231901,6 +239690,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231912,6 +239702,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231923,6 +239714,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231934,6 +239726,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231945,6 +239738,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231956,6 +239750,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231967,6 +239762,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231978,6 +239774,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -231989,6 +239786,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232000,6 +239798,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232011,6 +239810,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232022,6 +239822,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232033,6 +239834,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232044,6 +239846,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232055,6 +239858,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232066,6 +239870,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232077,6 +239882,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232088,6 +239894,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232099,6 +239906,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232110,6 +239918,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232121,6 +239930,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232132,6 +239942,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232143,6 +239954,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232154,6 +239966,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232165,6 +239978,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232176,6 +239990,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232187,6 +240002,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232198,6 +240014,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232209,6 +240026,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232220,6 +240038,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232231,6 +240050,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232242,6 +240062,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232253,6 +240074,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232264,6 +240086,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232351,6 +240174,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232362,6 +240186,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232373,6 +240198,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232384,6 +240210,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232395,6 +240222,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232406,6 +240234,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232417,6 +240246,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232428,6 +240258,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232439,6 +240270,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232450,6 +240282,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232461,6 +240294,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232472,6 +240306,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232483,6 +240318,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232494,6 +240330,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232505,6 +240342,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232516,6 +240354,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232527,6 +240366,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232538,6 +240378,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232549,6 +240390,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232560,6 +240402,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232571,6 +240414,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232582,6 +240426,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232593,6 +240438,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232604,6 +240450,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232615,6 +240462,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232626,6 +240474,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232637,6 +240486,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232648,6 +240498,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232659,6 +240510,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232670,6 +240522,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232681,6 +240534,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232692,6 +240546,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232703,6 +240558,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232714,6 +240570,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232725,6 +240582,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232736,6 +240594,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232747,6 +240606,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232758,6 +240618,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232769,6 +240630,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232780,6 +240642,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232791,6 +240654,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232802,6 +240666,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232813,6 +240678,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232824,6 +240690,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232835,6 +240702,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232846,6 +240714,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232857,6 +240726,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232868,6 +240738,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232879,6 +240750,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232890,6 +240762,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232901,6 +240774,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232912,6 +240786,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232923,6 +240798,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232934,6 +240810,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232945,6 +240822,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232956,6 +240834,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232967,6 +240846,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232978,6 +240858,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -232989,6 +240870,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233000,6 +240882,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233011,6 +240894,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233022,6 +240906,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233033,6 +240918,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233044,6 +240930,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233055,6 +240942,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233066,6 +240954,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233077,6 +240966,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233088,6 +240978,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233099,6 +240990,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233110,6 +241002,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233121,6 +241014,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233132,6 +241026,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233143,6 +241038,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233154,6 +241050,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233165,6 +241062,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233176,6 +241074,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233187,6 +241086,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233198,6 +241098,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233209,6 +241110,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233220,6 +241122,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233231,6 +241134,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233242,6 +241146,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233253,6 +241158,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233264,6 +241170,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233275,6 +241182,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233286,6 +241194,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233297,6 +241206,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233308,6 +241218,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233319,6 +241230,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233330,6 +241242,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233341,6 +241254,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233352,6 +241266,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233363,6 +241278,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233374,6 +241290,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233385,6 +241302,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233396,6 +241314,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233407,6 +241326,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233418,6 +241338,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233429,6 +241350,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233440,6 +241362,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233527,6 +241450,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233538,6 +241462,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233549,6 +241474,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233560,6 +241486,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233571,6 +241498,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233582,6 +241510,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233593,6 +241522,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233604,6 +241534,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233615,6 +241546,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233626,6 +241558,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233637,6 +241570,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233648,6 +241582,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233659,6 +241594,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233670,6 +241606,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233681,6 +241618,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233692,6 +241630,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233703,6 +241642,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233714,6 +241654,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233725,6 +241666,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233736,6 +241678,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233747,6 +241690,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233758,6 +241702,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233769,6 +241714,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233780,6 +241726,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233791,6 +241738,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233802,6 +241750,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233813,6 +241762,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233824,6 +241774,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233835,6 +241786,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233846,6 +241798,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233857,6 +241810,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233868,6 +241822,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233879,6 +241834,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233890,6 +241846,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233901,6 +241858,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233912,6 +241870,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233923,6 +241882,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233934,6 +241894,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233945,6 +241906,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233956,6 +241918,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233967,6 +241930,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233978,6 +241942,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -233989,6 +241954,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234000,6 +241966,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234011,6 +241978,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234022,6 +241990,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234033,6 +242002,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234044,6 +242014,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234055,6 +242026,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234066,6 +242038,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234077,6 +242050,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234088,6 +242062,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234099,6 +242074,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234110,6 +242086,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234121,6 +242098,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234132,6 +242110,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234143,6 +242122,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234154,6 +242134,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234165,6 +242146,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234176,6 +242158,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234187,6 +242170,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234198,6 +242182,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234209,6 +242194,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234220,6 +242206,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234231,6 +242218,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234242,6 +242230,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234253,6 +242242,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234264,6 +242254,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234275,6 +242266,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234286,6 +242278,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234297,6 +242290,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234308,6 +242302,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234319,6 +242314,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234330,6 +242326,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234341,6 +242338,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234352,6 +242350,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234363,6 +242362,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234374,6 +242374,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234385,6 +242386,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234396,6 +242398,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234407,6 +242410,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234418,6 +242422,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234429,6 +242434,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234440,6 +242446,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234451,6 +242458,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234462,6 +242470,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234473,6 +242482,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234484,6 +242494,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234495,6 +242506,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234506,6 +242518,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234517,6 +242530,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234528,6 +242542,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234539,6 +242554,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234550,6 +242566,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234561,6 +242578,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234572,6 +242590,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234583,6 +242602,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234594,6 +242614,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234605,6 +242626,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234616,6 +242638,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234703,6 +242726,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234714,6 +242738,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234725,6 +242750,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234736,6 +242762,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234747,6 +242774,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234758,6 +242786,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234769,6 +242798,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234780,6 +242810,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234791,6 +242822,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234802,6 +242834,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234813,6 +242846,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234824,6 +242858,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234835,6 +242870,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234846,6 +242882,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234857,6 +242894,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234868,6 +242906,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234879,6 +242918,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234890,6 +242930,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234901,6 +242942,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234912,6 +242954,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234923,6 +242966,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234934,6 +242978,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234945,6 +242990,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234956,6 +243002,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234967,6 +243014,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234978,6 +243026,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -234989,6 +243038,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235000,6 +243050,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235011,6 +243062,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235022,6 +243074,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235033,6 +243086,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235044,6 +243098,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235055,6 +243110,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235066,6 +243122,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235077,6 +243134,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235088,6 +243146,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235099,6 +243158,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235110,6 +243170,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235121,6 +243182,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235132,6 +243194,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235143,6 +243206,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235154,6 +243218,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235165,6 +243230,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235176,6 +243242,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235187,6 +243254,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235198,6 +243266,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235209,6 +243278,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235220,6 +243290,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235231,6 +243302,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235242,6 +243314,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235253,6 +243326,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235264,6 +243338,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235275,6 +243350,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235286,6 +243362,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235297,6 +243374,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235308,6 +243386,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235319,6 +243398,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235330,6 +243410,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235341,6 +243422,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235352,6 +243434,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235363,6 +243446,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235374,6 +243458,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235385,6 +243470,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235396,6 +243482,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235407,6 +243494,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235418,6 +243506,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235429,6 +243518,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235440,6 +243530,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235451,6 +243542,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235462,6 +243554,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235473,6 +243566,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235484,6 +243578,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235495,6 +243590,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235506,6 +243602,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235517,6 +243614,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235528,6 +243626,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235539,6 +243638,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235550,6 +243650,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235561,6 +243662,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235572,6 +243674,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235583,6 +243686,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235594,6 +243698,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235605,6 +243710,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235616,6 +243722,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235627,6 +243734,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235638,6 +243746,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235649,6 +243758,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235660,6 +243770,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235671,6 +243782,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235682,6 +243794,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235693,6 +243806,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235704,6 +243818,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235715,6 +243830,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235726,6 +243842,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235737,6 +243854,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235748,6 +243866,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235759,6 +243878,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235770,6 +243890,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235781,6 +243902,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235792,6 +243914,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235879,6 +244002,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235890,6 +244014,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235901,6 +244026,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235912,6 +244038,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235923,6 +244050,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235934,6 +244062,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235945,6 +244074,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235956,6 +244086,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235967,6 +244098,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235978,6 +244110,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -235989,6 +244122,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236000,6 +244134,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236011,6 +244146,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236022,6 +244158,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236033,6 +244170,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236044,6 +244182,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236055,6 +244194,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236066,6 +244206,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236077,6 +244218,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236088,6 +244230,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236099,6 +244242,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236110,6 +244254,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236121,6 +244266,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236132,6 +244278,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236143,6 +244290,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236154,6 +244302,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236165,6 +244314,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236176,6 +244326,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236187,6 +244338,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236198,6 +244350,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236209,6 +244362,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236220,6 +244374,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236231,6 +244386,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236242,6 +244398,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236253,6 +244410,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236264,6 +244422,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236275,6 +244434,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236286,6 +244446,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236297,6 +244458,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236308,6 +244470,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236319,6 +244482,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236330,6 +244494,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236341,6 +244506,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236352,6 +244518,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236363,6 +244530,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236374,6 +244542,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236385,6 +244554,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236396,6 +244566,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236407,6 +244578,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236418,6 +244590,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236429,6 +244602,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236440,6 +244614,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236451,6 +244626,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236462,6 +244638,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236473,6 +244650,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236484,6 +244662,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236495,6 +244674,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236506,6 +244686,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236517,6 +244698,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236528,6 +244710,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236539,6 +244722,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236550,6 +244734,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236561,6 +244746,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236572,6 +244758,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236583,6 +244770,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236594,6 +244782,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236605,6 +244794,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236616,6 +244806,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236627,6 +244818,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236638,6 +244830,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236649,6 +244842,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236660,6 +244854,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236671,6 +244866,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236682,6 +244878,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236693,6 +244890,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236704,6 +244902,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236715,6 +244914,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236726,6 +244926,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236737,6 +244938,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236748,6 +244950,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236759,6 +244962,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236770,6 +244974,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236781,6 +244986,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236792,6 +244998,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236803,6 +245010,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236814,6 +245022,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236825,6 +245034,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236836,6 +245046,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236847,6 +245058,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236858,6 +245070,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236869,6 +245082,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236880,6 +245094,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236891,6 +245106,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236902,6 +245118,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236913,6 +245130,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236924,6 +245142,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236935,6 +245154,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236946,6 +245166,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236957,6 +245178,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -236968,6 +245190,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237055,6 +245278,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237066,6 +245290,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237077,6 +245302,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237088,6 +245314,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237099,6 +245326,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237110,6 +245338,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237121,6 +245350,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237132,6 +245362,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237143,6 +245374,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237154,6 +245386,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237165,6 +245398,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237176,6 +245410,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237187,6 +245422,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237198,6 +245434,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237209,6 +245446,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237220,6 +245458,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/15",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237231,6 +245470,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/16",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237242,6 +245482,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/17",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237253,6 +245494,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/18",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237264,6 +245506,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/19",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237275,6 +245518,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/20",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237286,6 +245530,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/21",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237297,6 +245542,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/22",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237308,6 +245554,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/23",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237319,6 +245566,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/24",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237330,6 +245578,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/25",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237341,6 +245590,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/26",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237352,6 +245602,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/27",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237363,6 +245614,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/28",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237374,6 +245626,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/29",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237385,6 +245638,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/30",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237396,6 +245650,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/31",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237407,6 +245662,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/32",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237418,6 +245674,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/33",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237429,6 +245686,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/34",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237440,6 +245698,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/35",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237451,6 +245710,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/36",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237462,6 +245722,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/37",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237473,6 +245734,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/38",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237484,6 +245746,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/39",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237495,6 +245758,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/40",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237506,6 +245770,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/41",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237517,6 +245782,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/42",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237528,6 +245794,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/43",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237539,6 +245806,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/44",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237550,6 +245818,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/45",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237561,6 +245830,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/46",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237572,6 +245842,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/47",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237583,6 +245854,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/48",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237594,6 +245866,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/49",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237605,6 +245878,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/50",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237616,6 +245890,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/51",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237627,6 +245902,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/52",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237638,6 +245914,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/53",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237649,6 +245926,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/54",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237660,6 +245938,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/55",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237671,6 +245950,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/56",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237682,6 +245962,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/57",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237693,6 +245974,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/58",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237704,6 +245986,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/59",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237715,6 +245998,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/60",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237726,6 +246010,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/61",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237737,6 +246022,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/62",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237748,6 +246034,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/63",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237759,6 +246046,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/64",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237770,6 +246058,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/65",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237781,6 +246070,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/66",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237792,6 +246082,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/67",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237803,6 +246094,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/68",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237814,6 +246106,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/69",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237825,6 +246118,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/70",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237836,6 +246130,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/71",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237847,6 +246142,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/72",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237858,6 +246154,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/73",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237869,6 +246166,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/74",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237880,6 +246178,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/75",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237891,6 +246190,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/76",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237902,6 +246202,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/77",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237913,6 +246214,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/78",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237924,6 +246226,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/79",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237935,6 +246238,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/80",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237946,6 +246250,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/81",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237957,6 +246262,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/82",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237968,6 +246274,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/83",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237979,6 +246286,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/84",
                 "options": {
                   "hasCommittedMutations": false,
@@ -237990,6 +246298,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/85",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238001,6 +246310,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/86",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238012,6 +246322,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/87",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238023,6 +246334,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/88",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238034,6 +246346,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/89",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238045,6 +246358,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/90",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238056,6 +246370,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/91",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238067,6 +246382,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/92",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238078,6 +246394,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/93",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238089,6 +246406,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/94",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238100,6 +246418,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/95",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238111,6 +246430,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/96",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238122,6 +246442,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/97",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238133,6 +246454,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/98",
                 "options": {
                   "hasCommittedMutations": false,
@@ -238144,6 +246466,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/99",
                 "options": {
                   "hasCommittedMutations": false,
diff --git a/firebase-firestore/src/test/resources/json/persistence_spec_test.json b/firebase-firestore/src/test/resources/json/persistence_spec_test.json
index a9524ada630..e29b36e31c6 100644
--- a/firebase-firestore/src/test/resources/json/persistence_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/persistence_spec_test.json
@@ -7,7 +7,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -46,7 +46,7 @@
     ],
     "config": {
       "numClients": 3,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -136,7 +136,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -189,7 +189,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -287,7 +287,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -376,7 +376,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -421,6 +421,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -432,6 +433,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/key2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -482,7 +484,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -590,7 +592,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -630,6 +632,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -664,6 +667,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -714,6 +718,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -763,7 +768,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -803,6 +808,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": true,
@@ -852,7 +858,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -892,6 +898,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -926,6 +933,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -981,6 +989,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1031,7 +1040,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1096,7 +1105,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1136,6 +1145,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "users/existing",
               "options": {
                 "hasCommittedMutations": false,
@@ -1170,6 +1180,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "users/existing",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1205,6 +1216,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "users/anon",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1245,6 +1257,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "users/anon",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1286,6 +1299,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "users/user1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1316,6 +1330,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "users/anon",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1339,6 +1354,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "users/user1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1363,7 +1379,7 @@
     ],
     "config": {
       "numClients": 3,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
diff --git a/firebase-firestore/src/test/resources/json/query_spec_test.json b/firebase-firestore/src/test/resources/json/query_spec_test.json
index f2c1ce51e6c..7aed45ec207 100644
--- a/firebase-firestore/src/test/resources/json/query_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/query_spec_test.json
@@ -6,7 +6,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -46,6 +46,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "cg/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -80,6 +81,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "cg/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -153,6 +155,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "cg/2",
               "options": {
                 "hasCommittedMutations": false,
@@ -187,6 +190,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "cg/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -272,6 +276,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "not-cg/nope/cg/3",
               "options": {
                 "hasCommittedMutations": false,
@@ -306,6 +311,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "not-cg/nope/cg/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -403,6 +409,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "not-cg/nope",
               "options": {
                 "hasCommittedMutations": false,
@@ -437,6 +444,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "not-cg/nope",
                 "options": {
                   "hasCommittedMutations": false,
@@ -546,6 +554,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "cg/1/not-cg/nope",
               "options": {
                 "hasCommittedMutations": false,
@@ -580,6 +589,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "cg/1/not-cg/nope",
                 "options": {
                   "hasCommittedMutations": false,
@@ -620,6 +630,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "cg/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -631,6 +642,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "cg/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -642,6 +654,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "not-cg/nope/cg/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -765,6 +778,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "cg/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -776,6 +790,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "not-cg/nope/cg/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -910,7 +925,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -950,6 +965,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "cg/1",
               "options": {
                 "hasCommittedMutations": false,
@@ -984,6 +1000,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "cg/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1057,6 +1074,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "not-cg/nope",
               "options": {
                 "hasCommittedMutations": false,
@@ -1091,6 +1109,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "not-cg/nope",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1155,6 +1174,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "cg/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1166,6 +1186,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "cg/2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1177,6 +1198,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "not-cg/nope/cg/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1264,6 +1286,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "cg/1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1275,6 +1298,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "not-cg/nope/cg/3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1373,7 +1397,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1413,6 +1437,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1447,6 +1472,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1485,6 +1511,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1493,7 +1520,7 @@
                 "value": {
                   "match": true
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -1526,6 +1553,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1534,7 +1562,7 @@
                 "value": {
                   "match": true
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "errorCode": 0,
diff --git a/firebase-firestore/src/test/resources/json/recovery_spec_test.json b/firebase-firestore/src/test/resources/json/recovery_spec_test.json
index c42d58c9d41..0af9569b7a2 100644
--- a/firebase-firestore/src/test/resources/json/recovery_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/recovery_spec_test.json
@@ -8,7 +8,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -210,7 +210,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -250,6 +250,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "options": {
                 "hasCommittedMutations": false,
@@ -284,6 +285,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -354,6 +356,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -403,6 +406,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key2",
               "options": {
                 "hasCommittedMutations": false,
@@ -437,6 +441,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -489,7 +494,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -577,7 +582,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -619,6 +624,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -679,6 +685,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -740,6 +747,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "options": {
                 "hasCommittedMutations": false,
@@ -751,6 +759,7 @@
               "version": 1
             },
             {
+              "createTime": 0,
               "key": "collection/key3",
               "options": {
                 "hasCommittedMutations": false,
@@ -788,6 +797,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -799,6 +809,7 @@
                 "version": 1
               },
               {
+                "createTime": 0,
                 "key": "collection/key3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -831,7 +842,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -871,6 +882,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "options": {
                 "hasCommittedMutations": false,
@@ -905,6 +917,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -938,6 +951,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "value": null,
               "version": 2000
@@ -968,6 +982,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1012,6 +1027,20 @@
           },
           "targetId": 2
         },
+        "expectedSnapshotEvents": [
+          {
+            "errorCode": 0,
+            "fromCache": true,
+            "hasPendingWrites": false,
+            "query": {
+              "filters": [
+              ],
+              "orderBys": [
+              ],
+              "path": "collection"
+            }
+          }
+        ],
         "expectedState": {
           "activeTargets": {
             "2": {
@@ -1040,7 +1069,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1242,7 +1271,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1282,6 +1311,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "options": {
                 "hasCommittedMutations": false,
@@ -1316,6 +1346,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1389,6 +1420,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key2",
               "options": {
                 "hasCommittedMutations": false,
@@ -1423,6 +1455,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1539,6 +1572,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1588,6 +1622,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "options": {
                 "hasCommittedMutations": false,
@@ -1626,6 +1661,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1660,7 +1696,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1805,7 +1841,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1834,6 +1870,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1908,6 +1945,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1944,6 +1982,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1980,7 +2019,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -2129,7 +2168,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -2212,6 +2251,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -2260,6 +2300,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2296,7 +2337,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -2370,6 +2411,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -2422,6 +2464,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2495,6 +2538,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -2531,6 +2575,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2567,7 +2612,7 @@
     ],
     "config": {
       "numClients": 3,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -2645,6 +2690,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -2685,6 +2731,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2778,6 +2825,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -2818,6 +2866,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2853,7 +2902,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -2893,6 +2942,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "options": {
                 "hasCommittedMutations": false,
@@ -2927,6 +2977,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2987,6 +3038,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3080,7 +3132,8 @@
                   "path": "collection/key1"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -3116,6 +3169,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "options": {
                 "hasCommittedMutations": false,
@@ -3168,7 +3222,8 @@
                   "path": "collection/key1"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -3228,6 +3283,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "options": {
                 "hasCommittedMutations": false,
@@ -3277,6 +3333,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3325,7 +3382,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -3365,6 +3422,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "options": {
                 "hasCommittedMutations": false,
@@ -3399,6 +3457,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3459,6 +3518,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3552,7 +3612,8 @@
                   "path": "collection/key1"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -3611,7 +3672,8 @@
                   "path": "collection/key1"
                 }
               ],
-              "resumeToken": ""
+              "resumeToken": "",
+              "targetPurpose": "TargetPurposeLimboResolution"
             },
             "4": {
               "queries": [
@@ -3690,6 +3752,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3738,7 +3801,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -3778,6 +3841,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "options": {
                 "hasCommittedMutations": false,
@@ -3812,6 +3876,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3840,6 +3905,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key2",
               "options": {
                 "hasCommittedMutations": false,
@@ -3917,6 +3983,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key2",
               "options": {
                 "hasCommittedMutations": false,
@@ -3951,6 +4018,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3986,7 +4054,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -4078,7 +4146,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -4163,7 +4231,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -4283,7 +4351,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -4380,7 +4448,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -4427,6 +4495,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4485,6 +4554,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "options": {
                 "hasCommittedMutations": false,
@@ -4496,6 +4566,7 @@
               "version": 1
             },
             {
+              "createTime": 0,
               "key": "collection/key2",
               "options": {
                 "hasCommittedMutations": false,
@@ -4530,6 +4601,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4546,6 +4618,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4578,7 +4651,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -4618,6 +4691,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key1",
               "options": {
                 "hasCommittedMutations": false,
@@ -4652,6 +4726,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4709,7 +4784,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -4738,6 +4813,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4809,6 +4885,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4860,6 +4937,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4912,7 +4990,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -4990,7 +5068,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -5075,6 +5153,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5110,6 +5189,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5200,6 +5280,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -5237,6 +5318,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5276,6 +5358,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -5305,6 +5388,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
diff --git a/firebase-firestore/src/test/resources/json/remote_store_spec_test.json b/firebase-firestore/src/test/resources/json/remote_store_spec_test.json
index 5292f7ece41..ee992a2c7d7 100644
--- a/firebase-firestore/src/test/resources/json/remote_store_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/remote_store_spec_test.json
@@ -6,7 +6,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -69,6 +69,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -103,6 +104,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -138,7 +140,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -233,7 +235,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -405,6 +407,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -452,6 +455,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -499,6 +503,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/c",
               "options": {
                 "hasCommittedMutations": false,
@@ -546,6 +551,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/d",
               "options": {
                 "hasCommittedMutations": false,
@@ -580,6 +586,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/d",
                 "options": {
                   "hasCommittedMutations": false,
@@ -613,7 +620,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -697,6 +704,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -744,6 +752,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -778,6 +787,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
diff --git a/firebase-firestore/src/test/resources/json/resume_token_spec_test.json b/firebase-firestore/src/test/resources/json/resume_token_spec_test.json
index 85601ccaa8e..4a64b1b5bf5 100644
--- a/firebase-firestore/src/test/resources/json/resume_token_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/resume_token_spec_test.json
@@ -6,7 +6,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -46,6 +46,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -80,6 +81,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -138,7 +140,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -178,6 +180,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -212,6 +215,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -267,6 +271,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
diff --git a/firebase-firestore/src/test/resources/json/write_spec_test.json b/firebase-firestore/src/test/resources/json/write_spec_test.json
index 4ad3f39f4be..20510571b93 100644
--- a/firebase-firestore/src/test/resources/json/write_spec_test.json
+++ b/firebase-firestore/src/test/resources/json/write_spec_test.json
@@ -6,7 +6,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -46,6 +46,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -80,6 +81,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -118,6 +120,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -126,7 +129,7 @@
                 "value": {
                   "v": 2
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -157,6 +160,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -186,6 +190,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -216,7 +221,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -256,6 +261,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -290,6 +296,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -328,6 +335,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -336,7 +344,7 @@
                 "value": {
                   "v": 3
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -367,6 +375,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -394,6 +403,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -405,6 +415,7 @@
               "version": 3000
             },
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -431,6 +442,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -447,6 +459,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -477,7 +490,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -517,6 +530,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -551,6 +565,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -589,6 +604,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -597,7 +613,7 @@
                 "value": {
                   "v": 2
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -614,6 +630,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -648,6 +665,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -687,7 +705,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -727,6 +745,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": true,
@@ -776,7 +795,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -876,6 +895,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -903,6 +923,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -929,6 +950,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -962,7 +984,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1002,6 +1024,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -1039,6 +1062,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1081,6 +1105,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1092,7 +1117,7 @@
                   },
                   "v": 2
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -1109,6 +1134,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -1146,6 +1172,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1188,7 +1215,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1228,6 +1255,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -1262,6 +1290,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1300,6 +1329,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1308,7 +1338,7 @@
                 "value": {
                   "v": 2
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -1325,6 +1355,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -1359,6 +1390,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1398,7 +1430,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -1438,6 +1470,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -1472,6 +1505,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1507,6 +1541,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1559,6 +1594,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1567,7 +1603,7 @@
                 "value": {
                   "v": 2
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -1593,6 +1629,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1627,6 +1664,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -1656,6 +1694,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1686,7 +1725,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -1712,6 +1751,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1775,6 +1815,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -1813,6 +1854,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1849,6 +1891,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -1858,7 +1901,7 @@
                   "local": 5,
                   "remote": 2
                 },
-                "version": 2000
+                "version": 0
               }
             ],
             "query": {
@@ -1889,6 +1932,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": true,
@@ -1917,6 +1961,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": true,
@@ -1945,6 +1990,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -1975,6 +2021,7 @@
             "hasPendingWrites": false,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2007,7 +2054,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -2107,6 +2154,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": true,
@@ -2118,6 +2166,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": true,
@@ -2168,7 +2217,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -2207,6 +2256,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2297,6 +2347,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -2336,6 +2387,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2380,7 +2432,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -2437,6 +2489,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2497,6 +2550,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2546,7 +2600,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -2605,7 +2659,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -2753,6 +2807,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2784,6 +2839,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2819,6 +2875,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -2849,6 +2906,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2880,6 +2938,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -2920,7 +2979,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -3062,6 +3121,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3093,6 +3153,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3138,6 +3199,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3169,6 +3231,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3202,7 +3265,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -3297,6 +3360,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3341,6 +3405,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3400,6 +3465,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3431,6 +3497,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3467,6 +3534,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3498,6 +3566,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3528,7 +3597,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -3570,6 +3639,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3605,6 +3675,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3640,6 +3711,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3675,6 +3747,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3710,6 +3783,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3745,6 +3819,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3780,6 +3855,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3815,6 +3891,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3850,6 +3927,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3885,6 +3963,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3920,6 +3999,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3955,6 +4035,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -3990,6 +4071,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4025,6 +4107,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4060,6 +4143,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4107,6 +4191,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4150,6 +4235,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4193,6 +4279,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4236,6 +4323,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4279,6 +4367,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4322,6 +4411,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4365,6 +4455,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4408,6 +4499,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4451,6 +4543,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4494,6 +4587,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4537,6 +4631,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4580,6 +4675,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4623,6 +4719,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4666,6 +4763,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4709,6 +4807,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4743,7 +4842,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -4802,7 +4901,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -4862,7 +4961,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -4888,6 +4987,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -4938,7 +5038,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -4990,6 +5090,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5038,6 +5139,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5090,6 +5192,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5121,6 +5224,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5162,6 +5266,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5173,6 +5278,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5199,6 +5305,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5234,6 +5341,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5257,6 +5365,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5268,6 +5377,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5289,6 +5399,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5300,6 +5411,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5323,6 +5435,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5348,6 +5461,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5359,6 +5473,7 @@
                 "version": 0
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5382,6 +5497,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/c",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5405,7 +5521,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -5445,6 +5561,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -5456,6 +5573,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -5490,6 +5608,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5501,6 +5620,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5539,6 +5659,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5547,7 +5668,7 @@
                 "value": {
                   "v": 2
                 },
-                "version": 1000
+                "version": 0
               }
             ],
             "query": {
@@ -5564,6 +5685,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -5598,6 +5720,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5642,6 +5765,7 @@
             "hasPendingWrites": true,
             "modified": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5650,7 +5774,7 @@
                 "value": {
                   "v": 2
                 },
-                "version": 500
+                "version": 0
               }
             ],
             "query": {
@@ -5667,6 +5791,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -5701,6 +5826,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -5741,7 +5867,7 @@
     ],
     "config": {
       "numClients": 3,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -5845,7 +5971,7 @@
     ],
     "config": {
       "numClients": 3,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -5952,7 +6078,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -6015,7 +6141,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -6075,7 +6201,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -6136,7 +6262,7 @@
     ],
     "config": {
       "numClients": 3,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -6289,7 +6415,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -6330,7 +6456,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -6347,7 +6473,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -6388,7 +6514,7 @@
     ],
     "config": {
       "numClients": 4,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -6731,7 +6857,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -6839,7 +6965,7 @@
     ],
     "config": {
       "numClients": 3,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -6918,7 +7044,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -6966,6 +7092,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7095,6 +7222,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": true,
@@ -7164,6 +7292,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/doc",
               "options": {
                 "hasCommittedMutations": false,
@@ -7263,6 +7392,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/doc",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7296,7 +7426,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -7381,6 +7511,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7475,6 +7606,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -7512,6 +7644,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7542,7 +7675,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -7627,6 +7760,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7676,6 +7810,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7718,6 +7853,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -7729,6 +7865,7 @@
               "version": 1000
             },
             {
+              "createTime": 0,
               "key": "collection/b",
               "options": {
                 "hasCommittedMutations": false,
@@ -7758,6 +7895,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7769,6 +7907,7 @@
                 "version": 1000
               },
               {
+                "createTime": 0,
                 "key": "collection/b",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7799,7 +7938,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -7854,6 +7993,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7889,6 +8029,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7924,6 +8065,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7959,6 +8101,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -7994,6 +8137,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8029,6 +8173,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8064,6 +8209,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8099,6 +8245,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8134,6 +8281,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8169,6 +8317,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8204,6 +8353,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8239,6 +8389,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8274,6 +8425,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8309,6 +8461,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8344,6 +8497,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8389,6 +8543,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a0",
               "options": {
                 "hasCommittedMutations": false,
@@ -8418,6 +8573,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a0",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8457,6 +8613,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a1",
               "options": {
                 "hasCommittedMutations": false,
@@ -8486,6 +8643,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a1",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8525,6 +8683,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a2",
               "options": {
                 "hasCommittedMutations": false,
@@ -8554,6 +8713,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a2",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8593,6 +8753,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a3",
               "options": {
                 "hasCommittedMutations": false,
@@ -8622,6 +8783,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a3",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8661,6 +8823,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a4",
               "options": {
                 "hasCommittedMutations": false,
@@ -8690,6 +8853,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a4",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8729,6 +8893,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a5",
               "options": {
                 "hasCommittedMutations": false,
@@ -8758,6 +8923,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a5",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8797,6 +8963,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a6",
               "options": {
                 "hasCommittedMutations": false,
@@ -8826,6 +8993,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a6",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8865,6 +9033,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a7",
               "options": {
                 "hasCommittedMutations": false,
@@ -8894,6 +9063,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a7",
                 "options": {
                   "hasCommittedMutations": false,
@@ -8933,6 +9103,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a8",
               "options": {
                 "hasCommittedMutations": false,
@@ -8962,6 +9133,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a8",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9001,6 +9173,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a9",
               "options": {
                 "hasCommittedMutations": false,
@@ -9030,6 +9203,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a9",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9069,6 +9243,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a10",
               "options": {
                 "hasCommittedMutations": false,
@@ -9098,6 +9273,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a10",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9137,6 +9313,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a11",
               "options": {
                 "hasCommittedMutations": false,
@@ -9166,6 +9343,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a11",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9205,6 +9383,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a12",
               "options": {
                 "hasCommittedMutations": false,
@@ -9234,6 +9413,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a12",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9273,6 +9453,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a13",
               "options": {
                 "hasCommittedMutations": false,
@@ -9302,6 +9483,7 @@
             "hasPendingWrites": true,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a13",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9341,6 +9523,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a14",
               "options": {
                 "hasCommittedMutations": false,
@@ -9370,6 +9553,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a14",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9401,7 +9585,7 @@
     ],
     "config": {
       "numClients": 2,
-      "useGarbageCollection": false
+      "useEagerGCForMemory": false
     },
     "steps": [
       {
@@ -9504,6 +9688,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9556,6 +9741,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/a",
               "options": {
                 "hasCommittedMutations": false,
@@ -9586,6 +9772,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9618,7 +9805,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -9703,6 +9890,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/a",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9794,7 +9982,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -9851,7 +10039,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -9893,6 +10081,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -9948,6 +10137,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -9985,6 +10175,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10015,7 +10206,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -10057,6 +10248,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10101,6 +10293,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10133,7 +10326,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -10175,6 +10368,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10230,6 +10424,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -10267,6 +10462,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10297,7 +10493,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -10339,6 +10535,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10383,6 +10580,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10415,7 +10613,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -10457,6 +10655,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10512,6 +10711,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -10549,6 +10749,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10579,7 +10780,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -10621,6 +10822,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10665,6 +10867,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10697,7 +10900,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -10739,6 +10942,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10794,6 +10998,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -10831,6 +11036,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10861,7 +11067,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -10903,6 +11109,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10947,6 +11154,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -10979,7 +11187,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -11021,6 +11229,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11065,6 +11274,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11097,7 +11307,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -11139,6 +11349,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11183,6 +11394,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11215,7 +11427,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -11257,6 +11469,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11301,6 +11514,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11333,7 +11547,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -11375,6 +11589,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11416,7 +11631,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -11458,6 +11673,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11513,6 +11729,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -11550,6 +11767,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11580,7 +11798,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -11622,6 +11840,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11677,6 +11896,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -11714,6 +11934,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11744,7 +11965,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -11786,6 +12007,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11830,6 +12052,7 @@
             },
             "removed": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11862,7 +12085,7 @@
     ],
     "config": {
       "numClients": 1,
-      "useGarbageCollection": true
+      "useEagerGCForMemory": true
     },
     "steps": [
       {
@@ -11904,6 +12127,7 @@
           {
             "added": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
@@ -11959,6 +12183,7 @@
         "watchEntity": {
           "docs": [
             {
+              "createTime": 0,
               "key": "collection/key",
               "options": {
                 "hasCommittedMutations": false,
@@ -11996,6 +12221,7 @@
             "hasPendingWrites": false,
             "metadata": [
               {
+                "createTime": 0,
                 "key": "collection/key",
                 "options": {
                   "hasCommittedMutations": false,
diff --git a/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/ComparatorTester.java b/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/ComparatorTester.java
index 2193cab7b9e..96a39097d59 100644
--- a/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/ComparatorTester.java
+++ b/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/ComparatorTester.java
@@ -22,6 +22,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Ints;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.firebase.firestore.util.Preconditions;
 import java.util.Comparator;
 import java.util.List;
@@ -101,6 +102,7 @@ public ComparatorTester(@Nullable Comparator<?> comparator) {
    * Activates enforcement of {@code a.equals(b) == (a.compareTo(b) == 0)}. This is off by default
    * when testing {@link Comparator}s, but can be turned on if required.
    */
+  @CanIgnoreReturnValue
   public ComparatorTester requireConsistencyWithEquals() {
     testForEqualsCompatibility = true;
     return this;
@@ -110,6 +112,7 @@ public ComparatorTester requireConsistencyWithEquals() {
    * Deactivates enforcement of {@code a.equals(b) == (a.compareTo(b) == 0)}. This is on by default
    * when testing {@link Comparable}s, but can be turned off if required.
    */
+  @CanIgnoreReturnValue
   public ComparatorTester permitInconsistencyWithEquals() {
     testForEqualsCompatibility = false;
     return this;
@@ -122,6 +125,7 @@ public ComparatorTester permitInconsistencyWithEquals() {
    *
    * @return {@code this} (to allow chaining of calls)
    */
+  @CanIgnoreReturnValue
   public ComparatorTester addEqualityGroup(Object... objects) {
     Preconditions.checkNotNull(objects);
     Preconditions.checkArgument(objects.length > 0, "Array must not be empty");
diff --git a/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/TestTargetMetadataProvider.java b/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/TestTargetMetadataProvider.java
index 71cb84b9de8..698628b3300 100644
--- a/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/TestTargetMetadataProvider.java
+++ b/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/TestTargetMetadataProvider.java
@@ -16,6 +16,7 @@
 
 import com.google.firebase.database.collection.ImmutableSortedSet;
 import com.google.firebase.firestore.local.TargetData;
+import com.google.firebase.firestore.model.DatabaseId;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.remote.WatchChangeAggregator;
 import java.util.HashMap;
@@ -29,6 +30,7 @@
 public class TestTargetMetadataProvider implements WatchChangeAggregator.TargetMetadataProvider {
   final Map<Integer, ImmutableSortedSet<DocumentKey>> syncedKeys = new HashMap<>();
   final Map<Integer, TargetData> queryData = new HashMap<>();
+  DatabaseId databaseId = DatabaseId.forProject("test-project");
 
   @Override
   public ImmutableSortedSet<DocumentKey> getRemoteKeysForTarget(int targetId) {
@@ -41,6 +43,16 @@ public TargetData getTargetDataForTarget(int targetId) {
     return queryData.get(targetId);
   }
 
+  @Override
+  public DatabaseId getDatabaseId() {
+    return databaseId;
+  }
+
+  /** Replaces the default project ID and database ID. */
+  public void setDatabaseId(String projectId, String databaseId) {
+    this.databaseId = DatabaseId.forDatabase(projectId, databaseId);
+  }
+
   /** Sets or replaces the local state for the provided query data. */
   public void setSyncedKeys(TargetData targetData, ImmutableSortedSet<DocumentKey> keys) {
     this.queryData.put(targetData.getTargetId(), targetData);
diff --git a/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/TestUtil.java b/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/TestUtil.java
index 934d5aef4a2..e89a1e98b23 100644
--- a/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/TestUtil.java
+++ b/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/TestUtil.java
@@ -79,7 +79,6 @@
 import com.google.firebase.firestore.remote.WatchChange;
 import com.google.firebase.firestore.remote.WatchChange.DocumentChange;
 import com.google.firebase.firestore.remote.WatchChangeAggregator;
-import com.google.firestore.v1.StructuredQuery;
 import com.google.firestore.v1.Value;
 import com.google.protobuf.ByteString;
 import java.io.IOException;
@@ -109,6 +108,8 @@ public class TestUtil {
 
   public static final long ARBITRARY_SEQUENCE_NUMBER = 2;
 
+  private static final DatabaseId TEST_PROJECT = DatabaseId.forProject("project");
+
   @SuppressWarnings("unchecked")
   public static <T> Map<String, T> map(Object... entries) {
     Map<String, T> res = new LinkedHashMap<>();
@@ -141,8 +142,7 @@ public static FieldMask fieldMask(String... fields) {
   public static final Map<String, Object> EMPTY_MAP = new HashMap<>();
 
   public static Value wrap(Object value) {
-    DatabaseId databaseId = DatabaseId.forProject("project");
-    UserDataReader dataReader = new UserDataReader(databaseId);
+    UserDataReader dataReader = new UserDataReader(TEST_PROJECT);
     // HACK: We use parseQueryValue() since it accepts scalars as well as arrays / objects, and
     // our tests currently use wrap() pretty generically so we don't know the intent.
     return dataReader.parseQueryValue(value);
@@ -180,7 +180,7 @@ public static Query query(String path) {
   }
 
   public static FieldPath field(String path) {
-    return FieldPath.fromSegments(Arrays.asList(path.split("\\.")));
+    return FieldPath.fromServerFormat(path);
   }
 
   public static DocumentReference ref(String key) {
@@ -255,29 +255,32 @@ public static ImmutableSortedSet<DocumentKey> keySet(DocumentKey... keys) {
     return keySet;
   }
 
+  public static <T> Map<DocumentKey, T> keyMap(Object... entries) {
+    Map<DocumentKey, T> res = new LinkedHashMap<>();
+    for (int i = 0; i < entries.length; i += 2) {
+      res.put(DocumentKey.fromPathString((String) entries[i]), (T) entries[i + 1]);
+    }
+    return res;
+  }
+
   public static FieldFilter filter(String key, String operator, Object value) {
     return FieldFilter.create(field(key), operatorFromString(operator), wrap(value));
   }
 
   public static CompositeFilter andFilters(List<Filter> filters) {
-    return new CompositeFilter(filters, StructuredQuery.CompositeFilter.Operator.AND);
+    return new CompositeFilter(filters, CompositeFilter.Operator.AND);
   }
 
   public static CompositeFilter andFilters(Filter... filters) {
-    return new CompositeFilter(
-        Arrays.asList(filters), StructuredQuery.CompositeFilter.Operator.AND);
+    return new CompositeFilter(Arrays.asList(filters), CompositeFilter.Operator.AND);
   }
 
   public static CompositeFilter orFilters(Filter... filters) {
-    // TODO(orquery): Replace this with Operator.OR once it is available.
-    return new CompositeFilter(
-        Arrays.asList(filters), StructuredQuery.CompositeFilter.Operator.OPERATOR_UNSPECIFIED);
+    return new CompositeFilter(Arrays.asList(filters), CompositeFilter.Operator.OR);
   }
 
   public static CompositeFilter orFilters(List<Filter> filters) {
-    // TODO(orquery): Replace this with Operator.OR once it is available.
-    return new CompositeFilter(
-        filters, StructuredQuery.CompositeFilter.Operator.OPERATOR_UNSPECIFIED);
+    return new CompositeFilter(filters, CompositeFilter.Operator.OR);
   }
 
   public static Operator operatorFromString(String s) {
@@ -486,6 +489,11 @@ public TargetData getTargetDataForTarget(int targetId) {
                 ResourcePath collectionPath = docs.get(0).getKey().getCollectionPath();
                 return targetData(targetId, QueryPurpose.LISTEN, collectionPath.toString());
               }
+
+              @Override
+              public DatabaseId getDatabaseId() {
+                return TEST_PROJECT;
+              }
             });
 
     SnapshotVersion version = SnapshotVersion.NONE;
@@ -533,13 +541,18 @@ public TargetData getTargetDataForTarget(int targetId) {
                     ? targetData(targetId, QueryPurpose.LISTEN, doc.getKey().toString())
                     : null;
               }
+
+              @Override
+              public DatabaseId getDatabaseId() {
+                return TEST_PROJECT;
+              }
             });
     aggregator.handleDocumentChange(change);
     return aggregator.createRemoteEvent(doc.getVersion());
   }
 
   public static SetMutation setMutation(String path, Map<String, Object> values) {
-    UserDataReader dataReader = new UserDataReader(DatabaseId.forProject("project"));
+    UserDataReader dataReader = new UserDataReader(TEST_PROJECT);
     ParsedSetData parsed = dataReader.parseSetData(values);
 
     // The order of the transforms doesn't matter, but we sort them so tests can assume a particular
@@ -572,7 +585,7 @@ private static PatchMutation patchMutationHelper(
       }
     }
 
-    UserDataReader dataReader = new UserDataReader(DatabaseId.forProject("project"));
+    UserDataReader dataReader = new UserDataReader(TEST_PROJECT);
     ParsedUpdateData parsed = dataReader.parseUpdateData(values);
 
     // `mergeMutation()` provides an update mask for the merged fields, whereas `patchMutation()`
diff --git a/firebase-functions/CHANGELOG.md b/firebase-functions/CHANGELOG.md
new file mode 100644
index 00000000000..adc5138333f
--- /dev/null
+++ b/firebase-functions/CHANGELOG.md
@@ -0,0 +1,209 @@
+# Unreleased
+
+
+# 21.0.0
+* [changed] Bump internal dependencies
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.4.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-functions-ktx`
+  to `com.google.firebase:firebase-functions` under the `com.google.firebase.functions` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-functions-ktx` have been added to
+  `com.google.firebase:firebase-functions` under the `com.google.firebase.functions` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-functions-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.1
+* [changed] Added support for App Check limited-use tokens in HTTPS Callable Functions.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.0
+* [changed] Internal changes to ensure alignment with other SDK releases.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.2.2
+* [changed] Moved Task continuations off the main thread.
+* [changed] Internal infrastructure improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.2.1
+* [changed] Updated dependency of `firebase-iid` to its latest
+  version (v21.1.0).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.2.0
+* [unchanged] Updated to accommodate the release of the updated
+  [functions_client] Kotlin extensions library.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+  `firebase-functions` library. The Kotlin extensions library has the following
+  additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-functions-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+
+# 20.1.1
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.1.0
+* [feature] Added a new method
+  [`getHttpsCallableFromUrl(java.net.URL)`](/docs/reference/android/com/google/firebase/functions/FirebaseFunctions#public-httpscallablereference-gethttpscallablefromurl-url-url)
+  to create callables with URLs.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.2
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.1
+* [fixed] Fixed an issue that prevented functions from proceeding after
+  [app_check] failures.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.0
+* [feature] Added abuse reduction features.
+* [changed] Internal changes to support dynamic feature modules.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.2.0
+* [feature] Added support for custom domains, [`FirebaseFunctions#getInstance()`](/docs/reference/android/com/google/firebase/functions/FirebaseFunctions#getInstance(java.lang.String)).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.1.0
+* [feature] Added support for connecting to the Firebase Emulator Suite via
+  a new method,
+  [`FirebaseFunctions#UseEmulator()`](/docs/reference/android/com/google/firebase/functions/FirebaseFunctions#useEmulator(java.lang.String,%20int)).
+* [deprecated] Deprecated the `useFunctionsEmulator(String)` method.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.0.2
+* [changed] Internal changes to ensure functionality alignment with other SDK releases.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.0.1
+* [unchanged] Updated to accommodate the release of the [functions_client]
+  Kotlin extensions library.
+
+
+## Kotlin
+* [feature] The beta release of a [functions_client] Android library with
+  Kotlin extensions is now available. The Kotlin extensions library transitively
+  includes the base `firebase-functions` library. To learn more,  visit the
+  [[cloud_functions] KTX documentation](/docs/reference/kotlin/com/google/firebase/functions/ktx/package-summary).
+
+# 19.0.0
+* [changed] Versioned to add nullability annotations to improve the Kotlin
+  developer experience. No other changes.
+
+# 18.1.0
+* [feature] Added
+  [`getTimeout`](/docs/reference/android/com/google/firebase/functions/HttpsCallableReference)
+  method to get the timeout for a callable. For more details, refer to
+  [GitHub PR #574](//github.com/firebase/firebase-android-sdk/pull/574).
+
+# 17.0.0
+* [changed] Updated minSdkVersion to API level 16.
+
+# 16.3.0
+* [changed] Changed the default timeout for callable functions to 70 seconds
+  ([#2329](//github.com/firebase/firebase-android-sdk/pull/224)).
+* [feature] Added
+  [`setTimeout`](/docs/reference/android/com/google/firebase/functions/HttpsCallableReference)
+  and
+  [`withTimeout`](/docs/reference/android/com/google/firebase/functions/HttpsCallableReference)
+  methods to change the timeout for a callable
+  ([#2329](//github.com/firebase/firebase-android-sdk/pull/224)).
+
+# 16.1.0
+* [feature] `FirebaseFunctions.getInstance()` now allows passing in an
+optional region to override the default "us-central1".
+* [feature] New `useFunctionsEmulator` method allows testing against a local
+instance of the [Cloud Functions Emulator](https://firebase.google.com/docs/functions/local-emulator).
+
diff --git a/firebase-functions/api.txt b/firebase-functions/api.txt
index 25df5fab60a..2a59cdc659c 100644
--- a/firebase-functions/api.txt
+++ b/firebase-functions/api.txt
@@ -3,6 +3,9 @@ package com.google.firebase.functions {
 
   public class FirebaseFunctions {
     method @NonNull public com.google.firebase.functions.HttpsCallableReference getHttpsCallable(@NonNull String);
+    method @NonNull public com.google.firebase.functions.HttpsCallableReference getHttpsCallable(@NonNull String, @NonNull com.google.firebase.functions.HttpsCallableOptions);
+    method @NonNull public com.google.firebase.functions.HttpsCallableReference getHttpsCallableFromUrl(@NonNull java.net.URL);
+    method @NonNull public com.google.firebase.functions.HttpsCallableReference getHttpsCallableFromUrl(@NonNull java.net.URL, @NonNull com.google.firebase.functions.HttpsCallableOptions);
     method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull com.google.firebase.FirebaseApp, @NonNull String);
     method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull com.google.firebase.FirebaseApp);
     method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull String);
@@ -36,6 +39,26 @@ package com.google.firebase.functions {
     enum_constant public static final com.google.firebase.functions.FirebaseFunctionsException.Code UNKNOWN;
   }
 
+  public final class FunctionsKt {
+    method @NonNull public static com.google.firebase.functions.FirebaseFunctions functions(@NonNull com.google.firebase.Firebase, @NonNull String regionOrCustomDomain);
+    method @NonNull public static com.google.firebase.functions.FirebaseFunctions functions(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @NonNull public static com.google.firebase.functions.FirebaseFunctions functions(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String regionOrCustomDomain);
+    method @NonNull public static com.google.firebase.functions.FirebaseFunctions getFunctions(@NonNull com.google.firebase.Firebase);
+    method @NonNull public static com.google.firebase.functions.HttpsCallableReference getHttpsCallable(@NonNull com.google.firebase.functions.FirebaseFunctions, @NonNull String name, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.functions.HttpsCallableOptions.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.firebase.functions.HttpsCallableReference getHttpsCallableFromUrl(@NonNull com.google.firebase.functions.FirebaseFunctions, @NonNull java.net.URL url, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.functions.HttpsCallableOptions.Builder,kotlin.Unit> init);
+  }
+
+  public class HttpsCallableOptions {
+    method public boolean getLimitedUseAppCheckTokens();
+  }
+
+  public static class HttpsCallableOptions.Builder {
+    ctor public HttpsCallableOptions.Builder();
+    method @NonNull public com.google.firebase.functions.HttpsCallableOptions build();
+    method public boolean getLimitedUseAppCheckTokens();
+    method @NonNull public com.google.firebase.functions.HttpsCallableOptions.Builder setLimitedUseAppCheckTokens(boolean);
+  }
+
   public class HttpsCallableReference {
     method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.functions.HttpsCallableResult> call(@Nullable Object);
     method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.functions.HttpsCallableResult> call();
@@ -50,3 +73,16 @@ package com.google.firebase.functions {
 
 }
 
+package com.google.firebase.functions.ktx {
+
+  public final class FunctionsKt {
+    method @Deprecated @NonNull public static com.google.firebase.functions.FirebaseFunctions functions(@NonNull com.google.firebase.ktx.Firebase, @NonNull String regionOrCustomDomain);
+    method @Deprecated @NonNull public static com.google.firebase.functions.FirebaseFunctions functions(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @Deprecated @NonNull public static com.google.firebase.functions.FirebaseFunctions functions(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String regionOrCustomDomain);
+    method @Deprecated @NonNull public static com.google.firebase.functions.FirebaseFunctions getFunctions(@NonNull com.google.firebase.ktx.Firebase);
+    method @Deprecated @NonNull public static com.google.firebase.functions.HttpsCallableReference getHttpsCallable(@NonNull com.google.firebase.functions.FirebaseFunctions, @NonNull String name, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.functions.HttpsCallableOptions.Builder,kotlin.Unit> init);
+    method @Deprecated @NonNull public static com.google.firebase.functions.HttpsCallableReference getHttpsCallableFromUrl(@NonNull com.google.firebase.functions.FirebaseFunctions, @NonNull java.net.URL url, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.functions.HttpsCallableOptions.Builder,kotlin.Unit> init);
+  }
+
+}
+
diff --git a/firebase-functions/firebase-functions.gradle b/firebase-functions/firebase-functions.gradle
deleted file mode 100644
index 5ded4a8adb0..00000000000
--- a/firebase-functions/firebase-functions.gradle
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-plugins {
-    id 'firebase-library'
-}
-
-firebaseLibrary {
-    testLab.enabled = true
-    publishSources = true
-}
-
-android {
-    adbOptions {
-        timeOutInMs 60 * 1000
-    }
-
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-        targetSdkVersion project.targetSdkVersion
-        minSdkVersion 16
-        versionName version
-        multiDexEnabled true
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'proguard.txt'
-    }
-    sourceSets {
-        androidTest {
-            java {
-                srcDir 'src/testUtil'
-            }
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    testOptions.unitTests.includeAndroidResources = true
-}
-
-dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':appcheck:firebase-appcheck-interop')
-    implementation 'com.google.android.gms:play-services-basement:18.0.0'
-    implementation 'com.google.android.gms:play-services-base:18.0.1'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation ('com.google.firebase:firebase-iid:20.0.1') {
-        exclude group: 'com.google.firebase', module: 'firebase-common'
-    }
-    implementation ('com.google.firebase:firebase-auth-interop:18.0.0') {
-        exclude group: 'com.google.firebase', module: 'firebase-common'
-    }
-    implementation 'com.google.firebase:firebase-iid-interop:17.0.0'
-
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
-
-    annotationProcessor 'com.google.auto.value:auto-value:1.6.2'
-
-    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
-    javadocClasspath 'org.codehaus.mojo:animal-sniffer-annotations:1.19'
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
-
-    androidTestImplementation 'junit:junit:4.13.2'
-    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.25.0'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.25.0'
-
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:rules:1.2.0'
-    testImplementation 'androidx.test:core:1.2.0'
-}
-
-// ==========================================================================
-// Copy from here down if you want to use the google-services plugin in your
-// androidTest integration tests.
-// ==========================================================================
-ext.packageName = "com.google.firebase.functions"
-apply from: '../gradle/googleServices.gradle'
diff --git a/firebase-functions/firebase-functions.gradle.kts b/firebase-functions/firebase-functions.gradle.kts
new file mode 100644
index 00000000000..0a7e28f58de
--- /dev/null
+++ b/firebase-functions/firebase-functions.gradle.kts
@@ -0,0 +1,100 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+    id("firebase-library")
+    id("kotlin-android")
+    id("firebase-vendor")
+    id("copy-google-services")
+}
+
+firebaseLibrary {
+    libraryGroup("functions")
+    testLab.enabled = true
+    publishSources = true
+}
+
+android {
+  val compileSdkVersion : Int by rootProject
+  val targetSdkVersion : Int by rootProject
+  val minSdkVersion : Int by rootProject
+
+  namespace = "com.google.firebase.functions"
+  compileSdk = compileSdkVersion
+  defaultConfig {
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+    multiDexEnabled = true
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    consumerProguardFiles("proguard.txt")
+  }
+  sourceSets {
+    getByName("androidTest").java.srcDirs("src/testUtil")
+  }
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+  kotlinOptions { jvmTarget = "1.8" }
+  testOptions.unitTests.isIncludeAndroidResources = true
+}
+
+dependencies {
+    javadocClasspath("org.codehaus.mojo:animal-sniffer-annotations:1.21")
+    javadocClasspath(libs.autovalue.annotations)
+    javadocClasspath(libs.findbugs.jsr305)
+
+    api("com.google.firebase:firebase-appcheck-interop:17.1.0")
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
+    api("com.google.firebase:firebase-annotations:16.2.0")
+    api("com.google.firebase:firebase-auth-interop:18.0.0") {
+       exclude(group = "com.google.firebase", module = "firebase-common")
+   }
+    api("com.google.firebase:firebase-iid:21.1.0") {
+       exclude(group = "com.google.firebase", module = "firebase-common")
+       exclude(group = "com.google.firebase", module = "firebase-components")
+   }
+    api("com.google.firebase:firebase-iid-interop:17.1.0")
+    implementation(libs.androidx.annotation)
+    implementation(libs.javax.inject)
+    implementation(libs.kotlin.stdlib)
+    implementation(libs.okhttp)
+    implementation(libs.playservices.base)
+    implementation(libs.playservices.basement)
+    api(libs.playservices.tasks)
+
+    annotationProcessor(libs.autovalue)
+    annotationProcessor(libs.dagger.compiler)
+
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.androidx.test.rules)
+    testImplementation(libs.junit)
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.robolectric) {}
+    testImplementation(libs.truth)
+    vendor(libs.dagger.dagger) {
+     exclude(group = "javax.inject", module = "javax.inject")
+   }
+
+    androidTestImplementation(project(":integ-testing"))
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.junit)
+    androidTestImplementation(libs.mockito.core)
+    androidTestImplementation(libs.mockito.dexmaker)
+    androidTestImplementation(libs.truth)
+}
diff --git a/firebase-functions/gradle.properties b/firebase-functions/gradle.properties
index a6cc7e6cfa9..b878bad37ff 100644
--- a/firebase-functions/gradle.properties
+++ b/firebase-functions/gradle.properties
@@ -1,3 +1,3 @@
-version=20.0.2
-latestReleasedVersion=20.0.1
+version=21.0.1
+latestReleasedVersion=21.0.0
 android.enableUnitTestBinaryResources=true
diff --git a/firebase-functions/ktx/api.txt b/firebase-functions/ktx/api.txt
index 0d8eb896b78..60c7053d554 100644
--- a/firebase-functions/ktx/api.txt
+++ b/firebase-functions/ktx/api.txt
@@ -1,12 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.functions.ktx {
 
-  public final class FunctionsKt {
-    ctor public FunctionsKt();
-    method @NonNull public static com.google.firebase.functions.FirebaseFunctions functions(@NonNull com.google.firebase.ktx.Firebase, @NonNull String regionOrCustomDomain);
-    method @NonNull public static com.google.firebase.functions.FirebaseFunctions functions(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
-    method @NonNull public static com.google.firebase.functions.FirebaseFunctions functions(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String regionOrCustomDomain);
-    method @NonNull public static com.google.firebase.functions.FirebaseFunctions getFunctions(@NonNull com.google.firebase.ktx.Firebase);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-functions/ktx/ktx.gradle.kts b/firebase-functions/ktx/ktx.gradle.kts
new file mode 100644
index 00000000000..5ffceaeee8e
--- /dev/null
+++ b/firebase-functions/ktx/ktx.gradle.kts
@@ -0,0 +1,64 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+  id("firebase-library")
+    id("kotlin-android")
+}
+
+firebaseLibrary {
+  libraryGroup("functions")
+  publishJavadoc = false
+  publishReleaseNotes = false
+  publishSources = true
+  testLab.enabled = true
+}
+
+android {
+  val compileSdkVersion : Int by rootProject
+  val targetSdkVersion : Int by rootProject
+  val minSdkVersion : Int by rootProject
+
+  namespace = "com.google.firebase.functions.ktx"
+  compileSdk = compileSdkVersion
+  defaultConfig {
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+    multiDexEnabled = true
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+  }
+  sourceSets {
+    getByName("main").java.srcDirs("src/main/kotlin")
+    getByName("test").java.srcDirs("src/test/kotlin")
+    getByName("androidTest").java.srcDirs("src/androidTest/kotlin")
+  }
+  testOptions.unitTests.isIncludeAndroidResources = true
+}
+
+dependencies {
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api(project(":firebase-functions"))
+
+    implementation("com.google.firebase:firebase-components:18.0.0")
+
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.junit)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.truth)
+
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.junit)
+    androidTestImplementation(libs.truth)
+}
diff --git a/firebase-functions/ktx/src/androidTest/AndroidManifest.xml b/firebase-functions/ktx/src/androidTest/AndroidManifest.xml
index e00dc0c7ec9..d5b1f2e017a 100644
--- a/firebase-functions/ktx/src/androidTest/AndroidManifest.xml
+++ b/firebase-functions/ktx/src/androidTest/AndroidManifest.xml
@@ -1,7 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.google.firebase.functions.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />-->
+  <!--<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />-->
   <uses-permission android:name="android.permission.INTERNET"/>
   <application
       android:usesCleartextTraffic="true">
diff --git a/firebase-functions/ktx/src/androidTest/kotlin/com/google/firebase/functions/ktx/CallTests.kt b/firebase-functions/ktx/src/androidTest/kotlin/com/google/firebase/functions/ktx/CallTests.kt
index 8acae3506bc..87ca19f8348 100644
--- a/firebase-functions/ktx/src/androidTest/kotlin/com/google/firebase/functions/ktx/CallTests.kt
+++ b/firebase-functions/ktx/src/androidTest/kotlin/com/google/firebase/functions/ktx/CallTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.functions.ktx
 
@@ -32,56 +34,60 @@ const val API_KEY = "API_KEY"
 
 @RunWith(AndroidJUnit4::class)
 class CallTests {
-    companion object {
-        lateinit var app: FirebaseApp
+  companion object {
+    lateinit var app: FirebaseApp
 
-        @BeforeClass @JvmStatic fun setup() {
-            app = Firebase.initialize(InstrumentationRegistry.getContext())!!
-        }
+    @BeforeClass
+    @JvmStatic
+    fun setup() {
+      app = Firebase.initialize(InstrumentationRegistry.getContext())!!
+    }
 
-        @AfterClass @JvmStatic fun cleanup() {
-            app.delete()
-        }
+    @AfterClass
+    @JvmStatic
+    fun cleanup() {
+      app.delete()
     }
+  }
 
-    @Test
-    fun testDataCall() {
-        val functions = Firebase.functions(app)
-        val input = hashMapOf(
-            "bool" to true,
-            "int" to 2,
-            "long" to 3L,
-            "string" to "four",
-            "array" to listOf(5, 6),
-            "null" to null
-        )
+  @Test
+  fun testDataCall() {
+    val functions = Firebase.functions(app)
+    val input =
+      hashMapOf(
+        "bool" to true,
+        "int" to 2,
+        "long" to 3L,
+        "string" to "four",
+        "array" to listOf(5, 6),
+        "null" to null
+      )
 
-        var function = functions.getHttpsCallable("dataTest")
-        val actual = Tasks.await(function.call(input)).getData()
+    var function = functions.getHttpsCallable("dataTest")
+    val actual = Tasks.await(function.call(input)).getData()
 
-        assertThat(actual).isInstanceOf(Map::class.java)
-        @Suppress("UNCHECKED_CAST")
-        val map = actual as Map<String, *>
-        assertThat(map["message"]).isEqualTo("stub response")
-        assertThat(map["code"]).isEqualTo(42)
-        assertThat(map["long"]).isEqualTo(420L)
-    }
+    assertThat(actual).isInstanceOf(Map::class.java)
+    @Suppress("UNCHECKED_CAST") val map = actual as Map<String, *>
+    assertThat(map["message"]).isEqualTo("stub response")
+    assertThat(map["code"]).isEqualTo(42)
+    assertThat(map["long"]).isEqualTo(420L)
+  }
 
-    @Test
-    fun testNullDataCall() {
-        val functions = Firebase.functions(app)
-        var function = functions.getHttpsCallable("nullTest")
-        val actual = Tasks.await(function.call(null)).getData()
+  @Test
+  fun testNullDataCall() {
+    val functions = Firebase.functions(app)
+    var function = functions.getHttpsCallable("nullTest")
+    val actual = Tasks.await(function.call(null)).getData()
 
-        assertThat(actual).isNull()
-    }
+    assertThat(actual).isNull()
+  }
 
-    @Test
-    fun testEmptyDataCall() {
-        val functions = Firebase.functions(app)
-        var function = functions.getHttpsCallable("nullTest")
-        val actual = Tasks.await(function.call()).getData()
+  @Test
+  fun testEmptyDataCall() {
+    val functions = Firebase.functions(app)
+    var function = functions.getHttpsCallable("nullTest")
+    val actual = Tasks.await(function.call()).getData()
 
-        assertThat(actual).isNull()
-    }
+    assertThat(actual).isNull()
+  }
 }
diff --git a/firebase-functions/ktx/src/main/AndroidManifest.xml b/firebase-functions/ktx/src/main/AndroidManifest.xml
index bcdb806609a..336b52fc894 100644
--- a/firebase-functions/ktx/src/main/AndroidManifest.xml
+++ b/firebase-functions/ktx/src/main/AndroidManifest.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.functions.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.functions.ktx.FirebaseFunctionsKtxRegistrar"
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.functions.ktx.FirebaseFunctionsLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
diff --git a/firebase-functions/ktx/src/main/kotlin/com/google/firebase/functions/ktx/Functions.kt b/firebase-functions/ktx/src/main/kotlin/com/google/firebase/functions/ktx/Functions.kt
deleted file mode 100644
index 5fc5ad42558..00000000000
--- a/firebase-functions/ktx/src/main/kotlin/com/google/firebase/functions/ktx/Functions.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.functions.ktx
-
-import androidx.annotation.Keep
-import com.google.firebase.FirebaseApp
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.functions.FirebaseFunctions
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.platforminfo.LibraryVersionComponent
-
-/** Returns the [FirebaseFunctions] instance of the default [FirebaseApp]. */
-val Firebase.functions: FirebaseFunctions
-    get() = FirebaseFunctions.getInstance()
-
-/** Returns the [FirebaseFunctions] instance of a given [regionOrCustomDomain]. */
-fun Firebase.functions(regionOrCustomDomain: String): FirebaseFunctions =
-        FirebaseFunctions.getInstance(regionOrCustomDomain)
-
-/** Returns the [FirebaseFunctions] instance of a given [FirebaseApp]. */
-fun Firebase.functions(app: FirebaseApp): FirebaseFunctions = FirebaseFunctions.getInstance(app)
-
-/** Returns the [FirebaseFunctions] instance of a given [FirebaseApp] and [regionOrCustomDomain]. */
-fun Firebase.functions(app: FirebaseApp, regionOrCustomDomain: String): FirebaseFunctions =
-        FirebaseFunctions.getInstance(app, regionOrCustomDomain)
-
-internal const val LIBRARY_NAME: String = "fire-fun-ktx"
-
-/** @suppress */
-@Keep
-class FirebaseFunctionsKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-functions/ktx/src/main/kotlin/com/google/firebase/functions/ktx/Logging.kt b/firebase-functions/ktx/src/main/kotlin/com/google/firebase/functions/ktx/Logging.kt
new file mode 100644
index 00000000000..f5661d4caaf
--- /dev/null
+++ b/firebase-functions/ktx/src/main/kotlin/com/google/firebase/functions/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.functions.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.functions.BuildConfig
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-fun-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseFunctionsLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/TestVisibilityUtil.kt b/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/TestVisibilityUtil.kt
new file mode 100644
index 00000000000..9a8be4b4f9c
--- /dev/null
+++ b/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/TestVisibilityUtil.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.functions
+
+/**
+ * Returns true if the {@link HttpsCallableReference} is configured to use FAC limited-use tokens.
+ */
+fun HttpsCallableReference.usesLimitedUseFacTokens() = options.getLimitedUseAppCheckTokens()
diff --git a/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/ktx/FunctionsTests.kt b/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/ktx/FunctionsTests.kt
index 43e319deb8c..34e845c7927 100644
--- a/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/ktx/FunctionsTests.kt
+++ b/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/ktx/FunctionsTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.functions.ktx
 
@@ -19,10 +21,12 @@ import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
 import com.google.firebase.FirebaseOptions
 import com.google.firebase.functions.FirebaseFunctions
+import com.google.firebase.functions.usesLimitedUseFacTokens
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.ktx.app
 import com.google.firebase.ktx.initialize
 import com.google.firebase.platforminfo.UserAgentPublisher
+import java.net.URL
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
@@ -35,67 +39,115 @@ const val API_KEY = "API_KEY"
 const val EXISTING_APP = "existing"
 
 abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
-
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build(),
-                EXISTING_APP
-        )
-    }
-
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class FunctionsTests : BaseTestCase() {
 
-    @Test
-    fun `functions should delegate to FirebaseFunctions#getInstance()`() {
-        assertThat(Firebase.functions).isSameInstanceAs(FirebaseFunctions.getInstance())
-    }
-
-    @Test
-    fun `FirebaseApp#functions should delegate to FirebaseFunctions#getInstance(FirebaseApp)`() {
-        val app = Firebase.app(EXISTING_APP)
-        assertThat(Firebase.functions(app)).isSameInstanceAs(FirebaseFunctions.getInstance(app))
-    }
-
-    @Test
-    fun `Firebase#functions should delegate to FirebaseFunctions#getInstance(region)`() {
-        val region = "valid_region"
-        assertThat(Firebase.functions(region)).isSameInstanceAs(FirebaseFunctions.getInstance(region))
-    }
-
-    @Test
-    fun `Firebase#functions should delegate to FirebaseFunctions#getInstance(FirebaseApp, region)`() {
-        val app = Firebase.app(EXISTING_APP)
-        val region = "valid_region"
-        assertThat(Firebase.functions(app, region)).isSameInstanceAs(FirebaseFunctions.getInstance(app, region))
-    }
+  @Test
+  fun `functions should delegate to FirebaseFunctions#getInstance()`() {
+    assertThat(Firebase.functions).isSameInstanceAs(FirebaseFunctions.getInstance())
+  }
+
+  @Test
+  fun `FirebaseApp#functions should delegate to FirebaseFunctions#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.functions(app)).isSameInstanceAs(FirebaseFunctions.getInstance(app))
+  }
+
+  @Test
+  fun `Firebase#functions should delegate to FirebaseFunctions#getInstance(region)`() {
+    val region = "valid_region"
+    assertThat(Firebase.functions(region)).isSameInstanceAs(FirebaseFunctions.getInstance(region))
+  }
+
+  @Test
+  fun `Firebase#functions should delegate to FirebaseFunctions#getInstance(FirebaseApp, region)`() {
+    val app = Firebase.app(EXISTING_APP)
+    val region = "valid_region"
+    assertThat(Firebase.functions(app, region))
+      .isSameInstanceAs(FirebaseFunctions.getInstance(app, region))
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun `library version should be registered with runtime`() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class AppCheckLimitedUseTest : BaseTestCase() {
+  @Test
+  fun `FirebaseFunctions#getHttpsCallable should not use limited-use tokens by default`() {
+    val callable = Firebase.functions.getHttpsCallable("function")
+    assertThat(callable.usesLimitedUseFacTokens()).isFalse()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallable should build callable with FAC settings (when true)`() {
+    val callable =
+      Firebase.functions.getHttpsCallable("function") { limitedUseAppCheckTokens = true }
+    assertThat(callable.usesLimitedUseFacTokens()).isTrue()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallable should build callable with FAC settings (when false)`() {
+    val callable =
+      Firebase.functions.getHttpsCallable("function") { limitedUseAppCheckTokens = false }
+    assertThat(callable.usesLimitedUseFacTokens()).isFalse()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallableFromUrl should not use limited-use tokens by default`() {
+    val callable = Firebase.functions.getHttpsCallableFromUrl(URL("https://functions.test"))
+    assertThat(callable.usesLimitedUseFacTokens()).isFalse()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallableFromUrl callable with FAC settings (when true)`() {
+    val callable =
+      Firebase.functions.getHttpsCallableFromUrl(URL("https://functions.test")) {
+        limitedUseAppCheckTokens = true
+      }
+    assertThat(callable.usesLimitedUseFacTokens()).isTrue()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallableFromUrl callable with FAC settings (when false)`() {
+    val callable =
+      Firebase.functions.getHttpsCallableFromUrl(URL("https://functions.test")) {
+        limitedUseAppCheckTokens = false
+      }
+    assertThat(callable.usesLimitedUseFacTokens()).isFalse()
+  }
 }
diff --git a/firebase-functions/src/androidTest/AndroidManifest.xml b/firebase-functions/src/androidTest/AndroidManifest.xml
index a607dbb15d1..8b1af7ed002 100644
--- a/firebase-functions/src/androidTest/AndroidManifest.xml
+++ b/firebase-functions/src/androidTest/AndroidManifest.xml
@@ -1,7 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.google.firebase.functions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="23" />-->
+  <!--<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />-->
   <uses-permission android:name="android.permission.INTERNET"/>
   <application
       android:usesCleartextTraffic="true">
diff --git a/firebase-functions/src/androidTest/backend/functions/index.js b/firebase-functions/src/androidTest/backend/functions/index.js
index fe29f7587e9..fed5a371b89 100644
--- a/firebase-functions/src/androidTest/backend/functions/index.js
+++ b/firebase-functions/src/androidTest/backend/functions/index.js
@@ -64,6 +64,12 @@ exports.appCheckTest = functions.https.onRequest((request, response) => {
   response.send({data: {}});
 });
 
+exports.appCheckLimitedUseTest = functions.https.onRequest((request, response) => {
+  assert.equal(request.get('X-Firebase-AppCheck'), 'appCheck-limited-use');
+  assert.deepEqual(request.body, {data: {}});
+  response.send({data: {}});
+});
+
 exports.nullTest = functions.https.onRequest((request, response) => {
   assert.deepEqual(request.body, {data: null});
   response.send({data: null});
diff --git a/firebase-functions/src/androidTest/backend/functions/package.json b/firebase-functions/src/androidTest/backend/functions/package.json
index 3dba4fc0be6..6c5f9933d8b 100644
--- a/firebase-functions/src/androidTest/backend/functions/package.json
+++ b/firebase-functions/src/androidTest/backend/functions/package.json
@@ -2,11 +2,11 @@
   "name": "functions",
   "description": "Cloud Functions for Firebase",
   "dependencies": {
-    "firebase-admin": "9.4.2",
-    "firebase-functions": "3.13.1"
+    "firebase-admin": "11.8.0",
+    "firebase-functions": "4.4.0"
   },
   "private": true,
   "engines": {
-    "node": "12"
+    "node": "18"
   }
 }
diff --git a/firebase-functions/src/androidTest/java/com/google/firebase/functions/CallTest.java b/firebase-functions/src/androidTest/java/com/google/firebase/functions/CallTest.java
index 73ae20e3464..8764cf5d5c6 100644
--- a/firebase-functions/src/androidTest/java/com/google/firebase/functions/CallTest.java
+++ b/firebase-functions/src/androidTest/java/com/google/firebase/functions/CallTest.java
@@ -21,10 +21,11 @@
 import static org.junit.Assert.assertTrue;
 
 import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.functions.FirebaseFunctionsException.Code;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -84,14 +85,15 @@ public void testToken() throws InterruptedException, ExecutionException {
     // Override the normal token provider to simulate FirebaseAuth being logged in.
     FirebaseFunctions functions =
         new FirebaseFunctions(
-            app,
             app.getApplicationContext(),
             app.getOptions().getProjectId(),
             "us-central1",
-            () -> {
+            (unused) -> {
               HttpsCallableContext context = new HttpsCallableContext("token", null, null);
               return Tasks.forResult(context);
-            });
+            },
+            TestOnlyExecutors.lite(),
+            TestOnlyExecutors.ui());
 
     HttpsCallableReference function = functions.getHttpsCallable("tokenTest");
     Task<HttpsCallableResult> result = function.call(new HashMap<>());
@@ -105,14 +107,15 @@ public void testInstanceId() throws InterruptedException, ExecutionException {
     // Override the normal token provider to simulate FirebaseAuth being logged in.
     FirebaseFunctions functions =
         new FirebaseFunctions(
-            app,
             app.getApplicationContext(),
             app.getOptions().getProjectId(),
             "us-central1",
-            () -> {
+            (unused) -> {
               HttpsCallableContext context = new HttpsCallableContext(null, "iid", null);
               return Tasks.forResult(context);
-            });
+            },
+            TestOnlyExecutors.lite(),
+            TestOnlyExecutors.ui());
 
     HttpsCallableReference function = functions.getHttpsCallable("instanceIdTest");
     Task<HttpsCallableResult> result = function.call(new HashMap<>());
@@ -126,14 +129,15 @@ public void testAppCheck() throws InterruptedException, ExecutionException {
     // Override the normal token provider to simulate FirebaseAuth being logged in.
     FirebaseFunctions functions =
         new FirebaseFunctions(
-            app,
             app.getApplicationContext(),
             app.getOptions().getProjectId(),
             "us-central1",
-            () -> {
+            (unused) -> {
               HttpsCallableContext context = new HttpsCallableContext(null, null, "appCheck");
               return Tasks.forResult(context);
-            });
+            },
+            TestOnlyExecutors.lite(),
+            TestOnlyExecutors.ui());
 
     HttpsCallableReference function = functions.getHttpsCallable("appCheckTest");
     Task<HttpsCallableResult> result = function.call(new HashMap<>());
@@ -142,6 +146,32 @@ public void testAppCheck() throws InterruptedException, ExecutionException {
     assertEquals(new HashMap<>(), actual);
   }
 
+  @Test
+  public void testAppCheckLimitedUse() throws InterruptedException, ExecutionException {
+    // Override the normal token provider to simulate FirebaseAuth being logged in.
+    FirebaseFunctions functions =
+        new FirebaseFunctions(
+            app.getApplicationContext(),
+            app.getOptions().getProjectId(),
+            "us-central1",
+            (unused) -> {
+              HttpsCallableContext context =
+                  new HttpsCallableContext(null, null, "appCheck-limited-use");
+              return Tasks.forResult(context);
+            },
+            TestOnlyExecutors.lite(),
+            TestOnlyExecutors.ui());
+
+    HttpsCallableReference function =
+        functions.getHttpsCallable(
+            "appCheckLimitedUseTest",
+            new HttpsCallableOptions.Builder().setLimitedUseAppCheckTokens(true).build());
+    Task<HttpsCallableResult> result = function.call(new HashMap<>());
+    Object actual = Tasks.await(result).getData();
+
+    assertEquals(new HashMap<>(), actual);
+  }
+
   @Test
   public void testNull() throws InterruptedException, ExecutionException {
     FirebaseFunctions functions = FirebaseFunctions.getInstance(app);
diff --git a/firebase-functions/src/androidTest/java/com/google/firebase/functions/CallTests.kt b/firebase-functions/src/androidTest/java/com/google/firebase/functions/CallTests.kt
new file mode 100644
index 00000000000..66829a34a44
--- /dev/null
+++ b/firebase-functions/src/androidTest/java/com/google/firebase/functions/CallTests.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.functions
+
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
+import com.google.android.gms.tasks.Tasks
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.app
+import com.google.firebase.initialize
+import org.junit.AfterClass
+import org.junit.BeforeClass
+import org.junit.Test
+import org.junit.runner.RunWith
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+@RunWith(AndroidJUnit4::class)
+class CallTests {
+  companion object {
+    lateinit var app: FirebaseApp
+
+    @BeforeClass
+    @JvmStatic
+    fun setup() {
+      app = Firebase.initialize(InstrumentationRegistry.getContext())!!
+    }
+
+    @AfterClass
+    @JvmStatic
+    fun cleanup() {
+      app.delete()
+    }
+  }
+
+  @Test
+  fun testDataCall() {
+    val functions = Firebase.functions(app)
+    val input =
+      hashMapOf(
+        "bool" to true,
+        "int" to 2,
+        "long" to 3L,
+        "string" to "four",
+        "array" to listOf(5, 6),
+        "null" to null
+      )
+
+    var function = functions.getHttpsCallable("dataTest")
+    val actual = Tasks.await(function.call(input)).getData()
+
+    assertThat(actual).isInstanceOf(Map::class.java)
+    @Suppress("UNCHECKED_CAST") val map = actual as Map<String, *>
+    assertThat(map["message"]).isEqualTo("stub response")
+    assertThat(map["code"]).isEqualTo(42)
+    assertThat(map["long"]).isEqualTo(420L)
+  }
+
+  @Test
+  fun testNullDataCall() {
+    val functions = Firebase.functions(app)
+    var function = functions.getHttpsCallable("nullTest")
+    val actual = Tasks.await(function.call(null)).getData()
+
+    assertThat(actual).isNull()
+  }
+
+  @Test
+  fun testEmptyDataCall() {
+    val functions = Firebase.functions(app)
+    var function = functions.getHttpsCallable("nullTest")
+    val actual = Tasks.await(function.call()).getData()
+
+    assertThat(actual).isNull()
+  }
+}
diff --git a/firebase-functions/src/androidTest/java/com/google/firebase/functions/FirebaseContextProviderTest.java b/firebase-functions/src/androidTest/java/com/google/firebase/functions/FirebaseContextProviderTest.java
index 906981d762b..1126ae55fbb 100644
--- a/firebase-functions/src/androidTest/java/com/google/firebase/functions/FirebaseContextProviderTest.java
+++ b/firebase-functions/src/androidTest/java/com/google/firebase/functions/FirebaseContextProviderTest.java
@@ -18,8 +18,9 @@
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.iid.internal.FirebaseInstanceIdInternal;
 import com.google.firebase.inject.Deferred;
 import com.google.firebase.inject.Provider;
@@ -33,6 +34,8 @@ public class FirebaseContextProviderTest {
   private static final String AUTH_TOKEN = "authToken";
   private static final String IID_TOKEN = "iidToken";
   private static final String APP_CHECK_TOKEN = "appCheckToken";
+
+  private static final String APP_CHECK_LIMITED_USE_TOKEN = "appCheckLimitedUseToken";
   private static final String ERROR = "errorString";
 
   private static final InternalAuthProvider fixedAuthProvider =
@@ -44,19 +47,22 @@ public class FirebaseContextProviderTest {
           });
   private static final FirebaseInstanceIdInternal fixedIidProvider =
       new TestFirebaseInstanceIdInternal(IID_TOKEN);
-  private static final InternalAppCheckTokenProvider fixedAppCheckProvider =
-      new TestInternalAppCheckTokenProvider(APP_CHECK_TOKEN);
-  private static final InternalAppCheckTokenProvider errorAppCheckProvider =
-      new TestInternalAppCheckTokenProvider(APP_CHECK_TOKEN, ERROR);
+  private static final InteropAppCheckTokenProvider fixedAppCheckProvider =
+      new TestInteropAppCheckTokenProvider(APP_CHECK_TOKEN, APP_CHECK_LIMITED_USE_TOKEN);
+  private static final InteropAppCheckTokenProvider errorAppCheckProvider =
+      new TestInteropAppCheckTokenProvider(APP_CHECK_TOKEN, APP_CHECK_LIMITED_USE_TOKEN, ERROR);
 
   @Test
   public void getContext_whenAuthAndAppCheckAreNotAvailable_shouldContainOnlyIid()
       throws ExecutionException, InterruptedException {
     FirebaseContextProvider contextProvider =
         new FirebaseContextProvider(
-            absentProvider(), providerOf(fixedIidProvider), absentDeferred());
+            absentProvider(),
+            providerOf(fixedIidProvider),
+            absentDeferred(),
+            TestOnlyExecutors.lite());
 
-    HttpsCallableContext context = Tasks.await(contextProvider.getContext());
+    HttpsCallableContext context = Tasks.await(contextProvider.getContext(false));
     assertThat(context.getAuthToken()).isNull();
     assertThat(context.getAppCheckToken()).isNull();
     assertThat(context.getInstanceIdToken()).isEqualTo(IID_TOKEN);
@@ -67,9 +73,12 @@ public void getContext_whenOnlyAuthIsAvailable_shouldContainOnlyAuthTokenAndIid(
       throws ExecutionException, InterruptedException {
     FirebaseContextProvider contextProvider =
         new FirebaseContextProvider(
-            providerOf(fixedAuthProvider), providerOf(fixedIidProvider), absentDeferred());
+            providerOf(fixedAuthProvider),
+            providerOf(fixedIidProvider),
+            absentDeferred(),
+            TestOnlyExecutors.lite());
 
-    HttpsCallableContext context = Tasks.await(contextProvider.getContext());
+    HttpsCallableContext context = Tasks.await(contextProvider.getContext(false));
     assertThat(context.getAuthToken()).isEqualTo(AUTH_TOKEN);
     assertThat(context.getAppCheckToken()).isNull();
     assertThat(context.getInstanceIdToken()).isEqualTo(IID_TOKEN);
@@ -80,9 +89,12 @@ public void getContext_whenOnlyAppCheckIsAvailable_shouldContainOnlyAppCheckToke
       throws ExecutionException, InterruptedException {
     FirebaseContextProvider contextProvider =
         new FirebaseContextProvider(
-            absentProvider(), providerOf(fixedIidProvider), deferredOf(fixedAppCheckProvider));
+            absentProvider(),
+            providerOf(fixedIidProvider),
+            deferredOf(fixedAppCheckProvider),
+            TestOnlyExecutors.lite());
 
-    HttpsCallableContext context = Tasks.await(contextProvider.getContext());
+    HttpsCallableContext context = Tasks.await(contextProvider.getContext(false));
     assertThat(context.getAuthToken()).isNull();
     assertThat(context.getAppCheckToken()).isEqualTo(APP_CHECK_TOKEN);
     assertThat(context.getInstanceIdToken()).isEqualTo(IID_TOKEN);
@@ -93,9 +105,12 @@ public void getContext_whenOnlyAuthIsAvailableAndNotSignedIn_shouldContainOnlyIi
       throws ExecutionException, InterruptedException {
     FirebaseContextProvider contextProvider =
         new FirebaseContextProvider(
-            providerOf(anonymousAuthProvider), providerOf(fixedIidProvider), absentDeferred());
+            providerOf(anonymousAuthProvider),
+            providerOf(fixedIidProvider),
+            absentDeferred(),
+            TestOnlyExecutors.lite());
 
-    HttpsCallableContext context = Tasks.await(contextProvider.getContext());
+    HttpsCallableContext context = Tasks.await(contextProvider.getContext(false));
     assertThat(context.getAuthToken()).isNull();
     assertThat(context.getAppCheckToken()).isNull();
     assertThat(context.getInstanceIdToken()).isEqualTo(IID_TOKEN);
@@ -106,14 +121,49 @@ public void getContext_whenOnlyAppCheckIsAvailableAndHasError_shouldContainOnlyI
       throws ExecutionException, InterruptedException {
     FirebaseContextProvider contextProvider =
         new FirebaseContextProvider(
-            absentProvider(), providerOf(fixedIidProvider), deferredOf(errorAppCheckProvider));
+            absentProvider(),
+            providerOf(fixedIidProvider),
+            deferredOf(errorAppCheckProvider),
+            TestOnlyExecutors.lite());
+
+    HttpsCallableContext context = Tasks.await(contextProvider.getContext(false));
+    assertThat(context.getAuthToken()).isNull();
+    assertThat(context.getInstanceIdToken()).isEqualTo(IID_TOKEN);
+    assertThat(context.getAppCheckToken()).isNull();
+  }
+
+  @Test
+  public void getContext_facLimitedUse_whenOnlyAppCheckIsAvailableAndHasError_shouldContainOnlyIid()
+      throws ExecutionException, InterruptedException {
+    FirebaseContextProvider contextProvider =
+        new FirebaseContextProvider(
+            absentProvider(),
+            providerOf(fixedIidProvider),
+            deferredOf(errorAppCheckProvider),
+            TestOnlyExecutors.lite());
 
-    HttpsCallableContext context = Tasks.await(contextProvider.getContext());
+    HttpsCallableContext context = Tasks.await(contextProvider.getContext(true));
     assertThat(context.getAuthToken()).isNull();
     assertThat(context.getInstanceIdToken()).isEqualTo(IID_TOKEN);
     assertThat(context.getAppCheckToken()).isNull();
   }
 
+  @Test
+  public void getContext_facLimitedUse_whenOnlyAppCheckIsAvailable_shouldContainToken()
+      throws ExecutionException, InterruptedException {
+    FirebaseContextProvider contextProvider =
+        new FirebaseContextProvider(
+            absentProvider(),
+            providerOf(fixedIidProvider),
+            deferredOf(fixedAppCheckProvider),
+            TestOnlyExecutors.lite());
+
+    HttpsCallableContext context = Tasks.await(contextProvider.getContext(true));
+    assertThat(context.getAuthToken()).isNull();
+    assertThat(context.getInstanceIdToken()).isEqualTo(IID_TOKEN);
+    assertThat(context.getAppCheckToken()).isEqualTo(APP_CHECK_LIMITED_USE_TOKEN);
+  }
+
   @Test
   public void getContext_whenAuthAndAppCheckAreAvailable_shouldContainAuthAppCheckTokensAndIid()
       throws ExecutionException, InterruptedException {
@@ -121,9 +171,10 @@ public void getContext_whenAuthAndAppCheckAreAvailable_shouldContainAuthAppCheck
         new FirebaseContextProvider(
             providerOf(fixedAuthProvider),
             providerOf(fixedIidProvider),
-            deferredOf(fixedAppCheckProvider));
+            deferredOf(fixedAppCheckProvider),
+            TestOnlyExecutors.lite());
 
-    HttpsCallableContext context = Tasks.await(contextProvider.getContext());
+    HttpsCallableContext context = Tasks.await(contextProvider.getContext(false));
     assertThat(context.getAuthToken()).isEqualTo(AUTH_TOKEN);
     assertThat(context.getAppCheckToken()).isEqualTo(APP_CHECK_TOKEN);
     assertThat(context.getInstanceIdToken()).isEqualTo(IID_TOKEN);
diff --git a/firebase-functions/src/androidTest/java/com/google/firebase/functions/TestFirebaseInstanceIdInternal.java b/firebase-functions/src/androidTest/java/com/google/firebase/functions/TestFirebaseInstanceIdInternal.java
index 21a68ae5198..05e108c153a 100644
--- a/firebase-functions/src/androidTest/java/com/google/firebase/functions/TestFirebaseInstanceIdInternal.java
+++ b/firebase-functions/src/androidTest/java/com/google/firebase/functions/TestFirebaseInstanceIdInternal.java
@@ -14,8 +14,12 @@
 
 package com.google.firebase.functions;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.iid.internal.FirebaseInstanceIdInternal;
+import java.io.IOException;
 
 public class TestFirebaseInstanceIdInternal implements FirebaseInstanceIdInternal {
   private final String testToken;
@@ -34,4 +38,20 @@ public String getId() {
   public String getToken() {
     return testToken;
   }
+
+  @NonNull
+  @Override
+  public Task<String> getTokenTask() {
+    return Tasks.forResult(testToken);
+  }
+
+  @Override
+  public void deleteToken(@NonNull String s, @NonNull String s1) throws IOException {
+    // No-op: We're not using this method in our tests
+  }
+
+  @Override
+  public void addNewTokenListener(NewTokenListener newTokenListener) {
+    // No-op: We're not using this method in our tests
+  }
 }
diff --git a/firebase-functions/src/androidTest/java/com/google/firebase/functions/TestInternalAppCheckTokenProvider.java b/firebase-functions/src/androidTest/java/com/google/firebase/functions/TestInteropAppCheckTokenProvider.java
similarity index 59%
rename from firebase-functions/src/androidTest/java/com/google/firebase/functions/TestInternalAppCheckTokenProvider.java
rename to firebase-functions/src/androidTest/java/com/google/firebase/functions/TestInteropAppCheckTokenProvider.java
index 9c7c7abd297..8c9270a7806 100644
--- a/firebase-functions/src/androidTest/java/com/google/firebase/functions/TestInternalAppCheckTokenProvider.java
+++ b/firebase-functions/src/androidTest/java/com/google/firebase/functions/TestInteropAppCheckTokenProvider.java
@@ -21,12 +21,13 @@
 import com.google.firebase.FirebaseException;
 import com.google.firebase.appcheck.AppCheckTokenResult;
 import com.google.firebase.appcheck.interop.AppCheckTokenListener;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 
-public class TestInternalAppCheckTokenProvider implements InternalAppCheckTokenProvider {
+public class TestInteropAppCheckTokenProvider implements InteropAppCheckTokenProvider {
   private final AppCheckTokenResult testToken;
+  private final AppCheckTokenResult testLimitedUseToken;
 
-  public TestInternalAppCheckTokenProvider(String testToken) {
+  public TestInteropAppCheckTokenProvider(String testToken, String testLimitedUseToken) {
     this.testToken =
         new AppCheckTokenResult() {
           @NonNull
@@ -37,13 +38,29 @@ public String getToken() {
 
           @Nullable
           @Override
-          public FirebaseException getError() {
+          public Exception getError() {
+            return null;
+          }
+        };
+
+    this.testLimitedUseToken =
+        new AppCheckTokenResult() {
+          @NonNull
+          @Override
+          public String getToken() {
+            return testLimitedUseToken;
+          }
+
+          @Nullable
+          @Override
+          public Exception getError() {
             return null;
           }
         };
   }
 
-  public TestInternalAppCheckTokenProvider(String testToken, String error) {
+  public TestInteropAppCheckTokenProvider(
+      String testToken, String testLimitedUseToken, String error) {
     this.testToken =
         new AppCheckTokenResult() {
           @NonNull
@@ -54,7 +71,21 @@ public String getToken() {
 
           @Nullable
           @Override
-          public FirebaseException getError() {
+          public Exception getError() {
+            return new FirebaseException(error);
+          }
+        };
+    this.testLimitedUseToken =
+        new AppCheckTokenResult() {
+          @NonNull
+          @Override
+          public String getToken() {
+            return testLimitedUseToken;
+          }
+
+          @Nullable
+          @Override
+          public Exception getError() {
             return new FirebaseException(error);
           }
         };
@@ -66,6 +97,12 @@ public Task<AppCheckTokenResult> getToken(boolean forceRefresh) {
     return Tasks.forResult(testToken);
   }
 
+  @NonNull
+  @Override
+  public Task<AppCheckTokenResult> getLimitedUseToken() {
+    return Tasks.forResult(testLimitedUseToken);
+  }
+
   @Override
   public void addAppCheckTokenListener(@NonNull AppCheckTokenListener listener) {}
 
diff --git a/firebase-functions/src/androidTest/java/com/google/firebase/functions/ktx/CallTests.kt b/firebase-functions/src/androidTest/java/com/google/firebase/functions/ktx/CallTests.kt
new file mode 100644
index 00000000000..87ca19f8348
--- /dev/null
+++ b/firebase-functions/src/androidTest/java/com/google/firebase/functions/ktx/CallTests.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.functions.ktx
+
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
+import com.google.android.gms.tasks.Tasks
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import org.junit.AfterClass
+import org.junit.BeforeClass
+import org.junit.Test
+import org.junit.runner.RunWith
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+@RunWith(AndroidJUnit4::class)
+class CallTests {
+  companion object {
+    lateinit var app: FirebaseApp
+
+    @BeforeClass
+    @JvmStatic
+    fun setup() {
+      app = Firebase.initialize(InstrumentationRegistry.getContext())!!
+    }
+
+    @AfterClass
+    @JvmStatic
+    fun cleanup() {
+      app.delete()
+    }
+  }
+
+  @Test
+  fun testDataCall() {
+    val functions = Firebase.functions(app)
+    val input =
+      hashMapOf(
+        "bool" to true,
+        "int" to 2,
+        "long" to 3L,
+        "string" to "four",
+        "array" to listOf(5, 6),
+        "null" to null
+      )
+
+    var function = functions.getHttpsCallable("dataTest")
+    val actual = Tasks.await(function.call(input)).getData()
+
+    assertThat(actual).isInstanceOf(Map::class.java)
+    @Suppress("UNCHECKED_CAST") val map = actual as Map<String, *>
+    assertThat(map["message"]).isEqualTo("stub response")
+    assertThat(map["code"]).isEqualTo(42)
+    assertThat(map["long"]).isEqualTo(420L)
+  }
+
+  @Test
+  fun testNullDataCall() {
+    val functions = Firebase.functions(app)
+    var function = functions.getHttpsCallable("nullTest")
+    val actual = Tasks.await(function.call(null)).getData()
+
+    assertThat(actual).isNull()
+  }
+
+  @Test
+  fun testEmptyDataCall() {
+    val functions = Firebase.functions(app)
+    var function = functions.getHttpsCallable("nullTest")
+    val actual = Tasks.await(function.call()).getData()
+
+    assertThat(actual).isNull()
+  }
+}
diff --git a/firebase-functions/src/main/AndroidManifest.xml b/firebase-functions/src/main/AndroidManifest.xml
index 0fd428d93d2..216f7de3746 100644
--- a/firebase-functions/src/main/AndroidManifest.xml
+++ b/firebase-functions/src/main/AndroidManifest.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        package="com.google.firebase.functions">
+        xmlns:tools="http://schemas.android.com/tools">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16" />-->
+    <!--<uses-sdk android:minSdkVersion="21" />-->
     <uses-permission android:name="android.permission.INTERNET" />
     <application>
-        <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
+        <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.functions.FirebaseFunctionsKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.functions.FunctionsRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/ContextProvider.java b/firebase-functions/src/main/java/com/google/firebase/functions/ContextProvider.java
index 797869e88f1..a9802a5c3db 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/ContextProvider.java
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/ContextProvider.java
@@ -18,5 +18,5 @@
 
 /** The interface for getting metadata about the client. This is an interface for easier testing. */
 interface ContextProvider {
-  Task<HttpsCallableContext> getContext();
+  Task<HttpsCallableContext> getContext(boolean getLimitedUseAppCheckToken);
 }
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseContextProvider.java b/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseContextProvider.java
index 24a37a1cf8e..68e549464c3 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseContextProvider.java
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseContextProvider.java
@@ -17,32 +17,41 @@
 import android.util.Log;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.appcheck.AppCheckTokenResult;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.iid.internal.FirebaseInstanceIdInternal;
 import com.google.firebase.inject.Deferred;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.internal.api.FirebaseNoSignedInUserException;
+import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicReference;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
 /** A ContextProvider that uses FirebaseAuth to get the token. */
+@Singleton
 class FirebaseContextProvider implements ContextProvider {
   private final String TAG = "FirebaseContextProvider";
 
   private final Provider<InternalAuthProvider> tokenProvider;
   private final Provider<FirebaseInstanceIdInternal> instanceId;
-  private final AtomicReference<InternalAppCheckTokenProvider> appCheckRef =
-      new AtomicReference<>();
+  private final AtomicReference<InteropAppCheckTokenProvider> appCheckRef = new AtomicReference<>();
+  private final Executor executor;
 
+  @Inject
   FirebaseContextProvider(
       Provider<InternalAuthProvider> tokenProvider,
       Provider<FirebaseInstanceIdInternal> instanceId,
-      Deferred<InternalAppCheckTokenProvider> appCheckDeferred) {
+      Deferred<InteropAppCheckTokenProvider> appCheckDeferred,
+      @Lightweight Executor executor) {
     this.tokenProvider = tokenProvider;
     this.instanceId = instanceId;
+    this.executor = executor;
     appCheckDeferred.whenAvailable(
         p -> {
-          InternalAppCheckTokenProvider appCheck = p.get();
+          InteropAppCheckTokenProvider appCheck = p.get();
           appCheckRef.set(appCheck);
 
           appCheck.addAppCheckTokenListener(
@@ -54,11 +63,12 @@ class FirebaseContextProvider implements ContextProvider {
   }
 
   @Override
-  public Task<HttpsCallableContext> getContext() {
+  public Task<HttpsCallableContext> getContext(boolean limitedUseAppCheckToken) {
     Task<String> authToken = getAuthToken();
-    Task<String> appCheckToken = getAppCheckToken();
+    Task<String> appCheckToken = getAppCheckToken(limitedUseAppCheckToken);
     return Tasks.whenAll(authToken, appCheckToken)
         .onSuccessTask(
+            executor,
             v ->
                 Tasks.forResult(
                     new HttpsCallableContext(
@@ -74,6 +84,7 @@ private Task<String> getAuthToken() {
     }
     return auth.getAccessToken(false)
         .continueWith(
+            executor,
             task -> {
               String authToken = null;
               if (!task.isSuccessful()) {
@@ -90,22 +101,23 @@ private Task<String> getAuthToken() {
             });
   }
 
-  private Task<String> getAppCheckToken() {
-    InternalAppCheckTokenProvider appCheck = appCheckRef.get();
+  private Task<String> getAppCheckToken(boolean limitedUseAppCheckToken) {
+    InteropAppCheckTokenProvider appCheck = appCheckRef.get();
     if (appCheck == null) {
       return Tasks.forResult(null);
     }
-    return appCheck
-        .getToken(false)
-        .onSuccessTask(
-            result -> {
-              if (result.getError() != null) {
-                // If there was an error getting the App Check token, do NOT send the placeholder
-                // token. Only valid App Check tokens should be sent to the functions backend.
-                Log.w(TAG, "Error getting App Check token. Error: " + result.getError());
-                return Tasks.forResult(null);
-              }
-              return Tasks.forResult(result.getToken());
-            });
+    Task<AppCheckTokenResult> tokenTask =
+        limitedUseAppCheckToken ? appCheck.getLimitedUseToken() : appCheck.getToken(false);
+    return tokenTask.onSuccessTask(
+        executor,
+        result -> {
+          if (result.getError() != null) {
+            // If there was an error getting the App Check token, do NOT send the placeholder
+            // token. Only valid App Check tokens should be sent to the functions backend.
+            Log.w(TAG, "Error getting App Check token. Error: " + result.getError());
+            return Tasks.forResult(null);
+          }
+          return Tasks.forResult(result.getToken());
+        });
   }
 }
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.java b/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.java
index 100e6929f8e..6b15592b1f3 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.java
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.java
@@ -15,7 +15,6 @@
 package com.google.firebase.functions;
 
 import android.content.Context;
-import android.os.Handler;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -27,14 +26,20 @@
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
 import com.google.firebase.emulators.EmulatedServiceSettings;
 import com.google.firebase.functions.FirebaseFunctionsException.Code;
+import dagger.assisted.Assisted;
+import dagger.assisted.AssistedInject;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Executor;
+import javax.inject.Named;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.MediaType;
@@ -57,9 +62,6 @@ public class FirebaseFunctions {
    */
   private static boolean providerInstallStarted = false;
 
-  // The FirebaseApp instance
-  private final FirebaseApp app;
-
   // The network client to use for HTTPS requests.
   private final OkHttpClient client;
 
@@ -69,6 +71,8 @@ public class FirebaseFunctions {
   // A provider of client metadata to include with calls.
   private final ContextProvider contextProvider;
 
+  private final Executor executor;
+
   // The projectId to use for all functions references.
   private final String projectId;
 
@@ -84,13 +88,15 @@ public class FirebaseFunctions {
   // Emulator settings
   @Nullable private EmulatedServiceSettings emulatorSettings;
 
+  @AssistedInject
   FirebaseFunctions(
-      FirebaseApp app,
       Context context,
-      String projectId,
-      String regionOrCustomDomain,
-      ContextProvider contextProvider) {
-    this.app = app;
+      @Named("projectId") String projectId,
+      @Assisted String regionOrCustomDomain,
+      ContextProvider contextProvider,
+      @Lightweight Executor executor,
+      @UiThread Executor uiExecutor) {
+    this.executor = executor;
     this.client = new OkHttpClient();
     this.serializer = new Serializer();
     this.contextProvider = Preconditions.checkNotNull(contextProvider);
@@ -112,15 +118,16 @@ public class FirebaseFunctions {
       this.customDomain = regionOrCustomDomain;
     }
 
-    maybeInstallProviders(context);
+    maybeInstallProviders(context, uiExecutor);
   }
 
   /**
    * Runs ProviderInstaller.installIfNeededAsync once per application instance.
    *
    * @param context The application context.
+   * @param uiExecutor
    */
-  private static void maybeInstallProviders(Context context) {
+  private static void maybeInstallProviders(Context context, Executor uiExecutor) {
     // Make sure this only runs once.
     synchronized (providerInstalled) {
       if (providerInstallStarted) {
@@ -131,7 +138,7 @@ private static void maybeInstallProviders(Context context) {
 
     // Package installIfNeededAsync into a Runnable so it can be run on the main thread.
     // installIfNeededAsync checks to make sure it is on the main thread, and throws otherwise.
-    Runnable runnable =
+    uiExecutor.execute(
         () ->
             ProviderInstaller.installIfNeededAsync(
                 context,
@@ -146,10 +153,7 @@ public void onProviderInstallFailed(int i, android.content.Intent intent) {
                     Log.d("FirebaseFunctions", "Failed to update ssl context");
                     providerInstalled.setResult(null);
                   }
-                });
-
-    Handler handler = new Handler(context.getMainLooper());
-    handler.post(runnable);
+                }));
   }
 
   /**
@@ -198,10 +202,30 @@ public static FirebaseFunctions getInstance() {
     return getInstance(FirebaseApp.getInstance(), "us-central1");
   }
 
-  /** Returns a reference to the Callable HTTPS trigger with the given name. */
+  /** Returns a reference to the callable HTTPS trigger with the given name. */
   @NonNull
   public HttpsCallableReference getHttpsCallable(@NonNull String name) {
-    return new HttpsCallableReference(this, name);
+    return new HttpsCallableReference(this, name, new HttpsCallOptions());
+  }
+
+  /** Returns a reference to the callable HTTPS trigger with the provided URL. */
+  @NonNull
+  public HttpsCallableReference getHttpsCallableFromUrl(@NonNull URL url) {
+    return new HttpsCallableReference(this, url, new HttpsCallOptions());
+  }
+
+  /** Returns a reference to the callable HTTPS trigger with the given name and call options. */
+  @NonNull
+  public HttpsCallableReference getHttpsCallable(
+      @NonNull String name, @NonNull HttpsCallableOptions options) {
+    return new HttpsCallableReference(this, name, new HttpsCallOptions(options));
+  }
+
+  /** Returns a reference to the callable HTTPS trigger with the provided URL and call options. */
+  @NonNull
+  public HttpsCallableReference getHttpsCallableFromUrl(
+      @NonNull URL url, @NonNull HttpsCallableOptions options) {
+    return new HttpsCallableReference(this, url, new HttpsCallOptions(options));
   }
 
   /**
@@ -263,32 +287,57 @@ public void useEmulator(@NonNull String host, int port) {
   Task<HttpsCallableResult> call(String name, @Nullable Object data, HttpsCallOptions options) {
     return providerInstalled
         .getTask()
-        .continueWithTask(task -> contextProvider.getContext())
         .continueWithTask(
+            executor, task -> contextProvider.getContext(options.getLimitedUseAppCheckTokens()))
+        .continueWithTask(
+            executor,
             task -> {
               if (!task.isSuccessful()) {
                 return Tasks.forException(task.getException());
               }
               HttpsCallableContext context = task.getResult();
-              return call(name, data, context, options);
+              URL url = getURL(name);
+              return call(url, data, context, options);
             });
   }
 
   /**
    * Calls a Callable HTTPS trigger endpoint.
    *
-   * @param name The name of the HTTPS trigger.
+   * @param url The url of the HTTPS trigger
+   * @param data Parameters to pass to the function. Can be anything encodable as JSON.
+   * @return A Task that will be completed when the request is complete.
+   */
+  Task<HttpsCallableResult> call(URL url, @Nullable Object data, HttpsCallOptions options) {
+    return providerInstalled
+        .getTask()
+        .continueWithTask(
+            executor, task -> contextProvider.getContext(options.getLimitedUseAppCheckTokens()))
+        .continueWithTask(
+            executor,
+            task -> {
+              if (!task.isSuccessful()) {
+                return Tasks.forException(task.getException());
+              }
+              HttpsCallableContext context = task.getResult();
+              return call(url, data, context, options);
+            });
+  }
+
+  /**
+   * Calls a Callable HTTPS trigger endpoint.
+   *
+   * @param url The name of the HTTPS trigger.
    * @param data Parameters to pass to the function. Can be anything encodable as JSON.
    * @param context Metadata to supply with the function call.
    * @return A Task that will be completed when the request is complete.
    */
   private Task<HttpsCallableResult> call(
-      @NonNull String name,
+      @NonNull URL url,
       @Nullable Object data,
       HttpsCallableContext context,
       HttpsCallOptions options) {
-    Preconditions.checkNotNull(name, "name cannot be null");
-    URL url = getURL(name);
+    Preconditions.checkNotNull(url, "url cannot be null");
 
     Map<String, Object> body = new HashMap<>();
 
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/Functions.kt b/firebase-functions/src/main/java/com/google/firebase/functions/Functions.kt
new file mode 100644
index 00000000000..14ab9dc5809
--- /dev/null
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/Functions.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.functions
+
+import androidx.annotation.Keep
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import java.net.URL
+
+/** Returns the [FirebaseFunctions] instance of the default [FirebaseApp]. */
+val Firebase.functions: FirebaseFunctions
+  get() = FirebaseFunctions.getInstance()
+
+/** Returns the [FirebaseFunctions] instance of a given [regionOrCustomDomain]. */
+fun Firebase.functions(regionOrCustomDomain: String): FirebaseFunctions =
+  FirebaseFunctions.getInstance(regionOrCustomDomain)
+
+/** Returns the [FirebaseFunctions] instance of a given [FirebaseApp]. */
+fun Firebase.functions(app: FirebaseApp): FirebaseFunctions = FirebaseFunctions.getInstance(app)
+
+/** Returns the [FirebaseFunctions] instance of a given [FirebaseApp] and [regionOrCustomDomain]. */
+fun Firebase.functions(app: FirebaseApp, regionOrCustomDomain: String): FirebaseFunctions =
+  FirebaseFunctions.getInstance(app, regionOrCustomDomain)
+
+/** @suppress */
+@Keep
+class FirebaseFunctionsKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
+
+/** Returns a reference to the Callable HTTPS trigger with the given name and call options. */
+fun FirebaseFunctions.getHttpsCallable(
+  name: String,
+  init: HttpsCallableOptions.Builder.() -> Unit
+): HttpsCallableReference {
+  val builder = HttpsCallableOptions.Builder()
+  builder.init()
+  return getHttpsCallable(name, builder.build())
+}
+
+/** Returns a reference to the Callable HTTPS trigger with the given URL and call options. */
+fun FirebaseFunctions.getHttpsCallableFromUrl(
+  url: URL,
+  init: HttpsCallableOptions.Builder.() -> Unit
+): HttpsCallableReference {
+  val builder = HttpsCallableOptions.Builder()
+  builder.init()
+  return getHttpsCallableFromUrl(url, builder.build())
+}
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsComponent.java b/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsComponent.java
new file mode 100644
index 00000000000..f7fd4fc0635
--- /dev/null
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsComponent.java
@@ -0,0 +1,78 @@
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.functions;
+
+import android.content.Context;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
+import com.google.firebase.auth.internal.InternalAuthProvider;
+import com.google.firebase.iid.internal.FirebaseInstanceIdInternal;
+import com.google.firebase.inject.Deferred;
+import com.google.firebase.inject.Provider;
+import dagger.Binds;
+import dagger.BindsInstance;
+import dagger.Component;
+import dagger.Module;
+import dagger.Provides;
+import java.util.concurrent.Executor;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+/** @hide */
+@Component(modules = FunctionsComponent.MainModule.class)
+@Singleton
+interface FunctionsComponent {
+  FunctionsMultiResourceComponent getMultiResourceComponent();
+
+  @Component.Builder
+  interface Builder {
+    @BindsInstance
+    Builder setApplicationContext(Context applicationContext);
+
+    @BindsInstance
+    Builder setFirebaseOptions(FirebaseOptions options);
+
+    @BindsInstance
+    Builder setLiteExecutor(@Lightweight Executor executor);
+
+    @BindsInstance
+    Builder setUiExecutor(@UiThread Executor executor);
+
+    @BindsInstance
+    Builder setAuth(Provider<InternalAuthProvider> auth);
+
+    @BindsInstance
+    Builder setIid(Provider<FirebaseInstanceIdInternal> iid);
+
+    @BindsInstance
+    Builder setAppCheck(Deferred<InteropAppCheckTokenProvider> appCheck);
+
+    FunctionsComponent build();
+  }
+
+  @Module
+  interface MainModule {
+    @Provides
+    @Named("projectId")
+    static String bindProjectId(FirebaseOptions options) {
+      return options.getProjectId();
+    }
+
+    @Binds
+    ContextProvider contextProvider(FirebaseContextProvider provider);
+  }
+}
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsMultiResourceComponent.java b/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsMultiResourceComponent.java
index 6fe3dc8b69d..4a36b27297f 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsMultiResourceComponent.java
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsMultiResourceComponent.java
@@ -14,13 +14,16 @@
 
 package com.google.firebase.functions;
 
-import android.content.Context;
 import androidx.annotation.GuardedBy;
-import com.google.firebase.FirebaseApp;
+import dagger.assisted.Assisted;
+import dagger.assisted.AssistedFactory;
 import java.util.HashMap;
 import java.util.Map;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
 /** Multi-resource container for Functions. */
+@Singleton
 class FunctionsMultiResourceComponent {
   /**
    * A static map from instance key to FirebaseFunctions instances. Instance keys region names.
@@ -30,27 +33,24 @@ class FunctionsMultiResourceComponent {
   @GuardedBy("this")
   private final Map<String, FirebaseFunctions> instances = new HashMap<>();
 
-  private final Context applicationContext;
-  private final ContextProvider contextProvider;
-  private final FirebaseApp app;
+  private final FirebaseFunctionsFactory functionsFactory;
 
-  FunctionsMultiResourceComponent(
-      Context applicationContext, ContextProvider contextProvider, FirebaseApp app) {
-    this.applicationContext = applicationContext;
-    this.contextProvider = contextProvider;
-    this.app = app;
+  @Inject
+  FunctionsMultiResourceComponent(FirebaseFunctionsFactory functionsFactory) {
+    this.functionsFactory = functionsFactory;
   }
 
   synchronized FirebaseFunctions get(String regionOrCustomDomain) {
     FirebaseFunctions functions = instances.get(regionOrCustomDomain);
-    String projectId = app.getOptions().getProjectId();
-
     if (functions == null) {
-      functions =
-          new FirebaseFunctions(
-              app, applicationContext, projectId, regionOrCustomDomain, contextProvider);
+      functions = functionsFactory.create(regionOrCustomDomain);
       instances.put(regionOrCustomDomain, functions);
     }
     return functions;
   }
+
+  @AssistedFactory
+  interface FirebaseFunctionsFactory {
+    FirebaseFunctions create(@Assisted String regionOrCustomDomain);
+  }
 }
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsRegistrar.java b/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsRegistrar.java
index 4a36d4ee6c9..d65807502cf 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsRegistrar.java
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsRegistrar.java
@@ -16,16 +16,20 @@
 
 import android.content.Context;
 import androidx.annotation.Keep;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
 import com.google.firebase.iid.internal.FirebaseInstanceIdInternal;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.Executor;
 
 /**
  * Registers {@link FunctionsMultiResourceComponent}.
@@ -34,31 +38,35 @@
  */
 @Keep
 public class FunctionsRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-fn";
+
   @Override
   public List<Component<?>> getComponents() {
+    Qualified<Executor> liteExecutor = Qualified.qualified(Lightweight.class, Executor.class);
+    Qualified<Executor> uiExecutor = Qualified.qualified(UiThread.class, Executor.class);
     return Arrays.asList(
-        Component.builder(ContextProvider.class)
-            .add(Dependency.optionalProvider(InternalAuthProvider.class))
-            .add(Dependency.requiredProvider(FirebaseInstanceIdInternal.class))
-            .add(Dependency.deferred(InternalAppCheckTokenProvider.class))
-            .factory(
-                c ->
-                    new FirebaseContextProvider(
-                        c.getProvider(InternalAuthProvider.class),
-                        c.getProvider(FirebaseInstanceIdInternal.class),
-                        c.getDeferred(InternalAppCheckTokenProvider.class)))
-            .build(),
         Component.builder(FunctionsMultiResourceComponent.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(Context.class))
-            .add(Dependency.required(ContextProvider.class))
-            .add(Dependency.required(FirebaseApp.class))
+            .add(Dependency.required(FirebaseOptions.class))
+            .add(Dependency.optionalProvider(InternalAuthProvider.class))
+            .add(Dependency.requiredProvider(FirebaseInstanceIdInternal.class))
+            .add(Dependency.deferred(InteropAppCheckTokenProvider.class))
+            .add(Dependency.required(liteExecutor))
+            .add(Dependency.required(uiExecutor))
             .factory(
                 c ->
-                    new FunctionsMultiResourceComponent(
-                        c.get(Context.class),
-                        c.get(ContextProvider.class),
-                        c.get(FirebaseApp.class)))
+                    DaggerFunctionsComponent.builder()
+                        .setApplicationContext(c.get(Context.class))
+                        .setFirebaseOptions(c.get(FirebaseOptions.class))
+                        .setLiteExecutor(c.get(liteExecutor))
+                        .setUiExecutor(c.get(uiExecutor))
+                        .setAuth(c.getProvider(InternalAuthProvider.class))
+                        .setIid(c.getProvider(FirebaseInstanceIdInternal.class))
+                        .setAppCheck(c.getDeferred(InteropAppCheckTokenProvider.class))
+                        .build()
+                        .getMultiResourceComponent())
             .build(),
-        LibraryVersionComponent.create("fire-fn", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.java b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.java
index b046aeaa3d3..86ab79889fb 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.java
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallOptions.java
@@ -28,6 +28,17 @@ class HttpsCallOptions {
   private long timeout = DEFAULT_TIMEOUT;
   private TimeUnit timeoutUnits = DEFAULT_TIMEOUT_UNITS;
 
+  private final boolean limitedUseAppCheckTokens;
+
+  /** Creates an (internal) HttpsCallOptions from the (external) {@link HttpsCallableOptions}. */
+  HttpsCallOptions(HttpsCallableOptions publicCallableOptions) {
+    this.limitedUseAppCheckTokens = publicCallableOptions.getLimitedUseAppCheckTokens();
+  }
+
+  HttpsCallOptions() {
+    this.limitedUseAppCheckTokens = false;
+  }
+
   /**
    * Changes the timeout for calls from this instance of Functions. The default is 60 seconds.
    *
@@ -44,10 +55,14 @@ void setTimeout(long timeout, TimeUnit units) {
    *
    * @return The timeout, in milliseconds.
    */
-  public long getTimeout() {
+  long getTimeout() {
     return timeoutUnits.toMillis(timeout);
   }
 
+  boolean getLimitedUseAppCheckTokens() {
+    return limitedUseAppCheckTokens;
+  }
+
   /** Creates a new OkHttpClient with these options applied to it. */
   OkHttpClient apply(OkHttpClient client) {
     return client
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableOptions.java b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableOptions.java
new file mode 100644
index 00000000000..b3dd5811621
--- /dev/null
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableOptions.java
@@ -0,0 +1,64 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.functions;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Options for configuring the callable function.
+ *
+ * <p>These properties are immutable once a callable function reference is instantiated.
+ */
+public class HttpsCallableOptions {
+  // If true, request a limited-use token from AppCheck.
+  private final boolean limitedUseAppCheckTokens;
+
+  private HttpsCallableOptions(boolean limitedUseAppCheckTokens) {
+    this.limitedUseAppCheckTokens = limitedUseAppCheckTokens;
+  }
+
+  /**
+   * Returns the setting indicating if limited-use App Check tokens are enforced for this function.
+   */
+  public boolean getLimitedUseAppCheckTokens() {
+    return limitedUseAppCheckTokens;
+  }
+
+  /** Builder class for {@link com.google.firebase.functions.HttpsCallableOptions} */
+  public static class Builder {
+    private boolean limitedUseAppCheckTokens = false;
+
+    /**
+     * Sets whether or not to use limited-use App Check tokens when invoking the associated
+     * function.
+     */
+    @NonNull
+    public Builder setLimitedUseAppCheckTokens(boolean limitedUse) {
+      limitedUseAppCheckTokens = limitedUse;
+      return this;
+    }
+
+    /** Returns the setting indicating if limited-use App Check tokens are enforced. */
+    public boolean getLimitedUseAppCheckTokens() {
+      return limitedUseAppCheckTokens;
+    }
+
+    /** Builds a new {@link com.google.firebase.functions.HttpsCallableOptions}. */
+    @NonNull
+    public HttpsCallableOptions build() {
+      return new HttpsCallableOptions(limitedUseAppCheckTokens);
+    }
+  }
+}
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableReference.java b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableReference.java
index d212775200f..8957a9aa1bd 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableReference.java
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableReference.java
@@ -17,6 +17,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.Task;
+import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
 /** A reference to a particular Callable HTTPS trigger in Cloud Functions. */
@@ -26,15 +27,30 @@ public class HttpsCallableReference {
   private final FirebaseFunctions functionsClient;
 
   // The name of the HTTPS endpoint this reference refers to.
+  // Is null if url is set.
   private final String name;
 
+  // The url of the HTTPS endpoint this reference refers to.
+  // Is null if name is set.
+  private final URL url;
+
   // Options for how to do the HTTPS call.
-  HttpsCallOptions options = new HttpsCallOptions();
+  final HttpsCallOptions options;
 
   /** Creates a new reference with the given options. */
-  HttpsCallableReference(FirebaseFunctions functionsClient, String name) {
+  HttpsCallableReference(FirebaseFunctions functionsClient, String name, HttpsCallOptions options) {
     this.functionsClient = functionsClient;
     this.name = name;
+    this.url = null;
+    this.options = options;
+  }
+
+  /** Creates a new reference with the given options. */
+  HttpsCallableReference(FirebaseFunctions functionsClient, URL url, HttpsCallOptions options) {
+    this.functionsClient = functionsClient;
+    this.name = null;
+    this.url = url;
+    this.options = options;
   }
 
   /**
@@ -80,7 +96,11 @@ public class HttpsCallableReference {
    */
   @NonNull
   public Task<HttpsCallableResult> call(@Nullable Object data) {
-    return functionsClient.call(name, data, options);
+    if (name != null) {
+      return functionsClient.call(name, data, options);
+    } else {
+      return functionsClient.call(url, data, options);
+    }
   }
 
   /**
@@ -99,7 +119,11 @@ public Task<HttpsCallableResult> call(@Nullable Object data) {
    */
   @NonNull
   public Task<HttpsCallableResult> call() {
-    return functionsClient.call(name, null, options);
+    if (name != null) {
+      return functionsClient.call(name, null, options);
+    } else {
+      return functionsClient.call(url, null, options);
+    }
   }
 
   /**
@@ -129,7 +153,7 @@ public long getTimeout() {
    */
   @NonNull
   public HttpsCallableReference withTimeout(long timeout, @NonNull TimeUnit units) {
-    HttpsCallableReference other = new HttpsCallableReference(functionsClient, name);
+    HttpsCallableReference other = new HttpsCallableReference(functionsClient, name, options);
     other.setTimeout(timeout, units);
     return other;
   }
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/Serializer.java b/firebase-functions/src/main/java/com/google/firebase/functions/Serializer.java
index ec880d92a2d..52201464b58 100644
--- a/firebase-functions/src/main/java/com/google/firebase/functions/Serializer.java
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/Serializer.java
@@ -38,7 +38,7 @@ class Serializer {
 
   private final DateFormat dateFormat;
 
-  public Serializer() {
+  Serializer() {
     // Encode Dates as UTC ISO 8601 strings.
     dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
     dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/ktx/Functions.kt b/firebase-functions/src/main/java/com/google/firebase/functions/ktx/Functions.kt
new file mode 100644
index 00000000000..c0a18428f29
--- /dev/null
+++ b/firebase-functions/src/main/java/com/google/firebase/functions/ktx/Functions.kt
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.functions.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.functions.FirebaseFunctions
+import com.google.firebase.functions.HttpsCallableOptions
+import com.google.firebase.functions.HttpsCallableReference
+import com.google.firebase.ktx.Firebase
+import java.net.URL
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseFunctions] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-functions-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.functions: FirebaseFunctions
+  get() = FirebaseFunctions.getInstance()
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseFunctions] instance of a given [regionOrCustomDomain].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-functions-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.functions(regionOrCustomDomain: String): FirebaseFunctions =
+  FirebaseFunctions.getInstance(regionOrCustomDomain)
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseFunctions] instance of a given [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-functions-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.functions(app: FirebaseApp): FirebaseFunctions = FirebaseFunctions.getInstance(app)
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseFunctions] instance of a given [FirebaseApp] and [regionOrCustomDomain].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-functions-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.functions(app: FirebaseApp, regionOrCustomDomain: String): FirebaseFunctions =
+  FirebaseFunctions.getInstance(app, regionOrCustomDomain)
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-functions-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+@Keep
+class FirebaseFunctionsKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
+
+/**
+ * Returns a reference to the Callable HTTPS trigger with the given name and call options.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-functions-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun FirebaseFunctions.getHttpsCallable(
+  name: String,
+  init: HttpsCallableOptions.Builder.() -> Unit
+): HttpsCallableReference {
+  val builder = HttpsCallableOptions.Builder()
+  builder.init()
+  return getHttpsCallable(name, builder.build())
+}
+
+/**
+ * Returns a reference to the Callable HTTPS trigger with the given URL and call options.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-functions-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun FirebaseFunctions.getHttpsCallableFromUrl(
+  url: URL,
+  init: HttpsCallableOptions.Builder.() -> Unit
+): HttpsCallableReference {
+  val builder = HttpsCallableOptions.Builder()
+  builder.init()
+  return getHttpsCallableFromUrl(url, builder.build())
+}
diff --git a/firebase-functions/src/test/java/com/google/firebase/functions/FunctionsTests.kt b/firebase-functions/src/test/java/com/google/firebase/functions/FunctionsTests.kt
new file mode 100644
index 00000000000..71428ab4660
--- /dev/null
+++ b/firebase-functions/src/test/java/com/google/firebase/functions/FunctionsTests.kt
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.functions
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import java.net.URL
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class FunctionsTests : BaseTestCase() {
+
+  @Test
+  fun `functions should delegate to FirebaseFunctions#getInstance()`() {
+    assertThat(Firebase.functions).isSameInstanceAs(FirebaseFunctions.getInstance())
+  }
+
+  @Test
+  fun `FirebaseApp#functions should delegate to FirebaseFunctions#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.functions(app)).isSameInstanceAs(FirebaseFunctions.getInstance(app))
+  }
+
+  @Test
+  fun `Firebase#functions should delegate to FirebaseFunctions#getInstance(region)`() {
+    val region = "valid_region"
+    assertThat(Firebase.functions(region)).isSameInstanceAs(FirebaseFunctions.getInstance(region))
+  }
+
+  @Test
+  fun `Firebase#functions should delegate to FirebaseFunctions#getInstance(FirebaseApp, region)`() {
+    val app = Firebase.app(EXISTING_APP)
+    val region = "valid_region"
+    assertThat(Firebase.functions(app, region))
+      .isSameInstanceAs(FirebaseFunctions.getInstance(app, region))
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class AppCheckLimitedUseTest : BaseTestCase() {
+  @Test
+  fun `FirebaseFunctions#getHttpsCallable should not use limited-use tokens by default`() {
+    val callable = Firebase.functions.getHttpsCallable("function")
+    assertThat(callable.usesLimitedUseFacTokens()).isFalse()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallable should build callable with FAC settings (when true)`() {
+    val callable =
+      Firebase.functions.getHttpsCallable("function") { limitedUseAppCheckTokens = true }
+    assertThat(callable.usesLimitedUseFacTokens()).isTrue()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallable should build callable with FAC settings (when false)`() {
+    val callable =
+      Firebase.functions.getHttpsCallable("function") { limitedUseAppCheckTokens = false }
+    assertThat(callable.usesLimitedUseFacTokens()).isFalse()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallableFromUrl should not use limited-use tokens by default`() {
+    val callable = Firebase.functions.getHttpsCallableFromUrl(URL("https://functions.test"))
+    assertThat(callable.usesLimitedUseFacTokens()).isFalse()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallableFromUrl callable with FAC settings (when true)`() {
+    val callable =
+      Firebase.functions.getHttpsCallableFromUrl(URL("https://functions.test")) {
+        limitedUseAppCheckTokens = true
+      }
+    assertThat(callable.usesLimitedUseFacTokens()).isTrue()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallableFromUrl callable with FAC settings (when false)`() {
+    val callable =
+      Firebase.functions.getHttpsCallableFromUrl(URL("https://functions.test")) {
+        limitedUseAppCheckTokens = false
+      }
+    assertThat(callable.usesLimitedUseFacTokens()).isFalse()
+  }
+}
diff --git a/firebase-functions/src/test/java/com/google/firebase/functions/TestVisibilityUtil.kt b/firebase-functions/src/test/java/com/google/firebase/functions/TestVisibilityUtil.kt
new file mode 100644
index 00000000000..9a8be4b4f9c
--- /dev/null
+++ b/firebase-functions/src/test/java/com/google/firebase/functions/TestVisibilityUtil.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.functions
+
+/**
+ * Returns true if the {@link HttpsCallableReference} is configured to use FAC limited-use tokens.
+ */
+fun HttpsCallableReference.usesLimitedUseFacTokens() = options.getLimitedUseAppCheckTokens()
diff --git a/firebase-functions/src/test/java/com/google/firebase/functions/ktx/FunctionsTests.kt b/firebase-functions/src/test/java/com/google/firebase/functions/ktx/FunctionsTests.kt
new file mode 100644
index 00000000000..78a9fd8022d
--- /dev/null
+++ b/firebase-functions/src/test/java/com/google/firebase/functions/ktx/FunctionsTests.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.functions.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.functions.FirebaseFunctions
+import com.google.firebase.functions.usesLimitedUseFacTokens
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import java.net.URL
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class FunctionsTests : BaseTestCase() {
+
+  @Test
+  fun `functions should delegate to FirebaseFunctions#getInstance()`() {
+    assertThat(Firebase.functions).isSameInstanceAs(FirebaseFunctions.getInstance())
+  }
+
+  @Test
+  fun `FirebaseApp#functions should delegate to FirebaseFunctions#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.functions(app)).isSameInstanceAs(FirebaseFunctions.getInstance(app))
+  }
+
+  @Test
+  fun `Firebase#functions should delegate to FirebaseFunctions#getInstance(region)`() {
+    val region = "valid_region"
+    assertThat(Firebase.functions(region)).isSameInstanceAs(FirebaseFunctions.getInstance(region))
+  }
+
+  @Test
+  fun `Firebase#functions should delegate to FirebaseFunctions#getInstance(FirebaseApp, region)`() {
+    val app = Firebase.app(EXISTING_APP)
+    val region = "valid_region"
+    assertThat(Firebase.functions(app, region))
+      .isSameInstanceAs(FirebaseFunctions.getInstance(app, region))
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class AppCheckLimitedUseTest : BaseTestCase() {
+  @Test
+  fun `FirebaseFunctions#getHttpsCallable should not use limited-use tokens by default`() {
+    val callable = Firebase.functions.getHttpsCallable("function")
+    assertThat(callable.usesLimitedUseFacTokens()).isFalse()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallable should build callable with FAC settings (when true)`() {
+    val callable =
+      Firebase.functions.getHttpsCallable("function") { limitedUseAppCheckTokens = true }
+    assertThat(callable.usesLimitedUseFacTokens()).isTrue()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallable should build callable with FAC settings (when false)`() {
+    val callable =
+      Firebase.functions.getHttpsCallable("function") { limitedUseAppCheckTokens = false }
+    assertThat(callable.usesLimitedUseFacTokens()).isFalse()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallableFromUrl should not use limited-use tokens by default`() {
+    val callable = Firebase.functions.getHttpsCallableFromUrl(URL("https://functions.test"))
+    assertThat(callable.usesLimitedUseFacTokens()).isFalse()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallableFromUrl callable with FAC settings (when true)`() {
+    val callable =
+      Firebase.functions.getHttpsCallableFromUrl(URL("https://functions.test")) {
+        limitedUseAppCheckTokens = true
+      }
+    assertThat(callable.usesLimitedUseFacTokens()).isTrue()
+  }
+
+  @Test
+  fun `FirebaseFunctions#getHttpsCallableFromUrl callable with FAC settings (when false)`() {
+    val callable =
+      Firebase.functions.getHttpsCallableFromUrl(URL("https://functions.test")) {
+        limitedUseAppCheckTokens = false
+      }
+    assertThat(callable.usesLimitedUseFacTokens()).isFalse()
+  }
+}
diff --git a/firebase-inappmessaging-display/CHANGELOG.md b/firebase-inappmessaging-display/CHANGELOG.md
new file mode 100644
index 00000000000..8e37a383a13
--- /dev/null
+++ b/firebase-inappmessaging-display/CHANGELOG.md
@@ -0,0 +1,342 @@
+# Unreleased
+
+
+# 21.0.0
+* [fixed] Fixed bad token exception while showing FIAM
+  (GitHub [#5567](//github.com/firebase/firebase-android-sdk/issues/5567))
+  (GitHub [#5780](//github.com/firebase/firebase-android-sdk/issues/5780))
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.4.1
+* [fixed] Fixed FirebaseInAppMessagingDisplayErrorListener not being called
+  (GitHub [#5644](//github.com/firebase/firebase-android-sdk/issues/5644))
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.4.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-inappmessaging-display-ktx`
+  to `com.google.firebase:firebase-inappmessaging-display` under the `com.google.firebase.inappmessaging.display` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-inappmessaging-display-ktx` have been added to
+  `com.google.firebase:firebase-inappmessaging-display` under the `com.google.firebase.inappmessaging.display` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-inappmessaging-display-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.5
+* [fixed] Disabled `GradleMetadataPublishing` to fix breakage of the Kotlin extensions library. [#5337]
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.4
+* [changed] Updated internal logging backend.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.3
+* [unchanged] Updated internal Dagger dependency.
+
+# 20.3.2
+* [fixed] Fixed nullpointer crash when using experiments
+  (GitHub [#4716](//github.com/firebase/firebase-android-sdk/issues/4716){: .external})
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.1
+* [fixed] Fixed nullpointer crash
+  ([GitHub Issue #4214](//github.com/firebase/firebase-android-sdk/issues/4214))
+* [changed] Updated gRPC to 1.52.1, and updated JavaLite, protoc,
+  protobuf-java-util to 3.21.11.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.0
+* [changed] Migrated [inappmessaging] Display to use standard Firebase
+  executors.
+* [changed] Moved Task continuations off the main thread.
+* [feature] Added a new API for
+  [removing a dismiss listener](/docs/reference/android/com/google/firebase/inappmessaging/FirebaseInAppMessaging#removeDismissListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingDismissListener)).
+  (GitHub
+  [#4492](//github.com/firebase/firebase-android-sdk/issues/4492){: .external})
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.2.0
+* [fixed] Fixed a bug that prevented marking more than one message as
+  impressed.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+  `firebase-inappmessaging-display` library. The Kotlin extensions library has
+  the following additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-inappmessaging-display-ktx` as a transitive dependency, which
+  exposes the `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+
+# 20.1.3
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 20.1.2
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 20.1.1
+* [changed] Updated the gRPC dependency version.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 20.1.0
+* [changed] Migrated to Glide library for image downloading.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 20.0.0
+* [changed] Internal infrastructure improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.5
+* [fixed] Fixed `WindowManager$BadTokenException` when showing an in-app
+  message.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.4
+* [fixed] Fixed in-app message button click not working in Android 11
+  because of package visibility changes.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.3
+* [changed] Internal changes to maintain compatibility with other Firebase
+  SDKs.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.2
+* [changed] Internal changes to maintain compatibility with other Firebase
+  SDKs.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.1
+* [fixed] Improved link handling on devices without any browser installed
+  or without Chrome installed.
+* [feature] Added the ability to register a dismiss listener that reacts to
+  message dismissal.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.0
+* [changed] Updated the protocol buffer dependency to the newer
+  `protobuf-javalite` artifact. The new artifact is incompatible with the old
+  one, so this library needed to be upgraded to avoid conflicts.
+  No developer action is necessary.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.0.7
+* [fixed] Improved handling of activity transitions.
+  (GitHub [Issue #1410](//github.com/firebase/firebase-android-sdk/issues/1410)
+  and [Issue #1092](//github.com/firebase/firebase-android-sdk/issues/1092))
+* [changed] Migrated to use the [firebase_installations] service _directly_
+  instead of using an indirect dependency via the Firebase Instance ID SDK.
+
+  {% include "docs/reference/android/client/_includes/_iid-indirect-dependency-solutions.html" %}
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.0.6
+* [fixed] Fixed issue causing apps to become unresponsive in limited network
+  conditions. [GitHub Issue #1430](//github.com/firebase/firebase-android-sdk/issues/1430)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.0.5
+* [fixed] Fixed issue where campaigns with frequency limits were not properly
+  displaying multiple times.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.0.4
+* [fixed] Fixed issue with messages not being fetched on app first open.
+* [fixed] Fixed issue with first foreground trigger not being picked up.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.0.3
+* [changed] Internal changes to enable future SDK improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging-display` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.0.2
+* [changed] Updated version of Dagger to 2.24.
+* [fixed] Bug fixes to improve SDK stability.
+* [fixed] Fixed memory leak.
+
+
+## Kotlin
+* [feature] The beta release of a [inappmessaging] Display Android library
+  with Kotlin extensions is now available. The Kotlin extensions library
+  transitively includes the base `firebase-inappmessaging-display` library.
+  To learn more,  visit the
+  [[inappmessaging] Display KTX documentation](/docs/reference/kotlin/com/google/firebase/inappmessaging/display/ktx/package-summary).
+
+# 19.0.1
+* [changed] Internal changes to accommodate open-sourcing of the library and
+  to ensure functionality alignment with other SDK releases.
+
+# 19.0.0
+* [changed] Versioned to add nullability annotations to improve the Kotlin
+  developer experience. No other changes.
+
+# 18.0.2
+* [changed] Updated to support Picasso version 2.71828.
+* [fixed] Updated to send engagement metrics via [analytics].
+* [fixed] Fixed issue with callbacks triggering for Card templates.
+
+# 17.2.0
+* [feature] Adds support for card in-app messages.
+* [feature] Adds direct triggering (via [inappmessaging] SDK) of in-app
+  messages.
+
+# 17.1.1
+* [fixed] Fixed [firestore] and [inappmessaging] compatibility on Android
+  API level 19 (KitKat). The underlying issue was that [firestore] and
+  [cloud_functions] couldn't agree on which ciphers to use; this update fixes
+  this issue by overriding the set of ciphers that they use. Refer to
+  [GitHub issue 244](https://github.com/firebase/firebase-android-sdk/issues/244)
+  for more information.
+
+# 17.1.0
+* [feature] Adds functionality to programmatically register listeners for
+  updates on in-app engagement (for example, impression, click, display errors).   See
+  [`FirebaseInAppMessaging.addClickListener()`](/docs/reference/android/com/google/firebase/inappmessaging/FirebaseInAppMessaging.addClickListener())
+  for more details.
+
+# 17.0.5
+* [fixed] Users with restricted API keys can now use the SDK as expected.
+
+# 17.0.3
+* [fixed] Improved caching logic, added safeguards for cache expiration, and cleaned up API surface to prepare for open sourcing.
+
+# 17.0.1
+* [fixed] Fixed an issue where [fiam] and Firestore could not be included/built into the same app, because of an obfuscation collision.
+
+# 17.0.0
+* [feature] The initial public beta release of the Firebase In-App Messaging Display SDK for Android is now available. To learn more, see the [Firebase In-App Messaging documentation](/docs/in-app-messaging).
+
diff --git a/firebase-inappmessaging-display/api.txt b/firebase-inappmessaging-display/api.txt
index cc7a633d8a8..3d413271c9a 100644
--- a/firebase-inappmessaging-display/api.txt
+++ b/firebase-inappmessaging-display/api.txt
@@ -13,5 +13,17 @@ package com.google.firebase.inappmessaging.display {
     method public void onActivityStopped(android.app.Activity);
   }
 
+  public final class InAppMessagingDisplayKt {
+    method @NonNull public static com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay getInAppMessagingDisplay(@NonNull com.google.firebase.Firebase);
+  }
+
+}
+
+package com.google.firebase.inappmessaging.display.ktx {
+
+  public final class InAppMessagingDisplayKt {
+    method @Deprecated @NonNull public static com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay getInAppMessagingDisplay(@NonNull com.google.firebase.ktx.Firebase);
+  }
+
 }
 
diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
index 74f532ce5c3..738e381553c 100644
--- a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
+++ b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
@@ -14,17 +14,20 @@
 
 plugins {
     id 'firebase-library'
+    id("kotlin-android")
     id 'firebase-vendor'
 }
 
 firebaseLibrary {
+    libraryGroup "inappmessaging"
     testLab.enabled = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.inappmessaging.display"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         versionCode 1
         versionName version
@@ -40,12 +43,15 @@ android {
         disable "GradleCompatible"
     }
 
+    lint {
+        baseline = file("lint-baseline.xml")
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-        // Neccesary for Dagger
-        incremental = false
     }
+    kotlinOptions { jvmTarget = "1.8" }
 
     sourceSets {
         androidTest {
@@ -69,51 +75,64 @@ android {
 
 
 thirdPartyLicenses {
-    add 'Dagger', "file://${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-inappmessaging')
+    vendor (libs.dagger.dagger) {
+         exclude group: "javax.inject", module: "javax.inject"
+     }
 
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    api(project(":firebase-inappmessaging"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
+
+    implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.browser:browser:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.auto.value:auto-value-annotations:1.6.6'
-
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
-
-    vendor ('com.google.dagger:dagger:2.27') {
-        exclude group: "javax.inject", module: "javax.inject"
-    }
+    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    implementation 'com.google.auto.value:auto-value-annotations:1.6.6'
     implementation 'javax.inject:javax.inject:1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
-    annotationProcessor "com.google.dagger:dagger-compiler:2.27"
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
     annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
     annotationProcessor 'com.ryanharter.auto.value:auto-value-parcel:0.2.6'
+    annotationProcessor libs.dagger.compiler
 
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation ("com.google.firebase:firebase-analytics:17.0.0") {
+         exclude group: "com.google.firebase", module: "firebase-common"
+     }
+    testImplementation 'com.google.guava:guava:30.1-android'
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation "com.google.truth:truth:1.0"
     testImplementation "junit:junit:4.12"
+    testImplementation 'junit:junit:4.12'
     testImplementation "org.mockito:mockito-core:2.25.0"
-    testImplementation "com.google.truth:truth:1.0"
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'com.google.guava:guava:30.1-android'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 
-    androidTestImplementation "org.mockito:mockito-core:2.25.0"
-    androidTestImplementation "com.google.dexmaker:dexmaker:1.2"
-    androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:2.25.0"
+    androidTestImplementation(project(":integ-testing")){
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    androidTestImplementation "androidx.annotation:annotation:1.0.0"
     androidTestImplementation 'androidx.annotation:annotation:1.1.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
+    androidTestImplementation "com.google.dexmaker:dexmaker:1.2"
     androidTestImplementation ("com.google.firebase:firebase-analytics:17.4.0") {
-        exclude group: "com.google.firebase", module: "firebase-common"
-        exclude group: "com.google.firebase", module: "firebase-components"
-        exclude group: "com.google.firebase", module: "firebase-installations-interop"
-        exclude group: "com.google.firebase", module: "firebase-installations"
-    }
+         exclude group: "com.google.firebase", module: "firebase-common"
+         exclude group: "com.google.firebase", module: "firebase-components"
+         exclude group: "com.google.firebase", module: "firebase-installations-interop"
+         exclude group: "com.google.firebase", module: "firebase-installations"
+     }
+    androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:2.28.1"
+    androidTestImplementation "org.mockito:mockito-core:2.25.0"
 }
diff --git a/firebase-inappmessaging-display/gradle.properties b/firebase-inappmessaging-display/gradle.properties
index 8212b1b0425..ec7468f8665 100644
--- a/firebase-inappmessaging-display/gradle.properties
+++ b/firebase-inappmessaging-display/gradle.properties
@@ -1,2 +1,2 @@
-version=20.1.2
-latestReleasedVersion=20.1.1
+version=21.0.1
+latestReleasedVersion=21.0.0
diff --git a/firebase-inappmessaging-display/ktx/api.txt b/firebase-inappmessaging-display/ktx/api.txt
index 7566b98cfbb..2357649b88d 100644
--- a/firebase-inappmessaging-display/ktx/api.txt
+++ b/firebase-inappmessaging-display/ktx/api.txt
@@ -1,9 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.inappmessaging.display.ktx {
 
-  public final class InAppMessagingDisplayKt {
-    ctor public InAppMessagingDisplayKt();
-    method @NonNull public static com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay getInAppMessagingDisplay(@NonNull com.google.firebase.ktx.Firebase);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-inappmessaging-display/ktx/ktx.gradle b/firebase-inappmessaging-display/ktx/ktx.gradle
index 6f20559665b..6e63c75039a 100644
--- a/firebase-inappmessaging-display/ktx/ktx.gradle
+++ b/firebase-inappmessaging-display/ktx/ktx.gradle
@@ -14,19 +14,21 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-inappmessaging-display')
-    publishJavadoc = true
+    libraryGroup "inappmessaging"
+    publishJavadoc = false
+    publishReleaseNotes = false
     publishSources = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.inappmessaging.display.ktx"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
@@ -38,26 +40,25 @@ android {
             srcDir 'src/test/kotlin'
         }
     }
-
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api(project(":firebase-inappmessaging"))
+    api(project(":firebase-inappmessaging-display"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
 
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-inappmessaging')
-    implementation project(':firebase-inappmessaging:ktx')
-    implementation project(':firebase-inappmessaging-display')
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation("com.google.firebase:firebase-components:18.0.0")
 
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation ("com.google.firebase:firebase-analytics:17.0.0") {
-        exclude group: "com.google.firebase", module: "firebase-common"
-    }
-    testImplementation 'androidx.test:core:1.2.0'
+         exclude group: "com.google.firebase", module: "firebase-common"
+     }
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
diff --git a/firebase-inappmessaging-display/ktx/src/main/AndroidManifest.xml b/firebase-inappmessaging-display/ktx/src/main/AndroidManifest.xml
index 4cc54279e7a..1e87b15152b 100644
--- a/firebase-inappmessaging-display/ktx/src/main/AndroidManifest.xml
+++ b/firebase-inappmessaging-display/ktx/src/main/AndroidManifest.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.inappmessaging.display.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.inappmessaging.display.ktx.FirebaseInAppMessagingDisplayKtxRegistrar"
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.inappmessaging.display.ktx.FirebaseInappmessagingDisplayLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
diff --git a/firebase-inappmessaging-display/ktx/src/main/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplay.kt b/firebase-inappmessaging-display/ktx/src/main/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplay.kt
deleted file mode 100644
index e5aa56d7642..00000000000
--- a/firebase-inappmessaging-display/ktx/src/main/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplay.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.inappmessaging.display.ktx
-
-import androidx.annotation.Keep
-import com.google.firebase.FirebaseApp
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.platforminfo.LibraryVersionComponent
-
-/** Returns the [FirebaseInAppMessagingDisplay] instance of the default [FirebaseApp]. */
-val Firebase.inAppMessagingDisplay: FirebaseInAppMessagingDisplay
-    get() = FirebaseInAppMessagingDisplay.getInstance()
-
-internal const val LIBRARY_NAME: String = "fire-iamd-ktx"
-
-/** @suppress */
-@Keep
-class FirebaseInAppMessagingDisplayKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-inappmessaging-display/ktx/src/main/kotlin/com/google/firebase/inappmessaging/display/ktx/Logging.kt b/firebase-inappmessaging-display/ktx/src/main/kotlin/com/google/firebase/inappmessaging/display/ktx/Logging.kt
new file mode 100644
index 00000000000..df3354bc713
--- /dev/null
+++ b/firebase-inappmessaging-display/ktx/src/main/kotlin/com/google/firebase/inappmessaging/display/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.inappmessaging.display.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.inappmessaging.display.BuildConfig
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-iamd-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseInappmessagingDisplayLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-inappmessaging-display/ktx/src/test/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplayTests.kt b/firebase-inappmessaging-display/ktx/src/test/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplayTests.kt
index 51469b1fabd..ce14d51baed 100644
--- a/firebase-inappmessaging-display/ktx/src/test/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplayTests.kt
+++ b/firebase-inappmessaging-display/ktx/src/test/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplayTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.inappmessaging.display.ktx
 
@@ -36,48 +38,49 @@ internal val API_KEY = "ABC" + UUID.randomUUID().toString()
 const val EXISTING_APP = "existing"
 
 abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
 
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build(),
-                EXISTING_APP
-        )
-    }
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
 
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class InAppMessagingDisplayTests : BaseTestCase() {
 
-    @Test
-    fun `inAppMessagingDisplay should delegate to FirebaseInAppMessagingDisplay#getInstance()`() {
-        assertThat(Firebase.inAppMessagingDisplay).isSameInstanceAs(FirebaseInAppMessagingDisplay.getInstance())
-    }
+  @Test
+  fun `inAppMessagingDisplay should delegate to FirebaseInAppMessagingDisplay#getInstance()`() {
+    assertThat(Firebase.inAppMessagingDisplay)
+      .isSameInstanceAs(FirebaseInAppMessagingDisplay.getInstance())
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun `library version should be registered with runtime`() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
 }
diff --git a/firebase-inappmessaging-display/lint-baseline.xml b/firebase-inappmessaging-display/lint-baseline.xml
new file mode 100644
index 00000000000..f8cff6e402d
--- /dev/null
+++ b/firebase-inappmessaging-display/lint-baseline.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 7.4.2" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.2)" variant="all" version="7.4.2">
+
+    <issue
+        id="CheckResult"
+        message="The result of `placeholder` is not used"
+        errorLine1="      requestBuilder.placeholder(placeholderResId);"
+        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/google/firebase/inappmessaging/display/internal/FiamImageLoader.java"
+            line="95"
+            column="7"/>
+    </issue>
+
+    <issue
+        id="WrongConstant"
+        message="Must be one or more of: Gravity.FILL, Gravity.FILL_HORIZONTAL, Gravity.FILL_VERTICAL, Gravity.START, Gravity.END, Gravity.LEFT, Gravity.RIGHT, Gravity.TOP, Gravity.BOTTOM, Gravity.CENTER, Gravity.CENTER_HORIZONTAL, Gravity.CENTER_VERTICAL, Gravity.DISPLAY_CLIP_HORIZONTAL, Gravity.DISPLAY_CLIP_VERTICAL, Gravity.CLIP_HORIZONTAL, Gravity.CLIP_VERTICAL, Gravity.NO_GRAVITY"
+        errorLine1="    layoutParams.gravity = layoutConfig.viewWindowGravity();"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/google/firebase/inappmessaging/display/internal/FiamWindowManager.java"
+            line="120"
+            column="28"/>
+    </issue>
+
+    <issue
+        id="InflateParams"
+        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
+        errorLine1="    View root = inflater.inflate(R.layout.banner, null);"
+        errorLine2="                                                  ~~~~">
+        <location
+            file="src/main/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/BannerBindingWrapper.java"
+            line="67"
+            column="51"/>
+    </issue>
+
+    <issue
+        id="InflateParams"
+        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
+        errorLine1="    View root = inflater.inflate(R.layout.card, null);"
+        errorLine2="                                                ~~~~">
+        <location
+            file="src/main/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/CardBindingWrapper.java"
+            line="72"
+            column="49"/>
+    </issue>
+
+    <issue
+        id="InflateParams"
+        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
+        errorLine1="    View v = inflater.inflate(R.layout.image, null);"
+        errorLine2="                                              ~~~~">
+        <location
+            file="src/main/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/ImageBindingWrapper.java"
+            line="65"
+            column="47"/>
+    </issue>
+
+    <issue
+        id="InflateParams"
+        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
+        errorLine1="    View root = inflater.inflate(R.layout.modal, null);"
+        errorLine2="                                                 ~~~~">
+        <location
+            file="src/main/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/ModalBindingWrapper.java"
+            line="72"
+            column="50"/>
+    </issue>
+
+    <issue
+        id="DisableBaselineAlignment"
+        message="Set `android:baselineAligned=&quot;false&quot;` on this element for better performance"
+        errorLine1="    &lt;LinearLayout"
+        errorLine2="     ~~~~~~~~~~~~">
+        <location
+            file="src/main/res/layout/banner.xml"
+            line="12"
+            column="6"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.placeholder_50_50` appears to be unused">
+        <location
+            file="src/debug/res/drawable-mdpi/placeholder_50_50.png"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.card_content_descriptor` appears to be unused"
+        errorLine1="  &lt;string name=&quot;card_content_descriptor&quot;>card&lt;/string>"
+        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/values/strings.xml"
+            line="3"
+            column="11"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="     ~~~~~~~~~">
+        <location
+            file="src/main/res/layout-land/card_landscape_inner.xml"
+            line="16"
+            column="6"/>
+    </issue>
+
+    <issue
+        id="ContentDescription"
+        message="Missing `contentDescription` attribute on image"
+        errorLine1="    &lt;ImageView"
+        errorLine2="     ~~~~~~~~~">
+        <location
+            file="src/main/res/layout/card_portrait_inner.xml"
+            line="14"
+            column="6"/>
+    </issue>
+
+    <issue
+        id="RtlEnabled"
+        message="The project references RTL attributes, but does not explicitly enable or disable RTL support with `android:supportsRtl` in the manifest">
+        <location
+            file="src/main/AndroidManifest.xml"/>
+    </issue>
+
+    <issue
+        id="IgnoreWithoutReason"
+        message="Test is ignored without giving any explanation"
+        errorLine1="  @Ignore"
+        errorLine2="  ~~~~~~~">
+        <location
+            file="src/test/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayTest.java"
+            line="366"
+            column="3"/>
+    </issue>
+
+</issues>
diff --git a/firebase-inappmessaging-display/src/androidTest/AndroidManifest.xml b/firebase-inappmessaging-display/src/androidTest/AndroidManifest.xml
index 8fc42cf9d71..e7a497cf0b0 100644
--- a/firebase-inappmessaging-display/src/androidTest/AndroidManifest.xml
+++ b/firebase-inappmessaging-display/src/androidTest/AndroidManifest.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.inappmessaging.display.internal.bindingwrappers">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application>
     <uses-library android:name="android.test.runner"/>
-    <activity android:name=".TestActivity">
+    <activity android:name=".TestActivity" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
   </application>
-
-  <instrumentation
-      android:name="androidx.test.runner.AndroidJUnitRunner"
-      android:targetPackage="com.google.firebase.inappmessaging.display.internal.bindingwrappers">
-  </instrumentation>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/StrictModeTest.java b/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/StrictModeTest.java
new file mode 100644
index 00000000000..ed17365f04c
--- /dev/null
+++ b/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/StrictModeTest.java
@@ -0,0 +1,47 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.inappmessaging.display;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions.Builder;
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplay;
+import com.google.firebase.testing.integ.StrictModeRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class StrictModeTest {
+
+  @Rule public StrictModeRule strictMode = new StrictModeRule();
+
+  @Test
+  public void initializingFirebaseInAppMessagingDisplay_shouldNotViolateStrictMode() {
+    FirebaseApp app =
+        FirebaseApp.initializeApp(
+            ApplicationProvider.getApplicationContext(),
+            new Builder().setApiKey("api").setProjectId("123").setApplicationId("appId").build(),
+            "hello");
+    // Don't check for violations in other erroring components
+    app.get(FirebaseInstanceId.class);
+    strictMode.runOnMainThread(
+        () -> {
+          app.get(FirebaseInAppMessagingDisplay.class);
+        });
+  }
+}
diff --git a/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/BannerBindingWrapperTest.java b/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/BannerBindingWrapperTest.java
index 817c272d273..c2c4fd9d7de 100644
--- a/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/BannerBindingWrapperTest.java
+++ b/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/BannerBindingWrapperTest.java
@@ -27,6 +27,7 @@
 import androidx.test.runner.AndroidJUnit4;
 import com.google.firebase.inappmessaging.display.internal.InAppMessageLayoutConfig;
 import com.google.firebase.inappmessaging.display.internal.injection.modules.InflaterConfigModule;
+import com.google.firebase.inappmessaging.display.test.TestActivity;
 import com.google.firebase.inappmessaging.model.Action;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/CardBindingWrapperTest.java b/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/CardBindingWrapperTest.java
index 859f6335ac4..c8da825f3ff 100644
--- a/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/CardBindingWrapperTest.java
+++ b/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/CardBindingWrapperTest.java
@@ -35,6 +35,7 @@
 import androidx.test.runner.AndroidJUnit4;
 import com.google.firebase.inappmessaging.display.internal.InAppMessageLayoutConfig;
 import com.google.firebase.inappmessaging.display.internal.injection.modules.InflaterConfigModule;
+import com.google.firebase.inappmessaging.display.test.TestActivity;
 import com.google.firebase.inappmessaging.model.Action;
 import com.google.firebase.inappmessaging.model.CardMessage;
 import java.util.HashMap;
diff --git a/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/ImageBindingWrapperTest.java b/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/ImageBindingWrapperTest.java
index 0c9b5da65dc..3fa9e23f9d5 100644
--- a/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/ImageBindingWrapperTest.java
+++ b/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/ImageBindingWrapperTest.java
@@ -27,6 +27,7 @@
 import androidx.test.runner.AndroidJUnit4;
 import com.google.firebase.inappmessaging.display.internal.InAppMessageLayoutConfig;
 import com.google.firebase.inappmessaging.display.internal.injection.modules.InflaterConfigModule;
+import com.google.firebase.inappmessaging.display.test.TestActivity;
 import com.google.firebase.inappmessaging.model.Action;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/ModalBindingWrapperTest.java b/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/ModalBindingWrapperTest.java
index 8acfa8bf11c..2602971d0ff 100644
--- a/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/ModalBindingWrapperTest.java
+++ b/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/ModalBindingWrapperTest.java
@@ -34,6 +34,7 @@
 import androidx.test.runner.AndroidJUnit4;
 import com.google.firebase.inappmessaging.display.internal.InAppMessageLayoutConfig;
 import com.google.firebase.inappmessaging.display.internal.injection.modules.InflaterConfigModule;
+import com.google.firebase.inappmessaging.display.test.TestActivity;
 import com.google.firebase.inappmessaging.model.Action;
 import com.google.firebase.inappmessaging.model.ModalMessage;
 import java.util.HashMap;
diff --git a/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/TestActivity.java b/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/test/TestActivity.java
similarity index 89%
rename from firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/TestActivity.java
rename to firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/test/TestActivity.java
index 93b5c129ab1..8821e59ccf3 100644
--- a/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/TestActivity.java
+++ b/firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/test/TestActivity.java
@@ -11,8 +11,7 @@
 // WITHOUT 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 com.google.firebase.inappmessaging.display.internal.bindingwrappers;
+package com.google.firebase.inappmessaging.display.test;
 
 import android.app.Activity;
 
diff --git a/firebase-inappmessaging-display/src/main/AndroidManifest.xml b/firebase-inappmessaging-display/src/main/AndroidManifest.xml
index 0fecc085acf..97c88dd0ffd 100644
--- a/firebase-inappmessaging-display/src/main/AndroidManifest.xml
+++ b/firebase-inappmessaging-display/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.inappmessaging.display">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.INTERNET" />
@@ -13,10 +12,10 @@
 
   <application>
     <service android:name="com.google.firebase.components.ComponentDiscoveryService"
-        android:exported="false">
+        android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplayKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
       <meta-data android:name="com.google.firebase.components:com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplayRegistrar"
           android:value="com.google.firebase.components.ComponentRegistrar" />
     </service>
   </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplay.java b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplay.java
index bb70eef12fb..80d61973a91 100644
--- a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplay.java
+++ b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplay.java
@@ -40,6 +40,7 @@
 import com.google.firebase.inappmessaging.display.internal.FiamImageLoader;
 import com.google.firebase.inappmessaging.display.internal.FiamWindowManager;
 import com.google.firebase.inappmessaging.display.internal.FirebaseInAppMessagingDisplayImpl;
+import com.google.firebase.inappmessaging.display.internal.GlideErrorListener;
 import com.google.firebase.inappmessaging.display.internal.InAppMessageLayoutConfig;
 import com.google.firebase.inappmessaging.display.internal.Logging;
 import com.google.firebase.inappmessaging.display.internal.RenewableTimer;
@@ -144,9 +145,18 @@ public void testMessage(
       Activity activity,
       InAppMessage inAppMessage,
       FirebaseInAppMessagingDisplayCallbacks callbacks) {
+    setInAppMessageAndCallbacks(inAppMessage, callbacks);
+    showActiveFiam(activity);
+  }
+
+  private void setInAppMessageAndCallbacks(
+      InAppMessage inAppMessage, FirebaseInAppMessagingDisplayCallbacks callbacks) {
     this.inAppMessage = inAppMessage;
     this.callbacks = callbacks;
-    showActiveFiam(activity);
+  }
+
+  private void clearInAppMessageAndCallbacks() {
+    setInAppMessageAndCallbacks(null, null);
   }
 
   /**
@@ -204,8 +214,7 @@ private void bindFiamToActivity(Activity activity) {
               Logging.logd("Active FIAM exists. Skipping trigger");
               return;
             }
-            inAppMessage = iam;
-            callbacks = cb;
+            setInAppMessageAndCallbacks(iam, cb);
             showActiveFiam(activity);
           });
       // set the current activity to be the one passed in so that we know not to bind again to the
@@ -224,7 +233,6 @@ private void unbindFiamFromActivity(Activity activity) {
         && currentlyBoundActivityName.equals(activity.getLocalClassName())) {
       Logging.logi("Unbinding from activity: " + activity.getLocalClassName());
       headlessInAppMessaging.clearDisplayListener();
-      imageLoader.cancelTag(activity.getClass());
       removeDisplayedFiam(activity);
       currentlyBoundActivityName = null;
     }
@@ -293,6 +301,12 @@ public void run() {
   // it is safe to ignore this warning
   @SuppressLint("ClickableViewAccessibility")
   private void inflateBinding(final Activity activity, final BindingWrapper bindingWrapper) {
+    if (inAppMessage == null) {
+      // inAppMessage could get null because of race conditions from prior inapp message timers. So
+      // adding a safety null check. See b/269599986
+      return;
+    }
+
     // On click listener when X button or collapse button is clicked
     final View.OnClickListener dismissListener =
         new View.OnClickListener() {
@@ -324,8 +338,7 @@ public void onClick(View v) {
                 // Ensure that we remove the displayed FIAM, and ensure that on re-load, the message
                 // isn't re-displayed
                 removeDisplayedFiam(activity);
-                inAppMessage = null;
-                callbacks = null;
+                clearInAppMessageAndCallbacks();
               }
             };
       } else {
@@ -427,8 +440,7 @@ public void onError(Exception e) {
                   .removeGlobalOnLayoutListener(layoutListener);
             }
             cancelTimers(); // Not strictly necessary.
-            inAppMessage = null;
-            callbacks = null;
+            clearInAppMessageAndCallbacks();
           }
         });
   }
@@ -487,6 +499,7 @@ private void loadNullableImage(
     if (isValidImageData(imageData)) {
       imageLoader
           .load(imageData.getImageUrl())
+          .addErrorListener(new GlideErrorListener(inAppMessage, callbacks))
           .tag(activity.getClass())
           .placeholder(R.drawable.image_placeholder)
           .into(fiam.getImageView(), callback);
@@ -501,12 +514,12 @@ private void dismissFiam(Activity activity) {
     Logging.logd("Dismissing fiam");
     notifyFiamDismiss();
     removeDisplayedFiam(activity);
-    inAppMessage = null;
-    callbacks = null;
+    clearInAppMessageAndCallbacks();
   }
 
   private void removeDisplayedFiam(Activity activity) {
     if (windowManager.isFiamDisplayed()) {
+      imageLoader.cancelTag(activity.getClass());
       windowManager.destroy(activity);
       cancelTimers();
     }
diff --git a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayRegistrar.java b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayRegistrar.java
index afae9afa942..68658e69c38 100644
--- a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayRegistrar.java
+++ b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayRegistrar.java
@@ -39,17 +39,20 @@
  */
 @Keep
 public class FirebaseInAppMessagingDisplayRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-fiamd";
+
   @Override
   @Keep
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(FirebaseInAppMessagingDisplay.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(FirebaseInAppMessaging.class))
             .factory(this::buildFirebaseInAppMessagingUI)
             .eagerInDefaultApp()
             .build(),
-        LibraryVersionComponent.create("fire-fiamd", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 
   private FirebaseInAppMessagingDisplay buildFirebaseInAppMessagingUI(
diff --git a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/InAppMessagingDisplay.kt b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/InAppMessagingDisplay.kt
new file mode 100644
index 00000000000..b5e7d4314a3
--- /dev/null
+++ b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/InAppMessagingDisplay.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.inappmessaging.display
+
+import androidx.annotation.Keep
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+
+/** Returns the [FirebaseInAppMessagingDisplay] instance of the default [FirebaseApp]. */
+val Firebase.inAppMessagingDisplay: FirebaseInAppMessagingDisplay
+  get() = FirebaseInAppMessagingDisplay.getInstance()
+
+/** @suppress */
+@Keep
+class FirebaseInAppMessagingDisplayKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/FiamImageLoader.java b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/FiamImageLoader.java
index b19826b1345..c140ab741b0 100644
--- a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/FiamImageLoader.java
+++ b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/FiamImageLoader.java
@@ -97,6 +97,11 @@ public FiamImageRequestCreator placeholder(int placeholderResId) {
       return this;
     }
 
+    public FiamImageRequestCreator addErrorListener(GlideErrorListener glideErrorListener) {
+      requestBuilder.addListener(glideErrorListener);
+      return this;
+    }
+
     public FiamImageRequestCreator tag(Class c) {
       tag = c.getSimpleName();
       checkAndTag();
diff --git a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/FiamWindowManager.java b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/FiamWindowManager.java
index e382fc870e1..c212dab039b 100644
--- a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/FiamWindowManager.java
+++ b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/FiamWindowManager.java
@@ -54,7 +54,8 @@ public void show(@NonNull final BindingWrapper bindingWrapper, @NonNull Activity
       return;
     }
 
-    if (activity.isFinishing()) {
+    if (activity.isFinishing()
+        || Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed()) {
       Logging.loge("Activity is finishing or does not have valid window token. Cannot show FIAM.");
       return;
     }
diff --git a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/GlideErrorListener.java b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/GlideErrorListener.java
index d434da5ce29..ff52e49cc61 100644
--- a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/GlideErrorListener.java
+++ b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/GlideErrorListener.java
@@ -14,32 +14,20 @@
 
 package com.google.firebase.inappmessaging.display.internal;
 
-// Picasso 's api forces us to listen to errors only using a global listener set on the picasso
-// singleton. Since we initialize picasso from a static context and the in app message param to the
-// logError method is not available statically, we are forced to introduce a error listener with
-// mutable state so that the error from picasso can be translated to a logError on
-// fiam headless, with the in app message as a parameter
-
+import android.graphics.drawable.Drawable;
 import androidx.annotation.Nullable;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
 import com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks;
-import com.google.firebase.inappmessaging.display.internal.injection.scopes.FirebaseAppScope;
 import com.google.firebase.inappmessaging.model.InAppMessage;
-import javax.inject.Inject;
-
-/** @hide */
-@FirebaseAppScope
-public class GlideErrorListener implements RequestListener<Object> {
-  private InAppMessage inAppMessage;
-  private FirebaseInAppMessagingDisplayCallbacks displayCallbacks;
 
-  @Inject
-  GlideErrorListener() {}
+public class GlideErrorListener implements RequestListener<Drawable> {
+  private final InAppMessage inAppMessage;
+  private final FirebaseInAppMessagingDisplayCallbacks displayCallbacks;
 
-  public void setInAppMessage(
+  public GlideErrorListener(
       InAppMessage inAppMessage, FirebaseInAppMessagingDisplayCallbacks displayCallbacks) {
     this.inAppMessage = inAppMessage;
     this.displayCallbacks = displayCallbacks;
@@ -47,7 +35,7 @@ public void setInAppMessage(
 
   @Override
   public boolean onLoadFailed(
-      @Nullable GlideException e, Object model, Target<Object> target, boolean isFirstResource) {
+      @Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
     Logging.logd("Image Downloading  Error : " + e.getMessage() + ":" + e.getCause());
 
     if (inAppMessage != null && displayCallbacks != null) {
@@ -67,9 +55,9 @@ public boolean onLoadFailed(
 
   @Override
   public boolean onResourceReady(
-      Object resource,
+      Drawable resource,
       Object model,
-      Target<Object> target,
+      Target<Drawable> target,
       DataSource dataSource,
       boolean isFirstResource) {
     Logging.logd("Image Downloading  Success : " + resource);
diff --git a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/injection/components/AppComponent.java b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/injection/components/AppComponent.java
index 7849548af8d..37170e5f51e 100644
--- a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/injection/components/AppComponent.java
+++ b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/injection/components/AppComponent.java
@@ -16,7 +16,6 @@
 
 import com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay;
 import com.google.firebase.inappmessaging.display.internal.FiamImageLoader;
-import com.google.firebase.inappmessaging.display.internal.GlideErrorListener;
 import com.google.firebase.inappmessaging.display.internal.injection.modules.GlideModule;
 import com.google.firebase.inappmessaging.display.internal.injection.modules.HeadlessInAppMessagingModule;
 import com.google.firebase.inappmessaging.display.internal.injection.scopes.FirebaseAppScope;
@@ -31,7 +30,5 @@ public interface AppComponent {
   @FirebaseAppScope
   FirebaseInAppMessagingDisplay providesFirebaseInAppMessagingUI();
 
-  GlideErrorListener glideErrorListener();
-
   FiamImageLoader fiamImageLoader();
 }
diff --git a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/injection/modules/GlideModule.java b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/injection/modules/GlideModule.java
index 1cb1145816a..48c1d55d6c7 100644
--- a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/injection/modules/GlideModule.java
+++ b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/internal/injection/modules/GlideModule.java
@@ -17,7 +17,6 @@
 import android.app.Application;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.RequestManager;
-import com.google.firebase.inappmessaging.display.internal.GlideErrorListener;
 import com.google.firebase.inappmessaging.display.internal.injection.scopes.FirebaseAppScope;
 import dagger.Module;
 import dagger.Provides;
@@ -27,8 +26,7 @@
 public class GlideModule {
   @Provides
   @FirebaseAppScope
-  RequestManager providesGlideRequestManager(
-      Application application, GlideErrorListener glideErrorListener) {
-    return Glide.with(application).addDefaultRequestListener(glideErrorListener);
+  RequestManager providesGlideRequestManager(Application application) {
+    return Glide.with(application);
   }
 }
diff --git a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplay.kt b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplay.kt
new file mode 100644
index 00000000000..1abec0f0aa7
--- /dev/null
+++ b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplay.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.inappmessaging.display.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay
+import com.google.firebase.ktx.Firebase
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseInAppMessagingDisplay] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-inappmessaging-display-ktx` are now deprecated. As early as April
+ * 2024, we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.inAppMessagingDisplay: FirebaseInAppMessagingDisplay
+  get() = FirebaseInAppMessagingDisplay.getInstance()
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-inappmessaging-display-ktx` are now deprecated. As early as April
+ * 2024, we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+@Keep
+class FirebaseInAppMessagingDisplayKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-inappmessaging-display/src/main/res/drawable-anydpi-v21/btn_clear.xml b/firebase-inappmessaging-display/src/main/res/drawable-anydpi-v21/btn_clear.xml
deleted file mode 100644
index 38a9a1afaa4..00000000000
--- a/firebase-inappmessaging-display/src/main/res/drawable-anydpi-v21/btn_clear.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
-    android:width="24dp">
-
-  <path
-      android:fillColor="#ffffffff"
-      android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59
-19 19 17.59 13.41 12z"/>
-  <path
-      android:pathData="M0 0h24v24H0z"/>
-</vector>
\ No newline at end of file
diff --git a/firebase-inappmessaging-display/src/main/res/drawable-anydpi-v21/image_placeholder.xml b/firebase-inappmessaging-display/src/main/res/drawable-anydpi-v21/image_placeholder.xml
deleted file mode 100644
index a9049c8e5d1..00000000000
--- a/firebase-inappmessaging-display/src/main/res/drawable-anydpi-v21/image_placeholder.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
-    android:width="24dp">
-
-  <path
-      android:pathData="M0 0h24v24H0z"/>
-  <path
-      android:fillColor="#AAAAAA"
-      android:pathData="M21 19V5c0-1.1-0.9-2-2-2H5c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9
-2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z"/>
-</vector>
\ No newline at end of file
diff --git a/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayTest.java b/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayTest.java
index 25b1819ba0c..a4e8d722fce 100644
--- a/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayTest.java
+++ b/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayTest.java
@@ -26,6 +26,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.refEq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -61,6 +62,7 @@
 import com.google.firebase.inappmessaging.display.internal.FiamImageLoader;
 import com.google.firebase.inappmessaging.display.internal.FiamImageLoader.Callback;
 import com.google.firebase.inappmessaging.display.internal.FiamWindowManager;
+import com.google.firebase.inappmessaging.display.internal.GlideErrorListener;
 import com.google.firebase.inappmessaging.display.internal.InAppMessageLayoutConfig;
 import com.google.firebase.inappmessaging.display.internal.RenewableTimer;
 import com.google.firebase.inappmessaging.display.internal.bindingwrappers.BannerBindingWrapper;
@@ -87,11 +89,13 @@
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
 import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowPackageManager;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 21, qualifiers = "port")
+@LooperMode(LooperMode.Mode.LEGACY)
 public class FirebaseInAppMessagingDisplayTest {
 
   private com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay fiamUI;
@@ -247,6 +251,7 @@ public void onActivityPaused_clearsDisplayListener() {
   @Test
   public void onActivityPaused_clearsImageDownload() {
     resumeActivity(activity);
+    when(windowManager.isFiamDisplayed()).thenReturn(true);
     pauseActivity(activity);
 
     verify(imageLoader).cancelTag(activity.getClass());
@@ -416,6 +421,8 @@ public void streamListener_whenImageUrlExists_loadsImage() {
 
     verify(fiamImageRequestCreator).tag(TestActivity.class);
     verify(fiamImageRequestCreator).placeholder(R.drawable.image_placeholder);
+    verify(fiamImageRequestCreator)
+        .addErrorListener(refEq(new GlideErrorListener(IMAGE_MESSAGE_MODEL, callbacks)));
     verify(fiamImageRequestCreator).into(any(ImageView.class), any(Callback.class));
   }
 
@@ -425,6 +432,7 @@ public void streamListener_whenNoImageUrlExists_doesNotLoadImage() {
     listener.displayMessage(null, callbacks);
     verify(fiamImageRequestCreator, times(0)).tag(TestActivity.class);
     verify(fiamImageRequestCreator, times(0)).placeholder(R.drawable.image_placeholder);
+    verify(fiamImageRequestCreator, times(0)).addErrorListener(any(GlideErrorListener.class));
     verify(fiamImageRequestCreator, times(0)).into(any(ImageView.class), any(Callback.class));
   }
 
diff --git a/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/InAppMessagingDisplayTests.kt b/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/InAppMessagingDisplayTests.kt
new file mode 100644
index 00000000000..fa504c0be13
--- /dev/null
+++ b/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/InAppMessagingDisplayTests.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.inappmessaging.display
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import java.util.UUID
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+internal const val APP_ID = "APP:ID"
+internal val API_KEY = "ABC" + UUID.randomUUID().toString()
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class InAppMessagingDisplayTests : BaseTestCase() {
+
+  @Test
+  fun `inAppMessagingDisplay should delegate to FirebaseInAppMessagingDisplay#getInstance()`() {
+    assertThat(Firebase.inAppMessagingDisplay)
+      .isSameInstanceAs(FirebaseInAppMessagingDisplay.getInstance())
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/internal/FiamImageLoaderTest.java b/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/internal/FiamImageLoaderTest.java
index 73d4c3f4bc4..0567a1e65fe 100644
--- a/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/internal/FiamImageLoaderTest.java
+++ b/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/internal/FiamImageLoaderTest.java
@@ -64,6 +64,14 @@ public void placeholder_setsPlaceholderOnUnderlyingRequestCreator() {
     verify(requestBuilder).placeholder(1);
   }
 
+  @Test
+  public void addErrorListener_setsErrorListenerOnUnderlyingRequestCreator() {
+    FiamImageLoader.FiamImageRequestCreator fiamImageRequestCreator = imageLoader.load(IMAGE_URL);
+    GlideErrorListener errorListener = new GlideErrorListener(null, null);
+    fiamImageRequestCreator.addErrorListener(errorListener);
+    verify(requestBuilder).addListener(errorListener);
+  }
+
   @Test
   public void tag_tagsUnderlyingRequestCreator() {
     ImageView imageView = mock(ImageView.class);
diff --git a/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplayTests.kt b/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplayTests.kt
new file mode 100644
index 00000000000..d04f0e94892
--- /dev/null
+++ b/firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplayTests.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.inappmessaging.display.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import java.util.UUID
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+internal const val APP_ID = "APP:ID"
+internal val API_KEY = "ABC" + UUID.randomUUID().toString()
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class InAppMessagingDisplayTests : BaseTestCase() {
+
+  @Test
+  fun `inAppMessagingDisplay should delegate to FirebaseInAppMessagingDisplay#getInstance()`() {
+    assertThat(Firebase.inAppMessagingDisplay)
+      .isSameInstanceAs(FirebaseInAppMessagingDisplay.getInstance())
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-inappmessaging/CHANGELOG.md b/firebase-inappmessaging/CHANGELOG.md
new file mode 100644
index 00000000000..8a499333a5b
--- /dev/null
+++ b/firebase-inappmessaging/CHANGELOG.md
@@ -0,0 +1,340 @@
+# Unreleased
+
+
+# 21.0.0
+* [fixed] Fixed bad token exception while showing FIAM
+  (GitHub [#5567](//github.com/firebase/firebase-android-sdk/issues/5567))
+  (GitHub [#5780](//github.com/firebase/firebase-android-sdk/issues/5780))
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.4.1
+* [fixed] Fixed FirebaseInAppMessagingDisplayErrorListener not being called
+  (GitHub [#5644](//github.com/firebase/firebase-android-sdk/issues/5644))
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.4.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-inappmessaging-ktx`
+  to `com.google.firebase:firebase-inappmessaging` under the `com.google.firebase.inappmessaging` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-inappmessaging-ktx` have been added to
+  `com.google.firebase:firebase-inappmessaging` under the `com.google.firebase.inappmessaging` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-inappmessaging-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.5
+* [fixed] Disabled `GradleMetadataPublishing` to fix breakage of the Kotlin extensions library. [#5337]
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.4
+* [changed] Updated internal logging backend.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.3
+* [unchanged] Updated internal Dagger dependency.
+
+# 20.3.2
+* [fixed] Fixed nullpointer crash when using experiments
+  (GitHub [#4716](//github.com/firebase/firebase-android-sdk/issues/4716){: .external})
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.1
+* [fixed] Fixed nullpointer crash
+  ([GitHub Issue #4214](//github.com/firebase/firebase-android-sdk/issues/4214))
+* [changed] Updated gRPC to 1.52.1, and updated JavaLite, protoc,
+  protobuf-java-util to 3.21.11.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.0
+* [changed] Migrated [inappmessaging] to use standard Firebase executors.
+* [changed] Moved Task continuations off the main thread.
+* [feature] Added a new API for
+  [removing a dismiss listener](/docs/reference/android/com/google/firebase/inappmessaging/FirebaseInAppMessaging#removeDismissListener(com.google.firebase.inappmessaging.FirebaseInAppMessagingDismissListener)).
+  (GitHub
+  [#4492](//github.com/firebase/firebase-android-sdk/issues/4492){: .external})
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.2.0
+* [fixed] Fixed a bug that prevented marking more than one message as
+  impressed.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+  `firebase-inappmessaging` library. The Kotlin extensions library has the
+  following additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-inappmessaging-ktx` as a transitive dependency, which exposes
+  the `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+
+# 20.1.3
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 20.1.2
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 20.1.1
+* [changed] Updated the gRPC dependency version.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 20.1.0
+* [changed] Migrated to Glide library for image downloading.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 20.0.0
+* [changed] Internal infrastructure improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.5
+* [fixed] Fixed `WindowManager$BadTokenException` when showing an in-app
+  message.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.4
+* [fixed] Fixed in-app message button click not working in Android 11
+  because of package visibility changes.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.3
+* [changed] Internal changes to maintain compatibility with other Firebase
+  SDKs.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.2
+* [changed] Internal changes to maintain compatibility with other Firebase
+  SDKs.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.1
+* [fixed] Improved link handling on devices without any browser installed
+  or without Chrome installed.
+* [feature] Added the ability to register a dismiss listener that reacts to
+  message dismissal.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.1.0
+* [changed] Updated the protocol buffer dependency to the newer
+  `protobuf-javalite` artifact. The new artifact is incompatible with the old
+  one, so this library needed to be upgraded to avoid conflicts.
+  No developer action is necessary.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.0.7
+* [fixed] Improved handling of activity transitions.
+  (GitHub [Issue #1410](//github.com/firebase/firebase-android-sdk/issues/1410)
+  and [Issue #1092](//github.com/firebase/firebase-android-sdk/issues/1092))
+* [changed] Migrated to use the [firebase_installations] service _directly_
+  instead of using an indirect dependency via the Firebase Instance ID SDK.
+
+  {% include "docs/reference/android/client/_includes/_iid-indirect-dependency-solutions.html" %}
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.0.6
+* [fixed] Fixed issue causing apps to become unresponsive in limited network
+  conditions. [GitHub Issue #1430](//github.com/firebase/firebase-android-sdk/issues/1430)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.0.5
+* [fixed] Fixed issue where campaigns with frequency limits were not properly
+  displaying multiple times.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.0.4
+* [fixed] Fixed issue with messages not being fetched on app first open.
+* [fixed] Fixed issue with first foreground trigger not being picked up.
+* [changed] Internal migration to use the [firebase_installations] service.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.0.3
+* [changed] Internal changes to enable future SDK improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-inappmessaging` library. The Kotlin extensions library has no
+additional updates.
+
+# 19.0.2
+* [changed] Updated version of Dagger to 2.24.
+* [changed] Made info messages more clear in logcat.
+
+
+## Kotlin
+* [feature] The beta release of a [inappmessaging] Android library
+  with Kotlin extensions is now available. The Kotlin extensions library
+  transitively includes the base `firebase-inappmessaging`
+  library. To learn more,  visit the
+  [[inappmessaging] KTX documentation](/docs/reference/kotlin/com/google/firebase/inappmessaging/ktx/package-summary).
+
+# 19.0.1
+* [changed] Internal changes to accommodate open-sourcing of the library and
+  to ensure functionality alignment with other SDK releases.
+
+# 19.0.0
+* [changed] Versioned to add nullability annotations to improve the Kotlin
+  developer experience. No other changes.
+
+# 18.0.2
+* [fixed] Updated to send engagement metrics via [analytics].
+* [fixed] Fixed issue with callbacks triggering for Card templates.
+
+# 17.2.0
+* [feature] Adds support for card in-app messages.
+* [feature] Adds direct triggering (via [inappmessaging] SDK) of in-app
+  messages.
+
+# 17.1.1
+* [fixed] Fixed [firestore] and [inappmessaging] compatibility on Android
+  API level 19 (KitKat). The underlying issue was that [firestore] and
+  [cloud_functions] couldn't agree on which ciphers to use; this update fixes
+  this issue by overriding the set of ciphers that they use. Refer to
+  [GitHub issue 244](https://github.com/firebase/firebase-android-sdk/issues/244)
+  for more information.
+
+# 17.1.0
+* [feature] Adds functionality to programmatically register listeners for
+  updates on in-app engagement (for example, impression, click, display errors).
+  See
+  [`FirebaseInAppMessaging.addClickListener()`](/docs/reference/android/com/google/firebase/inappmessaging/FirebaseInAppMessaging.addClickListener())
+  for more details.
+
+# 17.0.5
+* [fixed] Users with restricted API keys can now use the SDK as expected.
+
+# 17.0.3
+* [fixed] Improved caching logic, added safeguards for cache expiration, and cleaned up API surface to prepare for open sourcing the [inappmessaging]-display SDK.
+
+# 17.0.1
+* [fixed] Fixed an issue where [fiam] and Firestore could not be included/built into the same app, because of an obfuscation collision.
+
+# 17.0.0
+* [feature] The initial public beta release of the Firebase In-App Messaging SDK for Android is now available. To learn more, see the [Firebase In-App Messaging documentation](/docs/in-app-messaging).
+
diff --git a/firebase-inappmessaging/api.txt b/firebase-inappmessaging/api.txt
index 55680d61aea..add30c0c53e 100644
--- a/firebase-inappmessaging/api.txt
+++ b/firebase-inappmessaging/api.txt
@@ -14,6 +14,7 @@ package com.google.firebase.inappmessaging {
     method @NonNull public static com.google.firebase.inappmessaging.FirebaseInAppMessaging getInstance();
     method public boolean isAutomaticDataCollectionEnabled();
     method public void removeClickListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener);
+    method public void removeDismissListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDismissListener);
     method public void removeDisplayErrorListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayErrorListener);
     method public void removeImpressionListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingImpressionListener);
     method public void setAutomaticDataCollectionEnabled(@Nullable Boolean);
@@ -69,6 +70,18 @@ package com.google.firebase.inappmessaging {
     method public void impressionDetected(@NonNull com.google.firebase.inappmessaging.model.InAppMessage);
   }
 
+  public final class InAppMessagingKt {
+    method @NonNull public static com.google.firebase.inappmessaging.FirebaseInAppMessaging getInAppMessaging(@NonNull com.google.firebase.Firebase);
+  }
+
+}
+
+package com.google.firebase.inappmessaging.ktx {
+
+  public final class InAppMessagingKt {
+    method @Deprecated @NonNull public static com.google.firebase.inappmessaging.FirebaseInAppMessaging getInAppMessaging(@NonNull com.google.firebase.ktx.Firebase);
+  }
+
 }
 
 package com.google.firebase.inappmessaging.model {
diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle
index 83776e0b24f..f9d00391494 100644
--- a/firebase-inappmessaging/firebase-inappmessaging.gradle
+++ b/firebase-inappmessaging/firebase-inappmessaging.gradle
@@ -14,11 +14,13 @@
 
 plugins {
     id 'firebase-library'
+    id("kotlin-android")
     id 'com.google.protobuf'
     id 'firebase-vendor'
 }
 
 firebaseLibrary {
+    libraryGroup "inappmessaging"
     testLab.enabled = true
 }
 
@@ -52,9 +54,10 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.inappmessaging"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-      minSdkVersion 16
+      minSdkVersion project.minSdkVersion
       targetSdkVersion project.targetSdkVersion
       multiDexEnabled true
       versionName version
@@ -85,9 +88,8 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-        // Neccesary for Dagger
-        incremental = false
     }
+    kotlinOptions { jvmTarget = "1.8" }
     testOptions {
         unitTests {
             includeAndroidResources = true
@@ -95,74 +97,82 @@ android {
     }
 }
 
-configurations.all {
-    if(it.name.contains('AndroidTestRuntimeClasspath')) {
-        it.resolutionStrategy {
-            force 'org.checkerframework:checker-compat-qual:2.5.5'
-            force 'com.google.guava:guava:30.1.1-android'
-        }
-    }
-}
-
 
 thirdPartyLicenses {
-    add 'Dagger', "file://${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"
 }
 
 dependencies {
-    implementation project(':firebase-abt')
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':protolite-well-known-types')
-    implementation project(':transport:transport-api')
-    implementation project(':firebase-datatransport')
-    implementation project(':firebase-installations-interop')
-    runtimeOnly project(':firebase-installations')
-    implementation 'javax.inject:javax.inject:1'
-
-    //To provide @Generated annotations
-    compileOnly 'javax.annotation:jsr250-api:1.0'
-
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation "io.grpc:grpc-stub:$grpcVersion"
-    implementation "io.grpc:grpc-protobuf-lite:$grpcVersion"
+    vendor (libs.dagger.dagger) {
+         exclude group: "javax.inject", module: "javax.inject"
+     }
+
+    api project(':protolite-well-known-types')
+    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api('com.google.firebase:firebase-abt:21.1.1') {
+         exclude group: 'com.google.firebase', module: 'firebase-common'
+         exclude group: 'com.google.firebase', module: 'firebase-components'
+     }
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
+    api("com.google.firebase:firebase-datatransport:18.2.0"){
+         exclude group: 'com.google.firebase', module: 'firebase-common'
+         exclude group: 'com.google.firebase', module: 'firebase-components'
+     }
+    api("com.google.firebase:firebase-installations:17.2.0")
+    api 'com.google.firebase:firebase-installations-interop:17.1.0'
+    api('com.google.firebase:firebase-measurement-connector:18.0.2') {
+         exclude group: 'com.google.firebase', module: 'firebase-common'
+     }
+
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'com.google.android.datatransport:transport-api:3.0.0'
+    implementation 'com.google.auto.value:auto-value-annotations:1.8.1'
     implementation "io.grpc:grpc-okhttp:$grpcVersion"
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
+    implementation "io.grpc:grpc-protobuf-lite:$grpcVersion"
+    implementation "io.grpc:grpc-stub:$grpcVersion"
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-    implementation 'com.google.auto.value:auto-value-annotations:1.8.1'
-
-    implementation('com.google.firebase:firebase-measurement-connector:18.0.2') {
-        exclude group: 'com.google.firebase', module: 'firebase-common'
-    }
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
+    implementation 'javax.inject:javax.inject:1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
-    vendor ('com.google.dagger:dagger:2.27') {
-        exclude group: "javax.inject", module: "javax.inject"
-    }
+    compileOnly 'javax.annotation:jsr250-api:1.0'
 
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.27'
     annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
     annotationProcessor 'com.ryanharter.auto.value:auto-value-parcel:0.2.6'
+    annotationProcessor libs.dagger.compiler
+
+    androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.27'
 
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation(project(":integ-testing")){
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation 'androidx.test:runner:1.3.0'
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
+    testImplementation 'com.google.guava:guava:30.1-android'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation "io.grpc:grpc-testing:$grpcVersion"
+    testImplementation 'junit:junit:4.12'
     testImplementation 'junit:junit:4.13.1'
-    testImplementation 'androidx.test:runner:1.3.0'
-    testImplementation 'androidx.test.ext:junit:1.1.2'
+    testImplementation 'org.mockito:mockito-core:5.2.0'
     testImplementation ("org.robolectric:robolectric:$robolectricVersion") {
-        exclude group: 'com.google.protobuf', module: 'protobuf-java'
-    }
-    testImplementation "io.grpc:grpc-testing:$grpcVersion"
-    testImplementation 'com.google.guava:guava:30.1-android'
-    testImplementation 'androidx.test:core:1.2.0'
+         exclude group: 'com.google.protobuf', module: 'protobuf-java'
+     }
 
-    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation(project(":integ-testing")){
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    androidTestImplementation "androidx.annotation:annotation:1.0.0"
     androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
-    androidTestImplementation 'org.awaitility:awaitility:3.1.0'
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.1'
     androidTestImplementation "io.grpc:grpc-testing:$grpcVersion"
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.25.0'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.25.0'
-
-    androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.27'
+    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation 'org.awaitility:awaitility:3.1.0'
 }
diff --git a/firebase-inappmessaging/gradle.properties b/firebase-inappmessaging/gradle.properties
index 8212b1b0425..ec7468f8665 100644
--- a/firebase-inappmessaging/gradle.properties
+++ b/firebase-inappmessaging/gradle.properties
@@ -1,2 +1,2 @@
-version=20.1.2
-latestReleasedVersion=20.1.1
+version=21.0.1
+latestReleasedVersion=21.0.0
diff --git a/firebase-inappmessaging/ktx/api.txt b/firebase-inappmessaging/ktx/api.txt
index 1c04bf758ca..57a96ed4b0a 100644
--- a/firebase-inappmessaging/ktx/api.txt
+++ b/firebase-inappmessaging/ktx/api.txt
@@ -1,9 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.inappmessaging.ktx {
 
-  public final class InAppMessagingKt {
-    ctor public InAppMessagingKt();
-    method @NonNull public static com.google.firebase.inappmessaging.FirebaseInAppMessaging getInAppMessaging(@NonNull com.google.firebase.ktx.Firebase);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-inappmessaging/ktx/ktx.gradle b/firebase-inappmessaging/ktx/ktx.gradle
index 85556711b08..80978538520 100644
--- a/firebase-inappmessaging/ktx/ktx.gradle
+++ b/firebase-inappmessaging/ktx/ktx.gradle
@@ -14,19 +14,21 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-inappmessaging')
-    publishJavadoc = true
+    libraryGroup "inappmessaging"
+    publishJavadoc = false
+    publishReleaseNotes = false
     publishSources = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.inappmessaging.ktx"    
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
@@ -38,21 +40,21 @@ android {
             srcDir 'src/test/kotlin'
         }
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api(project(":firebase-inappmessaging"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
 
-    implementation project(':firebase-common')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-inappmessaging')
-    implementation project(':firebase-components')
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    implementation("com.google.firebase:firebase-components:18.0.0")
 
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
diff --git a/firebase-inappmessaging/ktx/src/main/AndroidManifest.xml b/firebase-inappmessaging/ktx/src/main/AndroidManifest.xml
index ad2158dd778..d22f9fafcf3 100644
--- a/firebase-inappmessaging/ktx/src/main/AndroidManifest.xml
+++ b/firebase-inappmessaging/ktx/src/main/AndroidManifest.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.inappmessaging.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.inappmessaging.ktx.FirebaseInAppMessagingKtxRegistrar"
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.inappmessaging.ktx.FirebaseInappmessagingLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
diff --git a/firebase-inappmessaging/ktx/src/main/kotlin/com/google/firebase/inappmessaging/ktx/InAppMessaging.kt b/firebase-inappmessaging/ktx/src/main/kotlin/com/google/firebase/inappmessaging/ktx/InAppMessaging.kt
deleted file mode 100644
index 363be842464..00000000000
--- a/firebase-inappmessaging/ktx/src/main/kotlin/com/google/firebase/inappmessaging/ktx/InAppMessaging.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.inappmessaging.ktx
-
-import androidx.annotation.Keep
-import com.google.firebase.FirebaseApp
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.inappmessaging.FirebaseInAppMessaging
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.platforminfo.LibraryVersionComponent
-
-/** Returns the [FirebaseInAppMessaging] instance of the default [FirebaseApp]. */
-val Firebase.inAppMessaging: FirebaseInAppMessaging
-    get() = FirebaseInAppMessaging.getInstance()
-
-internal const val LIBRARY_NAME: String = "fire-iam-ktx"
-
-/** @suppress */
-@Keep
-class FirebaseInAppMessagingKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-inappmessaging/ktx/src/main/kotlin/com/google/firebase/inappmessaging/ktx/Logging.kt b/firebase-inappmessaging/ktx/src/main/kotlin/com/google/firebase/inappmessaging/ktx/Logging.kt
new file mode 100644
index 00000000000..41f3dc79e46
--- /dev/null
+++ b/firebase-inappmessaging/ktx/src/main/kotlin/com/google/firebase/inappmessaging/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.inappmessaging.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.inappmessaging.BuildConfig
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-iam-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseInappmessagingLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-inappmessaging/ktx/src/test/kotlin/com/google/firebase/inappmessagging/ktx/InAppMessaggingTests.kt b/firebase-inappmessaging/ktx/src/test/kotlin/com/google/firebase/inappmessagging/ktx/InAppMessaggingTests.kt
index 73c042cf70f..b98aa269269 100644
--- a/firebase-inappmessaging/ktx/src/test/kotlin/com/google/firebase/inappmessagging/ktx/InAppMessaggingTests.kt
+++ b/firebase-inappmessaging/ktx/src/test/kotlin/com/google/firebase/inappmessagging/ktx/InAppMessaggingTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.inappmessaging.ktx
 
@@ -36,49 +38,49 @@ internal val API_KEY = "ABC" + UUID.randomUUID().toString()
 const val EXISTING_APP = "existing"
 
 abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-            .setGcmSenderId("ic")
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setGcmSenderId("ic")
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
 
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build(),
-                EXISTING_APP
-        )
-    }
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
 
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class FirebaseInAppMessagingTests : BaseTestCase() {
 
-    @Test
-    fun `inappmessaging should delegate to FirebaseInAppMessaging#getInstance()`() {
-        assertThat(Firebase.inAppMessaging).isSameInstanceAs(FirebaseInAppMessaging.getInstance())
-    }
+  @Test
+  fun `inappmessaging should delegate to FirebaseInAppMessaging#getInstance()`() {
+    assertThat(Firebase.inAppMessaging).isSameInstanceAs(FirebaseInAppMessaging.getInstance())
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun `library version should be registered with runtime`() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
 }
diff --git a/firebase-inappmessaging/src/androidTest/AndroidManifest.xml b/firebase-inappmessaging/src/androidTest/AndroidManifest.xml
index b823c9c57ae..242180623d4 100644
--- a/firebase-inappmessaging/src/androidTest/AndroidManifest.xml
+++ b/firebase-inappmessaging/src/androidTest/AndroidManifest.xml
@@ -1,10 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.firebase.inappmessaging">
+    xmlns:tools="http://schemas.android.com/tools">
 
   <uses-sdk
-      android:minSdkVersion="16"
-      android:targetSdkVersion="23"/>
+      android:minSdkVersion="21"
+      android:targetSdkVersion="33"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <application>
     <uses-library android:name="android.test.runner"/>
@@ -14,8 +13,4 @@
               android:value="com.google.firebase.components.ComponentRegistrar" />
     </service>
   </application>
-
-  <instrumentation
-      android:name="androidx.test.runner.AndroidJUnitRunner"
-      android:targetPackage="com.google.firebase.inappmessaging"/>
 </manifest>
diff --git a/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingFlowableTest.java b/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingFlowableTest.java
index 0d6ec9e36c2..c99327774ed 100644
--- a/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingFlowableTest.java
+++ b/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingFlowableTest.java
@@ -52,6 +52,7 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.events.Subscriber;
 import com.google.firebase.inappmessaging.CommonTypesProto.Event;
 import com.google.firebase.inappmessaging.CommonTypesProto.Priority;
@@ -65,6 +66,7 @@
 import com.google.firebase.inappmessaging.internal.TestDeviceHelper;
 import com.google.firebase.inappmessaging.internal.injection.modules.AppMeasurementModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.ApplicationModule;
+import com.google.firebase.inappmessaging.internal.injection.modules.ExecutorsModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.GrpcClientModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.ProgrammaticContextualTriggerFlowableModule;
 import com.google.firebase.inappmessaging.model.BannerMessage;
@@ -270,7 +272,12 @@ public void setUp() {
             .testSystemClockModule(new TestSystemClockModule(NOW))
             .programmaticContextualTriggerFlowableModule(
                 new ProgrammaticContextualTriggerFlowableModule(
-                    new ProgramaticContextualTriggers()));
+                    new ProgramaticContextualTriggers()))
+            .executorsModule(
+                new ExecutorsModule(
+                    TestOnlyExecutors.lite(),
+                    TestOnlyExecutors.background(),
+                    TestOnlyExecutors.blocking()));
 
     TestUniversalComponent universalComponent = universalComponentBuilder.build();
 
@@ -315,6 +322,11 @@ public void onAppOpen_whenAnalyticsAbsent_notifiesSubscriber() {
     TestUniversalComponent analyticsLessUniversalComponent =
         universalComponentBuilder
             .appMeasurementModule(new AppMeasurementModule(handler -> {}, firebaseEventSubscriber))
+            .executorsModule(
+                new ExecutorsModule(
+                    TestOnlyExecutors.lite(),
+                    TestOnlyExecutors.background(),
+                    TestOnlyExecutors.blocking()))
             .build();
     TestAppComponent appComponent =
         appComponentBuilder.universalComponent(analyticsLessUniversalComponent).build();
@@ -492,7 +504,7 @@ public void onUnrelatedEvents_doesNotNotify() {
     analyticsConnector.invokeListenerOnEvent(ANALYTICS_EVENT_NAME);
     analyticsConnector.invokeListenerOnEvent("some_other_event");
     analyticsConnector.invokeListenerOnEvent(ANALYTICS_EVENT_NAME);
-    await().timeout(2, SECONDS).until(() -> subscriber.valueCount() > 0);
+    await().timeout(2, SECONDS).until(() -> subscriber.valueCount() > 1);
 
     List<Object> triggeredMessages = getPlainValues(subscriber);
     assertThat(triggeredMessages.size()).isEqualTo(2);
diff --git a/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/StrictModeTest.java b/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/StrictModeTest.java
new file mode 100644
index 00000000000..c48618935b7
--- /dev/null
+++ b/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/StrictModeTest.java
@@ -0,0 +1,47 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.inappmessaging;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions.Builder;
+import com.google.firebase.testing.integ.StrictModeRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class StrictModeTest {
+
+  @Rule public StrictModeRule strictMode = new StrictModeRule();
+
+  @Test
+  public void initializingFirebaseInAppMessaging_shouldNotViolateStrictMode() {
+    strictMode.runOnMainThread(
+        () -> {
+          FirebaseApp app =
+              FirebaseApp.initializeApp(
+                  ApplicationProvider.getApplicationContext(),
+                  new Builder()
+                      .setApiKey("api")
+                      .setProjectId("123")
+                      .setApplicationId("appId")
+                      .build(),
+                  "hello");
+          app.get(FirebaseInAppMessaging.class);
+        });
+  }
+}
diff --git a/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestApiClientModule.java b/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestApiClientModule.java
index 28c4bf89dae..0054e65fd40 100644
--- a/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestApiClientModule.java
+++ b/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestApiClientModule.java
@@ -26,9 +26,9 @@
 import com.google.firebase.inappmessaging.internal.injection.scopes.FirebaseAppScope;
 import com.google.firebase.inappmessaging.internal.time.Clock;
 import com.google.firebase.installations.FirebaseInstallationsApi;
-import dagger.Lazy;
 import dagger.Module;
 import dagger.Provides;
+import javax.inject.Provider;
 import javax.inject.Singleton;
 
 /** Test bindings for API client */
@@ -77,7 +77,9 @@ TestDeviceHelper providesTestDeviceHelper() {
   @Provides
   @FirebaseAppScope
   ApiClient providesApiClient(
-      Lazy<GrpcClient> grpcClient, Application application, ProviderInstaller providerInstaller) {
+      Provider<GrpcClient> grpcClient,
+      Application application,
+      ProviderInstaller providerInstaller) {
     return new ApiClient(grpcClient, firebaseApp, application, clock, providerInstaller);
   }
 }
diff --git a/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestEngagementMetricsLoggerClientModule.java b/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestEngagementMetricsLoggerClientModule.java
index c992bceb3e0..c0aadcc6df8 100644
--- a/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestEngagementMetricsLoggerClientModule.java
+++ b/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestEngagementMetricsLoggerClientModule.java
@@ -16,6 +16,7 @@
 
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.inappmessaging.internal.DeveloperListenerManager;
 import com.google.firebase.inappmessaging.internal.MetricsLoggerClient;
 import com.google.firebase.inappmessaging.internal.MetricsLoggerClient.EngagementMetricsLoggerInterface;
@@ -24,6 +25,7 @@
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import dagger.Module;
 import dagger.Provides;
+import java.util.concurrent.Executor;
 
 @Module
 public class TestEngagementMetricsLoggerClientModule {
@@ -42,13 +44,15 @@ public MetricsLoggerClient providesMetricLoggerClient(
       FirebaseInstallationsApi firebaseInstallations,
       AnalyticsConnector analyticsConnector,
       Clock clock,
-      DeveloperListenerManager developerListenerManager) {
+      DeveloperListenerManager developerListenerManager,
+      @Blocking Executor blockingExecutor) {
     return new MetricsLoggerClient(
         engagementMetricsLoggerInterface,
         analyticsConnector,
         firebaseApp,
         firebaseInstallations,
         clock,
-        developerListenerManager);
+        developerListenerManager,
+        blockingExecutor);
   }
 }
diff --git a/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestUniversalComponent.java b/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestUniversalComponent.java
index 1bcfa26cd19..92a0b972968 100644
--- a/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestUniversalComponent.java
+++ b/firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestUniversalComponent.java
@@ -18,6 +18,7 @@
 import com.google.firebase.inappmessaging.internal.injection.modules.AnalyticsEventsModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.AppMeasurementModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.ApplicationModule;
+import com.google.firebase.inappmessaging.internal.injection.modules.ExecutorsModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.ProgrammaticContextualTriggerFlowableModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.ProtoStorageClientModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.RateLimitModule;
@@ -41,5 +42,6 @@
       ProtoStorageClientModule.class,
       RateLimitModule.class,
       AppMeasurementModule.class,
+      ExecutorsModule.class,
     })
 public interface TestUniversalComponent extends UniversalComponent {}
diff --git a/firebase-inappmessaging/src/main/AndroidManifest.xml b/firebase-inappmessaging/src/main/AndroidManifest.xml
index 0becf12ec8d..6eeefffaf3f 100644
--- a/firebase-inappmessaging/src/main/AndroidManifest.xml
+++ b/firebase-inappmessaging/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.inappmessaging">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,10 +7,10 @@
     <application>
         <service
             android:name="com.google.firebase.components.ComponentDiscoveryService"
-            android:exported="false">
+            android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.inappmessaging.FirebaseInAppMessagingKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data
                 android:name="com.google.firebase.components:com.google.firebase.inappmessaging.FirebaseInAppMessagingRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessaging.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessaging.java
index 2fc4599624c..08f1a7e71ff 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessaging.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessaging.java
@@ -16,8 +16,10 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.android.gms.common.util.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
+
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Lightweight;
 import com.google.firebase.inappmessaging.internal.DataCollectionHelper;
 import com.google.firebase.inappmessaging.internal.DeveloperListenerManager;
 import com.google.firebase.inappmessaging.internal.DisplayCallbacksFactory;
@@ -60,6 +62,7 @@ public class FirebaseInAppMessaging {
 
   private boolean areMessagesSuppressed;
   private FirebaseInAppMessagingDisplay fiamDisplay;
+  @Lightweight private Executor lightWeightExecutor;
 
   @VisibleForTesting
   @Inject
@@ -69,7 +72,8 @@ public class FirebaseInAppMessaging {
       DataCollectionHelper dataCollectionHelper,
       FirebaseInstallationsApi firebaseInstallations,
       DisplayCallbacksFactory displayCallbacksFactory,
-      DeveloperListenerManager developerListenerManager) {
+      DeveloperListenerManager developerListenerManager,
+      @Lightweight Executor lightWeightExecutor) {
     this.inAppMessageStreamManager = inAppMessageStreamManager;
     this.programaticContextualTriggers = programaticContextualTriggers;
     this.dataCollectionHelper = dataCollectionHelper;
@@ -77,11 +81,15 @@ public class FirebaseInAppMessaging {
     this.areMessagesSuppressed = false;
     this.displayCallbacksFactory = displayCallbacksFactory;
     this.developerListenerManager = developerListenerManager;
+    this.lightWeightExecutor = lightWeightExecutor;
 
     firebaseInstallations
         .getId()
         .addOnSuccessListener(
-            id -> Logging.logi("Starting InAppMessaging runtime with Installation ID " + id));
+            lightWeightExecutor,
+            id -> {
+              Logging.logi("Starting InAppMessaging runtime with Installation ID " + id);
+            });
 
     Disposable unused =
         inAppMessageStreamManager
@@ -92,9 +100,6 @@ public class FirebaseInAppMessaging {
   /**
    * Gets FirebaseInAppMessaging instance using the firebase app returned by {@link
    * FirebaseApp#getInstance()}
-   *
-   * @param
-   * @return
    */
   @NonNull
   public static FirebaseInAppMessaging getInstance() {
@@ -332,6 +337,17 @@ public void removeDisplayErrorListener(
     developerListenerManager.removeDisplayErrorListener(displayErrorListener);
   }
 
+  /**
+   * Unregisters a dismiss listener.
+   *
+   * @param dismissListener the listener callback to be removed which was added using {@link
+   *     #addDismissListener}
+   */
+  public void removeDismissListener(
+      @NonNull FirebaseInAppMessagingDismissListener dismissListener) {
+    developerListenerManager.removeDismissListener(dismissListener);
+  }
+
   /**
    * Removes all registered listeners.
    *
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingRegistrar.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingRegistrar.java
index 763004d4829..4126d68000d 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingRegistrar.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingRegistrar.java
@@ -22,10 +22,15 @@
 import com.google.firebase.abt.FirebaseABTesting;
 import com.google.firebase.abt.component.AbtComponent;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentContainer;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import com.google.firebase.datatransport.LegacyTransportBackend;
 import com.google.firebase.events.Subscriber;
 import com.google.firebase.inappmessaging.internal.AbtIntegrationHelper;
 import com.google.firebase.inappmessaging.internal.ProgramaticContextualTriggers;
@@ -37,6 +42,7 @@
 import com.google.firebase.inappmessaging.internal.injection.modules.ApiClientModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.AppMeasurementModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.ApplicationModule;
+import com.google.firebase.inappmessaging.internal.injection.modules.ExecutorsModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.GrpcClientModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.ProgrammaticContextualTriggerFlowableModule;
 import com.google.firebase.inject.Deferred;
@@ -44,6 +50,7 @@
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.Executor;
 
 /**
  * Registers {@link FirebaseInAppMessaging}.
@@ -52,22 +59,37 @@
  */
 @Keep
 public class FirebaseInAppMessagingRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-fiam";
+  private Qualified<Executor> backgroundExecutor =
+      Qualified.qualified(Background.class, Executor.class);
+  private Qualified<Executor> blockingExecutor =
+      Qualified.qualified(Blocking.class, Executor.class);
+  private Qualified<Executor> lightWeightExecutor =
+      Qualified.qualified(Lightweight.class, Executor.class);
+
+  private Qualified<TransportFactory> legacyTransportFactory =
+      Qualified.qualified(LegacyTransportBackend.class, TransportFactory.class);
+
   @Override
   @Keep
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(FirebaseInAppMessaging.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(Context.class))
             .add(Dependency.required(FirebaseInstallationsApi.class))
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(AbtComponent.class))
             .add(Dependency.deferred(AnalyticsConnector.class))
-            .add(Dependency.required(TransportFactory.class))
+            .add(Dependency.required(legacyTransportFactory))
             .add(Dependency.required(Subscriber.class))
+            .add(Dependency.required(backgroundExecutor))
+            .add(Dependency.required(blockingExecutor))
+            .add(Dependency.required(lightWeightExecutor))
             .factory(this::providesFirebaseInAppMessaging)
             .eagerInDefaultApp()
             .build(),
-        LibraryVersionComponent.create("fire-fiam", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 
   private FirebaseInAppMessaging providesFirebaseInAppMessaging(ComponentContainer container) {
@@ -88,6 +110,11 @@ private FirebaseInAppMessaging providesFirebaseInAppMessaging(ComponentContainer
             .programmaticContextualTriggerFlowableModule(
                 new ProgrammaticContextualTriggerFlowableModule(
                     new ProgramaticContextualTriggers()))
+            .executorsModule(
+                new ExecutorsModule(
+                    container.get(lightWeightExecutor),
+                    container.get(backgroundExecutor),
+                    container.get(blockingExecutor)))
             .build();
 
     AppComponent instance =
@@ -96,12 +123,13 @@ private FirebaseInAppMessaging providesFirebaseInAppMessaging(ComponentContainer
                 new AbtIntegrationHelper(
                     container
                         .get(AbtComponent.class)
-                        .get(FirebaseABTesting.OriginService.INAPP_MESSAGING)))
+                        .get(FirebaseABTesting.OriginService.INAPP_MESSAGING),
+                    container.get(blockingExecutor)))
             .apiClientModule(
                 new ApiClientModule(firebaseApp, firebaseInstallations, universalComponent.clock()))
             .grpcClientModule(new GrpcClientModule(firebaseApp))
             .universalComponent(universalComponent)
-            .transportFactory(container.get(TransportFactory.class))
+            .transportFactory(container.get(legacyTransportFactory))
             .build();
 
     return instance.providesFirebaseInAppMessaging();
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/InAppMessaging.kt b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/InAppMessaging.kt
new file mode 100644
index 00000000000..4c0b5443946
--- /dev/null
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/InAppMessaging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.inappmessaging
+
+import androidx.annotation.Keep
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+
+/** Returns the [FirebaseInAppMessaging] instance of the default [FirebaseApp]. */
+val Firebase.inAppMessaging: FirebaseInAppMessaging
+  get() = FirebaseInAppMessaging.getInstance()
+
+/** @suppress */
+@Keep
+class FirebaseInAppMessagingKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/AbtIntegrationHelper.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/AbtIntegrationHelper.java
index 8ea864b51f3..f68362423cf 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/AbtIntegrationHelper.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/AbtIntegrationHelper.java
@@ -18,6 +18,7 @@
 import com.google.firebase.abt.AbtException;
 import com.google.firebase.abt.AbtExperimentInfo;
 import com.google.firebase.abt.FirebaseABTesting;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.inappmessaging.ExperimentPayloadProto;
 import com.google.firebase.inappmessaging.internal.injection.scopes.FirebaseAppScope;
 import com.google.internal.firebase.inappmessaging.v1.CampaignProto;
@@ -25,19 +26,18 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
 import javax.inject.Inject;
 
 /** @hide */
 @FirebaseAppScope
 public class AbtIntegrationHelper {
   private final FirebaseABTesting abTesting;
-
-  @VisibleForTesting Executor executor = Executors.newSingleThreadExecutor();
+  @VisibleForTesting Executor executor;
 
   @Inject
-  public AbtIntegrationHelper(FirebaseABTesting abTesting) {
+  public AbtIntegrationHelper(FirebaseABTesting abTesting, @Blocking Executor blockingExecutor) {
     this.abTesting = abTesting;
+    this.executor = blockingExecutor;
   }
 
   /**
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/ApiClient.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/ApiClient.java
index 69b04975291..66c299ec8cc 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/ApiClient.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/ApiClient.java
@@ -27,11 +27,11 @@
 import com.google.internal.firebase.inappmessaging.v1.sdkserving.ClientAppInfo;
 import com.google.internal.firebase.inappmessaging.v1.sdkserving.FetchEligibleCampaignsRequest;
 import com.google.internal.firebase.inappmessaging.v1.sdkserving.FetchEligibleCampaignsResponse;
-import dagger.Lazy;
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
+import javax.inject.Provider;
 
 /**
  * Interface to speak to the fiam backend
@@ -43,14 +43,14 @@ public class ApiClient {
 
   private static final String FETCHING_CAMPAIGN_MESSAGE = "Fetching campaigns from service.";
 
-  private final Lazy<GrpcClient> grpcClient;
+  private final Provider<GrpcClient> grpcClient;
   private final FirebaseApp firebaseApp;
   private final Application application;
   private final Clock clock;
   private final ProviderInstaller providerInstaller;
 
   public ApiClient(
-      Lazy<GrpcClient> grpcClient,
+      Provider<GrpcClient> grpcClient,
       FirebaseApp firebaseApp,
       Application application,
       Clock clock,
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/DeveloperListenerManager.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/DeveloperListenerManager.java
index ff1d3383849..71baa1973e6 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/DeveloperListenerManager.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/DeveloperListenerManager.java
@@ -14,7 +14,8 @@
 
 package com.google.firebase.inappmessaging.internal;
 
-import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import com.google.firebase.annotations.concurrent.Background;
 import com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener;
 import com.google.firebase.inappmessaging.FirebaseInAppMessagingDismissListener;
 import com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks;
@@ -24,13 +25,7 @@
 import com.google.firebase.inappmessaging.model.InAppMessage;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Executor;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * A class used to manage and schedule events to registered (ie: developer-defined) or expensive
@@ -41,11 +36,7 @@
 @SuppressWarnings("JavaDoc")
 public class DeveloperListenerManager {
 
-  // We limit to 1 so there is minimial impact to device performance
-  private static final int POOL_SIZE = 1;
-  // Keep alive to minimize chance of having to restart a thread to handle both impression and click
-  private static final int KEEP_ALIVE_TIME_SECONDS = 15;
-  public static DeveloperListenerManager instance = new DeveloperListenerManager();
+  private final Executor backgroundExecutor;
   private Map<FirebaseInAppMessagingClickListener, ClicksExecutorAndListener>
       registeredClickListeners = new HashMap<>();
   private Map<FirebaseInAppMessagingDismissListener, DismissExecutorAndListener>
@@ -55,25 +46,15 @@ public class DeveloperListenerManager {
   private Map<FirebaseInAppMessagingImpressionListener, ImpressionExecutorAndListener>
       registeredImpressionListeners = new HashMap<>();
 
-  private static BlockingQueue<Runnable> mCallbackQueue = new LinkedBlockingQueue<>();
-  private static final ThreadPoolExecutor CALLBACK_QUEUE_EXECUTOR =
-      new ThreadPoolExecutor(
-          POOL_SIZE,
-          POOL_SIZE,
-          KEEP_ALIVE_TIME_SECONDS,
-          TimeUnit.SECONDS,
-          mCallbackQueue,
-          new FIAMThreadFactory("EventListeners-"));
-
-  static {
-    CALLBACK_QUEUE_EXECUTOR.allowCoreThreadTimeOut(true);
+  public DeveloperListenerManager(@Background Executor backgroundExecutor) {
+    this.backgroundExecutor = backgroundExecutor;
   }
 
   // Used internally by MetricsLoggerClient
   public void impressionDetected(InAppMessage inAppMessage) {
     for (ImpressionExecutorAndListener listener : registeredImpressionListeners.values()) {
       listener
-          .withExecutor(CALLBACK_QUEUE_EXECUTOR)
+          .withExecutor(backgroundExecutor)
           .execute(() -> listener.getListener().impressionDetected(inAppMessage));
     }
   }
@@ -83,7 +64,7 @@ public void displayErrorEncountered(
       FirebaseInAppMessagingDisplayCallbacks.InAppMessagingErrorReason errorReason) {
     for (ErrorsExecutorAndListener listener : registeredErrorListeners.values()) {
       listener
-          .withExecutor(CALLBACK_QUEUE_EXECUTOR)
+          .withExecutor(backgroundExecutor)
           .execute(() -> listener.getListener().displayErrorEncountered(inAppMessage, errorReason));
     }
   }
@@ -91,7 +72,7 @@ public void displayErrorEncountered(
   public void messageClicked(InAppMessage inAppMessage, Action action) {
     for (ClicksExecutorAndListener listener : registeredClickListeners.values()) {
       listener
-          .withExecutor(CALLBACK_QUEUE_EXECUTOR)
+          .withExecutor(backgroundExecutor)
           .execute(() -> listener.getListener().messageClicked(inAppMessage, action));
     }
   }
@@ -99,7 +80,7 @@ public void messageClicked(InAppMessage inAppMessage, Action action) {
   public void messageDismissed(InAppMessage inAppMessage) {
     for (DismissExecutorAndListener listener : registeredDismissListeners.values()) {
       listener
-          .withExecutor(CALLBACK_QUEUE_EXECUTOR)
+          .withExecutor(backgroundExecutor)
           .execute(() -> listener.getListener().messageDismissed(inAppMessage));
     }
   }
@@ -165,31 +146,25 @@ public void removeDisplayErrorListener(
     registeredErrorListeners.remove(displayErrorListener);
   }
 
+  public void removeDismissListener(FirebaseInAppMessagingDismissListener dismissListener) {
+    registeredDismissListeners.remove(dismissListener);
+  }
+
   public void removeAllListeners() {
     registeredClickListeners.clear();
     registeredImpressionListeners.clear();
     registeredErrorListeners.clear();
+    registeredDismissListeners.clear();
   }
 
-  /** The thread factory for Storage threads. */
-  static class FIAMThreadFactory implements ThreadFactory {
-    private final AtomicInteger threadNumber = new AtomicInteger(1);
-    private final String mNameSuffix;
-
-    FIAMThreadFactory(@NonNull String suffix) {
-      mNameSuffix = suffix;
-    }
-
-    @SuppressWarnings("ThreadPriorityCheck")
-    @Override
-    public Thread newThread(@NonNull Runnable r) {
-      Thread t = new Thread(r, "FIAM-" + mNameSuffix + threadNumber.getAndIncrement());
-      t.setDaemon(false);
-      t.setPriority(
-          android.os.Process.THREAD_PRIORITY_BACKGROUND
-              + android.os.Process.THREAD_PRIORITY_MORE_FAVORABLE);
-      return t;
-    }
+  @VisibleForTesting
+  public Map getAllListeners() {
+    Map listeners = new HashMap();
+    listeners.putAll(registeredClickListeners);
+    listeners.putAll(registeredImpressionListeners);
+    listeners.putAll(registeredErrorListeners);
+    listeners.putAll(registeredDismissListeners);
+    return listeners;
   }
 
   private abstract static class ExecutorAndListener<T> {
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/DisplayCallbacksImpl.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/DisplayCallbacksImpl.java
index 7f693e76257..550585d142e 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/DisplayCallbacksImpl.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/DisplayCallbacksImpl.java
@@ -15,7 +15,9 @@
 package com.google.firebase.inappmessaging.internal;
 
 import android.text.TextUtils;
-import com.google.android.gms.common.util.VisibleForTesting;
+
+import androidx.annotation.VisibleForTesting;
+
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks;
@@ -42,7 +44,7 @@ public class DisplayCallbacksImpl implements FirebaseInAppMessagingDisplayCallba
   private final InAppMessage inAppMessage;
   private final String triggeringEvent;
 
-  private static boolean wasImpressed;
+  private boolean wasImpressed;
   private static final String MESSAGE_CLICK = "message click to metrics logger";
 
   @VisibleForTesting
@@ -72,6 +74,11 @@ public class DisplayCallbacksImpl implements FirebaseInAppMessagingDisplayCallba
     wasImpressed = false;
   }
 
+  @VisibleForTesting
+  boolean wasImpressed() {
+    return wasImpressed;
+  }
+
   @Override
   public Task<Void> impressionDetected() {
 
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/InAppMessageStreamManager.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/InAppMessageStreamManager.java
index bacf96fffad..7509b4e8791 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/InAppMessageStreamManager.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/InAppMessageStreamManager.java
@@ -17,6 +17,7 @@
 import android.text.TextUtils;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.inappmessaging.CommonTypesProto.TriggeringCondition;
 import com.google.firebase.inappmessaging.internal.injection.qualifiers.AppForeground;
 import com.google.firebase.inappmessaging.internal.injection.qualifiers.ProgrammaticTrigger;
@@ -39,6 +40,7 @@
 import io.reactivex.functions.Consumer;
 import io.reactivex.functions.Function;
 import java.util.Locale;
+import java.util.concurrent.Executor;
 import javax.inject.Inject;
 
 /**
@@ -64,6 +66,7 @@ public class InAppMessageStreamManager {
   private final AbtIntegrationHelper abtIntegrationHelper;
   private final FirebaseInstallationsApi firebaseInstallations;
   private final DataCollectionHelper dataCollectionHelper;
+  @Blocking private final Executor blockingExecutor;
 
   @Inject
   public InAppMessageStreamManager(
@@ -80,7 +83,8 @@ public InAppMessageStreamManager(
       TestDeviceHelper testDeviceHelper,
       FirebaseInstallationsApi firebaseInstallations,
       DataCollectionHelper dataCollectionHelper,
-      AbtIntegrationHelper abtIntegrationHelper) {
+      AbtIntegrationHelper abtIntegrationHelper,
+      @Blocking Executor blockingExecutor) {
     this.appForegroundEventFlowable = appForegroundEventFlowable;
     this.programmaticTriggerEventFlowable = programmaticTriggerEventFlowable;
     this.campaignCacheClient = campaignCacheClient;
@@ -95,6 +99,7 @@ public InAppMessageStreamManager(
     this.dataCollectionHelper = dataCollectionHelper;
     this.firebaseInstallations = firebaseInstallations;
     this.abtIntegrationHelper = abtIntegrationHelper;
+    this.blockingExecutor = blockingExecutor;
   }
 
   private static boolean containsTriggeringCondition(String event, ThickContent content) {
@@ -243,8 +248,8 @@ public Flowable<TriggeredInAppMessage> createFirebaseInAppMessageStream() {
 
               Maybe<InstallationIdResult> getIID =
                   Maybe.zip(
-                          taskToMaybe(firebaseInstallations.getId()),
-                          taskToMaybe(firebaseInstallations.getToken(false)),
+                          taskToMaybe(firebaseInstallations.getId(), blockingExecutor),
+                          taskToMaybe(firebaseInstallations.getToken(false), blockingExecutor),
                           InstallationIdResult::create)
                       .observeOn(schedulers.io());
 
@@ -387,15 +392,17 @@ static FetchEligibleCampaignsResponse cacheExpiringResponse() {
     return FetchEligibleCampaignsResponse.newBuilder().setExpirationEpochTimestampMillis(1).build();
   }
 
-  private static <T> Maybe<T> taskToMaybe(Task<T> task) {
+  private static <T> Maybe<T> taskToMaybe(Task<T> task, @Blocking Executor blockingExecutor) {
     return Maybe.create(
         emitter -> {
           task.addOnSuccessListener(
+              blockingExecutor,
               result -> {
                 emitter.onSuccess(result);
                 emitter.onComplete();
               });
           task.addOnFailureListener(
+              blockingExecutor,
               e -> {
                 emitter.onError(e);
                 emitter.onComplete();
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/MetricsLoggerClient.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/MetricsLoggerClient.java
index 29b0645b497..256dbbd4cd0 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/MetricsLoggerClient.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/MetricsLoggerClient.java
@@ -20,6 +20,7 @@
 import android.os.Bundle;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.inappmessaging.BuildConfig;
 import com.google.firebase.inappmessaging.CampaignAnalytics;
 import com.google.firebase.inappmessaging.ClientAppInfo;
@@ -38,6 +39,7 @@
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Executor;
 import javax.annotation.Nullable;
 
 /**
@@ -78,6 +80,7 @@ public class MetricsLoggerClient {
   private final Clock clock;
   private final AnalyticsConnector analyticsConnector;
   private final DeveloperListenerManager developerListenerManager;
+  @Blocking private final Executor blockingExecutor;
 
   public MetricsLoggerClient(
       EngagementMetricsLoggerInterface engagementMetricsLogger,
@@ -85,13 +88,15 @@ public MetricsLoggerClient(
       FirebaseApp firebaseApp,
       FirebaseInstallationsApi firebaseInstallations,
       Clock clock,
-      DeveloperListenerManager developerListenerManager) {
+      DeveloperListenerManager developerListenerManager,
+      @Blocking Executor blockingExecutor) {
     this.engagementMetricsLogger = engagementMetricsLogger;
     this.analyticsConnector = analyticsConnector;
     this.firebaseApp = firebaseApp;
     this.firebaseInstallations = firebaseInstallations;
     this.clock = clock;
     this.developerListenerManager = developerListenerManager;
+    this.blockingExecutor = blockingExecutor;
   }
 
   /** Log impression */
@@ -101,6 +106,7 @@ void logImpression(InAppMessage message) {
       firebaseInstallations
           .getId()
           .addOnSuccessListener(
+              blockingExecutor,
               id ->
                   engagementMetricsLogger.logEvent(
                       createEventEntry(message, id, IMPRESSION_EVENT_TYPE).toByteArray()));
@@ -121,6 +127,7 @@ void logMessageClick(InAppMessage message, Action action) {
       firebaseInstallations
           .getId()
           .addOnSuccessListener(
+              blockingExecutor,
               id ->
                   engagementMetricsLogger.logEvent(
                       createEventEntry(message, id, CLICK_EVENT_TYPE).toByteArray()));
@@ -138,6 +145,7 @@ void logRenderError(InAppMessage message, InAppMessagingErrorReason errorReason)
       firebaseInstallations
           .getId()
           .addOnSuccessListener(
+              blockingExecutor,
               id ->
                   engagementMetricsLogger.logEvent(
                       createRenderErrorEntry(message, id, errorTransform.get(errorReason))
@@ -154,6 +162,7 @@ void logDismiss(InAppMessage message, InAppMessagingDismissType dismissType) {
       firebaseInstallations
           .getId()
           .addOnSuccessListener(
+              blockingExecutor,
               id ->
                   engagementMetricsLogger.logEvent(
                       createDismissEntry(message, id, dismissTransform.get(dismissType))
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/components/UniversalComponent.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/components/UniversalComponent.java
index c4f7f67cc16..164148a2835 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/components/UniversalComponent.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/components/UniversalComponent.java
@@ -16,6 +16,8 @@
 
 import android.app.Application;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
 import com.google.firebase.events.Subscriber;
 import com.google.firebase.inappmessaging.internal.AnalyticsEventsManager;
 import com.google.firebase.inappmessaging.internal.CampaignCacheClient;
@@ -28,6 +30,7 @@
 import com.google.firebase.inappmessaging.internal.injection.modules.AnalyticsEventsModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.AppMeasurementModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.ApplicationModule;
+import com.google.firebase.inappmessaging.internal.injection.modules.ExecutorsModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.ForegroundFlowableModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.GrpcChannelModule;
 import com.google.firebase.inappmessaging.internal.injection.modules.ProgrammaticContextualTriggerFlowableModule;
@@ -44,6 +47,7 @@
 import dagger.Component;
 import io.grpc.Channel;
 import io.reactivex.flowables.ConnectableFlowable;
+import java.util.concurrent.Executor;
 import javax.inject.Singleton;
 
 /**
@@ -64,10 +68,11 @@
       ProtoStorageClientModule.class,
       SystemClockModule.class,
       RateLimitModule.class,
-      AppMeasurementModule.class
+      AppMeasurementModule.class,
+      ExecutorsModule.class
     })
 public interface UniversalComponent {
-  ProviderInstaller probiderInstaller();
+  ProviderInstaller providerInstaller();
 
   Channel gRPCChannel();
 
@@ -107,4 +112,10 @@ public interface UniversalComponent {
   RateLimit appForegroundRateLimit();
 
   DeveloperListenerManager developerListenerManager();
+
+  @Lightweight
+  Executor lightWeightExecutor();
+
+  @Blocking
+  Executor blockingExecutor();
 }
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/ApiClientModule.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/ApiClientModule.java
index 0f6c76944bb..ff130098db4 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/ApiClientModule.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/ApiClientModule.java
@@ -26,9 +26,9 @@
 import com.google.firebase.inappmessaging.internal.injection.scopes.FirebaseAppScope;
 import com.google.firebase.inappmessaging.internal.time.Clock;
 import com.google.firebase.installations.FirebaseInstallationsApi;
-import dagger.Lazy;
 import dagger.Module;
 import dagger.Provides;
+import javax.inject.Provider;
 
 /**
  * Provider for ApiClient
@@ -77,7 +77,9 @@ TestDeviceHelper providesTestDeviceHelper(SharedPreferencesUtils sharedPreferenc
   @Provides
   @FirebaseAppScope
   ApiClient providesApiClient(
-      Lazy<GrpcClient> grpcClient, Application application, ProviderInstaller providerInstaller) {
+      Provider<GrpcClient> grpcClient,
+      Application application,
+      ProviderInstaller providerInstaller) {
     return new ApiClient(grpcClient, firebaseApp, application, clock, providerInstaller);
   }
 }
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/ApplicationModule.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/ApplicationModule.java
index 96d8b63e1cc..ec4c86ff337 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/ApplicationModule.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/ApplicationModule.java
@@ -15,9 +15,11 @@
 package com.google.firebase.inappmessaging.internal.injection.modules;
 
 import android.app.Application;
+import com.google.firebase.annotations.concurrent.Background;
 import com.google.firebase.inappmessaging.internal.DeveloperListenerManager;
 import dagger.Module;
 import dagger.Provides;
+import java.util.concurrent.Executor;
 import javax.inject.Singleton;
 
 /**
@@ -41,7 +43,8 @@ public Application providesApplication() {
 
   @Provides
   @Singleton
-  public DeveloperListenerManager developerListenerManager() {
-    return new DeveloperListenerManager();
+  public DeveloperListenerManager developerListenerManager(
+      @Background Executor backgroundExecutor) {
+    return new DeveloperListenerManager(backgroundExecutor);
   }
 }
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/ExecutorsModule.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/ExecutorsModule.java
new file mode 100644
index 00000000000..42b4236446c
--- /dev/null
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/ExecutorsModule.java
@@ -0,0 +1,69 @@
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.inappmessaging.internal.injection.modules;
+
+import androidx.annotation.NonNull;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
+import dagger.Module;
+import dagger.Provides;
+import java.util.concurrent.Executor;
+import javax.inject.Singleton;
+
+/**
+ * Provides executors for running tasks.
+ *
+ * @hide
+ */
+@Module
+public class ExecutorsModule {
+  private final Executor backgroundExecutor;
+  private final Executor blockingExecutor;
+  private final Executor lightWeightExecutor;
+
+  public ExecutorsModule(
+      @NonNull @Lightweight Executor lightWeightExecutor,
+      @NonNull @Background Executor backgroundExecutor,
+      @NonNull @Blocking Executor blockingExecutor) {
+    this.lightWeightExecutor = lightWeightExecutor;
+    this.backgroundExecutor = backgroundExecutor;
+    this.blockingExecutor = blockingExecutor;
+  }
+
+  @Provides
+  @Singleton
+  @Background
+  @NonNull
+  public Executor providesBackgroundExecutor() {
+    return backgroundExecutor;
+  }
+
+  @Provides
+  @Lightweight
+  @Singleton
+  @NonNull
+  public Executor providesLightWeightExecutor() {
+    return lightWeightExecutor;
+  }
+
+  @Provides
+  @Singleton
+  @Blocking
+  @NonNull
+  public Executor providesBlockingExecutor() {
+    return blockingExecutor;
+  }
+}
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/TransportClientModule.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/TransportClientModule.java
index 3af19e45311..de97d533447 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/TransportClientModule.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/TransportClientModule.java
@@ -19,6 +19,7 @@
 import com.google.android.datatransport.TransportFactory;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.inappmessaging.internal.DeveloperListenerManager;
 import com.google.firebase.inappmessaging.internal.MetricsLoggerClient;
 import com.google.firebase.inappmessaging.internal.injection.scopes.FirebaseAppScope;
@@ -26,6 +27,7 @@
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import dagger.Module;
 import dagger.Provides;
+import java.util.concurrent.Executor;
 
 /**
  * Bindings for engagementMetrics
@@ -44,7 +46,8 @@ static MetricsLoggerClient providesMetricsLoggerClient(
       AnalyticsConnector analyticsConnector,
       FirebaseInstallationsApi firebaseInstallations,
       Clock clock,
-      DeveloperListenerManager developerListenerManager) {
+      DeveloperListenerManager developerListenerManager,
+      @Blocking Executor blockingExecutor) {
     Transport<byte[]> transport =
         transportFactory.getTransport(TRANSPORT_NAME, byte[].class, b -> b);
     return new MetricsLoggerClient(
@@ -53,6 +56,7 @@ static MetricsLoggerClient providesMetricsLoggerClient(
         app,
         firebaseInstallations,
         clock,
-        developerListenerManager);
+        developerListenerManager,
+        blockingExecutor);
   }
 }
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/ktx/InAppMessaging.kt b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/ktx/InAppMessaging.kt
new file mode 100644
index 00000000000..82dce304852
--- /dev/null
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/ktx/InAppMessaging.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.inappmessaging.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.inappmessaging.FirebaseInAppMessaging
+import com.google.firebase.ktx.Firebase
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseInAppMessaging] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-inappmessaging-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.inAppMessaging: FirebaseInAppMessaging
+  get() = FirebaseInAppMessaging.getInstance()
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-inappmessaging-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+@Keep
+class FirebaseInAppMessagingKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/model/CampaignMetadata.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/model/CampaignMetadata.java
index 3bbac3af272..968a800811d 100644
--- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/model/CampaignMetadata.java
+++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/model/CampaignMetadata.java
@@ -17,10 +17,13 @@
 import androidx.annotation.NonNull;
 
 /**
- * Provides the following about any message,
- * <li>Campaign ID
- * <li>Campaign Name
- * <li>Campaign Test Message State
+ * Provides the following about any message:
+ *
+ * <ul>
+ *   <li>Campaign ID
+ *   <li>Campaign Name
+ *   <li>Campaign Test Message State
+ * </ul>
  */
 public class CampaignMetadata {
   private final String campaignId;
diff --git a/firebase-inappmessaging/src/test/AndroidManifest.xml b/firebase-inappmessaging/src/test/AndroidManifest.xml
index 1372f98f886..a411a28a2a7 100644
--- a/firebase-inappmessaging/src/test/AndroidManifest.xml
+++ b/firebase-inappmessaging/src/test/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.inappmessaging">
-    <uses-sdk android:minSdkVersion="16"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-sdk android:minSdkVersion="21"/>
     <application
         android:label="FirebaseCommonTests" >
         <uses-library android:name="android.test.runner" />
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingTest.java
index 41e181dd8c3..a61b3e1a7b3 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingTest.java
@@ -21,7 +21,7 @@
 import static com.google.firebase.inappmessaging.testutil.TestData.CAMPAIGN_NAME_STRING;
 import static io.reactivex.BackpressureStrategy.BUFFER;
 import static io.reactivex.schedulers.Schedulers.trampoline;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -29,10 +29,12 @@
 
 import android.app.Application;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.inappmessaging.CommonTypesProto.Event;
 import com.google.firebase.inappmessaging.CommonTypesProto.Priority;
 import com.google.firebase.inappmessaging.CommonTypesProto.TriggeringCondition;
@@ -55,10 +57,12 @@
 import io.reactivex.Flowable;
 import io.reactivex.FlowableEmitter;
 import io.reactivex.Maybe;
+import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
@@ -149,7 +153,10 @@ public Builder toBuilder() {
   @Mock private DisplayCallbacksFactory displayCallbacksFactory;
   @Mock private FirebaseInAppMessagingDisplayCallbacks displayCallbacks;
   @Mock private ProgramaticContextualTriggers programaticContextualTriggers;
-  @Mock DeveloperListenerManager developerListenerManager = new DeveloperListenerManager();
+
+  DeveloperListenerManager developerListenerManager =
+      Mockito.spy(new DeveloperListenerManager(TestOnlyExecutors.background()));
+
   FirebaseApp firebaseApp1;
   FirebaseOptions options;
 
@@ -207,7 +214,10 @@ public void setup() {
             dataCollectionHelper,
             firebaseInstallations,
             displayCallbacksFactory,
-            developerListenerManager);
+            developerListenerManager,
+            TestOnlyExecutors.lite());
+
+    developerListenerManager.removeAllListeners();
   }
 
   @Test
@@ -293,4 +303,80 @@ public void addDisplayErrorListener_forwardsEventListenerRequestsToDeveloperList
     firebaseInAppMessaging.addDisplayErrorListener((inAppMessage, error) -> {});
     verify(developerListenerManager, times(1)).addDisplayErrorListener(any());
   }
+
+  @Test
+  public void addRemoveListeners_WorksAsExpected() {
+    FirebaseInAppMessagingClickListener clickListener = (inAppMessage, action) -> {};
+    FirebaseInAppMessagingDismissListener dismissListener = inAppMessage -> {};
+    FirebaseInAppMessagingImpressionListener impressionListener = inAppMessage -> {};
+    FirebaseInAppMessagingDisplayErrorListener displayErrorListener = (inAppMessage, error) -> {};
+
+    verifyListenerPresenceAndListenersCountMatch(null, false, 0);
+
+    firebaseInAppMessaging.addClickListener(clickListener);
+    verifyListenerPresenceAndListenersCountMatch(clickListener, true, 1);
+
+    firebaseInAppMessaging.addDismissListener(dismissListener);
+    verifyListenerPresenceAndListenersCountMatch(dismissListener, true, 2);
+
+    firebaseInAppMessaging.addImpressionListener(impressionListener);
+    verifyListenerPresenceAndListenersCountMatch(impressionListener, true, 3);
+
+    firebaseInAppMessaging.addDisplayErrorListener(displayErrorListener);
+    verifyListenerPresenceAndListenersCountMatch(displayErrorListener, true, 4);
+
+    firebaseInAppMessaging.removeClickListener(clickListener);
+    verifyListenerPresenceAndListenersCountMatch(clickListener, false, 3);
+
+    firebaseInAppMessaging.removeDismissListener(dismissListener);
+    verifyListenerPresenceAndListenersCountMatch(dismissListener, false, 2);
+
+    firebaseInAppMessaging.removeImpressionListener(impressionListener);
+    verifyListenerPresenceAndListenersCountMatch(impressionListener, false, 1);
+
+    firebaseInAppMessaging.removeDisplayErrorListener(displayErrorListener);
+    verifyListenerPresenceAndListenersCountMatch(displayErrorListener, false, 0);
+
+    verifyListenerPresenceAndListenersCountMatch(null, false, 0);
+  }
+
+  @Test
+  public void addRemoveAllListeners_WorksAsExpected() {
+    FirebaseInAppMessagingClickListener clickListener = (inAppMessage, action) -> {};
+    FirebaseInAppMessagingDismissListener dismissListener = inAppMessage -> {};
+    FirebaseInAppMessagingImpressionListener impressionListener = inAppMessage -> {};
+    FirebaseInAppMessagingDisplayErrorListener displayErrorListener = (inAppMessage, error) -> {};
+
+    verifyListenerPresenceAndListenersCountMatch(null, false, 0);
+
+    firebaseInAppMessaging.addClickListener(clickListener);
+    firebaseInAppMessaging.addDismissListener(dismissListener);
+    firebaseInAppMessaging.addImpressionListener(impressionListener);
+    firebaseInAppMessaging.addDisplayErrorListener(displayErrorListener);
+
+    verifyListenerPresenceAndListenersCountMatch(null, false, 4);
+
+    firebaseInAppMessaging.removeAllListeners();
+
+    verifyListenerPresenceAndListenersCountMatch(null, false, 0);
+  }
+
+  /**
+   * Verifies the presence of the provided listener in the set of listeners inside
+   * DeveloperListenerManager.
+   *
+   * @param listener the listener object or null. If null, only count verification will be done.
+   * @param shouldPresent should be present or absent.
+   * @param listenersCount the number of listeners that should be present.
+   */
+  private void verifyListenerPresenceAndListenersCountMatch(
+      @Nullable Object listener, boolean shouldPresent, int listenersCount) {
+    Map listeners = developerListenerManager.getAllListeners();
+
+    if (listener != null) {
+      assertThat(listeners.containsKey(listener)).isEqualTo(shouldPresent);
+    }
+
+    assertThat(listeners.keySet().size()).isEqualTo(listenersCount);
+  }
 }
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AbtIntegrationHelperTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AbtIntegrationHelperTest.java
index 62e9b6065cb..8626a3476a8 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AbtIntegrationHelperTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AbtIntegrationHelperTest.java
@@ -15,9 +15,10 @@
 package com.google.firebase.inappmessaging.internal;
 
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import com.google.firebase.abt.FirebaseABTesting;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.inappmessaging.MessagesProto;
 import com.google.internal.firebase.inappmessaging.v1.CampaignProto;
 import com.google.internal.firebase.inappmessaging.v1.sdkserving.FetchEligibleCampaignsResponse;
@@ -66,7 +67,7 @@ public class AbtIntegrationHelperTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    abtIntegrationHelper = new AbtIntegrationHelper(abTesting);
+    abtIntegrationHelper = new AbtIntegrationHelper(abTesting, TestOnlyExecutors.blocking());
     // make executor immediately execute
     abtIntegrationHelper.executor = Runnable::run;
   }
@@ -74,7 +75,7 @@ public void setUp() {
   @Test
   public void updateRunningExperiments_noExperiments_doesNotCallAbt() {
     abtIntegrationHelper.updateRunningExperiments(noExperimentResponse);
-    verifyZeroInteractions(abTesting);
+    verifyNoInteractions(abTesting);
   }
 
   @Test
@@ -86,6 +87,6 @@ public void updateRunningExperiments_yesExperiments_callsAbt() throws Exception
   @Test
   public void updateRunningExperiments_testExperiments_doesNotCallAbt() throws Exception {
     abtIntegrationHelper.updateRunningExperiments(testExperimentResponse);
-    verifyZeroInteractions(abTesting);
+    verifyNoInteractions(abTesting);
   }
 }
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AnalyticsEventsManagerTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AnalyticsEventsManagerTest.java
index ab6ee7134ea..0ee5d452585 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AnalyticsEventsManagerTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AnalyticsEventsManagerTest.java
@@ -16,8 +16,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.firebase.inappmessaging.CommonTypesProto.Trigger.ON_FOREGROUND;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
 import android.util.Log;
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ApiClientTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ApiClientTest.java
index 99867459bbe..bac8d1cecc3 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ApiClientTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ApiClientTest.java
@@ -15,7 +15,7 @@
 package com.google.firebase.inappmessaging.internal;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/CampaignCacheClientTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/CampaignCacheClientTest.java
index 10327ba4cd7..1740f5211d0 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/CampaignCacheClientTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/CampaignCacheClientTest.java
@@ -15,7 +15,7 @@
 package com.google.firebase.inappmessaging.internal;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
@@ -94,7 +94,7 @@ public void put_noErrors_writesToStorage() {
   @Test
   public void put_noErrors_cachesInMemory() {
     when(storageClient.write(fetchEligibleCampaignsResponse2)).thenReturn(fakeWrite);
-    when(storageClient.read(any(CampaignResponseParser.class)))
+    when(storageClient.read(any(Parser.class)))
         .thenReturn(Maybe.just(fetchEligibleCampaignsResponse1));
 
     campaignCacheClient.put(fetchEligibleCampaignsResponse2).subscribe();
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/DeveloperListenerManagerTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/DeveloperListenerManagerTest.java
index 2bf8517f558..c2ff58ffbb0 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/DeveloperListenerManagerTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/DeveloperListenerManagerTest.java
@@ -15,11 +15,12 @@
 package com.google.firebase.inappmessaging.internal;
 
 import static com.google.firebase.inappmessaging.testutil.TestData.BANNER_MESSAGE_MODEL;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener;
 import com.google.firebase.inappmessaging.FirebaseInAppMessagingDismissListener;
 import com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks;
@@ -51,7 +52,7 @@ public class DeveloperListenerManagerTest {
   @Before
   public void setup() {
     MockitoAnnotations.initMocks(this);
-    developerListenerManager = new DeveloperListenerManager();
+    developerListenerManager = new DeveloperListenerManager(TestOnlyExecutors.background());
   }
 
   @Test
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/DisplayCallbacksImplTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/DisplayCallbacksImplTest.java
index 7c597ff18af..fdb4baced48 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/DisplayCallbacksImplTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/DisplayCallbacksImplTest.java
@@ -32,7 +32,7 @@
 import static com.google.firebase.inappmessaging.testutil.TestData.createBannerMessageCustomMetadata;
 import static io.reactivex.BackpressureStrategy.BUFFER;
 import static io.reactivex.schedulers.Schedulers.trampoline;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -258,6 +258,27 @@ public void logImpression_forVanillaCampaign_recordsImpression() {
     assertThat(wasRecorded).isTrue();
   }
 
+  @Test
+  public void logImpression_forOneMessageShouldNotAffectOtherMessages() {
+    FirebaseInAppMessagingDisplayCallbacks displayCallbacksImplOne =
+        displayCallbacksFactory.generateDisplayCallback(
+            BANNER_TEST_MESSAGE_MODEL, ANALYTICS_EVENT_NAME);
+
+    FirebaseInAppMessagingDisplayCallbacks displayCallbacksImplTwo =
+        displayCallbacksFactory.generateDisplayCallback(
+            BANNER_TEST_MESSAGE_MODEL, ANALYTICS_EVENT_NAME);
+
+    displayCallbacksImplOne.impressionDetected();
+
+    assertThat(((DisplayCallbacksImpl) displayCallbacksImplOne).wasImpressed()).isTrue();
+    assertThat(((DisplayCallbacksImpl) displayCallbacksImplTwo).wasImpressed()).isFalse();
+
+    displayCallbacksImplTwo.impressionDetected();
+
+    assertThat(((DisplayCallbacksImpl) displayCallbacksImplOne).wasImpressed()).isTrue();
+    assertThat(((DisplayCallbacksImpl) displayCallbacksImplTwo).wasImpressed()).isTrue();
+  }
+
   @Test
   public void logImpression_forTestCampaign_doesRecordImpression() {
     displayCallbacksImpl =
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ImpressionStorageClientTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ImpressionStorageClientTest.java
index 5c93d546f6d..28549fee35e 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ImpressionStorageClientTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ImpressionStorageClientTest.java
@@ -16,7 +16,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.firebase.inappmessaging.testutil.TestData.CAMPAIGN_ID_STRING;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
@@ -92,7 +92,7 @@ public void setup() throws IOException {
               return null;
             });
 
-    when(storageClient.read(any(CampaignImpressionsParser.class))).thenReturn(fakeRead);
+    when(storageClient.read(any(Parser.class))).thenReturn(fakeRead);
     when(storageClient.write(any(CampaignImpressionList.class))).thenReturn(fakeWrite);
   }
 
@@ -105,7 +105,7 @@ public void storeImpression_noErrors_writesToStorage() {
 
   @Test
   public void storeImpression_noExistingImpressions_writesToStorage() {
-    when(storageClient.read(any(CampaignImpressionsParser.class))).thenReturn(Maybe.empty());
+    when(storageClient.read(any(Parser.class))).thenReturn(Maybe.empty());
 
     impressionStorageClient.storeImpression(campaignImpression).subscribe();
 
@@ -114,7 +114,7 @@ public void storeImpression_noExistingImpressions_writesToStorage() {
 
   @Test
   public void storeImpression_noErrors_storesAppendedCampaigns() {
-    when(storageClient.read(any(CampaignImpressionsParser.class)))
+    when(storageClient.read(any(Parser.class)))
         .thenReturn(
             Maybe.just(
                 CampaignImpressionList.newBuilder()
@@ -131,7 +131,7 @@ public void storeImpression_noErrors_storesAppendedCampaigns() {
 
   @Test
   public void storeImpression_noExistingCampaigns_storesAppendedCampaigns() {
-    when(storageClient.read(any(CampaignImpressionsParser.class))).thenReturn(Maybe.empty());
+    when(storageClient.read(any(Parser.class))).thenReturn(Maybe.empty());
     ArgumentCaptor<CampaignImpressionList> campaignImpressionListArgumentCaptor =
         ArgumentCaptor.forClass(CampaignImpressionList.class);
     impressionStorageClient.storeImpression(campaignImpression).subscribe();
@@ -145,9 +145,9 @@ public void storeImpression_noExistingCampaigns_storesAppendedCampaigns() {
   public void storeImpression_noErrors_cachesInMemory() {
     CampaignImpressionList otherCampaignImpressionList =
         CampaignImpressionList.getDefaultInstance();
-    when(storageClient.read(any(CampaignImpressionsParser.class))).thenReturn(Maybe.empty());
+    when(storageClient.read(any(Parser.class))).thenReturn(Maybe.empty());
     impressionStorageClient.storeImpression(campaignImpression).subscribe();
-    when(storageClient.read(any(CampaignImpressionsParser.class)))
+    when(storageClient.read(any(Parser.class)))
         .thenReturn(Maybe.just(otherCampaignImpressionList));
 
     TestSubscriber<CampaignImpressionList> subscriber =
@@ -165,9 +165,9 @@ public void storeImpression_writeErrors_doesNotSetInMemoryCache() {
         CampaignImpressionList.getDefaultInstance();
     when(storageClient.write(any(CampaignImpressionList.class)))
         .thenReturn(Completable.error(new IOException()));
-    when(storageClient.read(any(CampaignImpressionsParser.class))).thenReturn(Maybe.empty());
+    when(storageClient.read(any(Parser.class))).thenReturn(Maybe.empty());
     impressionStorageClient.storeImpression(campaignImpression).subscribe();
-    when(storageClient.read(any(CampaignImpressionsParser.class)))
+    when(storageClient.read(any(Parser.class)))
         .thenReturn(Maybe.just(otherCampaignImpressionList));
 
     TestSubscriber<CampaignImpressionList> subscriber =
@@ -189,7 +189,7 @@ public void storeImpression_writeErrors_notifiesError() {
 
   @Test
   public void storeImpression_readErrors_notifiesError() {
-    when(storageClient.read(any(CampaignImpressionsParser.class)))
+    when(storageClient.read(any(Parser.class)))
         .thenReturn(Maybe.error(new IOException()));
 
     TestSubscriber<Object> subscriber =
@@ -208,7 +208,7 @@ public void getAllImpressions_noErrors_returnsCampaignsList() {
 
   @Test
   public void getAllImpressions_readError_notifiesError() {
-    when(storageClient.read(any(CampaignImpressionsParser.class)))
+    when(storageClient.read(any(Parser.class)))
         .thenReturn(Maybe.error(new IOException()));
 
     TestSubscriber<CampaignImpressionList> subscriber =
@@ -242,7 +242,7 @@ public void isImpressed_ifCampaignNotImpressed_isFalse() {
 
   @Test
   public void isImpressed_ifExperimentImpressed_isTrue() {
-    when(storageClient.read(any(CampaignImpressionsParser.class)))
+    when(storageClient.read(any(Parser.class)))
         .thenReturn(Maybe.fromCallable(() -> experimentImpressionList));
     TestSubscriber<Boolean> subscriber =
         impressionStorageClient.isImpressed(experimentalCampaign).toFlowable().test();
@@ -260,7 +260,7 @@ public void isImpressed_ifExperimentNotImpressed_isFalse() {
 
   @Test
   public void isImpressed_ifNoCampaigns_isFalse() {
-    when(storageClient.read(any(CampaignImpressionsParser.class))).thenReturn(Maybe.empty());
+    when(storageClient.read(any(Parser.class))).thenReturn(Maybe.empty());
 
     TestSubscriber<Boolean> subscriber =
         impressionStorageClient.isImpressed(vanillaCampaign).toFlowable().test();
@@ -270,7 +270,7 @@ public void isImpressed_ifNoCampaigns_isFalse() {
 
   @Test
   public void isImpressed_onError_notifiesError() {
-    when(storageClient.read(any(CampaignImpressionsParser.class)))
+    when(storageClient.read(any(Parser.class)))
         .thenReturn(Maybe.error(new IOException()));
 
     TestSubscriber<Boolean> subscriber =
@@ -318,6 +318,4 @@ public void clearImpressions_doesNotClearImpressionForUnfetchedCampaign() {
         impressionStorageClient.isImpressed(vanillaCampaign).toFlowable().test();
     assertThat(subscriber2.getEvents().get(0)).containsExactly(true);
   }
-
-  interface CampaignImpressionsParser extends Parser<CampaignImpressionList> {}
 }
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/InAppMessageStreamManagerTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/InAppMessageStreamManagerTest.java
index 47235113be7..27eb59023ec 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/InAppMessageStreamManagerTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/InAppMessageStreamManagerTest.java
@@ -25,7 +25,7 @@
 import static com.google.firebase.inappmessaging.testutil.TestProtos.BANNER_MESSAGE_PROTO;
 import static io.reactivex.BackpressureStrategy.BUFFER;
 import static io.reactivex.schedulers.Schedulers.trampoline;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -34,6 +34,7 @@
 import android.app.Application;
 import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.inappmessaging.CommonTypesProto.Event;
 import com.google.firebase.inappmessaging.CommonTypesProto.Priority;
 import com.google.firebase.inappmessaging.CommonTypesProto.TriggeringCondition;
@@ -81,6 +82,7 @@ public class InAppMessageStreamManagerTest {
   private static final long FUTURE = NOW + 1000000;
   private static final String INSTALLATION_ID = "instance_id";
   private static final String INSTALLATION_TOKEN = "instance_token";
+  private static final long BLOCKING_EXECUTOR_TIMEOUT = 100;
 
   private static final TriggeringCondition.Builder ON_ANALYTICS_TRIGGER =
       TriggeringCondition.newBuilder().setEvent(Event.newBuilder().setName(ANALYTICS_EVENT_NAME));
@@ -239,7 +241,8 @@ public void setup() {
             testDeviceHelper,
             firebaseInstallations,
             dataCollectionHelper,
-            abtIntegrationHelper);
+            abtIntegrationHelper,
+            TestOnlyExecutors.blocking());
     subscriber = streamManager.createFirebaseInAppMessageStream().test();
     when(application.getApplicationContext()).thenReturn(application);
     when(dataCollectionHelper.isAutomaticDataCollectionEnabled()).thenReturn(true);
@@ -258,22 +261,25 @@ public void setup() {
   }
 
   @Test
-  public void stream_onAppOpen_notifiesSubscriber() {
+  public void stream_onAppOpen_notifiesSubscriber() throws InterruptedException {
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
             campaignImpressionListArgumentCaptor.capture()))
         .thenReturn(campaignsResponse);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, onForegroundTriggered);
   }
 
   @Test
-  public void stream_onAppOpen_dataCollectionDisabled_doesNotFetch() {
+  public void stream_onAppOpen_dataCollectionDisabled_doesNotFetch() throws InterruptedException {
     when(dataCollectionHelper.isAutomaticDataCollectionEnabled()).thenReturn(false);
+
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     subscriber.assertNoValues();
     verify(mockApiClient, times(0)).getFiams(any(), any());
@@ -281,16 +287,18 @@ public void stream_onAppOpen_dataCollectionDisabled_doesNotFetch() {
   }
 
   @Test
-  public void stream_onAppOpen_withEmptyIID_doesNotFetch() {
+  public void stream_onAppOpen_withEmptyIID_doesNotFetch() throws InterruptedException {
     when(firebaseInstallations.getId()).thenReturn(Tasks.forResult(""));
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
+
     verify(mockApiClient, times(0)).getFiams(any(), any());
     verify(campaignCacheClient, times(1)).put(InAppMessageStreamManager.cacheExpiringResponse());
   }
 
   @Test
-  public void stream_onAppOpen_withEmptyFIDToken_doesNotFetch() {
+  public void stream_onAppOpen_withEmptyFIDToken_doesNotFetch() throws InterruptedException {
     when(firebaseInstallations.getToken(false))
         .thenReturn(
             Tasks.forResult(
@@ -317,51 +325,56 @@ public Builder toBuilder() {
                 }));
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
+
     verify(mockApiClient, times(0)).getFiams(any(), any());
     verify(campaignCacheClient, times(1)).put(InAppMessageStreamManager.cacheExpiringResponse());
   }
 
   @Test
-  public void stream_onAnalyticsEvent_notifiesSubscriber() {
+  public void stream_onAnalyticsEvent_notifiesSubscriber() throws InterruptedException {
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
             campaignImpressionListArgumentCaptor.capture()))
         .thenReturn(campaignsResponse);
 
     analyticsEmitter.onNext(ANALYTICS_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, onAnalyticsTriggered);
   }
 
   @Test
-  public void stream_onProgrammaticTrigger_notifiesSubscriber() {
+  public void stream_onProgrammaticTrigger_notifiesSubscriber() throws InterruptedException {
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
             campaignImpressionListArgumentCaptor.capture()))
         .thenReturn(campaignsResponse);
 
     programmaticTriggerEmitter.onNext(ANALYTICS_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, onAnalyticsTriggered);
   }
 
   @Test
-  public void stream_onAppOpen_remainsOpen() {
+  public void stream_onAppOpen_remainsOpen() throws InterruptedException {
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
             campaignImpressionListArgumentCaptor.capture()))
         .thenReturn(campaignsResponse);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     subscriber.assertNotComplete();
   }
 
   @Test
-  public void stream_onUnrelatedForegroundEvent_doesNotTrigger() {
+  public void stream_onUnrelatedForegroundEvent_doesNotTrigger() throws InterruptedException {
     String unrelatedAnalyticsEvent = "some_other_event";
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
@@ -369,13 +382,14 @@ public void stream_onUnrelatedForegroundEvent_doesNotTrigger() {
         .thenReturn(campaignsResponse);
 
     appForegroundEmitter.onNext(unrelatedAnalyticsEvent);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     subscriber.assertNoValues();
   }
 
   @Test
-  public void stream_onUnrelatedAnalyticsEvent_doesNotTrigger() {
+  public void stream_onUnrelatedAnalyticsEvent_doesNotTrigger() throws InterruptedException {
     String unrelatedAnalyticsEvent = "some_other_event";
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
@@ -383,13 +397,14 @@ public void stream_onUnrelatedAnalyticsEvent_doesNotTrigger() {
         .thenReturn(campaignsResponse);
 
     analyticsEmitter.onNext(unrelatedAnalyticsEvent);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     subscriber.assertNoValues();
   }
 
   @Test
-  public void stream_onValidCampaign_notifiesSubscriber() {
+  public void stream_onValidCampaign_notifiesSubscriber() throws InterruptedException {
     ThickContent t =
         thickContentBuilder
             .clearVanillaPayload()
@@ -411,13 +426,14 @@ public void stream_onValidCampaign_notifiesSubscriber() {
         .thenReturn(r);
 
     analyticsEmitter.onNext(ANALYTICS_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, onAnalyticsTriggered);
   }
 
   @Test
-  public void stream_onExpiredCampaign_doesNotTrigger() {
+  public void stream_onExpiredCampaign_doesNotTrigger() throws InterruptedException {
     ThickContent t =
         thickContentBuilder
             .clearVanillaPayload()
@@ -439,13 +455,14 @@ public void stream_onExpiredCampaign_doesNotTrigger() {
         .thenReturn(r);
 
     analyticsEmitter.onNext(ANALYTICS_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     subscriber.assertNoValues();
   }
 
   @Test
-  public void stream_onFutureCampaign_doesNotTrigger() {
+  public void stream_onFutureCampaign_doesNotTrigger() throws InterruptedException {
     ThickContent t =
         thickContentBuilder
             .clearVanillaPayload()
@@ -467,13 +484,14 @@ public void stream_onFutureCampaign_doesNotTrigger() {
         .thenReturn(r);
 
     analyticsEmitter.onNext(ANALYTICS_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     subscriber.assertNoValues();
   }
 
   @Test
-  public void stream_onValidExperiment_notifiesSubscriber() {
+  public void stream_onValidExperiment_notifiesSubscriber() throws InterruptedException {
     ThickContent t =
         thickContentBuilder
             .clearVanillaPayload()
@@ -497,13 +515,14 @@ public void stream_onValidExperiment_notifiesSubscriber() {
         .thenReturn(r);
 
     analyticsEmitter.onNext(ANALYTICS_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, onAnalyticsTriggered);
   }
 
   @Test
-  public void stream_ontestExperiment_doesNotSetExperimentActive() {
+  public void stream_ontestExperiment_doesNotSetExperimentActive() throws InterruptedException {
     ThickContent t =
         thickContentBuilder
             .clearVanillaPayload()
@@ -528,6 +547,7 @@ public void stream_ontestExperiment_doesNotSetExperimentActive() {
         .thenReturn(r);
 
     analyticsEmitter.onNext(ANALYTICS_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, onAnalyticsTriggered);
@@ -535,7 +555,7 @@ public void stream_ontestExperiment_doesNotSetExperimentActive() {
   }
 
   @Test
-  public void stream_onExpiredExperiment_doesNotTrigger() {
+  public void stream_onExpiredExperiment_doesNotTrigger() throws InterruptedException {
     ThickContent t =
         thickContentBuilder
             .clearVanillaPayload()
@@ -558,13 +578,14 @@ public void stream_onExpiredExperiment_doesNotTrigger() {
         .thenReturn(r);
 
     analyticsEmitter.onNext(ANALYTICS_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     subscriber.assertNoValues();
   }
 
   @Test
-  public void stream_onFutureExperiment_doesNotTrigger() {
+  public void stream_onFutureExperiment_doesNotTrigger() throws InterruptedException {
     ThickContent t =
         thickContentBuilder
             .clearVanillaPayload()
@@ -587,13 +608,14 @@ public void stream_onFutureExperiment_doesNotTrigger() {
         .thenReturn(r);
 
     analyticsEmitter.onNext(ANALYTICS_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     subscriber.assertNoValues();
   }
 
   @Test
-  public void stream_onMultipleCampaigns_triggersTestMessage() {
+  public void stream_onMultipleCampaigns_triggersTestMessage() throws InterruptedException {
     ThickContent highPriorityContent =
         ThickContent.newBuilder(thickContent)
             .setPriority(Priority.newBuilder().setValue(1))
@@ -614,6 +636,7 @@ public void stream_onMultipleCampaigns_triggersTestMessage() {
         .thenReturn(r);
 
     analyticsEmitter.onNext(ANALYTICS_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(
@@ -621,7 +644,7 @@ public void stream_onMultipleCampaigns_triggersTestMessage() {
   }
 
   @Test
-  public void stream_onApiClientFailure_absorbsErrors() {
+  public void stream_onApiClientFailure_absorbsErrors() throws InterruptedException {
     Throwable t = new StatusRuntimeException(Status.DATA_LOSS);
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
@@ -629,6 +652,7 @@ public void stream_onApiClientFailure_absorbsErrors() {
         .thenThrow(t);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     subscriber.assertNotComplete();
@@ -637,55 +661,59 @@ public void stream_onApiClientFailure_absorbsErrors() {
   }
 
   @Test
-  public void stream_onCacheHit_notifiesCachedValue() {
+  public void stream_onCacheHit_notifiesCachedValue() throws InterruptedException {
     when(campaignCacheClient.get()).thenReturn(Maybe.just(campaignsResponse));
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedMessageTriggered(subscriber, onForegroundTriggered);
   }
 
   @Test
-  public void stream_onServiceFetchSuccess_cachesValue() {
+  public void stream_onServiceFetchSuccess_cachesValue() throws InterruptedException {
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
             campaignImpressionListArgumentCaptor.capture()))
         .thenReturn(campaignsResponse);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     verify(campaignCacheClient).put(campaignsResponse);
   }
 
   @Test
-  public void stream_onServiceFetchSuccess_updatesContextualTriggers() {
+  public void stream_onServiceFetchSuccess_updatesContextualTriggers() throws InterruptedException {
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
             campaignImpressionListArgumentCaptor.capture()))
         .thenReturn(campaignsResponse);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     verify(analyticsEventsManager).updateContextualTriggers(campaignsResponse);
   }
 
   @Test
-  public void stream_onServiceFetchFailure_doesNotCacheValue() {
+  public void stream_onServiceFetchFailure_doesNotCacheValue() throws InterruptedException {
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
             campaignImpressionListArgumentCaptor.capture()))
         .thenThrow(new RuntimeException("e"));
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     verify(campaignCacheClient, times(0)).put(campaignsResponse);
   }
 
   @Test
-  public void stream_whenAppInstallIsFresh_doesNotCacheValue() {
+  public void stream_whenAppInstallIsFresh_doesNotCacheValue() throws InterruptedException {
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
             campaignImpressionListArgumentCaptor.capture()))
@@ -693,13 +721,14 @@ public void stream_whenAppInstallIsFresh_doesNotCacheValue() {
     when(testDeviceHelper.isAppInstallFresh()).thenReturn(true);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     verify(campaignCacheClient, times(0)).put(any());
   }
 
   @Test
-  public void stream_whenDeviceIsInTestMode_doesNotCacheValue() {
+  public void stream_whenDeviceIsInTestMode_doesNotCacheValue() throws InterruptedException {
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
             campaignImpressionListArgumentCaptor.capture()))
@@ -707,13 +736,15 @@ public void stream_whenDeviceIsInTestMode_doesNotCacheValue() {
     when(testDeviceHelper.isDeviceInTestMode()).thenReturn(true);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     verify(campaignCacheClient, times(0)).put(any());
   }
 
   @Test
-  public void stream_onCacheReadFailure_notifiesValueFetchedFromService() {
+  public void stream_onCacheReadFailure_notifiesValueFetchedFromService()
+      throws InterruptedException {
     when(campaignCacheClient.get()).thenReturn(Maybe.error(new NullPointerException()));
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
@@ -721,13 +752,14 @@ public void stream_onCacheReadFailure_notifiesValueFetchedFromService() {
         .thenReturn(campaignsResponse);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, onForegroundTriggered);
   }
 
   @Test
-  public void stream_onCacheAndApiFail_absorbsFailure() {
+  public void stream_onCacheAndApiFail_absorbsFailure() throws InterruptedException {
     when(campaignCacheClient.get()).thenReturn(Maybe.error(new NullPointerException()));
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
@@ -735,6 +767,7 @@ public void stream_onCacheAndApiFail_absorbsFailure() {
         .thenThrow(new NullPointerException());
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     subscriber.assertNotComplete();
@@ -743,7 +776,7 @@ public void stream_onCacheAndApiFail_absorbsFailure() {
   }
 
   @Test
-  public void stream_onCacheWriteFailure_AbsorbsError() {
+  public void stream_onCacheWriteFailure_AbsorbsError() throws InterruptedException {
     when(campaignCacheClient.put(any(FetchEligibleCampaignsResponse.class)))
         .thenReturn(Completable.error(new NullPointerException()));
     when(mockApiClient.getFiams(
@@ -752,13 +785,14 @@ public void stream_onCacheWriteFailure_AbsorbsError() {
         .thenReturn(campaignsResponse);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, onForegroundTriggered);
   }
 
   @Test
-  public void stream_whenCampaignImpressed_filtersCampaign() {
+  public void stream_whenCampaignImpressed_filtersCampaign() throws InterruptedException {
     when(impressionStorageClient.isImpressed(any(ThickContent.class)))
         .thenReturn(Single.just(true));
     when(mockApiClient.getFiams(
@@ -767,13 +801,15 @@ public void stream_whenCampaignImpressed_filtersCampaign() {
         .thenReturn(campaignsResponse);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     subscriber.assertNoValues();
   }
 
   @Test
-  public void stream_whenCampaignImpressionStoreFails_doesNotFilterCampaign() {
+  public void stream_whenCampaignImpressionStoreFails_doesNotFilterCampaign()
+      throws InterruptedException {
     when(impressionStorageClient.isImpressed(any(ThickContent.class)))
         .thenReturn(Single.error(new Exception("e1")));
     when(mockApiClient.getFiams(
@@ -782,13 +818,15 @@ public void stream_whenCampaignImpressionStoreFails_doesNotFilterCampaign() {
         .thenReturn(campaignsResponse);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, onForegroundTriggered);
   }
 
   @Test
-  public void stream_whenCampaignImpressionStoreFail_doesNotFilterCampaign() {
+  public void stream_whenCampaignImpressionStoreFail_doesNotFilterCampaign()
+      throws InterruptedException {
     when(impressionStorageClient.isImpressed(any(ThickContent.class)))
         .thenReturn(Single.error(new Exception("e1")));
     when(mockApiClient.getFiams(
@@ -797,25 +835,28 @@ public void stream_whenCampaignImpressionStoreFail_doesNotFilterCampaign() {
         .thenReturn(campaignsResponse);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, onForegroundTriggered);
   }
 
   @Test
-  public void stream_whenCampaignImpressionStoreFails_absorbsError() {
+  public void stream_whenCampaignImpressionStoreFails_absorbsError() throws InterruptedException {
     when(impressionStorageClient.getAllImpressions())
         .thenReturn(Maybe.error(new NullPointerException()));
     when(mockApiClient.getFiams(any(InstallationIdResult.class), any(CampaignImpressionList.class)))
         .thenReturn(campaignsResponse);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedMessageTriggered(subscriber, onForegroundTriggered);
   }
 
   @Test
-  public void stream_whenCampaignImpressionStoreFails_wiresEmptyImpressionList() {
+  public void stream_whenCampaignImpressionStoreFails_wiresEmptyImpressionList()
+      throws InterruptedException {
     when(impressionStorageClient.getAllImpressions())
         .thenReturn(Maybe.error(new NullPointerException()));
     when(mockApiClient.getFiams(
@@ -823,13 +864,14 @@ public void stream_whenCampaignImpressionStoreFails_wiresEmptyImpressionList() {
         .thenReturn(campaignsResponse);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertThat(campaignImpressionListArgumentCaptor.getValue())
         .isEqualTo(CampaignImpressionList.getDefaultInstance());
   }
 
   @Test
-  public void stream_whenAppOpenRateLimited_doesNotTrigger() {
+  public void stream_whenAppOpenRateLimited_doesNotTrigger() throws InterruptedException {
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
             campaignImpressionListArgumentCaptor.capture()))
@@ -837,13 +879,14 @@ public void stream_whenAppOpenRateLimited_doesNotTrigger() {
     when(rateLimiterClient.isRateLimited(appForegroundRateLimit)).thenReturn(Single.just(true));
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     subscriber.assertNoValues();
   }
 
   @Test
-  public void stream_whenAppOpenRateLimited_stillTriggersTestMessage() {
+  public void stream_whenAppOpenRateLimited_stillTriggersTestMessage() throws InterruptedException {
     when(rateLimiterClient.isRateLimited(appForegroundRateLimit)).thenReturn(Single.just(true));
     when(testDeviceHelper.isDeviceInTestMode()).thenReturn(true);
     ThickContent testMessageContent =
@@ -869,13 +912,14 @@ public void stream_whenAppOpenRateLimited_stillTriggersTestMessage() {
         .thenReturn(response);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, testTriggered);
   }
 
   @Test
-  public void stream_alwaysTriggersTestMessagesOnAppForground() {
+  public void stream_alwaysTriggersTestMessagesOnAppForeground() throws InterruptedException {
     when(rateLimiterClient.isRateLimited(appForegroundRateLimit)).thenReturn(Single.just(false));
     when(testDeviceHelper.isDeviceInTestMode()).thenReturn(true);
     ThickContent testMessageContent =
@@ -901,13 +945,14 @@ public void stream_alwaysTriggersTestMessagesOnAppForground() {
         .thenReturn(r);
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, testTriggered);
   }
 
   @Test
-  public void stream_whenRateLimitingClientFails_triggers() {
+  public void stream_whenRateLimitingClientFails_triggers() throws InterruptedException {
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
             campaignImpressionListArgumentCaptor.capture()))
@@ -916,13 +961,15 @@ public void stream_whenRateLimitingClientFails_triggers() {
         .thenReturn(Single.error(new NullPointerException("e1")));
 
     appForegroundEmitter.onNext(ON_FOREGROUND_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, onForegroundTriggered);
   }
 
   @Test
-  public void stream_whenAppOpenRateLimited_notifiesAnalyticsSubscriber() {
+  public void stream_whenAppOpenRateLimited_notifiesAnalyticsSubscriber()
+      throws InterruptedException {
     when(mockApiClient.getFiams(
             installationIdResultArgumentCaptor.capture(),
             campaignImpressionListArgumentCaptor.capture()))
@@ -930,8 +977,13 @@ public void stream_whenAppOpenRateLimited_notifiesAnalyticsSubscriber() {
     when(rateLimiterClient.isRateLimited(appForegroundRateLimit)).thenReturn(Single.just(true));
 
     analyticsEmitter.onNext(ANALYTICS_EVENT_NAME);
+    waitForBlockingExecutor();
 
     assertExpectedGetFiamsCall();
     assertExpectedMessageTriggered(subscriber, onAnalyticsTriggered);
   }
+
+  private static void waitForBlockingExecutor() throws InterruptedException {
+    TestOnlyExecutors.blocking().awaitTermination(BLOCKING_EXECUTOR_TIMEOUT, TimeUnit.MILLISECONDS);
+  }
 }
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/MetricsLoggerClientTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/MetricsLoggerClientTest.java
index ca074a008e7..8348fb3a40a 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/MetricsLoggerClientTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/MetricsLoggerClientTest.java
@@ -23,7 +23,7 @@
 import static com.google.firebase.inappmessaging.testutil.TestData.CAMPAIGN_ID_STRING;
 import static com.google.firebase.inappmessaging.testutil.TestData.CAMPAIGN_NAME_STRING;
 import static com.google.firebase.inappmessaging.testutil.TestData.CARD_MESSAGE_WITHOUT_ACTIONS;
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -35,6 +35,7 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.analytics.connector.AnalyticsConnector;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.inappmessaging.CampaignAnalytics;
 import com.google.firebase.inappmessaging.DismissType;
 import com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingDismissType;
@@ -46,6 +47,7 @@
 import com.google.firebase.inappmessaging.internal.time.FakeClock;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -55,9 +57,11 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
+@LooperMode(LooperMode.Mode.LEGACY)
 public class MetricsLoggerClientTest {
   private static final long PAST = 1000000;
   private static final long NOW = PAST + 100000;
@@ -66,6 +70,7 @@ public class MetricsLoggerClientTest {
   private static final String INSTALLATION_ID = "instance_id";
   private static final String INSTALLATION_TOKEN = "instance_token";
   private static final String PROJECT_NUMBER = "project_number";
+  private static final long BLOCKING_EXECUTOR_TIMEOUT = 100;
 
   private final FirebaseOptions firebaseOptions =
       new FirebaseOptions.Builder()
@@ -101,11 +106,12 @@ public void setup() throws NameNotFoundException {
             firebaseApp,
             firebaseInstallations,
             clock,
-            developerListenerManager);
+            developerListenerManager,
+            TestOnlyExecutors.blocking());
   }
 
   @Test
-  public void logImpression_proxiesRequestToEngagementMetricsClient() {
+  public void logImpression_proxiesRequestToEngagementMetricsClient() throws InterruptedException {
     metricsLoggerClient =
         new MetricsLoggerClient(
             engagementMetricsLoggerInterface,
@@ -113,14 +119,17 @@ public void logImpression_proxiesRequestToEngagementMetricsClient() {
             firebaseApp,
             firebaseInstallations,
             clock,
-            developerListenerManager);
+            developerListenerManager,
+            TestOnlyExecutors.blocking());
 
     metricsLoggerClient.logImpression(BANNER_MESSAGE_MODEL);
-    verify(engagementMetricsLoggerInterface).logEvent(anyObject());
+    waitForBlockingExecutor();
+
+    verify(engagementMetricsLoggerInterface).logEvent(any());
   }
 
   @Test
-  public void logImpression_alertsImpressionListeners() {
+  public void logImpression_alertsImpressionListeners() throws InterruptedException {
     metricsLoggerClient =
         new MetricsLoggerClient(
             engagementMetricsLoggerInterface,
@@ -128,14 +137,18 @@ public void logImpression_alertsImpressionListeners() {
             firebaseApp,
             firebaseInstallations,
             clock,
-            developerListenerManager);
+            developerListenerManager,
+            TestOnlyExecutors.blocking());
 
     metricsLoggerClient.logImpression(BANNER_MESSAGE_MODEL);
+    waitForBlockingExecutor();
+
     verify(developerListenerManager, times(1)).impressionDetected(BANNER_MESSAGE_MODEL);
   }
 
   @Test
-  public void logImpression_alertsImpressionListenerAndSetsConversionPropWithoutActions() {
+  public void logImpression_alertsImpressionListenerAndSetsConversionPropWithoutActions()
+      throws InterruptedException {
     metricsLoggerClient =
         new MetricsLoggerClient(
             engagementMetricsLoggerInterface,
@@ -143,9 +156,12 @@ public void logImpression_alertsImpressionListenerAndSetsConversionPropWithoutAc
             firebaseApp,
             firebaseInstallations,
             clock,
-            developerListenerManager);
+            developerListenerManager,
+            TestOnlyExecutors.blocking());
 
     metricsLoggerClient.logImpression(CARD_MESSAGE_WITHOUT_ACTIONS);
+    waitForBlockingExecutor();
+
     verify(developerListenerManager, times(1)).impressionDetected(CARD_MESSAGE_WITHOUT_ACTIONS);
     // sets conversion user prop
     verify(analyticsConnector, times(1))
@@ -156,15 +172,18 @@ public void logImpression_alertsImpressionListenerAndSetsConversionPropWithoutAc
   }
 
   @Test
-  public void logImpression_failsGracefullyWithNoAnalytics() {
+  public void logImpression_failsGracefullyWithNoAnalytics() throws InterruptedException {
     metricsLoggerClient.logImpression(BANNER_MESSAGE_MODEL);
+    waitForBlockingExecutor();
 
-    verify(engagementMetricsLoggerInterface).logEvent(anyObject());
+    verify(engagementMetricsLoggerInterface).logEvent(any());
   }
 
   @Test
-  public void logImpression_setsCampaignId() throws InvalidProtocolBufferException {
+  public void logImpression_setsCampaignId()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logImpression(BANNER_MESSAGE_MODEL);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -174,8 +193,10 @@ public void logImpression_setsCampaignId() throws InvalidProtocolBufferException
   }
 
   @Test
-  public void logImpression_setsApplicationId() throws InvalidProtocolBufferException {
+  public void logImpression_setsApplicationId()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logImpression(BANNER_MESSAGE_MODEL);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -185,8 +206,10 @@ public void logImpression_setsApplicationId() throws InvalidProtocolBufferExcept
   }
 
   @Test
-  public void logImpression_setsInstanceId() throws InvalidProtocolBufferException {
+  public void logImpression_setsInstanceId()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logImpression(BANNER_MESSAGE_MODEL);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -196,8 +219,10 @@ public void logImpression_setsInstanceId() throws InvalidProtocolBufferException
   }
 
   @Test
-  public void logImpression_setsImpressionEventType() throws InvalidProtocolBufferException {
+  public void logImpression_setsImpressionEventType()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logImpression(BANNER_MESSAGE_MODEL);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -207,8 +232,10 @@ public void logImpression_setsImpressionEventType() throws InvalidProtocolBuffer
   }
 
   @Test
-  public void logImpression_setsClientTimestamp() throws InvalidProtocolBufferException {
+  public void logImpression_setsClientTimestamp()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logImpression(BANNER_MESSAGE_MODEL);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -218,23 +245,28 @@ public void logImpression_setsClientTimestamp() throws InvalidProtocolBufferExce
   }
 
   @Test
-  public void logMessageClick_proxiesRequestToEngagementMetricsClient() {
+  public void logMessageClick_proxiesRequestToEngagementMetricsClient()
+      throws InterruptedException {
     metricsLoggerClient.logMessageClick(BANNER_MESSAGE_MODEL, BANNER_MESSAGE_MODEL.getAction());
+    waitForBlockingExecutor();
 
-    verify(engagementMetricsLoggerInterface).logEvent(anyObject());
+    verify(engagementMetricsLoggerInterface).logEvent(any());
   }
 
   @Test
-  public void logMessageClick_notifiesListeners() {
+  public void logMessageClick_notifiesListeners() throws InterruptedException {
     metricsLoggerClient.logMessageClick(BANNER_MESSAGE_MODEL, BANNER_MESSAGE_MODEL.getAction());
+    waitForBlockingExecutor();
 
     verify(developerListenerManager, times(1))
         .messageClicked(BANNER_MESSAGE_MODEL, BANNER_MESSAGE_MODEL.getAction());
   }
 
   @Test
-  public void logMessageClick_setsCampaignId() throws InvalidProtocolBufferException {
+  public void logMessageClick_setsCampaignId()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logMessageClick(BANNER_MESSAGE_MODEL, BANNER_MESSAGE_MODEL.getAction());
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -244,8 +276,10 @@ public void logMessageClick_setsCampaignId() throws InvalidProtocolBufferExcepti
   }
 
   @Test
-  public void logMessageClick_setsApplicationId() throws InvalidProtocolBufferException {
+  public void logMessageClick_setsApplicationId()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logMessageClick(BANNER_MESSAGE_MODEL, BANNER_MESSAGE_MODEL.getAction());
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -255,8 +289,10 @@ public void logMessageClick_setsApplicationId() throws InvalidProtocolBufferExce
   }
 
   @Test
-  public void logMessageClick_setsInstanceId() throws InvalidProtocolBufferException {
+  public void logMessageClick_setsInstanceId()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logMessageClick(BANNER_MESSAGE_MODEL, BANNER_MESSAGE_MODEL.getAction());
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -266,8 +302,10 @@ public void logMessageClick_setsInstanceId() throws InvalidProtocolBufferExcepti
   }
 
   @Test
-  public void logMessageClick_setsClickEventType() throws InvalidProtocolBufferException {
+  public void logMessageClick_setsClickEventType()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logMessageClick(BANNER_MESSAGE_MODEL, BANNER_MESSAGE_MODEL.getAction());
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -277,8 +315,10 @@ public void logMessageClick_setsClickEventType() throws InvalidProtocolBufferExc
   }
 
   @Test
-  public void logMessageClick_setsClientTimestamp() throws InvalidProtocolBufferException {
+  public void logMessageClick_setsClientTimestamp()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logMessageClick(BANNER_MESSAGE_MODEL, BANNER_MESSAGE_MODEL.getAction());
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -288,17 +328,19 @@ public void logMessageClick_setsClientTimestamp() throws InvalidProtocolBufferEx
   }
 
   @Test
-  public void logRenderError_proxiesRequestToEngagementMetricsClient() {
+  public void logRenderError_proxiesRequestToEngagementMetricsClient() throws InterruptedException {
     metricsLoggerClient.logRenderError(
         BANNER_MESSAGE_MODEL, InAppMessagingErrorReason.UNSPECIFIED_RENDER_ERROR);
+    waitForBlockingExecutor();
 
-    verify(engagementMetricsLoggerInterface).logEvent(anyObject());
+    verify(engagementMetricsLoggerInterface).logEvent(any());
   }
 
   @Test
-  public void logRenderError_notifiesListeners() {
+  public void logRenderError_notifiesListeners() throws InterruptedException {
     metricsLoggerClient.logRenderError(
         BANNER_MESSAGE_MODEL, InAppMessagingErrorReason.UNSPECIFIED_RENDER_ERROR);
+    waitForBlockingExecutor();
 
     verify(developerListenerManager, times(1))
         .displayErrorEncountered(
@@ -306,9 +348,11 @@ public void logRenderError_notifiesListeners() {
   }
 
   @Test
-  public void logRenderError_setsCampaignId() throws InvalidProtocolBufferException {
+  public void logRenderError_setsCampaignId()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logRenderError(
         BANNER_MESSAGE_MODEL, InAppMessagingErrorReason.UNSPECIFIED_RENDER_ERROR);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -318,9 +362,11 @@ public void logRenderError_setsCampaignId() throws InvalidProtocolBufferExceptio
   }
 
   @Test
-  public void logRenderError_setsApplicationId() throws InvalidProtocolBufferException {
+  public void logRenderError_setsApplicationId()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logRenderError(
         BANNER_MESSAGE_MODEL, InAppMessagingErrorReason.UNSPECIFIED_RENDER_ERROR);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -330,9 +376,11 @@ public void logRenderError_setsApplicationId() throws InvalidProtocolBufferExcep
   }
 
   @Test
-  public void logRenderError_setsInstanceId() throws InvalidProtocolBufferException {
+  public void logRenderError_setsInstanceId()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logRenderError(
         BANNER_MESSAGE_MODEL, InAppMessagingErrorReason.UNSPECIFIED_RENDER_ERROR);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -343,9 +391,10 @@ public void logRenderError_setsInstanceId() throws InvalidProtocolBufferExceptio
 
   @Test
   public void logRenderError_withGenericRenderErrorReason_setsEquivalentErrorReason()
-      throws InvalidProtocolBufferException {
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logRenderError(
         BANNER_MESSAGE_MODEL, InAppMessagingErrorReason.UNSPECIFIED_RENDER_ERROR);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -357,9 +406,10 @@ public void logRenderError_withGenericRenderErrorReason_setsEquivalentErrorReaso
 
   @Test
   public void logRenderError_withImageFetchRenderError_setsEquivalentErrorReason()
-      throws InvalidProtocolBufferException {
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logRenderError(
         BANNER_MESSAGE_MODEL, InAppMessagingErrorReason.IMAGE_FETCH_ERROR);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -371,9 +421,10 @@ public void logRenderError_withImageFetchRenderError_setsEquivalentErrorReason()
 
   @Test
   public void logRenderError_withImageDisplayError_setsEquivalentErrorReason()
-      throws InvalidProtocolBufferException {
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logRenderError(
         BANNER_MESSAGE_MODEL, InAppMessagingErrorReason.IMAGE_DISPLAY_ERROR);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -385,9 +436,10 @@ public void logRenderError_withImageDisplayError_setsEquivalentErrorReason()
 
   @Test
   public void logRenderError_withUnsupportedFiam_setsEquivalentErrorReason()
-      throws InvalidProtocolBufferException {
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logRenderError(
         BANNER_MESSAGE_MODEL, InAppMessagingErrorReason.IMAGE_UNSUPPORTED_FORMAT);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -398,9 +450,11 @@ public void logRenderError_withUnsupportedFiam_setsEquivalentErrorReason()
   }
 
   @Test
-  public void logRenderError_setsClientTimestamp() throws InvalidProtocolBufferException {
+  public void logRenderError_setsClientTimestamp()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logRenderError(
         BANNER_MESSAGE_MODEL, InAppMessagingErrorReason.UNSPECIFIED_RENDER_ERROR);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -410,24 +464,28 @@ public void logRenderError_setsClientTimestamp() throws InvalidProtocolBufferExc
   }
 
   @Test
-  public void logDismiss_proxiesRequestToEngagementMetricsClient() {
+  public void logDismiss_proxiesRequestToEngagementMetricsClient() throws InterruptedException {
     metricsLoggerClient.logDismiss(
         BANNER_MESSAGE_MODEL, InAppMessagingDismissType.UNKNOWN_DISMISS_TYPE);
+    waitForBlockingExecutor();
 
-    verify(engagementMetricsLoggerInterface).logEvent(anyObject());
+    verify(engagementMetricsLoggerInterface).logEvent(any());
   }
 
   @Test
-  public void logDismiss_notifiesListeners() {
+  public void logDismiss_notifiesListeners() throws InterruptedException {
     metricsLoggerClient.logDismiss(BANNER_MESSAGE_MODEL, InAppMessagingDismissType.CLICK);
+    waitForBlockingExecutor();
 
     verify(developerListenerManager, times(1)).messageDismissed(BANNER_MESSAGE_MODEL);
   }
 
   @Test
-  public void logDismiss_setsCampaignId() throws InvalidProtocolBufferException {
+  public void logDismiss_setsCampaignId()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logDismiss(
         BANNER_MESSAGE_MODEL, InAppMessagingDismissType.UNKNOWN_DISMISS_TYPE);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -437,9 +495,11 @@ public void logDismiss_setsCampaignId() throws InvalidProtocolBufferException {
   }
 
   @Test
-  public void logDismiss_setsApplicationId() throws InvalidProtocolBufferException {
+  public void logDismiss_setsApplicationId()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logDismiss(
         BANNER_MESSAGE_MODEL, InAppMessagingDismissType.UNKNOWN_DISMISS_TYPE);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -449,9 +509,11 @@ public void logDismiss_setsApplicationId() throws InvalidProtocolBufferException
   }
 
   @Test
-  public void logDismiss_setsInstanceId() throws InvalidProtocolBufferException {
+  public void logDismiss_setsInstanceId()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logDismiss(
         BANNER_MESSAGE_MODEL, InAppMessagingDismissType.UNKNOWN_DISMISS_TYPE);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -462,9 +524,10 @@ public void logDismiss_setsInstanceId() throws InvalidProtocolBufferException {
 
   @Test
   public void logDismiss_withUnknownDismissType_setsEquivalentDismissType()
-      throws InvalidProtocolBufferException {
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logDismiss(
         BANNER_MESSAGE_MODEL, InAppMessagingDismissType.UNKNOWN_DISMISS_TYPE);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -475,8 +538,9 @@ public void logDismiss_withUnknownDismissType_setsEquivalentDismissType()
 
   @Test
   public void logDismiss_withAutoDismissType_setsEquivalentDismissType()
-      throws InvalidProtocolBufferException {
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logDismiss(BANNER_MESSAGE_MODEL, InAppMessagingDismissType.AUTO);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -487,8 +551,9 @@ public void logDismiss_withAutoDismissType_setsEquivalentDismissType()
 
   @Test
   public void logDismiss_withClickDismissType_setsEquivalentDismissType()
-      throws InvalidProtocolBufferException {
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logDismiss(BANNER_MESSAGE_MODEL, InAppMessagingDismissType.CLICK);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -499,8 +564,9 @@ public void logDismiss_withClickDismissType_setsEquivalentDismissType()
 
   @Test
   public void logDismiss_withSwipeDismissType_setsEquivalentDismissType()
-      throws InvalidProtocolBufferException {
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logDismiss(BANNER_MESSAGE_MODEL, InAppMessagingDismissType.SWIPE);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -510,9 +576,11 @@ public void logDismiss_withSwipeDismissType_setsEquivalentDismissType()
   }
 
   @Test
-  public void logDismiss_setsClientTimestamp() throws InvalidProtocolBufferException {
+  public void logDismiss_setsClientTimestamp()
+      throws InvalidProtocolBufferException, InterruptedException {
     metricsLoggerClient.logDismiss(
         BANNER_MESSAGE_MODEL, InAppMessagingDismissType.UNKNOWN_DISMISS_TYPE);
+    waitForBlockingExecutor();
 
     verify(engagementMetricsLoggerInterface).logEvent(byteArrayCaptor.capture());
 
@@ -522,7 +590,7 @@ public void logDismiss_setsClientTimestamp() throws InvalidProtocolBufferExcepti
   }
 
   @Test
-  public void logImpression_sendsCorrectScionEventWithParams() {
+  public void logImpression_sendsCorrectScionEventWithParams() throws InterruptedException {
     FakeAnalyticsConnector analytics = new FakeAnalyticsConnector();
     metricsLoggerClient =
         new MetricsLoggerClient(
@@ -531,9 +599,12 @@ public void logImpression_sendsCorrectScionEventWithParams() {
             firebaseApp,
             firebaseInstallations,
             clock,
-            developerListenerManager);
+            developerListenerManager,
+            TestOnlyExecutors.blocking());
 
     metricsLoggerClient.logImpression(BANNER_MESSAGE_MODEL);
+    waitForBlockingExecutor();
+
     LoggedEvent actual = analytics.getLoggedEvent().get(0);
 
     assertThat(actual.origin).isEqualTo(AnalyticsConstants.ORIGIN_FIAM);
@@ -550,7 +621,7 @@ public void logImpression_sendsCorrectScionEventWithParams() {
   }
 
   @Test
-  public void logClick_sendsCorrectScionEventName() {
+  public void logClick_sendsCorrectScionEventName() throws InterruptedException {
     metricsLoggerClient =
         new MetricsLoggerClient(
             engagementMetricsLoggerInterface,
@@ -558,9 +629,11 @@ public void logClick_sendsCorrectScionEventName() {
             firebaseApp,
             firebaseInstallations,
             clock,
-            developerListenerManager);
+            developerListenerManager,
+            TestOnlyExecutors.blocking());
 
     metricsLoggerClient.logMessageClick(BANNER_MESSAGE_MODEL, BANNER_MESSAGE_MODEL.getAction());
+    waitForBlockingExecutor();
 
     assertThat(analytics.getLoggedEvent().size()).isEqualTo(1);
     LoggedEvent actual = analytics.getLoggedEvent().get(0);
@@ -570,7 +643,7 @@ public void logClick_sendsCorrectScionEventName() {
   }
 
   @Test
-  public void logDismisssendsCorrectScionEventName() {
+  public void logDismisssendsCorrectScionEventName() throws InterruptedException {
     metricsLoggerClient =
         new MetricsLoggerClient(
             engagementMetricsLoggerInterface,
@@ -578,9 +651,11 @@ public void logDismisssendsCorrectScionEventName() {
             firebaseApp,
             firebaseInstallations,
             clock,
-            developerListenerManager);
+            developerListenerManager,
+            TestOnlyExecutors.blocking());
 
     metricsLoggerClient.logMessageClick(BANNER_MESSAGE_MODEL, BANNER_MESSAGE_MODEL.getAction());
+    waitForBlockingExecutor();
 
     assertThat(analytics.getLoggedEvent().size()).isEqualTo(1);
     LoggedEvent actual = analytics.getLoggedEvent().get(0);
@@ -590,7 +665,7 @@ public void logDismisssendsCorrectScionEventName() {
   }
 
   @Test
-  public void logEvent_sendsEventParams() {
+  public void logEvent_sendsEventParams() throws InterruptedException {
     metricsLoggerClient =
         new MetricsLoggerClient(
             engagementMetricsLoggerInterface,
@@ -598,9 +673,11 @@ public void logEvent_sendsEventParams() {
             firebaseApp,
             firebaseInstallations,
             clock,
-            developerListenerManager);
+            developerListenerManager,
+            TestOnlyExecutors.blocking());
 
     metricsLoggerClient.logImpression(BANNER_MESSAGE_MODEL);
+    waitForBlockingExecutor();
 
     assertThat(analytics.getLoggedEvent().size()).isEqualTo(1);
     LoggedEvent actual = analytics.getLoggedEvent().get(0);
@@ -619,7 +696,7 @@ public void logEvent_sendsEventParams() {
   }
 
   @Test
-  public void logEvent_addsConversionTrackingOnAction() {
+  public void logEvent_addsConversionTrackingOnAction() throws InterruptedException {
     metricsLoggerClient =
         new MetricsLoggerClient(
             engagementMetricsLoggerInterface,
@@ -627,15 +704,18 @@ public void logEvent_addsConversionTrackingOnAction() {
             firebaseApp,
             firebaseInstallations,
             clock,
-            developerListenerManager);
+            developerListenerManager,
+            TestOnlyExecutors.blocking());
 
     metricsLoggerClient.logImpression(BANNER_MESSAGE_MODEL);
     metricsLoggerClient.logDismiss(
         BANNER_MESSAGE_MODEL, InAppMessagingDismissType.UNKNOWN_DISMISS_TYPE);
+    waitForBlockingExecutor();
 
     assertThat(analytics.getSetUserProperty().size()).isEqualTo(0);
 
     metricsLoggerClient.logMessageClick(BANNER_MESSAGE_MODEL, BANNER_MESSAGE_MODEL.getAction());
+    waitForBlockingExecutor();
 
     assertThat(analytics.getSetUserProperty().size()).isEqualTo(1);
     LoggedUserProperty actual = analytics.getSetUserProperty().get(0);
@@ -646,7 +726,7 @@ public void logEvent_addsConversionTrackingOnAction() {
   }
 
   @Test
-  public void logEvent_addsConversionTrackingOnClickWhenNoAction() {
+  public void logEvent_addsConversionTrackingOnClickWhenNoAction() throws InterruptedException {
     metricsLoggerClient =
         new MetricsLoggerClient(
             engagementMetricsLoggerInterface,
@@ -654,14 +734,17 @@ public void logEvent_addsConversionTrackingOnClickWhenNoAction() {
             firebaseApp,
             firebaseInstallations,
             clock,
-            developerListenerManager);
+            developerListenerManager,
+            TestOnlyExecutors.blocking());
 
     metricsLoggerClient.logDismiss(
         BANNER_MESSAGE_NO_ACTION_MODEL, InAppMessagingDismissType.UNKNOWN_DISMISS_TYPE);
+    waitForBlockingExecutor();
 
     assertThat(analytics.getSetUserProperty().size()).isEqualTo(0);
 
     metricsLoggerClient.logImpression(BANNER_MESSAGE_NO_ACTION_MODEL);
+    waitForBlockingExecutor();
 
     assertThat(analytics.getSetUserProperty().size()).isEqualTo(1);
     LoggedUserProperty actual = analytics.getSetUserProperty().get(0);
@@ -672,7 +755,7 @@ public void logEvent_addsConversionTrackingOnClickWhenNoAction() {
   }
 
   @Test
-  public void metricsLoggerClient_doesNotLogTestCampaigns() {
+  public void metricsLoggerClient_doesNotLogTestCampaigns() throws InterruptedException {
     metricsLoggerClient.logImpression(BANNER_TEST_MESSAGE_MODEL);
     metricsLoggerClient.logMessageClick(
         BANNER_TEST_MESSAGE_MODEL, BANNER_TEST_MESSAGE_MODEL.getAction());
@@ -680,7 +763,12 @@ public void metricsLoggerClient_doesNotLogTestCampaigns() {
         BANNER_TEST_MESSAGE_MODEL, InAppMessagingDismissType.UNKNOWN_DISMISS_TYPE);
     metricsLoggerClient.logRenderError(
         BANNER_TEST_MESSAGE_MODEL, InAppMessagingErrorReason.UNSPECIFIED_RENDER_ERROR);
+    waitForBlockingExecutor();
+
+    verify(engagementMetricsLoggerInterface, never()).logEvent(any());
+  }
 
-    verify(engagementMetricsLoggerInterface, never()).logEvent(anyObject());
+  private static void waitForBlockingExecutor() throws InterruptedException {
+    TestOnlyExecutors.blocking().awaitTermination(BLOCKING_EXECUTOR_TIMEOUT, TimeUnit.MILLISECONDS);
   }
 }
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ProxyAnalyticsConnectorTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ProxyAnalyticsConnectorTest.java
index dbfc905be61..67fc62c4528 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ProxyAnalyticsConnectorTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ProxyAnalyticsConnectorTest.java
@@ -14,8 +14,8 @@
 
 package com.google.firebase.inappmessaging.internal;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/RateLimiterClientTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/RateLimiterClientTest.java
index 454dd0c84e8..9a3cddded22 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/RateLimiterClientTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/RateLimiterClientTest.java
@@ -15,10 +15,11 @@
 package com.google.firebase.inappmessaging.internal;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.MockitoAnnotations.openMocks;
 
 import com.google.firebase.inappmessaging.internal.RateLimitProto.Counter;
 import com.google.firebase.inappmessaging.internal.time.FakeClock;
@@ -84,7 +85,7 @@ public void setup() throws IOException {
 
     rateLimiterClient = new RateLimiterClient(storageClient, new FakeClock(NOW));
 
-    when(storageClient.read(any(RateLimitParser.class))).thenReturn(fakeRead);
+    when(storageClient.read(any(Parser.class))).thenReturn(fakeRead);
     when(storageClient.write(any(RateLimitProto.RateLimit.class))).thenReturn(fakeWrite);
   }
 
@@ -97,7 +98,7 @@ public void increment_noErrors_writesToStorage() {
 
   @Test
   public void increment_noExistingCounter_writesToStorage() {
-    when(storageClient.read(any(RateLimitParser.class))).thenReturn(Maybe.empty());
+    when(storageClient.read(any(Parser.class))).thenReturn(Maybe.empty());
 
     rateLimiterClient.increment(rateLimit).subscribe();
 
@@ -117,7 +118,7 @@ public void increment_noErrors_incrementsCounter() {
 
   @Test
   public void increment_noExistingLimits_initializesLimits() {
-    when(storageClient.read(any(RateLimitParser.class))).thenReturn(Maybe.empty());
+    when(storageClient.read(any(Parser.class))).thenReturn(Maybe.empty());
     ArgumentCaptor<RateLimitProto.RateLimit> rateLimitCaptor =
         ArgumentCaptor.forClass(RateLimitProto.RateLimit.class);
 
@@ -168,7 +169,7 @@ public void increment_noCounterForLimit_initializesCounter() {
   @Test
   public void increment_noErrors_cachesInMemory() {
     rateLimiterClient.increment(rateLimit).subscribe();
-    when(storageClient.read(any(RateLimitParser.class))).thenReturn(Maybe.empty());
+    when(storageClient.read(any(Parser.class))).thenReturn(Maybe.empty());
 
     TestObserver<Boolean> testObserver = rateLimiterClient.isRateLimited(rateLimit).test();
 
@@ -181,7 +182,7 @@ public void increment_writeErrors_doesNotSetInMemoryCache() {
         RateLimit.builder().setLimit(2).setLimiterKey("OTHER_KEY").setTimeToLiveMillis(TTL).build();
     when(storageClient.write(any(RateLimitProto.RateLimit.class)))
         .thenReturn(Completable.error(new IOException()));
-    when(storageClient.read(any(RateLimitParser.class))).thenReturn(Maybe.empty());
+    when(storageClient.read(any(Parser.class))).thenReturn(Maybe.empty());
     rateLimiterClient.increment(otherLimit).subscribe();
     rateLimiterClient.increment(otherLimit).subscribe();
     rateLimiterClient.increment(otherLimit).subscribe();
@@ -203,7 +204,7 @@ public void increment_writeErrors_notifiesError() {
 
   @Test
   public void increment_readErrors_notifiesError() {
-    when(storageClient.read(any(RateLimitParser.class))).thenReturn(Maybe.error(new IOException()));
+    when(storageClient.read(any(Parser.class))).thenReturn(Maybe.error(new IOException()));
 
     TestObserver<Boolean> testObserver = rateLimiterClient.isRateLimited(rateLimit).test();
 
@@ -245,7 +246,7 @@ public void isRateLimited_ifExpired_isFalse() {
 
   @Test
   public void isRateLimited_ifNoLimits_isFalse() {
-    when(storageClient.read(any(RateLimitParser.class))).thenReturn(Maybe.empty());
+    when(storageClient.read(any(Parser.class))).thenReturn(Maybe.empty());
     RateLimit oneLimit =
         RateLimit.builder().setLimit(1).setLimiterKey(LIMITER_KEY).setTimeToLiveMillis(TTL).build();
 
@@ -256,12 +257,10 @@ public void isRateLimited_ifNoLimits_isFalse() {
 
   @Test
   public void isRateLimited_readError_notifiesError() {
-    when(storageClient.read(any(RateLimitParser.class))).thenReturn(Maybe.error(new IOException()));
+    when(storageClient.read(any(Parser.class))).thenReturn(Maybe.error(new IOException()));
 
     TestObserver<Boolean> testObserver = rateLimiterClient.isRateLimited(rateLimit).test();
 
     testObserver.assertError(IOException.class);
   }
-
-  interface RateLimitParser extends Parser<RateLimitProto.RateLimit> {}
 }
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/SharedPreferencesUtilsTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/SharedPreferencesUtilsTest.java
index 2b31c838bdd..cfb5b0dd8c6 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/SharedPreferencesUtilsTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/SharedPreferencesUtilsTest.java
@@ -15,7 +15,7 @@
 package com.google.firebase.inappmessaging.internal;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
diff --git a/firebase-installations-interop/CHANGELOG.md b/firebase-installations-interop/CHANGELOG.md
new file mode 100644
index 00000000000..7e1c5ca7f52
--- /dev/null
+++ b/firebase-installations-interop/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Unreleased
+* [changed] Release to align with ktx changes
+
+
diff --git a/firebase-installations-interop/api.txt b/firebase-installations-interop/api.txt
index f15ea828d7d..82087808935 100644
--- a/firebase-installations-interop/api.txt
+++ b/firebase-installations-interop/api.txt
@@ -1,7 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.installations {
 
-  public abstract class InstallationTokenResult {
+  @com.google.auto.value.AutoValue public abstract class InstallationTokenResult {
     ctor public InstallationTokenResult();
     method @NonNull public abstract String getToken();
     method @NonNull public abstract long getTokenExpirationTimestamp();
diff --git a/firebase-installations-interop/firebase-installations-interop.gradle b/firebase-installations-interop/firebase-installations-interop.gradle
index 4c719ffa5e0..d629f815445 100644
--- a/firebase-installations-interop/firebase-installations-interop.gradle
+++ b/firebase-installations-interop/firebase-installations-interop.gradle
@@ -17,31 +17,37 @@ plugins {
     id 'firebase-library'
 }
 
-firebaseLibrary.publishJavadoc = false
+firebaseLibrary {
+    publishJavadoc = false
+    publishReleaseNotes = false
+}
 
 android {
-	compileSdkVersion project.targetSdkVersion
-	defaultConfig {
-		minSdkVersion project.minSdkVersion
-		targetSdkVersion project.targetSdkVersion
-		versionName version
-		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-	}
-	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
-	 }
-	 testOptions {
-	 	unitTests {
-			includeAndroidResources = true
-		}
-	}
+    namespace "com.google.firebase.installations.interop"
+    compileSdkVersion project.compileSdkVersion
+    defaultConfig {
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
+        versionName version
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+     }
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
-	implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation project(path: ':firebase-annotations')
+    api 'com.google.firebase:firebase-annotations:16.2.0'
+
+    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
 
     compileOnly "com.google.auto.value:auto-value-annotations:1.6.5"
-	annotationProcessor "com.google.auto.value:auto-value:1.6.2"
+
+    annotationProcessor "com.google.auto.value:auto-value:1.6.2"
 }
diff --git a/firebase-installations-interop/gradle.properties b/firebase-installations-interop/gradle.properties
index 54be3eb478f..962eb5d49b6 100644
--- a/firebase-installations-interop/gradle.properties
+++ b/firebase-installations-interop/gradle.properties
@@ -1,2 +1,2 @@
-version=17.0.1
-latestReleasedVersion=17.0.0
+version=18.0.0
+latestReleasedVersion=17.2.0
diff --git a/firebase-installations-interop/src/main/AndroidManifest.xml b/firebase-installations-interop/src/main/AndroidManifest.xml
index 7ae18eafe43..0648ac31dea 100644
--- a/firebase-installations-interop/src/main/AndroidManifest.xml
+++ b/firebase-installations-interop/src/main/AndroidManifest.xml
@@ -13,5 +13,6 @@
 <!-- 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="com.google.firebase.installations.interop" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" >
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
+</manifest>
diff --git a/firebase-installations-interop/src/main/java/com/google/firebase/installations/FirebaseInstallationsApi.java b/firebase-installations-interop/src/main/java/com/google/firebase/installations/FirebaseInstallationsApi.java
index 9178498e4e3..595e3c77fad 100644
--- a/firebase-installations-interop/src/main/java/com/google/firebase/installations/FirebaseInstallationsApi.java
+++ b/firebase-installations-interop/src/main/java/com/google/firebase/installations/FirebaseInstallationsApi.java
@@ -48,9 +48,9 @@ public interface FirebaseInstallationsApi {
   Task<InstallationTokenResult> getToken(boolean forceRefresh);
 
   /**
-   * Async function that deletes this Firebase app installation from Firebase backend. This call
-   * would possibly lead Firebase Notification, Firebase RemoteConfig, Firebase Predictions or
-   * Firebase In-App Messaging not function properly.
+   * Async function that deletes this Firebase app installation from Firebase backend. This call may
+   * cause Firebase Cloud Messaging, Firebase Remote Config, Firebase A/B Testing, or Firebase
+   * In-App Messaging to not function properly.
    */
   @NonNull
   Task<Void> delete();
diff --git a/firebase-installations/CHANGELOG.md b/firebase-installations/CHANGELOG.md
index 1b8baeab0a2..ecf23d70e18 100644
--- a/firebase-installations/CHANGELOG.md
+++ b/firebase-installations/CHANGELOG.md
@@ -1,4 +1,41 @@
-# v17.0.0
+# Unreleased
+
+
+# 18.0.0
+* [changed] Bump internal dependencies
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-installations` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.2.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-installations-ktx`
+  to `com.google.firebase:firebase-installations` under the `com.google.firebase.installations` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-installations-ktx` have been added to
+  `com.google.firebase:firebase-installations` under the `com.google.firebase.installations` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-installations-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-installations` library. The Kotlin extensions library has no additional
+updates.
+
+# 17.1.3
+* [changed] Internal changes to improve startup time
+
+# 17.1.2
+* [fixed] Updated `firebase-common` to its latest version (v20.3.0) to fix an issue that was 
+  causing a nondeterministic crash on startup.
+
+# 17.1.0
+* [changed] Internal changes to ensure functionality alignment with other
+  SDK releases. For more details, refer to the
+  [Firebase Instance ID v21.1.0 release notes](/support/release-notes/android#iid_v21-1-0).
 
-- [added] The Firebase Installations Service is an infrastructure service for Firebase services that creates unique identifiers and authentication tokens for Firebase clients (called "Firebase Installations") enabling Firebase Targeting, i.e. interoperation between Firebase services.
-- [added] The Firebase Installations SDK introduces the Firebase Installations API. Developers that use API-restrictions for their API-Key may experience blocked requests (https://stackoverflow.com/questions/58495985/). This problem can be mitigated by following the instructions found [here](API_KEY_RESTRICTIONS.md).
\ No newline at end of file
diff --git a/firebase-installations/api.txt b/firebase-installations/api.txt
index 78e4549555e..9e99e69d965 100644
--- a/firebase-installations/api.txt
+++ b/firebase-installations/api.txt
@@ -10,5 +10,19 @@ package com.google.firebase.installations {
     method @NonNull public com.google.firebase.installations.internal.FidListenerHandle registerFidListener(@NonNull com.google.firebase.installations.internal.FidListener);
   }
 
+  public final class InstallationsKt {
+    method @NonNull public static com.google.firebase.installations.FirebaseInstallations getInstallations(@NonNull com.google.firebase.Firebase);
+    method @NonNull public static com.google.firebase.installations.FirebaseInstallations installations(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+  }
+
+}
+
+package com.google.firebase.installations.ktx {
+
+  public final class InstallationsKt {
+    method @Deprecated @NonNull public static com.google.firebase.installations.FirebaseInstallations getInstallations(@NonNull com.google.firebase.ktx.Firebase);
+    method @Deprecated @NonNull public static com.google.firebase.installations.FirebaseInstallations installations(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+  }
+
 }
 
diff --git a/firebase-installations/firebase-installations.gradle b/firebase-installations/firebase-installations.gradle
index 331bb783032..37d2885d17f 100644
--- a/firebase-installations/firebase-installations.gradle
+++ b/firebase-installations/firebase-installations.gradle
@@ -15,10 +15,16 @@
 
 plugins {
     id 'firebase-library'
+    id("kotlin-android")
+}
+
+firebaseLibrary {
+    libraryGroup "installations"
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.installations"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
@@ -30,6 +36,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions { jvmTarget = "1.8" }
     testOptions {
         unitTests {
             includeAndroidResources = true
@@ -38,31 +45,43 @@ android {
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-installations-interop')
-    implementation project(':firebase-components')
+    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
 
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api 'com.google.firebase:firebase-annotations:16.2.0'
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
+    api 'com.google.firebase:firebase-installations-interop:17.1.0'
+    api("com.google.firebase:firebase-installations-interop:17.1.1")
 
-    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     compileOnly "com.google.auto.value:auto-value-annotations:1.6.5"
+
     annotationProcessor "com.google.auto.value:auto-value:1.6.2"
 
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation(project(":integ-testing")){
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
+    testImplementation 'org.mockito:mockito-core:5.2.0'
+    testImplementation 'org.mockito:mockito-inline:5.2.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'org.mockito:mockito-inline:2.25.0'
 
-    androidTestImplementation project(':integ-testing')
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation(project(":integ-testing")){
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    androidTestImplementation "androidx.annotation:annotation:1.0.0"
     androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
     androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation "androidx.annotation:annotation:1.0.0"
     androidTestImplementation 'org.mockito:mockito-core:2.25.0'
     androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
 }
diff --git a/firebase-installations/gradle.properties b/firebase-installations/gradle.properties
index 54be3eb478f..9b7be4891d1 100644
--- a/firebase-installations/gradle.properties
+++ b/firebase-installations/gradle.properties
@@ -1,2 +1,2 @@
-version=17.0.1
-latestReleasedVersion=17.0.0
+version=18.0.1
+latestReleasedVersion=18.0.0
diff --git a/firebase-installations/ktx/api.txt b/firebase-installations/ktx/api.txt
index 6f16e5fefff..5e4b3374897 100644
--- a/firebase-installations/ktx/api.txt
+++ b/firebase-installations/ktx/api.txt
@@ -1,10 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.installations.ktx {
 
-  public final class InstallationsKt {
-    ctor public InstallationsKt();
-    method @NonNull public static com.google.firebase.installations.FirebaseInstallations getInstallations(@NonNull com.google.firebase.ktx.Firebase);
-    method @NonNull public static com.google.firebase.installations.FirebaseInstallations installations(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-installations/ktx/ktx.gradle b/firebase-installations/ktx/ktx.gradle
index 6f9da73016c..f6873f2fea9 100644
--- a/firebase-installations/ktx/ktx.gradle
+++ b/firebase-installations/ktx/ktx.gradle
@@ -14,17 +14,19 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-installations')
-    publishJavadoc = true
+    libraryGroup "installations"
+    publishJavadoc = false
+    publishReleaseNotes = false
     publishSources = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.installations.ktx"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
         multiDexEnabled true
@@ -37,20 +39,22 @@ android {
         test.java.srcDirs += 'src/test/kotlin'
         androidTest.java.srcDirs += 'src/androidTest/kotlin'
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api(project(":firebase-installations"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-installations-interop:17.1.1")
 
-    implementation project(':firebase-common')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-components')
-    implementation project(':firebase-installations')
-    implementation project(':firebase-installations-interop')
+    implementation("com.google.firebase:firebase-components:18.0.0")
 
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.13'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation 'junit:junit:4.13'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
diff --git a/firebase-installations/ktx/src/main/AndroidManifest.xml b/firebase-installations/ktx/src/main/AndroidManifest.xml
index 10261e8f548..477db160ce1 100644
--- a/firebase-installations/ktx/src/main/AndroidManifest.xml
+++ b/firebase-installations/ktx/src/main/AndroidManifest.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.installations.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <service
             android:name="com.google.firebase.components.ComponentDiscoveryService"
             android:exported="false">
             <meta-data
-                android:name="com.google.firebase.components:com.google.firebase.installations.ktx.FirebaseInstallationsKtxRegistrar"
+                android:name="com.google.firebase.components:com.google.firebase.installations.ktx.FirebaseInstallationsLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/firebase-installations/ktx/src/main/kotlin/com/google/firebase/installations/ktx/Installations.kt b/firebase-installations/ktx/src/main/kotlin/com/google/firebase/installations/ktx/Installations.kt
deleted file mode 100644
index 3cc8897a5d7..00000000000
--- a/firebase-installations/ktx/src/main/kotlin/com/google/firebase/installations/ktx/Installations.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.installations.ktx
-
-import com.google.firebase.FirebaseApp
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.installations.FirebaseInstallations
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.platforminfo.LibraryVersionComponent
-
-/** Returns the [FirebaseInstallations] instance of the default [FirebaseApp]. */
-val Firebase.installations: FirebaseInstallations
-    get() = FirebaseInstallations.getInstance()
-
-/** Returns the [FirebaseInstallations] instance of a given [FirebaseApp]. */
-fun Firebase.installations(app: FirebaseApp): FirebaseInstallations =
-        FirebaseInstallations.getInstance(app)
-
-internal const val LIBRARY_NAME: String = "fire-installations-ktx"
-
-/** @suppress */
-class FirebaseInstallationsKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-installations/ktx/src/main/kotlin/com/google/firebase/installations/ktx/Logging.kt b/firebase-installations/ktx/src/main/kotlin/com/google/firebase/installations/ktx/Logging.kt
new file mode 100644
index 00000000000..d746430fb6e
--- /dev/null
+++ b/firebase-installations/ktx/src/main/kotlin/com/google/firebase/installations/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.installations.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.installations.BuildConfig
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-installations-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseInstallationsLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-installations/ktx/src/test/kotlin/com/google/firebase/installations/ktx/InstallationsTests.kt b/firebase-installations/ktx/src/test/kotlin/com/google/firebase/installations/ktx/InstallationsTests.kt
index 367d838e87a..4d169997ae7 100644
--- a/firebase-installations/ktx/src/test/kotlin/com/google/firebase/installations/ktx/InstallationsTests.kt
+++ b/firebase-installations/ktx/src/test/kotlin/com/google/firebase/installations/ktx/InstallationsTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.installations.ktx
 
@@ -35,53 +37,54 @@ const val API_KEY = "API_KEY"
 const val EXISTING_APP = "existing"
 
 abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
 
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build(),
-                EXISTING_APP
-        )
-    }
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
 
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class InstallationsTests : BaseTestCase() {
-    @Test
-    fun `installations should delegate to FirebaseInstallations#getInstance()`() {
-        Truth.assertThat(Firebase.installations).isSameInstanceAs(FirebaseInstallations.getInstance())
-    }
+  @Test
+  fun `installations should delegate to FirebaseInstallations#getInstance()`() {
+    Truth.assertThat(Firebase.installations).isSameInstanceAs(FirebaseInstallations.getInstance())
+  }
 
-    @Test
-    fun `installations(app) should delegate to FirebaseInstallations#getInstance(FirebaseApp)`() {
-        val app = Firebase.app(EXISTING_APP)
-        Truth.assertThat(Firebase.installations(app)).isSameInstanceAs(FirebaseInstallations.getInstance(app))
-    }
+  @Test
+  fun `installations(app) should delegate to FirebaseInstallations#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    Truth.assertThat(Firebase.installations(app))
+      .isSameInstanceAs(FirebaseInstallations.getInstance(app))
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun `library version should be registered with runtime`() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        Truth.assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    Truth.assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
 }
diff --git a/firebase-installations/src/androidTest/AndroidManifest.xml b/firebase-installations/src/androidTest/AndroidManifest.xml
index f9fb55a7b56..abdd103bbab 100644
--- a/firebase-installations/src/androidTest/AndroidManifest.xml
+++ b/firebase-installations/src/androidTest/AndroidManifest.xml
@@ -13,8 +13,7 @@
 <!-- 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="com.google.firebase.installations">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <uses-library android:name="android.test.runner"/>
diff --git a/firebase-installations/src/androidTest/java/com/google/firebase/installations/StrictModeTest.java b/firebase-installations/src/androidTest/java/com/google/firebase/installations/StrictModeTest.java
index e56a1222c3b..9a5830f5588 100644
--- a/firebase-installations/src/androidTest/java/com/google/firebase/installations/StrictModeTest.java
+++ b/firebase-installations/src/androidTest/java/com/google/firebase/installations/StrictModeTest.java
@@ -19,7 +19,6 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions.Builder;
 import com.google.firebase.testing.integ.StrictModeRule;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,7 +29,6 @@ public class StrictModeTest {
   @Rule public StrictModeRule strictMode = new StrictModeRule();
 
   @Test
-  @Ignore("enable once strict mode violations are addressed")
   public void initializingFirebaseInstallations_shouldNotViolateStrictMode() {
     strictMode.runOnMainThread(
         () -> {
diff --git a/firebase-installations/src/androidTest/java/com/google/firebase/installations/local/PersistedInstallationEntrySubject.java b/firebase-installations/src/androidTest/java/com/google/firebase/installations/local/PersistedInstallationEntrySubject.java
index d2b91e5a58d..f4484069d76 100644
--- a/firebase-installations/src/androidTest/java/com/google/firebase/installations/local/PersistedInstallationEntrySubject.java
+++ b/firebase-installations/src/androidTest/java/com/google/firebase/installations/local/PersistedInstallationEntrySubject.java
@@ -19,13 +19,12 @@
 import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.Subject;
 import com.google.firebase.installations.local.PersistedInstallation.RegistrationStatus;
-import org.checkerframework.checker.nullness.compatqual.NullableDecl;
 
 public final class PersistedInstallationEntrySubject extends Subject {
 
   // User-defined entry point
   public static PersistedInstallationEntrySubject assertThat(
-      @NullableDecl PersistedInstallationEntry persistedInstallationEntry) {
+      PersistedInstallationEntry persistedInstallationEntry) {
     return assertAbout(PERSISTED_INSTALLATION_ENTRY_SUBJECT_FACTORY)
         .that(persistedInstallationEntry);
   }
@@ -45,13 +44,13 @@ public static PersistedInstallationEntrySubject assertThat(
 
   /**
    * Constructor for use by subclasses. If you want to create an instance of this class itself, call
-   * {@link Subject#check(String, Object ...) check(...)}{@code .that(actual)}.
+   * {@link Subject#check(String, Object...)}}{@code .that(actual)}.
    *
    * @param metadata
    * @param actual
    */
   protected PersistedInstallationEntrySubject(
-      FailureMetadata metadata, @NullableDecl PersistedInstallationEntry actual) {
+      FailureMetadata metadata, PersistedInstallationEntry actual) {
     super(metadata, actual);
     this.actual = actual;
   }
diff --git a/firebase-installations/src/main/AndroidManifest.xml b/firebase-installations/src/main/AndroidManifest.xml
index 2308668ad52..94840d4da74 100644
--- a/firebase-installations/src/main/AndroidManifest.xml
+++ b/firebase-installations/src/main/AndroidManifest.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.installations">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service
             android:name="com.google.firebase.components.ComponentDiscoveryService"
-            android:exported="false">
+            android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data
                 android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
diff --git a/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java b/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java
index fa397612a31..2dee7d87d98 100644
--- a/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java
+++ b/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.installations;
 
+import android.annotation.SuppressLint;
 import android.text.TextUtils;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
@@ -25,6 +26,7 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
+import com.google.firebase.components.Lazy;
 import com.google.firebase.heartbeatinfo.HeartBeatController;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsException.Status;
@@ -42,11 +44,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -65,11 +65,11 @@ public class FirebaseInstallations implements FirebaseInstallationsApi {
   private final FirebaseInstallationServiceClient serviceClient;
   private final PersistedInstallation persistedInstallation;
   private final Utils utils;
-  private final IidStore iidStore;
+  private final Lazy<IidStore> iidStore;
   private final RandomFidGenerator fidGenerator;
   private final Object lock = new Object();
   private final ExecutorService backgroundExecutor;
-  private final ExecutorService networkExecutor;
+  private final Executor networkExecutor;
   /* FID of this Firebase Installations instance. Cached after successfully registering and
   persisting the FID locally. NOTE: cachedFid resets if FID is deleted.*/
   @GuardedBy("this")
@@ -95,6 +95,8 @@ public class FirebaseInstallations implements FirebaseInstallationsApi {
         private final AtomicInteger mCount = new AtomicInteger(1);
 
         @Override
+        // TODO(b/258422917): Migrate to go/firebase-android-executors
+        @SuppressLint("ThreadPoolCreation")
         public Thread newThread(Runnable r) {
           return new Thread(
               r, String.format("firebase-installations-executor-%d", mCount.getAndIncrement()));
@@ -122,32 +124,35 @@ public Thread newThread(Runnable r) {
           + "Please retry your last request.";
 
   /** package private constructor. */
+  // TODO(b/258422917): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   FirebaseInstallations(
-      FirebaseApp firebaseApp, @NonNull Provider<HeartBeatController> heartBeatProvider) {
+      FirebaseApp firebaseApp,
+      @NonNull Provider<HeartBeatController> heartBeatProvider,
+      @NonNull ExecutorService backgroundExecutor,
+      @NonNull Executor networkExecutor) {
     this(
-        new ThreadPoolExecutor(
-            CORE_POOL_SIZE,
-            MAXIMUM_POOL_SIZE,
-            KEEP_ALIVE_TIME_IN_SECONDS,
-            TimeUnit.SECONDS,
-            new LinkedBlockingQueue<>(),
-            THREAD_FACTORY),
+        backgroundExecutor,
+        networkExecutor,
         firebaseApp,
         new FirebaseInstallationServiceClient(
             firebaseApp.getApplicationContext(), heartBeatProvider),
         new PersistedInstallation(firebaseApp),
         Utils.getInstance(),
-        new IidStore(firebaseApp),
+        new Lazy<>(() -> new IidStore(firebaseApp)),
         new RandomFidGenerator());
   }
 
+  // TODO(b/258422917): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   FirebaseInstallations(
       ExecutorService backgroundExecutor,
+      Executor networkExecutor,
       FirebaseApp firebaseApp,
       FirebaseInstallationServiceClient serviceClient,
       PersistedInstallation persistedInstallation,
       Utils utils,
-      IidStore iidStore,
+      Lazy<IidStore> iidStore,
       RandomFidGenerator fidGenerator) {
     this.firebaseApp = firebaseApp;
     this.serviceClient = serviceClient;
@@ -156,14 +161,7 @@ public Thread newThread(Runnable r) {
     this.iidStore = iidStore;
     this.fidGenerator = fidGenerator;
     this.backgroundExecutor = backgroundExecutor;
-    this.networkExecutor =
-        new ThreadPoolExecutor(
-            CORE_POOL_SIZE,
-            MAXIMUM_POOL_SIZE,
-            KEEP_ALIVE_TIME_IN_SECONDS,
-            TimeUnit.SECONDS,
-            new LinkedBlockingQueue<>(),
-            THREAD_FACTORY);
+    this.networkExecutor = networkExecutor;
   }
 
   /**
@@ -266,7 +264,7 @@ public Task<InstallationTokenResult> getToken(boolean forceRefresh) {
 
   /**
    * Call to delete this Firebase app installation from the Firebase backend. This call may cause
-   * Firebase Cloud Messaging, Firebase Remote Config, Firebase Predictions, or Firebase In-App
+   * Firebase Cloud Messaging, Firebase Remote Config, Firebase A/B Testing, or Firebase In-App
    * Messaging to not function properly.
    */
   @NonNull
@@ -374,6 +372,10 @@ private final void doRegistrationOrRefresh(boolean forceRefresh) {
     networkExecutor.execute(() -> doNetworkCallIfNecessary(forceRefresh));
   }
 
+  private IidStore getIidStore() {
+    return iidStore.get();
+  }
+
   private void doNetworkCallIfNecessary(boolean forceRefresh) {
     PersistedInstallationEntry prefs = getMultiProcessSafePrefs();
     // There are two possible cleanup steps to perform at this stage: the FID may need to
@@ -422,7 +424,8 @@ private void doNetworkCallIfNecessary(boolean forceRefresh) {
   private synchronized void updateFidListener(
       PersistedInstallationEntry prefs, PersistedInstallationEntry updatedPrefs) {
     if (fidListeners.size() != 0
-        && !prefs.getFirebaseInstallationId().equals(updatedPrefs.getFirebaseInstallationId())) {
+        && !TextUtils.equals(
+            prefs.getFirebaseInstallationId(), updatedPrefs.getFirebaseInstallationId())) {
       // Update all the registered FidListener about fid changes.
       for (FidListener listener : fidListeners) {
         listener.onFidChanged(updatedPrefs.getFirebaseInstallationId());
@@ -505,7 +508,7 @@ private String readExistingIidOrCreateFid(PersistedInstallationEntry prefs) {
       return fidGenerator.createRandomFid();
     }
     // For a default/chime firebase installation, read the existing iid from shared prefs
-    String fid = iidStore.readIid();
+    String fid = getIidStore().readIid();
     if (TextUtils.isEmpty(fid)) {
       fid = fidGenerator.createRandomFid();
     }
@@ -523,7 +526,7 @@ private PersistedInstallationEntry registerFidWithServer(PersistedInstallationEn
         && prefs.getFirebaseInstallationId().length() == 11) {
       // For a default firebase installation, read the stored star scoped iid token. This token
       // will be used for authenticating Instance-ID when migrating to FIS.
-      iidToken = iidStore.readToken();
+      iidToken = getIidStore().readToken();
     }
 
     InstallationResponse response =
diff --git a/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallationsRegistrar.java b/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallationsRegistrar.java
index f50186beeea..e1ff8711c98 100644
--- a/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallationsRegistrar.java
+++ b/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallationsRegistrar.java
@@ -16,31 +16,45 @@
 
 import androidx.annotation.Keep;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import com.google.firebase.concurrent.FirebaseExecutors;
 import com.google.firebase.heartbeatinfo.HeartBeatConsumerComponent;
 import com.google.firebase.heartbeatinfo.HeartBeatController;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 
 /** @hide */
 @Keep
 public class FirebaseInstallationsRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-installations";
 
   @Override
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(FirebaseInstallationsApi.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.optionalProvider(HeartBeatController.class))
+            .add(Dependency.required(Qualified.qualified(Background.class, ExecutorService.class)))
+            .add(Dependency.required(Qualified.qualified(Blocking.class, Executor.class)))
             .factory(
                 c ->
                     new FirebaseInstallations(
-                        c.get(FirebaseApp.class), c.getProvider(HeartBeatController.class)))
+                        c.get(FirebaseApp.class),
+                        c.getProvider(HeartBeatController.class),
+                        c.get(Qualified.qualified(Background.class, ExecutorService.class)),
+                        FirebaseExecutors.newSequentialExecutor(
+                            c.get(Qualified.qualified(Blocking.class, Executor.class)))))
             .build(),
         HeartBeatConsumerComponent.create(),
-        LibraryVersionComponent.create("fire-installations", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-installations/src/main/java/com/google/firebase/installations/Installations.kt b/firebase-installations/src/main/java/com/google/firebase/installations/Installations.kt
new file mode 100644
index 00000000000..d14a20af690
--- /dev/null
+++ b/firebase-installations/src/main/java/com/google/firebase/installations/Installations.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.installations
+
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+
+/** Returns the [FirebaseInstallations] instance of the default [FirebaseApp]. */
+val Firebase.installations: FirebaseInstallations
+  get() = FirebaseInstallations.getInstance()
+
+/** Returns the [FirebaseInstallations] instance of a given [FirebaseApp]. */
+fun Firebase.installations(app: FirebaseApp): FirebaseInstallations =
+  FirebaseInstallations.getInstance(app)
+
+/** @suppress */
+class FirebaseInstallationsKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-installations/src/main/java/com/google/firebase/installations/ktx/Installations.kt b/firebase-installations/src/main/java/com/google/firebase/installations/ktx/Installations.kt
new file mode 100644
index 00000000000..3ab350e5e9e
--- /dev/null
+++ b/firebase-installations/src/main/java/com/google/firebase/installations/ktx/Installations.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.installations.ktx
+
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.installations.FirebaseInstallations
+import com.google.firebase.ktx.Firebase
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseInstallations] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.installations: FirebaseInstallations
+  get() = FirebaseInstallations.getInstance()
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseInstallations] instance of a given [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.installations(app: FirebaseApp): FirebaseInstallations =
+  FirebaseInstallations.getInstance(app)
+
+/** @suppress */
+@Deprecated(
+  "com.google.firebase.installations.FirebaseInstallationsKtxRegistrar has been deprecated. Use `com.google.firebase.installationsFirebaseInstallationsKtxRegistrar` instead.",
+  ReplaceWith("")
+)
+class FirebaseInstallationsKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-installations/src/main/java/com/google/firebase/installations/remote/FirebaseInstallationServiceClient.java b/firebase-installations/src/main/java/com/google/firebase/installations/remote/FirebaseInstallationServiceClient.java
index 0311c3b196c..6fadab50145 100644
--- a/firebase-installations/src/main/java/com/google/firebase/installations/remote/FirebaseInstallationServiceClient.java
+++ b/firebase-installations/src/main/java/com/google/firebase/installations/remote/FirebaseInstallationServiceClient.java
@@ -26,9 +26,10 @@
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 import com.google.android.gms.common.util.AndroidUtilsLight;
 import com.google.android.gms.common.util.Hex;
-import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.heartbeatinfo.HeartBeatController;
 import com.google.firebase.inject.Provider;
diff --git a/firebase-installations/src/test/java/com/google/firebase/installations/FirebaseInstallationsTest.java b/firebase-installations/src/test/java/com/google/firebase/installations/FirebaseInstallationsTest.java
index 49ddc2a66d3..e344c9459eb 100644
--- a/firebase-installations/src/test/java/com/google/firebase/installations/FirebaseInstallationsTest.java
+++ b/firebase-installations/src/test/java/com/google/firebase/installations/FirebaseInstallationsTest.java
@@ -14,12 +14,11 @@
 
 package com.google.firebase.installations;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
@@ -30,7 +29,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import android.content.SharedPreferences;
@@ -38,6 +37,9 @@
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
+import com.google.firebase.components.Lazy;
+import com.google.firebase.concurrent.FirebaseExecutors;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.installations.FirebaseInstallationsException.Status;
 import com.google.firebase.installations.internal.FidListenerHandle;
 import com.google.firebase.installations.local.IidStore;
@@ -50,9 +52,8 @@
 import com.google.firebase.installations.remote.TokenResult;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
@@ -68,7 +69,8 @@
 @RunWith(RobolectricTestRunner.class)
 public class FirebaseInstallationsTest {
   private FirebaseApp firebaseApp;
-  private ExecutorService executor;
+  private ExecutorService backgroundExecutor;
+  private Executor networkExecutor;
   private PersistedInstallation persistedInstallation;
   @Mock private FirebaseInstallationServiceClient mockBackend;
   @Mock private IidStore mockIidStore;
@@ -140,7 +142,8 @@ public class FirebaseInstallationsTest {
   public void setUp() {
     MockitoAnnotations.initMocks(this);
     FirebaseApp.clearInstancesForTest();
-    executor = new ThreadPoolExecutor(0, 1, 30L, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
+    backgroundExecutor = TestOnlyExecutors.background();
+    networkExecutor = FirebaseExecutors.newSequentialExecutor(TestOnlyExecutors.blocking());
 
     firebaseApp =
         FirebaseApp.initializeApp(
@@ -157,12 +160,13 @@ public void setUp() {
     utils = Utils.getInstance(fakeClock);
     firebaseInstallations =
         new FirebaseInstallations(
-            executor,
+            backgroundExecutor,
+            networkExecutor,
             firebaseApp,
             mockBackend,
             persistedInstallation,
             utils,
-            mockIidStore,
+            new Lazy(() -> mockIidStore),
             mockFidGenerator);
 
     when(mockFidGenerator.createRandomFid()).thenReturn(TEST_FID_1);
@@ -172,7 +176,7 @@ public void setUp() {
   public void cleanUp() {
     persistedInstallation.clearForTesting();
     try {
-      executor.awaitTermination(250, TimeUnit.MILLISECONDS);
+      backgroundExecutor.awaitTermination(250, TimeUnit.MILLISECONDS);
     } catch (InterruptedException e) {
 
     }
@@ -202,19 +206,19 @@ public void testGetId_noNetwork_noIid() throws Exception {
     // Confirm both that it returns the expected ID, as does reading the prefs from storage.
     TestOnCompleteListener<String> onCompleteListener = new TestOnCompleteListener<>();
     Task<String> task = firebaseInstallations.getId();
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     String fid = onCompleteListener.await();
     assertWithMessage("getId Task failed.").that(fid).isEqualTo(TEST_FID_1);
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo(TEST_FID_1));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo(TEST_FID_1);
 
     // Waiting for Task that registers FID on the FIS Servers
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
+    backgroundExecutor.awaitTermination(500, TimeUnit.MILLISECONDS);
 
     // The storage should still have the same ID and the status should indicate that the
     // fid is registered.
     entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo(TEST_FID_1));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo(TEST_FID_1);
     assertTrue("the entry isn't unregistered: " + entry, entry.isUnregistered());
   }
 
@@ -237,19 +241,19 @@ public void testGetId_noNetwork_iidPresent() throws Exception {
     // Confirm both that it returns the expected ID, as does reading the prefs from storage.
     TestOnCompleteListener<String> onCompleteListener = new TestOnCompleteListener<>();
     Task<String> task = firebaseInstallations.getId();
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     String fid = onCompleteListener.await();
     assertWithMessage("getId Task failed.").that(fid).isEqualTo(TEST_INSTANCE_ID_1);
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo(TEST_INSTANCE_ID_1));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo(TEST_INSTANCE_ID_1);
 
     // Waiting for Task that registers FID on the FIS Servers
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
+    backgroundExecutor.awaitTermination(500, TimeUnit.MILLISECONDS);
 
     // The storage should still have the same ID and the status should indicate that the
     // fid is registered.
     entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo(TEST_INSTANCE_ID_1));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo(TEST_INSTANCE_ID_1);
     assertTrue("the entry doesn't have an uregistered fid: " + entry, entry.isUnregistered());
   }
 
@@ -268,17 +272,17 @@ public void testGetId_noNetwork_fidAlreadyGenerated() throws Exception {
     // Confirm both that it returns the expected ID, as does reading the prefs from storage.
     TestOnCompleteListener<String> onCompleteListener = new TestOnCompleteListener<>();
     Task<String> task = firebaseInstallations.getId();
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     String fid = onCompleteListener.await();
     assertWithMessage("getId Task failed.").that(fid).isEqualTo("generatedFid");
 
     // Waiting for Task that registers FID on the FIS Servers
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
+    backgroundExecutor.awaitTermination(500, TimeUnit.MILLISECONDS);
 
     // The storage should still have the same ID and the status should indicate that the
     // fid is registered.
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo("generatedFid"));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo("generatedFid");
     assertTrue("the entry doesn't have an uregistered fid: " + entry, entry.isUnregistered());
   }
 
@@ -298,21 +302,21 @@ public void testGetId_ValidIdAndToken_NoBackendCalls() throws Exception {
     // No exception, means success.
     TestOnCompleteListener<String> onCompleteListener = new TestOnCompleteListener<>();
     Task<String> task = firebaseInstallations.getId();
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     String fid = onCompleteListener.await();
     assertWithMessage("getId Task failed.").that(fid).isEqualTo(TEST_FID_1);
 
     // getId() returns fid immediately but registers fid asynchronously.  Waiting for half a second
     // while we mock fid registration. We dont send an actual request to FIS in tests.
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
+    backgroundExecutor.awaitTermination(500, TimeUnit.MILLISECONDS);
 
     // check that the mockClient didn't get invoked at all, since the fid is already registered
     // and the authtoken is present and not expired
-    verifyZeroInteractions(mockBackend);
+    verifyNoInteractions(mockBackend);
 
     // check that the fid is still the expected one and is registered
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo(TEST_FID_1));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo(TEST_FID_1);
     assertTrue("the entry doesn't have a registered fid: " + entry, entry.isRegistered());
   }
 
@@ -331,13 +335,13 @@ public void testGetId_UnRegisteredId_IssueCreateIdCall() throws Exception {
     // No exception, means success.
     TestOnCompleteListener<String> onCompleteListener = new TestOnCompleteListener<>();
     Task<String> task = firebaseInstallations.getId();
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     String fid = onCompleteListener.await();
     assertWithMessage("getId Task failed.").that(fid).isEqualTo(TEST_FID_1);
 
     // getId() returns fid immediately but registers fid asynchronously.  Waiting for half a second
     // while we mock fid registration. We dont send an actual request to FIS in tests.
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
+    backgroundExecutor.awaitTermination(500, TimeUnit.MILLISECONDS);
 
     // check that the mockClient didn't get invoked at all, since the fid is already registered
     // and the authtoken is present and not expired
@@ -349,7 +353,7 @@ public void testGetId_UnRegisteredId_IssueCreateIdCall() throws Exception {
 
     // check that the fid is still the expected one and is registered
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo(TEST_FID_1));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo(TEST_FID_1);
     assertTrue("the entry doesn't have a registered fid: " + entry, entry.isRegistered());
   }
 
@@ -367,7 +371,7 @@ public void testReadToken_wildcard() {
         .commit();
 
     IidStore iidStore = new IidStore(prefs, "123");
-    assertThat(iidStore.readToken(), equalTo("tokenWILDCARD"));
+    assertThat(iidStore.readToken()).isEqualTo("tokenWILDCARD");
   }
 
   @Test
@@ -384,7 +388,7 @@ public void testReadToken_fcm() {
         .commit();
 
     IidStore iidStore = new IidStore(prefs, "123");
-    assertThat(iidStore.readToken(), equalTo("tokenFCM"));
+    assertThat(iidStore.readToken()).isEqualTo("tokenFCM");
   }
 
   @Test
@@ -401,7 +405,7 @@ public void testReadToken_gcm() {
         .commit();
 
     IidStore iidStore = new IidStore(prefs, "123");
-    assertThat(iidStore.readToken(), equalTo("tokenGCM"));
+    assertThat(iidStore.readToken()).isEqualTo("tokenGCM");
   }
 
   @Test
@@ -418,7 +422,7 @@ public void testReadToken_empty() {
         .commit();
 
     IidStore iidStore = new IidStore(prefs, "123");
-    assertThat(iidStore.readToken(), equalTo("tokenEMPTY"));
+    assertThat(iidStore.readToken()).isEqualTo("tokenEMPTY");
   }
 
   @Test
@@ -452,7 +456,7 @@ public void testReadToken_withJsonformatting() {
         .commit();
 
     IidStore iidStore = new IidStore(prefs, "123");
-    assertThat(iidStore.readToken(), equalTo("thetoken"));
+    assertThat(iidStore.readToken()).isEqualTo("thetoken");
   }
 
   @Test
@@ -482,17 +486,17 @@ public void testFidListener_fidChanged_successful() throws Exception {
     // Unregister FidListener2
     listenerHandle.unregister();
 
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     String fid = onCompleteListener.await();
     assertWithMessage("getId Task failed.").that(fid).isEqualTo(TEST_FID_1);
 
     // Waiting for Task that registers FID on the FIS Servers
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
+    backgroundExecutor.awaitTermination(500, TimeUnit.MILLISECONDS);
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo(TEST_FID_2));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo(TEST_FID_2);
 
     // Verify FidListener receives fid changes.
-    assertThat(fidListener.getLatestFid(), equalTo(TEST_FID_2));
+    assertThat(fidListener.getLatestFid()).isEqualTo(TEST_FID_2);
     assertNull(fidListener2.getLatestFid());
   }
 
@@ -508,19 +512,19 @@ public void testGetId_migrateIid_successful() throws Exception {
     // Confirm both that it returns the expected ID, as does reading the prefs from storage.
     TestOnCompleteListener<String> onCompleteListener = new TestOnCompleteListener<>();
     Task<String> task = firebaseInstallations.getId();
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     String fid = onCompleteListener.await();
     assertWithMessage("getId Task failed.").that(fid).isEqualTo(TEST_INSTANCE_ID_1);
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo(TEST_INSTANCE_ID_1));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo(TEST_INSTANCE_ID_1);
 
     // Waiting for Task that registers FID on the FIS Servers
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
+    backgroundExecutor.awaitTermination(500, TimeUnit.MILLISECONDS);
 
     // The storage should still have the same ID and the status should indicate that the
     // fid si registered.
     entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo(TEST_INSTANCE_ID_1));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo(TEST_INSTANCE_ID_1);
     assertTrue("the entry doesn't have a registered fid: " + entry, entry.isRegistered());
   }
 
@@ -534,16 +538,16 @@ public void testGetId_multipleCalls_sameFIDReturned() throws Exception {
 
     // Call getId multiple times
     Task<String> task1 = firebaseInstallations.getId();
-    Task<String> task2 = firebaseInstallations.getId();
     TestOnCompleteListener<String> onCompleteListener1 = new TestOnCompleteListener<>();
-    task1.addOnCompleteListener(executor, onCompleteListener1);
-    TestOnCompleteListener<String> onCompleteListener2 = new TestOnCompleteListener<>();
-    task2.addOnCompleteListener(executor, onCompleteListener2);
+    task1.addOnCompleteListener(backgroundExecutor, onCompleteListener1);
     onCompleteListener1.await();
+    Task<String> task2 = firebaseInstallations.getId();
+    TestOnCompleteListener<String> onCompleteListener2 = new TestOnCompleteListener<>();
+    task2.addOnCompleteListener(backgroundExecutor, onCompleteListener2);
     onCompleteListener2.await();
 
     // Waiting for Task that registers FID on the FIS Servers
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
+    backgroundExecutor.awaitTermination(500, TimeUnit.MILLISECONDS);
 
     assertWithMessage("Persisted Fid of Task1 doesn't match.")
         .that(task1.getResult())
@@ -554,7 +558,7 @@ public void testGetId_multipleCalls_sameFIDReturned() throws Exception {
     verify(mockBackend, times(1))
         .createFirebaseInstallation(TEST_API_KEY, TEST_FID_1, TEST_PROJECT_ID, TEST_APP_ID_1, null);
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo(TEST_FID_1));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo(TEST_FID_1);
     assertTrue("the entry isn't doesn't have a registered fid: " + entry, entry.isRegistered());
   }
 
@@ -581,17 +585,17 @@ public void testGetId_expiredAuthTokenThrowsException_statusUpdated() throws Exc
 
     TestOnCompleteListener<String> onCompleteListener = new TestOnCompleteListener<>();
     Task<String> getIdTask = firebaseInstallations.getId();
-    getIdTask.addOnCompleteListener(executor, onCompleteListener);
+    getIdTask.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     String fid = onCompleteListener.await();
 
     assertWithMessage("getId Task failed").that(fid).isEqualTo(TEST_FID_1);
 
     // Waiting for Task that generates auth token with the FIS Servers
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
+    backgroundExecutor.awaitTermination(500, TimeUnit.MILLISECONDS);
 
     // Validate that registration status is still REGISTER
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo(TEST_FID_1));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo(TEST_FID_1);
     assertTrue("the entry doesn't have a registered fid: " + entry, entry.isRegistered());
   }
 
@@ -625,14 +629,14 @@ public void testGetId_expiredAuthToken_refreshesAuthToken() throws Exception {
     // kick off a refresh of the token.
     TestOnCompleteListener<String> onCompleteListener = new TestOnCompleteListener<>();
     Task<String> getIdTask = firebaseInstallations.getId();
-    getIdTask.addOnCompleteListener(executor, onCompleteListener);
+    getIdTask.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     String fid = onCompleteListener.await();
     assertWithMessage("getId Task failed").that(fid).isEqualTo(TEST_FID_1);
 
     TestOnCompleteListener<InstallationTokenResult> onCompleteListener2 =
         new TestOnCompleteListener<>();
     Task<InstallationTokenResult> task = firebaseInstallations.getToken(false);
-    task.addOnCompleteListener(executor, onCompleteListener2);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener2);
     InstallationTokenResult installationTokenResult = onCompleteListener2.await();
 
     // Check that the token has been refreshed
@@ -662,19 +666,19 @@ public void testGetId_unregistered_replacesFidWithResponse() throws Exception {
     // The first call will return the existing FID, "tobereplaced"
     TestOnCompleteListener<String> onCompleteListener = new TestOnCompleteListener<>();
     Task<String> task = firebaseInstallations.getId();
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     String fid = onCompleteListener.await();
 
     // do a getId(), the unregistered TEST_FID_1 should be returned
     assertWithMessage("getId Task failed.").that(fid).isEqualTo("tobereplaced");
 
     // Waiting for Task that registers FID on the FIS Servers
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
+    backgroundExecutor.awaitTermination(500, TimeUnit.MILLISECONDS);
 
     // The next call should return the FID that was returned by the server
     onCompleteListener = new TestOnCompleteListener<>();
     task = firebaseInstallations.getId();
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     fid = onCompleteListener.await();
 
     // do a getId(), the unregistered TEST_FID_1 should be returned
@@ -699,20 +703,20 @@ public void testGetId_ServerError_UnregisteredFID() throws Exception {
 
     TestOnCompleteListener<String> onCompleteListener = new TestOnCompleteListener<>();
     Task<String> task = firebaseInstallations.getId();
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     String fid = onCompleteListener.await();
 
     // do a getId(), the unregistered TEST_FID_1 should be returned
     assertWithMessage("getId Task failed.").that(fid).isEqualTo(TEST_FID_1);
 
     // Waiting for Task that registers FID on the FIS Servers.
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
+    backgroundExecutor.awaitTermination(500, TimeUnit.MILLISECONDS);
 
     // We expect that the server error will cause the FID to be put into the error state.
     // There is nothing more we can do.
     PersistedInstallationEntry updatedInstallationEntry =
         persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(updatedInstallationEntry.getFirebaseInstallationId(), equalTo(TEST_FID_1));
+    assertThat(updatedInstallationEntry.getFirebaseInstallationId()).isEqualTo(TEST_FID_1);
     assertTrue(
         "the entry doesn't have an error fid: " + updatedInstallationEntry,
         updatedInstallationEntry.isErrored());
@@ -732,18 +736,18 @@ public void testGetId_fidRegistrationFailed_statusNotUpdated() throws Exception
 
     TestOnCompleteListener<String> onCompleteListener = new TestOnCompleteListener<>();
     Task<String> getIdTask = firebaseInstallations.getId();
-    getIdTask.addOnCompleteListener(executor, onCompleteListener);
+    getIdTask.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     String fid = onCompleteListener.await();
 
     assertEquals("fid doesn't match expected", TEST_FID_1, fid);
 
     // Waiting for Task that registers FID on the FIS Servers
-    executor.awaitTermination(500, TimeUnit.MILLISECONDS);
+    backgroundExecutor.awaitTermination(500, TimeUnit.MILLISECONDS);
 
     // We expect that the IOException will cause the request to fail, but it will not
     // cause the FID to be put into the error state because we expect this to eventually succeed.
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getFirebaseInstallationId(), equalTo(TEST_FID_1));
+    assertThat(entry.getFirebaseInstallationId()).isEqualTo(TEST_FID_1);
     assertTrue("the entry doesn't have an unregistered fid: " + entry, entry.isUnregistered());
   }
 
@@ -756,11 +760,11 @@ public void testGetAuthToken_fidDoesNotExist_successful() throws Exception {
     TestOnCompleteListener<InstallationTokenResult> onCompleteListener =
         new TestOnCompleteListener<>();
     Task<InstallationTokenResult> task = firebaseInstallations.getToken(false);
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     onCompleteListener.await();
 
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getAuthToken(), equalTo(TEST_AUTH_TOKEN));
+    assertThat(entry.getAuthToken()).isEqualTo(TEST_AUTH_TOKEN);
   }
 
   @Test
@@ -776,7 +780,7 @@ public void testGetAuthToken_fidExists_successful() throws Exception {
     TestOnCompleteListener<InstallationTokenResult> onCompleteListener =
         new TestOnCompleteListener<>();
     Task<InstallationTokenResult> task = firebaseInstallations.getToken(false);
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     InstallationTokenResult installationTokenResult = onCompleteListener.await();
 
     assertWithMessage("Persisted Auth Token doesn't match")
@@ -811,7 +815,7 @@ public void testGetAuthToken_expiredAuthToken_fetchedNewTokenFromFIS() throws Ex
     TestOnCompleteListener<InstallationTokenResult> onCompleteListener =
         new TestOnCompleteListener<>();
     Task<InstallationTokenResult> task = firebaseInstallations.getToken(false);
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     InstallationTokenResult installationTokenResult = onCompleteListener.await();
 
     assertWithMessage("Persisted Auth Token doesn't match")
@@ -847,10 +851,10 @@ public void testGetAuthToken_multipleCallsDoNotForceRefresh_fetchedNewTokenOnce(
     Task<InstallationTokenResult> task2 = firebaseInstallations.getToken(false);
     TestOnCompleteListener<InstallationTokenResult> onCompleteListener1 =
         new TestOnCompleteListener<>();
-    task1.addOnCompleteListener(executor, onCompleteListener1);
+    task1.addOnCompleteListener(backgroundExecutor, onCompleteListener1);
     TestOnCompleteListener<InstallationTokenResult> onCompleteListener2 =
         new TestOnCompleteListener<>();
-    task2.addOnCompleteListener(executor, onCompleteListener2);
+    task2.addOnCompleteListener(backgroundExecutor, onCompleteListener2);
     onCompleteListener1.await();
     onCompleteListener2.await();
 
@@ -877,7 +881,7 @@ public void testGetToken_unregisteredFid_fetchedNewTokenFromFIS() throws Excepti
     TestOnCompleteListener<InstallationTokenResult> onCompleteListener =
         new TestOnCompleteListener<>();
     Task<InstallationTokenResult> task = firebaseInstallations.getToken(false);
-    task.addOnCompleteListener(executor, onCompleteListener);
+    task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
     InstallationTokenResult installationTokenResult = onCompleteListener.await();
 
     assertWithMessage("Persisted Auth Token doesn't match")
@@ -905,7 +909,7 @@ public void testGetAuthToken_authError_persistedInstallationCleared() throws Exc
       TestOnCompleteListener<InstallationTokenResult> onCompleteListener =
           new TestOnCompleteListener<>();
       Task<InstallationTokenResult> task = firebaseInstallations.getToken(true);
-      task.addOnCompleteListener(executor, onCompleteListener);
+      task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
       onCompleteListener.await();
       fail("the getAuthToken() call should have failed due to Auth Error.");
     } catch (ExecutionException expected) {
@@ -942,7 +946,7 @@ public void testGetAuthToken_serverError_failure() throws Exception {
       TestOnCompleteListener<InstallationTokenResult> onCompleteListener =
           new TestOnCompleteListener<>();
       Task<InstallationTokenResult> task = firebaseInstallations.getToken(true);
-      task.addOnCompleteListener(executor, onCompleteListener);
+      task.addOnCompleteListener(backgroundExecutor, onCompleteListener);
       onCompleteListener.await();
       fail(
           "getAuthToken() succeeded but should have failed due to the BAD_CONFIG error "
@@ -1001,10 +1005,10 @@ public void testGetAuthToken_multipleCallsForceRefresh_fetchedNewTokenTwice() th
     Task<InstallationTokenResult> task2 = firebaseInstallations.getToken(true);
     TestOnCompleteListener<InstallationTokenResult> onCompleteListener1 =
         new TestOnCompleteListener<>();
-    task1.addOnCompleteListener(executor, onCompleteListener1);
+    task1.addOnCompleteListener(backgroundExecutor, onCompleteListener1);
     TestOnCompleteListener<InstallationTokenResult> onCompleteListener2 =
         new TestOnCompleteListener<>();
-    task2.addOnCompleteListener(executor, onCompleteListener2);
+    task2.addOnCompleteListener(backgroundExecutor, onCompleteListener2);
     onCompleteListener1.await();
     onCompleteListener2.await();
 
@@ -1018,7 +1022,7 @@ public void testGetAuthToken_multipleCallsForceRefresh_fetchedNewTokenTwice() th
     verify(mockBackend, times(1))
         .generateAuthToken(TEST_API_KEY, TEST_FID_1, TEST_PROJECT_ID, TEST_REFRESH_TOKEN);
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
-    assertThat(entry.getAuthToken(), equalTo(TEST_AUTH_TOKEN_3));
+    assertThat(entry.getAuthToken()).isEqualTo(TEST_AUTH_TOKEN_3);
   }
 
   @Test
@@ -1036,7 +1040,7 @@ public void testDelete_registeredFID_successful() throws Exception {
         .thenReturn(TEST_INSTALLATION_RESPONSE);
 
     TestOnCompleteListener<Void> onCompleteListener = new TestOnCompleteListener<>();
-    firebaseInstallations.delete().addOnCompleteListener(executor, onCompleteListener);
+    firebaseInstallations.delete().addOnCompleteListener(backgroundExecutor, onCompleteListener);
     onCompleteListener.await();
 
     PersistedInstallationEntry entryValue =
@@ -1053,7 +1057,7 @@ public void testDelete_unregisteredFID_successful() throws Exception {
         PersistedInstallationEntry.INSTANCE.withUnregisteredFid(TEST_FID_1));
 
     TestOnCompleteListener<Void> onCompleteListener = new TestOnCompleteListener<>();
-    firebaseInstallations.delete().addOnCompleteListener(executor, onCompleteListener);
+    firebaseInstallations.delete().addOnCompleteListener(backgroundExecutor, onCompleteListener);
     onCompleteListener.await();
 
     PersistedInstallationEntry entryValue =
@@ -1069,7 +1073,7 @@ public void testDelete_emptyPersistedFidEntry_successful() throws Exception {
         PersistedInstallationEntry.INSTANCE.withNoGeneratedFid());
 
     TestOnCompleteListener<Void> onCompleteListener = new TestOnCompleteListener<>();
-    firebaseInstallations.delete().addOnCompleteListener(executor, onCompleteListener);
+    firebaseInstallations.delete().addOnCompleteListener(backgroundExecutor, onCompleteListener);
     onCompleteListener.await();
 
     PersistedInstallationEntry entry = persistedInstallation.readPersistedInstallationEntryValue();
@@ -1098,7 +1102,7 @@ public void testDelete_serverError_badConfig() throws Exception {
     // Expect exception
     try {
       TestOnCompleteListener<Void> onCompleteListener = new TestOnCompleteListener<>();
-      firebaseInstallations.delete().addOnCompleteListener(executor, onCompleteListener);
+      firebaseInstallations.delete().addOnCompleteListener(backgroundExecutor, onCompleteListener);
       onCompleteListener.await();
       fail("firebaseInstallations.delete() failed due to Server Error.");
     } catch (ExecutionException expected) {
@@ -1133,7 +1137,7 @@ public void testDelete_networkError() throws Exception {
     // Expect exception
     try {
       TestOnCompleteListener<Void> onCompleteListener = new TestOnCompleteListener<>();
-      firebaseInstallations.delete().addOnCompleteListener(executor, onCompleteListener);
+      firebaseInstallations.delete().addOnCompleteListener(backgroundExecutor, onCompleteListener);
       onCompleteListener.await();
       fail("firebaseInstallations.delete() should have failed due to a Network Error.");
     } catch (ExecutionException expected) {
diff --git a/firebase-installations/src/test/java/com/google/firebase/installations/InstallationsTests.kt b/firebase-installations/src/test/java/com/google/firebase/installations/InstallationsTests.kt
new file mode 100644
index 00000000000..537d8a538e7
--- /dev/null
+++ b/firebase-installations/src/test/java/com/google/firebase/installations/InstallationsTests.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.installations
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class InstallationsTests : BaseTestCase() {
+  @Test
+  fun `installations should delegate to FirebaseInstallations#getInstance()`() {
+    Truth.assertThat(Firebase.installations).isSameInstanceAs(FirebaseInstallations.getInstance())
+  }
+
+  @Test
+  fun `installations(app) should delegate to FirebaseInstallations#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    Truth.assertThat(Firebase.installations(app))
+      .isSameInstanceAs(FirebaseInstallations.getInstance(app))
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-installations/src/test/java/com/google/firebase/installations/ktx/InstallationsTests.kt b/firebase-installations/src/test/java/com/google/firebase/installations/ktx/InstallationsTests.kt
new file mode 100644
index 00000000000..796e78a56ae
--- /dev/null
+++ b/firebase-installations/src/test/java/com/google/firebase/installations/ktx/InstallationsTests.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.installations.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.installations.FirebaseInstallations
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class InstallationsTests : BaseTestCase() {
+  @Test
+  fun `installations should delegate to FirebaseInstallations#getInstance()`() {
+    Truth.assertThat(Firebase.installations).isSameInstanceAs(FirebaseInstallations.getInstance())
+  }
+
+  @Test
+  fun `installations(app) should delegate to FirebaseInstallations#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    Truth.assertThat(Firebase.installations(app))
+      .isSameInstanceAs(FirebaseInstallations.getInstance(app))
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-messaging-directboot/CHANGELOG.md b/firebase-messaging-directboot/CHANGELOG.md
new file mode 100644
index 00000000000..118337a1d5b
--- /dev/null
+++ b/firebase-messaging-directboot/CHANGELOG.md
@@ -0,0 +1,122 @@
+# Unreleased
+
+
+# 24.0.0
+* [changed] Bump internal dependencies
+
+# 23.4.0
+* [unchanged] Updated to keep messaging SDK versions aligned.
+
+# 23.3.0
+* [unchanged] Updated to keep messaging SDK versions aligned.
+
+# 23.1.2
+* [unchanged] Updated to keep messaging SDK versions aligned.
+
+# 23.1.1
+* [changed] Removed unused classes.
+
+# 23.1.0
+* [changed] Internal changes to ensure functionality alignment with other
+  SDK releases.
+
+# 23.0.8
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+# 23.0.7
+* [changed] Updated `minSdkVersion` to 19 to match [messaging_longer]
+  `minSdkVersion`.
+* [changed] Updated `FirebaseMessagingDirectBootReceiver` to match
+  [messaging_longer] `FirebaseInstanceIdReceiver`.
+* [changed] Removed unused dependencies.
+
+# 23.0.6
+* [changed] Internal changes to ensure functionality alignment with other
+  SDK releases. For more details, refer to the
+  [[messaging_longer] v23.0.6 release notes](/support/release-notes/android#messaging_v23-0-6).
+
+# 23.0.5
+* [changed] Internal changes to ensure functionality alignment with other
+  SDK releases. For more details, refer to the
+  [[messaging_longer] v23.0.5 release notes](/support/release-notes/android#messaging_v23-0-5).
+
+# 23.0.3
+* [changed] Internal changes to ensure functionality alignment with other
+  SDK releases. For more details, refer to the
+  [[messaging_longer] v23.0.3 release notes](/support/release-notes/android#messaging_v23-0-3).
+
+# 23.0.2
+* [fixed] Fixed an issue where the messaging component in
+  the [firebase_bom_long] leaked the `httpcomponents` transitive dependencies.
+
+# 23.0.1
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases. For more details, refer to the
+  [[messaging_longer] v23.0.1 release note](/support/release-notes/android#messaging_v23-0-1).
+
+# 23.0.0
+* [changed] Internal changes to ensure functionality alignment with other
+  SDK releases. For more details, refer to the
+  [[messaging_longer] v23.0.0 release notes](/support/release-notes/android#messaging_v23-0-0).
+
+# 22.0.0
+* [changed] Internal changes to ensure functionality alignment with other
+  SDK releases.
+* [changed] Internal changes to support dynamic feature modules.
+* [changed] Internal infrastructure improvements.
+
+# 21.1.0
+* [changed] Internal changes to ensure functionality alignment with other
+  SDK releases. For more details, refer to the
+  [[messaging_longer] v21.1.0 release notes](/support/release-notes/android#messaging_v21-1-0).
+
+# 21.0.1
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases. For more details, refer to the
+  [[messaging_longer] v21.0.1 release note](/support/release-notes/android#messaging_v21-0-1).
+
+# 21.0.0
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases. For more details, refer to the
+  [[messaging_longer] v21.0.0 release note](/support/release-notes/android#messaging_v21-0-0).
+
+# 20.3.0
+* [changed] Internal changes to the Google Play services interface to improve
+  future development velocity.
+
+# 20.2.4
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases. For more information, refer to the
+  [Firebase Installations v16.3.3 release notes](/support/release-notes/android#installations_v16-3-3).
+
+# 20.2.3
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases. For more details, see the
+  [`firebase-messaging` v20.2.3 release note](/support/release-notes/android#messaging_v20-2-3).
+
+# 20.2.2
+Warning: **This version of `firebase-messaging-directboot` (v20.2.2) should not
+be used.** A related library has a known issue (for more details, see
+[`firebase-messaging` v20.2.2](/support/release-notes/android#messaging_v20-2-2)).
+A fix for this issue was released on July 08, 2020
+(see [v20.2.3](/support/release-notes/android#messaging-directboot_v20-2-3)).
+
+* [changed] Internal improvements.
+
+# 20.2.1
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases. For more information, refer to the
+  [Firebase Instance ID v20.2.1 release notes](/support/release-notes/android#iid_v20-2-1).
+
+# 20.2.0
+* [feature] The Firebase Cloud Messaging Direct Boot SDK is now available
+  and supports receiving FCM messages in Direct Boot mode. See
+  [Receive FCM messages in direct boot mode](/docs/cloud-messaging/android/receive#receive_fcm_messages_in_direct_boot_mode)
+  for more information.
+
diff --git a/firebase-messaging-directboot/firebase-messaging-directboot.gradle b/firebase-messaging-directboot/firebase-messaging-directboot.gradle
index 04dd19e4883..ee674d52384 100644
--- a/firebase-messaging-directboot/firebase-messaging-directboot.gradle
+++ b/firebase-messaging-directboot/firebase-messaging-directboot.gradle
@@ -18,21 +18,18 @@ plugins {
 
 firebaseLibrary {
     testLab.enabled = false
-    releaseWith project(':firebase-messaging')
+    publishJavadoc = false
+    libraryGroup "messaging"
 }
 
 android {
     adbOptions {
         timeOutInMs 60 * 1000
     }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.messaging.directboot"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         versionName version
 
@@ -46,28 +43,8 @@ android {
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-installations-interop')
-    implementation project(':firebase-datatransport')
-    implementation project(':transport:transport-api')
-    implementation project(':transport:transport-runtime')
-    implementation project(':transport:transport-backend-cct')
-    implementation project(':encoders:firebase-encoders')
-    implementation project(':encoders:firebase-encoders-json')
+    api project(':firebase-messaging')
 
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation "com.google.android.gms:play-services-tasks:18.0.1"
-    implementation "com.google.android.gms:play-services-basement:18.0.0"
-    implementation 'com.google.android.gms:play-services-base:18.0.1'
-    implementation ("com.google.firebase:firebase-iid:20.2.3") {
-        exclude group: "com.google.firebase", module: "firebase-common"
-        exclude group: "com.google.firebase", module: "firebase-components"
-        exclude group: "com.google.firebase", module: "firebase-installations-interop"
-    }
-    implementation 'com.google.firebase:firebase-measurement-connector:18.0.0'
-    implementation "com.google.firebase:firebase-iid-interop:17.0.0"
-    implementation ("com.google.api-client:google-api-client:1.30.9") {
-        exclude group: "org.apache.httpcomponents", module: "httpclient"
-    }
-}
\ No newline at end of file
+    implementation 'com.google.android.gms:play-services-cloud-messaging:17.0.2'
+    implementation "com.google.errorprone:error_prone_annotations:2.9.0"
+}
diff --git a/firebase-messaging-directboot/gradle.properties b/firebase-messaging-directboot/gradle.properties
index 7d3c078912a..0755740b9a2 100644
--- a/firebase-messaging-directboot/gradle.properties
+++ b/firebase-messaging-directboot/gradle.properties
@@ -1,3 +1,3 @@
-version=23.0.1
-latestReleasedVersion=23.0.0
-android.enableUnitTestBinaryResources=true
\ No newline at end of file
+version=24.0.1
+latestReleasedVersion=24.0.0
+android.enableUnitTestBinaryResources=true
diff --git a/firebase-messaging-directboot/src/main/AndroidManifest.xml b/firebase-messaging-directboot/src/main/AndroidManifest.xml
index 77d2074fb0d..16f331847d4 100644
--- a/firebase-messaging-directboot/src/main/AndroidManifest.xml
+++ b/firebase-messaging-directboot/src/main/AndroidManifest.xml
@@ -13,10 +13,9 @@
      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="com.google.firebase.messaging.directboot">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/FirebaseMessagingDirectBootReceiver.java b/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/FirebaseMessagingDirectBootReceiver.java
index 257cef49480..af4cd69af67 100644
--- a/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/FirebaseMessagingDirectBootReceiver.java
+++ b/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/FirebaseMessagingDirectBootReceiver.java
@@ -14,20 +14,20 @@
 package com.google.firebase.messaging.directboot;
 
 import android.content.Context;
-import android.content.Intent;
 import android.util.Log;
-import androidx.legacy.content.WakefulBroadcastReceiver;
-import com.google.android.gms.common.util.concurrent.NamedThreadFactory;
-import com.google.firebase.iid.FcmBroadcastProcessor;
-import com.google.firebase.iid.ServiceStarter;
-import com.google.firebase.messaging.directboot.threads.PoolableExecutors;
-import com.google.firebase.messaging.directboot.threads.ThreadPriority;
-import java.util.concurrent.ExecutorService;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
+import com.google.android.gms.cloudmessaging.CloudMessage;
+import com.google.android.gms.cloudmessaging.CloudMessagingReceiver;
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.messaging.FcmBroadcastProcessor;
+import com.google.firebase.messaging.ServiceStarter;
+import java.util.concurrent.ExecutionException;
 
 /**
- * WakefulBroadcastReceiver that receives FirebaseMessaging events and delivers them to the
- * application-specific {@link com.google.firebase.iid.FirebaseInstanceIdService} subclass in direct
- * boot mode.
+ * BroadcastReceiver that receives FirebaseMessaging events and delivers them to the
+ * application-specific {@link com.google.firebase.messaging.FirebaseMessagingService} subclass in
+ * direct boot mode.
  *
  * <p>This receiver is automatically added to your application's manifest file via manifest merge.
  * If necessary it can be manually declared via:
@@ -49,58 +49,20 @@
  *
  * @hide
  */
-public final class FirebaseMessagingDirectBootReceiver extends WakefulBroadcastReceiver {
+public final class FirebaseMessagingDirectBootReceiver extends CloudMessagingReceiver {
 
   /** TAG for log statements coming from FCM */
   static final String TAG = "FCM";
 
-  /** Action for FCM direct boot message intents */
-  private static final String ACTION_DIRECT_BOOT_REMOTE_INTENT =
-      "com.google.firebase.messaging.RECEIVE_DIRECT_BOOT";
-
-  /** All broadcasts get processed on this executor. */
-  private final ExecutorService processorExecutor =
-      PoolableExecutors.factory()
-          .newSingleThreadExecutor(
-              new NamedThreadFactory("fcm-db-intent-handle"), ThreadPriority.LOW_POWER);
-
+  /** @hide */
   @Override
-  public void onReceive(Context context, Intent intent) {
-    if (intent == null) {
-      return;
-    }
-    if (!ACTION_DIRECT_BOOT_REMOTE_INTENT.equals(intent.getAction())) {
-      Log.d(TAG, "Unexpected intent: " + intent.getAction());
-      return;
+  @WorkerThread
+  protected int onMessageReceive(@NonNull Context context, @NonNull CloudMessage message) {
+    try {
+      return Tasks.await(new FcmBroadcastProcessor(context).process(message.getIntent()));
+    } catch (ExecutionException | InterruptedException e) {
+      Log.e(TAG, "Failed to send message to service.", e);
+      return ServiceStarter.ERROR_UNKNOWN;
     }
-
-    // Just pass the intent to the service mostly unchanged.
-    // Clear the component and ensure package name is set so that the standard dispatching
-    // mechanism will find the right service in the app.
-    intent.setComponent(null);
-    intent.setPackage(context.getPackageName());
-
-    // We don't actually want to process this broadcast on the main thread, so we're going to use
-    // goAsync to deal with this in the background. Unfortunately, we need to check whether the
-    // broadcast was ordered (and thus needs a result) before calling goAsync, because once we've
-    // called goAsync then isOrderedBroadcast will always return false.
-    boolean needsResult = isOrderedBroadcast();
-    PendingResult pendingBroadcastResult = goAsync();
-
-    new FcmBroadcastProcessor(context, processorExecutor)
-        .process(intent)
-        .addOnCompleteListener(
-            processorExecutor,
-            resultCodeTask -> {
-              // If we call setResultCode on a non-ordered broadcast it'll throw, so only set the
-              // result if the broadcast was ordered
-              if (needsResult) {
-                pendingBroadcastResult.setResultCode(
-                    resultCodeTask.isSuccessful()
-                        ? resultCodeTask.getResult()
-                        : ServiceStarter.ERROR_UNKNOWN);
-              }
-              pendingBroadcastResult.finish();
-            });
   }
 }
diff --git a/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/threads/ExecutorFactory.java b/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/threads/ExecutorFactory.java
deleted file mode 100644
index 6e801ce3227..00000000000
--- a/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/threads/ExecutorFactory.java
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.messaging.directboot.threads;
-
-import com.google.errorprone.annotations.CompileTimeConstant;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-
-/**
- * Factory to work as a drop-in replacement for {@link java.util.concurrent.Executors}.
- *
- * <ul>
- *   <li>Specifying a ThreadFactory is not allowed, since thread creation is not at the discretion
- *       of the client.
- *   <li>The core pool size is decided globally, and is not at the discretion of any individual
- *       client.
- *   <li>Setting the current thread priority or name will affect future tasks and is banned.
- * </ul>
- *
- * <p>One divergence from Executors is that unused threads are allowed to time out after a period of
- * inactivity, so subsequent semi-cold starts may experience a tiny bit of latency. It is not
- * expected to be a significant performance concern, but will save significant memory.
- */
-public interface ExecutorFactory {
-
-  /**
-   * Creates a thread pool that creates new threads as needed, but will reuse previously constructed
-   * threads when they are available.
-   *
-   * <p>Drop-in replacement for {@link java.util.concurrent.Executors#newCachedThreadPool()}.
-   *
-   * @param priority see {@link ThreadPriority}.
-   */
-  public ExecutorService newThreadPool(ThreadPriority priority);
-
-  /**
-   * Creates a thread pool that creates new threads as needed, but will reuse previously constructed
-   * threads when they are available.
-   *
-   * <p>Drop-in replacement for {@link
-   * java.util.concurrent.Executors#newCachedThreadPool(ThreadFactory)}.
-   *
-   * @param threadFactory the factory to use when creating new threads.
-   * @param priority see {@link ThreadPriority}.
-   */
-  public ExecutorService newThreadPool(ThreadFactory threadFactory, ThreadPriority priority);
-
-  /**
-   * Creates a thread pool that creates new threads as needed, but will reuse previously constructed
-   * threads when they are available.
-   *
-   * <p>Drop-in replacement for {@link java.util.concurrent.Executors#newFixedThreadPool(int)}.
-   *
-   * @param maxConcurrency at most this number of tasks will be executed concurrently. Overflow
-   *     tasks will be placed into an unbounded queue.
-   * @param priority see {@link ThreadPriority}.
-   */
-  public ExecutorService newThreadPool(int maxConcurrency, ThreadPriority priority);
-
-  /**
-   * Creates a thread pool that creates new threads as needed, but will reuse previously constructed
-   * threads when they are available.
-   *
-   * <p>Drop-in replacement for {@link java.util.concurrent.Executors#newFixedThreadPool(int,
-   * ThreadFactory)}.
-   *
-   * @param maxConcurrency at most this number of tasks will be executed concurrently. Overflow
-   *     tasks will be placed into an unbounded queue.
-   * @param threadFactory the factory to use when creating new threads.
-   * @param priority see {@link ThreadPriority}.
-   */
-  public ExecutorService newThreadPool(
-      int maxConcurrency, ThreadFactory threadFactory, ThreadPriority priority);
-
-  /**
-   * Creates an executor that mimics a single-threaded executor, in the sense that operations can
-   * happen at most one-at-a-time.
-   *
-   * <p>Drop-in replacement for {@link java.util.concurrent.Executors#newSingleThreadExecutor()}.
-   *
-   * @param priority see {@link ThreadPriority}.
-   */
-  public ExecutorService newSingleThreadExecutor(ThreadPriority priority);
-
-  /**
-   * Creates an executor that mimics a single-threaded executor, in the sense that operations can
-   * happen at most one-at-a-time.
-   *
-   * <p>Drop-in replacement for {@link
-   * java.util.concurrent.Executors#newSingleThreadExecutor(ThreadFactory)}.
-   *
-   * @param threadFactory the factory to use when creating new threads.
-   * @param priority see {@link ThreadPriority}.
-   */
-  public ExecutorService newSingleThreadExecutor(
-      ThreadFactory threadFactory, ThreadPriority priority);
-
-  /**
-   * Creates a ScheduledThreadPool that allows executing tasks in the future. If you don't require
-   * this functionality, just use {@link #newCachedThreadPool(int)}.
-   *
-   * <p>WARNING: Do not leak these, since these never terminate their threads.
-   *
-   * <p>Drop-in replacement for {@link java.util.concurrent.Executors#newScheduledThreadPool(int)}.
-   *
-   * @param maxConcurrency at most this number of tasks will be executed concurrently. Overflow
-   *     tasks will be placed into an unbounded queue.
-   * @param priority see {@link ThreadPriority}.
-   */
-  public ScheduledExecutorService newScheduledThreadPool(
-      int maxConcurrency, ThreadPriority priority);
-
-  /**
-   * Creates a ScheduledThreadPool that allows executing tasks in the future. If you don't require
-   * this functionality, just use {@link #newCachedThreadPool(int)}.
-   *
-   * <p>WARNING: Do not leak these, since these never terminate their threads.
-   *
-   * <p>Drop-in replacement for {@link java.util.concurrent.Executors#newScheduledThreadPool(int,
-   * ThreadFactory)}.
-   *
-   * @param maxConcurrency at most this number of tasks will be executed concurrently. Overflow
-   *     tasks will be placed into an unbounded queue.
-   * @param threadFactory the factory to use when creating new threads.
-   * @param priority see {@link ThreadPriority}.
-   */
-  public ScheduledExecutorService newScheduledThreadPool(
-      int maxConcurrency, ThreadFactory threadFactory, ThreadPriority priority);
-
-  /**
-   * Executes a one-off task where previously {@code new Thread()} may have been used.
-   *
-   * <p>Note that this may use a global, unlimited thread pool. Thus, threads should not generally
-   * try to manipulate the thread priority or name within the Runnable.
-   *
-   * @param moduleName name of the module
-   * @param name name of the thread; only sometimes honored
-   * @param priority see {@link ThreadPriority}.
-   * @param runnable the Runnable to run
-   */
-  public void executeOneOff(
-      @CompileTimeConstant String moduleName,
-      @CompileTimeConstant String name,
-      ThreadPriority priority,
-      Runnable runnable);
-
-  /**
-   * Executes a one-off task where previously {@code new Thread()} may have been used.
-   *
-   * <p>This returns a Future to allow you to query the state; you can use {@code Future.isDone()}
-   * instead of {@code !Thread.isAlive())}, and {@code Future.get()} instead of {@code
-   * Thread.join()}.
-   *
-   * @param moduleName name of the module
-   * @param name name of the thread; only sometimes honored
-   * @param priority see {@link ThreadPriority}.
-   * @param runnable the Runnable to run
-   */
-  public Future<?> submitOneOff(
-      @CompileTimeConstant String moduleName,
-      @CompileTimeConstant String name,
-      ThreadPriority priority,
-      Runnable runnable);
-}
diff --git a/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/threads/PoolableExecutors.java b/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/threads/PoolableExecutors.java
deleted file mode 100644
index 529fe04dcd5..00000000000
--- a/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/threads/PoolableExecutors.java
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.messaging.directboot.threads;
-
-import androidx.annotation.NonNull;
-import com.google.errorprone.annotations.CompileTimeConstant;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Provider of the {@link ExecutorFactory} that should be used to create thread executors.
- *
- * <p>If a factory is not provided during initialization, then it provides a default implementation.
- */
-// TODO(b/144941134): Remove nullness suppression.
-@SuppressWarnings("nullness")
-public class PoolableExecutors {
-
-  private static final ExecutorFactory DEFAULT_INSTANCE = new DefaultExecutorFactory();
-  private static volatile ExecutorFactory instance = DEFAULT_INSTANCE;
-
-  private PoolableExecutors() {}
-
-  public static ExecutorFactory factory() {
-    return instance;
-  }
-
-  /** A {@link ExecutorFactory} that creates the default thread executors. */
-  private static class DefaultExecutorFactory implements ExecutorFactory {
-
-    private static final long CORE_THREAD_TIMEOUT_SECS = 60L;
-
-    /** {@inheritDoc} */
-    @NonNull
-    @Override
-    public ExecutorService newThreadPool(ThreadPriority priority) {
-      // NOTE: Cached threadpools automatically time out all threads.  They have no concept of core
-      // threads; the queue blocks until a thread is started.
-      return Executors.unconfigurableExecutorService(Executors.newCachedThreadPool());
-    }
-
-    /** {@inheritDoc} */
-    @NonNull
-    @Override
-    public ExecutorService newThreadPool(ThreadFactory threadFactory, ThreadPriority priority) {
-      return Executors.unconfigurableExecutorService(Executors.newCachedThreadPool(threadFactory));
-    }
-
-    /** {@inheritDoc} */
-    @NonNull
-    @Override
-    public ExecutorService newThreadPool(int maxConcurrency, ThreadPriority priority) {
-      // TODO(gboyer): Honor the thread priority even when no factory is provided, by creating
-      // a factory that actually sets priority.
-      // TODO(gboyer): Add a @CompileTimeConstant String name argument; this will replace almost
-      // all uses of the ThreadFactory version, and could later help with tracing.
-      return newThreadPool(maxConcurrency, Executors.defaultThreadFactory(), priority);
-    }
-
-    /** {@inheritDoc} */
-    @NonNull
-    @Override
-    public ExecutorService newThreadPool(
-        int maxConcurrency, ThreadFactory threadFactory, ThreadPriority priority) {
-      ThreadPoolExecutor executor =
-          new ThreadPoolExecutor(
-              maxConcurrency,
-              maxConcurrency,
-              CORE_THREAD_TIMEOUT_SECS,
-              TimeUnit.SECONDS,
-              new LinkedBlockingQueue<Runnable>(),
-              threadFactory);
-      // This allows core threads to be terminated if they are not used; otherwise, these threads
-      // will forever suck up memory until the executor is shutdown or finalized. Generally, it is
-      // fairly fast in Android to start and stop threads, especially if this is limited to only
-      // happening once per minute.
-      executor.allowCoreThreadTimeOut(true);
-      return Executors.unconfigurableExecutorService(executor);
-    }
-
-    /** {@inheritDoc} */
-    @NonNull
-    @Override
-    public ExecutorService newSingleThreadExecutor(ThreadPriority priority) {
-      return newThreadPool(1, priority);
-    }
-
-    /** {@inheritDoc} */
-    @NonNull
-    @Override
-    public ExecutorService newSingleThreadExecutor(
-        ThreadFactory threadFactory, ThreadPriority priority) {
-      return newThreadPool(1, threadFactory, priority);
-    }
-
-    /** {@inheritDoc} */
-    @NonNull
-    @Override
-    public ScheduledExecutorService newScheduledThreadPool(
-        int maxConcurrency, ThreadPriority priority) {
-      // NOTE: There's no way to make a scheduled executor stop threads automatically, because
-      // at least one thread is needed to waiting for future tasks.
-      // TODO(b/63802200): Consider wrapping this in a finalizable decorator that prevents runaway
-      // memory leaks from non-shutdown pools.
-      return Executors.unconfigurableScheduledExecutorService(
-          Executors.newScheduledThreadPool(maxConcurrency));
-    }
-
-    /** {@inheritDoc} */
-    @NonNull
-    @Override
-    public ScheduledExecutorService newScheduledThreadPool(
-        int maxConcurrency, ThreadFactory threadFactory, ThreadPriority priority) {
-      return Executors.unconfigurableScheduledExecutorService(
-          Executors.newScheduledThreadPool(maxConcurrency, threadFactory));
-    }
-
-    @Override
-    @NonNull
-    public void executeOneOff(
-        @CompileTimeConstant final String moduleName,
-        @CompileTimeConstant final String name,
-        ThreadPriority priority,
-        Runnable runnable) {
-      new Thread(runnable, name).start();
-    }
-
-    @Override
-    @NonNull
-    public Future<?> submitOneOff(
-        @CompileTimeConstant final String moduleName,
-        @CompileTimeConstant final String name,
-        ThreadPriority priority,
-        Runnable runnable) {
-      FutureTask<?> task = new FutureTask<>(runnable, null);
-      new Thread(task, name).start();
-      return task;
-    }
-  }
-
-  /**
-   * Installs the {@link ExecutorFactory} implementation; INTERNAL USE ONLY.
-   *
-   * <p>May only be called once.
-   *
-   * <p>Call this only via build-visibility-restricted PunchClockThreadsImplementationApi.
-   */
-  static void installExecutorFactory(ExecutorFactory instance) {
-    if (PoolableExecutors.instance != DEFAULT_INSTANCE) {
-      throw new IllegalStateException("Trying to install an ExecutorFactory twice!");
-    }
-    PoolableExecutors.instance = instance;
-  }
-}
diff --git a/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/threads/ThreadPriority.java b/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/threads/ThreadPriority.java
deleted file mode 100644
index dcb8eae39b6..00000000000
--- a/firebase-messaging-directboot/src/main/java/com/google/firebase/messaging/directboot/threads/ThreadPriority.java
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.messaging.directboot.threads;
-
-/**
- * Commonly used thread priorities.
- *
- * <p>A true, but simple, enum is used for type safety to prevent mistakes like thread pool
- * factories frequently take in integers that could be mistaken for an {@code IntDef} if the caller
- * is not using Android Lint. The {@code @SimpleEnum} annotation is not used because of complex
- * downstream usage, so minification by ProGuard depends on the app's usage.
- */
-public enum ThreadPriority {
-
-  /**
-   * Reduced performance but at greater power efficiency. If the user isn't staring at a spinner
-   * while you're doing your work, or if more CPU power won't help, or if you're just not sure what
-   * to choose - then this is for you!
-   *
-   * <p>Example use cases: - Doing auto-backup. - Cleaning up a database. - Computing contextual
-   * signals in the background. - Pretty much anything that's I/O bound (tasks that are mostly disk
-   * and network access). - A sane default.
-   *
-   * <p>Such tasks will be yield to more important work, but won't be starved, and will still be
-   * allowed to make forward progress. On some devices with big.LITTLE CPU architectures running
-   * Marshmallow, your tasks may be locked to the little cores, executing slower but drawing 3x less
-   * power for the same amount of work! (This is primarily true for Nexus 5x/6p devices, and any
-   * other OEM with specialized kernel logic; it is not true for Pixels.)
-   *
-   * <p>See b/25246923 for more.
-   */
-  LOW_POWER,
-
-  /**
-   * Better performance at the expense of power and execution of other tasks. If the user will be
-   * waiting for your work to complete (i.e. staring at a spinner), then this is a good choice.
-   * Often this is the case for handling client app requests. Otherwise, it's best to use {@link
-   * #LOW_POWER}.
-   *
-   * <p>Tasks with this priority will be allowed to contend with other urgent things across the
-   * system. On devices with big.LITTLE CPU architectures running Marshmallow, your tasks will be
-   * allowed to schedule on the big cores, executing faster but drawing 3x more power for the same
-   * amount of work.
-   *
-   * <p>Some tasks require even higher priority, such as some UI work or real-time audio. If needed,
-   * create your own thread(s) with an elevated priority. Please be careful!
-   *
-   * <p>See b/25246923 for more.
-   */
-  HIGH_SPEED
-}
diff --git a/firebase-messaging/CHANGELOG.md b/firebase-messaging/CHANGELOG.md
new file mode 100644
index 00000000000..fa74fe41b30
--- /dev/null
+++ b/firebase-messaging/CHANGELOG.md
@@ -0,0 +1,462 @@
+# Unreleased
+
+
+# 24.0.0
+* [changed] Switched Firelog to use the new TransportBackend.
+* [changed] Log analytics for notifications displayed by Google Play services on
+  behalf of the app.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.4.1
+* [changed] Bump internal dependencies.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.0.0
+* [changed] Called messageHandled() after a message has been handled to indicate
+  that the message has been handled successfully.
+* [changed] Added an internal identifier to Firelog logging for compliance.
+
+# 23.3.1
+* [changed] Added metadata to FirebaseInstanceIdReceiver to signal that it
+  finishes background broadcasts after the message has been handled.
+* [changed] Specified notification's dismiss intent target via action instead of
+  component name.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.3.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-messaging-ktx`
+  to `com.google.firebase:firebase-messaging` under the `com.google.firebase.messaging` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-messaging-ktx` have been added to
+  `com.google.firebase:firebase-messaging` under the `com.google.firebase.messaging` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-messaging-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.2.1
+* [changed] Changed to finish a background broadcast after the message has been
+  handled, subject to a timeout. This keeps the `FirebaseMessagingService`'s
+  process in an active state while it is handling an FCM message, up to the
+  20 seconds allowed.
+
+# 23.2.0
+* [deprecated] Deprecated FCM upstream messaging. See the
+  [FAQ](https://firebase.google.com/support/faq#fcm-23-deprecation) for more
+  details.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.1.2
+* [fixed] Fixed a breakage related to Jetpack core library related to an
+  [upstream update](https://android-review.googlesource.com/c/platform/frameworks/support/+/2399893).
+* [changed] Updated JavaLite, protoc, protobuf-java-util to 3.21.11.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.1.1
+* [fixed] Fixed deadlock when handling simultaneous messages.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.1.0
+* [unchanged] Updated to accommodate the release of the updated
+  [messaging_longer] Kotlin extensions library.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has the following
+additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-messaging-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+
+# 23.0.8
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.0.7
+* [changed] Message broadcasts now finish immediately after binding to the
+  service. This change should reduce the chance of ANRs.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.0.6
+* [changed] Added the `POST_NOTIFICATIONS` permission to enable posting
+  notifications when targeting SDK level 33. See [messaging] guidance
+  on how to [request runtime notification permission on Android 13+](/docs/cloud-messaging/android/client#request-permission13)
+* [fixed] Added an annotation to an internal class to fix a missing class
+  warning.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.0.5
+* [fixed] Fixed a dependency on the `firebase-datatransport` layer.
+  ([GitHub #3716](https://github.com/firebase/firebase-android-sdk/issues/3716){: .external})
+* [fixed] Upgraded logging priority for message delivery events to avoid
+  dropped logs.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.0.3
+* [fixed] Removed test resources from library.
+* [fixed] Changed to catch `RuntimeException` when getting the `Bundle` from
+  an `Activity Intent` while checking for notification analytics data.
+* [changed] Internal changes to notification building methods.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.0.2
+* [fixed] Fixed an issue where the messaging component in
+  the [firebase_bom_long] leaked the `httpcomponents` transitive dependencies.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.0.1
+* [changed] Updated to the latest version of the `firebase-datatransport`
+  library.
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+* [fixed] On Android 7.0 and earlier, the SDK now logs that a notification was
+  opened after `onActivityCreated` to avoid a race condition when unparceling
+  the extras Bundle.
+* [fixed] Switched to stopping an image download by canceling a `Future` to
+  interrupt the download thread. This change avoids errors that can occur in the
+  image downloading library when trying to close the stream on a different thread
+  than the one that started the download.
+* [fixed] Fixed reference documentation for [`RemoteMessage.getMessageId()`](/docs/reference/android/com/google/firebase/messaging/RemoteMessage#public-string-getmessageid)
+  and updated obsolete references to Google Cloud Messaging (GCM).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 23.0.0
+* [changed] Due to its
+  [dependency on Google Play services](/docs/android/android-play-services),
+  this SDK now requires devices and emulators to target API level 19 (KitKat)
+  or higher and to use Android 4.4 or higher.
+* [feature] Added methods for determining and controlling whether Google
+  Play services is set as the app’s notification delegate. By default, FCM
+  will now set Google Play services as the app’s notification delegate so
+  that it is allowed to display notifications for the app. This could be used
+  in the future to show an app’s notifications without needing to start the
+  app, which may improve message reliability and timeliness.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 22.0.0
+* [changed] Removed dependency on the deprecated Firebase Instance ID SDK.
+  Caution: **This is a breaking change for apps that use [messaging] and the
+  deprecated Firebase Instance ID API to manage registration tokens.**<br>We
+  strongly recommend
+  [migrating to [messaging]'s token APIs](/docs/projects/manage-installations#fid-iid).
+  If you're unable to migrate to the replacement APIs, add a direct dependency
+  on the `firebase-iid` library to your `build.gradle` file.
+* [feature] Changed to open an `Activity` directly when a notification is
+  tapped instead of passing it through `FirebaseMessagingService`. This change
+  is to comply with Android 12 notification trampoline restrictions.
+* [feature] Internal changes to use proto instead of JSON for logging.
+* [changed] Internal changes to support dynamic feature modules.
+* [changed] Internal infrastructure improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.1.0
+* [feature] Migrated internal handling of new token callbacks and
+  notification actions from Firebase Instance ID to [firebase_messaging].
+* [feature] Added functionality to generate [messaging] tokens from
+  `FirebaseMessaging.getToken`, while continuing to call through to Firebase
+  Instance ID if it is present. This will allow [firebase_messaging] to
+  remove its dependency on Firebase Instance ID in the future.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.0.1
+* [changed] Updated to latest version of the `firebase-datatransport` library.
+* [feature] The SDK now gracefully handles missing default resources.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 21.0.0
+* [feature] Migrated auto-initialization from Firebase Instance ID to
+  [firebase_messaging].
+* [feature] Added a check for incompatible versions of Firebase Instance ID.
+  An exception is thrown during instantiation if one is found.
+* [fixed] Fixed an issue where events were erronously logged to
+  [firebase_analytics] twice.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-messaging` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.0
+* [feature] Added
+  [`getToken`](/docs/reference/android/com/google/firebase/messaging/FirebaseMessaging.html#getToken())
+  and
+  [`deleteToken`](/docs/reference/android/com/google/firebase/messaging/FirebaseMessaging.html#deleteToken())
+  methods directly to `FirebaseMessaging`.
+* [changed] Internal changes to the Google Play services interface to improve
+  future development velocity.
+
+
+## Kotlin
+* [feature] The [messaging_longer] Android library with Kotlin
+  extensions is now available. The Kotlin extensions library transitively
+  includes the base `firebase-messaging` library. To learn more,  visit the
+  [[messaging_longer] KTX documentation](/docs/reference/kotlin/com/google/firebase/messaging/ktx/package-summary).
+
+# 20.2.4
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases. For more information, refer to the
+  [Firebase Installations v16.3.3 release notes](/support/release-notes/android#installations_v16-3-3).
+
+# 20.2.3
+* [fixed] Fixed an issue that caused an app to crash when a user tapped on a
+  received notification.
+
+# 20.2.2
+Warning: **This version of `firebase-messaging` (v20.2.2) should not be used.**
+It has a known issue that causes an app to crash when a user taps on a
+received notification. A fix for this issue was released on July 08, 2020
+(see [v20.2.3](/support/release-notes/android#messaging_v20-2-3)).
+
+* [changed] Internal improvements.
+
+# 20.2.1
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases. For more information, refer to the
+  [Firebase Instance ID v20.2.1 release notes](/support/release-notes/android#iid_v20-2-1).
+
+# 20.2.0
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases (for more information, refer to the
+  [[messaging_longer] Direct Boot v20.2.0 release notes](/support/release-notes/android#messaging-directboot_v20-2-0)).
+
+# 20.1.7
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases (for more information, refer to the
+  [Firebase Instance ID v20.1.7 release notes](/support/release-notes/android#iid_v20-1-7)).
+
+# 20.1.6
+* [fixed] Fixed a bug in topic syncing that was causing increased usage of
+  shared system resources when waiting for a working network connection.
+
+# 20.1.5
+Warning: In some cases, `firebase-messaging` v20.1.4 and v20.1.5 are erroneously
+consuming system resources which can negatively impact the performance of a
+user's device. To avoid this effect, **update your app's version of
+`firebase-messaging` to
+[v20.1.6](/support/release-notes/android#messaging_v20-1-6) or later**.
+
+* [changed] Internal changes to ensure functionality alignment with other SDK releases.
+
+# 20.1.4
+Warning: In some cases, `firebase-messaging` v20.1.4 and v20.1.5 are erroneously
+consuming system resources which can negatively impact the performance of a
+user's device. To avoid this effect, **update your app's version of
+`firebase-messaging` to
+[v20.1.6](/support/release-notes/android#messaging_v20-1-6) or later**.
+
+* [changed] Internal changes to ensure functionality alignment with other SDK releases.
+
+# 20.1.3
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases.
+
+# 20.1.2
+**As of v20.1.1, the [messaging_longer] SDK depends on the
+[installations_sdk]. Learn about possible impacts in the
+[v20.1.1 release notes](/support/release-notes/android#messaging_v20-1-1).**
+
+* [changed] Internal changes to ensure functionality alignment with other
+  SDK releases (for more information, refer to the bug fix in the [Firebase
+  Instance ID v20.1.1 release notes](/support/release-notes/android#iid_v20-1-1)).
+
+# 20.1.1
+Warning: This version of `firebase-messaging` (v20.1.1) has known issues
+involving silent failures and should not be used. A fix for these issues was
+released on [March 03, 2020](/support/release-notes/android#2020-03-03).
+
+* [changed] Changed the default for notification titles. Previously, an empty
+  title was replaced with the app's label, but now an empty title causes the
+  notification title to be omitted.
+* [fixed] Fixed an issue that could cause ANRs when receiving messages.
+* [changed] [messaging_longer] now transitively depends on the
+  [installations_sdk]. After updating to the latest dependency versions, make
+  sure that push notifications still work as expected. Also, be aware of the
+  following:
+
+  * The [messaging] registration tokens of installed instances of your apps
+    might change once after updating dependencies to their latest versions. To
+    learn if your apps are affected, review the
+    <a href="//github.com/firebase/firebase-android-sdk/blob/master/firebase-installations/FCM_TOKENS_CHANGE.md"
+       class="external">[firebase_installations] documentation</a>. Also,
+    make sure to
+    <a href="/docs/cloud-messaging/android/client#monitor-token-generation">monitor
+      [messaging] registration token generation</a> using the
+    <code>#onNewToken</code> implementation.
+
+  * Apps that use the Firebase auto-initialization process and the Gradle plugin
+    to convert `google-services.json` into resources are unaffected. However,
+    apps that create their own `FirebaseOptions` instances must provide a valid
+    API key, Firebase project ID, and application ID.
+
+# 20.1.0
+* [feature] Added
+  [`setDeliveryMetricsExportToBigQuery(boolean)`](/docs/reference/android/com/google/firebase/messaging/FirebaseMessaging.html#setDeliveryMetricsExportToBigQuery(boolean))
+  and
+  [`deliveryMetricsExportToBigQueryEnabled()`](/docs/reference/android/com/google/firebase/messaging/FirebaseMessaging.html#deliveryMetricsExportToBigQueryEnabled())
+  to control and query if messsage delivery metrics are exported to BigQuery.
+* [changed] Changed to catch and log NullPointerException when trying to close
+  the image download stream. This NPE can happen if the image download takes too
+  long and times out.
+
+# 20.0.1
+* [fixed] Fixed notifications on API level 24 and later to display the event
+  time when `event_time` is set.
+
+# 20.0.0
+* [feature] Added support for more Android notification parameters, including:
+  `ticker`, `sticky`,`event_time`, `local_only`, `notification_priority`,
+  `default_sound`, `default_vibrate_timings`, `default_light_settings`,
+  `visibility`, `notification_count`, `vibrate_timings` and `light_settings`.
+* [feature] Added support for Android notifications that include an image.
+* [changed] Added nullability annotations to improve the Kotlin developer
+  experience.
+
+# 19.0.1
+* [fixed] Fixed an issue where `FirebaseMessagingService.onNewToken` would be
+  invoked for tokens created for non-default FirebaseApp instances.
+* [fixed] SDK now only retries topic subscriptions and token registration on
+  the following errors: "ERROR_SERVICE_NOT_AVAILABLE" and
+  "ERROR_INTERNAL_SERVER_ERROR".
+
+# 18.0.0
+* [changed] Updated minSdkVersion to API level 16.
+
+# 17.6.0
+* [feature] Added functionality to automatically download and show an image in
+  a notification message. Retrieve the image URL set in the message with the
+  `getImageUrl` method in
+  [`RemoteMessage.Notification`](/docs/reference/android/com/google/firebase/messaging/RemoteMessage.Notification).
+
+# 17.5.0
+* [changed] Added internal improvements and refactored code.
+
+# 17.4.0
+* [feature] Added `getChannelId` method to [`RemoteMessage.Notification`](/docs/reference/android/com/google/firebase/messaging/RemoteMessage.Notification) for getting the channel ID set in a notification message.
+* [fixed] Fixed a rare `ClassCastException` while receiving a message.
+
+# 17.3.4
+* [fixed] Bug fixes and internal improvements.
+
+# 17.3.2
+* [fixed] Fixed an issue that would occasionally cause apps to crash with
+  Android Not Responding (ANR) errors when receiving a message.
+
+# 17.3.0
+* [changed] Incremented the version number to 17.3.0 due to internal SDK
+  changes. These changes do not affect client functionality, and developers
+  do not need to take any action.
+
+# 17.1.0
+* [feature] Added `onNewToken` method to [`FirebaseMessagingService`](/docs/reference/android/com/google/firebase/messaging/FirebaseMessagingService) which is invoked when the app gets a new Instance ID token or its existing token changes.
+
+# 17.0.0
+* [feature] Added `getPriority()` and `getOriginalPriority()` methods to
+  [`RemoteMessage`](/docs/reference/android/com/google/firebase/messaging/RemoteMessage).
+* [changed] The methods `subscribeToTopic()` and `unsubscribeFromTopic()` on
+  [`FirebaseMessaging`](/docs/reference/android/com/google/firebase/messaging/FirebaseMessaging)
+  now return a
+  [`Task`](/docs/reference/android/com/google/android/gms/tasks/Task) that can
+  be used to see when the request has completed.
+
diff --git a/firebase-messaging/api.txt b/firebase-messaging/api.txt
index 1a49cff4741..bf42f6119ab 100644
--- a/firebase-messaging/api.txt
+++ b/firebase-messaging/api.txt
@@ -8,10 +8,10 @@ package com.google.firebase.messaging {
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.String> getToken();
     method public boolean isAutoInitEnabled();
     method public boolean isNotificationDelegationEnabled();
-    method public void send(@NonNull com.google.firebase.messaging.RemoteMessage);
+    method @Deprecated public void send(@NonNull com.google.firebase.messaging.RemoteMessage);
     method public void setAutoInitEnabled(boolean);
     method public void setDeliveryMetricsExportToBigQuery(boolean);
-    method public com.google.android.gms.tasks.Task<java.lang.Void> setNotificationDelegationEnabled(boolean);
+    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> setNotificationDelegationEnabled(boolean);
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> subscribeToTopic(@NonNull String);
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> unsubscribeFromTopic(@NonNull String);
     field @Deprecated public static final String INSTANCE_ID_SCOPE = "FCM";
@@ -28,7 +28,12 @@ package com.google.firebase.messaging {
     method public final int onStartCommand(android.content.Intent, int, int);
   }
 
-  @com.google.android.gms.common.internal.safeparcel.SafeParcelable.Reserved({1}) @com.google.android.gms.common.internal.safeparcel.SafeParcelable.Class(creator="RemoteMessageCreator") public final class RemoteMessage extends com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable {
+  public final class MessagingKt {
+    method @NonNull public static com.google.firebase.messaging.FirebaseMessaging getMessaging(@NonNull com.google.firebase.Firebase);
+    method @NonNull public static inline com.google.firebase.messaging.RemoteMessage remoteMessage(@NonNull String to, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.messaging.RemoteMessage.Builder,kotlin.Unit> init);
+  }
+
+  @com.google.android.gms.common.internal.safeparcel.SafeParcelable.Class(creator="RemoteMessageCreator") @com.google.android.gms.common.internal.safeparcel.SafeParcelable.Reserved({1}) public final class RemoteMessage extends com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable {
     method @Nullable public String getCollapseKey();
     method @NonNull public java.util.Map<java.lang.String,java.lang.String> getData();
     method @Nullable public String getFrom();
@@ -91,13 +96,6 @@ package com.google.firebase.messaging {
     method @Nullable public Integer getVisibility();
   }
 
-  public class RemoteMessageCreator implements android.os.Parcelable.Creator<com.google.firebase.messaging.RemoteMessage> {
-    ctor public RemoteMessageCreator();
-    method @Nullable public com.google.firebase.messaging.RemoteMessage createFromParcel(android.os.Parcel);
-    method @Nullable public com.google.firebase.messaging.RemoteMessage[] newArray(int);
-    field public static final int CONTENT_DESCRIPTION = 0; // 0x0
-  }
-
   public final class SendException extends java.lang.Exception {
     method public int getErrorCode();
     field public static final int ERROR_INVALID_PARAMETERS = 1; // 0x1
@@ -109,28 +107,11 @@ package com.google.firebase.messaging {
 
 }
 
-package com.google.firebase.messaging.threads {
-
-  public interface ExecutorFactory {
-    method public void executeOneOff(String, String, com.google.firebase.messaging.threads.ThreadPriority, Runnable);
-    method public java.util.concurrent.ScheduledExecutorService newScheduledThreadPool(int, com.google.firebase.messaging.threads.ThreadPriority);
-    method public java.util.concurrent.ScheduledExecutorService newScheduledThreadPool(int, java.util.concurrent.ThreadFactory, com.google.firebase.messaging.threads.ThreadPriority);
-    method public java.util.concurrent.ExecutorService newSingleThreadExecutor(com.google.firebase.messaging.threads.ThreadPriority);
-    method public java.util.concurrent.ExecutorService newSingleThreadExecutor(java.util.concurrent.ThreadFactory, com.google.firebase.messaging.threads.ThreadPriority);
-    method public java.util.concurrent.ExecutorService newThreadPool(com.google.firebase.messaging.threads.ThreadPriority);
-    method public java.util.concurrent.ExecutorService newThreadPool(java.util.concurrent.ThreadFactory, com.google.firebase.messaging.threads.ThreadPriority);
-    method public java.util.concurrent.ExecutorService newThreadPool(int, com.google.firebase.messaging.threads.ThreadPriority);
-    method public java.util.concurrent.ExecutorService newThreadPool(int, java.util.concurrent.ThreadFactory, com.google.firebase.messaging.threads.ThreadPriority);
-    method public java.util.concurrent.Future<?> submitOneOff(String, String, com.google.firebase.messaging.threads.ThreadPriority, Runnable);
-  }
-
-  public class PoolableExecutors {
-    method public static com.google.firebase.messaging.threads.ExecutorFactory factory();
-  }
+package com.google.firebase.messaging.ktx {
 
-  public enum ThreadPriority {
-    enum_constant public static final com.google.firebase.messaging.threads.ThreadPriority HIGH_SPEED;
-    enum_constant public static final com.google.firebase.messaging.threads.ThreadPriority LOW_POWER;
+  public final class MessagingKt {
+    method @Deprecated @NonNull public static com.google.firebase.messaging.FirebaseMessaging getMessaging(@NonNull com.google.firebase.ktx.Firebase);
+    method @Deprecated @NonNull public static inline com.google.firebase.messaging.RemoteMessage remoteMessage(@NonNull String to, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.messaging.RemoteMessage.Builder,kotlin.Unit> init);
   }
 
 }
diff --git a/firebase-messaging/firebase-messaging.gradle b/firebase-messaging/firebase-messaging.gradle
index 4286983534d..90715343536 100644
--- a/firebase-messaging/firebase-messaging.gradle
+++ b/firebase-messaging/firebase-messaging.gradle
@@ -13,25 +13,27 @@
 // limitations under the License.
 
 plugins {
-    id 'firebase-library'
     id 'com.google.protobuf'
+    id 'firebase-library'
+    id("kotlin-android")
 }
-
 configurations.create("protobuild")
-dependencies {
-    protobuild project(path: ":encoders:protoc-gen-firebase-encoders", configuration: "shadow")
-}
 
 protobuf {
+    dependencies {
+        // Include the project dependency directly
+        protobuild project(path: ':encoders:protoc-gen-firebase-encoders', configuration: 'shadow')
+}
     protoc {
         artifact = "com.google.protobuf:protoc:$protocVersion"
     }
     plugins {
         firebaseEncoders {
-            path = configurations.protobuild.asPath
+            path = project(':encoders:protoc-gen-firebase-encoders').buildDir.path + '/libs' +'/protoc-gen-firebase-encoders-all.jar'
         }
     }
     generateProtoTasks {
+
         all().each { task ->
             task.dependsOn configurations.protobuild
             task.inputs.file 'code_gen_cfg.textproto'
@@ -42,13 +44,16 @@ protobuf {
             }
             task.builtins {
                 remove java
+                remove kotlin
             }
+
         }
     }
 }
 
 
 firebaseLibrary {
+    libraryGroup "messaging"
     testLab.enabled = false
 }
 
@@ -56,15 +61,10 @@ android {
     adbOptions {
         timeOutInMs 60 * 1000
     }
-
-
-    lintOptions {
-        abortOnError false
-    }
-
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.messaging"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         versionName version
 
@@ -72,64 +72,87 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     testOptions.unitTests.includeAndroidResources = true
+    testOptions.unitTests.all {
+        jvmArgs '--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED'
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions { jvmTarget = "1.8" }
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-installations-interop')
-    implementation project(':firebase-datatransport')
-    implementation project(':transport:transport-api')
-    implementation project(':transport:transport-runtime')
-    implementation project(':transport:transport-backend-cct')
-    implementation project(':encoders:firebase-encoders')
-    implementation project(':encoders:firebase-encoders-json')
-    implementation project(":encoders:firebase-encoders-proto")
-    implementation project(":firebase-installations")
-    annotationProcessor project(":encoders:firebase-encoders-processor")
-
-    implementation 'androidx.annotation:annotation:1.2.0'
-    implementation "com.google.android.gms:play-services-tasks:18.0.1"
-    implementation "com.google.android.gms:play-services-basement:18.0.0"
-    implementation 'com.google.android.gms:play-services-base:18.0.1'
-    implementation 'com.google.android.gms:play-services-stats:17.0.2'
-    implementation 'com.google.firebase:firebase-measurement-connector:19.0.0'
-    implementation "com.google.firebase:firebase-iid-interop:17.1.0"
-    implementation 'com.google.android.gms:play-services-cloud-messaging:17.0.1'
-    implementation ("com.google.api-client:google-api-client:1.30.9") {
-        exclude group: "org.apache.httpcomponents", module: "httpclient"
-    }
-    testCompileOnly 'com.google.auto.value:auto-value-annotations:1.6.3'
-    testAnnotationProcessor "com.google.auto.value:auto-value:1.6.3"
-
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
-
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'com.google.android.gms:play-services-cloud-messaging:17.0.1'
-    testImplementation 'androidx.test:rules:1.2.0'
-    testImplementation 'androidx.test:runner:1.2.0'
-    testImplementation "org.robolectric:robolectric:4.6.1"
-    testImplementation 'junit:junit:4.13-beta-2'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'com.google.android.gms:play-services-vision:20.1.3'
-    testImplementation ("com.google.firebase:firebase-iid:21.1.0") {
-        exclude group: "com.google.firebase", module: "firebase-common"
-        exclude group: "com.google.firebase", module: "firebase-components"
-        exclude group: "com.google.firebase", module: "firebase-installations-interop"
-        exclude group: "com.google.firebase", module: "firebase-installations"
-    }
+        javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+
+        api("com.google.firebase:firebase-common:21.0.0")
+        api("com.google.firebase:firebase-common-ktx:21.0.0")
+        api("com.google.firebase:firebase-components:18.0.0")
+        api('com.google.firebase:firebase-datatransport:18.2.0') {
+         exclude group: 'com.google.firebase', module: 'firebase-common'
+         exclude group: 'com.google.firebase', module: 'firebase-components'
+     }
+        api 'com.google.firebase:firebase-encoders:17.0.0'
+        api 'com.google.firebase:firebase-encoders-json:18.0.0'
+        api "com.google.firebase:firebase-encoders-proto:16.0.0"
+        api "com.google.firebase:firebase-iid-interop:17.1.0"
+        api("com.google.firebase:firebase-installations:17.2.0")
+        api('com.google.firebase:firebase-installations-interop:17.1.0')
+        api('com.google.firebase:firebase-measurement-connector:19.0.0')
+
+        implementation 'androidx.annotation:annotation:1.2.0'
+        implementation 'com.google.android.datatransport:transport-api:3.1.0'
+        implementation 'com.google.android.datatransport:transport-backend-cct:3.1.8'
+        implementation 'com.google.android.datatransport:transport-runtime:3.1.8'
+        implementation 'com.google.android.gms:play-services-base:18.0.1'
+        implementation "com.google.android.gms:play-services-basement:18.1.0"
+        implementation 'com.google.android.gms:play-services-cloud-messaging:17.2.0'
+        implementation 'com.google.android.gms:play-services-stats:17.0.2'
+        implementation "com.google.android.gms:play-services-tasks:18.0.1"
+        implementation "com.google.errorprone:error_prone_annotations:2.9.0"
+        implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+
+        annotationProcessor project(":encoders:firebase-encoders-processor")
+
+        testAnnotationProcessor "com.google.auto.value:auto-value:1.6.3"
+
+        testImplementation 'androidx.core:core:1.6.0'
+        testImplementation "androidx.test:core:$androidxTestCoreVersion"
+        testImplementation 'androidx.test:rules:1.2.0'
+        testImplementation 'androidx.test:runner:1.2.0'
+        testImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
+        testImplementation 'androidx.test.ext:truth:1.4.0'
+        testImplementation 'androidx.test.services:test-services:1.2.0'
+        testImplementation 'com.android.support.test:runner:1.0.2'
+        testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
+        testImplementation 'com.google.android.gms:play-services-cloud-messaging:17.0.1'
+        testImplementation 'com.google.android.gms:play-services-vision:20.1.3'
+        testImplementation ("com.google.api-client:google-api-client:1.30.9") {
+         exclude group: "org.apache.httpcomponents", module: "httpclient"
+     }
+        testImplementation ("com.google.firebase:firebase-iid:21.1.0") {
+         exclude group: "com.google.firebase", module: "firebase-common"
+         exclude group: "com.google.firebase", module: "firebase-components"
+         exclude group: "com.google.firebase", module: "firebase-installations-interop"
+         exclude group: "com.google.firebase", module: "firebase-installations"
+     }
+        testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
+        testImplementation "com.google.truth:truth:$googleTruthVersion"
+        testImplementation 'junit:junit:4.12'
+        testImplementation 'junit:junit:4.13-beta-2'
+        testImplementation 'org.mockito:mockito-core:5.2.0'
+        testImplementation "org.robolectric:robolectric:$robolectricVersion"
+
+        testCompileOnly 'com.google.auto.value:auto-value-annotations:1.6.3'
 
-    testImplementation 'com.android.support.test:runner:1.0.2'
-    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
-    testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
-    testImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
-    testImplementation 'androidx.test:rules:1.2.0'
-    testImplementation 'androidx.test.ext:truth:1.4.0'
-    testImplementation 'androidx.test.services:test-services:1.2.0'
-    testImplementation 'androidx.core:core:1.6.0'
+        androidTestImplementation(project(":integ-testing")){
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components' }
+        androidTestImplementation "androidx.annotation:annotation:1.0.0"
+        androidTestImplementation 'androidx.test:runner:1.2.0'
+        androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
+        androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+        androidTestImplementation 'junit:junit:4.12'
+        androidTestImplementation 'org.mockito:mockito-core:5.2.0'
+        androidTestImplementation 'org.mockito:mockito-inline:5.2.0'
 }
diff --git a/firebase-messaging/gradle.properties b/firebase-messaging/gradle.properties
index 6edafcaa15d..0755740b9a2 100644
--- a/firebase-messaging/gradle.properties
+++ b/firebase-messaging/gradle.properties
@@ -1,3 +1,3 @@
-version=23.0.1
-latestReleasedVersion=23.0.0
+version=24.0.1
+latestReleasedVersion=24.0.0
 android.enableUnitTestBinaryResources=true
diff --git a/firebase-messaging/ktx/api.txt b/firebase-messaging/ktx/api.txt
index 9980e0d085e..c0bdbc228e9 100644
--- a/firebase-messaging/ktx/api.txt
+++ b/firebase-messaging/ktx/api.txt
@@ -1,10 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.messaging.ktx {
 
-  public final class MessagingKt {
-    ctor public MessagingKt();
-    method @NonNull public static com.google.firebase.messaging.FirebaseMessaging getMessaging(@NonNull com.google.firebase.ktx.Firebase);
-    method @NonNull public static inline com.google.firebase.messaging.RemoteMessage remoteMessage(@NonNull String to, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.messaging.RemoteMessage.Builder,kotlin.Unit> init);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-messaging/ktx/ktx.gradle b/firebase-messaging/ktx/ktx.gradle
index 3c87cde1acf..f58242e41be 100644
--- a/firebase-messaging/ktx/ktx.gradle
+++ b/firebase-messaging/ktx/ktx.gradle
@@ -14,19 +14,21 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-messaging')
-    publishJavadoc = true
+    libraryGroup "messaging"
+    publishJavadoc = false
+    publishReleaseNotes = false
     publishSources = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.messaging.ktx"    
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
@@ -37,20 +39,21 @@ android {
         test.java.srcDirs += 'src/test/kotlin'
         androidTest.java.srcDirs += 'src/androidTest/kotlin'
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api(project(":firebase-messaging"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
 
-    implementation project(':firebase-common')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-components')
-    implementation project(':firebase-messaging')
-    implementation "com.google.android.gms:play-services-basement:18.0.0"
+    implementation("com.google.firebase:firebase-components:18.0.0")
 
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
diff --git a/firebase-messaging/ktx/src/main/AndroidManifest.xml b/firebase-messaging/ktx/src/main/AndroidManifest.xml
index 846b9fda334..26423f637af 100644
--- a/firebase-messaging/ktx/src/main/AndroidManifest.xml
+++ b/firebase-messaging/ktx/src/main/AndroidManifest.xml
@@ -13,16 +13,14 @@
      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="com.google.firebase.messaging.ktx">
-  <!--<uses-sdk android:minSdkVersion="16"/>-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <!--<uses-sdk android:minSdkVersion="21"/>-->
   <application>
         <service android:exported="false"
             android:name="com.google.firebase.components.ComponentDiscoveryService">
             <meta-data
-                android:name="com.google.firebase.components:com.google.firebase.messaging.ktx.FirebaseMessagingKtxRegistrar"
+                android:name="com.google.firebase.components:com.google.firebase.messaging.ktx.FirebaseMessagingLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
 </manifest>
-
diff --git a/firebase-messaging/ktx/src/main/kotlin/com/google/firebase/messaging/ktx/Logging.kt b/firebase-messaging/ktx/src/main/kotlin/com/google/firebase/messaging/ktx/Logging.kt
new file mode 100644
index 00000000000..3e3a591947a
--- /dev/null
+++ b/firebase-messaging/ktx/src/main/kotlin/com/google/firebase/messaging/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.messaging.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.messaging.BuildConfig
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-fcm-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseMessagingLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-messaging/ktx/src/main/kotlin/com/google/firebase/messaging/ktx/Messaging.kt b/firebase-messaging/ktx/src/main/kotlin/com/google/firebase/messaging/ktx/Messaging.kt
deleted file mode 100644
index e40198a0132..00000000000
--- a/firebase-messaging/ktx/src/main/kotlin/com/google/firebase/messaging/ktx/Messaging.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.messaging.ktx
-
-import com.google.firebase.FirebaseApp
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.messaging.FirebaseMessaging
-import com.google.firebase.messaging.RemoteMessage
-import com.google.firebase.platforminfo.LibraryVersionComponent
-
-internal const val LIBRARY_NAME: String = "fire-fcm-ktx"
-
-/** Returns the [FirebaseMessaging] instance of the default [FirebaseApp]. */
-val Firebase.messaging: FirebaseMessaging
-    get() = FirebaseMessaging.getInstance()
-
-/** Returns a [RemoteMessage] instance initialized using the [init] function. */
-inline fun remoteMessage(to: String, crossinline init: RemoteMessage.Builder.() -> Unit): RemoteMessage {
-    val builder = RemoteMessage.Builder(to)
-    builder.init()
-    return builder.build()
-}
-
-/** @suppress */
-class FirebaseMessagingKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-messaging/ktx/src/test/kotlin/com/google/firebase/messaging/ktx/MessagingTests.kt b/firebase-messaging/ktx/src/test/kotlin/com/google/firebase/messaging/ktx/MessagingTests.kt
index f8a269bfbac..ce40403254f 100644
--- a/firebase-messaging/ktx/src/test/kotlin/com/google/firebase/messaging/ktx/MessagingTests.kt
+++ b/firebase-messaging/ktx/src/test/kotlin/com/google/firebase/messaging/ktx/MessagingTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.messaging.ktx
 
@@ -33,59 +35,60 @@ const val APP_ID = "APP_ID"
 const val API_KEY = "API_KEY"
 
 abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
-    }
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+  }
 
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class MessagingTests : BaseTestCase() {
 
-    @Test
-    fun `messaging should delegate to FirebaseMessaging#getInstance()`() {
-        assertThat(Firebase.messaging).isSameInstanceAs(FirebaseMessaging.getInstance())
-    }
+  @Test
+  fun `messaging should delegate to FirebaseMessaging#getInstance()`() {
+    assertThat(Firebase.messaging).isSameInstanceAs(FirebaseMessaging.getInstance())
+  }
 
-    @Test
-    fun `remoteMessage() should produce correct RemoteMessages`() {
-        val recipient = "recipient"
-        val expectedCollapseKey = "collapse"
-        val msgId = "id"
-        val msgType = "type"
-        val timeToLive = 100
-        val remoteMessage = remoteMessage(recipient) {
-            collapseKey = expectedCollapseKey
-            messageId = msgId
-            messageType = msgType
-            ttl = timeToLive
-            addData("hello", "world")
-        }
-        assertThat(remoteMessage.to).isEqualTo(recipient)
-        assertThat(remoteMessage.collapseKey).isEqualTo(expectedCollapseKey)
-        assertThat(remoteMessage.messageId).isEqualTo(msgId)
-        assertThat(remoteMessage.messageType).isEqualTo(msgType)
-        assertThat(remoteMessage.data).isEqualTo(mapOf("hello" to "world"))
-    }
+  @Test
+  fun `remoteMessage() should produce correct RemoteMessages`() {
+    val recipient = "recipient"
+    val expectedCollapseKey = "collapse"
+    val msgId = "id"
+    val msgType = "type"
+    val timeToLive = 100
+    val remoteMessage =
+      remoteMessage(recipient) {
+        collapseKey = expectedCollapseKey
+        messageId = msgId
+        messageType = msgType
+        ttl = timeToLive
+        addData("hello", "world")
+      }
+    assertThat(remoteMessage.to).isEqualTo(recipient)
+    assertThat(remoteMessage.collapseKey).isEqualTo(expectedCollapseKey)
+    assertThat(remoteMessage.messageId).isEqualTo(msgId)
+    assertThat(remoteMessage.messageType).isEqualTo(msgType)
+    assertThat(remoteMessage.data).isEqualTo(mapOf("hello" to "world"))
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun `library version should be registered with runtime`() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
 }
diff --git a/health-metrics/macrobenchmark/template/benchmark/src/androidTest/AndroidManifest.xml b/firebase-messaging/src/androidTest/AndroidManifest.xml
similarity index 72%
rename from health-metrics/macrobenchmark/template/benchmark/src/androidTest/AndroidManifest.xml
rename to firebase-messaging/src/androidTest/AndroidManifest.xml
index a3d4dd73e80..8f39c6896e4 100644
--- a/health-metrics/macrobenchmark/template/benchmark/src/androidTest/AndroidManifest.xml
+++ b/firebase-messaging/src/androidTest/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2021 Google LLC -->
+<!-- Copyright 2019 Google LLC -->
 <!-- -->
 <!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
 <!-- you may not use this file except in compliance with the License. -->
@@ -13,12 +13,13 @@
 <!-- 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"
-    package="com.google.firebase.benchmark.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
+    <application>
+        <uses-library android:name="android.test.runner"/>
+    </application>
 
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.google.firebase.messaging" />
 </manifest>
diff --git a/firebase-messaging/src/androidTest/java/com/google/firebase/messaging/StrictModeTest.java b/firebase-messaging/src/androidTest/java/com/google/firebase/messaging/StrictModeTest.java
new file mode 100644
index 00000000000..98972a9340e
--- /dev/null
+++ b/firebase-messaging/src/androidTest/java/com/google/firebase/messaging/StrictModeTest.java
@@ -0,0 +1,47 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.messaging;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions.Builder;
+import com.google.firebase.testing.integ.StrictModeRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class StrictModeTest {
+
+  @Rule public StrictModeRule strictMode = new StrictModeRule();
+
+  @Test
+  public void initializingFirebaseMessaging_shouldNotViolateStrictMode() {
+    strictMode.runOnMainThread(
+        () -> {
+          FirebaseApp app =
+              FirebaseApp.initializeApp(
+                  ApplicationProvider.getApplicationContext(),
+                  new Builder()
+                      .setApiKey("api")
+                      .setProjectId("123")
+                      .setApplicationId("appId")
+                      .build(),
+                  "hello");
+          app.get(FirebaseMessaging.class);
+        });
+  }
+}
diff --git a/firebase-messaging/src/main/AndroidManifest.xml b/firebase-messaging/src/main/AndroidManifest.xml
index bd7c3a36c1a..453f2bf9aff 100644
--- a/firebase-messaging/src/main/AndroidManifest.xml
+++ b/firebase-messaging/src/main/AndroidManifest.xml
@@ -13,9 +13,9 @@
      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="com.google.firebase.messaging">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <!-- Required by older versions of Google Play services to create IID tokens -->
   <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
@@ -28,6 +28,9 @@
             <intent-filter>
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
             </intent-filter>
+            <meta-data
+                android:name="com.google.android.gms.cloudmessaging.FINISHED_AFTER_HANDLED"
+                android:value="true" />
         </receiver>
 
         <!-- FirebaseMessagingService performs security checks at runtime,
@@ -41,11 +44,10 @@
             </intent-filter>
         </service>
         <service android:exported="false"
-            android:name="com.google.firebase.components.ComponentDiscoveryService">
+            android:name="com.google.firebase.components.ComponentDiscoveryService"> <meta-data android:name="com.google.firebase.components:com.google.firebase.messaging.FirebaseMessagingKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data
                 android:name="com.google.firebase.components:com.google.firebase.messaging.FirebaseMessagingRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
 </manifest>
-
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/ByteStreams.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/ByteStreams.java
new file mode 100644
index 00000000000..e890214eaa9
--- /dev/null
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/ByteStreams.java
@@ -0,0 +1,201 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.messaging;
+
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Queue;
+
+/** @hide */
+final class ByteStreams {
+
+  private static final int BUFFER_SIZE = 8192;
+
+  /** Creates a new byte array for buffering reads or writes. */
+  static byte[] createBuffer() {
+    return new byte[BUFFER_SIZE];
+  }
+
+  private static int saturatedCast(long value) {
+    if (value > Integer.MAX_VALUE) {
+      return Integer.MAX_VALUE;
+    }
+    if (value < Integer.MIN_VALUE) {
+      return Integer.MIN_VALUE;
+    }
+    return (int) value;
+  }
+
+  private ByteStreams() {}
+
+  /** Max array length on JVM. */
+  private static final int MAX_ARRAY_LEN = Integer.MAX_VALUE - 8;
+
+  /** Large enough to never need to expand, given the geometric progression of buffer sizes. */
+  private static final int TO_BYTE_ARRAY_DEQUE_SIZE = 20;
+
+  /**
+   * Returns a byte array containing the bytes from the buffers already in {@code bufs} (which have
+   * a total combined length of {@code totalLen} bytes) followed by all bytes remaining in the given
+   * input stream.
+   */
+  private static byte[] toByteArrayInternal(InputStream in, Queue<byte[]> bufs, int totalLen)
+      throws IOException {
+    // Roughly size to match what has been read already. Some file systems, such as procfs, return 0
+    // as their length. These files are very small, so it's wasteful to allocate an 8KB buffer.
+    int initialBufferSize = min(BUFFER_SIZE, max(128, Integer.highestOneBit(totalLen) * 2));
+    // Starting with an 8k buffer, double the size of each successive buffer. Smaller buffers
+    // quadruple in size until they reach 8k, to minimize the number of small reads for longer
+    // streams. Buffers are retained in a deque so that there's no copying between buffers while
+    // reading and so all of the bytes in each new allocated buffer are available for reading from
+    // the stream.
+    for (int bufSize = initialBufferSize;
+        totalLen < MAX_ARRAY_LEN;
+        bufSize = saturatedCast((long) bufSize * (bufSize < 4096 ? 4 : 2))) {
+      byte[] buf = new byte[min(bufSize, MAX_ARRAY_LEN - totalLen)];
+      bufs.add(buf);
+      int off = 0;
+      while (off < buf.length) {
+        // always OK to fill buf; its size plus the rest of bufs is never more than MAX_ARRAY_LEN
+        int r = in.read(buf, off, buf.length - off);
+        if (r == -1) {
+          return combineBuffers(bufs, totalLen);
+        }
+        off += r;
+        totalLen += r;
+      }
+    }
+
+    // read MAX_ARRAY_LEN bytes without seeing end of stream
+    if (in.read() == -1) {
+      // oh, there's the end of the stream
+      return combineBuffers(bufs, MAX_ARRAY_LEN);
+    } else {
+      throw new OutOfMemoryError("input is too large to fit in a byte array");
+    }
+  }
+
+  private static byte[] combineBuffers(Queue<byte[]> bufs, int totalLen) {
+    if (bufs.isEmpty()) {
+      return new byte[0];
+    }
+    byte[] result = bufs.remove();
+    if (result.length == totalLen) {
+      return result;
+    }
+    int remaining = totalLen - result.length;
+    result = Arrays.copyOf(result, totalLen);
+    while (remaining > 0) {
+      byte[] buf = bufs.remove();
+      int bytesToCopy = min(remaining, buf.length);
+      int resultOffset = totalLen - remaining;
+      System.arraycopy(buf, 0, result, resultOffset, bytesToCopy);
+      remaining -= bytesToCopy;
+    }
+    return result;
+  }
+
+  /**
+   * Reads all bytes from an input stream into a byte array. Does not close the stream.
+   *
+   * @param in the input stream to read from
+   * @return a byte array containing all the bytes from the stream
+   * @throws IOException if an I/O error occurs
+   */
+  public static byte[] toByteArray(InputStream in) throws IOException {
+    return toByteArrayInternal(in, new ArrayDeque<byte[]>(TO_BYTE_ARRAY_DEQUE_SIZE), 0);
+  }
+
+  public static InputStream limit(InputStream in, long limit) {
+    return new LimitedInputStream(in, limit);
+  }
+
+  private static final class LimitedInputStream extends FilterInputStream {
+
+    private long left;
+    private long mark = -1;
+
+    LimitedInputStream(InputStream in, long limit) {
+      super(in);
+      left = limit;
+    }
+
+    @Override
+    public int available() throws IOException {
+      return (int) Math.min(in.available(), left);
+    }
+
+    // it's okay to mark even if mark isn't supported, as reset won't work
+    @Override
+    public synchronized void mark(int readLimit) {
+      in.mark(readLimit);
+      mark = left;
+    }
+
+    @Override
+    public int read() throws IOException {
+      if (left == 0) {
+        return -1;
+      }
+
+      int result = in.read();
+      if (result != -1) {
+        --left;
+      }
+      return result;
+    }
+
+    @Override
+    public int read(byte[] b, int off, int len) throws IOException {
+      if (left == 0) {
+        return -1;
+      }
+
+      len = (int) Math.min(len, left);
+      int result = in.read(b, off, len);
+      if (result != -1) {
+        left -= result;
+      }
+      return result;
+    }
+
+    @Override
+    public synchronized void reset() throws IOException {
+      if (!in.markSupported()) {
+        throw new IOException("Mark not supported");
+      }
+      if (mark == -1) {
+        throw new IOException("Mark not set");
+      }
+
+      in.reset();
+      left = mark;
+    }
+
+    @Override
+    public long skip(long n) throws IOException {
+      n = Math.min(n, left);
+      long skipped = in.skip(n);
+      left -= skipped;
+      return skipped;
+    }
+  }
+}
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/CommonNotificationBuilder.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/CommonNotificationBuilder.java
index b2bc2c76d5e..61029444300 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/CommonNotificationBuilder.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/CommonNotificationBuilder.java
@@ -20,7 +20,6 @@
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
-import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -71,7 +70,7 @@ public final class CommonNotificationBuilder {
   // resource file exists (possibly stripped by Progurad). Note this name is set purposefully
   // different from FM's default resource channel name "Miscellaneous" for debugability.
   private static final String FCM_FALLBACK_NOTIFICATION_CHANNEL_NAME_NO_RESOURCE = "Misc";
-  private static final String ACTION_MESSAGING_EVENT = "com.google.firebase.MESSAGING_EVENT";
+  private static final String ACTION_RECEIVER = "com.google.android.c2dm.intent.RECEIVE";
 
   // Getting illegal resouce id from context will throw NotFoundException.
   // See: https://developer.android.com/reference/android/content/res/Resources#ID_NULL
@@ -95,6 +94,7 @@ public final class CommonNotificationBuilder {
   // Do not instantiate.
   private CommonNotificationBuilder() {}
 
+  /** Creates a DisplayNotificationInfo from NotificationParams for a single Context. */
   static DisplayNotificationInfo createNotificationInfo(
       Context context, NotificationParams params) {
     Bundle manifestMetadata =
@@ -102,24 +102,27 @@ static DisplayNotificationInfo createNotificationInfo(
 
     return createNotificationInfo(
         context,
-        context.getPackageName(),
+        context,
         params,
         getOrCreateChannel(context, params.getNotificationChannelId(), manifestMetadata),
-        context.getResources(),
-        context.getPackageManager(),
         manifestMetadata);
   }
 
+  /**
+   * Creates a DisplayNotificationInfo from NotificationParams that allows specifying a calling
+   * Context to be used for creating PendingIntents and one Context that the notification is
+   * intended for (resources, package name, manifest data, etc.)
+   */
   public static DisplayNotificationInfo createNotificationInfo(
-      Context context,
-      String pkgName,
+      Context callingContext,
+      Context appContext,
       NotificationParams params,
       String channelId,
-      Resources appResources,
-      PackageManager appPackageManager,
       Bundle manifestMetadata) {
-
-    NotificationCompat.Builder builder = new NotificationCompat.Builder(context, channelId);
+    String pkgName = appContext.getPackageName();
+    Resources appResources = appContext.getResources();
+    PackageManager appPackageManager = appContext.getPackageManager();
+    NotificationCompat.Builder builder = new NotificationCompat.Builder(appContext, channelId);
 
     String title =
         params.getPossiblyLocalizedString(
@@ -150,15 +153,16 @@ public static DisplayNotificationInfo createNotificationInfo(
       builder.setSound(sound);
     }
 
-    builder.setContentIntent(createContentIntent(context, params, pkgName, appPackageManager));
+    builder.setContentIntent(
+        createContentIntent(callingContext, params, pkgName, appPackageManager));
 
-    PendingIntent deleteIntent = createDeleteIntent(context, params);
+    PendingIntent deleteIntent = createDeleteIntent(callingContext, appContext, params);
     if (deleteIntent != null) {
       builder.setDeleteIntent(deleteIntent);
     }
 
     Integer color =
-        getColor(context, params.getString(MessageNotificationKeys.COLOR), manifestMetadata);
+        getColor(appContext, params.getString(MessageNotificationKeys.COLOR), manifestMetadata);
     if (color != null) {
       builder.setColor(color);
     }
@@ -541,7 +545,8 @@ private static int getPendingIntentFlags(int baseFlags) {
   }
 
   @Nullable
-  private static PendingIntent createDeleteIntent(Context context, NotificationParams params) {
+  private static PendingIntent createDeleteIntent(
+      Context callingContext, Context appContext, NotificationParams params) {
     if (!shouldUploadMetrics(params)) {
       return null;
     }
@@ -550,17 +555,17 @@ private static PendingIntent createDeleteIntent(Context context, NotificationPar
         new Intent(IntentActionKeys.NOTIFICATION_DISMISS)
             .putExtras(params.paramsForAnalyticsIntent());
 
-    return createMessagingPendingIntent(context, dismissIntent);
+    return createMessagingPendingIntent(callingContext, appContext, dismissIntent);
   }
 
-  /** Create a PendingIntent to start the app's messaging service via FirebaseInstanceIdReceiver */
-  private static PendingIntent createMessagingPendingIntent(Context context, Intent intent) {
+  /** Create a PendingIntent for the app's messaging receiver. */
+  private static PendingIntent createMessagingPendingIntent(
+      Context callingContext, Context appContext, Intent intent) {
     return PendingIntent.getBroadcast(
-        context,
+        callingContext,
         generatePendingIntentRequestCode(),
-        new Intent(ACTION_MESSAGING_EVENT)
-            .setComponent(
-                new ComponentName(context, "com.google.firebase.iid.FirebaseInstanceIdReceiver"))
+        new Intent(ACTION_RECEIVER)
+            .setPackage(appContext.getPackageName())
             .putExtra(IntentKeys.WRAPPED_INTENT, intent),
         getPendingIntentFlags(PendingIntent.FLAG_ONE_SHOT));
   }
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/Constants.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/Constants.java
index 003a55a28b0..3fcc6f04910 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/Constants.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/Constants.java
@@ -104,6 +104,9 @@ public static final class MessagePayloadKeys {
      */
     public static final String PRIORITY_REDUCED_V19 = RESERVED_PREFIX + "priority_reduced";
 
+    /** Product ID of message. */
+    public static final String PRODUCT_ID = RESERVED_PREFIX + "product_id";
+
     /**
      * Prefix "google.c" for keys that are reserved for the client library. While all the other
      * "google." are removed at GmsCore level, google.c keys are preserved in the intent extras, and
@@ -269,8 +272,8 @@ public static final class FirelogAnalytics {
     public static final String FCM_LOG_SOURCE = "FCM_CLIENT_EVENT_LOGGING";
 
     /**
-     * These are the canonical priority constants used in proto logs. They differ from the {@link
-     * RemoteMessage} priority values.
+     * These are the canonical priority constants used in proto logs. <br>
+     * They differ from the {@link RemoteMessage} priority values.
      */
     @IntDef({MessagePriority.UNKNOWN, MessagePriority.NORMAL, MessagePriority.HIGH})
     @Retention(RetentionPolicy.SOURCE)
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/DisplayNotification.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/DisplayNotification.java
index 58633053bf4..2575b6d59ed 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/DisplayNotification.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/DisplayNotification.java
@@ -144,7 +144,7 @@ private void waitForAndApplyImageDownload(
        * notification does as well.
        */
       n.setLargeIcon(bitmap);
-      n.setStyle(new BigPictureStyle().bigPicture(bitmap).bigLargeIcon(null));
+      n.setStyle(new BigPictureStyle().bigPicture(bitmap).bigLargeIcon((Bitmap) null));
 
     } catch (ExecutionException e) {
       // For all exceptions, fall through to show the notification without the image
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/EnhancedIntentService.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/EnhancedIntentService.java
index c77f9391b5d..846e292a40f 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/EnhancedIntentService.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/EnhancedIntentService.java
@@ -36,6 +36,10 @@
  */
 @SuppressLint("UnwrappedWakefulBroadcastReceiver") // Not used within GmsCore
 public abstract class EnhancedIntentService extends Service {
+
+  // Allow apps 20 seconds to handle a message.
+  static final long MESSAGE_TIMEOUT_S = 20;
+
   private static final String TAG = "EnhancedIntentService";
 
   // Use a different thread per service instance, so it can be reclaimed once the service is done.
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/FcmBroadcastProcessor.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/FcmBroadcastProcessor.java
index bc24d9050a6..b9460025db9 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/FcmBroadcastProcessor.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/FcmBroadcastProcessor.java
@@ -21,14 +21,14 @@
 import android.os.Build;
 import android.util.Base64;
 import android.util.Log;
+import androidx.annotation.GuardedBy;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.common.annotation.KeepForSdk;
 import com.google.android.gms.common.util.PlatformVersion;
-import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.concurrent.GuardedBy;
 
 /**
  * Processes incoming FCM broadcasts.
@@ -87,7 +87,7 @@ public Task<Integer> startMessagingService(Context context, Intent intent) {
     boolean isHighPriority = (intent.getFlags() & Intent.FLAG_RECEIVER_FOREGROUND) != 0;
 
     if (subjectToBackgroundCheck && !isHighPriority) {
-      return bindToMessagingService(context, intent);
+      return bindToMessagingService(context, intent, isHighPriority);
     }
 
     // If app isn't subject to background check or if message is high priority, use startService
@@ -106,7 +106,7 @@ public Task<Integer> startMessagingService(Context context, Intent intent) {
           // On O, if we're not able to start the service fall back to binding. This could happen if
           // the app isn't targeting O, but the user manually applied restrictions, or if the temp
           // whitelist has already expired.
-          return bindToMessagingService(context, intent)
+          return bindToMessagingService(context, intent, isHighPriority)
               .continueWith(
                   // ok to use direct executor because we're just immediately returning an int
                   Runnable::run,
@@ -114,15 +114,32 @@ public Task<Integer> startMessagingService(Context context, Intent intent) {
         });
   }
 
-  private static Task<Integer> bindToMessagingService(Context context, Intent intent) {
+  private static Task<Integer> bindToMessagingService(
+      Context context, Intent intent, boolean isForegroundBroadcast) {
     if (Log.isLoggable(TAG, Log.DEBUG)) {
       Log.d(TAG, "Binding to service");
     }
 
-    return getServiceConnection(context, ServiceStarter.ACTION_MESSAGING_EVENT)
-        .sendIntent(intent)
-        // ok to use direct executor because we're just immediately returning an int
-        .continueWith(Runnable::run, t -> ServiceStarter.SUCCESS);
+    WithinAppServiceConnection connection =
+        getServiceConnection(context, ServiceStarter.ACTION_MESSAGING_EVENT);
+
+    if (isForegroundBroadcast) {
+      // Foreground broadcast queue, finish the broadcast immediately
+      // (by returning a completed Task) to avoid ANRs.
+      if (ServiceStarter.getInstance().hasWakeLockPermission(context)) {
+        WakeLockHolder.sendWakefulServiceIntent(context, connection, intent);
+      } else {
+        connection.sendIntent(intent);
+      }
+      return Tasks.forResult(ServiceStarter.SUCCESS);
+    } else {
+      // Background broadcast queue, finish the broadcast after the message has been handled
+      // (which times out after 20 seconds to avoid ANRs and to limit how long the app is active).
+      return connection
+          .sendIntent(intent)
+          // ok to use direct executor because we're just immediately returning an int
+          .continueWith(Runnable::run, t -> ServiceStarter.SUCCESS);
+    }
   }
 
   /** Connect to a service via bind. This is used to process intents in Android O+ */
@@ -146,4 +163,16 @@ public static void reset() {
       fcmServiceConn = null;
     }
   }
+
+  /**
+   * Sets WithinAppServiceConnection for testing.
+   *
+   * @hide
+   */
+  @VisibleForTesting
+  public static void setServiceConnection(WithinAppServiceConnection connection) {
+    synchronized (lock) {
+      fcmServiceConn = connection;
+    }
+  }
 }
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/FcmExecutors.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/FcmExecutors.java
index acf674e0092..0f1bf92f062 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/FcmExecutors.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/FcmExecutors.java
@@ -15,6 +15,7 @@
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 
+import android.annotation.SuppressLint;
 import com.google.android.gms.common.util.concurrent.NamedThreadFactory;
 import com.google.firebase.messaging.threads.PoolableExecutors;
 import com.google.firebase.messaging.threads.ThreadPriority;
@@ -34,7 +35,7 @@
 class FcmExecutors {
   // TODO(b/117848373): TikTok applications need to comply with go/tiktok-tattletale. Before we
   // migrate to use TikTok thread pools, threads need to use the whitelisted prefix
-  // "Firebase-Messaing".
+  // "Firebase-Messaging".
   private static final String THREAD_NETWORK_IO = "Firebase-Messaging-Network-Io";
   private static final String THREAD_TASK = "Firebase-Messaging-Task";
   private static final String THREAD_FILE = "Firebase-Messaging-File";
@@ -54,6 +55,8 @@ static Executor newFileIOExecutor() {
   }
 
   @SuppressWarnings("ThreadChecker")
+  // TODO(b/258424124): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   private static Executor newCachedSingleThreadExecutor(String threadName) {
     // Creates a single threaded executor that only keeps the thread alive for a short time when
     // idle to reduce resource use.
@@ -68,27 +71,37 @@ private static Executor newCachedSingleThreadExecutor(String threadName) {
 
   /** Creates a single threaded ScheduledPoolExecutor. */
   @SuppressWarnings("ThreadChecker")
+  // TODO(b/258424124): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   static ScheduledExecutorService newTopicsSyncExecutor() {
     return new ScheduledThreadPoolExecutor(
         /* corePoolSize= */ 1, new NamedThreadFactory(THREAD_TOPICS_IO));
   }
 
   @SuppressWarnings("ThreadChecker")
+  // TODO(b/258424124): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   static ExecutorService newNetworkIOExecutor() {
     // TODO(b/148493968): consider use PoolableExecutors for all FCM threading
     return Executors.newSingleThreadExecutor(new NamedThreadFactory(THREAD_NETWORK_IO));
   }
 
   @SuppressWarnings("ThreadChecker")
+  // TODO(b/258424124): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   static ExecutorService newTaskExecutor() {
     return Executors.newSingleThreadExecutor(new NamedThreadFactory(THREAD_TASK));
   }
 
   @SuppressWarnings("ThreadChecker")
+  // TODO(b/258424124): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   static ExecutorService newFileExecutor() {
     return Executors.newSingleThreadExecutor(new NamedThreadFactory(THREAD_FILE));
   }
 
+  // TODO(b/258424124): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   static ExecutorService newIntentHandleExecutor() {
     return PoolableExecutors.factory()
         .newSingleThreadExecutor(
@@ -97,6 +110,8 @@ static ExecutorService newIntentHandleExecutor() {
 
   /** Creates a single threaded ScheduledPoolExecutor. */
   @SuppressWarnings("ThreadChecker")
+  // TODO(b/258424124): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   static ScheduledExecutorService newInitExecutor() {
     return new ScheduledThreadPoolExecutor(
         /* corePoolSize= */ 1, new NamedThreadFactory(THREAD_INIT));
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/FcmLifecycleCallbacks.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/FcmLifecycleCallbacks.java
index b48196139ca..530cdeabc02 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/FcmLifecycleCallbacks.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/FcmLifecycleCallbacks.java
@@ -13,6 +13,9 @@
 // limitations under the License.
 package com.google.firebase.messaging;
 
+import static com.google.firebase.messaging.Constants.TAG;
+
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Application;
 import android.content.Intent;
@@ -21,6 +24,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.Log;
 import java.util.Collections;
 import java.util.Set;
 import java.util.WeakHashMap;
@@ -31,6 +35,8 @@ class FcmLifecycleCallbacks implements Application.ActivityLifecycleCallbacks {
   private final Set<Intent> seenIntents =
       Collections.newSetFromMap(new WeakHashMap<Intent, Boolean>());
 
+  // TODO(b/258424124): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   @Override
   public void onActivityCreated(Activity createdActivity, Bundle instanceState) {
     Intent startingIntent = createdActivity.getIntent();
@@ -39,8 +45,8 @@ public void onActivityCreated(Activity createdActivity, Bundle instanceState) {
       return;
     }
 
-    if (VERSION.SDK_INT <= VERSION_CODES.N) {
-      // On Android 7.0 and lower Bundle unparceling is not thread safe. Wait to log notification
+    if (VERSION.SDK_INT <= VERSION_CODES.N_MR1) {
+      // On Android 7.1 and lower Bundle unparceling is not thread safe. Wait to log notification
       // open after Activity.onCreate() has completed to try to avoid race conditions with other
       // code that may be trying to access the Intent extras Bundle in onCreate() on a different
       // thread.
@@ -74,12 +80,19 @@ public void onActivityResumed(Activity activity) {}
   public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {}
 
   private void logNotificationOpen(Intent startingIntent) {
-    Bundle extras = startingIntent.getExtras();
-    if (extras != null) {
-      Bundle analyticsData = extras.getBundle(Constants.MessageNotificationKeys.ANALYTICS_DATA);
-      if (MessagingAnalytics.shouldUploadScionMetrics(analyticsData)) {
-        MessagingAnalytics.logNotificationOpen(analyticsData);
+    Bundle analyticsData = null;
+    try {
+      Bundle extras = startingIntent.getExtras();
+      if (extras != null) {
+        analyticsData = extras.getBundle(Constants.MessageNotificationKeys.ANALYTICS_DATA);
       }
+    } catch (RuntimeException e) {
+      // Don't crash if there was a problem trying to get the analytics data Bundle since the
+      // Intent could be coming from anywhere and could be incorrectly formatted.
+      Log.w(TAG, "Failed trying to get analytics data from Intent extras.", e);
+    }
+    if (MessagingAnalytics.shouldUploadScionMetrics(analyticsData)) {
+      MessagingAnalytics.logNotificationOpen(analyticsData);
     }
   }
 }
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
index a252ab9766b..8270c088bf5 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.firebase.messaging;
 
+import static com.google.firebase.messaging.FcmExecutors.newFileIOExecutor;
 import static com.google.firebase.messaging.FcmExecutors.newInitExecutor;
 import static com.google.firebase.messaging.FcmExecutors.newTaskExecutor;
 import static com.google.firebase.messaging.FcmExecutors.newTopicsSyncExecutor;
@@ -28,6 +29,7 @@
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
+import androidx.annotation.GuardedBy;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -40,6 +42,7 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.DataCollectionDefaultChange;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.analytics.connector.AnalyticsConnector;
 import com.google.firebase.events.EventHandler;
 import com.google.firebase.events.Subscriber;
 import com.google.firebase.heartbeatinfo.HeartBeatInfo;
@@ -54,27 +57,15 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.concurrent.GuardedBy;
 
 /**
  * Top level <a href="https://firebase.google.com/docs/cloud-messaging/">Firebase Cloud
  * Messaging</a> singleton that provides methods for subscribing to topics and sending upstream
  * messages.
  *
- * <p>In order to receive Firebase messages, declare an implementation of {@link
- * FirebaseMessagingService} in the app manifest. To process messages, override base class methods
- * to handle any events required by the application.
- *
- * <p>Client apps can send <a
- * href="https://firebase.google.com/docs/cloud-messaging/android/upstream">upstream messages</a>
- * back to the app server using the XMPP-based Cloud Connection Server. For example:
- *
- * <pre>
- * FirebaseMessaging.getInstance().send(
- *     new RemoteMessage.Builder(SENDER_ID + "&#64;fcm.googleapis.com")
- *     .setMessageId(id)
- *     .addData("key", "value")
- *     .build());</pre>
+ * <p>In order to receive messages, declare an implementation of <br>
+ * {@link FirebaseMessagingService} in the app manifest. To process messages, override base class
+ * methods to handle any events required by the application.
  */
 public class FirebaseMessaging {
 
@@ -105,13 +96,12 @@ public class FirebaseMessaging {
 
   private final FirebaseApp firebaseApp;
   @Nullable private final FirebaseInstanceIdInternal iid;
-  private final FirebaseInstallationsApi fis;
   private final Context context;
   private final GmsRpc gmsRpc;
   private final RequestDeduplicator requestDeduplicator;
   private final AutoInit autoInit;
-  private final Executor fileIoExecutor;
-  private final Executor taskExecutor;
+  private final Executor initExecutor;
+  private final Executor fileExecutor;
   private final Task<TopicsSubscriber> topicsSubscriberTask;
   private final Metadata metadata;
 
@@ -120,11 +110,7 @@ public class FirebaseMessaging {
 
   private final Application.ActivityLifecycleCallbacks lifecycleCallbacks;
 
-  @Nullable
-  @SuppressLint(
-      "FirebaseUnknownNullness") // Checktest wasn't recognizing @Nullable nor @NonNull annotations.
-  @VisibleForTesting
-  static TransportFactory transportFactory;
+  @VisibleForTesting static Provider<TransportFactory> transportFactory = () -> null;
 
   @GuardedBy("FirebaseMessaging.class")
   @VisibleForTesting
@@ -163,7 +149,7 @@ static synchronized FirebaseMessaging getInstance(@NonNull FirebaseApp firebaseA
       Provider<UserAgentPublisher> userAgentPublisher,
       Provider<HeartBeatInfo> heartBeatInfo,
       FirebaseInstallationsApi firebaseInstallationsApi,
-      @Nullable TransportFactory transportFactory,
+      Provider<TransportFactory> transportFactory,
       Subscriber subscriber) {
     this(
         firebaseApp,
@@ -182,46 +168,45 @@ static synchronized FirebaseMessaging getInstance(@NonNull FirebaseApp firebaseA
       Provider<UserAgentPublisher> userAgentPublisher,
       Provider<HeartBeatInfo> heartBeatInfo,
       FirebaseInstallationsApi firebaseInstallationsApi,
-      @Nullable TransportFactory transportFactory,
+      Provider<TransportFactory> transportFactory,
       Subscriber subscriber,
       Metadata metadata) {
     this(
         firebaseApp,
         iid,
-        firebaseInstallationsApi,
         transportFactory,
         subscriber,
         metadata,
         new GmsRpc(
             firebaseApp, metadata, userAgentPublisher, heartBeatInfo, firebaseInstallationsApi),
         /* taskExecutor= */ newTaskExecutor(),
-        /* fileIoExecutor= */ newInitExecutor());
+        /* initExecutor= */ newInitExecutor(),
+        /* fileExecutor= */ newFileIOExecutor());
   }
 
   FirebaseMessaging(
       FirebaseApp firebaseApp,
       @Nullable FirebaseInstanceIdInternal iid,
-      FirebaseInstallationsApi firebaseInstallationsApi,
-      @Nullable TransportFactory transportFactory,
+      Provider<TransportFactory> transportFactory,
       Subscriber subscriber,
       Metadata metadata,
       GmsRpc gmsRpc,
       Executor taskExecutor,
-      Executor fileIoExecutor) {
+      Executor initExecutor,
+      Executor fileExecutor) {
 
     FirebaseMessaging.transportFactory = transportFactory;
 
     this.firebaseApp = firebaseApp;
     this.iid = iid;
-    fis = firebaseInstallationsApi;
     autoInit = new AutoInit(subscriber);
     context = firebaseApp.getApplicationContext();
     this.lifecycleCallbacks = new FcmLifecycleCallbacks();
     this.metadata = metadata;
-    this.taskExecutor = taskExecutor;
     this.gmsRpc = gmsRpc;
     this.requestDeduplicator = new RequestDeduplicator(taskExecutor);
-    this.fileIoExecutor = fileIoExecutor;
+    this.initExecutor = initExecutor;
+    this.fileExecutor = fileExecutor;
 
     Context appContext = firebaseApp.getApplicationContext();
     if (appContext instanceof Application) {
@@ -243,7 +228,7 @@ static synchronized FirebaseMessaging getInstance(@NonNull FirebaseApp firebaseA
           });
     }
 
-    fileIoExecutor.execute(
+    initExecutor.execute(
         () -> {
           if (isAutoInitEnabled()) {
             startSyncIfNecessary();
@@ -257,7 +242,7 @@ static synchronized FirebaseMessaging getInstance(@NonNull FirebaseApp firebaseA
     // During FCM instantiation, as part of the initial setup, we spin up a couple of background
     // threads to handle topic syncing and proxy notification configuration.
     topicsSubscriberTask.addOnSuccessListener(
-        fileIoExecutor,
+        initExecutor,
         topicsSubscriber -> {
           // Topics operations relay on IID for token generation, thus the sync is also
           // subject to an auto-init check.
@@ -266,10 +251,49 @@ static synchronized FirebaseMessaging getInstance(@NonNull FirebaseApp firebaseA
           }
         });
 
-    fileIoExecutor.execute(
-        () ->
-            // Initializes proxy notification support for the app.
-            ProxyNotificationInitializer.initialize(context));
+    initExecutor.execute(() -> initializeProxyNotifications());
+  }
+
+  private void initializeProxyNotifications() {
+    // Initializes proxy notification support for the app.
+    ProxyNotificationInitializer.initialize(context);
+    // Update proxy retention in case any settings or included libraries has changed.
+    ProxyNotificationPreferences.setProxyRetention(
+        context, gmsRpc, shouldRetainProxyNotifications());
+    if (shouldRetainProxyNotifications()) {
+      // Handle any retained proxy notifications.
+      handleProxiedNotificationData();
+    }
+  }
+
+  @SuppressWarnings("FirebaseUseExplicitDependencies")
+  private boolean shouldRetainProxyNotifications() {
+    ProxyNotificationInitializer.initialize(context);
+    if (!ProxyNotificationInitializer.isProxyNotificationEnabled(context)) {
+      // Proxy notifications not enabled, shouldn't retain.
+      return false;
+    }
+    if (firebaseApp.get(AnalyticsConnector.class) != null) {
+      // Google Analytics is present, should retain.
+      return true;
+    }
+    // Retain if BigQuery export is enabled and Firelog is present so that proxied notifications can
+    // be retrieved and logged to Firelog for BigQuery export on next startup after being displayed.
+    return MessagingAnalytics.deliveryMetricsExportToBigQueryEnabled() && transportFactory != null;
+  }
+
+  private void handleProxiedNotificationData() {
+    gmsRpc
+        .getProxyNotificationData()
+        .addOnSuccessListener(
+            initExecutor,
+            notification -> {
+              if (notification != null) {
+                // Proxied notification retrieved, log it and check if there's more.
+                MessagingAnalytics.logNotificationReceived(notification.getIntent());
+                handleProxiedNotificationData();
+              }
+            });
   }
 
   /**
@@ -330,6 +354,9 @@ public boolean deliveryMetricsExportToBigQueryEnabled() {
    */
   public void setDeliveryMetricsExportToBigQuery(boolean enable) {
     MessagingAnalytics.setDeliveryMetricsExportToBigQuery(enable);
+    // Update proxy retention since BigQuery export setting may have changed.
+    ProxyNotificationPreferences.setProxyRetention(
+        context, gmsRpc, shouldRetainProxyNotifications());
   }
 
   /**
@@ -362,8 +389,15 @@ public boolean isNotificationDelegationEnabled() {
    * @param enable Whether to enable or disable notification delegation.
    * @return A Task that completes when the notification delegation has been set.
    */
+  @NonNull
   public Task<Void> setNotificationDelegationEnabled(boolean enable) {
-    return ProxyNotificationInitializer.setEnableProxyNotification(fileIoExecutor, context, enable);
+    return ProxyNotificationInitializer.setEnableProxyNotification(initExecutor, context, enable)
+        .addOnSuccessListener(
+            Runnable::run,
+            listener ->
+                // Update proxy retention since proxy enabled state may have changed.
+                ProxyNotificationPreferences.setProxyRetention(
+                    context, gmsRpc, shouldRetainProxyNotifications()));
   }
 
   /**
@@ -381,7 +415,7 @@ public Task<String> getToken() {
       return iid.getTokenTask();
     }
     TaskCompletionSource<String> taskCompletionSource = new TaskCompletionSource<>();
-    fileIoExecutor.execute(
+    initExecutor.execute(
         () -> {
           try {
             taskCompletionSource.setResult(blockingGetToken());
@@ -405,7 +439,7 @@ public Task<String> getToken() {
   public Task<Void> deleteToken() {
     if (iid != null) {
       TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
-      fileIoExecutor.execute(
+      initExecutor.execute(
           () -> {
             try {
               iid.deleteToken(Metadata.getDefaultSenderId(firebaseApp), INSTANCE_ID_SCOPE);
@@ -441,7 +475,7 @@ public Task<Void> deleteToken() {
    * <p>The subscribe operation is persisted and will be retried until successful.
    *
    * <p>This uses an FCM registration token to identify the app instance, generating one if it does
-   * not exist (see {@link #getToken()}), which perodically sends data to the Firebase backend when
+   * not exist (see {@link #getToken()}), which periodically sends data to the Firebase backend when
    * auto-init is enabled. To delete the data, delete the token ({@link #deleteToken}) and the
    * Firebase Installations ID ({@code FirebaseInstallations.delete()}). To stop the periodic
    * sending of data, disable auto-init ({@link #setAutoInitEnabled}).
@@ -450,6 +484,8 @@ public Task<Void> deleteToken() {
    *     "[a-zA-Z0-9-_.~%]{1,900}".
    * @return A task that will be completed when the topic has been successfully subscribed to.
    */
+  // TODO(b/261013992): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   @NonNull
   public Task<Void> subscribeToTopic(@NonNull String topic) {
     return topicsSubscriberTask.onSuccessTask(
@@ -465,6 +501,8 @@ public Task<Void> subscribeToTopic(@NonNull String topic) {
    *     expression: "[a-zA-Z0-9-_.~%]{1,900}".
    * @return A task that will be completed when the topic has been successfully unsubscribed from.
    */
+  // TODO(b/261013992): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   @NonNull
   public Task<Void> unsubscribeFromTopic(@NonNull String topic) {
     return topicsSubscriberTask.onSuccessTask(
@@ -476,7 +514,12 @@ public Task<Void> unsubscribeFromTopic(@NonNull String topic) {
    *
    * <p>When there is an active connection the message will be sent immediately, otherwise the
    * message will be queued up to the time to live (TTL) set in the message.
+   *
+   * @deprecated FCM upstream messaging is deprecated and will be decommissioned in June 2024. Learn
+   *     more in the <a href="https://firebase.google.com/support/faq#fcm-23-deprecation">FAQ about
+   *     FCM features deprecated in June 2023</a>.
    */
+  @Deprecated
   public void send(@NonNull RemoteMessage message) {
     if (TextUtils.isEmpty(message.getTo())) {
       throw new IllegalArgumentException("Missing 'to'");
@@ -512,12 +555,12 @@ Task<TopicsSubscriber> getTopicsSubscriberTask() {
   /** @hide */
   @Nullable
   public static TransportFactory getTransportFactory() {
-    return transportFactory;
+    return transportFactory.get();
   }
 
   /** @hide */
   static void clearTransportFactoryForTest() {
-    transportFactory = null;
+    transportFactory = () -> null;
   }
 
   /** Checks if Gmscore is present. */
@@ -543,6 +586,8 @@ synchronized void syncWithDelaySecondsInternal(long delaySeconds) {
   }
 
   @SuppressWarnings("FutureReturnValueIgnored")
+  // TODO(b/258424124): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   void enqueueTaskWithDelaySeconds(Runnable task, long delaySeconds) {
     synchronized (FirebaseMessaging.class) {
       if (syncExecutor == null) {
@@ -604,7 +649,7 @@ String blockingGetToken() throws IOException {
                 gmsRpc
                     .getToken()
                     .onSuccessTask(
-                        Runnable::run, // direct executor
+                        fileExecutor,
                         token -> {
                           getStore(context)
                               .saveToken(
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingRegistrar.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingRegistrar.java
index bf4e94fd246..5f9518105fe 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingRegistrar.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingRegistrar.java
@@ -20,6 +20,8 @@
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import com.google.firebase.datatransport.TransportBackend;
 import com.google.firebase.events.Subscriber;
 import com.google.firebase.heartbeatinfo.HeartBeatInfo;
 import com.google.firebase.iid.internal.FirebaseInstanceIdInternal;
@@ -38,17 +40,22 @@
 @KeepForSdk
 @Keep
 public class FirebaseMessagingRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-fcm";
+
   @Override
   @Keep
   public List<Component<?>> getComponents() {
+    Qualified<TransportFactory> transportFactory =
+        Qualified.qualified(TransportBackend.class, TransportFactory.class);
     return Arrays.asList(
         Component.builder(FirebaseMessaging.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.optional(FirebaseInstanceIdInternal.class))
             .add(Dependency.optionalProvider(UserAgentPublisher.class))
             .add(Dependency.optionalProvider(HeartBeatInfo.class))
-            .add(Dependency.optional(TransportFactory.class))
             .add(Dependency.required(FirebaseInstallationsApi.class))
+            .add(Dependency.optionalProvider(transportFactory))
             .add(Dependency.required(Subscriber.class))
             .factory(
                 container ->
@@ -58,10 +65,10 @@ public List<Component<?>> getComponents() {
                         container.getProvider(UserAgentPublisher.class),
                         container.getProvider(HeartBeatInfo.class),
                         container.get(FirebaseInstallationsApi.class),
-                        container.get(TransportFactory.class),
+                        container.getProvider(transportFactory),
                         container.get(Subscriber.class)))
             .alwaysEager()
             .build(),
-        LibraryVersionComponent.create("fire-fcm", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java
index 480036643c7..7cc65379bfb 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java
@@ -15,6 +15,7 @@
 
 import static com.google.firebase.messaging.Constants.TAG;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -22,6 +23,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
+import com.google.android.gms.cloudmessaging.CloudMessage;
+import com.google.android.gms.cloudmessaging.Rpc;
 import com.google.firebase.messaging.Constants.MessagePayloadKeys;
 import com.google.firebase.messaging.Constants.MessageTypes;
 import java.util.ArrayDeque;
@@ -82,9 +85,14 @@ public class FirebaseMessagingService extends EnhancedIntentService {
   private static final Queue<String> recentlyReceivedMessageIds =
       new ArrayDeque<>(RECENTLY_RECEIVED_MESSAGE_IDS_MAX_SIZE);
 
+  private Rpc rpc;
+
   /**
    * Called when a message is received.
    *
+   * <p>This should complete within 20 seconds. Taking longer may interfere with your ability to
+   * complete your work and may affect pending messages.
+   *
    * <p>This is also called when a notification message is received while the app is in the
    * foreground. The notification parameters can be retrieved with {@link
    * RemoteMessage#getNotification()}.
@@ -143,7 +151,6 @@ public void onSendError(@NonNull String msgId, @NonNull Exception exception) {}
    */
   @WorkerThread
   public void onNewToken(@NonNull String token) {}
-  ;
 
   /** @hide */
   @Override
@@ -171,6 +178,7 @@ private void handleMessageIntent(Intent intent) {
     if (!alreadyReceivedMessage(messageId)) {
       passMessageIntentToSdk(intent);
     }
+    getRpc(this).messageHandled(new CloudMessage(intent));
   }
 
   private void passMessageIntentToSdk(Intent intent) {
@@ -261,8 +269,20 @@ private String getMessageId(Intent intent) {
     return messageId;
   }
 
+  private Rpc getRpc(Context context) {
+    if (rpc == null) {
+      rpc = new Rpc(context.getApplicationContext());
+    }
+    return rpc;
+  }
+
   @VisibleForTesting
   static void resetForTesting() {
     recentlyReceivedMessageIds.clear();
   }
+
+  @VisibleForTesting
+  void setRpcForTesting(Rpc rpc) {
+    this.rpc = rpc;
+  }
 }
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/GmsRpc.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/GmsRpc.java
index 95040d8b0a4..e3849e279de 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/GmsRpc.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/GmsRpc.java
@@ -20,6 +20,7 @@
 import android.util.Log;
 import androidx.annotation.AnyThread;
 import androidx.annotation.VisibleForTesting;
+import com.google.android.gms.cloudmessaging.CloudMessage;
 import com.google.android.gms.cloudmessaging.Rpc;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
@@ -217,6 +218,14 @@ Task<?> unsubscribeFromTopic(String cachedToken, String topic) {
     return extractResponseWhenComplete(rpcTask);
   }
 
+  Task<Void> setRetainProxiedNotifications(boolean retain) {
+    return rpc.setRetainProxiedNotifications(retain);
+  }
+
+  Task<CloudMessage> getProxyNotificationData() {
+    return rpc.getProxiedNotificationData();
+  }
+
   private Task<Bundle> startRpc(String to, String scope, Bundle extras) {
     try {
       setDefaultAttributesToBundle(to, scope, extras);
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/ImageDownload.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/ImageDownload.java
index b003adce629..ab43d67f816 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/ImageDownload.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/ImageDownload.java
@@ -23,7 +23,6 @@
 import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
-import com.google.common.io.ByteStreams;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/Messaging.kt b/firebase-messaging/src/main/java/com/google/firebase/messaging/Messaging.kt
new file mode 100644
index 00000000000..d0ea238135c
--- /dev/null
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/Messaging.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.messaging
+
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+
+/** Returns the [FirebaseMessaging] instance of the default [FirebaseApp]. */
+val Firebase.messaging: FirebaseMessaging
+  get() = FirebaseMessaging.getInstance()
+
+/** Returns a [RemoteMessage] instance initialized using the [init] function. */
+inline fun remoteMessage(
+  to: String,
+  crossinline init: RemoteMessage.Builder.() -> Unit
+): RemoteMessage {
+  val builder = RemoteMessage.Builder(to)
+  builder.init()
+  return builder.build()
+}
+
+/** @suppress */
+class FirebaseMessagingKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/MessagingAnalytics.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/MessagingAnalytics.java
index af4b106fd03..6c59f00a2d2 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/MessagingAnalytics.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/MessagingAnalytics.java
@@ -28,6 +28,7 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.android.datatransport.Encoding;
 import com.google.android.datatransport.Event;
+import com.google.android.datatransport.ProductData;
 import com.google.android.datatransport.TransportFactory;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
@@ -71,6 +72,8 @@ public class MessagingAnalytics {
   private static final String MANIFEST_DELIVERY_METRICS_EXPORT_TO_BIG_QUERY_ENABLED =
       "delivery_metrics_exported_to_big_query_enabled";
 
+  private static final int DEFAULT_PRODUCT_ID = 111881503;
+
   /** Log that a notification was received by the client app. */
   public static void logNotificationReceived(Intent intent) {
     if (shouldUploadScionMetrics(intent)) {
@@ -319,8 +322,8 @@ static void logToScion(String event, Bundle extras) {
   /**
    * Asynchronously log an event to Firelog.
    *
-   * <p>Firelog batch-send delivery metrics every 24 hours when the device is idle and have network
-   * connection in a background thread.
+   * <p>Firelog batch-send usually delivery metrics within 1 hour (at most 24 hours) when the device
+   * is idle and have network connection in a background thread.
    */
   private static void logToFirelog(
       MessagingClientEvent.Event event,
@@ -337,17 +340,21 @@ private static void logToFirelog(
 
     try {
       // TODO(b/145299499): offload encoding to Firelog Thread
+      ProductData productData =
+          ProductData.withProductId(
+              intent.getIntExtra(MessagePayloadKeys.PRODUCT_ID, DEFAULT_PRODUCT_ID));
       transportFactory
           .getTransport(
               FirelogAnalytics.FCM_LOG_SOURCE,
               MessagingClientEventExtension.class,
-              Encoding.of("src/main/proto"),
+              Encoding.of("proto"),
               MessagingClientEventExtension::toByteArray)
           .send(
-              Event.ofTelemetry(
+              Event.ofData(
                   MessagingClientEventExtension.newBuilder()
                       .setMessagingClientEvent(clientEvent)
-                      .build()));
+                      .build(),
+                  productData));
     } catch (RuntimeException e) {
       Log.w(TAG, "Failed to send big query analytics payload.", e);
     }
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/Metadata.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/Metadata.java
index 057793f9c19..cbb7417e0d0 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/Metadata.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/Metadata.java
@@ -21,13 +21,13 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.util.Log;
+import androidx.annotation.GuardedBy;
 import androidx.annotation.IntDef;
 import com.google.android.gms.common.util.PlatformVersion;
 import com.google.firebase.FirebaseApp;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
-import javax.annotation.concurrent.GuardedBy;
 
 /** Helper to query app's metadata. */
 class Metadata {
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/ProxyNotificationPreferences.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/ProxyNotificationPreferences.java
index df598abae5b..c6c60596f7b 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/ProxyNotificationPreferences.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/ProxyNotificationPreferences.java
@@ -14,11 +14,13 @@
 package com.google.firebase.messaging;
 
 import static com.google.firebase.messaging.ProxyNotificationPreferences.PreferenceKeys.KEY_PROXY_NOTIFICATION_INITIALIZED;
+import static com.google.firebase.messaging.ProxyNotificationPreferences.PreferenceKeys.KEY_PROXY_NOTIFICATION_RETENTION;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import androidx.annotation.StringDef;
 import androidx.annotation.WorkerThread;
+import com.google.android.gms.common.util.PlatformVersion;
 
 /**
  * Firebase helper class to store and retrieve firebase related preference values.
@@ -49,13 +51,42 @@ static void setProxyNotificationsInitialized(Context context, boolean isInitiali
     preferencesEditor.apply();
   }
 
+  @WorkerThread
+  static void setProxyRetention(Context context, GmsRpc gmsRpc, boolean retention) {
+    if (!PlatformVersion.isAtLeastQ()) {
+      // Proxy supported on Q+.
+      return;
+    }
+    SharedPreferences preferences = getPreference(context);
+    if (!isProxyNotificationRetentionSet(preferences, retention)) {
+      gmsRpc
+          .setRetainProxiedNotifications(retention)
+          .addOnSuccessListener(
+              Runnable::run, unused -> setProxyRetentionPreferences(context, retention));
+    }
+  }
+
   @WorkerThread
   static boolean isProxyNotificationInitialized(Context context) {
     return getPreference(context).getBoolean(KEY_PROXY_NOTIFICATION_INITIALIZED, false);
   }
 
-  @StringDef({KEY_PROXY_NOTIFICATION_INITIALIZED})
+  @WorkerThread
+  static boolean isProxyNotificationRetentionSet(SharedPreferences preferences, boolean retention) {
+    return preferences.contains(KEY_PROXY_NOTIFICATION_RETENTION)
+        && preferences.getBoolean(KEY_PROXY_NOTIFICATION_RETENTION, false) == retention;
+  }
+
+  @WorkerThread
+  static void setProxyRetentionPreferences(Context context, boolean retention) {
+    SharedPreferences.Editor preferencesEditor = getPreference(context).edit();
+    preferencesEditor.putBoolean(KEY_PROXY_NOTIFICATION_RETENTION, retention);
+    preferencesEditor.apply();
+  }
+
+  @StringDef({KEY_PROXY_NOTIFICATION_INITIALIZED, KEY_PROXY_NOTIFICATION_RETENTION})
   @interface PreferenceKeys {
     String KEY_PROXY_NOTIFICATION_INITIALIZED = "proxy_notification_initialized";
+    String KEY_PROXY_NOTIFICATION_RETENTION = "proxy_retention";
   }
 }
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/RemoteMessageCreator.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/RemoteMessageCreator.java
index 90ad5fc0770..8e5790209a2 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/RemoteMessageCreator.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/RemoteMessageCreator.java
@@ -22,6 +22,7 @@
 import com.google.android.gms.common.internal.safeparcel.SafeParcelWriter;
 
 // Autogenerated, do not edit
+/** @hide */
 public class RemoteMessageCreator implements Creator<RemoteMessage> {
   public static final int CONTENT_DESCRIPTION = 0;
 
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/RequestDeduplicator.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/RequestDeduplicator.java
index 8669a034537..323eea38d5e 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/RequestDeduplicator.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/RequestDeduplicator.java
@@ -16,11 +16,11 @@
 import static com.google.firebase.messaging.FirebaseMessaging.TAG;
 
 import android.util.Log;
+import androidx.annotation.GuardedBy;
 import androidx.collection.ArrayMap;
 import com.google.android.gms.tasks.Task;
 import java.util.Map;
 import java.util.concurrent.Executor;
-import javax.annotation.concurrent.GuardedBy;
 
 /**
  * Deduplicates concurrent requests for FCM tokens into the same request to GmsCore/FCM backend.
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/ServiceStarter.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/ServiceStarter.java
index 2752cfad3c3..ab8cce43575 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/ServiceStarter.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/ServiceStarter.java
@@ -25,6 +25,7 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.util.Log;
+import androidx.annotation.GuardedBy;
 import androidx.annotation.MainThread;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
@@ -32,7 +33,6 @@
 import com.google.firebase.iid.FirebaseInstanceIdReceiver;
 import java.util.ArrayDeque;
 import java.util.Queue;
-import javax.annotation.concurrent.GuardedBy;
 
 /**
  * Manages securely starting the app's FirebaseMessagingService implementation even though they are
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/SyncTask.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/SyncTask.java
index 39dc5d3ad76..c0c4074c11e 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/SyncTask.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/SyncTask.java
@@ -26,14 +26,14 @@
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
-import com.google.android.gms.common.util.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.common.util.concurrent.NamedThreadFactory;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
 
 /** Background task to perform sync operations with the Firebase backend using a bg thread */
 class SyncTask implements Runnable {
@@ -44,6 +44,8 @@ class SyncTask implements Runnable {
   private final FirebaseMessaging firebaseMessaging;
 
   @VisibleForTesting
+  // TODO(b/258424124): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   ExecutorService processorExecutor =
       new ThreadPoolExecutor(
           /* corePoolSize= */ 0,
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/TopicOperation.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/TopicOperation.java
index 3ab0e0e78b4..40de9d9a2eb 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/TopicOperation.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/TopicOperation.java
@@ -22,6 +22,8 @@
 import androidx.annotation.StringDef;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.common.internal.Objects;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.regex.Pattern;
 
 final class TopicOperation {
@@ -117,6 +119,7 @@ public int hashCode() {
   }
 
   @StringDef({TopicOperations.OPERATION_SUBSCRIBE, TopicOperations.OPERATION_UNSUBSCRIBE})
+  @Retention(RetentionPolicy.SOURCE)
   @interface TopicOperations {
     String OPERATION_SUBSCRIBE = "S";
     String OPERATION_UNSUBSCRIBE = "U";
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/WakeLockHolder.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/WakeLockHolder.java
index 96ea6c6a782..9b80a0cbe2e 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/WakeLockHolder.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/WakeLockHolder.java
@@ -13,16 +13,17 @@
 // limitations under the License.
 package com.google.firebase.messaging;
 
+import android.annotation.SuppressLint;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.PowerManager;
+import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.stats.WakeLock;
 import com.google.errorprone.annotations.RestrictedApi;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.concurrent.GuardedBy;
 
 /**
  * Helper class to manage wake locks in FCM.
@@ -38,7 +39,7 @@ final class WakeLockHolder {
   private static final String EXTRA_WAKEFUL_INTENT =
       "com.google.firebase.iid.WakeLockHolder.wakefulintent";
   /** Release wakelocks after 60s, because we don't expect operations to take longer than that. */
-  private static final long WAKE_LOCK_ACQUIRE_TIMEOUT_MILLIS = TimeUnit.MINUTES.toMillis(1);
+  static final long WAKE_LOCK_ACQUIRE_TIMEOUT_MILLIS = TimeUnit.MINUTES.toMillis(1);
   // Object to sync threads
   private static final Object syncObject = new Object();
 
@@ -86,6 +87,34 @@ static ComponentName startWakefulService(@NonNull Context context, @NonNull Inte
     }
   }
 
+  /**
+   * Sends an Intent to a Service, binding to it, if necessary. Acquires a WakeLock based on the
+   * Intent and holds until the Service has finished processing the Intent or after a certain amount
+   * of time.
+   *
+   * @param context Application context.
+   * @param connection ServiceConnection to send the Intent to.
+   * @param intent Intent for starting the service.
+   */
+  // TODO(b/261013992): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
+  static void sendWakefulServiceIntent(
+      Context context, WithinAppServiceConnection connection, Intent intent) {
+    synchronized (syncObject) {
+      checkAndInitWakeLock(context);
+
+      boolean isWakeLockAlreadyAcquired = isWakefulIntent(intent);
+
+      setAsWakefulIntent(intent, true);
+
+      if (!isWakeLockAlreadyAcquired) {
+        wakeLock.acquire(WAKE_LOCK_ACQUIRE_TIMEOUT_MILLIS);
+      }
+
+      connection.sendIntent(intent).addOnCompleteListener(t -> completeWakefulIntent(intent));
+    }
+  }
+
   private static void setAsWakefulIntent(@NonNull Intent intent, boolean isWakeful) {
     intent.putExtra(EXTRA_WAKEFUL_INTENT, isWakeful);
   }
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/WithinAppServiceConnection.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/WithinAppServiceConnection.java
index 84a62bac9d4..dcde8d1009b 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/WithinAppServiceConnection.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/WithinAppServiceConnection.java
@@ -15,6 +15,7 @@
 
 import static com.google.firebase.messaging.FirebaseMessaging.TAG;
 
+import android.annotation.SuppressLint;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -28,6 +29,7 @@
 import com.google.android.gms.common.util.concurrent.NamedThreadFactory;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.ArrayDeque;
 import java.util.Queue;
 import java.util.concurrent.ScheduledExecutorService;
@@ -41,10 +43,6 @@
  */
 class WithinAppServiceConnection implements ServiceConnection {
 
-  // Time out requests by finishing the pending result and thus unblocking the receiver after
-  // 9s to avoid causing the receiver to time out after 10s.
-  private static final int REQUEST_TIMEOUT_MS = 9000;
-
   static class BindRequest {
     final Intent intent;
     private final TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
@@ -54,6 +52,8 @@ static class BindRequest {
     }
 
     void arrangeTimeout(ScheduledExecutorService executor) {
+      // Timeout after 20 seconds by finishing the Task. This will finish a background broadcast,
+      // which waits for the message to be handled.
       ScheduledFuture<?> timeoutFuture =
           executor.schedule(
               () -> {
@@ -61,11 +61,11 @@ void arrangeTimeout(ScheduledExecutorService executor) {
                     TAG,
                     "Service took too long to process intent: "
                         + intent.getAction()
-                        + " App may get closed.");
+                        + " finishing.");
                 finish();
               },
-              REQUEST_TIMEOUT_MS,
-              TimeUnit.MILLISECONDS);
+              EnhancedIntentService.MESSAGE_TIMEOUT_S,
+              TimeUnit.SECONDS);
 
       getTask()
           .addOnCompleteListener(
@@ -99,6 +99,8 @@ void finish() {
   @GuardedBy("this")
   private boolean connectionInProgress = false;
 
+  // TODO(b/258424124): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   WithinAppServiceConnection(Context context, String action) {
     // Class instances are owned by a static variable in FirebaseInstanceIdReceiver
     // and GcmReceiver so that they survive getting gc'd and reinstantiated, so use a
@@ -119,6 +121,7 @@ void finish() {
     this.scheduledExecutorService = scheduledExecutorService;
   }
 
+  @CanIgnoreReturnValue
   synchronized Task<Void> sendIntent(Intent intent) {
     if (Log.isLoggable(TAG, Log.DEBUG)) {
       Log.d(TAG, "new intent queued in the bind-strategy delivery");
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/ktx/Messaging.kt b/firebase-messaging/src/main/java/com/google/firebase/messaging/ktx/Messaging.kt
new file mode 100644
index 00000000000..d0035e605a0
--- /dev/null
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/ktx/Messaging.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.messaging.ktx
+
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.messaging.FirebaseMessaging
+import com.google.firebase.messaging.RemoteMessage
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseMessaging] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-messaging-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.messaging: FirebaseMessaging
+  get() = FirebaseMessaging.getInstance()
+
+/**
+ * Returns a [RemoteMessage] instance initialized using the [init] function.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-messaging-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun remoteMessage(
+  to: String,
+  crossinline init: RemoteMessage.Builder.() -> Unit
+): RemoteMessage {
+  val builder = RemoteMessage.Builder(to)
+  builder.init()
+  return builder.build()
+}
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-messaging-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+class FirebaseMessagingKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/threads/PoolableExecutors.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/threads/PoolableExecutors.java
index 18e50fa0373..dabdecbf795 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/threads/PoolableExecutors.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/threads/PoolableExecutors.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.messaging.threads;
 
+import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
 import com.google.errorprone.annotations.CompileTimeConstant;
 import java.util.concurrent.ExecutorService;
@@ -52,6 +53,8 @@ private static class DefaultExecutorFactory implements ExecutorFactory {
     /** {@inheritDoc} */
     @NonNull
     @Override
+    // TODO(b/258424124): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     public ExecutorService newThreadPool(ThreadPriority priority) {
       // NOTE: Cached threadpools automatically time out all threads.  They have no concept of core
       // threads; the queue blocks until a thread is started.
@@ -61,6 +64,8 @@ public ExecutorService newThreadPool(ThreadPriority priority) {
     /** {@inheritDoc} */
     @NonNull
     @Override
+    // TODO(b/258424124): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     public ExecutorService newThreadPool(ThreadFactory threadFactory, ThreadPriority priority) {
       return Executors.unconfigurableExecutorService(Executors.newCachedThreadPool(threadFactory));
     }
@@ -79,6 +84,8 @@ public ExecutorService newThreadPool(int maxConcurrency, ThreadPriority priority
     /** {@inheritDoc} */
     @NonNull
     @Override
+    // TODO(b/258424124): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     public ExecutorService newThreadPool(
         int maxConcurrency, ThreadFactory threadFactory, ThreadPriority priority) {
       ThreadPoolExecutor executor =
@@ -115,6 +122,8 @@ public ExecutorService newSingleThreadExecutor(
     /** {@inheritDoc} */
     @NonNull
     @Override
+    // TODO(b/258424124): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     public ScheduledExecutorService newScheduledThreadPool(
         int maxConcurrency, ThreadPriority priority) {
       // NOTE: There's no way to make a scheduled executor stop threads automatically, because
@@ -128,6 +137,8 @@ public ScheduledExecutorService newScheduledThreadPool(
     /** {@inheritDoc} */
     @NonNull
     @Override
+    // TODO(b/258424124): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     public ScheduledExecutorService newScheduledThreadPool(
         int maxConcurrency, ThreadFactory threadFactory, ThreadPriority priority) {
       return Executors.unconfigurableScheduledExecutorService(
@@ -136,6 +147,8 @@ public ScheduledExecutorService newScheduledThreadPool(
 
     @Override
     @NonNull
+    // TODO(b/258424124): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     public void executeOneOff(
         @CompileTimeConstant final String moduleName,
         @CompileTimeConstant final String name,
@@ -146,6 +159,8 @@ public void executeOneOff(
 
     @Override
     @NonNull
+    // TODO(b/258424124): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     public Future<?> submitOneOff(
         @CompileTimeConstant final String moduleName,
         @CompileTimeConstant final String name,
diff --git a/firebase-datatransport/src/main/java/com/google/firebase/datatransport/package-info.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/threads/package-info.java
similarity index 92%
rename from firebase-datatransport/src/main/java/com/google/firebase/datatransport/package-info.java
rename to firebase-messaging/src/main/java/com/google/firebase/messaging/threads/package-info.java
index ec19b766d63..45a8459c0b9 100644
--- a/firebase-datatransport/src/main/java/com/google/firebase/datatransport/package-info.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/threads/package-info.java
@@ -13,4 +13,4 @@
 // limitations under the License.
 
 /** @hide */
-package com.google.firebase.datatransport;
+package com.google.firebase.messaging.threads;
diff --git a/firebase-messaging/src/main/res/values/strings.xml b/firebase-messaging/src/main/res/values/strings.xml
index a8d4eeb6370..a8139f83d96 100644
--- a/firebase-messaging/src/main/res/values/strings.xml
+++ b/firebase-messaging/src/main/res/values/strings.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="fcm_fallback_notification_channel_label">Miscellaneous</string>
-    <string name="fcm_no_args">String with no arguments</string>
-    <string name="fcm_2_args">First: %1$s and second %2$s</string>
-    <color name="fcm_test_color">#4285F4</color>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/firebase-messaging/src/test/AndroidManifest.xml b/firebase-messaging/src/test/AndroidManifest.xml
index 16bdd322287..34d239d4020 100644
--- a/firebase-messaging/src/test/AndroidManifest.xml
+++ b/firebase-messaging/src/test/AndroidManifest.xml
@@ -15,11 +15,10 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="com.google.firebase.messaging.test"
           android:versionCode="1"
           android:versionName="1">
 
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service android:exported="false"
             android:name="com.google.firebase.components.ComponentDiscoveryService">
diff --git a/firebase-messaging/src/test/java/com/google/firebase/iid/FirebaseInstanceIdWithFcmReceiverRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/iid/FirebaseInstanceIdWithFcmReceiverRoboTest.java
index 0d0730df7be..a7dce1d5bcb 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/iid/FirebaseInstanceIdWithFcmReceiverRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/iid/FirebaseInstanceIdWithFcmReceiverRoboTest.java
@@ -20,7 +20,7 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Application;
@@ -35,6 +35,8 @@
 import com.google.firebase.messaging.FcmBroadcastProcessor;
 import com.google.firebase.messaging.ServiceStarter;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -83,22 +85,36 @@ public void resetStaticState() {
     FcmBroadcastProcessor.reset();
   }
 
-  /* Method used to set build version */
-  private void setFinalStatic(Field field, Object newValue) throws Exception {
-    field.setAccessible(true);
-
-    Field modifiersField = Field.class.getDeclaredField("modifiers");
-    modifiersField.setAccessible(true);
-    modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-
-    field.set(null, newValue);
+  private static Field getDeclaredField(Class<?> clazz, String name) throws NoSuchFieldException {
+    try {
+      return clazz.getDeclaredField(name);
+    } catch (NoSuchFieldException e1) {
+      try {
+        Method getDeclaredFields0 =
+            Class.class.getDeclaredMethod("getDeclaredFields0", boolean.class);
+        getDeclaredFields0.setAccessible(true);
+        Field[] fields = (Field[]) getDeclaredFields0.invoke(clazz, false);
+        for (Field f : fields) {
+          if (f.getName().equals(name)) {
+            return f;
+          }
+        }
+        throw new NoSuchFieldException(name);
+      } catch (NoSuchMethodException e2) {
+        throw new NoSuchFieldException(name);
+      } catch (IllegalAccessException e2) {
+        throw new NoSuchFieldException(name);
+      } catch (InvocationTargetException e2) {
+        throw new NoSuchFieldException(name);
+      }
+    }
   }
 
   @Test
   public void testNullIntent() throws Exception {
     receiver.onReceive(context, null);
 
-    verifyZeroInteractions(serviceStarter);
+    verifyNoInteractions(serviceStarter);
   }
 
   @Test
@@ -124,21 +140,6 @@ public void testStartsService_preO() throws Exception {
     assertThat(shadowOf(context).getBoundServiceConnections()).isEmpty();
   }
 
-  @Test
-  @Config(sdk = VERSION_CODES.O)
-  public void testStartsService_oButAppNotTargetingO() throws Exception {
-    setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 26);
-    context.getApplicationInfo().targetSdkVersion = VERSION_CODES.N_MR1;
-
-    Intent intent = new Intent(ACTION_FCM_MESSAGE).putExtra("key", "value");
-    sendOrderedBroadcastBlocking(intent);
-
-    verify(serviceStarter, atLeastOnce())
-        .startMessagingService(nullable(Context.class), intentCaptor.capture());
-    assertThat(intentCaptor.getValue()).isSameInstanceAs(intent);
-    assertThat(shadowOf(context).getBoundServiceConnections()).isEmpty();
-  }
-
   @Test
   @Config(maxSdk = VERSION_CODES.N_MR1)
   public void testStartsService_notOButTargetingO() throws Exception {
@@ -153,50 +154,6 @@ public void testStartsService_notOButTargetingO() throws Exception {
     assertThat(shadowOf(context).getBoundServiceConnections()).isEmpty();
   }
 
-  @Test
-  public void testStartsService_OTargetingO_highPriority() throws Exception {
-    setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 26);
-    context.getApplicationInfo().targetSdkVersion = VERSION_CODES.O;
-
-    Intent intent = new Intent(ACTION_FCM_MESSAGE).putExtra("key", "value");
-    intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-    sendOrderedBroadcastBlocking(intent);
-
-    verify(serviceStarter, atLeastOnce())
-        .startMessagingService(nullable(Context.class), intentCaptor.capture());
-    assertThat(intentCaptor.getValue()).isSameInstanceAs(intent);
-    assertThat(shadowOf(context).getBoundServiceConnections()).isEmpty();
-  }
-
-  @Test
-  public void testStartsService_fallsBackToBindService() throws Exception {
-    setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 26);
-    context.getApplicationInfo().targetSdkVersion = VERSION_CODES.N_MR1;
-    doReturn(ERROR_ILLEGAL_STATE_EXCEPTION)
-        .when(serviceStarter)
-        .startMessagingService(any(), any());
-
-    Intent intent = new Intent(ACTION_FCM_MESSAGE).putExtra("key", "value");
-    sendOrderedBroadcastBlocking(intent);
-
-    verify(serviceStarter, atLeastOnce())
-        .startMessagingService(nullable(Context.class), intentCaptor.capture());
-    assertThat(intentCaptor.getValue()).isSameInstanceAs(intent);
-    assertThat(shadowOf(context).getBoundServiceConnections()).hasSize(1);
-  }
-
-  @Test
-  public void testBindsService_oAndTargetingO() throws Exception {
-    setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 26);
-    context.getApplicationInfo().targetSdkVersion = VERSION_CODES.O;
-
-    Intent intent = new Intent(ACTION_FCM_MESSAGE).putExtra("key", "value");
-    sendOrderedBroadcastBlocking(intent);
-
-    verify(serviceStarter, never()).startMessagingService(any(), any());
-    assertThat(shadowOf(context).getBoundServiceConnections()).hasSize(1);
-  }
-
   private void sendOrderedBroadcastBlocking(Intent intent) throws Exception {
     CountDownLatch latch = new CountDownLatch(1);
 
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/CommonNotificationBuilderRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/CommonNotificationBuilderRoboTest.java
index a1b74b5dd47..698c16dc633 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/CommonNotificationBuilderRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/CommonNotificationBuilderRoboTest.java
@@ -18,6 +18,7 @@
 
 import android.app.Notification;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -27,7 +28,10 @@
 import android.os.Bundle;
 import androidx.core.app.NotificationCompat;
 import androidx.test.core.app.ApplicationProvider;
+import com.google.android.gms.cloudmessaging.CloudMessagingReceiver.IntentActionKeys;
+import com.google.android.gms.cloudmessaging.CloudMessagingReceiver.IntentKeys;
 import com.google.firebase.messaging.CommonNotificationBuilder.DisplayNotificationInfo;
+import com.google.firebase.messaging.Constants.AnalyticsKeys;
 import com.google.firebase.messaging.Constants.MessageNotificationKeys;
 import com.google.firebase.messaging.testing.Bundles;
 import java.util.Arrays;
@@ -38,6 +42,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.LooperMode;
+import org.robolectric.shadows.ShadowPendingIntent;
 
 @LooperMode(LooperMode.Mode.LEGACY)
 @RunWith(RobolectricTestRunner.class)
@@ -45,7 +50,6 @@ public class CommonNotificationBuilderRoboTest {
   public static final String FCM_FALLBACK_NOTIFICATION_CHANNEL =
       "fcm_fallback_notification_channel";
   private static final String FCM_FALLBACK_NOTIFICATION_CHANNEL_NO_RESOURCE = "Misc";
-  private static final String PACKAGE_NAME = "test_package";
   private static final String KEY_PREFIX = "gcm.n.";
   private static final String KEY_TICKER = KEY_PREFIX + "ticker";
   private static final String KEY_VIBRATE_TIMINGS = KEY_PREFIX + "vibrate_timings";
@@ -60,12 +64,19 @@ public class CommonNotificationBuilderRoboTest {
   private static final String NOTIFICATION_PRIORITY_DEFAULT = "0";
   private static final String NOTIFICATION_PRIORITY_NEGATIVE = "-999";
   private static final int DEFAULTS_ALL_OFF = 0;
+  private static final String ACTION_RECEIVER = "com.google.android.c2dm.intent.RECEIVE";
 
   private Context appContext;
+  private Context callingContext;
 
   @Before
-  public void setUp() {
+  public void setUp() throws Exception {
     appContext = ApplicationProvider.getApplicationContext();
+
+    PackageInfo packageInfo = new PackageInfo();
+    packageInfo.packageName = "test.calling.package";
+    shadowOf(appContext.getPackageManager()).addPackage(packageInfo);
+    callingContext = appContext.createPackageContext("test.calling.package", 0);
   }
 
   @Test
@@ -459,12 +470,10 @@ public void createNotificationInfo_withInvalidVisibility_outOfBoundVisibility()
   public void staticCreateNotificationInfo_respectsChannelId() throws Exception {
     DisplayNotificationInfo notificationInfo =
         CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
             appContext,
-            appContext.getPackageName(),
             new NotificationParams(Bundle.EMPTY),
             "channelId",
-            appContext.getResources(),
-            appContext.getPackageManager(),
             Bundle.EMPTY);
 
     assertThat(notificationInfo.notificationBuilder.build().getChannelId()).isEqualTo("channelId");
@@ -497,15 +506,13 @@ static void setTargetSdkVersion(Context context, int version) throws Exception {
   public void staticCreateNotificationInfo_handlesNoArgLocalizedTitle() {
     DisplayNotificationInfo notificationInfo =
         CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
             appContext,
-            appContext.getPackageName(),
             new NotificationParams(
                 Bundles.of(
                     MessageNotificationKeys.TITLE + MessageNotificationKeys.TEXT_RESOURCE_SUFFIX,
                     "fcm_no_args")),
             "channelId",
-            appContext.getResources(),
-            appContext.getPackageManager(),
             Bundle.EMPTY);
 
     // http://google3/javatests/com/google/android/gmscore/integ/tests_res/res/values/strings.xml?l=25-28&rcl=127925113
@@ -518,17 +525,15 @@ public void staticCreateNotificationInfo_handlesNoArgLocalizedTitle() {
   public void staticCreateNotificationInfo_handlesLocalizedTitleWithArgs() {
     DisplayNotificationInfo notificationInfo =
         CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
             appContext,
-            appContext.getPackageName(),
             new NotificationParams(
                 Bundles.of(
                     MessageNotificationKeys.TITLE + MessageNotificationKeys.TEXT_RESOURCE_SUFFIX,
-                        "fcm_2_args",
+                    "fcm_2_args",
                     MessageNotificationKeys.TITLE + MessageNotificationKeys.TEXT_ARGS_SUFFIX,
-                        "[\"one\", \"two\"]")),
+                    "[\"one\", \"two\"]")),
             "channelId",
-            appContext.getResources(),
-            appContext.getPackageManager(),
             Bundle.EMPTY);
 
     // http://google3/javatests/com/google/android/gmscore/integ/tests_res/res/values/strings.xml?l=25-28&rcl=127925113
@@ -541,15 +546,13 @@ public void staticCreateNotificationInfo_handlesLocalizedTitleWithArgs() {
   public void staticCreateNotificationInfo_handlesNoArgLocalizedBody() {
     DisplayNotificationInfo notificationInfo =
         CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
             appContext,
-            appContext.getPackageName(),
             new NotificationParams(
                 Bundles.of(
                     MessageNotificationKeys.BODY + MessageNotificationKeys.TEXT_RESOURCE_SUFFIX,
                     "fcm_no_args")),
             "channelId",
-            appContext.getResources(),
-            appContext.getPackageManager(),
             Bundle.EMPTY);
 
     // http://google3/javatests/com/google/android/gmscore/integ/tests_res/res/values/strings.xml?l=25-28&rcl=127925113
@@ -562,17 +565,15 @@ public void staticCreateNotificationInfo_handlesNoArgLocalizedBody() {
   public void staticCreateNotificationInfo_handlesLocalizedBodyWithArgs() {
     DisplayNotificationInfo notificationInfo =
         CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
             appContext,
-            appContext.getPackageName(),
             new NotificationParams(
                 Bundles.of(
                     MessageNotificationKeys.BODY + MessageNotificationKeys.TEXT_RESOURCE_SUFFIX,
-                        "fcm_2_args",
+                    "fcm_2_args",
                     MessageNotificationKeys.BODY + MessageNotificationKeys.TEXT_ARGS_SUFFIX,
-                        "[\"one\", \"two\"]")),
+                    "[\"one\", \"two\"]")),
             "channelId",
-            appContext.getResources(),
-            appContext.getPackageManager(),
             Bundle.EMPTY);
 
     // http://google3/javatests/com/google/android/gmscore/integ/tests_res/res/values/strings.xml?l=25-28&rcl=127925113
@@ -585,12 +586,10 @@ public void staticCreateNotificationInfo_handlesLocalizedBodyWithArgs() {
   public void staticCreateNotificationInfo_smallIconSpecified() {
     DisplayNotificationInfo notificationInfo =
         CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
             appContext,
-            appContext.getPackageName(),
             new NotificationParams(Bundles.of(MessageNotificationKeys.ICON, "gcm_icon")),
             "channelId",
-            appContext.getResources(),
-            appContext.getPackageManager(),
             Bundle.EMPTY);
 
     assertThat(notificationInfo.notificationBuilder.build().icon)
@@ -601,12 +600,10 @@ public void staticCreateNotificationInfo_smallIconSpecified() {
   public void staticCreateNotificationInfo_smallIconSpecifiedInMetadata() {
     DisplayNotificationInfo notificationInfo =
         CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
             appContext,
-            appContext.getPackageName(),
             new NotificationParams(Bundle.EMPTY),
             "channelId",
-            appContext.getResources(),
-            appContext.getPackageManager(),
             Bundles.of(
                 CommonNotificationBuilder.METADATA_DEFAULT_ICON,
                 com.google.firebase.messaging.test.R.drawable.gcm_icon));
@@ -618,21 +615,19 @@ public void staticCreateNotificationInfo_smallIconSpecifiedInMetadata() {
   @Test
   public void staticCreateNotificationInfo_noIconSpecifiedShouldUseAppIcon() {
     PackageInfo packageInfo = new PackageInfo();
-    packageInfo.packageName = PACKAGE_NAME;
+    packageInfo.packageName = appContext.getPackageName();
     packageInfo.applicationInfo = new ApplicationInfo();
-    packageInfo.applicationInfo.packageName = PACKAGE_NAME;
+    packageInfo.applicationInfo.packageName = appContext.getPackageName();
     packageInfo.applicationInfo.icon = com.google.firebase.messaging.test.R.drawable.gcm_icon2;
 
     shadowOf(appContext.getPackageManager()).installPackage(packageInfo);
 
     DisplayNotificationInfo notificationInfo =
         CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
             appContext,
-            PACKAGE_NAME,
             new NotificationParams(Bundle.EMPTY),
             "channelId",
-            appContext.getResources(),
-            appContext.getPackageManager(),
             Bundle.EMPTY);
 
     assertThat(notificationInfo.notificationBuilder.build().icon)
@@ -642,21 +637,19 @@ public void staticCreateNotificationInfo_noIconSpecifiedShouldUseAppIcon() {
   @Test
   public void staticCreateNotificationInfo_noAppIconShouldUseDefaultSystemIcon() {
     PackageInfo packageInfo = new PackageInfo();
-    packageInfo.packageName = PACKAGE_NAME;
+    packageInfo.packageName = appContext.getPackageName();
     packageInfo.applicationInfo = new ApplicationInfo();
-    packageInfo.applicationInfo.packageName = PACKAGE_NAME;
+    packageInfo.applicationInfo.packageName = appContext.getPackageName();
     packageInfo.applicationInfo.icon = 0; // Bad app icon!
 
     shadowOf(appContext.getPackageManager()).installPackage(packageInfo);
 
     DisplayNotificationInfo notificationInfo =
         CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
             appContext,
-            PACKAGE_NAME,
             new NotificationParams(Bundle.EMPTY),
             "channelId",
-            appContext.getResources(),
-            appContext.getPackageManager(),
             Bundle.EMPTY);
 
     assertThat(notificationInfo.notificationBuilder.build().icon)
@@ -667,12 +660,10 @@ public void staticCreateNotificationInfo_noAppIconShouldUseDefaultSystemIcon() {
   public void staticCreateNotificationInfo_defaultSoundSpecified_sound1Key() {
     DisplayNotificationInfo notificationInfo =
         CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
             appContext,
-            appContext.getPackageName(),
             new NotificationParams(Bundles.of(MessageNotificationKeys.SOUND, "default")),
             "channelId",
-            appContext.getResources(),
-            appContext.getPackageManager(),
             Bundle.EMPTY);
 
     assertThat(notificationInfo.notificationBuilder.build().sound)
@@ -683,12 +674,10 @@ public void staticCreateNotificationInfo_defaultSoundSpecified_sound1Key() {
   public void staticCreateNotificationInfo_defaultSoundSpecified_sound2Key() {
     DisplayNotificationInfo notificationInfo =
         CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
             appContext,
-            appContext.getPackageName(),
             new NotificationParams(Bundles.of(MessageNotificationKeys.SOUND_2, "default")),
             "channelId",
-            appContext.getResources(),
-            appContext.getPackageManager(),
             Bundle.EMPTY);
 
     assertThat(notificationInfo.notificationBuilder.build().sound)
@@ -699,14 +688,123 @@ public void staticCreateNotificationInfo_defaultSoundSpecified_sound2Key() {
   public void staticCreateNotificationInfo_noSoundSpecified() {
     DisplayNotificationInfo notificationInfo =
         CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
             appContext,
-            appContext.getPackageName(),
             new NotificationParams(Bundle.EMPTY),
             "channelId",
-            appContext.getResources(),
-            appContext.getPackageManager(),
             Bundle.EMPTY);
 
     assertThat(notificationInfo.notificationBuilder.build().sound).isNull();
   }
+
+  @Test
+  public void createNotificationInfo_noContentIntentSpecified() {
+    DisplayNotificationInfo notificationInfo =
+        CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
+            appContext,
+            new NotificationParams(Bundle.EMPTY),
+            "channelId",
+            Bundle.EMPTY);
+
+    assertThat(notificationInfo.notificationBuilder.build().contentIntent).isNull();
+  }
+
+  @Test
+  public void createNotificationInfo_clickAction() {
+    DisplayNotificationInfo notificationInfo =
+        CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
+            appContext,
+            new NotificationParams(
+                Bundles.of(MessageNotificationKeys.CLICK_ACTION, "click.action")),
+            "channelId",
+            Bundle.EMPTY);
+
+    ShadowPendingIntent contentPendingIntent =
+        shadowOf(notificationInfo.notificationBuilder.build().contentIntent);
+    assertThat(contentPendingIntent.isActivityIntent()).isTrue();
+    assertThat(contentPendingIntent.getSavedContext()).isEqualTo(callingContext);
+    Intent contentIntent = contentPendingIntent.getSavedIntent();
+    assertThat(contentIntent.getPackage()).isEqualTo(appContext.getPackageName());
+    assertThat(contentIntent.getAction()).isEqualTo("click.action");
+  }
+
+  @Test
+  public void createNotificationInfo_link() {
+    DisplayNotificationInfo notificationInfo =
+        CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
+            appContext,
+            new NotificationParams(Bundles.of(MessageNotificationKeys.LINK, "link")),
+            "channelId",
+            Bundle.EMPTY);
+
+    ShadowPendingIntent contentPendingIntent =
+        shadowOf(notificationInfo.notificationBuilder.build().contentIntent);
+    assertThat(contentPendingIntent.isActivityIntent()).isTrue();
+    assertThat(contentPendingIntent.getSavedContext()).isEqualTo(callingContext);
+    Intent contentIntent = contentPendingIntent.getSavedIntent();
+    assertThat(contentIntent.getPackage()).isEqualTo(appContext.getPackageName());
+    assertThat(contentIntent.getDataString()).isEqualTo("link");
+  }
+
+  @Test
+  public void createNotificationInfo_androidLink() {
+    DisplayNotificationInfo notificationInfo =
+        CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
+            appContext,
+            new NotificationParams(
+                Bundles.of(
+                    MessageNotificationKeys.LINK,
+                    "link",
+                    MessageNotificationKeys.LINK_ANDROID,
+                    "androidLink")),
+            "channelId",
+            Bundle.EMPTY);
+
+    ShadowPendingIntent contentPendingIntent =
+        shadowOf(notificationInfo.notificationBuilder.build().contentIntent);
+    assertThat(contentPendingIntent.isActivityIntent()).isTrue();
+    assertThat(contentPendingIntent.getSavedContext()).isEqualTo(callingContext);
+    Intent contentIntent = contentPendingIntent.getSavedIntent();
+    assertThat(contentIntent.getPackage()).isEqualTo(appContext.getPackageName());
+    assertThat(contentIntent.getDataString()).isEqualTo("androidLink");
+  }
+
+  @Test
+  public void createNotificationInfo_deleteIntentWithoutAnalytics() {
+    DisplayNotificationInfo notificationInfo =
+        CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
+            appContext,
+            new NotificationParams(Bundle.EMPTY),
+            "channelId",
+            Bundle.EMPTY);
+
+    assertThat(notificationInfo.notificationBuilder.build().deleteIntent).isNull();
+  }
+
+  @Test
+  public void createNotificationInfo_deleteIntentWithAnalytics() {
+    DisplayNotificationInfo notificationInfo =
+        CommonNotificationBuilder.createNotificationInfo(
+            callingContext,
+            appContext,
+            new NotificationParams(Bundles.of(AnalyticsKeys.ENABLED, "1")),
+            "channelId",
+            Bundle.EMPTY);
+
+    ShadowPendingIntent deletePendingIntent =
+        shadowOf(notificationInfo.notificationBuilder.build().deleteIntent);
+    assertThat(deletePendingIntent.isBroadcastIntent()).isTrue();
+    assertThat(deletePendingIntent.getSavedContext()).isEqualTo(callingContext);
+    Intent deleteIntent = deletePendingIntent.getSavedIntent();
+    assertThat(deleteIntent.getPackage()).isEqualTo(appContext.getPackageName());
+    assertThat(deleteIntent.getAction()).isEqualTo(ACTION_RECEIVER);
+    Intent dismissIntent = deleteIntent.getParcelableExtra(IntentKeys.WRAPPED_INTENT);
+    assertThat(dismissIntent).isNotNull();
+    assertThat(dismissIntent.getAction()).isEqualTo(IntentActionKeys.NOTIFICATION_DISMISS);
+  }
 }
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationRoboTest.java
index e5b9f82a454..7a107bb3730 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationRoboTest.java
@@ -17,7 +17,6 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -45,6 +44,7 @@
 import android.os.Process;
 import android.os.SystemClock;
 import androidx.test.core.app.ApplicationProvider;
+
 import com.google.firebase.messaging.shadows.ShadowPreconditions;
 import com.google.firebase.messaging.testing.Bundles;
 import com.google.firebase.messaging.testing.TestImageServer;
@@ -197,7 +197,8 @@ public void testIconFromMetadata() {
     Bundle metadata = new Bundle();
     metadata.putInt(METADATA_DEFAULT_ICON, resId);
     PackageInfo packageInfo =
-        shadowOf(context.getPackageManager()).getPackageInfoForTesting(context.getPackageName());
+        shadowOf(context.getPackageManager())
+            .getInternalMutablePackageInfo(context.getPackageName());
     packageInfo.applicationInfo.metaData = metadata;
 
     Bundle data = new Bundle();
@@ -250,7 +251,8 @@ public void testAdaptiveIcon_viaMetadata() {
     metadata.putInt(
         METADATA_DEFAULT_ICON, com.google.firebase.messaging.test.R.drawable.adaptive_icon);
     PackageInfo packageInfo =
-        shadowOf(context.getPackageManager()).getPackageInfoForTesting(context.getPackageName());
+        shadowOf(context.getPackageManager())
+            .getInternalMutablePackageInfo(context.getPackageName());
     packageInfo.applicationInfo.metaData = metadata;
 
     Bundle data = new Bundle();
@@ -508,7 +510,8 @@ public void testColorFromMetadata() {
     metadata.putInt(
         METADATA_DEFAULT_COLOR, com.google.firebase.messaging.test.R.color.fcm_test_color);
     PackageInfo packageInfo =
-        shadowOf(context.getPackageManager()).getPackageInfoForTesting(context.getPackageName());
+        shadowOf(context.getPackageManager())
+            .getInternalMutablePackageInfo(context.getPackageName());
     packageInfo.applicationInfo.metaData = metadata;
 
     Bundle data = new Bundle();
@@ -523,20 +526,6 @@ public void testColorFromMetadata() {
         n.color);
   }
 
-  /** Test that a color is ignored pre-Lollipop where it wasn't supported. */
-  @Test
-  @Config(sdk = Build.VERSION_CODES.KITKAT)
-  public void testColor_kitkat() {
-    final String color = "#123456";
-    Bundle data = new Bundle();
-    data.putString(KEY_COLOR, color);
-    assertTrue(
-        new DisplayNotification(context, new NotificationParams(data), executor)
-            .handleNotification());
-
-    assertNotNull(getSingleNotification());
-  }
-
   /** Test a valid notification with default notification sound is displayed. */
   @Test
   public void testDefaultSound() {
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/FcmBroadcastProcessorRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/FcmBroadcastProcessorRoboTest.java
new file mode 100644
index 00000000000..5ae9d3a4e6f
--- /dev/null
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/FcmBroadcastProcessorRoboTest.java
@@ -0,0 +1,157 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.messaging;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build.VERSION_CODES;
+import androidx.test.core.app.ApplicationProvider;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.firebase.messaging.testing.FakeScheduledExecutorService;
+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;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLooper;
+import org.robolectric.shadows.ShadowPowerManager;
+
+/** Robolectric test for FcmBroadcastProcessor. */
+@RunWith(RobolectricTestRunner.class)
+public class FcmBroadcastProcessorRoboTest {
+
+  private static final String ACTION_FCM_MESSAGE = "com.google.android.c2dm.intent.RECEIVE";
+
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
+
+  private Application context;
+  private FcmBroadcastProcessor processor;
+  private FakeScheduledExecutorService fakeExecutorService;
+  @Mock private ServiceStarter serviceStarter;
+  @Mock private WithinAppServiceConnection mockConnection;
+  private TaskCompletionSource<Void> sendIntentTask;
+
+  @Before
+  public void setUp() {
+    context = ApplicationProvider.getApplicationContext();
+    ServiceStarter.setForTesting(serviceStarter);
+    fakeExecutorService = new FakeScheduledExecutorService();
+    processor = new FcmBroadcastProcessor(context, fakeExecutorService);
+    FcmBroadcastProcessor.setServiceConnection(mockConnection);
+    sendIntentTask = new TaskCompletionSource<>();
+    when(mockConnection.sendIntent(any(Intent.class))).thenReturn(sendIntentTask.getTask());
+  }
+
+  @After
+  public void resetStaticState() {
+    ServiceStarter.setForTesting(null);
+    FcmBroadcastProcessor.reset();
+    WakeLockHolder.reset();
+    ShadowPowerManager.clearWakeLocks();
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.O)
+  public void testStartMessagingService_Background() {
+    setSubjectToBackgroundCheck();
+    setWakeLockPermission(true);
+    Intent intent = new Intent(ACTION_FCM_MESSAGE);
+
+    Task<Integer> startServiceTask = processor.startMessagingService(context, intent);
+
+    // Should send the intent through the connection and not acquire a WakeLock.
+    assertThat(startServiceTask.isComplete()).isFalse();
+    verify(serviceStarter, never()).startMessagingService(any(), any());
+    verify(mockConnection).sendIntent(intent);
+    assertThat(ShadowPowerManager.getLatestWakeLock()).isNull();
+
+    // After the message has been handled, the task should be completed successfully.
+    sendIntentTask.setResult(null);
+    ShadowLooper.idleMainLooper();
+
+    assertThat(startServiceTask.getResult()).isEqualTo(ServiceStarter.SUCCESS);
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.O)
+  public void testStartMessagingService_ForegroundBindWithWakeLock() {
+    setWakeLockPermission(true);
+    setStartServiceFails();
+    Intent intent = new Intent(ACTION_FCM_MESSAGE);
+    intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+
+    Task<Integer> startServiceTask = processor.startMessagingService(context, intent);
+
+    // Should return immediately with SUCCESS, bind to the Service, and acquire a WakeLock.
+    fakeExecutorService.runAll();
+    assertThat(startServiceTask.isComplete()).isTrue();
+    assertThat(startServiceTask.getResult())
+        .isEqualTo(ServiceStarter.ERROR_ILLEGAL_STATE_EXCEPTION_FALLBACK_TO_BIND);
+    verify(mockConnection).sendIntent(any(Intent.class));
+    assertThat(ShadowPowerManager.getLatestWakeLock()).isNotNull();
+    assertThat(ShadowPowerManager.getLatestWakeLock().isHeld()).isTrue();
+
+    // After the message has been handled, the WakeLock should be released.
+    sendIntentTask.setResult(null);
+    ShadowLooper.idleMainLooper();
+
+    assertThat(ShadowPowerManager.getLatestWakeLock().isHeld()).isFalse();
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.O)
+  public void testStartMessagingService_ForegroundBindNoWakeLock() {
+    setWakeLockPermission(false);
+    setStartServiceFails();
+    Intent intent = new Intent(ACTION_FCM_MESSAGE);
+    intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+
+    Task<Integer> startServiceTask = processor.startMessagingService(context, intent);
+
+    // Should return immediately with SUCCESS, bind to the Service, and not acquire a WakeLock.
+    fakeExecutorService.runAll();
+    assertThat(startServiceTask.isComplete()).isTrue();
+    assertThat(startServiceTask.getResult())
+        .isEqualTo(ServiceStarter.ERROR_ILLEGAL_STATE_EXCEPTION_FALLBACK_TO_BIND);
+    verify(mockConnection).sendIntent(any(Intent.class));
+    assertThat(ShadowPowerManager.getLatestWakeLock()).isNull();
+  }
+
+  private void setSubjectToBackgroundCheck() {
+    // Subject to background check when run on Android O and targetSdkVersion set to O.
+    context.getApplicationInfo().targetSdkVersion = VERSION_CODES.O;
+  }
+
+  private void setWakeLockPermission(boolean permission) {
+    when(serviceStarter.hasWakeLockPermission(any(Context.class))).thenReturn(permission);
+  }
+
+  private void setStartServiceFails() {
+    when(serviceStarter.startMessagingService(any(Context.class), any(Intent.class)))
+        .thenReturn(ServiceStarter.ERROR_ILLEGAL_STATE_EXCEPTION);
+  }
+}
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/FirebaseMessagingRegistrarRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/FirebaseMessagingRegistrarRoboTest.java
index 7edf372697d..c481e3967b8 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/FirebaseMessagingRegistrarRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/FirebaseMessagingRegistrarRoboTest.java
@@ -19,6 +19,8 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import com.google.firebase.datatransport.TransportBackend;
 import com.google.firebase.events.Subscriber;
 import com.google.firebase.heartbeatinfo.HeartBeatInfo;
 import com.google.firebase.iid.internal.FirebaseInstanceIdInternal;
@@ -48,8 +50,9 @@ public void testGetComponents() {
             Dependency.optional(FirebaseInstanceIdInternal.class),
             Dependency.optionalProvider(UserAgentPublisher.class),
             Dependency.optionalProvider(HeartBeatInfo.class),
-            Dependency.optional(TransportFactory.class),
             Dependency.required(FirebaseInstallationsApi.class),
+            Dependency.optionalProvider(
+                Qualified.qualified(TransportBackend.class, TransportFactory.class)),
             Dependency.required(Subscriber.class));
   }
 }
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/FirebaseMessagingRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/FirebaseMessagingRoboTest.java
index ecdf2ca4b45..64796aa9346 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/FirebaseMessagingRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/FirebaseMessagingRoboTest.java
@@ -13,12 +13,17 @@
 // limitations under the License.
 package com.google.firebase.messaging;
 
-import static android.os.Looper.getMainLooper;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.firebase.messaging.FirebaseMessaging.GMS_PACKAGE;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -34,16 +39,25 @@
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import androidx.test.core.app.ApplicationProvider;
+import com.google.android.datatransport.Encoding;
+import com.google.android.datatransport.Transformer;
+import com.google.android.datatransport.Transport;
+import com.google.android.datatransport.TransportFactory;
+import com.google.android.gms.cloudmessaging.CloudMessage;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
+import com.google.firebase.analytics.connector.AnalyticsConnector;
 import com.google.firebase.components.ComponentDiscoveryService;
 import com.google.firebase.events.Subscriber;
 import com.google.firebase.heartbeatinfo.HeartBeatInfo;
 import com.google.firebase.iid.internal.FirebaseInstanceIdInternal;
+import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
+import com.google.firebase.messaging.reporting.MessagingClientEventExtension;
 import com.google.firebase.messaging.shadows.ShadowPreconditions;
 import com.google.firebase.messaging.testing.FakeScheduledExecutorService;
 import com.google.firebase.messaging.testing.FirebaseIidRoboTestHelper;
@@ -80,11 +94,11 @@ public final class FirebaseMessagingRoboTest {
   private static final String PROJECT_ID = FirebaseIidRoboTestHelper.PROJECT_ID;
   private static final String API_KEY = FirebaseIidRoboTestHelper.API_KEY;
 
+  private static final Provider<TransportFactory> EMPTY_TRANSPORT_FACTORY = () -> null;
+
   private Application context;
-  private FirebaseMessaging firebaseMessaging;
   private final FakeScheduledExecutorService fakeScheduledExecutorService =
       new FakeScheduledExecutorService();
-  private TopicsSubscriber topicSubscriber;
 
   @Before
   public void setUp() throws InterruptedException, ExecutionException, TimeoutException {
@@ -105,10 +119,6 @@ public void setUp() throws InterruptedException, ExecutionException, TimeoutExce
             .setApiKey(API_KEY)
             .setGcmSenderId(FirebaseIidRoboTestHelper.SENDER_ID)
             .build());
-    firebaseMessaging = FirebaseMessaging.getInstance();
-    // Making sure Topic subscriber task succeeds before proceeding with tests.
-    topicSubscriber = Tasks.await(firebaseMessaging.getTopicsSubscriberTask(), 5, SECONDS);
-    clearTopicOperations();
 
     // To make sure proxy initialization happens before test execution.
     ProxyNotificationInitializer.initialize(context);
@@ -163,7 +173,7 @@ public void testIsFcmAutoInitEnabled_default() {
             () -> mock(UserAgentPublisher.class),
             () -> mock(HeartBeatInfo.class),
             mock(FirebaseInstallationsApi.class),
-            /* transportFactory= */ null,
+            EMPTY_TRANSPORT_FACTORY,
             mock(Subscriber.class));
 
     assertThat(messaging.isAutoInitEnabled()).isTrue();
@@ -191,7 +201,7 @@ public void testIsFcmAutoInitEnabled_firebase_manifest() {
             () -> mock(UserAgentPublisher.class),
             () -> mock(HeartBeatInfo.class),
             mock(FirebaseInstallationsApi.class),
-            /* transportFactory= */ null,
+            EMPTY_TRANSPORT_FACTORY,
             mock(Subscriber.class));
 
     assertThat(messaging.isAutoInitEnabled()).isFalse();
@@ -209,7 +219,7 @@ public void testIsFcmAutoInitEnabled_manifest() {
             () -> mock(UserAgentPublisher.class),
             () -> mock(HeartBeatInfo.class),
             mock(FirebaseInstallationsApi.class),
-            /* transportFactory= */ null,
+            EMPTY_TRANSPORT_FACTORY,
             mock(Subscriber.class));
 
     assertThat(messaging.isAutoInitEnabled()).isFalse();
@@ -221,7 +231,7 @@ public void testIsFcmAutoInitEnabled_firebase_setDataCollectionDefaultDisabled()
     FirebaseApp.getInstance().setDataCollectionDefaultEnabled(false);
     editManifestApplicationMetadata().remove("firebase_messaging_auto_init_enabled");
 
-    assertThat(firebaseMessaging.isAutoInitEnabled()).isFalse();
+    assertThat(FirebaseMessaging.getInstance().isAutoInitEnabled()).isFalse();
   }
 
   /** Test that setting auto-init at runtime overrides the default setting. */
@@ -240,9 +250,9 @@ public void testSetFcmAutoInitEnabled_overrideDataCollectionDefaultEnabled() {
     FirebaseApp.getInstance().setDataCollectionDefaultEnabled(false);
     editManifestApplicationMetadata().remove("firebase_messaging_auto_init_enabled");
 
-    firebaseMessaging.setAutoInitEnabled(true);
+    FirebaseMessaging.getInstance().setAutoInitEnabled(true);
 
-    assertThat(firebaseMessaging.isAutoInitEnabled()).isTrue();
+    assertThat(FirebaseMessaging.getInstance().isAutoInitEnabled()).isTrue();
   }
 
   /** Test that setting auto-init enabled at runtime overrides the manifest value. */
@@ -256,7 +266,7 @@ public void testSetFcmAutoInitEnabled_firebase_manifest() {
             () -> mock(UserAgentPublisher.class),
             () -> mock(HeartBeatInfo.class),
             mock(FirebaseInstallationsApi.class),
-            /* transportFactory= */ null,
+            EMPTY_TRANSPORT_FACTORY,
             mock(Subscriber.class));
 
     messaging.setAutoInitEnabled(true);
@@ -272,12 +282,12 @@ public void testGetToken() throws Exception {
         new FirebaseMessaging(
             FirebaseApp.getInstance(),
             /* iid= */ null,
-            mock(FirebaseInstallationsApi.class),
-            /* transportFactory= */ null,
+            EMPTY_TRANSPORT_FACTORY,
             mock(Subscriber.class),
             new Metadata(context),
             mockGmsRpc,
             Runnable::run,
+            Runnable::run,
             Runnable::run);
     when(mockGmsRpc.getToken()).thenReturn(Tasks.forResult("fake_token"));
 
@@ -298,12 +308,12 @@ public void getToken_withFiid() throws Exception {
         new FirebaseMessaging(
             FirebaseApp.getInstance(),
             mockFiid,
-            mock(FirebaseInstallationsApi.class),
-            /* transportFactory= */ null,
+            EMPTY_TRANSPORT_FACTORY,
             mock(Subscriber.class),
             mock(Metadata.class),
             mockGmsRpc,
             Runnable::run,
+            Runnable::run,
             Runnable::run);
     when(mockFiid.getTokenTask()).thenReturn(Tasks.forResult("fake_token"));
 
@@ -322,12 +332,12 @@ public void testDeleteToken() throws Exception {
         new FirebaseMessaging(
             FirebaseApp.getInstance(),
             /* iid= */ null,
-            mock(FirebaseInstallationsApi.class),
-            /* transportFactory= */ null,
+            EMPTY_TRANSPORT_FACTORY,
             mock(Subscriber.class),
             new Metadata(context),
             mockGmsRpc,
             Runnable::run,
+            Runnable::run,
             Runnable::run);
     when(mockGmsRpc.getToken()).thenReturn(Tasks.forResult("fake_token"));
     when(mockGmsRpc.deleteToken()).thenReturn(Tasks.forResult(null));
@@ -350,12 +360,12 @@ public void deleteToken_withFiid() throws Exception {
         new FirebaseMessaging(
             FirebaseApp.getInstance(),
             mockFiid,
-            mock(FirebaseInstallationsApi.class),
-            /* transportFactory= */ null,
+            EMPTY_TRANSPORT_FACTORY,
             mock(Subscriber.class),
             mock(Metadata.class),
             mockGmsRpc,
             Runnable::run,
+            Runnable::run,
             Runnable::run);
 
     Task<Void> deleteTokenTask = messaging.deleteToken();
@@ -370,15 +380,18 @@ public void deleteToken_withFiid() throws Exception {
   @Test
   @Config(sdk = VERSION_CODES.Q)
   public void isProxyNotificationEnabledDefaultsToTrueForNewerDevices() {
+    GmsRpc mockGmsRpc = mock(GmsRpc.class);
+    when(mockGmsRpc.setRetainProxiedNotifications(anyBoolean())).thenReturn(Tasks.forResult(null));
+    when(mockGmsRpc.getProxyNotificationData()).thenReturn(Tasks.forResult(null));
     FirebaseMessaging messaging =
         new FirebaseMessaging(
             FirebaseApp.getInstance(),
             /* iid= */ null,
-            mock(FirebaseInstallationsApi.class),
-            /* transportFactory= */ null,
+            EMPTY_TRANSPORT_FACTORY,
             mock(Subscriber.class),
             mock(Metadata.class),
-            mock(GmsRpc.class),
+            mockGmsRpc,
+            Runnable::run,
             Runnable::run,
             Runnable::run);
 
@@ -392,12 +405,12 @@ public void isProxyNotificationEnabledDefaultsToFalseForOlderDevices() {
         new FirebaseMessaging(
             FirebaseApp.getInstance(),
             /* iid= */ null,
-            mock(FirebaseInstallationsApi.class),
-            /* transportFactory= */ null,
+            EMPTY_TRANSPORT_FACTORY,
             mock(Subscriber.class),
             mock(Metadata.class),
             mock(GmsRpc.class),
             Runnable::run,
+            Runnable::run,
             Runnable::run);
 
     assertThat(messaging.isNotificationDelegationEnabled()).isFalse();
@@ -456,6 +469,279 @@ public void proxyNotificationEnabledIsFalseWhenUidIsWrong() throws Exception {
     assertThat(FirebaseMessaging.getInstance().isNotificationDelegationEnabled()).isFalse();
   }
 
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  public void initialProxy_noGoogleAnalyticsNoBigQuery() {
+    // Delete SharedPreferences to clear out the RetainProxiedNotifications setting.
+    context.deleteSharedPreferences("com.google.firebase.messaging");
+    GmsRpc mockGmsRpc = createMockGmsRpc();
+
+    createFirebaseMessageInstance(mockGmsRpc, /* analyticsConnectorPresent= */ false);
+
+    // GA not present and BigQuery export not enabled, shouldn't retain proxy notifications.
+    verify(mockGmsRpc).setRetainProxiedNotifications(false);
+    verify(mockGmsRpc, never()).getProxyNotificationData();
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  public void initialProxy_googleAnalyticsNoBigQuery() {
+    // Delete SharedPreferences to clear out the RetainProxiedNotifications setting.
+    context.deleteSharedPreferences("com.google.firebase.messaging");
+    GmsRpc mockGmsRpc = createMockGmsRpc();
+
+    createFirebaseMessageInstance(mockGmsRpc, /* analyticsConnectorPresent= */ true);
+
+    // GA present and BigQuery export not enabled, should retain proxy notifications.
+    verify(mockGmsRpc).setRetainProxiedNotifications(true);
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  public void initialProxy_noGoogleAnalyticsBigQuery() {
+    // Delete SharedPreferences to clear out the RetainProxiedNotifications setting.
+    context.deleteSharedPreferences("com.google.firebase.messaging");
+    editManifestApplicationMetadata()
+        .putBoolean("delivery_metrics_exported_to_big_query_enabled", true);
+    GmsRpc mockGmsRpc = createMockGmsRpc();
+
+    createFirebaseMessageInstance(mockGmsRpc, /* analyticsConnectorPresent= */ false);
+
+    // GA not present and BigQuery export enabled, should retain proxy notifications.
+    verify(mockGmsRpc).setRetainProxiedNotifications(true);
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  public void initialProxy_googleAnalyticsBigQuery() {
+    // Delete SharedPreferences to clear out the RetainProxiedNotifications setting.
+    context.deleteSharedPreferences("com.google.firebase.messaging");
+    // Enable BigQuery export.
+    editManifestApplicationMetadata()
+        .putBoolean("delivery_metrics_exported_to_big_query_enabled", true);
+    GmsRpc mockGmsRpc = createMockGmsRpc();
+
+    createFirebaseMessageInstance(mockGmsRpc, /* analyticsConnectorPresent= */ true);
+
+    // GA present and BigQuery export enabled, should retain proxy notifications.
+    verify(mockGmsRpc).setRetainProxiedNotifications(true);
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.P)
+  public void initialProxy_preQ() {
+    // Delete SharedPreferences to clear out the RetainProxiedNotifications setting.
+    context.deleteSharedPreferences("com.google.firebase.messaging");
+    // Enable BigQuery export.
+    editManifestApplicationMetadata()
+        .putBoolean("delivery_metrics_exported_to_big_query_enabled", true);
+    GmsRpc mockGmsRpc = createMockGmsRpc();
+
+    createFirebaseMessageInstance(mockGmsRpc, /* analyticsConnectorPresent= */ true);
+
+    // Shouldn't set retention on a version that doesn't support proxy.
+    verify(mockGmsRpc, never()).setRetainProxiedNotifications(anyBoolean());
+    verify(mockGmsRpc, never()).getProxyNotificationData();
+  }
+
+  private static class FakeFirelogTransportFactory implements TransportFactory {
+    final Transport<?> mockTransport;
+
+    FakeFirelogTransportFactory(Transport<?> transport) {
+      mockTransport = transport;
+    }
+
+    @Override
+    public <T> Transport<T> getTransport(
+        String name, Class<T> payloadType, Transformer<T, byte[]> payloadTransformer) {
+      throw new IllegalStateException("unimplemented");
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Transport<T> getTransport(
+        String name,
+        Class<T> payloadType,
+        Encoding payloadEncoding,
+        Transformer<T, byte[]> payloadTransformer) {
+      return (Transport<T>) mockTransport;
+    }
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  @SuppressWarnings("unchecked")
+  public void initializeProxy_handlesProxyNotifications() {
+    // Enable BigQuery export so that it will try to log to Firelog if it receives proxy data.
+    editManifestApplicationMetadata()
+        .putBoolean("delivery_metrics_exported_to_big_query_enabled", true);
+    GmsRpc mockGmsRpc = createMockGmsRpc();
+    when(mockGmsRpc.getProxyNotificationData())
+        .thenReturn(
+            Tasks.forResult(new CloudMessage(new Intent())),
+            Tasks.forResult(new CloudMessage(new Intent())),
+            Tasks.forResult(null));
+    Transport<MessagingClientEventExtension> mockTransport = mock(Transport.class);
+
+    FirebaseMessaging unused =
+        new FirebaseMessaging(
+            FirebaseApp.getInstance(),
+            /* iid= */ null,
+            () -> new FakeFirelogTransportFactory(mockTransport),
+            mock(Subscriber.class),
+            mock(Metadata.class),
+            mockGmsRpc,
+            Runnable::run,
+            Runnable::run,
+            Runnable::run);
+
+    // Should have logged to Firelog twice, once for each notification returned.
+    verify(mockTransport, times(2)).send(any());
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  @SuppressWarnings("unchecked")
+  public void initializeProxy_handlesNoPendingProxyNotifications() {
+    // Enable BigQuery export so that it will try to log to Firelog if it receives proxy data.
+    editManifestApplicationMetadata()
+        .putBoolean("delivery_metrics_exported_to_big_query_enabled", true);
+    GmsRpc mockGmsRpc = createMockGmsRpc();
+    when(mockGmsRpc.getProxyNotificationData()).thenReturn(Tasks.forResult(null));
+    Transport<MessagingClientEventExtension> mockTransport = mock(Transport.class);
+
+    FirebaseMessaging unused =
+        new FirebaseMessaging(
+            FirebaseApp.getInstance(),
+            /* iid= */ null,
+            () -> new FakeFirelogTransportFactory(mockTransport),
+            mock(Subscriber.class),
+            mock(Metadata.class),
+            mockGmsRpc,
+            Runnable::run,
+            Runnable::run,
+            Runnable::run);
+
+    // Should have tried to retrieve data, but should not have logged since there is no pending
+    // proxy notification data.
+    verify(mockGmsRpc).getProxyNotificationData();
+    verify(mockTransport, never()).send(any());
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  public void setDeliveryMetricsExportToBigQuery_enablesProxyRetention() {
+    GmsRpc mockGmsRpc = createMockGmsRpc();
+    FirebaseMessaging messaging =
+        createFirebaseMessageInstance(mockGmsRpc, /* analyticsConnectorPresent= */ false);
+    clearInvocations(mockGmsRpc);
+
+    messaging.setDeliveryMetricsExportToBigQuery(true);
+
+    // Enabling BigQuery should start retaining proxy notifications.
+    verify(mockGmsRpc).setRetainProxiedNotifications(true);
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  public void setDeliveryMetricsExportToBigQuery_disablesProxyRetention() {
+    // Enable BigQuery export.
+    editManifestApplicationMetadata()
+        .putBoolean("delivery_metrics_exported_to_big_query_enabled", true);
+    GmsRpc mockGmsRpc = createMockGmsRpc();
+    // Create an instance that should retain proxy notifications because BigQuery is enabled.
+    FirebaseMessaging messaging =
+        createFirebaseMessageInstance(mockGmsRpc, /* analyticsConnectorPresent= */ false);
+    clearInvocations(mockGmsRpc);
+
+    messaging.setDeliveryMetricsExportToBigQuery(false);
+
+    // Disabling BigQuery should stop retaining proxy notifications.
+    verify(mockGmsRpc).setRetainProxiedNotifications(false);
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  public void setDeliveryMetricsExportToBigQuery_noProxyRetentionChange() {
+    // Enable BigQuery export.
+    editManifestApplicationMetadata()
+        .putBoolean("delivery_metrics_exported_to_big_query_enabled", true);
+    // Create an instance that should retain proxy notifications due to AnalyticsConnector and
+    // BigQuery enabled.
+    GmsRpc mockGmsRpc = createMockGmsRpc();
+    FirebaseMessaging messaging =
+        createFirebaseMessageInstance(mockGmsRpc, /* analyticsConnectorPresent= */ true);
+    clearInvocations(mockGmsRpc);
+
+    messaging.setDeliveryMetricsExportToBigQuery(false);
+
+    // Disabling BigQuery should keep retaining proxy notifications since AnalyticsConnector is
+    // still present.
+    verify(mockGmsRpc, never()).setRetainProxiedNotifications(anyBoolean());
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  public void setNotificationDelegationEnabled_disablesProxyRetention() throws Exception {
+    GmsRpc mockGmsRpc = createMockGmsRpc();
+    // Create an instance that should save that proxy notifications are retained.
+    FirebaseMessaging messaging =
+        createFirebaseMessageInstance(mockGmsRpc, /* analyticsConnectorPresent= */ true);
+    clearInvocations(mockGmsRpc);
+
+    Tasks.await(messaging.setNotificationDelegationEnabled(false));
+
+    // Disabling proxy should stop retaining proxy notifications.
+    ShadowLooper.idleMainLooper();
+    verify(mockGmsRpc).setRetainProxiedNotifications(false);
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  public void setNotificationDelegationEnabled_enablesProxyRetention() throws Exception {
+    GmsRpc mockGmsRpc = createMockGmsRpc();
+    // Create an instance that should retain proxy notifications, but disable proxy notifications.
+    FirebaseMessaging messaging =
+        createFirebaseMessageInstance(mockGmsRpc, /* analyticsConnectorPresent= */ true);
+    Tasks.await(messaging.setNotificationDelegationEnabled(false));
+    ShadowLooper.idleMainLooper();
+    clearInvocations(mockGmsRpc);
+
+    Tasks.await(messaging.setNotificationDelegationEnabled(true));
+
+    // Enabling proxy should start retaining proxy notifications again.
+    ShadowLooper.idleMainLooper();
+    verify(mockGmsRpc).setRetainProxiedNotifications(true);
+  }
+
+  private GmsRpc createMockGmsRpc() {
+    GmsRpc mockGmsRpc = mock(GmsRpc.class);
+    when(mockGmsRpc.setRetainProxiedNotifications(anyBoolean())).thenReturn(Tasks.forResult(null));
+    when(mockGmsRpc.getProxyNotificationData()).thenReturn(Tasks.forResult(null));
+    return mockGmsRpc;
+  }
+
+  @CanIgnoreReturnValue
+  private FirebaseMessaging createFirebaseMessageInstance(
+      GmsRpc gmsRpc, boolean analyticsConnectorPresent) {
+    FirebaseApp firebaseAppSpy = spy(FirebaseApp.getInstance());
+    when(firebaseAppSpy.get(AnalyticsConnector.class))
+        .thenReturn(analyticsConnectorPresent ? mock(AnalyticsConnector.class) : null);
+
+    return new FirebaseMessaging(
+        firebaseAppSpy,
+        /* iid= */ null,
+        () -> mock(TransportFactory.class),
+        mock(Subscriber.class),
+        mock(Metadata.class),
+        gmsRpc,
+        Runnable::run,
+        Runnable::run,
+        Runnable::run);
+  }
+
+  /*
+  TODO b/286544512
   @Test
   public void testSubscribeToTopic_withPrefix() {
     firebaseMessaging.subscribeToTopic(VALID_TOPIC);
@@ -485,6 +771,7 @@ public void testUnsubscribeFromTopic_invalid() {
     shadowOf(getMainLooper()).runToEndOfTasks();
     assertThat(task.getException()).isInstanceOf(IllegalArgumentException.class);
   }
+   */
 
   @Test
   public void testLibraryVersionRegistration_valid() {
@@ -502,12 +789,12 @@ public void blockingGetToken_calledTwice_OnNewTokenInvokedOnce() throws Exceptio
         new FirebaseMessaging(
             FirebaseApp.getInstance(),
             /* iid= */ null,
-            mock(FirebaseInstallationsApi.class),
-            /* transportFactory= */ null,
+            EMPTY_TRANSPORT_FACTORY,
             mock(Subscriber.class),
             new Metadata(context),
             mockGmsRpc,
             Runnable::run,
+            Runnable::run,
             Runnable::run);
 
     // Call blockingGetToken() twice. Since GmsRpc.getToken() is blocked, neither call should see a
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/FirebaseMessagingServiceRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/FirebaseMessagingServiceRoboTest.java
index 6f7c46a8ffc..66915d6fd63 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/FirebaseMessagingServiceRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/FirebaseMessagingServiceRoboTest.java
@@ -26,12 +26,14 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Activity;
@@ -43,7 +45,6 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -54,13 +55,14 @@
 import android.os.Process;
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.core.app.ApplicationProvider;
+import com.google.android.gms.cloudmessaging.CloudMessage;
+import com.google.android.gms.cloudmessaging.Rpc;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.iid.FirebaseInstanceIdReceiver;
 import com.google.firebase.messaging.AnalyticsTestHelper.Analytics;
-import com.google.firebase.messaging.shadows.ShadowMessenger;
 import com.google.firebase.messaging.testing.AnalyticsValidator;
 import com.google.firebase.messaging.testing.Bundles;
 import com.google.firebase.messaging.testing.FakeConnectorComponent;
@@ -76,23 +78,23 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.ArgumentMatcher;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.android.controller.ServiceController;
-import org.robolectric.annotation.Config;
 import org.robolectric.annotation.LooperMode;
 import org.robolectric.annotation.LooperMode.Mode;
 import org.robolectric.shadows.ShadowLooper;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowMessenger.class})
 @LooperMode(Mode.PAUSED)
 public class FirebaseMessagingServiceRoboTest {
 
   // Constants are copied so that tests will break if these change
   private static final String ACTION_NEW_TOKEN = "com.google.firebase.messaging.NEW_TOKEN";
+  private static final String ACTION_RECEIVER = "com.google.android.c2dm.intent.RECEIVE";
 
   private static final String DEFAULT_FROM = "123";
   private static final String DEFAULT_TO = "456";
@@ -214,6 +216,43 @@ public void testMessage_nullIntentExtras() throws Exception {
     assertThat(shadowOf(context).getNextStartedService()).isNull();
   }
 
+  @Test
+  public void messageHandled() throws Exception {
+    RemoteMessageBuilder builder =
+        new RemoteMessageBuilder()
+            .setFrom(DEFAULT_FROM)
+            .setTo(DEFAULT_TO)
+            .addData("key1", "value1")
+            .setMessageId("message_id_456")
+            .setSentTime(123456789);
+    Intent intent = builder.buildIntent();
+    Rpc mockRpc = mock(Rpc.class);
+    service.setRpcForTesting(mockRpc);
+    CountDownLatch latch = new CountDownLatch(1);
+    doAnswer(
+            invocation -> {
+              latch.await();
+              return null;
+            })
+        .when(service)
+        .onMessageReceived(any(RemoteMessage.class));
+
+    shadowOf(context).clearStartedServices();
+    sendBroadcastToReceiver(intent);
+    processInternalStartService(context);
+
+    // Shouldn't call messageHandled while onMessageReceived is still running.
+    verifyNoMoreInteractions(mockRpc);
+    // Finish onMessageReceived, messageHandled should now be called.
+    latch.countDown();
+    flushTasks();
+    ArgumentCaptor<CloudMessage> messageCaptor = ArgumentCaptor.forClass(CloudMessage.class);
+    verify(mockRpc).messageHandled(messageCaptor.capture());
+    CloudMessage message = messageCaptor.getValue();
+    assertThat(message).isNotNull();
+    assertThat(message.getIntent()).isEqualTo(intent);
+  }
+
   @Test
   public void testDuplicateMessageDropped() throws Exception {
     String messageId = "a.message.id";
@@ -311,6 +350,7 @@ public void testOnNewToken() throws Exception {
 
     ServiceStarter.getInstance().startMessagingService(context, intent);
     processInternalStartService(context);
+    flushTasks();
 
     verify(service).onNewToken("token123");
   }
@@ -588,8 +628,8 @@ private void dispatchBroadcastIntentToReceiver(PendingIntent pi) throws Interrup
     // Ensure the intent is a broadcast to the receiver, then dispatch it
     assertWithMessage("expected broadcast intent").that(shadowOf(pi).isBroadcastIntent()).isTrue();
 
-    assertEquals(
-        intent.getComponent(), new ComponentName(context, FirebaseInstanceIdReceiver.class));
+    assertEquals(intent.getAction(), ACTION_RECEIVER);
+    assertEquals(intent.getPackage(), context.getPackageName());
     sendBroadcastToReceiver(intent);
     ShadowLooper.idleMainLooper();
   }
@@ -688,6 +728,7 @@ public void startServiceViaReceiver(Intent intent) throws InterruptedException {
     shadowOf(context).clearStartedServices();
     sendBroadcastToReceiver(intent);
     processInternalStartService(context);
+    flushTasks();
   }
 
   /**
@@ -703,7 +744,6 @@ public void processInternalStartService(Application application) throws Interrup
     assertEquals(application.getPackageName(), serviceIntent.getPackage());
 
     service.onStartCommand(serviceIntent, 0 /* flags */, 1 /* startId */);
-    flushTasks();
   }
 
   // Flush the Service background tasks
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/GmsRpcRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/GmsRpcRoboTest.java
index 885dcf24231..d6b77978ad6 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/GmsRpcRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/GmsRpcRoboTest.java
@@ -26,10 +26,12 @@
 import static org.mockito.Mockito.when;
 
 import android.app.Application;
+import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
+import com.google.android.gms.cloudmessaging.CloudMessage;
 import com.google.android.gms.cloudmessaging.Rpc;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
@@ -40,7 +42,6 @@
 import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.installations.InstallationTokenResult;
-import com.google.firebase.messaging.shadows.ShadowGoogleSignatureVerifier;
 import com.google.firebase.messaging.shadows.ShadowPreconditions;
 import com.google.firebase.messaging.testing.Bundles;
 import com.google.firebase.messaging.testing.LibraryVersion;
@@ -60,7 +61,7 @@
 
 /** Robolectric test for the GmsRpcRoboTest. */
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowGoogleSignatureVerifier.class, ShadowPreconditions.class})
+@Config(shadows = {ShadowPreconditions.class})
 public class GmsRpcRoboTest {
 
   private static final int TIMEOUT_S = 5;
@@ -243,6 +244,27 @@ public void testUnsubscribeFromToken_propagatesIoException() {
     testPropagatesIoException(() -> gmsRpc.unsubscribeFromTopic("cachedToken", "topic"));
   }
 
+  @Test
+  public void setRetainProxiedNotifications() {
+    when(internalRpc.setRetainProxiedNotifications(anyBoolean())).thenReturn(Tasks.forResult(null));
+
+    Task<Void> resultTask = gmsRpc.setRetainProxiedNotifications(true);
+
+    assertThat(resultTask.isSuccessful()).isTrue();
+    verify(internalRpc).setRetainProxiedNotifications(true);
+  }
+
+  @Test
+  public void getProxyNotificationData() {
+    CloudMessage proxyData = new CloudMessage(new Intent());
+    when(internalRpc.getProxiedNotificationData()).thenReturn(Tasks.forResult(proxyData));
+
+    Task<CloudMessage> resultTask = gmsRpc.getProxyNotificationData();
+
+    assertThat(resultTask.isSuccessful()).isTrue();
+    assertThat(resultTask.getResult()).isEqualTo(proxyData);
+  }
+
   @Test
   public void testClientVersionReadsLibraryVersion() throws Exception {
     doReturn(createUnregistrationResponse()).when(internalRpc).send(nullable(Bundle.class));
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/ImageDownloadRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/ImageDownloadRoboTest.java
index bc4f07106e4..b5b910e5729 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/ImageDownloadRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/ImageDownloadRoboTest.java
@@ -22,6 +22,7 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.messaging.shadows.ShadowPreconditions;
+import com.google.firebase.messaging.test.R;
 import com.google.firebase.messaging.testing.TestImageServer;
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/MessagingAnalyticsRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/MessagingAnalyticsRoboTest.java
index d0db7a07f85..8304f5d52c5 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/MessagingAnalyticsRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/MessagingAnalyticsRoboTest.java
@@ -86,6 +86,8 @@ public class MessagingAnalyticsRoboTest {
   private static final String MANIFEST_DELIVERY_METRICS_EXPORT_TO_BIG_QUERY_ENABLED =
       "delivery_metrics_exported_to_big_query_enabled";
 
+  private static final int DEFAULT_PRODUCT_ID = 111881503;
+
   private Context context;
 
   @Before
@@ -105,6 +107,9 @@ public void setUp() {
 
     // Create and Initialize Firelog service components
     context = ApplicationProvider.getApplicationContext();
+
+    // Reset sharedpreferences for bigquery delivery metrics export before every test.
+    resetPreferencesField(DELIVERY_METRICS_EXPORT_TO_BIG_QUERY_PREF);
   }
 
   /** If the developer didn't include Analytics and Firelog, we should not crash. */
@@ -331,6 +336,13 @@ public void testShouldExportDeliveryMetricsToBigQuery_falseManifestTrueSetter()
     assertPreferencesFieldWithValue(DELIVERY_METRICS_EXPORT_TO_BIG_QUERY_PREF, true);
   }
 
+  private void resetPreferencesField(String field) {
+    SharedPreferences preferences =
+        context.getSharedPreferences(FCM_PREFERENCES, Context.MODE_PRIVATE);
+
+    preferences.edit().remove(field).apply();
+  }
+
   private void assertPreferencesFieldWithValue(String field, Boolean expectedValue) {
     SharedPreferences preferences =
         context.getSharedPreferences(FCM_PREFERENCES, Context.MODE_PRIVATE);
@@ -1047,7 +1059,40 @@ public void testEventToProto_fullSampleDirectedMessage() {
   public void testLogNotificationReceived() throws Exception {
     MessagingAnalytics.setDeliveryMetricsExportToBigQuery(true);
     FakeFirelogTransport<MessagingClientEventExtension> transport = new FakeFirelogTransport<>();
-    FirebaseMessaging.transportFactory = new FakeFirelogTransportFactory(transport);
+    FirebaseMessaging.transportFactory = () -> new FakeFirelogTransportFactory(transport);
+
+    Bundle b = new Bundle();
+    b.putString(MessagePayloadKeys.TTL, "22223");
+    b.putString(MessagePayloadKeys.TO, "some_installation_id");
+    b.putString(MessagePayloadKeys.FROM, "/topics/my cool topic");
+    b.putString(MessageNotificationKeys.ENABLE_NOTIFICATION, "1");
+    b.putString(MessagePayloadKeys.MSGID, "an id!!!");
+    b.putString(MessagePayloadKeys.DELIVERED_PRIORITY, "high");
+    b.putString(MessagePayloadKeys.SENDER_ID, "100101010");
+    b.putString(AnalyticsKeys.COMPOSER_LABEL, "composer label!");
+    b.putString(AnalyticsKeys.MESSAGE_LABEL, "message label!");
+    b.putString(MessagePayloadKeys.COLLAPSE_KEY, "collapse key");
+    Intent intent = new Intent().putExtras(b);
+    MessagingAnalytics.logNotificationReceived(intent);
+
+    Event<MessagingClientEventExtension> event = transport.eventQueue.poll();
+    MessagingClientEventExtension gotEvent = event.getPayload();
+    MessagingClientEventExtension wantEvent =
+        MessagingClientEventExtension.newBuilder()
+            .setMessagingClientEvent(
+                MessagingAnalytics.eventToProto(
+                    MessagingClientEvent.Event.MESSAGE_DELIVERED, intent))
+            .build();
+    assertThat(gotEvent.toByteArray()).isEqualTo(wantEvent.toByteArray());
+    assertThat(event.getProductData()).isNotNull();
+    assertThat(event.getProductData().getProductId()).isEqualTo(DEFAULT_PRODUCT_ID);
+  }
+
+  @Test
+  public void testLogNotificationReceived_withProductId() {
+    MessagingAnalytics.setDeliveryMetricsExportToBigQuery(true);
+    FakeFirelogTransport<MessagingClientEventExtension> transport = new FakeFirelogTransport<>();
+    FirebaseMessaging.transportFactory = () -> new FakeFirelogTransportFactory(transport);
 
     Bundle b = new Bundle();
     b.putString(MessagePayloadKeys.TTL, "22223");
@@ -1060,10 +1105,12 @@ public void testLogNotificationReceived() throws Exception {
     b.putString(AnalyticsKeys.COMPOSER_LABEL, "composer label!");
     b.putString(AnalyticsKeys.MESSAGE_LABEL, "message label!");
     b.putString(MessagePayloadKeys.COLLAPSE_KEY, "collapse key");
+    b.putInt(MessagePayloadKeys.PRODUCT_ID, 12345);
     Intent intent = new Intent().putExtras(b);
     MessagingAnalytics.logNotificationReceived(intent);
 
-    MessagingClientEventExtension gotEvent = transport.eventQueue.poll().getPayload();
+    Event<MessagingClientEventExtension> event = transport.eventQueue.poll();
+    MessagingClientEventExtension gotEvent = event.getPayload();
     MessagingClientEventExtension wantEvent =
         MessagingClientEventExtension.newBuilder()
             .setMessagingClientEvent(
@@ -1071,13 +1118,15 @@ public void testLogNotificationReceived() throws Exception {
                     MessagingClientEvent.Event.MESSAGE_DELIVERED, intent))
             .build();
     assertThat(gotEvent.toByteArray()).isEqualTo(wantEvent.toByteArray());
+    assertThat(event.getProductData()).isNotNull();
+    assertThat(event.getProductData().getProductId()).isEqualTo(12345);
   }
 
   @Test
   public void testLogNotificationReceived_bigQueryExportDisabled() throws Exception {
     MessagingAnalytics.setDeliveryMetricsExportToBigQuery(false);
     FakeFirelogTransport<MessagingClientEventExtension> transport = new FakeFirelogTransport<>();
-    FirebaseMessaging.transportFactory = new FakeFirelogTransportFactory(transport);
+    FirebaseMessaging.transportFactory = () -> new FakeFirelogTransportFactory(transport);
 
     Bundle b = new Bundle();
     b.putString(MessagePayloadKeys.TTL, "22223");
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/MessagingTests.kt b/firebase-messaging/src/test/java/com/google/firebase/messaging/MessagingTests.kt
new file mode 100644
index 00000000000..d854383dc18
--- /dev/null
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/MessagingTests.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.messaging
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class MessagingTests : BaseTestCase() {
+
+  @Test
+  fun `messaging should delegate to FirebaseMessaging#getInstance()`() {
+    assertThat(Firebase.messaging).isSameInstanceAs(FirebaseMessaging.getInstance())
+  }
+
+  @Test
+  fun `remoteMessage() should produce correct RemoteMessages`() {
+    val recipient = "recipient"
+    val expectedCollapseKey = "collapse"
+    val msgId = "id"
+    val msgType = "type"
+    val timeToLive = 100
+    val remoteMessage =
+      remoteMessage(recipient) {
+        collapseKey = expectedCollapseKey
+        messageId = msgId
+        messageType = msgType
+        ttl = timeToLive
+        addData("hello", "world")
+      }
+    assertThat(remoteMessage.to).isEqualTo(recipient)
+    assertThat(remoteMessage.collapseKey).isEqualTo(expectedCollapseKey)
+    assertThat(remoteMessage.messageId).isEqualTo(msgId)
+    assertThat(remoteMessage.messageType).isEqualTo(msgType)
+    assertThat(remoteMessage.data).isEqualTo(mapOf("hello" to "world"))
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/ProxyNotificationPreferencesRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/ProxyNotificationPreferencesRoboTest.java
new file mode 100644
index 00000000000..0da453079b8
--- /dev/null
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/ProxyNotificationPreferencesRoboTest.java
@@ -0,0 +1,84 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.messaging;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Build.VERSION_CODES;
+import androidx.test.core.app.ApplicationProvider;
+import com.google.android.gms.tasks.Tasks;
+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;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Robolectric tests for ProxyNotificationPreferences. */
+@RunWith(RobolectricTestRunner.class)
+public class ProxyNotificationPreferencesRoboTest {
+
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
+
+  private Context context;
+  @Mock private GmsRpc mockGmsRpc;
+
+  @Before
+  public void setUp() {
+    context = ApplicationProvider.getApplicationContext();
+    when(mockGmsRpc.setRetainProxiedNotifications(anyBoolean())).thenReturn(Tasks.forResult(null));
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  public void setProxyRetention() {
+    ProxyNotificationPreferences.setProxyRetention(context, mockGmsRpc, true);
+
+    verify(mockGmsRpc).setRetainProxiedNotifications(true);
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  public void setProxyRetention_sameTwiceSetOnce() {
+    ProxyNotificationPreferences.setProxyRetention(context, mockGmsRpc, true);
+    ProxyNotificationPreferences.setProxyRetention(context, mockGmsRpc, true);
+
+    verify(mockGmsRpc).setRetainProxiedNotifications(true);
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.Q)
+  public void setProxyRetention_differentChanges() {
+    ProxyNotificationPreferences.setProxyRetention(context, mockGmsRpc, true);
+    ProxyNotificationPreferences.setProxyRetention(context, mockGmsRpc, false);
+
+    verify(mockGmsRpc).setRetainProxiedNotifications(true);
+    verify(mockGmsRpc).setRetainProxiedNotifications(false);
+  }
+
+  @Test
+  @Config(sdk = VERSION_CODES.P)
+  public void setProxyRetention_preQ() {
+    ProxyNotificationPreferences.setProxyRetention(context, mockGmsRpc, true);
+
+    verify(mockGmsRpc, never()).setRetainProxiedNotifications(anyBoolean());
+  }
+}
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/TopicsStoreRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/TopicsStoreRoboTest.java
index bcfac3e2a40..d9ddea6c523 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/TopicsStoreRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/TopicsStoreRoboTest.java
@@ -21,7 +21,6 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import androidx.test.core.app.ApplicationProvider;
-import com.google.firebase.messaging.shadows.ShadowPreconditions;
 import com.google.firebase.messaging.testing.FakeScheduledExecutorService;
 import java.util.Arrays;
 import java.util.List;
@@ -29,10 +28,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowPreconditions.class)
 public class TopicsStoreRoboTest {
 
   private TopicsStore store;
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/WakeLockHolderRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/WakeLockHolderRoboTest.java
index f2605f820af..3600c6ee8fc 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/WakeLockHolderRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/WakeLockHolderRoboTest.java
@@ -14,15 +14,20 @@
 package com.google.firebase.messaging;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import android.app.Application;
 import android.content.Intent;
 import android.os.PowerManager.WakeLock;
 import androidx.test.core.app.ApplicationProvider;
+import com.google.android.gms.tasks.TaskCompletionSource;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowLooper;
 import org.robolectric.shadows.ShadowPowerManager;
 
 @RunWith(RobolectricTestRunner.class)
@@ -51,6 +56,32 @@ public void testStartWakefulService_AcquiresWakeLock() throws Exception {
     assertThat(ShadowPowerManager.getLatestWakeLock().isHeld()).isTrue();
   }
 
+  @Test
+  public void testSendWakefulServiceIntent_AcquiresWakeLock() {
+    TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
+    WithinAppServiceConnection mockConnection = mock(WithinAppServiceConnection.class);
+    when(mockConnection.sendIntent(any(Intent.class))).thenReturn(taskCompletionSource.getTask());
+    WakeLockHolder.sendWakefulServiceIntent(context, mockConnection, new Intent());
+
+    assertThat(ShadowPowerManager.getLatestWakeLock()).isNotNull();
+    assertThat(ShadowPowerManager.getLatestWakeLock().isHeld()).isTrue();
+  }
+
+  @Test
+  public void testSendWakefulServiceIntent_ReleasesWakeLock() {
+    TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
+    WithinAppServiceConnection mockConnection = mock(WithinAppServiceConnection.class);
+    when(mockConnection.sendIntent(any(Intent.class))).thenReturn(taskCompletionSource.getTask());
+    WakeLockHolder.sendWakefulServiceIntent(context, mockConnection, new Intent());
+
+    // Verify that the WakeLock is released once the Intent has been handled by the Service.
+    WakeLock wakeLock = ShadowPowerManager.getLatestWakeLock();
+    taskCompletionSource.setResult(null);
+
+    ShadowLooper.idleMainLooper();
+    assertThat(wakeLock.isHeld()).isFalse();
+  }
+
   @Test
   public void testCompleteWakefulIntent_ReleasesWakeLockIfPresent() throws Exception {
     Intent intent = newIntent("Any_Action");
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/WithinAppServiceConnectionRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/WithinAppServiceConnectionRoboTest.java
index 3fd8053be1b..b28db5f5431 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/WithinAppServiceConnectionRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/WithinAppServiceConnectionRoboTest.java
@@ -44,7 +44,7 @@ public class WithinAppServiceConnectionRoboTest {
   private static final String TEST_BIND_ACTION = "testBindAction";
 
   // The amount of time that a broadcast receiver takes to time out
-  private static final long RECEIVER_TIMEOUT_S = 10;
+  private static final long RECEIVER_TIMEOUT_S = 20;
 
   private Application context;
   private FakeScheduledExecutorService fakeExecutor;
@@ -66,9 +66,9 @@ public void testReceiverTimesOut() {
     Task<Void> pendingResult = connection.sendIntent(new Intent());
     assertThat(pendingResult.isComplete()).isFalse();
 
-    // Check the runnable doesn't run early, and that after it shuld have run the pending
+    // Check the runnable doesn't run early, and that after it should have run the pending
     // result is finished.
-    fakeExecutor.simulateNormalOperationFor(RECEIVER_TIMEOUT_S - 2, TimeUnit.SECONDS);
+    fakeExecutor.simulateNormalOperationFor(RECEIVER_TIMEOUT_S - 1, TimeUnit.SECONDS);
     assertThat(pendingResult.isComplete()).isFalse();
     fakeExecutor.simulateNormalOperationFor(1, TimeUnit.SECONDS);
     assertThat(pendingResult.isComplete()).isTrue();
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/ktx/MessagingTests.kt b/firebase-messaging/src/test/java/com/google/firebase/messaging/ktx/MessagingTests.kt
new file mode 100644
index 00000000000..66f105ed7be
--- /dev/null
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/ktx/MessagingTests.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.messaging.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.messaging.FirebaseMessaging
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class MessagingTests : BaseTestCase() {
+
+  @Test
+  fun `messaging should delegate to FirebaseMessaging#getInstance()`() {
+    assertThat(Firebase.messaging).isSameInstanceAs(FirebaseMessaging.getInstance())
+  }
+
+  @Test
+  fun `remoteMessage() should produce correct RemoteMessages`() {
+    val recipient = "recipient"
+    val expectedCollapseKey = "collapse"
+    val msgId = "id"
+    val msgType = "type"
+    val timeToLive = 100
+    val remoteMessage =
+      remoteMessage(recipient) {
+        collapseKey = expectedCollapseKey
+        messageId = msgId
+        messageType = msgType
+        ttl = timeToLive
+        addData("hello", "world")
+      }
+    assertThat(remoteMessage.to).isEqualTo(recipient)
+    assertThat(remoteMessage.collapseKey).isEqualTo(expectedCollapseKey)
+    assertThat(remoteMessage.messageId).isEqualTo(msgId)
+    assertThat(remoteMessage.messageType).isEqualTo(msgType)
+    assertThat(remoteMessage.data).isEqualTo(mapOf("hello" to "world"))
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-messaging/src/main/res/drawable-v26/adaptive_icon.xml b/firebase-messaging/src/test/res/drawable-v26/adaptive_icon.xml
similarity index 100%
rename from firebase-messaging/src/main/res/drawable-v26/adaptive_icon.xml
rename to firebase-messaging/src/test/res/drawable-v26/adaptive_icon.xml
diff --git a/firebase-messaging/src/main/res/drawable/adaptive_icon_background.xml b/firebase-messaging/src/test/res/drawable/adaptive_icon_background.xml
similarity index 100%
rename from firebase-messaging/src/main/res/drawable/adaptive_icon_background.xml
rename to firebase-messaging/src/test/res/drawable/adaptive_icon_background.xml
diff --git a/firebase-messaging/src/main/res/drawable/adaptive_icon_foreground.xml b/firebase-messaging/src/test/res/drawable/adaptive_icon_foreground.xml
similarity index 100%
rename from firebase-messaging/src/main/res/drawable/adaptive_icon_foreground.xml
rename to firebase-messaging/src/test/res/drawable/adaptive_icon_foreground.xml
diff --git a/firebase-messaging/src/main/res/drawable/gcm_icon.png b/firebase-messaging/src/test/res/drawable/gcm_icon.png
similarity index 100%
rename from firebase-messaging/src/main/res/drawable/gcm_icon.png
rename to firebase-messaging/src/test/res/drawable/gcm_icon.png
diff --git a/firebase-messaging/src/main/res/drawable/gcm_icon2.png b/firebase-messaging/src/test/res/drawable/gcm_icon2.png
similarity index 100%
rename from firebase-messaging/src/main/res/drawable/gcm_icon2.png
rename to firebase-messaging/src/test/res/drawable/gcm_icon2.png
diff --git a/firebase-messaging/src/main/res/drawable/icon_with_gradient.xml b/firebase-messaging/src/test/res/drawable/icon_with_gradient.xml
similarity index 100%
rename from firebase-messaging/src/main/res/drawable/icon_with_gradient.xml
rename to firebase-messaging/src/test/res/drawable/icon_with_gradient.xml
diff --git a/firebase-messaging/src/main/res/raw/gcm_bip.mp3 b/firebase-messaging/src/test/res/raw/gcm_bip.mp3
similarity index 100%
rename from firebase-messaging/src/main/res/raw/gcm_bip.mp3
rename to firebase-messaging/src/test/res/raw/gcm_bip.mp3
diff --git a/firebase-messaging/src/test/res/values/strings.xml b/firebase-messaging/src/test/res/values/strings.xml
new file mode 100644
index 00000000000..7cf1f5310e6
--- /dev/null
+++ b/firebase-messaging/src/test/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="fcm_no_args">String with no arguments</string>
+    <string name="fcm_2_args">First: %1$s and second %2$s</string>
+    <color name="fcm_test_color">#4285F4</color>
+</resources>
diff --git a/firebase-messaging/src/test/resources/robolectric.properties b/firebase-messaging/src/test/resources/robolectric.properties
index 6c72f5a6d85..8bfbb3c5552 100644
--- a/firebase-messaging/src/test/resources/robolectric.properties
+++ b/firebase-messaging/src/test/resources/robolectric.properties
@@ -1 +1 @@
-sdk=19
\ No newline at end of file
+sdk=21
diff --git a/firebase-ml-modeldownloader/CHANGELOG.md b/firebase-ml-modeldownloader/CHANGELOG.md
new file mode 100644
index 00000000000..69be9eb9857
--- /dev/null
+++ b/firebase-ml-modeldownloader/CHANGELOG.md
@@ -0,0 +1,189 @@
+# Unreleased
+
+
+# 25.0.0
+* [changed] Bump internal dependencies
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-ml-modeldownloader` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.2.3
+* [changed] Bump internal dependencies.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-ml-modeldownloader` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.2.2
+* [fixed] Fixed `SecurityException` where the `RECEIVER_EXPORTED` or `RECEIVER_NOT_EXPORTED` flag should be 
+  specified when registerReceiver is being used. [#5597](https://github.com/firebase/firebase-android-sdk/pull/5597)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-ml-modeldownloader` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.2.1
+* [changed] Internal infrastructure improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-ml-modeldownloader` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.2.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-ml-modeldownloader-ktx`
+  to `com.google.firebase:firebase-ml-modeldownloader` under the `com.google.firebase.ml.modeldownloader` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-ml-modeldownloader-ktx` have been added to
+  `com.google.firebase:firebase-ml-modeldownloader` under the `com.google.firebase.ml.modeldownloader` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-ml-modeldownloader-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-ml-modeldownloader` library. The Kotlin extensions library has no additional
+updates.
+
+# 24.1.3
+* [unchanged] Updated internal Dagger dependency.
+* [fixed] Updated the third-party license file to include Dagger's license.
+
+# 24.1.2
+* [changed] Internal infrastructure improvements.
+* [changed] Migrated [firebase_ml] to use standard Firebase executors.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-ml-modeldownloader` library. The Kotlin extensions library has no
+additional updates.
+
+# 24.1.1
+* [fixed] Fixed an issue where `FirebaseModelDownloader.getModel` was throwing
+  `FirebaseMlException.PERMISSION_DENIED` when the model name was empty. It now
+  throws `FirebaseMlException.INVALID_ARGUMENT`
+  (#4157)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-ml-modeldownloader` library. The Kotlin extensions library has no
+additional updates.
+
+# 24.1.0
+* [unchanged] Updated to accommodate the release of the updated
+  [firebase_ml] Kotlin extensions library.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+  `firebase-ml-modeldownloader` library. The Kotlin extensions library has the
+  following additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-ml-modeldownloader-ktx` as a transitive dependency, which
+   exposes the `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+
+# 24.0.5
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-ml-modeldownloader` library. The Kotlin extensions library has no
+additional updates.
+
+# 24.0.4
+* [fixed] Fixed a race condition that was caused when differently sized
+  models were concurrently downloaded using this SDK and the Model Downloader from
+  the `com.google.firebase:firebase-ml-common` SDK.
+  (#3321)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-ml-modeldownloader` library. The Kotlin extensions library has no
+additional updates.
+
+# 24.0.3
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-ml-modeldownloader` library. The Kotlin extensions library has no
+additional updates.
+
+# 24.0.2
+* [fixed] Fixed an issue where `FirebaseModelDownloader.getInstance` would
+  crash when using non-default FirebaseApp instances.
+  (#3321)
+* [changed] Updated to the latest version of the `firebase-datatransport`
+  library.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-ml-modeldownloader` library. The Kotlin extensions library has no
+additional updates.
+
+# 24.0.1
+* [fixed] Added support for Android API key restrictions.
+
+# 24.0.0
+* [changed] Internal infrastructure improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-ml-modeldownloader` library. The Kotlin extensions library has no
+additional updates.
+
+# 23.0.1
+* [unchanged] Updated to accommodate the release of the [firebase_ml]
+  Kotlin extensions library.
+
+
+## Kotlin
+* [feature] The beta release of a [firebase_ml] Android library with
+  Kotlin extensions is now available. The Kotlin extensions library transitively
+  includes the base `firebase-ml-model-downloader` library. To learn more,
+  visit the
+  [[firebase_ml] KTX documentation](/docs/reference/android/com/google/firebase/ml/modeldownloader/package-summary).
+
+# 23.0.0
+This release includes the initial beta release of the
+[firebase_ml] Model Downloader SDK.
+
+The [firebase_ml] Model Downloader SDK provides APIs for downloading models
+hosted with [[firebase_ml] Custom Model Hosting](/docs/ml/use-custom-models).
+This SDK is a lightweight version of the ML Kit Custom Models library
+(`firebase-ml-model-interpreter`), allowing you to work with custom hosted
+models without the interpreter API, which is now provided directly by TFLite
+runtime.
+
+* [feature] Added custom hosted model download and on-device management
+  capabilities.
+* [feature] Added ability to get the model download ID, which allows progress
+  tracking of file downloads.
+
diff --git a/firebase-ml-modeldownloader/api.txt b/firebase-ml-modeldownloader/api.txt
index d1e6d62b365..5d4d7395a5f 100644
--- a/firebase-ml-modeldownloader/api.txt
+++ b/firebase-ml-modeldownloader/api.txt
@@ -65,5 +65,31 @@ package com.google.firebase.ml.modeldownloader {
     method public void setModelDownloaderCollectionEnabled(@Nullable Boolean);
   }
 
+  public final class ModelDownloaderKt {
+    method @Nullable public static operator java.io.File component1(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static operator long component2(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static operator long component3(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
+    method @NonNull public static operator String component4(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
+    method @NonNull public static operator String component5(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
+    method @NonNull public static com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions customModelDownloadConditions(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions.Builder,kotlin.Unit> init);
+    method @NonNull public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader getModelDownloader(@NonNull com.google.firebase.Firebase);
+    method @NonNull public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader modelDownloader(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+  }
+
+}
+
+package com.google.firebase.ml.modeldownloader.ktx {
+
+  public final class ModelDownloaderKt {
+    method @Nullable public static operator java.io.File component1(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static operator long component2(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
+    method public static operator long component3(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
+    method @NonNull public static operator String component4(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
+    method @NonNull public static operator String component5(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
+    method @Deprecated @NonNull public static com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions customModelDownloadConditions(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions.Builder,kotlin.Unit> init);
+    method @Deprecated @NonNull public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader getModelDownloader(@NonNull com.google.firebase.ktx.Firebase);
+    method @Deprecated @NonNull public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader modelDownloader(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+  }
+
 }
 
diff --git a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
index efdc6e389c8..d3ab75b5a22 100644
--- a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
+++ b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
@@ -14,10 +14,14 @@
 
 plugins {
     id 'firebase-library'
+    id("kotlin-android")
+    id 'firebase-vendor'
     id 'com.google.protobuf'
+    id("copy-google-services")
 }
 
 firebaseLibrary {
+    libraryGroup "ml-modeldownloader"
     testLab.enabled = true
     publishJavadoc = true
 }
@@ -31,17 +35,18 @@ protobuf {
     generateProtoTasks {
         all().each { task ->
             task.builtins {
-                java { }
+                java {}
             }
         }
     }
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.ml.modeldownloader"
+    compileSdkVersion project.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         multiDexEnabled true
         versionName version
@@ -51,57 +56,79 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions { jvmTarget = "1.8" }
     testOptions {
         unitTests {
             includeAndroidResources = true
         }
+
+        unitTests.all {
+            jvmArgs '--add-opens=java.base/java.io=ALL-UNNAMED'
+        }
+    }
+    lint {
+        baseline = file("lint-baseline.xml")
     }
 }
 
-dependencies {
-    implementation project(':encoders:firebase-encoders')
-    implementation project(':encoders:firebase-encoders-json')
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-datatransport')
-    implementation project(':firebase-installations-interop')
-    implementation project(':transport:transport-api')
-    implementation project(':transport:transport-runtime')
-    runtimeOnly project(':firebase-installations')
+thirdPartyLicenses {
+    add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"
+}
 
+dependencies {
     javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
 
+    vendor (libs.dagger.dagger) {
+         exclude group: "javax.inject", module: "javax.inject"
+     }
+
+    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api 'com.google.firebase:firebase-annotations:16.2.0'
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
+    api('com.google.firebase:firebase-datatransport:18.2.0'){
+         exclude group: 'com.google.firebase', module: 'firebase-common'
+         exclude group: 'com.google.firebase', module: 'firebase-components'
+     }
+    api 'com.google.firebase:firebase-encoders:17.0.0'
+    api 'com.google.firebase:firebase-encoders-json:18.0.0'
+    api("com.google.firebase:firebase-installations:17.2.0")
+    api 'com.google.firebase:firebase-installations-interop:17.1.0'
+
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation 'com.google.auto.service:auto-service-annotations:1.0-rc6'
+    implementation 'com.google.android.datatransport:transport-api:3.0.0'
+    implementation 'com.google.android.datatransport:transport-runtime:3.1.8'
+    implementation 'com.google.auto.service:auto-service-annotations:1.0.1'
     implementation 'javax.inject:javax.inject:1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
     compileOnly "com.google.auto.value:auto-value-annotations:1.6.6"
-    annotationProcessor "com.google.auto.value:auto-value:1.6.5"
+
     annotationProcessor project(":encoders:firebase-encoders-processor")
+    annotationProcessor "com.google.auto.value:auto-value:1.6.5"
+    annotationProcessor libs.dagger.compiler
 
-    testImplementation 'androidx.test:core:1.3.0'
+    testImplementation(project(":integ-testing")) {
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation 'androidx.test:runner:1.5.1'
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     testImplementation 'com.github.tomakehurst:wiremock-standalone:2.26.3'
+    testImplementation "com.google.protobuf:protobuf-java-util:$protobufJavaUtilVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0'
-    testImplementation 'com.google.protobuf:protobuf-java-util:3.11.0'
     testImplementation 'junit:junit:4.13-beta-2'
-
-    //Android compatible version of Apache httpclient.
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation 'org.mockito:mockito-core:5.2.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 
-    androidTestImplementation 'junit:junit:4.13.1'
     androidTestImplementation "androidx.annotation:annotation:1.1.0"
     androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'junit:junit:4.13.1'
 }
-
-// ==========================================================================
-// Copy from here down if you want to use the google-services plugin in your
-// androidTest integration tests.
-// ==========================================================================
-ext.packageName = "com.google.firebase.ml.modeldownloader"
-apply from: '../gradle/googleServices.gradle'
diff --git a/firebase-ml-modeldownloader/gradle.properties b/firebase-ml-modeldownloader/gradle.properties
index ccb54dd12e8..833aa95e6e3 100644
--- a/firebase-ml-modeldownloader/gradle.properties
+++ b/firebase-ml-modeldownloader/gradle.properties
@@ -1 +1,2 @@
-version=24.0.3
+version=25.0.1
+latestReleasedVersion=25.0.0
diff --git a/firebase-ml-modeldownloader/ktx/api.txt b/firebase-ml-modeldownloader/ktx/api.txt
index c91a559110e..97f07ed6300 100644
--- a/firebase-ml-modeldownloader/ktx/api.txt
+++ b/firebase-ml-modeldownloader/ktx/api.txt
@@ -1,16 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.ml.modeldownloader.ktx {
 
-  public final class ModelDownloaderKt {
-    ctor public ModelDownloaderKt();
-    method @Nullable public static operator java.io.File component1(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
-    method public static operator long component2(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
-    method public static operator long component3(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
-    method @NonNull public static operator String component4(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
-    method @NonNull public static operator String component5(@NonNull com.google.firebase.ml.modeldownloader.CustomModel);
-    method @NonNull public static com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions customModelDownloadConditions(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions.Builder,kotlin.Unit> init);
-    method @NonNull public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader getModelDownloader(@NonNull com.google.firebase.ktx.Firebase);
-    method @NonNull public static com.google.firebase.ml.modeldownloader.FirebaseModelDownloader modelDownloader(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-ml-modeldownloader/ktx/ktx.gradle b/firebase-ml-modeldownloader/ktx/ktx.gradle
index ddac1aa8f02..2336a2ea473 100644
--- a/firebase-ml-modeldownloader/ktx/ktx.gradle
+++ b/firebase-ml-modeldownloader/ktx/ktx.gradle
@@ -14,20 +14,22 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-ml-modeldownloader')
-    publishJavadoc = true
+    libraryGroup "ml-modeldownloader"
+    publishJavadoc = false
+    publishReleaseNotes = false
     publishSources = true
     testLab.enabled = false
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.ml.modeldownloader.ktx"    
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
@@ -41,14 +43,16 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api(project(":firebase-ml-modeldownloader"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
 
-    implementation project(':firebase-common')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-components')
-    implementation project(':firebase-ml-modeldownloader')
+    implementation("com.google.firebase:firebase-components:18.0.0")
 
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'androidx.test:runner:1.5.1'
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:3.6.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
diff --git a/firebase-ml-modeldownloader/ktx/src/main/AndroidManifest.xml b/firebase-ml-modeldownloader/ktx/src/main/AndroidManifest.xml
index 52ec9d438dd..105842d8ac4 100644
--- a/firebase-ml-modeldownloader/ktx/src/main/AndroidManifest.xml
+++ b/firebase-ml-modeldownloader/ktx/src/main/AndroidManifest.xml
@@ -12,15 +12,13 @@
 <!-- WITHOUT 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="com.google.firebase.ml.modeldownloader.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <application>
         <service android:exported="false"
             android:name="com.google.firebase.components.ComponentDiscoveryService">
             <meta-data
-                android:name="com.google.firebase.components:com.google.firebase.ml.modeldownloader.ktx.FirebaseMlModelDownloaderKtxRegistrar"
+                android:name="com.google.firebase.components:com.google.firebase.ml.modeldownloader.ktx.FirebaseMlModeldownloaderLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
-</manifest>
-
+</manifest>
\ No newline at end of file
diff --git a/firebase-ml-modeldownloader/ktx/src/main/kotlin/com/google/firebase/ml/modeldownloader/ktx/Logging.kt b/firebase-ml-modeldownloader/ktx/src/main/kotlin/com/google/firebase/ml/modeldownloader/ktx/Logging.kt
new file mode 100644
index 00000000000..faaace93f22
--- /dev/null
+++ b/firebase-ml-modeldownloader/ktx/src/main/kotlin/com/google/firebase/ml/modeldownloader/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.ml.modeldownloader.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.ml.modeldownloader.BuildConfig
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "firebase-ml-modeldownloader-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseMlModeldownloaderLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-ml-modeldownloader/ktx/src/main/kotlin/com/google/firebase/ml/modeldownloader/ktx/ModelDownloader.kt b/firebase-ml-modeldownloader/ktx/src/main/kotlin/com/google/firebase/ml/modeldownloader/ktx/ModelDownloader.kt
deleted file mode 100644
index aad6f58d1cd..00000000000
--- a/firebase-ml-modeldownloader/ktx/src/main/kotlin/com/google/firebase/ml/modeldownloader/ktx/ModelDownloader.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.ml.modeldownloader.ktx
-
-import com.google.firebase.FirebaseApp
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.ml.modeldownloader.CustomModel
-import com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions
-import com.google.firebase.ml.modeldownloader.FirebaseModelDownloader
-import com.google.firebase.platforminfo.LibraryVersionComponent
-import java.io.File
-
-internal const val LIBRARY_NAME: String = "firebase-ml-modeldownloader-ktx"
-
-/** Returns the [FirebaseModelDownloader] instance of the default [FirebaseApp]. */
-val Firebase.modelDownloader: FirebaseModelDownloader
-    get() = FirebaseModelDownloader.getInstance()
-
-/** Returns the [FirebaseModelDownloader] instance of a given [FirebaseApp]. */
-fun Firebase.modelDownloader(app: FirebaseApp) = FirebaseModelDownloader.getInstance(app)
-
-/** Returns a [CustomModelDownloadConditions] initialized using the [init] function. */
-fun customModelDownloadConditions(
-    init: CustomModelDownloadConditions.Builder.() -> Unit
-): CustomModelDownloadConditions {
-    val builder = CustomModelDownloadConditions.Builder()
-    builder.init()
-    return builder.build()
-}
-
-operator fun CustomModel.component1(): File? = file
-
-operator fun CustomModel.component2() = size
-
-operator fun CustomModel.component3() = downloadId
-
-operator fun CustomModel.component4() = modelHash
-
-operator fun CustomModel.component5() = name
-
-/** @suppress */
-class FirebaseMlModelDownloaderKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-ml-modeldownloader/ktx/src/test/kotlin/com/google/firebase/ml/modeldownloader/ktx/ModelDownloaderTests.kt b/firebase-ml-modeldownloader/ktx/src/test/kotlin/com/google/firebase/ml/modeldownloader/ktx/ModelDownloaderTests.kt
index 7e3a6ee1049..775d599b106 100644
--- a/firebase-ml-modeldownloader/ktx/src/test/kotlin/com/google/firebase/ml/modeldownloader/ktx/ModelDownloaderTests.kt
+++ b/firebase-ml-modeldownloader/ktx/src/test/kotlin/com/google/firebase/ml/modeldownloader/ktx/ModelDownloaderTests.kt
@@ -1,26 +1,29 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.ml.modeldownloader.ktx
 
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
 import com.google.firebase.FirebaseOptions
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.ktx.app
 import com.google.firebase.ktx.initialize
-import com.google.firebase.ml.modeldownloader.CustomModel
 import com.google.firebase.ml.modeldownloader.FirebaseModelDownloader
 import com.google.firebase.platforminfo.UserAgentPublisher
 import org.junit.After
@@ -28,7 +31,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.RuntimeEnvironment
 
 const val APP_ID = "1:1234567890:android:321abc456def7890"
 const val API_KEY = "AIzaSyDOCAbC123dEf456GhI789jKl012-MnO"
@@ -36,83 +38,86 @@ const val API_KEY = "AIzaSyDOCAbC123dEf456GhI789jKl012-MnO"
 const val EXISTING_APP = "existing"
 
 abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                RuntimeEnvironment.application,
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
-        Firebase.initialize(
-                RuntimeEnvironment.application,
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build(),
-                EXISTING_APP
-        )
-    }
-
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
-@RunWith(RobolectricTestRunner::class)
+@RunWith(AndroidJUnit4::class)
 class ModelDownloaderTests : BaseTestCase() {
 
-    @Test
-    fun `modelDownloader should delegate to FirebaseModelDownloader#getInstance()`() {
-        assertThat(Firebase.modelDownloader).isSameInstanceAs(FirebaseModelDownloader.getInstance())
+  @Test
+  fun `modelDownloader should delegate to FirebaseModelDownloader#getInstance()`() {
+    assertThat(Firebase.modelDownloader).isSameInstanceAs(FirebaseModelDownloader.getInstance())
+  }
+
+  @Test
+  fun `Firebase#modelDownloader(FirebaseApp) should delegate to FirebaseModelDownloader#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.modelDownloader(app))
+      .isSameInstanceAs(FirebaseModelDownloader.getInstance(app))
+  }
+
+  @Test
+  fun `CustomModelDownloadConditions builder works`() {
+    val conditions = customModelDownloadConditions {
+      requireCharging()
+      requireDeviceIdle()
     }
 
-    @Test
-    fun `Firebase#modelDownloader(FirebaseApp) should delegate to FirebaseModelDownloader#getInstance(FirebaseApp)`() {
-        val app = Firebase.app(EXISTING_APP)
-        assertThat(Firebase.modelDownloader(app))
-                .isSameInstanceAs(FirebaseModelDownloader.getInstance(app))
-    }
+    assertThat(conditions.isChargingRequired).isEqualTo(true)
+    assertThat(conditions.isWifiRequired).isEqualTo(false)
+    assertThat(conditions.isDeviceIdleRequired).isEqualTo(true)
+  }
 
-    @Test
-    fun `CustomModelDownloadConditions builder works`() {
-        val conditions = customModelDownloadConditions {
-            requireCharging()
-            requireDeviceIdle()
-        }
+  @Test
+  fun `CustomModel destructuring declarations work`() {
+    val app = Firebase.app(EXISTING_APP)
 
-        assertThat(conditions.isChargingRequired).isEqualTo(true)
-        assertThat(conditions.isWifiRequired).isEqualTo(false)
-        assertThat(conditions.isDeviceIdleRequired).isEqualTo(true)
-    }
-
-    @Test
-    fun `CustomModel destructuring declarations work`() {
-        val modelName = "myModel"
-        val modelHash = "someHash"
-        val fileSize = 200L
-        val downloadId = 258L
+    val modelName = "myModel"
+    val modelHash = "someHash"
+    val fileSize = 200L
+    val downloadId = 258L
 
-        val customModel = CustomModel(modelName, modelHash, fileSize, downloadId)
+    val customModel =
+      Firebase.modelDownloader(app).modelFactory.create(modelName, modelHash, fileSize, downloadId)
 
-        val (file, size, id, hash, name) = customModel
+    val (_, size, id, hash, name) = customModel
 
-        assertThat(name).isEqualTo(customModel.name)
-        assertThat(hash).isEqualTo(customModel.modelHash)
-        assertThat(size).isEqualTo(customModel.size)
-        assertThat(id).isEqualTo(customModel.downloadId)
-    }
+    assertThat(name).isEqualTo(customModel.name)
+    assertThat(hash).isEqualTo(customModel.modelHash)
+    assertThat(size).isEqualTo(customModel.size)
+    assertThat(id).isEqualTo(customModel.downloadId)
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun `library version should be registered with runtime`() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
 }
diff --git a/firebase-ml-modeldownloader/lint-baseline.xml b/firebase-ml-modeldownloader/lint-baseline.xml
new file mode 100644
index 00000000000..5b5232cdef7
--- /dev/null
+++ b/firebase-ml-modeldownloader/lint-baseline.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 7.3.1" type="baseline" client="gradle" dependencies="false" name="AGP (7.3.1)" variant="all" version="7.3.1">
+
+    <issue
+        id="ApplySharedPref"
+        message="Consider using `apply()` instead; `commit` writes its data to persistent storage immediately, whereas `apply` will handle it in the background"
+        errorLine1="        .commit();"
+        errorLine2="         ~~~~~~~~">
+        <location
+            file="src/main/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtil.java"
+            line="164"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="ApplySharedPref"
+        message="Consider using `apply()` instead; `commit` writes its data to persistent storage immediately, whereas `apply` will handle it in the background"
+        errorLine1="        .commit();"
+        errorLine2="         ~~~~~~~~">
+        <location
+            file="src/main/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtil.java"
+            line="192"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="ApplySharedPref"
+        message="Consider using `apply()` instead; `commit` writes its data to persistent storage immediately, whereas `apply` will handle it in the background"
+        errorLine1="        .commit();"
+        errorLine2="         ~~~~~~~~">
+        <location
+            file="src/main/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtil.java"
+            line="226"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="ApplySharedPref"
+        message="Consider using `apply()` instead; `commit` writes its data to persistent storage immediately, whereas `apply` will handle it in the background"
+        errorLine1="          .commit();"
+        errorLine2="           ~~~~~~~~">
+        <location
+            file="src/main/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtil.java"
+            line="317"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="ApplySharedPref"
+        message="Consider using `apply()` instead; `commit` writes its data to persistent storage immediately, whereas `apply` will handle it in the background"
+        errorLine1="          .commit();"
+        errorLine2="           ~~~~~~~~">
+        <location
+            file="src/main/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtil.java"
+            line="324"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 but `getColumnIndex` can be -1"
+        errorLine1="        statusCode = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS));"
+        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileDownloadService.java"
+            line="318"
+            column="36"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 but `getColumnIndex` can be -1"
+        errorLine1="      int reason = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_REASON));"
+        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileDownloadService.java"
+            line="476"
+            column="34"/>
+    </issue>
+
+</issues>
diff --git a/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle b/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle
index 47f5f4b453a..b09deac0aad 100644
--- a/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle
+++ b/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle
@@ -21,9 +21,10 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.ml_data_collection_tests"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         versionName version
         multiDexEnabled true
@@ -41,12 +42,14 @@ android {
 }
 
 dependencies {
-    implementation project(':firebase-common')
     implementation project(':firebase-ml-modeldownloader')
+    implementation 'androidx.core:core:1.2.0'
+    implementation 'com.google.firebase:firebase-common:21.0.0'
+    implementation 'com.google.firebase:firebase-common-ktx:21.0.0'
+
     testImplementation 'androidx.test:runner:1.2.0'
-    testImplementation 'androidx.test.ext:junit:1.1.1'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    implementation 'androidx.core:core:1.2.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 }
diff --git a/firebase-ml-modeldownloader/ml-data-collection-tests/src/main/AndroidManifest.xml b/firebase-ml-modeldownloader/ml-data-collection-tests/src/main/AndroidManifest.xml
index d544936cf0e..b9ff93da1fd 100644
--- a/firebase-ml-modeldownloader/ml-data-collection-tests/src/main/AndroidManifest.xml
+++ b/firebase-ml-modeldownloader/ml-data-collection-tests/src/main/AndroidManifest.xml
@@ -13,8 +13,7 @@
 <!-- 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="com.google.firebase.ml_data_collection_tests">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 <application>
     <meta-data android:name="firebase_model_downloader_collection_enabled"
@@ -27,4 +26,3 @@
     </service>
   </application>
 </manifest>
-
diff --git a/firebase-ml-modeldownloader/ml-data-collection-tests/src/test/java/com/google/firebase/ml_data_collection_tests/MlDataCollectionTestUtil.java b/firebase-ml-modeldownloader/ml-data-collection-tests/src/test/java/com/google/firebase/ml_data_collection_tests/MlDataCollectionTestUtil.java
index cca82b8e6f0..2b9788e8d84 100644
--- a/firebase-ml-modeldownloader/ml-data-collection-tests/src/test/java/com/google/firebase/ml_data_collection_tests/MlDataCollectionTestUtil.java
+++ b/firebase-ml-modeldownloader/ml-data-collection-tests/src/test/java/com/google/firebase/ml_data_collection_tests/MlDataCollectionTestUtil.java
@@ -14,11 +14,10 @@
 
 package com.google.firebase.ml_data_collection_tests;
 
-import android.content.Context;
-import android.content.SharedPreferences;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
+import com.google.firebase.ml.modeldownloader.FirebaseModelDownloader;
 import com.google.firebase.ml.modeldownloader.internal.SharedPreferencesUtil;
 import java.util.function.Consumer;
 
@@ -47,12 +46,8 @@ static void withApp(String name, Consumer<FirebaseApp> callable) {
   }
 
   static SharedPreferencesUtil getSharedPreferencesUtil(FirebaseApp app) {
-    return new SharedPreferencesUtil(app);
-  }
-
-  static SharedPreferences getSharedPreferences(FirebaseApp app) {
-    return app.getApplicationContext()
-        .getSharedPreferences(SharedPreferencesUtil.PREFERENCES_PACKAGE_NAME, Context.MODE_PRIVATE);
+    return new SharedPreferencesUtil(
+        app, FirebaseModelDownloader.getInstance(app).getModelFactory());
   }
 
   static void setSharedPreferencesTo(FirebaseApp app, Boolean enabled) {
diff --git a/firebase-ml-modeldownloader/src/androidTest/java/com/google/firebase/ml/modeldownloader/TestGetModelLocal.java b/firebase-ml-modeldownloader/src/androidTest/java/com/google/firebase/ml/modeldownloader/TestGetModelLocal.java
index 1febf4a9785..a1858cf26d0 100644
--- a/firebase-ml-modeldownloader/src/androidTest/java/com/google/firebase/ml/modeldownloader/TestGetModelLocal.java
+++ b/firebase-ml-modeldownloader/src/androidTest/java/com/google/firebase/ml/modeldownloader/TestGetModelLocal.java
@@ -45,20 +45,25 @@ public class TestGetModelLocal {
   private static final String MODEL_NAME_LOCAL = "getLocalModel";
   private static final String MODEL_NAME_LOCAL_2 = "getLocalModel2";
   private static final String MODEL_HASH = "origHash324";
-  private final CustomModel SETUP_LOADED_LOCAL_MODEL =
-      new CustomModel(MODEL_NAME_LOCAL, MODEL_HASH, 100, 0);
 
   private FirebaseApp app;
   private File firstDeviceModelFile;
   private File firstLoadTempModelFile;
 
+  private CustomModel.Factory modelFactory;
+  private CustomModel setupLoadedLocalModel;
+
   @Before
   public void before() {
     app = FirebaseApp.initializeApp(ApplicationProvider.getApplicationContext());
     app.setDataCollectionDefaultEnabled(Boolean.FALSE);
     FirebaseModelDownloader firebaseModelDownloader = FirebaseModelDownloader.getInstance(app);
 
-    SharedPreferencesUtil sharedPreferencesUtil = new SharedPreferencesUtil(app);
+    modelFactory = firebaseModelDownloader.getModelFactory();
+
+    setupLoadedLocalModel = modelFactory.create(MODEL_NAME_LOCAL, MODEL_HASH, 100, 0);
+
+    SharedPreferencesUtil sharedPreferencesUtil = new SharedPreferencesUtil(app, modelFactory);
     // reset shared preferences and downloads for models used by this test.
     firebaseModelDownloader.deleteDownloadedModel(MODEL_NAME_LOCAL);
     firebaseModelDownloader.deleteDownloadedModel(MODEL_NAME_LOCAL_2);
@@ -79,7 +84,11 @@ public void teardown() {
   }
 
   private void setUpLoadedLocalModelWithFile() throws Exception {
-    ModelFileManager fileManager = ModelFileManager.getInstance();
+    ModelFileManager fileManager =
+        new ModelFileManager(
+            app.getApplicationContext(),
+            app.getPersistenceKey(),
+            new SharedPreferencesUtil(app, modelFactory));
     final File testDir = new File(app.getApplicationContext().getNoBackupFilesDir(), "tmpModels");
     testDir.mkdirs();
     // make sure the directory is empty. Doesn't recurse into subdirs, but that's OK since
@@ -105,14 +114,14 @@ private void setUpLoadedLocalModelWithFile() throws Exception {
     ParcelFileDescriptor fd =
         ParcelFileDescriptor.open(firstLoadTempModelFile, ParcelFileDescriptor.MODE_READ_ONLY);
 
-    firstDeviceModelFile = fileManager.moveModelToDestinationFolder(SETUP_LOADED_LOCAL_MODEL, fd);
+    firstDeviceModelFile = fileManager.moveModelToDestinationFolder(setupLoadedLocalModel, fd);
     assertEquals(firstDeviceModelFile, new File(expectedDestinationFolder + "/0"));
     assertTrue(firstDeviceModelFile.exists());
     fd.close();
 
     fakePreloadedCustomModel(
         MODEL_NAME_LOCAL,
-        SETUP_LOADED_LOCAL_MODEL.getModelHash(),
+        setupLoadedLocalModel.getModelHash(),
         99,
         expectedDestinationFolder + "/0");
   }
@@ -150,9 +159,11 @@ public void localModel_successTestPath()
     assertTrue(listModelTask.contains(modelUpdatedTask.getResult()));
 
     // delete the old model
-    FirebaseModelDownloader.getInstance().deleteDownloadedModel(MODEL_NAME_LOCAL);
+    Task deleteDownloadedModelTask =
+        FirebaseModelDownloader.getInstance().deleteDownloadedModel(MODEL_NAME_LOCAL);
+    Tasks.await(deleteDownloadedModelTask);
     listModelTask = getDownloadedModelList();
-    assertEquals(listModelTask.size(), 1);
+    assertEquals(1, listModelTask.size());
 
     // verify model file was also deleted
     assertNull(modelTask.getResult().getFile());
@@ -228,9 +239,9 @@ public void localModel_preloadedDoNotFetchUpdate() throws Exception {
   }
 
   private void fakePreloadedCustomModel(String modelName, String hash, long size, String filePath) {
-    SharedPreferencesUtil sharedPreferencesUtil = new SharedPreferencesUtil(app);
+    SharedPreferencesUtil sharedPreferencesUtil = new SharedPreferencesUtil(app, modelFactory);
     sharedPreferencesUtil.setLoadedCustomModelDetails(
-        new CustomModel(modelName, hash, size, 0L, filePath));
+        modelFactory.create(modelName, hash, size, 0L, filePath));
   }
 
   private Set<CustomModel> getDownloadedModelList()
diff --git a/firebase-ml-modeldownloader/src/androidTest/java/com/google/firebase/ml/modeldownloader/TestPublicApi.java b/firebase-ml-modeldownloader/src/androidTest/java/com/google/firebase/ml/modeldownloader/TestPublicApi.java
index 52f58a32137..f1dfbf2a841 100644
--- a/firebase-ml-modeldownloader/src/androidTest/java/com/google/firebase/ml/modeldownloader/TestPublicApi.java
+++ b/firebase-ml-modeldownloader/src/androidTest/java/com/google/firebase/ml/modeldownloader/TestPublicApi.java
@@ -45,7 +45,8 @@ public void before() {
     app.setDataCollectionDefaultEnabled(Boolean.FALSE);
     FirebaseModelDownloader firebaseModelDownloader = FirebaseModelDownloader.getInstance(app);
 
-    SharedPreferencesUtil sharedPreferencesUtil = new SharedPreferencesUtil(app);
+    SharedPreferencesUtil sharedPreferencesUtil =
+        new SharedPreferencesUtil(app, firebaseModelDownloader.getModelFactory());
     // reset shared preferences and downloads for models used by this test.
     firebaseModelDownloader.deleteDownloadedModel(MODEL_NAME_LOCAL);
     firebaseModelDownloader.deleteDownloadedModel(MODEL_NAME_LOCAL_2);
diff --git a/firebase-ml-modeldownloader/src/main/AndroidManifest.xml b/firebase-ml-modeldownloader/src/main/AndroidManifest.xml
index 5b1f5cabf7b..c1d87ac8dc6 100644
--- a/firebase-ml-modeldownloader/src/main/AndroidManifest.xml
+++ b/firebase-ml-modeldownloader/src/main/AndroidManifest.xml
@@ -13,17 +13,16 @@
 <!-- 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="com.google.firebase.ml.modeldownloader">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.INTERNET" />
   <application>
     <service
         android:name="com.google.firebase.components.ComponentDiscoveryService"
-        android:exported="false">
+        android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.ml.modeldownloader.FirebaseMlModelDownloaderKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
       <meta-data
           android:name="com.google.firebase.components:com.google.firebase.ml.modeldownloader.FirebaseModelDownloaderRegistrar"
           android:value="com.google.firebase.components.ComponentRegistrar" />
     </service>
   </application>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/CustomModel.java b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/CustomModel.java
index 2395161ed98..16d9c32c6f0 100644
--- a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/CustomModel.java
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/CustomModel.java
@@ -16,9 +16,13 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.common.internal.Objects;
 import com.google.firebase.ml.modeldownloader.internal.ModelFileDownloadService;
+import dagger.assisted.Assisted;
+import dagger.assisted.AssistedFactory;
+import dagger.assisted.AssistedInject;
 import java.io.File;
 
 /**
@@ -27,6 +31,7 @@
  * downloaded, the original model file will be removed once it is safe to do so.
  */
 public class CustomModel {
+  private final ModelFileDownloadService fileDownloadService;
   private final String name;
   private final long downloadId;
   private final long fileSize;
@@ -35,57 +40,31 @@ public class CustomModel {
   private final String downloadUrl;
   private final long downloadUrlExpiry;
 
-  /**
-   * Use when creating a custom model while the initial download is still in progress.
-   *
-   * @param name Model name.
-   * @param modelHash Model hash.
-   * @param fileSize Model file size.
-   * @param downloadId Android Download Manger - download ID.
-   * @hide
-   */
-  public CustomModel(
-      @NonNull String name, @NonNull String modelHash, long fileSize, long downloadId) {
-    this(name, modelHash, fileSize, downloadId, "", "", 0);
-  }
+  /** @hide */
+  @AssistedFactory
+  public interface Factory {
+    CustomModel create(
+        @Assisted("name") String name,
+        @Assisted("modelHash") String modelHash,
+        @Assisted("fileSize") long fileSize,
+        @Assisted("downloadId") long downloadId,
+        @Assisted("localFilePath") String localFilePath,
+        @Assisted("downloadUrl") String downloadUrl,
+        @Assisted("downloadUrlExpiry") long downloadUrlExpiry);
 
-  /**
-   * Use when creating a custom model from a stored model with a new download in the background.
-   *
-   * @param name Model name.
-   * @param modelHash Model hash.
-   * @param fileSize Model file size.
-   * @param downloadId Android Download Manger - download ID.
-   * @hide
-   */
-  public CustomModel(
-      @NonNull String name,
-      @NonNull String modelHash,
-      long fileSize,
-      long downloadId,
-      String localFilePath) {
-    this(name, modelHash, fileSize, downloadId, localFilePath, "", 0);
-  }
+    default CustomModel create(String name, String modelHash, long fileSize, long downloadId) {
+      return create(name, modelHash, fileSize, downloadId, "", "", 0);
+    }
 
-  /**
-   * Use when creating a custom model from a download service response. Download URL and download
-   * URL expiry should go together. These will not be stored in user preferences as this is a
-   * temporary step towards setting the actual download ID.
-   *
-   * @param name Model name.
-   * @param modelHash Model hash.
-   * @param fileSize Model file size.
-   * @param downloadUrl Download URL path
-   * @param downloadUrlExpiry Time download URL path expires.
-   * @hide
-   */
-  public CustomModel(
-      @NonNull String name,
-      @NonNull String modelHash,
-      long fileSize,
-      String downloadUrl,
-      long downloadUrlExpiry) {
-    this(name, modelHash, fileSize, 0, "", downloadUrl, downloadUrlExpiry);
+    default CustomModel create(
+        String name, String modelHash, long fileSize, long downloadId, String localFilePath) {
+      return create(name, modelHash, fileSize, downloadId, localFilePath, "", 0);
+    }
+
+    default CustomModel create(
+        String name, String modelHash, long fileSize, String downloadUrl, long downloadUrlExpiry) {
+      return create(name, modelHash, fileSize, 0, "", downloadUrl, downloadUrlExpiry);
+    }
   }
 
   /**
@@ -100,14 +79,19 @@ public CustomModel(
    * @param downloadUrlExpiry Expiry time of download URL link.
    * @hide
    */
-  private CustomModel(
-      @NonNull String name,
-      @NonNull String modelHash,
-      long fileSize,
-      long downloadId,
-      @Nullable String localFilePath,
-      @Nullable String downloadUrl,
-      long downloadUrlExpiry) {
+  @AssistedInject
+  @VisibleForTesting
+  @RestrictTo(RestrictTo.Scope.LIBRARY)
+  public CustomModel(
+      ModelFileDownloadService fileDownloadService,
+      @Assisted("name") String name,
+      @Assisted("modelHash") String modelHash,
+      @Assisted("fileSize") long fileSize,
+      @Assisted("downloadId") long downloadId,
+      @Assisted("localFilePath") String localFilePath,
+      @Assisted("downloadUrl") String downloadUrl,
+      @Assisted("downloadUrlExpiry") long downloadUrlExpiry) {
+    this.fileDownloadService = fileDownloadService;
     this.modelHash = modelHash;
     this.name = name;
     this.fileSize = fileSize;
@@ -137,7 +121,7 @@ public String getName() {
    */
   @Nullable
   public File getFile() {
-    return getFile(ModelFileDownloadService.getInstance());
+    return getFile(fileDownloadService);
   }
 
   /**
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloader.java b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloader.java
index cbf8fb1f894..3309902f98f 100644
--- a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloader.java
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloader.java
@@ -25,7 +25,8 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.installations.FirebaseInstallationsApi;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.ml.modeldownloader.internal.CustomModelDownloadService;
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.ModelDownloadLogEvent.DownloadStatus;
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.ModelDownloadLogEvent.ErrorCode;
@@ -36,7 +37,7 @@
 import java.io.File;
 import java.util.Set;
 import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
+import javax.inject.Inject;
 
 public class FirebaseModelDownloader {
 
@@ -46,25 +47,15 @@ public class FirebaseModelDownloader {
   private final ModelFileDownloadService fileDownloadService;
   private final ModelFileManager fileManager;
   private final CustomModelDownloadService modelDownloadService;
-  private final Executor executor;
+  private final Executor bgExecutor;
+  private final Executor blockingExecutor;
 
   private final FirebaseMlLogger eventLogger;
+  private final CustomModel.Factory modelFactory;
 
-  @RequiresApi(api = VERSION_CODES.KITKAT)
-  FirebaseModelDownloader(
-      FirebaseApp firebaseApp, FirebaseInstallationsApi firebaseInstallationsApi) {
-    this.firebaseOptions = firebaseApp.getOptions();
-    this.sharedPreferencesUtil = new SharedPreferencesUtil(firebaseApp);
-    this.eventLogger = FirebaseMlLogger.getInstance(firebaseApp);
-    this.fileDownloadService = new ModelFileDownloadService(firebaseApp);
-    this.modelDownloadService =
-        new CustomModelDownloadService(firebaseApp, firebaseInstallationsApi);
-
-    this.executor = Executors.newSingleThreadExecutor();
-    fileManager = ModelFileManager.getInstance();
-  }
-
+  @Inject
   @VisibleForTesting
+  @RequiresApi(api = VERSION_CODES.KITKAT)
   FirebaseModelDownloader(
       FirebaseOptions firebaseOptions,
       SharedPreferencesUtil sharedPreferencesUtil,
@@ -72,14 +63,18 @@ public class FirebaseModelDownloader {
       CustomModelDownloadService modelDownloadService,
       ModelFileManager fileManager,
       FirebaseMlLogger eventLogger,
-      Executor executor) {
+      @Background Executor bgExecutor,
+      @Blocking Executor blockingExecutor,
+      CustomModel.Factory modelFactory) {
     this.firebaseOptions = firebaseOptions;
     this.sharedPreferencesUtil = sharedPreferencesUtil;
     this.fileDownloadService = fileDownloadService;
     this.modelDownloadService = modelDownloadService;
     this.fileManager = fileManager;
     this.eventLogger = eventLogger;
-    this.executor = executor;
+    this.bgExecutor = bgExecutor;
+    this.blockingExecutor = blockingExecutor;
+    this.modelFactory = modelFactory;
   }
 
   /**
@@ -214,7 +209,7 @@ private Task<CustomModel> getCompletedLocalCustomModelTask(@NonNull CustomModel
 
       if (downloadInProgressTask != null) {
         return downloadInProgressTask.continueWithTask(
-            executor,
+            bgExecutor,
             downloadTask -> {
               if (downloadTask.isSuccessful()) {
                 return finishModelDownload(model.getName());
@@ -238,7 +233,7 @@ private Task<CustomModel> getCompletedLocalCustomModelTask(@NonNull CustomModel
     // bad model state - delete all existing model details and return exception
     return deleteDownloadedModel(model.getName())
         .continueWithTask(
-            executor,
+            bgExecutor,
             deletionTask ->
                 Tasks.forException(
                     new FirebaseMlException(
@@ -271,7 +266,7 @@ private Task<CustomModel> getCustomModelTask(
             firebaseOptions.getProjectId(), modelName, modelHash);
 
     return incomingModelDetails.continueWithTask(
-        executor,
+        bgExecutor,
         incomingModelDetailTask -> {
           if (incomingModelDetailTask.isSuccessful()) {
             // null means we have the latest model or we failed to connect.
@@ -355,7 +350,7 @@ && new File(currentModel.getLocalFilePath()).exists()) {
             return fileDownloadService
                 .download(incomingModelDetailTask.getResult(), conditions)
                 .continueWithTask(
-                    executor,
+                    blockingExecutor,
                     downloadTask -> {
                       if (downloadTask.isSuccessful()) {
                         return finishModelDownload(modelName);
@@ -388,14 +383,14 @@ private Task<CustomModel> retryExpiredUrlDownload(
               firebaseOptions.getProjectId(), modelName);
       // no local model - start download.
       return retryModelDetails.continueWithTask(
-          executor,
+          bgExecutor,
           retryModelDetailTask -> {
             if (retryModelDetailTask.isSuccessful()) {
               // start download
               return fileDownloadService
                   .download(retryModelDetailTask.getResult(), conditions)
                   .continueWithTask(
-                      executor,
+                      bgExecutor,
                       retryDownloadTask -> {
                         if (retryDownloadTask.isSuccessful()) {
                           return finishModelDownload(modelName);
@@ -445,7 +440,7 @@ public Task<Set<CustomModel>> listDownloadedModels() {
     fileDownloadService.maybeCheckDownloadingComplete();
 
     TaskCompletionSource<Set<CustomModel>> taskCompletionSource = new TaskCompletionSource<>();
-    executor.execute(
+    bgExecutor.execute(
         () -> taskCompletionSource.setResult(sharedPreferencesUtil.listDownloadedModels()));
     return taskCompletionSource.getTask();
   }
@@ -459,7 +454,7 @@ public Task<Set<CustomModel>> listDownloadedModels() {
   public Task<Void> deleteDownloadedModel(@NonNull String modelName) {
 
     TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();
-    executor.execute(
+    bgExecutor.execute(
         () -> {
           // remove all files associated with this model and then clean up model references.
           boolean isSuccessful = deleteModelDetails(modelName);
@@ -536,4 +531,10 @@ public Task<Long> getModelDownloadId(
   String getApplicationId() {
     return firebaseOptions.getApplicationId();
   }
+
+  /** @hide */
+  @VisibleForTesting
+  public CustomModel.Factory getModelFactory() {
+    return modelFactory;
+  }
 }
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderRegistrar.java b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderRegistrar.java
index b9b133505ab..7678ebd30db 100644
--- a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderRegistrar.java
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderRegistrar.java
@@ -14,23 +14,24 @@
 
 package com.google.firebase.ml.modeldownloader;
 
+import android.content.Context;
 import android.os.Build.VERSION_CODES;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import com.google.android.datatransport.TransportFactory;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import com.google.firebase.datatransport.TransportBackend;
 import com.google.firebase.installations.FirebaseInstallationsApi;
-import com.google.firebase.ml.modeldownloader.internal.CustomModelDownloadService;
-import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogger;
-import com.google.firebase.ml.modeldownloader.internal.ModelFileDownloadService;
-import com.google.firebase.ml.modeldownloader.internal.ModelFileManager;
-import com.google.firebase.ml.modeldownloader.internal.SharedPreferencesUtil;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.Executor;
 
 /**
  * Registrar for setting up Firebase ML Model Downloader's dependency injections in Firebase Android
@@ -39,51 +40,37 @@
  * @hide
  */
 public class FirebaseModelDownloaderRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "firebase-ml-modeldownloader";
 
   @Override
   @NonNull
   @RequiresApi(api = VERSION_CODES.KITKAT)
   public List<Component<?>> getComponents() {
+    Qualified<Executor> bgExecutor = Qualified.qualified(Background.class, Executor.class);
+    Qualified<Executor> blockingExecutor = Qualified.qualified(Blocking.class, Executor.class);
+    Qualified<TransportFactory> transportFactory =
+        Qualified.qualified(TransportBackend.class, TransportFactory.class);
     return Arrays.asList(
         Component.builder(FirebaseModelDownloader.class)
+            .name(LIBRARY_NAME)
+            .add(Dependency.required(Context.class))
             .add(Dependency.required(FirebaseApp.class))
-            .add(Dependency.required(FirebaseInstallationsApi.class))
+            .add(Dependency.requiredProvider(FirebaseInstallationsApi.class))
+            .add(Dependency.requiredProvider(transportFactory))
+            .add(Dependency.required(bgExecutor))
+            .add(Dependency.required(blockingExecutor))
             .factory(
                 c ->
-                    new FirebaseModelDownloader(
-                        c.get(FirebaseApp.class), c.get(FirebaseInstallationsApi.class)))
+                    DaggerModelDownloaderComponent.builder()
+                        .setApplicationContext(c.get(Context.class))
+                        .setFirebaseApp(c.get(FirebaseApp.class))
+                        .setFis(c.getProvider(FirebaseInstallationsApi.class))
+                        .setBlockingExecutor(c.get(blockingExecutor))
+                        .setBgExecutor(c.get(bgExecutor))
+                        .setTransportFactory(c.getProvider(transportFactory))
+                        .build()
+                        .getModelDownloader())
             .build(),
-        Component.builder(SharedPreferencesUtil.class)
-            .add(Dependency.required(FirebaseApp.class))
-            .factory(c -> new SharedPreferencesUtil(c.get(FirebaseApp.class)))
-            .build(),
-        Component.builder(FirebaseMlLogger.class)
-            .add(Dependency.required(FirebaseApp.class))
-            .add(Dependency.required(TransportFactory.class))
-            .add(Dependency.required(SharedPreferencesUtil.class))
-            .factory(
-                c ->
-                    new FirebaseMlLogger(
-                        c.get(FirebaseApp.class),
-                        c.get(SharedPreferencesUtil.class),
-                        c.get(TransportFactory.class)))
-            .build(),
-        Component.builder(ModelFileManager.class)
-            .add(Dependency.required(FirebaseApp.class))
-            .factory(c -> new ModelFileManager(c.get(FirebaseApp.class)))
-            .build(),
-        Component.builder(ModelFileDownloadService.class)
-            .add(Dependency.required(FirebaseApp.class))
-            .factory(c -> new ModelFileDownloadService(c.get(FirebaseApp.class)))
-            .build(),
-        Component.builder(CustomModelDownloadService.class)
-            .add(Dependency.required(FirebaseApp.class))
-            .add(Dependency.required(FirebaseInstallationsApi.class))
-            .factory(
-                c ->
-                    new CustomModelDownloadService(
-                        c.get(FirebaseApp.class), c.get(FirebaseInstallationsApi.class)))
-            .build(),
-        LibraryVersionComponent.create("firebase-ml-modeldownloader", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/ModelDownloader.kt b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/ModelDownloader.kt
new file mode 100644
index 00000000000..07a1579d899
--- /dev/null
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/ModelDownloader.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.ml.modeldownloader
+
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import java.io.File
+
+/** Returns the [FirebaseModelDownloader] instance of the default [FirebaseApp]. */
+val Firebase.modelDownloader: FirebaseModelDownloader
+  get() = FirebaseModelDownloader.getInstance()
+
+/** Returns the [FirebaseModelDownloader] instance of a given [FirebaseApp]. */
+fun Firebase.modelDownloader(app: FirebaseApp) = FirebaseModelDownloader.getInstance(app)
+
+/** Returns a [CustomModelDownloadConditions] initialized using the [init] function. */
+fun customModelDownloadConditions(
+  init: CustomModelDownloadConditions.Builder.() -> Unit
+): CustomModelDownloadConditions {
+  val builder = CustomModelDownloadConditions.Builder()
+  builder.init()
+  return builder.build()
+}
+
+operator fun CustomModel.component1(): File? = file
+
+operator fun CustomModel.component2() = size
+
+operator fun CustomModel.component3() = downloadId
+
+operator fun CustomModel.component4() = modelHash
+
+operator fun CustomModel.component5() = name
+
+/** @suppress */
+class FirebaseMlModelDownloaderKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/ModelDownloaderComponent.java b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/ModelDownloaderComponent.java
new file mode 100644
index 00000000000..bbf3686a38d
--- /dev/null
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/ModelDownloaderComponent.java
@@ -0,0 +1,98 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.ml.modeldownloader;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.util.Log;
+import com.google.android.datatransport.TransportFactory;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.inject.Provider;
+import com.google.firebase.installations.FirebaseInstallationsApi;
+import dagger.BindsInstance;
+import dagger.Component;
+import dagger.Module;
+import dagger.Provides;
+import java.util.concurrent.Executor;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+/** @hide */
+@Component(modules = ModelDownloaderComponent.MainModule.class)
+@Singleton
+interface ModelDownloaderComponent {
+  FirebaseModelDownloader getModelDownloader();
+
+  @Component.Builder
+  interface Builder {
+    @BindsInstance
+    Builder setApplicationContext(Context context);
+
+    @BindsInstance
+    Builder setFirebaseApp(FirebaseApp app);
+
+    @BindsInstance
+    Builder setFis(Provider<FirebaseInstallationsApi> fis);
+
+    @BindsInstance
+    Builder setTransportFactory(Provider<TransportFactory> transportFactory);
+
+    @BindsInstance
+    Builder setBlockingExecutor(@Blocking Executor blockingExecutor);
+
+    @BindsInstance
+    Builder setBgExecutor(@Background Executor bgExecutor);
+
+    ModelDownloaderComponent build();
+  }
+
+  @Module
+  interface MainModule {
+
+    @Provides
+    @Named("persistenceKey")
+    static String persistenceKey(FirebaseApp app) {
+      return app.getPersistenceKey();
+    }
+
+    @Provides
+    @Named("appPackageName")
+    static String appPackageName(Context applicationContext) {
+      return applicationContext.getPackageName();
+    }
+
+    @Provides
+    static FirebaseOptions firebaseOptions(FirebaseApp app) {
+      return app.getOptions();
+    }
+
+    @Provides
+    @Singleton
+    @Named("appVersionCode")
+    static String appVersionCode(
+        Context applicationContext, @Named("appPackageName") String appPackageName) {
+      try {
+        return String.valueOf(
+            applicationContext.getPackageManager().getPackageInfo(appPackageName, 0).versionCode);
+      } catch (PackageManager.NameNotFoundException e) {
+        Log.e("ModelDownloader", "Exception thrown when trying to get app version " + e);
+      }
+      return "";
+    }
+  }
+}
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/CustomModelDownloadService.java b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/CustomModelDownloadService.java
index f9a6f550584..5e24258bf81 100644
--- a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/CustomModelDownloadService.java
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/CustomModelDownloadService.java
@@ -16,16 +16,20 @@
 
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.text.TextUtils;
 import android.util.JsonReader;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 import com.google.android.gms.common.util.AndroidUtilsLight;
 import com.google.android.gms.common.util.Hex;
-import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.installations.InstallationTokenResult;
 import com.google.firebase.ml.modeldownloader.CustomModel;
@@ -45,9 +49,9 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.Executor;
 import java.util.zip.GZIPInputStream;
+import javax.inject.Inject;
 import org.json.JSONObject;
 
 /**
@@ -69,7 +73,8 @@ public class CustomModelDownloadService {
   private static final String ERROR_RESPONSE_ERROR = "error";
   private static final String ERROR_RESPONSE_MESSAGE = "message";
 
-  @VisibleForTesting static final String ETAG_HEADER = "etag";
+  @VisibleForTesting
+  static final String ETAG_HEADER = "etag";
   @VisibleForTesting static final String CONTENT_TYPE = "Content-Type";
   @VisibleForTesting static final String APPLICATION_JSON = "application/json; charset=UTF-8";
   @VisibleForTesting static final String IF_NONE_MATCH_HEADER_KEY = "If-None-Match";
@@ -84,40 +89,50 @@ public class CustomModelDownloadService {
   @VisibleForTesting
   static final String DOWNLOAD_MODEL_REGEX = "%s/v1beta2/projects/%s/models/%s:download";
 
-  private final ExecutorService executorService;
-  private final FirebaseInstallationsApi firebaseInstallations;
+  private final Provider<FirebaseInstallationsApi> firebaseInstallations;
   private final FirebaseMlLogger eventLogger;
   private final String apiKey;
   @Nullable private final String fingerprintHashForPackage;
   private final Context context;
+  private final CustomModel.Factory modelFactory;
   private String downloadHost = FIREBASE_DOWNLOAD_HOST;
+  private final Executor blockingExecutor;
 
+  @Inject
   public CustomModelDownloadService(
-      FirebaseApp firebaseApp, FirebaseInstallationsApi installationsApi) {
-    context = firebaseApp.getApplicationContext();
+      Context context,
+      FirebaseOptions options,
+      Provider<FirebaseInstallationsApi> installationsApi,
+      FirebaseMlLogger eventLogger,
+      CustomModel.Factory modelFactory,
+      @Blocking Executor blockingExecutor) {
+    this.context = context;
     firebaseInstallations = installationsApi;
-    apiKey = firebaseApp.getOptions().getApiKey();
+    apiKey = options.getApiKey();
     fingerprintHashForPackage = getFingerprintHashForPackage(context);
-    executorService = Executors.newCachedThreadPool();
-    this.eventLogger = FirebaseMlLogger.getInstance();
+    this.blockingExecutor = blockingExecutor;
+    this.eventLogger = eventLogger;
+    this.modelFactory = modelFactory;
   }
 
   @VisibleForTesting
   CustomModelDownloadService(
       Context context,
-      FirebaseInstallationsApi firebaseInstallations,
-      ExecutorService executorService,
+      Provider<FirebaseInstallationsApi> firebaseInstallations,
+      Executor blockingExecutor,
       String apiKey,
       String fingerprintHashForPackage,
       String downloadHost,
-      FirebaseMlLogger eventLogger) {
+      FirebaseMlLogger eventLogger,
+      CustomModel.Factory modelFactory) {
     this.context = context;
     this.firebaseInstallations = firebaseInstallations;
-    this.executorService = executorService;
+    this.blockingExecutor = blockingExecutor;
     this.apiKey = apiKey;
     this.fingerprintHashForPackage = fingerprintHashForPackage;
     this.downloadHost = downloadHost;
     this.eventLogger = eventLogger;
+    this.modelFactory = modelFactory;
   }
 
   /**
@@ -148,62 +163,75 @@ public Task<CustomModel> getNewDownloadUrlWithExpiry(String projectNumber, Strin
   public Task<CustomModel> getCustomModelDetails(
       String projectNumber, String modelName, String modelHash) {
     try {
-      URL url =
-          new URL(String.format(DOWNLOAD_MODEL_REGEX, downloadHost, projectNumber, modelName));
-      HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-      connection.setConnectTimeout(CONNECTION_TIME_OUT_MS);
-      connection.setRequestProperty(ACCEPT_ENCODING_HEADER_KEY, GZIP_CONTENT_ENCODING);
-      connection.setRequestProperty(CONTENT_TYPE, APPLICATION_JSON);
-      if (modelHash != null && !modelHash.isEmpty()) {
-        connection.setRequestProperty(IF_NONE_MATCH_HEADER_KEY, modelHash);
-      }
+
+      if (TextUtils.isEmpty(modelName))
+        throw new FirebaseMlException(
+            "Error cannot retrieve model from reading an empty modelName",
+            FirebaseMlException.INVALID_ARGUMENT);
 
       Task<InstallationTokenResult> installationAuthTokenTask =
-          firebaseInstallations.getToken(false);
+          firebaseInstallations.get().getToken(false);
       return installationAuthTokenTask.continueWithTask(
-          executorService,
+          blockingExecutor,
           (CustomModelTask) -> {
-            if (!installationAuthTokenTask.isSuccessful()) {
-              ErrorCode errorCode = ErrorCode.MODEL_INFO_DOWNLOAD_CONNECTION_FAILED;
-              String errorMessage = "Failed to get model due to authentication error";
-              int exceptionCode = FirebaseMlException.UNAUTHENTICATED;
-              if (installationAuthTokenTask.getException() != null
-                  && (installationAuthTokenTask.getException() instanceof UnknownHostException
-                      || installationAuthTokenTask.getException().getCause()
-                          instanceof UnknownHostException)) {
-                errorCode = ErrorCode.NO_NETWORK_CONNECTION;
-                errorMessage = "Failed to retrieve model info due to no internet connection.";
-                exceptionCode = FirebaseMlException.NO_NETWORK_CONNECTION;
+            try {
+              URL url =
+                  new URL(
+                      String.format(DOWNLOAD_MODEL_REGEX, downloadHost, projectNumber, modelName));
+              HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+              connection.setConnectTimeout(CONNECTION_TIME_OUT_MS);
+              connection.setRequestProperty(ACCEPT_ENCODING_HEADER_KEY, GZIP_CONTENT_ENCODING);
+              connection.setRequestProperty(CONTENT_TYPE, APPLICATION_JSON);
+              if (modelHash != null && !modelHash.isEmpty()) {
+                connection.setRequestProperty(IF_NONE_MATCH_HEADER_KEY, modelHash);
+              }
+              if (!installationAuthTokenTask.isSuccessful()) {
+                ErrorCode errorCode = ErrorCode.MODEL_INFO_DOWNLOAD_CONNECTION_FAILED;
+                String errorMessage = "Failed to get model due to authentication error";
+                int exceptionCode = FirebaseMlException.UNAUTHENTICATED;
+                if (installationAuthTokenTask.getException() != null
+                    && (installationAuthTokenTask.getException() instanceof UnknownHostException
+                        || installationAuthTokenTask.getException().getCause()
+                            instanceof UnknownHostException)) {
+                  errorCode = ErrorCode.NO_NETWORK_CONNECTION;
+                  errorMessage = "Failed to retrieve model info due to no internet connection.";
+                  exceptionCode = FirebaseMlException.NO_NETWORK_CONNECTION;
+                }
+                eventLogger.logDownloadFailureWithReason(
+                    modelFactory.create(modelName, modelHash != null ? modelHash : "", 0, 0L),
+                    false,
+                    errorCode.getValue());
+                return Tasks.forException(new FirebaseMlException(errorMessage, exceptionCode));
               }
-              eventLogger.logDownloadFailureWithReason(
-                  new CustomModel(modelName, modelHash, 0, 0L), false, errorCode.getValue());
-              return Tasks.forException(new FirebaseMlException(errorMessage, exceptionCode));
-            }
 
-            connection.setRequestProperty(
-                INSTALLATIONS_AUTH_TOKEN_HEADER, installationAuthTokenTask.getResult().getToken());
-            connection.setRequestProperty(API_KEY_HEADER, apiKey);
+              connection.setRequestProperty(
+                  INSTALLATIONS_AUTH_TOKEN_HEADER,
+                  installationAuthTokenTask.getResult().getToken());
+              connection.setRequestProperty(API_KEY_HEADER, apiKey);
 
-            // Headers required for Android API Key Restrictions.
-            connection.setRequestProperty(X_ANDROID_PACKAGE_HEADER, context.getPackageName());
+              // Headers required for Android API Key Restrictions.
+              connection.setRequestProperty(X_ANDROID_PACKAGE_HEADER, context.getPackageName());
 
-            if (fingerprintHashForPackage != null) {
-              connection.setRequestProperty(X_ANDROID_CERT_HEADER, fingerprintHashForPackage);
-            }
+              if (fingerprintHashForPackage != null) {
+                connection.setRequestProperty(X_ANDROID_CERT_HEADER, fingerprintHashForPackage);
+              }
 
-            return fetchDownloadDetails(modelName, connection);
+              return fetchDownloadDetails(modelName, connection);
+            } catch (IOException e) {
+              eventLogger.logDownloadFailureWithReason(
+                  modelFactory.create(modelName, modelHash, 0, 0L),
+                  false,
+                  ErrorCode.MODEL_INFO_DOWNLOAD_CONNECTION_FAILED.getValue());
+
+              return Tasks.forException(
+                  new FirebaseMlException(
+                      "Error reading custom model from download service: " + e.getMessage(),
+                      FirebaseMlException.INVALID_ARGUMENT));
+            }
           });
 
-    } catch (IOException e) {
-      eventLogger.logDownloadFailureWithReason(
-          new CustomModel(modelName, modelHash, 0, 0L),
-          false,
-          ErrorCode.MODEL_INFO_DOWNLOAD_CONNECTION_FAILED.getValue());
-
-      return Tasks.forException(
-          new FirebaseMlException(
-              "Error reading custom model from download service: " + e.getMessage(),
-              FirebaseMlException.INVALID_ARGUMENT));
+    } catch (FirebaseMlException e) {
+      return Tasks.forException(e);
     }
   }
 
@@ -300,7 +328,7 @@ private Task<CustomModel> fetchDownloadDetails(String modelName, HttpURLConnecti
         errorMessage = "Failed to retrieve model info due to no internet connection.";
         exceptionCode = FirebaseMlException.NO_NETWORK_CONNECTION;
       }
-      eventLogger.logModelInfoRetrieverFailure(new CustomModel(modelName, "", 0, 0), errorCode);
+      eventLogger.logModelInfoRetrieverFailure(modelFactory.create(modelName, "", 0, 0), errorCode);
       return Tasks.forException(new FirebaseMlException(errorMessage, exceptionCode));
     }
   }
@@ -308,7 +336,7 @@ private Task<CustomModel> fetchDownloadDetails(String modelName, HttpURLConnecti
   private Task<CustomModel> setAndLogException(
       String modelName, int httpResponseCode, String errorMessage, @Code int invalidArgument) {
     eventLogger.logModelInfoRetrieverFailure(
-        new CustomModel(modelName, "", 0, 0),
+        modelFactory.create(modelName, "", 0, 0),
         ErrorCode.MODEL_INFO_DOWNLOAD_UNSUCCESSFUL_HTTP_STATUS,
         httpResponseCode);
     return Tasks.forException(new FirebaseMlException(errorMessage, invalidArgument));
@@ -327,7 +355,7 @@ private Task<CustomModel> readCustomModelResponse(
 
     if (modelHash == null || modelHash.isEmpty()) {
       eventLogger.logDownloadFailureWithReason(
-          new CustomModel(modelName, modelHash, 0, 0L),
+          modelFactory.create(modelName, modelHash, 0, 0L),
           false,
           ErrorCode.MODEL_INFO_DOWNLOAD_CONNECTION_FAILED.getValue());
       return Tasks.forException(
@@ -361,12 +389,13 @@ private Task<CustomModel> readCustomModelResponse(
     inputStream.close();
 
     if (!downloadUrl.isEmpty() && expireTime > 0L) {
-      CustomModel model = new CustomModel(modelName, modelHash, fileSize, downloadUrl, expireTime);
+      CustomModel model =
+          modelFactory.create(modelName, modelHash, fileSize, downloadUrl, expireTime);
       eventLogger.logModelInfoRetrieverSuccess(model);
       return Tasks.forResult(model);
     }
     eventLogger.logDownloadFailureWithReason(
-        new CustomModel(modelName, modelHash, 0, 0L),
+        modelFactory.create(modelName, modelHash, 0, 0L),
         false,
         ErrorCode.MODEL_INFO_DOWNLOAD_CONNECTION_FAILED.getValue());
     return Tasks.forException(
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/DataTransportMlEventSender.java b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/DataTransportMlEventSender.java
index 8dbae13bd29..ca6ec9d65c1 100644
--- a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/DataTransportMlEventSender.java
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/DataTransportMlEventSender.java
@@ -19,6 +19,10 @@
 import com.google.android.datatransport.Event;
 import com.google.android.datatransport.Transport;
 import com.google.android.datatransport.TransportFactory;
+import com.google.firebase.components.Lazy;
+import com.google.firebase.inject.Provider;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
 /**
  * This class is responsible for sending Firebase ML Log Events to Firebase through Google
@@ -28,26 +32,26 @@
  *
  * @hide
  */
+@Singleton
 public class DataTransportMlEventSender {
   private static final String FIREBASE_ML_LOG_SDK_NAME = "FIREBASE_ML_LOG_SDK";
-  private final Transport<FirebaseMlLogEvent> transport;
+  private final Provider<Transport<FirebaseMlLogEvent>> transport;
 
-  @NonNull
-  public static DataTransportMlEventSender create(TransportFactory transportFactory) {
-    final Transport<FirebaseMlLogEvent> transport =
-        transportFactory.getTransport(
-            FIREBASE_ML_LOG_SDK_NAME,
-            FirebaseMlLogEvent.class,
-            Encoding.of("json"),
-            FirebaseMlLogEvent.getFirebaseMlJsonTransformer());
-    return new DataTransportMlEventSender(transport);
-  }
-
-  DataTransportMlEventSender(Transport<FirebaseMlLogEvent> transport) {
-    this.transport = transport;
+  @Inject
+  DataTransportMlEventSender(Provider<TransportFactory> transportFactory) {
+    this.transport =
+        new Lazy<>(
+            () ->
+                transportFactory
+                    .get()
+                    .getTransport(
+                        FIREBASE_ML_LOG_SDK_NAME,
+                        FirebaseMlLogEvent.class,
+                        Encoding.of("json"),
+                        FirebaseMlLogEvent.getFirebaseMlJsonTransformer()));
   }
 
   public void sendEvent(@NonNull FirebaseMlLogEvent firebaseMlLogEvent) {
-    transport.send(Event.ofData(firebaseMlLogEvent));
+    transport.get().send(Event.ofData(firebaseMlLogEvent));
   }
 }
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLogger.java b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLogger.java
index b68b61bf829..651fe901370 100644
--- a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLogger.java
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLogger.java
@@ -14,15 +14,11 @@
 
 package com.google.firebase.ml.modeldownloader.internal;
 
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.SystemClock;
 import android.util.Log;
 import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
-import com.google.android.datatransport.TransportFactory;
-import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
 import com.google.firebase.ml.modeldownloader.BuildConfig;
 import com.google.firebase.ml.modeldownloader.CustomModel;
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.DeleteModelLogEvent;
@@ -33,6 +29,10 @@
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.ModelDownloadLogEvent.ModelOptions;
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.ModelDownloadLogEvent.ModelOptions.ModelInfo;
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.SystemInfo;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Provider;
+import javax.inject.Singleton;
 
 /**
  * Logging class for Firebase ML Event logging.
@@ -40,62 +40,35 @@
  * @hide
  */
 @WorkerThread
+@Singleton
 public class FirebaseMlLogger {
 
   public static final int NO_FAILURE_VALUE = 0;
   private static final String TAG = "FirebaseMlLogger";
   private final SharedPreferencesUtil sharedPreferencesUtil;
   private final DataTransportMlEventSender eventSender;
-  private final FirebaseApp firebaseApp;
+  private final FirebaseOptions firebaseOptions;
 
-  private final String appPackageName;
-  private final String appVersion;
+  private final Provider<String> appPackageName;
+  private final Provider<String> appVersionCode;
   private final String firebaseProjectId;
   private final String apiKey;
 
+  @Inject
   public FirebaseMlLogger(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull SharedPreferencesUtil sharedPreferencesUtil,
-      @NonNull TransportFactory transportFactory) {
-    this.firebaseApp = firebaseApp;
-    this.sharedPreferencesUtil = sharedPreferencesUtil;
-    this.eventSender = DataTransportMlEventSender.create(transportFactory);
-
-    this.firebaseProjectId = getProjectId();
-    this.apiKey = getApiKey();
-    this.appPackageName = firebaseApp.getApplicationContext().getPackageName();
-    this.appVersion = getAppVersion();
-  }
-
-  @VisibleForTesting
-  FirebaseMlLogger(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull SharedPreferencesUtil sharedPreferencesUtil,
-      @NonNull DataTransportMlEventSender eventSender) {
-    this.firebaseApp = firebaseApp;
+      FirebaseOptions options,
+      SharedPreferencesUtil sharedPreferencesUtil,
+      DataTransportMlEventSender eventSender,
+      @Named("appPackageName") Provider<String> appPackageName,
+      @Named("appVersionCode") Provider<String> appVersionCode) {
+    this.firebaseOptions = options;
     this.sharedPreferencesUtil = sharedPreferencesUtil;
     this.eventSender = eventSender;
 
     this.firebaseProjectId = getProjectId();
     this.apiKey = getApiKey();
-    this.appPackageName = firebaseApp.getApplicationContext().getPackageName();
-    this.appVersion = getAppVersion();
-  }
-
-  /**
-   * Get FirebaseMlLogger instance using the firebase app returned by {@link
-   * FirebaseApp#getInstance()}
-   *
-   * @return FirebaseMlLogger
-   */
-  @NonNull
-  public static FirebaseMlLogger getInstance() {
-    return FirebaseApp.getInstance().get(FirebaseMlLogger.class);
-  }
-
-  @NonNull
-  public static FirebaseMlLogger getInstance(@NonNull FirebaseApp app) {
-    return app.get(FirebaseMlLogger.class);
+    this.appPackageName = appPackageName;
+    this.appVersionCode = appVersionCode;
   }
 
   void logModelInfoRetrieverFailure(CustomModel model, ErrorCode errorCode) {
@@ -256,33 +229,15 @@ private void logDownloadEvent(
   private SystemInfo getSystemInfo() {
     return SystemInfo.builder()
         .setFirebaseProjectId(firebaseProjectId)
-        .setAppId(appPackageName)
-        .setAppVersion(appVersion)
+        .setAppId(appPackageName.get())
+        .setAppVersion(appVersionCode.get())
         .setApiKey(apiKey)
         .setMlSdkVersion(BuildConfig.VERSION_NAME)
         .build();
   }
 
-  private String getAppVersion() {
-    String version = "";
-    try {
-      PackageInfo packageInfo =
-          firebaseApp
-              .getApplicationContext()
-              .getPackageManager()
-              .getPackageInfo(firebaseApp.getApplicationContext().getPackageName(), 0);
-      version = String.valueOf(packageInfo.versionCode);
-    } catch (NameNotFoundException e) {
-      Log.e(TAG, "Exception thrown when trying to get app version " + e);
-    }
-    return version;
-  }
-
   private String getProjectId() {
-    if (firebaseApp == null) {
-      return "";
-    }
-    String projectId = firebaseApp.getOptions().getProjectId();
+    String projectId = firebaseOptions.getProjectId();
     if (projectId == null) {
       return "";
     }
@@ -290,10 +245,6 @@ private String getProjectId() {
   }
 
   private String getApiKey() {
-    if (firebaseApp == null) {
-      return "";
-    }
-    String key = firebaseApp.getOptions().getApiKey();
-    return key == null ? "" : key;
+    return firebaseOptions.getApiKey();
   }
 }
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileDownloadService.java b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileDownloadService.java
index ba5ae50043d..5c649508234 100644
--- a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileDownloadService.java
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileDownloadService.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.ml.modeldownloader.internal;
 
+import android.annotation.SuppressLint;
 import android.app.DownloadManager;
 import android.app.DownloadManager.Query;
 import android.app.DownloadManager.Request;
@@ -23,6 +24,7 @@
 import android.content.IntentFilter;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.ParcelFileDescriptor;
@@ -36,7 +38,6 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.FirebaseApp;
 import com.google.firebase.ml.modeldownloader.CustomModel;
 import com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions;
 import com.google.firebase.ml.modeldownloader.FirebaseMlException;
@@ -47,6 +48,7 @@
 import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import javax.inject.Inject;
 
 /**
  * Calls the Android Download service to copy the model file to device (temp location) and then
@@ -65,6 +67,7 @@ public class ModelFileDownloadService {
   private final ModelFileManager fileManager;
   private final SharedPreferencesUtil sharedPreferencesUtil;
   private final FirebaseMlLogger eventLogger;
+  private final CustomModel.Factory modelFactory;
 
   private boolean isInitialLoad;
 
@@ -82,40 +85,39 @@ public class ModelFileDownloadService {
   private CustomModelDownloadConditions downloadConditions =
       new CustomModelDownloadConditions.Builder().build();
 
-  public ModelFileDownloadService(@NonNull FirebaseApp firebaseApp) {
-    this.context = firebaseApp.getApplicationContext();
-    downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-    this.fileManager = ModelFileManager.getInstance(firebaseApp);
-    this.sharedPreferencesUtil = new SharedPreferencesUtil(firebaseApp);
-    this.isInitialLoad = true;
-    this.eventLogger = FirebaseMlLogger.getInstance();
+  @Inject
+  public ModelFileDownloadService(
+      Context context,
+      FirebaseMlLogger eventLogger,
+      ModelFileManager modelFileManager,
+      SharedPreferencesUtil sharedPreferencesUtil,
+      CustomModel.Factory modelFactory) {
+    this(
+        context,
+        (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE),
+        modelFileManager,
+        sharedPreferencesUtil,
+        eventLogger,
+        true,
+        modelFactory);
   }
 
   @VisibleForTesting
   ModelFileDownloadService(
-      @NonNull FirebaseApp firebaseApp,
+      Context context,
       DownloadManager downloadManager,
       ModelFileManager fileManager,
       SharedPreferencesUtil sharedPreferencesUtil,
       FirebaseMlLogger eventLogger,
-      boolean isInitialLoad) {
-    this.context = firebaseApp.getApplicationContext();
+      boolean isInitialLoad,
+      CustomModel.Factory modelFactory) {
+    this.context = context;
     this.downloadManager = downloadManager;
     this.fileManager = fileManager;
     this.sharedPreferencesUtil = sharedPreferencesUtil;
     this.eventLogger = eventLogger;
     this.isInitialLoad = isInitialLoad;
-  }
-
-  /**
-   * Get ModelFileDownloadService instance using the firebase app returned by {@link
-   * FirebaseApp#getInstance()}
-   *
-   * @return ModelFileDownloadService
-   */
-  @NonNull
-  public static ModelFileDownloadService getInstance() {
-    return FirebaseApp.getInstance().get(ModelFileDownloadService.class);
+    this.modelFactory = modelFactory;
   }
 
   public Task<Void> download(
@@ -207,12 +209,20 @@ private synchronized void removeDownloadTaskInstance(long downloadId) {
     this.receiverMaps.remove(downloadId);
   }
 
+  @SuppressLint("WrongConstant")
   private Task<Void> registerReceiverForDownloadId(long downloadId, String modelName) {
     BroadcastReceiver broadcastReceiver = getReceiverInstance(downloadId, modelName);
     // It is okay to always register here. Since the broadcast receiver is the same via the lookup
     // for the same download id, the same broadcast receiver will be notified only once.
-    context.registerReceiver(
-        broadcastReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      context.registerReceiver(
+          broadcastReceiver,
+          new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
+          Context.RECEIVER_EXPORTED);
+    } else {
+      context.registerReceiver(
+          broadcastReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+    }
 
     return getTaskCompletionSourceInstance(downloadId).getTask();
   }
@@ -291,7 +301,7 @@ synchronized Long scheduleModelDownload(@NonNull CustomModel customModel)
     // update the custom model to store the download id - do not lose current local file - in case
     // this is a background update.
     CustomModel model =
-        new CustomModel(
+        modelFactory.create(
             customModel.getName(),
             customModel.getModelHash(),
             customModel.getSize(),
@@ -429,7 +439,7 @@ public File loadNewlyDownloadedModelFile(CustomModel model) {
               + newModelFile.getParent());
       // Successfully moved,  update share preferences
       sharedPreferencesUtil.setLoadedCustomModelDetails(
-          new CustomModel(
+          modelFactory.create(
               model.getName(), model.getModelHash(), model.getSize(), 0, newModelFile.getPath()));
 
       maybeCleanUpOldModels();
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileManager.java b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileManager.java
index a825a2b7a25..b318cdc5564 100644
--- a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileManager.java
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileManager.java
@@ -23,54 +23,44 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
-import com.google.firebase.FirebaseApp;
 import com.google.firebase.ml.modeldownloader.CustomModel;
 import com.google.firebase.ml.modeldownloader.FirebaseMlException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
 
 /**
  * Model File Manager is used to move the downloaded file to the appropriate locations.
  *
  * @hide
  */
+@Singleton
 public class ModelFileManager {
 
   public static final String CUSTOM_MODEL_ROOT_PATH = "com.google.firebase.ml.custom.models";
   private static final String TAG = "FirebaseModelFileManage";
   private static final int INVALID_INDEX = -1;
   private final Context context;
-  private final FirebaseApp firebaseApp;
+  private final String persistenceKey;
   private final SharedPreferencesUtil sharedPreferencesUtil;
 
-  public ModelFileManager(@NonNull FirebaseApp firebaseApp) {
-    this.context = firebaseApp.getApplicationContext();
-    this.firebaseApp = firebaseApp;
-    this.sharedPreferencesUtil = new SharedPreferencesUtil(firebaseApp);
-  }
-
-  /**
-   * Get ModelFileDownloadService instance using the firebase app returned by {@link
-   * FirebaseApp#getInstance()}
-   *
-   * @return ModelFileDownloadService
-   */
-  @NonNull
-  public static ModelFileManager getInstance() {
-    return FirebaseApp.getInstance().get(ModelFileManager.class);
-  }
-
-  @NonNull
-  public static ModelFileManager getInstance(@NonNull FirebaseApp app) {
-    return app.get(ModelFileManager.class);
+  @Inject
+  public ModelFileManager(
+      Context applicationContext,
+      @Named("persistenceKey") String persistenceKey,
+      SharedPreferencesUtil sharedPreferencesUtil) {
+    this.context = applicationContext;
+    this.persistenceKey = persistenceKey;
+    this.sharedPreferencesUtil = sharedPreferencesUtil;
   }
 
   void deleteNonLatestCustomModels() throws FirebaseMlException {
     File root = getDirImpl("");
 
-    boolean ret = true;
     if (root.isDirectory()) {
       for (File f : root.listFiles()) {
         // for each custom model sub directory - extract customModelName and clean up old models.
@@ -98,7 +88,7 @@ private File getModelDirUnsafe(@NonNull String modelName) {
     } else {
       root = context.getApplicationContext().getDir(modelTypeSpecificRoot, Context.MODE_PRIVATE);
     }
-    File firebaseAppDir = new File(root, firebaseApp.getPersistenceKey());
+    File firebaseAppDir = new File(root, persistenceKey);
     return new File(firebaseAppDir, modelName);
   }
 
@@ -212,7 +202,7 @@ public synchronized File moveModelToDestinationFolder(
   public synchronized void deleteOldModels(
       @NonNull String modelName, @NonNull String latestModelFilePath) {
     File modelFolder = getModelDirUnsafe(modelName);
-    if (!modelFolder.exists()) {
+    if (!modelFolder.exists() || latestModelFilePath.isEmpty()) {
       return;
     }
 
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtil.java b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtil.java
index 4559fbcb165..e5af8131291 100644
--- a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtil.java
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtil.java
@@ -29,8 +29,11 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
 /** @hide */
+@Singleton
 public class SharedPreferencesUtil {
 
   public static final String FIREBASE_MODELDOWNLOADER_COLLECTION_ENABLED =
@@ -58,10 +61,13 @@ public class SharedPreferencesUtil {
 
   private final String persistenceKey;
   private final FirebaseApp firebaseApp;
+  private final CustomModel.Factory modelFactory;
 
-  public SharedPreferencesUtil(FirebaseApp firebaseApp) {
+  @Inject
+  public SharedPreferencesUtil(FirebaseApp firebaseApp, CustomModel.Factory modelFactory) {
     this.firebaseApp = firebaseApp;
     this.persistenceKey = firebaseApp.getPersistenceKey();
+    this.modelFactory = modelFactory;
   }
 
   /**
@@ -99,7 +105,7 @@ public synchronized CustomModel getCustomModelDetails(@NonNull String modelName)
         getSharedPreferences()
             .getLong(String.format(DOWNLOADING_MODEL_ID_PATTERN, persistenceKey, modelName), 0);
 
-    return new CustomModel(modelName, modelHash, fileSize, id, filePath);
+    return modelFactory.create(modelName, modelHash, fileSize, id, filePath);
   }
 
   /**
@@ -130,7 +136,7 @@ public synchronized CustomModel getDownloadingCustomModelDetails(@NonNull String
         getSharedPreferences()
             .getLong(String.format(DOWNLOADING_MODEL_ID_PATTERN, persistenceKey, modelName), 0);
 
-    return new CustomModel(modelName, modelHash, fileSize, id);
+    return modelFactory.create(modelName, modelHash, fileSize, id);
   }
 
   /**
diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/ktx/ModelDownloader.kt b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/ktx/ModelDownloader.kt
new file mode 100644
index 00000000000..89b34d9053a
--- /dev/null
+++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/ktx/ModelDownloader.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.ml.modeldownloader.ktx
+
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ml.modeldownloader.CustomModel
+import com.google.firebase.ml.modeldownloader.CustomModelDownloadConditions
+import com.google.firebase.ml.modeldownloader.FirebaseModelDownloader
+import java.io.File
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseModelDownloader] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-ml-modeldownloade-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.modelDownloader: FirebaseModelDownloader
+  get() = FirebaseModelDownloader.getInstance()
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseModelDownloader] instance of a given [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-ml-modeldownloade-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.modelDownloader(app: FirebaseApp) = FirebaseModelDownloader.getInstance(app)
+
+/**
+ * Returns a [CustomModelDownloadConditions] initialized using the [init] function.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-ml-modeldownloade-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun customModelDownloadConditions(
+  init: CustomModelDownloadConditions.Builder.() -> Unit
+): CustomModelDownloadConditions {
+  val builder = CustomModelDownloadConditions.Builder()
+  builder.init()
+  return builder.build()
+}
+
+operator fun CustomModel.component1(): File? = file
+
+operator fun CustomModel.component2() = size
+
+operator fun CustomModel.component3() = downloadId
+
+operator fun CustomModel.component4() = modelHash
+
+operator fun CustomModel.component5() = name
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-ml-modeldownloade-ktx` are now deprecated. As early as April 2024,
+ * we'll no longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+class FirebaseMlModelDownloaderKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/CustomModelTest.java b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/CustomModelTest.java
index c10b6ec9d75..d4abab80f06 100644
--- a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/CustomModelTest.java
+++ b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/CustomModelTest.java
@@ -19,12 +19,13 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.content.Context;
 import androidx.test.core.app.ApplicationProvider;
-import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.FirebaseOptions.Builder;
 import com.google.firebase.ml.modeldownloader.internal.ModelFileDownloadService;
@@ -34,8 +35,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
@@ -52,31 +51,42 @@ public class CustomModelTest {
           .build();
   private static final long URL_EXPIRATION = 604800L;
 
-  private final CustomModel CUSTOM_MODEL = new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0);
-  private final CustomModel CUSTOM_MODEL_URL =
-      new CustomModel(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION);
-  private final CustomModel CUSTOM_MODEL_BADFILE =
-      new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0, "tmp/some/bad/filepath/model.tflite");
+  private CustomModel CUSTOM_MODEL;
+  private CustomModel CUSTOM_MODEL_URL;
+  private CustomModel CUSTOM_MODEL_BADFILE;
 
   private File testModelFile;
   private File testModelFile2;
   private CustomModel customModelWithFile;
 
-  @Mock private ModelFileDownloadService fileDownloadService;
+  private final ModelFileDownloadService fileDownloadService = mock(ModelFileDownloadService.class);
+
+  private final CustomModel.Factory modelFactory =
+      (name, modelHash, fileSize, downloadId, localFilePath, downloadUrl, downloadUrlExpiry) ->
+          new CustomModel(
+              fileDownloadService,
+              name,
+              modelHash,
+              fileSize,
+              downloadId,
+              localFilePath,
+              downloadUrl,
+              downloadUrlExpiry);
 
   @Before
   public void setUp() throws IOException {
-    MockitoAnnotations.initMocks(this);
-    FirebaseApp.clearInstancesForTest();
-    // default app
-    FirebaseApp app =
-        FirebaseApp.initializeApp(ApplicationProvider.getApplicationContext(), FIREBASE_OPTIONS);
-    setUpTestingFiles(app);
-    customModelWithFile = new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0, testModelFile.getPath());
+    CUSTOM_MODEL = modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0);
+    CUSTOM_MODEL_URL = modelFactory.create(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION);
+    CUSTOM_MODEL_BADFILE =
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0, "tmp/some/bad/filepath/model.tflite");
+
+    setUpTestingFiles(ApplicationProvider.getApplicationContext());
+    customModelWithFile =
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0, testModelFile.getPath());
   }
 
-  private void setUpTestingFiles(FirebaseApp app) throws IOException {
-    final File testDir = new File(app.getApplicationContext().getNoBackupFilesDir(), "tmpModels");
+  private void setUpTestingFiles(Context context) throws IOException {
+    final File testDir = new File(context.getNoBackupFilesDir(), "tmpModels");
     testDir.mkdirs();
     // make sure the directory is empty. Doesn't recurse into subdirs, but that's OK since
     // we're only using this directory for this test and we won't create any subdirs.
@@ -168,36 +178,40 @@ public void customModel_getDownloadUrlExpiry() {
   @Test
   public void customModel_equals() {
     // downloading models
-    assertEquals(CUSTOM_MODEL, new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0));
-    assertNotEquals(CUSTOM_MODEL, new CustomModel(MODEL_NAME, MODEL_HASH, 101, 0));
-    assertNotEquals(CUSTOM_MODEL, new CustomModel(MODEL_NAME, MODEL_HASH, 100, 101));
+    assertEquals(CUSTOM_MODEL, modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0));
+    assertNotEquals(CUSTOM_MODEL, modelFactory.create(MODEL_NAME, MODEL_HASH, 101, 0));
+    assertNotEquals(CUSTOM_MODEL, modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 101));
     // get model details models
     assertEquals(
-        CUSTOM_MODEL_URL, new CustomModel(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION));
+        CUSTOM_MODEL_URL,
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION));
     assertNotEquals(
-        CUSTOM_MODEL_URL, new CustomModel(MODEL_NAME, MODEL_HASH, 101, MODEL_URL, URL_EXPIRATION));
+        CUSTOM_MODEL_URL,
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 101, MODEL_URL, URL_EXPIRATION));
     assertNotEquals(
         CUSTOM_MODEL_URL,
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION + 10L));
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION + 10L));
   }
 
   @Test
   public void customModel_hashCode() {
     assertEquals(
-        CUSTOM_MODEL.hashCode(), new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0).hashCode());
+        CUSTOM_MODEL.hashCode(), modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0).hashCode());
     assertNotEquals(
-        CUSTOM_MODEL.hashCode(), new CustomModel(MODEL_NAME, MODEL_HASH, 101, 0).hashCode());
+        CUSTOM_MODEL.hashCode(), modelFactory.create(MODEL_NAME, MODEL_HASH, 101, 0).hashCode());
     assertNotEquals(
-        CUSTOM_MODEL.hashCode(), new CustomModel(MODEL_NAME, MODEL_HASH, 100, 101).hashCode());
+        CUSTOM_MODEL.hashCode(), modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 101).hashCode());
 
     assertEquals(
         CUSTOM_MODEL_URL.hashCode(),
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION).hashCode());
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION).hashCode());
     assertNotEquals(
         CUSTOM_MODEL_URL.hashCode(),
-        new CustomModel(MODEL_NAME, MODEL_HASH, 101, MODEL_URL, URL_EXPIRATION).hashCode());
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 101, MODEL_URL, URL_EXPIRATION).hashCode());
     assertNotEquals(
         CUSTOM_MODEL_URL.hashCode(),
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION + 10L).hashCode());
+        modelFactory
+            .create(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION + 10L)
+            .hashCode());
   }
 }
diff --git a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderTest.java b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderTest.java
index cc76d7a0a00..00b26ca493a 100644
--- a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderTest.java
+++ b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderTest.java
@@ -23,6 +23,7 @@
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -36,6 +37,7 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.FirebaseOptions.Builder;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.ml.modeldownloader.internal.CustomModelDownloadService;
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.ModelDownloadLogEvent.DownloadStatus;
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.ModelDownloadLogEvent.ErrorCode;
@@ -52,8 +54,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
@@ -78,21 +78,32 @@ public class FirebaseModelDownloaderTest {
   private static final CustomModelDownloadConditions DOWNLOAD_CONDITIONS =
       new CustomModelDownloadConditions.Builder().requireWifi().build();
 
-  private final CustomModel CUSTOM_MODEL = new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0);
-  private final CustomModel ORIG_CUSTOM_MODEL_URL =
-      new CustomModel(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION + 10L);
-  private final CustomModel UPDATE_CUSTOM_MODEL_URL =
-      new CustomModel(MODEL_NAME, UPDATE_MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION + 10L);
-  private final CustomModel UPDATE_IN_PROGRESS_CUSTOM_MODEL =
-      new CustomModel(MODEL_NAME, UPDATE_MODEL_HASH, 100, DOWNLOAD_ID);
+  private CustomModel CUSTOM_MODEL;
+  private CustomModel ORIG_CUSTOM_MODEL_URL;
+  private CustomModel UPDATE_CUSTOM_MODEL_URL;
+  private CustomModel UPDATE_IN_PROGRESS_CUSTOM_MODEL;
   private CustomModel customModelUpdateLoaded;
   private CustomModel customModelLoaded;
 
-  private @Mock SharedPreferencesUtil mockPrefs;
-  private @Mock ModelFileDownloadService mockFileDownloadService;
-  private @Mock CustomModelDownloadService mockModelDownloadService;
-  private @Mock ModelFileManager mockFileManager;
-  private @Mock FirebaseMlLogger mockEventLogger;
+  private final SharedPreferencesUtil mockPrefs = mock(SharedPreferencesUtil.class);
+  private final ModelFileDownloadService mockFileDownloadService =
+      mock(ModelFileDownloadService.class);
+  private final CustomModelDownloadService mockModelDownloadService =
+      mock(CustomModelDownloadService.class);
+  private final ModelFileManager mockFileManager = mock(ModelFileManager.class);
+  private final FirebaseMlLogger mockEventLogger = mock(FirebaseMlLogger.class);
+
+  private final CustomModel.Factory modelFactory =
+      (name, modelHash, fileSize, downloadId, localFilePath, downloadUrl, downloadUrlExpiry) ->
+          new CustomModel(
+              mockFileDownloadService,
+              name,
+              modelHash,
+              fileSize,
+              downloadId,
+              localFilePath,
+              downloadUrl,
+              downloadUrlExpiry);
 
   private FirebaseModelDownloader firebaseModelDownloader;
   private ExecutorService executor;
@@ -107,7 +118,14 @@ public class FirebaseModelDownloaderTest {
 
   @Before
   public void setUp() throws Exception {
-    MockitoAnnotations.initMocks(this);
+    CUSTOM_MODEL = modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0);
+    ORIG_CUSTOM_MODEL_URL =
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION + 10L);
+    UPDATE_CUSTOM_MODEL_URL =
+        modelFactory.create(MODEL_NAME, UPDATE_MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION + 10L);
+    UPDATE_IN_PROGRESS_CUSTOM_MODEL =
+        modelFactory.create(MODEL_NAME, UPDATE_MODEL_HASH, 100, DOWNLOAD_ID);
+
     FirebaseApp.clearInstancesForTest();
     FirebaseApp app =
         FirebaseApp.initializeApp(ApplicationProvider.getApplicationContext(), FIREBASE_OPTIONS);
@@ -120,7 +138,9 @@ public void setUp() throws Exception {
             mockModelDownloadService,
             mockFileManager,
             mockEventLogger,
-            executor);
+            TestOnlyExecutors.background(),
+            TestOnlyExecutors.blocking(),
+            modelFactory);
     setUpTestingFiles(app);
 
     doNothing().when(mockEventLogger).logDownloadEventWithExactDownloadTime(any(), any(), any());
@@ -131,7 +151,11 @@ public void setUp() throws Exception {
   }
 
   private void setUpTestingFiles(FirebaseApp app) throws Exception {
-    fileManager = new ModelFileManager(app);
+    fileManager =
+        new ModelFileManager(
+            app.getApplicationContext(),
+            app.getPersistenceKey(),
+            new SharedPreferencesUtil(app, modelFactory));
     final File testDir = new File(app.getApplicationContext().getNoBackupFilesDir(), "tmpModels");
     testDir.mkdirs();
     // make sure the directory is empty. Doesn't recurse into subdirs, but that's OK since
@@ -172,9 +196,9 @@ private void setUpTestingFiles(FirebaseApp app) throws Exception {
     fd2.close();
 
     customModelLoaded =
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0, expectedDestinationFolder + "/0");
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0, expectedDestinationFolder + "/0");
     customModelUpdateLoaded =
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0, expectedDestinationFolder + "/1");
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0, expectedDestinationFolder + "/1");
   }
 
   @After
@@ -210,7 +234,8 @@ public void getModel_latestModel_localExists_noUpdate() throws Exception {
   public void getModel_latestModel_localExists_noUpdate_MissingFile() throws Exception {
     // model with missing file.
     CustomModel missingFileModel =
-        new CustomModel(MODEL_NAME, UPDATE_MODEL_HASH, 100, 0, expectedDestinationFolder + "/4");
+        modelFactory.create(
+            MODEL_NAME, UPDATE_MODEL_HASH, 100, 0, expectedDestinationFolder + "/4");
     when(mockPrefs.getCustomModelDetails(eq(MODEL_NAME)))
         .thenReturn(missingFileModel)
         .thenReturn(customModelUpdateLoaded);
@@ -240,7 +265,7 @@ public void getModel_latestModel_localExists_noUpdate_MissingFile() throws Excep
 
   @Test
   public void getModel_latestModel_localExists_noUpdate_MissingDownloadId() throws Exception {
-    CustomModel badLocalModel = new CustomModel(MODEL_NAME, UPDATE_MODEL_HASH, 100, 0);
+    CustomModel badLocalModel = modelFactory.create(MODEL_NAME, UPDATE_MODEL_HASH, 100, 0);
     when(mockPrefs.getCustomModelDetails(eq(MODEL_NAME)))
         .thenReturn(badLocalModel) // getlocalModelDetails 1
         .thenReturn(null) // getCustomModelTask 1
@@ -275,7 +300,7 @@ public void getModel_latestModel_localExists_noUpdate_MissingDownloadId() throws
   @Test
   public void getModel_latestModel_localExists_noUpdate_inProgress() throws Exception {
     // model with no file yet.
-    CustomModel inProgressLocalModel = new CustomModel(MODEL_NAME, UPDATE_MODEL_HASH, 100, 88);
+    CustomModel inProgressLocalModel = modelFactory.create(MODEL_NAME, UPDATE_MODEL_HASH, 100, 88);
     when(mockPrefs.getCustomModelDetails(eq(MODEL_NAME)))
         .thenReturn(inProgressLocalModel) // getlocalModelDetails 1
         .thenReturn(inProgressLocalModel) // getCustomModelTask 1
@@ -356,7 +381,7 @@ public void getModel_latestModel_localExists_UpdateFound() throws Exception {
   @Test
   public void getModel_latestModel_localExists_DownloadInProgress() throws Exception {
     CustomModel customModelLoadedWithDownload =
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, 99, expectedDestinationFolder + "/0");
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 99, expectedDestinationFolder + "/0");
 
     when(mockPrefs.getCustomModelDetails(eq(MODEL_NAME))).thenReturn(customModelLoadedWithDownload);
     when(mockPrefs.getDownloadingCustomModelDetails(eq(MODEL_NAME)))
@@ -423,7 +448,6 @@ public void getModel_latestModel_noLocalModel_modelDownloadServiceFails() throws
     }
 
     verify(mockPrefs, times(2)).getCustomModelDetails(eq(MODEL_NAME));
-    verify(mockFileDownloadService, never()).loadNewlyDownloadedModelFile(any());
     assertThat(task.isComplete()).isTrue();
     assertThat(task.isSuccessful()).isFalse();
     assertTrue(task.getException().getMessage().contains("bad state"));
diff --git a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/ModelDownloaderTests.kt b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/ModelDownloaderTests.kt
new file mode 100644
index 00000000000..ca5398a1715
--- /dev/null
+++ b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/ModelDownloaderTests.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.ml.modeldownloader
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "1:1234567890:android:321abc456def7890"
+const val API_KEY = "AIzaSyDOCAbC123dEf456GhI789jKl012-MnO"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(AndroidJUnit4::class)
+class ModelDownloaderTests : BaseTestCase() {
+
+  @Test
+  fun `modelDownloader should delegate to FirebaseModelDownloader#getInstance()`() {
+    assertThat(Firebase.modelDownloader).isSameInstanceAs(FirebaseModelDownloader.getInstance())
+  }
+
+  @Test
+  fun `Firebase#modelDownloader(FirebaseApp) should delegate to FirebaseModelDownloader#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.modelDownloader(app))
+      .isSameInstanceAs(FirebaseModelDownloader.getInstance(app))
+  }
+
+  @Test
+  fun `CustomModelDownloadConditions builder works`() {
+    val conditions = customModelDownloadConditions {
+      requireCharging()
+      requireDeviceIdle()
+    }
+
+    assertThat(conditions.isChargingRequired).isEqualTo(true)
+    assertThat(conditions.isWifiRequired).isEqualTo(false)
+    assertThat(conditions.isDeviceIdleRequired).isEqualTo(true)
+  }
+
+  @Test
+  fun `CustomModel destructuring declarations work`() {
+    val app = Firebase.app(EXISTING_APP)
+
+    val modelName = "myModel"
+    val modelHash = "someHash"
+    val fileSize = 200L
+    val downloadId = 258L
+
+    val customModel =
+      Firebase.modelDownloader(app).modelFactory.create(modelName, modelHash, fileSize, downloadId)
+
+    val (_, size, id, hash, name) = customModel
+
+    assertThat(name).isEqualTo(customModel.name)
+    assertThat(hash).isEqualTo(customModel.modelHash)
+    assertThat(size).isEqualTo(customModel.size)
+    assertThat(id).isEqualTo(customModel.downloadId)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/CustomModelDownloadServiceTest.java b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/CustomModelDownloadServiceTest.java
index dec5f78d139..6f5a3634b9b 100644
--- a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/CustomModelDownloadServiceTest.java
+++ b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/CustomModelDownloadServiceTest.java
@@ -20,6 +20,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -52,6 +53,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -119,6 +121,20 @@ public Builder toBuilder() {
   private FirebaseInstallationsApi installationsApiMock;
   @Mock private FirebaseMlLogger mockEventLogger;
 
+  private final ModelFileDownloadService modelFileDownloadService =
+      mock(ModelFileDownloadService.class);
+  private final CustomModel.Factory modelFactory =
+      (name, modelHash, fileSize, downloadId, localFilePath, downloadUrl, downloadUrlExpiry) ->
+          new CustomModel(
+              modelFileDownloadService,
+              name,
+              modelHash,
+              fileSize,
+              downloadId,
+              localFilePath,
+              downloadUrl,
+              downloadUrlExpiry);
+
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
@@ -170,18 +186,20 @@ public void downloadService_noHashSuccess() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             PACKAGE_FINGERPRINT_HASH,
             TEST_ENDPOINT,
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getNewDownloadUrlWithExpiry(PROJECT_ID, MODEL_NAME);
 
     Assert.assertEquals(
         modelTask.getResult(),
-        new CustomModel(MODEL_NAME, MODEL_HASH, FILE_SIZE, DOWNLOAD_URI, TEST_EXPIRATION_IN_MS));
+        modelFactory.create(
+            MODEL_NAME, MODEL_HASH, FILE_SIZE, DOWNLOAD_URI, TEST_EXPIRATION_IN_MS));
 
     WireMock.verify(
         getRequestedFor(urlEqualTo(downloadPath))
@@ -218,18 +236,20 @@ public void downloadService_fingerPrintHashNull_NoCertHeader() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             null,
             TEST_ENDPOINT,
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getNewDownloadUrlWithExpiry(PROJECT_ID, MODEL_NAME);
 
     Assert.assertEquals(
         modelTask.getResult(),
-        new CustomModel(MODEL_NAME, MODEL_HASH, FILE_SIZE, DOWNLOAD_URI, TEST_EXPIRATION_IN_MS));
+        modelFactory.create(
+            MODEL_NAME, MODEL_HASH, FILE_SIZE, DOWNLOAD_URI, TEST_EXPIRATION_IN_MS));
 
     WireMock.verify(
         getRequestedFor(urlEqualTo(downloadPath))
@@ -264,18 +284,20 @@ public void downloadService_withHashSuccess_noMatch() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             PACKAGE_FINGERPRINT_HASH,
             TEST_ENDPOINT,
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getCustomModelDetails(PROJECT_ID, MODEL_NAME, MODEL_HASH);
 
     Assert.assertEquals(
         modelTask.getResult(),
-        new CustomModel(MODEL_NAME, MODEL_HASH, FILE_SIZE, DOWNLOAD_URI, TEST_EXPIRATION_IN_MS));
+        modelFactory.create(
+            MODEL_NAME, MODEL_HASH, FILE_SIZE, DOWNLOAD_URI, TEST_EXPIRATION_IN_MS));
 
     WireMock.verify(
         getRequestedFor(urlEqualTo(downloadPath))
@@ -312,12 +334,13 @@ public void downloadService_withHashSuccess_match() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             PACKAGE_FINGERPRINT_HASH,
             TEST_ENDPOINT,
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getCustomModelDetails(PROJECT_ID, MODEL_NAME, MODEL_HASH);
 
@@ -361,12 +384,13 @@ public void downloadService_modelNotFound() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             PACKAGE_FINGERPRINT_HASH,
             TEST_ENDPOINT,
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getCustomModelDetails(PROJECT_ID, MODEL_NAME, MODEL_HASH);
 
@@ -413,12 +437,13 @@ public void downloadService_badRequest() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             PACKAGE_FINGERPRINT_HASH,
             TEST_ENDPOINT,
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getCustomModelDetails(PROJECT_ID, MODEL_NAME, MODEL_HASH);
 
@@ -471,12 +496,13 @@ public void downloadService_forbidden() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             PACKAGE_FINGERPRINT_HASH,
             TEST_ENDPOINT,
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getCustomModelDetails(PROJECT_ID, MODEL_NAME, MODEL_HASH);
 
@@ -529,12 +555,13 @@ public void downloadService_internalError() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             PACKAGE_FINGERPRINT_HASH,
             TEST_ENDPOINT,
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getCustomModelDetails(PROJECT_ID, MODEL_NAME, MODEL_HASH);
 
@@ -586,12 +613,13 @@ public void downloadService_tooManyRequest() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             PACKAGE_FINGERPRINT_HASH,
             TEST_ENDPOINT,
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getCustomModelDetails(PROJECT_ID, MODEL_NAME, MODEL_HASH);
 
@@ -641,12 +669,13 @@ public void downloadService_authenticationIssue() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             PACKAGE_FINGERPRINT_HASH,
             TEST_ENDPOINT,
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getCustomModelDetails(PROJECT_ID, MODEL_NAME, MODEL_HASH);
 
@@ -688,12 +717,13 @@ public void downloadService_unauthenticatedToken() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             PACKAGE_FINGERPRINT_HASH,
             TEST_ENDPOINT,
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getCustomModelDetails(PROJECT_ID, MODEL_NAME, MODEL_HASH);
 
@@ -708,17 +738,51 @@ public void downloadService_unauthenticatedToken() {
             any(), eq(false), eq(ErrorCode.MODEL_INFO_DOWNLOAD_CONNECTION_FAILED.getValue()));
   }
 
+  @Test
+  public void downloadService_nullModelHashPassedUnauthenticatedToken() {
+    when(installationsApiMock.getToken(anyBoolean()))
+        .thenReturn(Tasks.forException(new IllegalArgumentException("bad request")));
+
+    CustomModelDownloadService service =
+        new CustomModelDownloadService(
+            ApplicationProvider.getApplicationContext(),
+            () -> installationsApiMock,
+            directExecutor,
+            API_KEY,
+            PACKAGE_FINGERPRINT_HASH,
+            TEST_ENDPOINT,
+            mockEventLogger,
+            modelFactory);
+
+    Task<CustomModel> modelTask = service.getCustomModelDetails(PROJECT_ID, MODEL_NAME, null);
+
+    Assert.assertTrue(modelTask.getException() instanceof FirebaseMlException);
+    Assert.assertEquals(
+        ((FirebaseMlException) modelTask.getException()).getCode(),
+        FirebaseMlException.UNAUTHENTICATED);
+    Assert.assertTrue(modelTask.getException().getMessage().contains("authentication error"));
+
+    ArgumentCaptor<CustomModel> captor = ArgumentCaptor.forClass(CustomModel.class);
+    verify(mockEventLogger, times(1))
+        .logDownloadFailureWithReason(
+            captor.capture(),
+            eq(false),
+            eq(ErrorCode.MODEL_INFO_DOWNLOAD_CONNECTION_FAILED.getValue()));
+    assertThat(captor.getValue().getModelHash()).isNotNull();
+  }
+
   @Test
   public void downloadService_malFormedUrl() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             PACKAGE_FINGERPRINT_HASH,
             "https7://localhost:8989/barUrl",
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getCustomModelDetails(PROJECT_ID, MODEL_NAME, MODEL_HASH);
 
@@ -741,12 +805,13 @@ public void downloadService_unauthenticatedToken_noNetworkConnection() {
     CustomModelDownloadService service =
         new CustomModelDownloadService(
             ApplicationProvider.getApplicationContext(),
-            installationsApiMock,
+            () -> installationsApiMock,
             directExecutor,
             API_KEY,
             PACKAGE_FINGERPRINT_HASH,
             TEST_ENDPOINT,
-            mockEventLogger);
+            mockEventLogger,
+            modelFactory);
 
     Task<CustomModel> modelTask = service.getCustomModelDetails(PROJECT_ID, MODEL_NAME, MODEL_HASH);
 
diff --git a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/DataTransportMlEventSenderTest.java b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/DataTransportMlEventSenderTest.java
index 4ca7f441664..576280c8c87 100644
--- a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/DataTransportMlEventSenderTest.java
+++ b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/DataTransportMlEventSenderTest.java
@@ -18,13 +18,16 @@
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import com.google.android.datatransport.Transport;
+import com.google.android.datatransport.TransportFactory;
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.EventName;
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.SystemInfo;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -32,6 +35,7 @@
 @RunWith(RobolectricTestRunner.class)
 public class DataTransportMlEventSenderTest {
 
+  @Mock private TransportFactory mockTransportFactory;
   @Mock private Transport<FirebaseMlLogEvent> mockTransport;
 
   private DataTransportMlEventSender statsSender;
@@ -48,7 +52,10 @@ public class DataTransportMlEventSenderTest {
   @Before
   public void setup() {
     MockitoAnnotations.initMocks(this);
-    statsSender = new DataTransportMlEventSender(mockTransport);
+    when(mockTransportFactory.getTransport(
+            any(), ArgumentMatchers.<Class<FirebaseMlLogEvent>>any(), any(), any()))
+        .thenReturn(mockTransport);
+    statsSender = new DataTransportMlEventSender(() -> mockTransportFactory);
   }
 
   @Test
diff --git a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLoggerTest.java b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLoggerTest.java
index 7903278ccfe..501f17df49a 100644
--- a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLoggerTest.java
+++ b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLoggerTest.java
@@ -18,6 +18,7 @@
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.times;
@@ -33,6 +34,7 @@
 import com.google.firebase.ml.modeldownloader.BuildConfig;
 import com.google.firebase.ml.modeldownloader.CustomModel;
 import com.google.firebase.ml.modeldownloader.FirebaseMlException;
+import com.google.firebase.ml.modeldownloader.FirebaseModelDownloader;
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.DeleteModelLogEvent;
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.EventName;
 import com.google.firebase.ml.modeldownloader.internal.FirebaseMlLogEvent.ModelDownloadLogEvent;
@@ -45,9 +47,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
@@ -69,26 +69,42 @@ public class FirebaseMlLoggerTest {
   private static final String MODEL_HASH = "dsf324";
   private static final long SYSTEM_TIME = 2000;
   private static final Long DOWNLOAD_ID = 987923L;
-  private static final CustomModel CUSTOM_MODEL_DOWNLOADING =
-      new CustomModel(MODEL_NAME, MODEL_HASH, 100, DOWNLOAD_ID);
+  private CustomModel CUSTOM_MODEL_DOWNLOADING;
   private static final ModelOptions MODEL_OPTIONS =
       ModelOptions.builder()
           .setModelInfo(ModelInfo.builder().setName(MODEL_NAME).setHash(MODEL_HASH).build())
           .build();
 
-  @Mock private SharedPreferencesUtil mockSharedPreferencesUtil;
-  @Mock private DataTransportMlEventSender mockStatsSender;
+  private final SharedPreferencesUtil mockSharedPreferencesUtil = mock(SharedPreferencesUtil.class);
+  private final DataTransportMlEventSender mockStatsSender = mock(DataTransportMlEventSender.class);
 
   private FirebaseMlLogger mlLogger;
+  private CustomModel.Factory modelFactory;
 
   @Before
   public void setUp() throws NameNotFoundException {
-    MockitoAnnotations.initMocks(this);
     FirebaseApp.clearInstancesForTest();
     FirebaseApp app =
         FirebaseApp.initializeApp(ApplicationProvider.getApplicationContext(), FIREBASE_OPTIONS);
 
-    mlLogger = new FirebaseMlLogger(app, mockSharedPreferencesUtil, mockStatsSender);
+    modelFactory = FirebaseModelDownloader.getInstance(app).getModelFactory();
+    mlLogger =
+        new FirebaseMlLogger(
+            FIREBASE_OPTIONS,
+            mockSharedPreferencesUtil,
+            mockStatsSender,
+            () -> ApplicationProvider.getApplicationContext().getPackageName(),
+            () -> {
+              try {
+                return String.valueOf(
+                    app.getApplicationContext()
+                        .getPackageManager()
+                        .getPackageInfo(app.getApplicationContext().getPackageName(), 0)
+                        .versionCode);
+              } catch (NameNotFoundException e) {
+                return "";
+              }
+            });
     systemInfo =
         SystemInfo.builder()
             .setFirebaseProjectId(TEST_PROJECT_ID)
@@ -109,6 +125,7 @@ public void setUp() throws NameNotFoundException {
     doNothing().when(mockSharedPreferencesUtil).setModelDownloadCompleteTimeMs(any(), anyLong());
     when(mockSharedPreferencesUtil.getCustomModelStatsCollectionFlag()).thenReturn(true);
     SystemClock.setCurrentTimeMillis(SYSTEM_TIME + 500);
+    CUSTOM_MODEL_DOWNLOADING = modelFactory.create(MODEL_NAME, MODEL_HASH, 100, DOWNLOAD_ID);
   }
 
   @Test
diff --git a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/ModelFileDownloadServiceTest.java b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/ModelFileDownloadServiceTest.java
index f431ebbeb70..6f3c186bdfd 100644
--- a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/ModelFileDownloadServiceTest.java
+++ b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/ModelFileDownloadServiceTest.java
@@ -26,6 +26,7 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -54,15 +55,16 @@
 import java.util.Date;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicReference;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.LooperMode;
 
 @RunWith(RobolectricTestRunner.class)
+@LooperMode(LooperMode.Mode.LEGACY)
 public class ModelFileDownloadServiceTest {
 
   private static final String TEST_PROJECT_ID = "777777777777";
@@ -81,16 +83,11 @@ public class ModelFileDownloadServiceTest {
   private static final long URL_EXPIRATION_FUTURE = (new Date()).getTime() + 600000;
   private static final Long DOWNLOAD_ID = 987923L;
 
-  private static final CustomModel CUSTOM_MODEL_PREVIOUS_LOADED =
-      new CustomModel(MODEL_NAME, MODEL_HASH + "2", 105, 0, "FakeFile/path.tflite");
-  private static final CustomModel CUSTOM_MODEL_NO_URL =
-      new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0);
-  private static final CustomModel CUSTOM_MODEL_URL =
-      new CustomModel(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION_FUTURE);
-  private static final CustomModel CUSTOM_MODEL_EXPIRED_URL =
-      new CustomModel(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION_OLD);
-  private static final CustomModel CUSTOM_MODEL_DOWNLOADING =
-      new CustomModel(MODEL_NAME, MODEL_HASH, 100, DOWNLOAD_ID);
+  private CustomModel CUSTOM_MODEL_PREVIOUS_LOADED;
+  private CustomModel CUSTOM_MODEL_NO_URL;
+  private CustomModel CUSTOM_MODEL_URL;
+  private CustomModel CUSTOM_MODEL_EXPIRED_URL;
+  private CustomModel CUSTOM_MODEL_DOWNLOADING;
   CustomModel customModelDownloadComplete;
 
   private static final CustomModelDownloadConditions DOWNLOAD_CONDITIONS_CHARGING_IDLE =
@@ -99,52 +96,77 @@ public class ModelFileDownloadServiceTest {
   File testTempModelFile;
   File testAppModelFile;
 
+  private final DownloadManager mockDownloadManager = mock(DownloadManager.class);
+  private final ModelFileManager mockFileManager = mock(ModelFileManager.class);
+  private final FirebaseMlLogger mockStatsLogger = mock(FirebaseMlLogger.class);
+
+  private final ExecutorService executor = Executors.newSingleThreadExecutor();
+
   private ModelFileDownloadService modelFileDownloadService;
 
   private ModelFileDownloadService modelFileDownloadServiceInitialLoad;
   private SharedPreferencesUtil sharedPreferencesUtil;
-  @Mock DownloadManager mockDownloadManager;
-  @Mock ModelFileManager mockFileManager;
-  @Mock FirebaseMlLogger mockStatsLogger;
+  private CustomModel.Factory modelFactory;
 
-  ExecutorService executor;
   private MatrixCursor matrixCursor;
   FirebaseApp app;
 
   @Before
   public void setUp() throws IOException {
-    MockitoAnnotations.initMocks(this);
     FirebaseApp.clearInstancesForTest();
     app = FirebaseApp.initializeApp(ApplicationProvider.getApplicationContext(), FIREBASE_OPTIONS);
 
-    executor = Executors.newSingleThreadExecutor();
-    sharedPreferencesUtil = new SharedPreferencesUtil(app);
+    AtomicReference<ModelFileDownloadService> serviceRef = new AtomicReference<>();
+    modelFactory =
+        (name, modelHash, fileSize, downloadId, localFilePath, downloadUrl, downloadUrlExpiry) ->
+            new CustomModel(
+                serviceRef.get(),
+                name,
+                modelHash,
+                fileSize,
+                downloadId,
+                localFilePath,
+                downloadUrl,
+                downloadUrlExpiry);
+    sharedPreferencesUtil = new SharedPreferencesUtil(app, modelFactory);
     sharedPreferencesUtil.clearModelDetails(MODEL_NAME);
 
     modelFileDownloadService =
         new ModelFileDownloadService(
-            app,
+            ApplicationProvider.getApplicationContext(),
             mockDownloadManager,
             mockFileManager,
             sharedPreferencesUtil,
             mockStatsLogger,
-            false);
+            false,
+            modelFactory);
+    serviceRef.set(modelFileDownloadService);
 
     modelFileDownloadServiceInitialLoad =
         new ModelFileDownloadService(
-            app,
+            ApplicationProvider.getApplicationContext(),
             mockDownloadManager,
             mockFileManager,
             sharedPreferencesUtil,
             mockStatsLogger,
-            true);
+            true,
+            modelFactory);
+
+    CUSTOM_MODEL_PREVIOUS_LOADED =
+        modelFactory.create(MODEL_NAME, MODEL_HASH + "2", 105, 0, "FakeFile/path.tflite");
+    CUSTOM_MODEL_NO_URL = modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0);
+    CUSTOM_MODEL_URL =
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION_FUTURE);
+    CUSTOM_MODEL_EXPIRED_URL =
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, URL_EXPIRATION_OLD);
+    CUSTOM_MODEL_DOWNLOADING = modelFactory.create(MODEL_NAME, MODEL_HASH, 100, DOWNLOAD_ID);
 
     matrixCursor = new MatrixCursor(new String[] {DownloadManager.COLUMN_STATUS});
     testTempModelFile = File.createTempFile("fakeTempFile", ".tflite");
 
     testAppModelFile = File.createTempFile("fakeAppFile", ".tflite");
     customModelDownloadComplete =
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0, testAppModelFile.getPath());
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0, testAppModelFile.getPath());
   }
 
   @After
@@ -410,7 +432,7 @@ public void ensureModelDownloaded_downloadFailed_urlExpiry() {
     when(mockDownloadManager.query(any())).thenReturn(matrixCursor);
 
     CustomModel justAboutToExpireModel =
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, (new Date()).getTime() + 3);
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, (new Date()).getTime() + 3);
 
     TestOnCompleteListener<Void> onCompleteListener = new TestOnCompleteListener<>();
     Task<Void> task = modelFileDownloadService.ensureModelDownloaded(justAboutToExpireModel);
@@ -609,7 +631,7 @@ public void ensureModelDownloaded_alreadyInProgess_UrlExpired() throws Exception
 
     // set up the first request
     CustomModel justAboutToExpireModel =
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, (new Date()).getTime() + 30);
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, MODEL_URL, (new Date()).getTime() + 30);
     TestOnCompleteListener<Void> onCompleteListener = new TestOnCompleteListener<>();
     Task<Void> task = modelFileDownloadService.ensureModelDownloaded(justAboutToExpireModel);
     task.addOnCompleteListener(executor, onCompleteListener);
@@ -818,7 +840,8 @@ public void maybeCheckDownloadingComplete_downloadInprogress() {
   public void maybeCheckDownloadingComplete_multipleDownloads() throws Exception {
     sharedPreferencesUtil.setDownloadingCustomModelDetails(CUSTOM_MODEL_DOWNLOADING);
     String secondModelName = "secondModelName";
-    CustomModel downloading2 = new CustomModel(secondModelName, MODEL_HASH, 100, DOWNLOAD_ID + 1);
+    CustomModel downloading2 =
+        modelFactory.create(secondModelName, MODEL_HASH, 100, DOWNLOAD_ID + 1);
     sharedPreferencesUtil.setDownloadingCustomModelDetails(downloading2);
 
     assertNull(modelFileDownloadService.getDownloadingModelStatusCode(0L));
@@ -837,7 +860,7 @@ public void maybeCheckDownloadingComplete_multipleDownloads() throws Exception {
         sharedPreferencesUtil.getCustomModelDetails(MODEL_NAME), customModelDownloadComplete);
     assertEquals(
         sharedPreferencesUtil.getCustomModelDetails(secondModelName),
-        new CustomModel(secondModelName, MODEL_HASH, 100, 0, testAppModelFile.getPath()));
+        modelFactory.create(secondModelName, MODEL_HASH, 100, 0, testAppModelFile.getPath()));
     verify(mockDownloadManager, times(5)).query(any());
     verify(mockDownloadManager, times(2)).remove(anyLong());
   }
diff --git a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/ModelFileManagerTest.java b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/ModelFileManagerTest.java
index ce7da3c9f89..0c70673a63c 100644
--- a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/ModelFileManagerTest.java
+++ b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/ModelFileManagerTest.java
@@ -25,6 +25,7 @@
 import com.google.firebase.FirebaseOptions.Builder;
 import com.google.firebase.ml.modeldownloader.CustomModel;
 import com.google.firebase.ml.modeldownloader.FirebaseMlException;
+import com.google.firebase.ml.modeldownloader.FirebaseModelDownloader;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -51,8 +52,8 @@ public class ModelFileManagerTest {
   public static final String MODEL_NAME_2 = "MODEL_NAME_2";
   public static final String MODEL_HASH_2 = "hash2";
 
-  final CustomModel CUSTOM_MODEL_NO_FILE = new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0);
-  final CustomModel CUSTOM_MODEL_NO_FILE_2 = new CustomModel(MODEL_NAME_2, MODEL_HASH_2, 101, 0);
+  private CustomModel CUSTOM_MODEL_NO_FILE;
+  private CustomModel CUSTOM_MODEL_NO_FILE_2;
 
   private File testModelFile;
   private File testModelFile2;
@@ -60,7 +61,8 @@ public class ModelFileManagerTest {
   ModelFileManager fileManager;
   FirebaseApp app;
   private SharedPreferencesUtil sharedPreferencesUtil;
-  String modelDestinationFolder;
+  private String modelDestinationFolder;
+  private CustomModel.Factory modelFactory;
 
   @Before
   public void setUp() throws IOException {
@@ -68,10 +70,18 @@ public void setUp() throws IOException {
     FirebaseApp.clearInstancesForTest();
     app = FirebaseApp.initializeApp(ApplicationProvider.getApplicationContext(), FIREBASE_OPTIONS);
 
-    sharedPreferencesUtil = new SharedPreferencesUtil(app);
-    fileManager = new ModelFileManager(app);
+    modelFactory = FirebaseModelDownloader.getInstance(app).getModelFactory();
+
+    sharedPreferencesUtil = new SharedPreferencesUtil(app, modelFactory);
+    fileManager =
+        new ModelFileManager(
+            ApplicationProvider.getApplicationContext(),
+            app.getPersistenceKey(),
+            sharedPreferencesUtil);
 
     modelDestinationFolder = setUpTestingFiles(app, MODEL_NAME);
+    CUSTOM_MODEL_NO_FILE = modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0);
+    CUSTOM_MODEL_NO_FILE_2 = modelFactory.create(MODEL_NAME_2, MODEL_HASH_2, 101, 0);
   }
 
   private String setUpTestingFiles(FirebaseApp app, String modelName) throws IOException {
@@ -181,20 +191,43 @@ public void deleteNonLatestCustomModels_fileToDelete()
     MoveFileToDestination(modelDestinationFolder, testModelFile2, CUSTOM_MODEL_NO_FILE, 1);
 
     sharedPreferencesUtil.setLoadedCustomModelDetails(
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0, modelDestinationFolder + "/1"));
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0, modelDestinationFolder + "/1"));
     fileManager.deleteNonLatestCustomModels();
 
     assertFalse(new File(modelDestinationFolder + "/0").exists());
     assertTrue(new File(modelDestinationFolder + "/1").exists());
   }
 
+  @Test
+  public void deleteNonLatestCustomModels_whenModelOnDiskButNotInPreferences()
+      throws FirebaseMlException, IOException {
+    String modelDestinationFolder2 = setUpTestingFiles(app, MODEL_NAME_2);
+
+    // Was just downloaded
+    MoveFileToDestination(modelDestinationFolder, testModelFile, CUSTOM_MODEL_NO_FILE, 0);
+    // Was downloaded previously via FirebaseModelManager
+    MoveFileToDestination(modelDestinationFolder2, testModelFile2, CUSTOM_MODEL_NO_FILE_2, 0);
+
+    sharedPreferencesUtil.setLoadedCustomModelDetails(
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0, modelDestinationFolder + "/0"));
+
+    // Download in progress, hence file path is not present
+    sharedPreferencesUtil.setLoadedCustomModelDetails(
+        modelFactory.create(MODEL_NAME_2, MODEL_HASH_2, 100, 0));
+
+    fileManager.deleteNonLatestCustomModels();
+
+    assertTrue(new File(modelDestinationFolder + "/0").exists());
+    assertTrue(new File(modelDestinationFolder2 + "/0").exists());
+  }
+
   @Test
   public void deleteNonLatestCustomModels_noFileToDelete()
       throws FirebaseMlException, FileNotFoundException {
     MoveFileToDestination(modelDestinationFolder, testModelFile, CUSTOM_MODEL_NO_FILE, 0);
 
     sharedPreferencesUtil.setLoadedCustomModelDetails(
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0, modelDestinationFolder + "/0"));
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0, modelDestinationFolder + "/0"));
     fileManager.deleteNonLatestCustomModels();
 
     assertTrue(new File(modelDestinationFolder + "/0").exists());
@@ -207,14 +240,14 @@ public void deleteNonLatestCustomModels_multipleNamedModels()
     MoveFileToDestination(modelDestinationFolder, testModelFile2, CUSTOM_MODEL_NO_FILE, 1);
 
     sharedPreferencesUtil.setLoadedCustomModelDetails(
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0, modelDestinationFolder + "/1"));
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0, modelDestinationFolder + "/1"));
 
     String modelDestinationFolder2 = setUpTestingFiles(app, MODEL_NAME_2);
     MoveFileToDestination(modelDestinationFolder2, testModelFile, CUSTOM_MODEL_NO_FILE_2, 0);
     MoveFileToDestination(modelDestinationFolder2, testModelFile2, CUSTOM_MODEL_NO_FILE_2, 1);
 
     sharedPreferencesUtil.setLoadedCustomModelDetails(
-        new CustomModel(MODEL_NAME_2, MODEL_HASH_2, 101, 0, modelDestinationFolder2 + "/1"));
+        modelFactory.create(MODEL_NAME_2, MODEL_HASH_2, 101, 0, modelDestinationFolder2 + "/1"));
 
     fileManager.deleteNonLatestCustomModels();
 
@@ -274,14 +307,14 @@ public void deleteOldModels_multipleNamedModels() throws FirebaseMlException, IO
     MoveFileToDestination(modelDestinationFolder, testModelFile2, CUSTOM_MODEL_NO_FILE, 1);
 
     sharedPreferencesUtil.setLoadedCustomModelDetails(
-        new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0, modelDestinationFolder + "/1"));
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0, modelDestinationFolder + "/1"));
 
     String modelDestinationFolder2 = setUpTestingFiles(app, MODEL_NAME_2);
     MoveFileToDestination(modelDestinationFolder2, testModelFile, CUSTOM_MODEL_NO_FILE_2, 0);
     MoveFileToDestination(modelDestinationFolder2, testModelFile2, CUSTOM_MODEL_NO_FILE_2, 1);
 
     sharedPreferencesUtil.setLoadedCustomModelDetails(
-        new CustomModel(MODEL_NAME_2, MODEL_HASH_2, 101, 0, modelDestinationFolder2 + "/1"));
+        modelFactory.create(MODEL_NAME_2, MODEL_HASH_2, 101, 0, modelDestinationFolder2 + "/1"));
 
     fileManager.deleteOldModels(MODEL_NAME, modelDestinationFolder + "/1");
 
diff --git a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtilTest.java b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtilTest.java
index 5bd1722b603..22c4fb442f4 100644
--- a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtilTest.java
+++ b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/SharedPreferencesUtilTest.java
@@ -25,6 +25,7 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.ml.modeldownloader.CustomModel;
+import com.google.firebase.ml.modeldownloader.FirebaseModelDownloader;
 import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
@@ -39,14 +40,12 @@ public class SharedPreferencesUtilTest {
   private static final String TEST_PROJECT_ID = "777777777777";
   private static final String MODEL_NAME = "ModelName";
   private static final String MODEL_HASH = "dsf324";
-  private static final CustomModel CUSTOM_MODEL_DOWNLOAD_COMPLETE =
-      new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0, "file/path/store/ModelName/1");
-  private static final CustomModel CUSTOM_MODEL_UPDATE_IN_BACKGROUND =
-      new CustomModel(MODEL_NAME, MODEL_HASH, 100, 986, "file/path/store/ModelName/1");
-  private static final CustomModel CUSTOM_MODEL_DOWNLOADING =
-      new CustomModel(MODEL_NAME, MODEL_HASH, 100, 986);
+  private CustomModel CUSTOM_MODEL_DOWNLOAD_COMPLETE;
+  private CustomModel CUSTOM_MODEL_UPDATE_IN_BACKGROUND;
+  private CustomModel CUSTOM_MODEL_DOWNLOADING;
   private SharedPreferencesUtil sharedPreferencesUtil;
   private FirebaseApp app;
+  private CustomModel.Factory modelFactory;
 
   @Before
   public void setUp() {
@@ -60,10 +59,17 @@ public void setUp() {
                 .setProjectId(TEST_PROJECT_ID)
                 .build());
 
+    modelFactory = FirebaseModelDownloader.getInstance(app).getModelFactory();
+
     app.setDataCollectionDefaultEnabled(Boolean.TRUE);
     // default sharedPreferenceUtil
-    sharedPreferencesUtil = new SharedPreferencesUtil(app);
+    sharedPreferencesUtil = new SharedPreferencesUtil(app, modelFactory);
     assertNotNull(sharedPreferencesUtil);
+    CUSTOM_MODEL_DOWNLOAD_COMPLETE =
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 0, "file/path/store/ModelName/1");
+    CUSTOM_MODEL_UPDATE_IN_BACKGROUND =
+        modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 986, "file/path/store/ModelName/1");
+    CUSTOM_MODEL_DOWNLOADING = modelFactory.create(MODEL_NAME, MODEL_HASH, 100, 986);
   }
 
   @Test
@@ -158,11 +164,13 @@ public void listDownloadedModels_multipleModels() {
     sharedPreferencesUtil.setLoadedCustomModelDetails(CUSTOM_MODEL_DOWNLOAD_COMPLETE);
 
     CustomModel model2 =
-        new CustomModel(MODEL_NAME + "2", MODEL_HASH + "2", 102, 0, "file/path/store/ModelName2/1");
+        modelFactory.create(
+            MODEL_NAME + "2", MODEL_HASH + "2", 102, 0, "file/path/store/ModelName2/1");
     sharedPreferencesUtil.setLoadedCustomModelDetails(model2);
 
     CustomModel model3 =
-        new CustomModel(MODEL_NAME + "3", MODEL_HASH + "3", 103, 0, "file/path/store/ModelName3/1");
+        modelFactory.create(
+            MODEL_NAME + "3", MODEL_HASH + "3", 103, 0, "file/path/store/ModelName3/1");
 
     sharedPreferencesUtil.setLoadedCustomModelDetails(model3);
 
@@ -185,7 +193,7 @@ public void getCustomModelStatsCollectionFlag_defaultFirebaseAppTrue() {
   public void getCustomModelStatsCollectionFlag_defaultFirebaseAppFalse() {
     app.setDataCollectionDefaultEnabled(Boolean.FALSE);
     // default sharedPreferenceUtil
-    SharedPreferencesUtil disableLogUtil = new SharedPreferencesUtil(app);
+    SharedPreferencesUtil disableLogUtil = new SharedPreferencesUtil(app, modelFactory);
     assertEquals(
         disableLogUtil.getCustomModelStatsCollectionFlag(), app.isDataCollectionDefaultEnabled());
     assertFalse(disableLogUtil.getCustomModelStatsCollectionFlag());
@@ -195,7 +203,7 @@ public void getCustomModelStatsCollectionFlag_defaultFirebaseAppFalse() {
   public void getCustomModelStatsCollectionFlag_overrideFirebaseAppFalse() {
     app.setDataCollectionDefaultEnabled(Boolean.FALSE);
     // default sharedPreferenceUtil
-    SharedPreferencesUtil sharedPreferencesUtil2 = new SharedPreferencesUtil(app);
+    SharedPreferencesUtil sharedPreferencesUtil2 = new SharedPreferencesUtil(app, modelFactory);
     sharedPreferencesUtil2.setCustomModelStatsCollectionEnabled(true);
     assertEquals(sharedPreferencesUtil2.getCustomModelStatsCollectionFlag(), true);
     assertTrue(sharedPreferencesUtil2.getCustomModelStatsCollectionFlag());
diff --git a/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/ktx/ModelDownloaderTests.kt b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/ktx/ModelDownloaderTests.kt
new file mode 100644
index 00000000000..e88df2d6946
--- /dev/null
+++ b/firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/ktx/ModelDownloaderTests.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.ml.modeldownloader.ktx
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.ml.modeldownloader.FirebaseModelDownloader
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "1:1234567890:android:321abc456def7890"
+const val API_KEY = "AIzaSyDOCAbC123dEf456GhI789jKl012-MnO"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(AndroidJUnit4::class)
+class ModelDownloaderTests : BaseTestCase() {
+
+  @Test
+  fun `modelDownloader should delegate to FirebaseModelDownloader#getInstance()`() {
+    assertThat(Firebase.modelDownloader).isSameInstanceAs(FirebaseModelDownloader.getInstance())
+  }
+
+  @Test
+  fun `Firebase#modelDownloader(FirebaseApp) should delegate to FirebaseModelDownloader#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.modelDownloader(app))
+      .isSameInstanceAs(FirebaseModelDownloader.getInstance(app))
+  }
+
+  @Test
+  fun `CustomModelDownloadConditions builder works`() {
+    val conditions = customModelDownloadConditions {
+      requireCharging()
+      requireDeviceIdle()
+    }
+
+    assertThat(conditions.isChargingRequired).isEqualTo(true)
+    assertThat(conditions.isWifiRequired).isEqualTo(false)
+    assertThat(conditions.isDeviceIdleRequired).isEqualTo(true)
+  }
+
+  @Test
+  fun `CustomModel destructuring declarations work`() {
+    val app = Firebase.app(EXISTING_APP)
+
+    val modelName = "myModel"
+    val modelHash = "someHash"
+    val fileSize = 200L
+    val downloadId = 258L
+
+    val customModel =
+      Firebase.modelDownloader(app).modelFactory.create(modelName, modelHash, fileSize, downloadId)
+
+    val (_, size, id, hash, name) = customModel
+
+    assertThat(name).isEqualTo(customModel.name)
+    assertThat(hash).isEqualTo(customModel.modelHash)
+    assertThat(size).isEqualTo(customModel.size)
+    assertThat(id).isEqualTo(customModel.downloadId)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-perf/CHANGELOG.md b/firebase-perf/CHANGELOG.md
index b7c4d7c056b..7d57a9c0502 100644
--- a/firebase-perf/CHANGELOG.md
+++ b/firebase-perf/CHANGELOG.md
@@ -1,311 +1,387 @@
-# Firebase Performance Monitoring SDK (aka `firebase-perf` and `firebase-perf-ktx`)
+# Unreleased
 
-Refer [GMaven](https://maven.google.com/web/index.html?q=firebase-perf#com.google.firebase:firebase-perf) for the release artifacts and [Firebase Android Release Notes](https://firebase.google.com/support/release-notes/android) for the release info.
 
-## Example Changelog
+# 21.0.0
+* [changed] Bump internal dependencies
 
-```
-## vX.Y.Z (MXX)
 
-#### Android library / Kotlin extensions
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-* {{feature}} You can now do this cool new thing. For more details, refer to the [documentation](docs/path).
+# 20.5.2
+* [changed] Bump internal dependencies.
 
-* {{fixed}} Fixed the `methodFoo` warning.
 
-* {{changed}} You need to do _this_ instead of _that_.
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-```
+# 20.5.1
+* [changed] Make Fireperf generate its own session Id.
 
-> **Note:** Refer go/firebase-android-release for `MXX` info.
+# 20.5.0
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-perf-ktx`
+  to `com.google.firebase:firebase-perf` under the `com.google.firebase.perf` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-perf-ktx` have been added to
+  `com.google.firebase:firebase-perf` under the `com.google.firebase.perf` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-perf-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
 
-## Unreleased
-*   {{feature}} Enable global custom attributes on Network Requests
-*   {{fixed}} Update log statement to differentiate event drop because of rate limiting and sampling.
+# 20.4.1
+* [changed] Updated `firebase-sessions` dependency to v1.0.2
+* [fixed] Make fireperf data collection state is reliable for Firebase Sessions library.
 
-## Released
+# 20.4.0
+* [feature] Integrated with Firebase sessions library to enable upcoming features related to
+  session-based performance metrics.
 
-## v20.0.1 (M97)
 
-#### Android library
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-*   {{feature}} Firebase Performance logs now contain URLs to see the performance 
-    data on the Firebase console.
-*   {{fixed}} Fixed RateLimiter replenishment logic and unit alignment.
+# 20.3.3
+* [fixed] Fixed app start trace creation where some measured time could be NULL (#4730).
+* [changed] Adjusted default behavior when remote config fetch fails.
 
-#### Kotlin extensions
 
+## Kotlin
 The Kotlin extensions library transitively includes the updated
 `firebase-performance` library. The Kotlin extensions library has no additional
 updates.
 
-## v20.0.0 (M95)
-
-#### Android library
-
-*   {{feature}} Introduce Dagger as a dependency injection framework for some
-    parts of the code.
-*   {{changed}} Improved the code organization of the SDK (package restructure,
-    code conventions, remove unncessary annotations).
-*   {{changed}} Improve the launch time of the SDK.
+# 20.3.2
+* [changed] Updated JavaLite, protoc, protobuf-java-util to 3.21.11.
+* [changed] Updated [perfmon] to use double-precision for sampling.
 
-#### Kotlin extensions
 
+## Kotlin
 The Kotlin extensions library transitively includes the updated
 `firebase-performance` library. The Kotlin extensions library has no additional
 updates.
 
-## v19.1.1 (M89)
+# 20.3.1
+* [changed] Migrated [perfmon] to use standard Firebase executors.
 
-#### Android library
-
-*   {{feature}} The Firebase Performance Monitoring SDK is now open sourced.
-*   {{changed}} Improved performance event dispatch wait time from 2 hours to
-    30 seconds.
-
-#### Kotlin extensions
 
+## Kotlin
 The Kotlin extensions library transitively includes the updated
 `firebase-performance` library. The Kotlin extensions library has no additional
 updates.
 
-## v19.1.0 (M87)
+# 20.3.0
+* [fixed] Fixed a `NullPointerException` crash when instrumenting screen
+  traces on Android 7, 8, and 9.
+  (#4146)
 
-#### Android library
 
-*   {{changed}} Removed GMS dependency from {{perfmon}}. Google Play services
-    installation is no longer required to use firebase performance.
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has the following
+additional updates:
 
-*   {{changed}} Improved performance event dispatch wait time from 2 hours to
-    30 seconds.
+* [feature] Added a
+  [`trace(String, Trace.() -> T)`](/docs/reference/kotlin/com/google/firebase/perf/ktx/package-summary#trace(kotlin.String,kotlin.Function1))
+  extension function to create a custom trace with the specified name.
 
-#### Kotlin extensions
+# 20.2.0
+* [unchanged] Updated to accommodate the release of the updated
+  [perfmon] Kotlin extensions library.
 
-The Kotlin extensions library transitively includes the updated
-`firebase-performance` library. The Kotlin extensions library has no additional
-updates.
 
-## v19.0.11 (M85)
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has the following
+additional updates:
 
-#### Android library
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-performance-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
 
-*   {{fixed}} Upgraded protobuf dependency to the latest released version
-    ([GitHub Issue #2158](//github.com/firebase/firebase-android-sdk/issues/2158))
+# 20.1.1
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
 
-#### Kotlin extensions
 
+## Kotlin
 The Kotlin extensions library transitively includes the updated
 `firebase-performance` library. The Kotlin extensions library has no additional
 updates.
 
-## v19.0.10 (M83)
+# 20.1.0
+* [feature] Added support for out-of-the-box measurement of screen performance
+  metrics for [Fragments](//developer.android.com/guide/fragments){: .external}.
+  For more details, visit
+  [Learn about screen rendering performance data](/docs/perf-mon/screen-traces?platform=android).
+* [fixed] Fixed a bug where screen traces were not capturing frame metrics for
+  multi-Activity apps.
+* [fixed] Excluded custom attributes that have key/value lengths of 0.
 
-#### Android library
-Note: We recommend using {{perfmon}} Gradle plugin version v1.3.4 or above with
-this version of SDK.
 
-*  {{changed}} Integrated with the `firebase-datatransport` library for
-    performance log dispatch mechanism.
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-*  {{fixed}} Synchronized the access to fix a race condition that was causing a
-    `NullPointerException` when making network requests.
-    ([GitHub Issue #2096](//github.com/firebase/firebase-android-sdk/issues/2096))
+# 20.0.6
+* [fixed] Fixed a null pointer exception (NPE) when instrumenting network
+  requests.
+  (#3406)
+* [fixed] Fixed a bug where incorrect session IDs were associated with some
+  foreground and background traces.
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
 
-#### Kotlin extensions
 
+## Kotlin
 The Kotlin extensions library transitively includes the updated
 `firebase-performance` library. The Kotlin extensions library has no additional
 updates.
 
-## v19.0.9 (M80)
+# 20.0.5
+* [feature] Enabled global custom attributes for network request traces.
+* [fixed] Updated log statement to differentiate an event being dropped due to
+  rate limiting and sampling.
 
-#### Android library
 
-*  {{fixed}} Created lazy dependency on {{firebase_remote_config}} to avoid
-    main thread contention issue. ([GitHub Issue #1810](//github.com/firebase/firebase-android-sdk/issues/1810))
-
-*  {{changed}} Updated the protocol buffer dependency to the
-   `protobuf-javalite` artifact to allow for backward compatibility.
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-*  {{changed}} Removed Guava dependency from the SDK to avoid symbol collision with any other SDKs.
+# 20.0.4
+* [changed] Improved [perfmon] start up time by 25%. This improvement was
+  achieved by moving some component initialization to background threads.
 
-*  {{changed}} Removed proguarding for SDK; logcat messages will show original class paths for debugging.
 
-*  {{changed}} Improved build configurations and dependencies to reduce SDK size.
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-#### Kotlin extensions
+# 20.0.3
+* [changed] [perfmon] now has a random delay of 5 to 30 seconds before
+  fetching [remote_config] upon app startup.
+* [fixed] Added a validation to stop screen traces with 0 total frames from
+  being sent to the backend.
 
-* {{feature}} The {{firebase_perfmon}} Android library with Kotlin
-  extensions is now available. The Kotlin extensions library transitively
-  includes the base `firebase-performance` library. To learn more,  visit the
-  [{{perfmon}} KTX documentation](/docs/reference/kotlin/com/google/firebase/perf/ktx/package-summary).
 
-## v19.0.8 (M75)
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-#### Android library
+# 20.0.2
+* [fixed] Fixed inaccurate calculation of screen activity metrics for
+  multi-activity apps.
+  (#2672)
+  Note: You may see some changes in data for frozen frames and slow rendering
+  metrics.
+* [fixed] Fixed issue where screen traces were not being tracked for Android
+  API levels 23 and below.
 
-* {{changed}} Updated the
-  [logging message](/docs/perf-mon/get-started-android#view-log-messages)
-  for performance events.
 
-* {{fixed}} Silenced {{firebase_remote_config}} logging triggered by
-  {{firebase_perfmon}}.
-  ([GitHub Issue #403](//github.com/firebase/firebase-android-sdk/issues/403))
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-* {{fixed}} Removed unnecessary logging. {{perfmon}} now only logs debug
-  information if the `firebase_performance_logcat_enabled` setting is `true` in
-  `AndroidManifest.xml`. Visit the documentation for details about
-  explicitly [enabling debug logging](/docs/perf-mon/get-started-android#view-log-messages).
+# 20.0.1
+* [feature] Logs for [firebase_perfmon] now contain URLs to view
+  performance data in the [name_appmanager].
+* [fixed] Fixed `RateLimiter` replenishment logic and unit alignment.
 
-* {{changed}} Migrated to use the {{firebase_installations}} service _directly_
-  instead of using an indirect dependency via the Firebase Instance ID SDK.
 
-## v19.0.7 (M69)
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-#### Android library
+# 20.0.0
+* [feature] Introduce Dagger as a dependency injection framework for some
+  parts of the code.
+* [changed] Improved the code organization of the SDK (package restructure,
+  code conventions, remove unncessary annotations).
+* [changed] Improve the launch time of the SDK.
 
-* {{changed}} Updated dependency on the Firebase Instance ID library to v20.1.5,
-  which is a step towards a direct dependency on the {{firebase_installations}}
-  service in a future release.
 
-  This update to `firebase-iid` v20.1.5 fixed the following GitHub issues:
-  [#1454](//github.com/firebase/firebase-android-sdk/issues/1454),
-  [#1397](//github.com/firebase/firebase-android-sdk/issues/1397), and
-  [#1339](//github.com/firebase/firebase-android-sdk/issues/1339).
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-## v19.0.6 (M68)
+# 19.1.1
+* [feature] The [firebase_perfmon] SDK is now
+  [open sourced](//github.com/firebase/firebase-android-sdk/tree/master/firebase-perf){: .external}.
+* [fixed] Fixed issue on the console logger to avoid throwing
+    `UnknownFormatConversionException`.
 
-#### Android library
 
-* {{fixed}} Fixed an NPE crash when calling `trace.stop()`.
-  ([GitHub Issue #1383](//github.com/firebase/firebase-android-sdk/issues/1383))
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-## v19.0.5 (M62)
+# 19.1.0
+* [changed] Removed GMS dependency from [perfmon]. Google Play services
+  installation is no longer required to use [perfmon].
+* [changed] Improved performance event dispatch wait time from 2 hours to
+  30 seconds.
 
-#### Android library
 
-* {{fixed}} Muted logcat logging for {{firebase_perfmon}} when
-`firebase_performance_logcat_enabled` is not set or set to false.
-([#403](//github.com/firebase/firebase-android-sdk/issues/403))
-* {{fixed}} Skipped automatic performance event creation when
-`firebase_performance_collection_enabled` is set to false.
-* {{changed}} Internal infrastructure improvements.
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-## v19.0.4 (M61)
+# 19.0.11
+* [fixed] Upgraded protobuf dependency to the latest released version
+  (#2158)
 
-#### Android library
 
-* {{changed}} Improved internal infrastructure to work better with
-  {{firebase_remote_config}}.
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-----
+# 19.0.10
+Note: We recommend using [perfmon] Gradle plugin v1.3.4+ with this version of
+the [perfmon] SDK and above.
 
-**NOTE:** For some historical reasons below internal versions may or may not correlate to an externally released version. However, this document keeps track of what internal version was released as an external version so that its easier to figure out what version of the SDK we were dealing with (and whether it was publicly released). Unfortunately, we did not keep records of what internal version correlated to an external version until `v16.2.0`, and so the values before that were procured as a result of manually going through history and correlating release dates.
+* [changed] Integrated with the `firebase-datatransport` library for
+  performance log dispatch mechanism.
+* [fixed] Synchronized the access to fix a race condition that was causing a
+  `NullPointerException` when making network requests.
+  (#2096)
 
-## 19.0.3 (M60.1): 1.0.0.282466371
 
-#### Android library
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-performance` library. The Kotlin extensions library has no additional
+updates.
 
-* {{changed}} Internal infrastructure improvements.
+# 19.0.9
+* [fixed] Created lazy dependency on [firebase_remote_config] to avoid
+  main thread contention issue.
+  (#1810)
+* [changed] Updated the protocol buffer dependency to the
+  `protobuf-javalite` artifact to allow for backward compatibility.
+* [changed] Removed Guava dependency from the SDK to avoid symbol collision
+  with any other SDKs.
+* [changed] Removed proguarding for SDK; logcat messages will show original
+  class paths for debugging.
+* [changed] Improved build configurations and dependencies to reduce SDK
+  size.
+
+
+## Kotlin
+* [feature] The [firebase_perfmon] Android library with Kotlin
+  extensions is now available. The Kotlin extensions library transitively
+  includes the base `firebase-performance` library. To learn more,  visit the
+  [[perfmon] KTX documentation](/docs/reference/kotlin/com/google/firebase/perf/ktx/package-summary).
 
-## 19.0.2 (M59): 1.0.0.277188197
+# 19.0.8
+* [changed] Updated the
+  [logging message](/docs/perf-mon/get-started-android#view-log-messages)
+  for performance events.
+* [fixed] Silenced [firebase_remote_config] logging triggered by
+  [firebase_perfmon].
+  (#403)
+* [fixed] Removed unnecessary logging. [perfmon] now only logs debug
+  information if the `firebase_performance_logcat_enabled` setting is `true` in
+  `AndroidManifest.xml`. Visit the documentation for details about
+  explicitly [enabling debug logging](/docs/perf-mon/get-started-android#view-log-messages).
+* [changed] Migrated to use the [firebase_installations] service _directly_
+  instead of using an indirect dependency via the Firebase Instance ID SDK.
 
-#### Android library
+  {% include "docs/reference/android/client/_includes/_iid-indirect-dependency-solutions.html" %}
 
-* {{changed}} Internal infrastructure improvements.
+# 19.0.7
+* [changed] Updated dependency on the Firebase Instance ID library to v20.1.5,
+  which is a step towards a direct dependency on the [firebase_installations]
+  service in a future release.
 
-## 19.0.1 (M57): 1.0.0.272275548
+  This update to `firebase-iid` v20.1.5 fixed the following GitHub issues:
+  [#1454](//github.com/firebase/firebase-android-sdk/issues/1454),
+  [#1397](//github.com/firebase/firebase-android-sdk/issues/1397), and
+  [#1339](//github.com/firebase/firebase-android-sdk/issues/1339).
 
-#### Android library
+# 19.0.6
+* [fixed] Fixed an NPE crash when calling `trace.stop()`.
+  (#1383)
 
-* {{changed}} Internal infrastructure improvements.
+# 19.0.5
+* [fixed] Muted logcat logging for [firebase_perfmon] when
+  `firebase_performance_logcat_enabled` is not set or set to false.
+  ([#403](//github.com/firebase/firebase-android-sdk/issues/403))
+* [fixed] Skipped automatic performance event creation when
+  `firebase_performance_collection_enabled` is set to false.
+* [changed] Internal infrastructure improvements.
 
-## 19.0.0 (M53): 
+# 19.0.4
+* [changed] Improved internal infrastructure to work better with
+  [firebase_remote_config].
 
-#### Android library
+# 19.0.3
+* [changed] Internal infrastructure improvements.
 
-* {{changed}} Versioned to add nullability annotations to improve the Kotlin
-  developer experience. No other changes.
+# 19.0.2
+* [changed] Internal infrastructure improvements.
 
-## 18.0.1 (M50): 1.0.0.252929170
+# 19.0.1
+* [changed] Internal infrastructure improvements.
 
-#### Android library
+# 19.0.0
+* [changed] Versioned to add nullability annotations to improve the Kotlin
+  developer experience. No other changes.
 
-* {{fixed}} Fixed an `IllegalStateException` that was thrown when an activity
+# 18.0.1
+* [fixed] Fixed an `IllegalStateException` that was thrown when an activity
   with hardware acceleration disabled was stopped.
-  
-## 18.0.0 (Android X - Clone of 17.0.2): 1.0.0.249530108
-
-## 17.0.2 (M48): 1.0.0.249530108
-
-#### Android library
-
-* {{fixed}} Fixed a `Null Pointer Exception` that was being observed on certain Android 7.0 devices.
-
-* {{fixed}} Updates to make {{perfmon}} work better with the latest version of
-  {{firebase_remote_config}}.
-  
-## 17.0.1 (Unreleased): 1.0.0.242580265
-
-## 17.0.0 (M47): 1.0.0.242580265
-
-#### Android library
 
-* {{removed}} Removed the deprecated counter API. Use metrics API going forward.
+# 17.0.2
+* [fixed] Fixed a `Null Pointer Exception` that was being observed on certain Android 7.0 devices.
+* [fixed] Updates to make [perfmon] work better with the latest version of
+  [firebase_remote_config].
 
-## 16.2.5 (M46): 1.0.0.240228580
+# 17.0.0
+* [removed] Removed the deprecated counter API. Use metrics API going forward.
 
-#### Android library
-
-* {{fixed}} Fixed a bug that was causing apps using multiple processses to
+# 16.2.5
+* [fixed] Fixed a bug that was causing apps using multiple processses to
   throw an `IllegalStateException` in the non-main processes.
 
-## 16.2.4 (M44): 1.0.0.233854359
-
-#### Android library
-
-* {{fixed}} Fixed a bug that was causing a `NoClassDefFoundError` to be thrown
+# 16.2.4
+* [fixed] Fixed a bug that was causing a `NoClassDefFoundError` to be thrown
   which resulted in intermittent app crashes.
+* [fixed] Updates to make [perfmon] work better with the latest version of
+  [firebase_remote_config].
+* [changed] [firebase_perfmon] no longer depends on [firebase_analytics].
 
-* {{fixed}} Updates to make {{perfmon}} work better with the latest version of
-  {{firebase_remote_config}}.
-
-* {{changed}} {{firebase_perfmon}} no longer depends on {{firebase_analytics}}.
-
-## 16.2.3 (M40): 1.0.0.225053256
-
-#### Android library
-
-* {{fixed}} Bug fixes.
-
-## 16.2.2 (M38.1): 1.0.0.221486272
-
-## 16.2.1 (M38): 1.0.0.221486272
-
-#### Android library
-
-* {{fixed}} SDK size is now smaller.
-
-## 16.2.0 (M36): 1.0.0.217212991
-
-#### Android library
-
-* {{feature}} Introduces the Sessions feature, which gives developers access to actionable insights about data captured using {{perfmon}}.
-
-* {{fixed}} Minor bug fixes and improvements.
-
-## 16.1.1 (EAP): 1.0.0.212694509
-
-## 16.1.0 (M30): 1.0.0.206222422
-
-#### Android library
-
-* {{fixed}} Fixed a `SecurityException` crash on certain devices that do not have Google Play Services on them.
+# 16.2.3
+* [fixed] Bug fixes.
 
-## 16.0.0: 1.0.0.196558987
+# 16.2.1
+* [fixed] SDK size is now smaller.
 
-## 15.2.0: 1.0.0.194951622
+# 16.2.0
+* [feature] Introduces the Sessions feature, which gives developers access to actionable insights about data captured using [perfmon].
+* [fixed] Minor bug fixes and improvements.
 
-## 15.1.0: 1.0.0.194607773
+# 16.1.0
+* [fixed] Fixed a `SecurityException` crash on certain devices that do not have Google Play Services on them.
 
-## 15.0.0: 1.0.0.184862077
diff --git a/firebase-perf/README.md b/firebase-perf/README.md
index c7662aebb45..ee8b7186fb1 100644
--- a/firebase-perf/README.md
+++ b/firebase-perf/README.md
@@ -84,28 +84,38 @@ firebase-android-sdk$ ./gradlew :firebase-perf:deviceCheck
 
 ### Creating a Release Candidate
 
-```
-firebase-android-sdk$ ./gradlew -PpublishMode=SNAPSHOT -PprojectsToPublish="firebase-perf" firebasePublish
-```
+Change the version field in `gradle.properties` to reflect the RC status:
 
-### Publish project locally
+```properties
+version=20.4.1-SNAPSHOT
+```
 
-The simplest way to publish a project and all its associated dependencies is to just publish all 
-projects. The following command builds **SNAPSHOT** dependencies of all projects. All pom level 
-dependencies within the published artifacts will also point to SNAPSHOT versions that are 
-co-published.
+And then generate the library with required libraries:
 
-```
-firebase-android-sdk$ ./gradlew publishAllToLocal
+```bash
+# firebase-perf requires firebase-sessions
+./gradlew -PprojectsToPublish="firebase-perf,firebase-sessions" firebasePublish
 ```
 
-Alternative, publish `firebase-perf` only:
+This will generate various files in the root build directory that align with
+the release candidates.
 
+Alternatively, you can just build the repository in isolation:
+```bash
+# firebase-perf requires firebase-sessions
+./gradlew -PprojectsToPublish="firebase-perf,firebase-sessions" buildMavenZip
 ```
-firebase-android-sdk$ ./gradlew -PprojectsToPublish=":firebase-perf"  publishProjectsToMavenLocal
-```
 
-The location of published project `~/.m2/repository/com/google/firebase/`.
+### Publish project locally
+
+You can publish the project directly to your [local maven](https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:maven_local) 
+repository like so:
+
+```bash
+# firebase-perf requires firebase-sessions
+./gradlew -PprojectsToPublish="firebase-perf,firebase-sessions" \
+    publishReleasingLibrariesToMavenLocal
+```
 
 ### Read SDK from mavenLocal()
 
diff --git a/firebase-perf/api.txt b/firebase-perf/api.txt
index 210b413b256..27e8478d5af 100644
--- a/firebase-perf/api.txt
+++ b/firebase-perf/api.txt
@@ -1,7 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.perf {
 
-  public class FirebasePerformance {
+  @javax.inject.Singleton public class FirebasePerformance {
     method @NonNull public static com.google.firebase.perf.FirebasePerformance getInstance();
     method public boolean isPerformanceCollectionEnabled();
     method @NonNull public com.google.firebase.perf.metrics.HttpMetric newHttpMetric(@NonNull String, @NonNull @com.google.firebase.perf.FirebasePerformance.HttpMethod String);
@@ -27,6 +27,24 @@ package com.google.firebase.perf {
     field public static final String TRACE = "TRACE";
   }
 
+  public final class PerformanceKt {
+    method @NonNull public static com.google.firebase.perf.FirebasePerformance getPerformance(@NonNull com.google.firebase.Firebase);
+    method public static inline void trace(@NonNull com.google.firebase.perf.metrics.HttpMetric, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.HttpMetric,kotlin.Unit> block);
+    method public static inline <T> T trace(@NonNull com.google.firebase.perf.metrics.Trace, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.Trace,? extends T> block);
+    method public static inline <T> T trace(@NonNull String name, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.Trace,? extends T> block);
+  }
+
+}
+
+package com.google.firebase.perf.ktx {
+
+  public final class PerformanceKt {
+    method @Deprecated @NonNull public static com.google.firebase.perf.FirebasePerformance getPerformance(@NonNull com.google.firebase.ktx.Firebase);
+    method @Deprecated public static inline void trace(@NonNull com.google.firebase.perf.metrics.HttpMetric, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.HttpMetric,kotlin.Unit> block);
+    method @Deprecated public static inline <T> T trace(@NonNull com.google.firebase.perf.metrics.Trace, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.Trace,? extends T> block);
+    method @Deprecated public static inline <T> T trace(@NonNull String name, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.Trace,? extends T> block);
+  }
+
 }
 
 package com.google.firebase.perf.metrics {
diff --git a/firebase-perf/dev-app/README.md b/firebase-perf/dev-app/README.md
index 7b413932358..e263df12497 100644
--- a/firebase-perf/dev-app/README.md
+++ b/firebase-perf/dev-app/README.md
@@ -85,7 +85,7 @@ There are differences in terms of Firebase projects when running this command in
 1. **CI Run**: These tests are run under Firebase Test Lab of the unified Firebase project 
 (according to [this](https://github.com/firebase/firebase-android-sdk/blob/master/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java)) 
 but the performance events are sent to a different project with which apps are configured with 
-(see [this](https://github.com/firebase/firebase-android-sdk/blob/master/gradle/googleServices.gradle)). 
+(see `copyRootGoogleServices` task). 
  
 1. **Local run**: When running locally both the tests and the events will happen on the same locally 
 integrated Firebase project.
diff --git a/firebase-perf/dev-app/dev-app.gradle b/firebase-perf/dev-app/dev-app.gradle
index 1cd4f84f0d0..7c0fa7907c6 100644
--- a/firebase-perf/dev-app/dev-app.gradle
+++ b/firebase-perf/dev-app/dev-app.gradle
@@ -15,15 +15,18 @@
 apply plugin: 'com.android.application'
 // Firebase performance plugin, the relevant dependency is specified in the "buildSrc/build-src.gradle"
 apply plugin: 'com.google.firebase.firebase-perf'
-apply plugin: 'com.google.gms.google-services'
 apply plugin: com.google.firebase.gradle.plugins.ci.device.FirebaseTestLabPlugin
+apply plugin: 'copy-google-services'
 
 firebaseTestLab {
     device 'model=Pixel2,version=28,locale=en,orientation=portrait'
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion project.compileSdkVersion
+
+    namespace "com.googletest.firebase.perf.testapp"
+    buildFeatures.buildConfig true
 
     compileOptions {
         sourceCompatibility 1.8
@@ -45,10 +48,10 @@ android {
     defaultConfig {
         // NOTE: This can be different than the package name.
         // https://developer.android.com/studio/build/application-id.html
-        applicationId "com.googletest.firebase.perf.testapp.prod"
+        applicationId "com.googletest.firebase.perf.testapp"
 
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
         versionCode 3
         versionName "3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -84,7 +87,8 @@ dependencies {
     if (project.hasProperty("fireperfBuildForAutopush")) {
         println("Building with HEAD version ':firebase-perf' of SDK")
         implementation project(":firebase-perf")
-        implementation project(":firebase-common")
+        implementation "com.google.firebase:firebase-common:21.0.0"
+        implementation "com.google.firebase:firebase-common-ktx:21.0.0"
         implementation project(":firebase-config")
 
     } else {
@@ -93,31 +97,27 @@ dependencies {
     }
 
     // Google Deps
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.annotation:annotation:1.4.0'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'com.google.android.gms:play-services-tasks:18.0.2'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata:2.4.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.4.0'
-    implementation 'androidx.navigation:navigation-fragment:2.3.5'
-    implementation 'androidx.navigation:navigation-ui:2.3.5'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
+    implementation 'androidx.navigation:navigation-fragment:2.5.1'
+    implementation 'androidx.navigation:navigation-ui:2.5.1'
+    implementation 'com.google.android.material:material:1.6.1'
 
     // 3rd party Deps
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'com.github.bumptech.glide:glide:4.12.0'
 
     // Integration Test Deps
-    androidTestImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    androidTestImplementation 'com.google.truth:truth:1.0.1'
+    androidTestImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'com.google.truth:truth:1.1.2'
     androidTestImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1'
 }
-
-// This allows the app to connect to Firebase on the CI.
-ext.packageName = "com.googletest.firebase.perf.testapp.prod"
-apply from: '../../gradle/googleServices.gradle'
diff --git a/firebase-perf/dev-app/src/main/AndroidManifest.xml b/firebase-perf/dev-app/src/main/AndroidManifest.xml
index a776452c6d3..68282ee4610 100644
--- a/firebase-perf/dev-app/src/main/AndroidManifest.xml
+++ b/firebase-perf/dev-app/src/main/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?> <!-- Copyright 2020 Google Inc. All Rights Reserved. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.googletest.firebase.perf.testapp">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:allowBackup="true"
@@ -17,6 +17,7 @@
             android:label="@string/title_activity_fragment"
             android:theme="@style/Theme.MaterialComponents.DayNight.NoActionBar" />
         <activity
+            android:exported="true"
             android:name=".PerfTestActivity"
             android:label="Perf Test App">
             <intent-filter>
@@ -35,6 +36,12 @@
         <meta-data
             android:name="sessions_sampling_percentage"
             android:value="100.0" />
+        <meta-data
+            android:name="fragment_sampling_percentage"
+            android:value="100.0" />
+        <meta-data
+            android:name="experiment_app_start_ttid"
+            android:value="true" />
 
         <receiver
             android:name=".FirebasePerfTestReceiver"
@@ -53,4 +60,4 @@
             android:required="false" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/firebase-perf/dev-app/src/main/java/com/googletest/firebase/perf/testapp/FragmentActivity.java b/firebase-perf/dev-app/src/main/java/com/googletest/firebase/perf/testapp/FragmentActivity.java
index 31ed59429ff..32c00d08821 100644
--- a/firebase-perf/dev-app/src/main/java/com/googletest/firebase/perf/testapp/FragmentActivity.java
+++ b/firebase-perf/dev-app/src/main/java/com/googletest/firebase/perf/testapp/FragmentActivity.java
@@ -71,13 +71,13 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case R.id.action_change_gif:
-        model.changeImage();
-        return true;
-      default:
-        return super.onOptionsItemSelected(item);
-    }
+      int itemId = item.getItemId();
+          if(itemId == R.id.action_change_gif) {
+              model.changeImage();
+              return true;
+          } else {
+              return super.onOptionsItemSelected(item);
+          }
   }
 
   @Override
diff --git a/firebase-perf/e2e-app/README.md b/firebase-perf/e2e-app/README.md
index 8db04010351..0fc4ae8d92f 100644
--- a/firebase-perf/e2e-app/README.md
+++ b/firebase-perf/e2e-app/README.md
@@ -77,7 +77,7 @@ There are differences in terms of Firebase projects when running this command in
 1. **CI Run**: These tests are run under Firebase Test Lab of the unified Firebase project 
 (according to [this](https://github.com/firebase/firebase-android-sdk/blob/master/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java)) 
 but the performance events are sent to a different project with which apps are configured with 
-(see [this](https://github.com/firebase/firebase-android-sdk/blob/master/gradle/googleServices.gradle) 
+(see `copyRootGoogleServices` task) 
 and the Prow Configuration in tg/831643). 
 
 1. **Local run**: When running locally both the tests and the events will happen on the same locally 
diff --git a/firebase-perf/e2e-app/e2e-app.gradle b/firebase-perf/e2e-app/e2e-app.gradle
index 9a66e5ac318..55fd762a75f 100644
--- a/firebase-perf/e2e-app/e2e-app.gradle
+++ b/firebase-perf/e2e-app/e2e-app.gradle
@@ -15,8 +15,8 @@
 apply plugin: 'com.android.application'
 // Firebase performance plugin, the relevant dependency is specified in the "buildSrc/build-src.gradle"
 apply plugin: 'com.google.firebase.firebase-perf'
-apply plugin: 'com.google.gms.google-services'
 apply plugin: com.google.firebase.gradle.plugins.ci.device.FirebaseTestLabPlugin
+apply plugin: 'copy-google-services'
 
 // Since Test Lab devices are wiped off immediately (for both Security and Privacy reasons) we have
 // previously seen issues pertaining to the App not sending data to our backend when the
@@ -28,8 +28,9 @@ firebaseTestLab {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion project.compileSdkVersion
 
+    namespace "com.google.firebase.testing.fireperf"
     // Specifies the build type that the Android plugin should use to run the instrumentation tests.
     // TL;DR Configure what build types should Firebase Test Lab (FTL) runs your tests on.
     // https://bit.ly/3j1smXH
@@ -52,8 +53,8 @@ android {
         // https://developer.android.com/studio/build/application-id.html
         applicationId "com.google.firebase.testing.fireperf"
 
-        minSdkVersion 18
-        targetSdkVersion 28
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
         versionCode 3
         versionName "3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -103,8 +104,8 @@ dependencies {
 
     // Integration Test Deps
     androidTestImplementation 'junit:junit:4.13.1'
-    androidTestImplementation "androidx.test.ext:junit:1.1.2"
-    androidTestImplementation "androidx.test:core:1.3.0"
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
     androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
@@ -112,7 +113,3 @@ dependencies {
     androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
 }
-
-// This allows the app to connect to Firebase on the CI.
-ext.packageName = "com.google.firebase.testing.fireperf"
-apply from: '../../gradle/googleServices.gradle'
diff --git a/firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceFragmentScreenTracesTest.java b/firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceFragmentScreenTracesTest.java
index 32762c11e96..342f2ec3b90 100644
--- a/firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceFragmentScreenTracesTest.java
+++ b/firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceFragmentScreenTracesTest.java
@@ -19,22 +19,16 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static com.google.common.truth.Truth.assertThat;
 
-import android.app.Activity;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Lifecycle.State;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 import com.google.firebase.testing.fireperf.ui.fast.FastFragment;
 import com.google.firebase.testing.fireperf.ui.home.HomeFragment;
 import com.google.firebase.testing.fireperf.ui.slow.SlowFragment;
-import java.util.Arrays;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,38 +42,24 @@
 public class FirebasePerformanceFragmentScreenTracesTest {
 
   @Rule
-  public ActivityScenarioRule<FragmentActivity> activityRule =
-      new ActivityScenarioRule<>(FragmentActivity.class);
+  public ActivityScenarioRule<FirebasePerfFragmentsActivity> activityRule =
+      new ActivityScenarioRule<>(FirebasePerfFragmentsActivity.class);
 
   @Test
   public void scrollAndCycleThroughAllFragments() throws InterruptedException {
-    activityRule
-        .getScenario()
-        .onActivity(
-            activity -> {
-              ((AppCompatActivity) activity)
-                  .getSupportFragmentManager()
-                  .registerFragmentLifecycleCallbacks(
-                      new FragmentManager.FragmentLifecycleCallbacks() {
-                        @Override
-                        public void onFragmentResumed(
-                            @NonNull FragmentManager fm, @NonNull Fragment f) {
-                          super.onFragmentResumed(fm, f);
-                          notifyNavigationLock();
-                        }
-                      },
-                      true);
-            });
+    ActivityScenario scenario = activityRule.getScenario();
     scrollRecyclerViewToEnd(HomeFragment.NUM_LIST_ITEMS, R.id.rv_numbers_home);
-    activityRule.getScenario().onActivity(new NavigateAction(R.id.navigation_fast));
-    blockUntilNavigationDone();
+    scenario.onActivity(new NavigateAction(R.id.navigation_fast));
     scrollRecyclerViewToEnd(FastFragment.NUM_LIST_ITEMS, R.id.rv_numbers_fast);
-    activityRule.getScenario().onActivity(new NavigateAction(R.id.navigation_slow));
-    blockUntilNavigationDone();
+    scenario.onActivity(new NavigateAction(R.id.navigation_slow));
     scrollRecyclerViewToEnd(SlowFragment.NUM_LIST_ITEMS, R.id.rv_numbers_slow);
-    assertThat(activityRule.getScenario().getState())
-        .isIn(Arrays.asList(State.CREATED, State.RESUMED));
-    activityRule.getScenario().moveToState(State.CREATED);
+    assertThat(scenario.getState()).isEqualTo(State.RESUMED);
+    scenario.moveToState(State.STARTED).moveToState(State.CREATED);
+
+    // End Activity screen trace by relaunching the activity to ensure the screen trace is sent.
+    scenario.launch(FirebasePerfFragmentsActivity.class);
+    // Default wait between flushes is 30s.
+    Thread.sleep(40 * 1000);
   }
 
   private void scrollRecyclerViewToEnd(int itemCount, int viewId) {
@@ -91,15 +71,8 @@ private void scrollRecyclerViewToEnd(int itemCount, int viewId) {
     }
   }
 
-  private synchronized void blockUntilNavigationDone() throws InterruptedException {
-    wait();
-  }
-
-  private synchronized void notifyNavigationLock() {
-    notify();
-  }
-
-  static class NavigateAction implements ActivityScenario.ActivityAction {
+  static class NavigateAction
+      implements ActivityScenario.ActivityAction<FirebasePerfFragmentsActivity> {
     private final int destinationId;
 
     public NavigateAction(int destinationId) {
@@ -107,7 +80,7 @@ public NavigateAction(int destinationId) {
     }
 
     @Override
-    public void perform(Activity activity) {
+    public void perform(FirebasePerfFragmentsActivity activity) {
       NavController navController =
           Navigation.findNavController(activity, R.id.nav_host_fragment_activity_fragment);
       navController.navigate(destinationId);
diff --git a/firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceScreenTracesTest.java b/firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceScreenTracesTest.java
index c02a0bb8eef..eef826a70cc 100644
--- a/firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceScreenTracesTest.java
+++ b/firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceScreenTracesTest.java
@@ -17,17 +17,11 @@
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static com.google.common.truth.Truth.assertThat;
 
-import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.filters.MediumTest;
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
-import androidx.test.uiautomator.By;
-import androidx.test.uiautomator.UiDevice;
-import androidx.test.uiautomator.Until;
-import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,31 +36,22 @@ public class FirebasePerformanceScreenTracesTest {
   private static final int LAUNCH_TIMEOUT = 5000;
 
   @Rule
-  public ActivityTestRule<FirebasePerfScreenTracesActivity> activityRule =
-      new ActivityTestRule<>(
-          FirebasePerfScreenTracesActivity.class,
-          /* initialTouchMode= */ false,
-          /* launchActivity= */ true);
-
-  @After
-  public void pressHome_toTriggerSendScreenTrace() {
-    UiDevice device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-    boolean success = device.pressHome();
-    // Wait for launcher
-    final String launcherPackage = device.getLauncherPackageName();
-    assertThat(launcherPackage).isNotNull();
-    device.wait(Until.hasObject(By.pkg(launcherPackage).depth(0)), LAUNCH_TIMEOUT);
-  }
+  public ActivityScenarioRule<FirebasePerfScreenTracesActivity> activityRule =
+      new ActivityScenarioRule<>(FirebasePerfScreenTracesActivity.class);
 
   @Test
-  public void scrollRecyclerViewToEnd() {
-    RecyclerView recyclerView = activityRule.getActivity().findViewById(R.id.rv_numbers);
-    int itemCount = recyclerView.getAdapter().getItemCount();
+  public void scrollRecyclerViewToEnd() throws Exception {
+    ActivityScenario scenario = activityRule.getScenario();
+    int itemCount = FirebasePerfScreenTracesActivity.NUM_LIST_ITEMS;
     int currItemCount = 0;
 
     while (currItemCount < itemCount) {
       onView(withId(R.id.rv_numbers)).perform(scrollToPosition(currItemCount));
       currItemCount += 5;
     }
+    // End Activity screen trace by switching to another Activity
+    scenario.launch(FirebasePerfScreenTracesActivity.class);
+    // Default wait between flushes is 30s.
+    Thread.sleep(40 * 1000);
   }
 }
diff --git a/firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceTest.java b/firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceTest.java
index eaf15e7659b..7b028f80c33 100644
--- a/firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceTest.java
+++ b/firebase-perf/e2e-app/src/androidTest/java/com/google/firebase/testing/fireperf/FirebasePerformanceTest.java
@@ -14,12 +14,14 @@
 
 package com.google.firebase.testing.fireperf;
 
-import android.content.Context;
-import android.content.Intent;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.rule.ActivityTestRule;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,20 +32,8 @@
 public class FirebasePerformanceTest {
 
   @Rule
-  public ActivityTestRule<FirebasePerfActivity> activityRule =
-      new ActivityTestRule<>(
-          FirebasePerfActivity.class, /* initialTouchMode= */ true, /* launchActivity= */ false);
-
-  private Intent getTraceAndNetworkEventIntent() {
-    Context targetContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-    Intent intent = new Intent(targetContext, FirebasePerfActivity.class);
-    intent.putExtra(FirebasePerfActivity.START_TRACES, true);
-    intent.putExtra(FirebasePerfActivity.START_NETWORK_REQUESTS, true);
-    intent.putExtra(FirebasePerfActivity.NUMBER_OF_TRACE_ITERATIONS, 15);
-    intent.putExtra(FirebasePerfActivity.NUMBER_OF_NETWORK_ITERATIONS, 15);
-
-    return intent;
-  }
+  public ActivityScenarioRule<FirebasePerfActivity> rule =
+      new ActivityScenarioRule<>(FirebasePerfActivity.class);
 
   /*
    * Totally generates 32 * 15 = 480 TraceMetric and 32 * 15 = 480 NetworkRequestMetric.
@@ -57,9 +47,20 @@ private Intent getTraceAndNetworkEventIntent() {
    *   - Rate: 100 Events/Minute (https://bityl.co/3ZPL)
    */
   @Test
-  public void waitForBothTracesAndNetworkRequestsBatch() throws InterruptedException {
-    Intent intent = getTraceAndNetworkEventIntent();
-    activityRule.launchActivity(intent);
-    FireperfUtils.blockUntilAllEventsSent();
+  public void waitForBothTracesAndNetworkRequestsBatch()
+      throws ExecutionException, InterruptedException {
+    final int iterations = 15;
+    final List<Future<?>> futureList = new ArrayList<>();
+    ActivityScenario scenario = rule.getScenario();
+    scenario.onActivity(
+        activity -> {
+          futureList.add(FireperfUtils.generateTraces(iterations));
+          futureList.add(FireperfUtils.generateNetworkRequests(iterations));
+        });
+    for (Future<?> future : futureList) {
+      future.get();
+    }
+    // Default wait between flushes is 30s.
+    Thread.sleep(40 * 1000);
   }
 }
diff --git a/firebase-perf/e2e-app/src/main/AndroidManifest.xml b/firebase-perf/e2e-app/src/main/AndroidManifest.xml
index c3168f7d888..7754d922309 100644
--- a/firebase-perf/e2e-app/src/main/AndroidManifest.xml
+++ b/firebase-perf/e2e-app/src/main/AndroidManifest.xml
@@ -12,10 +12,11 @@
         android:usesCleartextTraffic="true"
         tools:ignore="HardcodedDebugMode,UnusedAttribute">
         <activity
-            android:name=".FragmentActivity"
+            android:name=".FirebasePerfFragmentsActivity"
             android:label="@string/title_activity_fragment"
             android:theme="@style/Theme.MaterialComponents.DayNight.DarkActionBar" />
         <activity
+            android:exported="true"
             android:name=".FirebasePerfActivity"
             android:label="FirebasePerfActivity">
             <intent-filter>
@@ -33,6 +34,9 @@
         <meta-data
             android:name="sessions_sampling_percentage"
             android:value="100.0" />
+        <meta-data
+            android:name="fragment_sampling_percentage"
+            android:value="100.0" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FirebasePerfActivity.java b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FirebasePerfActivity.java
index 44871d84502..29cd12f73e9 100644
--- a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FirebasePerfActivity.java
+++ b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FirebasePerfActivity.java
@@ -15,53 +15,6 @@
 package com.google.firebase.testing.fireperf;
 
 import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 
 /** Activity used to help end to end testing of FirebasePerformance. */
-public class FirebasePerfActivity extends Activity {
-
-  public static final String START_TRACES = "START_TRACES";
-  public static final String START_NETWORK_REQUESTS = "START_NETWORK_REQUESTS";
-  public static final String NUMBER_OF_ITERATIONS = "NUMBER_OF_ITERATIONS";
-  public static final String NUMBER_OF_TRACE_ITERATIONS = "NUMBER_OF_TRACE_ITERATIONS";
-  public static final String NUMBER_OF_NETWORK_ITERATIONS = "NUMBER_OF_NETWORK_ITERATIONS";
-
-  @Override
-  public void onCreate(Bundle onSavedInstanceState) {
-    super.onCreate(onSavedInstanceState);
-
-    Intent intent = getIntent();
-
-    int iterations = intent.getIntExtra(NUMBER_OF_ITERATIONS, /* defaultValue= */ 15);
-    int traceIterations = intent.getIntExtra(NUMBER_OF_TRACE_ITERATIONS, /* defaultValue= */ 15);
-    int networkIterations =
-        intent.getIntExtra(NUMBER_OF_NETWORK_ITERATIONS, /* defaultValue= */ 15);
-
-    ExecutorService executorService =
-        new ThreadPoolExecutor(
-            /* corePoolSize= */ 1,
-            /* maximumPoolSize= */ 3,
-            /* keepAliveTime= */ 1,
-            TimeUnit.MINUTES,
-            new LinkedBlockingQueue<>());
-
-    if (intent.getBooleanExtra(START_TRACES, /* defaultValue= */ false)) {
-      executorService.execute(() -> FireperfUtils.startTraces(traceIterations));
-    }
-
-    if (intent.getBooleanExtra(START_NETWORK_REQUESTS, /* defaultValue= */ false)) {
-      executorService.execute(() -> FireperfUtils.startNetworkRequests(networkIterations));
-    }
-
-    // If neither network or trace event is specified in Intent, start both events in sequence.
-    if (!intent.getBooleanExtra(START_TRACES, /* defaultValue= */ false)
-        && !intent.getBooleanExtra(START_NETWORK_REQUESTS, /* defaultValue= */ false)) {
-      executorService.execute(() -> FireperfUtils.startEvents(iterations));
-    }
-  }
-}
+public class FirebasePerfActivity extends Activity {}
diff --git a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FragmentActivity.java b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FirebasePerfFragmentsActivity.java
similarity index 96%
rename from firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FragmentActivity.java
rename to firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FirebasePerfFragmentsActivity.java
index 2703a2a7153..6587058d46f 100644
--- a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FragmentActivity.java
+++ b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FirebasePerfFragmentsActivity.java
@@ -21,7 +21,7 @@
 import androidx.navigation.ui.NavigationUI;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
-public class FragmentActivity extends AppCompatActivity {
+public class FirebasePerfFragmentsActivity extends AppCompatActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
diff --git a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FirebasePerfScreenTracesActivity.java b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FirebasePerfScreenTracesActivity.java
index 5f9a848d184..bc35f527a77 100644
--- a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FirebasePerfScreenTracesActivity.java
+++ b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FirebasePerfScreenTracesActivity.java
@@ -23,7 +23,7 @@
 /** This activity displays a ListView which when scrolled generates slow and frozen frames. */
 public class FirebasePerfScreenTracesActivity extends Activity {
 
-  private static final int NUM_LIST_ITEMS = 100;
+  public static final int NUM_LIST_ITEMS = 100;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
diff --git a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FireperfUtils.java b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FireperfUtils.java
index ba0f9b826fc..5f9febf9351 100644
--- a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FireperfUtils.java
+++ b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/FireperfUtils.java
@@ -14,62 +14,31 @@
 
 package com.google.firebase.testing.fireperf;
 
-import android.util.Log;
-import java.util.concurrent.Executors;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Future;
-import java.util.concurrent.Semaphore;
 
 /** A helper class that generates all of the traces and network requests. */
 public class FireperfUtils {
-
-  private static final String LOG_TAG = FireperfUtils.class.getSimpleName();
   private static final int MILLIS_IN_SECONDS = 1000;
-  private static final int MAX_SEMAPHORE_PERMITS = 2;
-  private static final Semaphore SEMAPHORE = new Semaphore(MAX_SEMAPHORE_PERMITS);
+  private static final int TRACES_PER_ITERATION = 32;
+  private static final int REQUESTS_PER_ITERATION = 32;
 
   /** Creates all the traces and network requests. */
-  static void startEvents(final int iterations) {
-    if (SEMAPHORE.availablePermits() < MAX_SEMAPHORE_PERMITS) {
-      return;
-    }
-
-    final TraceGenerator traceGenerator = new TraceGenerator(SEMAPHORE);
-    final NetworkRequestGenerator networkRequestGenerator = new NetworkRequestGenerator(SEMAPHORE);
-
-    @SuppressWarnings("FutureReturnValueIgnored")
-    Future<?> unusedFuture =
-        Executors.newSingleThreadExecutor()
-            .submit(
-                () -> {
-                  try {
-                    traceGenerator.launchTraces(/* totalTraces= */ 32, iterations).get();
-                    networkRequestGenerator
-                        .launchRequests(/* totalRequests= */ 32, iterations)
-                        .get();
-                  } catch (Exception e) {
-                    Log.e(LOG_TAG, e.getMessage(), e);
-                  }
-                });
+  static List<Future<?>> generateEvents(final int iterations) {
+    List<Future<?>> futures = new ArrayList<>();
+    futures.add(generateTraces(iterations));
+    futures.add(generateNetworkRequests(iterations));
+    return futures;
   }
 
-  static void startTraces(int iterations) {
-    if (SEMAPHORE.availablePermits() < 1) {
-      return;
-    }
-
-    @SuppressWarnings("FutureReturnValueIgnored")
-    Future<?> unusedTraceFuture =
-        new TraceGenerator(SEMAPHORE).launchTraces(/* totalTraces= */ 32, iterations);
+  static Future<?> generateTraces(int iterations) {
+    return new TraceGenerator().generateTraces(/* totalTraces= */ TRACES_PER_ITERATION, iterations);
   }
 
-  static void startNetworkRequests(int iterations) {
-    if (SEMAPHORE.availablePermits() < 1) {
-      return;
-    }
-
-    @SuppressWarnings("FutureReturnValueIgnored")
-    Future<?> unusedNetworkFuture =
-        new NetworkRequestGenerator(SEMAPHORE).launchRequests(/* totalRequests= */ 32, iterations);
+  static Future<?> generateNetworkRequests(int iterations) {
+    return new NetworkRequestGenerator()
+        .generateRequests(/* totalRequests= */ REQUESTS_PER_ITERATION, iterations);
   }
 
   /**
@@ -99,13 +68,4 @@ static float randomGaussianValueWithMean(float mean, float deviation) {
 
     return mean + (deviation * gaussianValue);
   }
-
-  /**
-   * Tries to acquire all allocated semaphore permits, and blocks the thread until they are all
-   * available.
-   */
-  public static void blockUntilAllEventsSent() throws InterruptedException {
-    SEMAPHORE.acquire(MAX_SEMAPHORE_PERMITS);
-    SEMAPHORE.release(MAX_SEMAPHORE_PERMITS);
-  }
 }
diff --git a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/NetworkRequestGenerator.java b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/NetworkRequestGenerator.java
index f3b6aebd814..2f51a75d400 100644
--- a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/NetworkRequestGenerator.java
+++ b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/NetworkRequestGenerator.java
@@ -25,7 +25,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -59,18 +58,13 @@ public class NetworkRequestGenerator {
   private static final ImmutableList<Integer> STATUS_CODES =
       ImmutableList.of(200, 201, 300, 400, 502, 503, 504);
 
-  private final Semaphore sem;
   private final Random rand;
-  private boolean isSemaphoreAcquired;
 
-  NetworkRequestGenerator(Semaphore sem) {
-    this.sem = sem;
+  NetworkRequestGenerator() {
     this.rand = new Random();
   }
 
-  Future<?> launchRequests(final int totalRequests, final int totalSets) {
-    isSemaphoreAcquired = sem.tryAcquire();
-
+  Future<?> generateRequests(final int totalRequests, final int totalSets) {
     return Executors.newSingleThreadExecutor()
         .submit(
             () -> {
@@ -114,10 +108,6 @@ Future<?> launchRequests(final int totalRequests, final int totalSets) {
                   Log.e(LOG_TAG, e.getMessage());
                 }
               }
-
-              if (isSemaphoreAcquired) {
-                sem.release();
-              }
             });
   }
 
diff --git a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/SlowListAdapter.java b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/SlowListAdapter.java
index d8a527816e7..3a1e2e409c9 100644
--- a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/SlowListAdapter.java
+++ b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/SlowListAdapter.java
@@ -30,6 +30,7 @@ public SlowListAdapter(int numberOfItems) {
 
   @Override
   public void onBindViewHolder(@NotNull NumberViewHolder holder, int position) {
+    // sleep thread to simulate jank
     try {
       if (position % 15 == 0) {
         Thread.sleep(900);
@@ -40,6 +41,6 @@ public void onBindViewHolder(@NotNull NumberViewHolder holder, int position) {
       Log.e(LOG_TAG, e.getMessage(), e);
     }
 
-    holder.bind(position);
+    super.onBindViewHolder(holder, position);
   }
 }
diff --git a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/TraceGenerator.java b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/TraceGenerator.java
index 83d47099e27..dedddf0a6d4 100644
--- a/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/TraceGenerator.java
+++ b/firebase-perf/e2e-app/src/main/java/com/google/firebase/testing/fireperf/TraceGenerator.java
@@ -24,7 +24,6 @@
 import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.Semaphore;
 
 /** Generates traces with all the appropriate information. */
 public class TraceGenerator {
@@ -33,16 +32,7 @@ public class TraceGenerator {
   private static final int TRACE_MEAN_DURATION = 3;
   private static final float TRACE_DURATION_STD_DEVIATION = .3f;
 
-  private final Semaphore sem;
-  private boolean isSemaphoreAcquired;
-
-  TraceGenerator(Semaphore sem) {
-    this.sem = sem;
-  }
-
-  Future<?> launchTraces(final int totalTraces, final int totalSets) {
-    isSemaphoreAcquired = sem.tryAcquire();
-
+  Future<?> generateTraces(final int totalTraces, final int totalSets) {
     return Executors.newSingleThreadExecutor()
         .submit(
             () -> {
@@ -78,10 +68,6 @@ Future<?> launchTraces(final int totalTraces, final int totalSets) {
                   traceHolder.stopTrace();
                 }
               }
-
-              if (isSemaphoreAcquired) {
-                sem.release();
-              }
             });
   }
 
diff --git a/firebase-perf/e2e-app/src/main/res/values/strings.xml b/firebase-perf/e2e-app/src/main/res/values/strings.xml
index 9d27dce0c5b..b7b921fd4c3 100644
--- a/firebase-perf/e2e-app/src/main/res/values/strings.xml
+++ b/firebase-perf/e2e-app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <!-- Copyright 2021 Google Inc. All Rights Reserved. -->
 
 <resources>
-    <string name="title_activity_fragment">FragmentActivity</string>
+    <string name="title_activity_fragment">FirebasePerfFragmentsActivity</string>
     <string name="title_home">Home</string>
     <string name="title_fast">Fast</string>
     <string name="title_slow">Slow</string>
diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle
index 73d587afa0d..9a036eb39a8 100644
--- a/firebase-perf/firebase-perf.gradle
+++ b/firebase-perf/firebase-perf.gradle
@@ -17,10 +17,12 @@
 
 plugins {
     id 'firebase-library'
+    id("kotlin-android")
     id 'com.google.protobuf'
 }
 
 firebaseLibrary {
+    libraryGroup "perf"
     publishJavadoc = true
     // Disabling Test Lab as there are no instrumentation tests for the SDK currently.
     // When we add instrumentation tests in the future, this needs to be enabled.
@@ -41,10 +43,12 @@ protobuf {
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.perf"
+    compileSdk project.compileSdkVersion
 
     lintOptions {
         abortOnError true
+        baseline file("lint-baseline.xml")
     }
 
     defaultConfig {
@@ -70,7 +74,7 @@ android {
             buildConfigField("Boolean", "ENFORCE_DEFAULT_LOG_SRC", "Boolean.valueOf(true)")
         }
 
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
@@ -81,7 +85,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
+    kotlinOptions.jvmTarget = "1.8"
     testOptions {
         unitTests {
             includeAndroidResources = true
@@ -90,39 +94,44 @@ android {
 }
 
 dependencies {
-    // Firebase Deps
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-config')
-    implementation project(':firebase-installations-interop')
-    implementation project(':protolite-well-known-types')
-    implementation "com.google.protobuf:protobuf-javalite:$javaliteVersion"
-    runtimeOnly project(':firebase-installations')
-    implementation project(':transport:transport-api')
-    runtimeOnly project(':firebase-datatransport')
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
-    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
-
-    // Google Deps
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.27'
+    compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6'
+    implementation "androidx.annotation:annotation:1.1.0"
+    implementation "androidx.lifecycle:lifecycle-process:2.3.1"
     implementation "com.google.android.gms:play-services-tasks:18.0.1"
+    implementation "com.google.protobuf:protobuf-javalite:$javaliteVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    implementation 'androidx.annotation:annotation:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.annotation:annotation:1.1.0"
-
-    // 3rd Party Deps
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
-    compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6'
+    implementation 'com.google.android.datatransport:transport-api:3.0.0'
     implementation 'com.google.dagger:dagger:2.27'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.27'
-
-    // Unit Test Deps
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.28.2'
-    testImplementation 'org.mockito:mockito-inline:2.13.0'
-    testImplementation ("org.robolectric:robolectric:$robolectricVersion") {
-        exclude group: 'com.google.protobuf', module: 'protobuf-java'
-    }
+    api 'com.google.firebase:firebase-annotations:16.2.0'
+    api 'com.google.firebase:firebase-installations-interop:17.1.0'
+    api 'com.google.firebase:protolite-well-known-types:18.0.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
+    api("com.google.firebase:firebase-config:21.5.0")
+    api("com.google.firebase:firebase-installations:17.2.0")
+    api("com.google.firebase:firebase-sessions:2.0.0") {
+         exclude group: 'com.google.firebase', module: 'firebase-common'
+         exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
+         exclude group: 'com.google.firebase', module: 'firebase-components'
+     }
+    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
+    runtimeOnly("com.google.firebase:firebase-datatransport:18.1.8") {
+         exclude group: 'com.google.firebase', module: 'firebase-common'
+         exclude group: 'com.google.firebase', module: 'firebase-components'
+     }
+    testCompileOnly "com.google.protobuf:protobuf-java:3.21.9"
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6'
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'androidx.test:rules:1.2.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:5.2.0'
+    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6'
 }
diff --git a/firebase-perf/gradle.properties b/firebase-perf/gradle.properties
index f193339a660..e649acbeb71 100644
--- a/firebase-perf/gradle.properties
+++ b/firebase-perf/gradle.properties
@@ -15,7 +15,7 @@
 #
 #
 
-version=20.0.6
-latestReleasedVersion=20.0.5
+version=21.0.1
+latestReleasedVersion=21.0.0
 android.enableUnitTestBinaryResources=true
 
diff --git a/firebase-perf/ktx/api.txt b/firebase-perf/ktx/api.txt
index 5bc29038494..5c7be346e10 100644
--- a/firebase-perf/ktx/api.txt
+++ b/firebase-perf/ktx/api.txt
@@ -1,11 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.perf.ktx {
 
-  public final class PerformanceKt {
-    ctor public PerformanceKt();
-    method @NonNull public static com.google.firebase.perf.FirebasePerformance getPerformance(@NonNull com.google.firebase.ktx.Firebase);
-    method public static inline void trace(@NonNull com.google.firebase.perf.metrics.HttpMetric, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.HttpMetric,kotlin.Unit> block);
-    method public static inline <T> T trace(@NonNull com.google.firebase.perf.metrics.Trace, @NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.perf.metrics.Trace,? extends T> block);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-perf/ktx/ktx.gradle b/firebase-perf/ktx/ktx.gradle
index f8c655341ab..d9a3d626861 100644
--- a/firebase-perf/ktx/ktx.gradle
+++ b/firebase-perf/ktx/ktx.gradle
@@ -14,19 +14,21 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
-    releaseWith project(':firebase-perf')
-    publishJavadoc = true
+    libraryGroup "perf"
+    publishJavadoc = false
+    publishReleaseNotes = false
     publishSources = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.perf.ktx"    
+    compileSdk project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
@@ -38,21 +40,22 @@ android {
             srcDir 'src/test/kotlin'
         }
     }
+    kotlinOptions.jvmTarget = "1.8"
     testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api(project(":firebase-perf"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
 
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-perf')
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation("com.google.firebase:firebase-components:18.0.0")
 
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+
+    testCompileOnly "com.google.protobuf:protobuf-java:3.21.9"
 }
diff --git a/firebase-perf/ktx/src/main/AndroidManifest.xml b/firebase-perf/ktx/src/main/AndroidManifest.xml
index 1bc39a2fe46..ddafad4d174 100644
--- a/firebase-perf/ktx/src/main/AndroidManifest.xml
+++ b/firebase-perf/ktx/src/main/AndroidManifest.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.perf.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.perf.ktx.FirebasePerfKtxRegistrar"
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.perf.ktx.FirebasePerfLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
diff --git a/firebase-perf/ktx/src/main/kotlin/com/google/firebase/perf/ktx/Logging.kt b/firebase-perf/ktx/src/main/kotlin/com/google/firebase/perf/ktx/Logging.kt
new file mode 100644
index 00000000000..b9f8fba664c
--- /dev/null
+++ b/firebase-perf/ktx/src/main/kotlin/com/google/firebase/perf/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.perf.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.perf.BuildConfig
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-perf-ktx"
+
+/** @suppress */
+@Keep
+class FirebasePerfLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-perf/ktx/src/main/kotlin/com/google/firebase/perf/ktx/Performance.kt b/firebase-perf/ktx/src/main/kotlin/com/google/firebase/perf/ktx/Performance.kt
deleted file mode 100644
index 365a6f2afb2..00000000000
--- a/firebase-perf/ktx/src/main/kotlin/com/google/firebase/perf/ktx/Performance.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.perf.ktx
-
-import androidx.annotation.Keep
-import com.google.firebase.FirebaseApp
-import com.google.firebase.components.Component
-import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.perf.FirebasePerformance
-import com.google.firebase.perf.metrics.HttpMetric
-import com.google.firebase.perf.metrics.Trace
-import com.google.firebase.platforminfo.LibraryVersionComponent
-
-/** Returns the [FirebasePerformance] instance of the default [FirebaseApp]. */
-val Firebase.performance: FirebasePerformance
-    get() = FirebasePerformance.getInstance()
-
-/** Measures the time it takes to run the [block] wrapped by calls to [start] and [stop] using [HttpMetric]. */
-inline fun HttpMetric.trace(block: HttpMetric.() -> Unit) {
-    start()
-    try {
-        block()
-    } finally {
-        stop()
-    }
-}
-
-/** Measures the time it takes to run the [block] wrapped by calls to [start] and [stop] using [Trace]. */
-inline fun <T> Trace.trace(block: Trace.() -> T): T {
-    start()
-    try {
-        return block()
-    } finally {
-        stop()
-    }
-}
-
-internal const val LIBRARY_NAME: String = "fire-perf-ktx"
-
-/** @suppress */
-@Keep
-class FirebasePerfKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
-}
diff --git a/firebase-perf/ktx/src/test/kotlin/com/google/firebase/perf/ktx/PerformanceTests.kt b/firebase-perf/ktx/src/test/kotlin/com/google/firebase/perf/ktx/PerformanceTests.kt
index 96d7a00557a..2a477986908 100644
--- a/firebase-perf/ktx/src/test/kotlin/com/google/firebase/perf/ktx/PerformanceTests.kt
+++ b/firebase-perf/ktx/src/test/kotlin/com/google/firebase/perf/ktx/PerformanceTests.kt
@@ -1,19 +1,22 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.perf.ktx
 
+import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
@@ -44,121 +47,119 @@ import org.mockito.ArgumentMatchers
 import org.mockito.ArgumentMatchers.nullable
 import org.mockito.Captor
 import org.mockito.Mock
-import org.mockito.Mockito.`when`
 import org.mockito.Mockito.doAnswer
 import org.mockito.Mockito.verify
+import org.mockito.Mockito.`when`
 import org.mockito.MockitoAnnotations.initMocks
 import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows
 
-const val APP_ID = "APP_ID"
-const val API_KEY = "API_KEY"
+const val APP_ID = "1:149208680807:android:0000000000000000"
+const val API_KEY = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
 
 const val EXISTING_APP = "existing"
 
 abstract class BaseTestCase {
-    @Before
-    open fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
-
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build(),
-                EXISTING_APP
-        )
-    }
-
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @Before
+  open fun setUp() {
+    val context = ApplicationProvider.getApplicationContext<Context>()
+    val shadowPackageManager = Shadows.shadowOf(context.packageManager)
+    val packageInfo = shadowPackageManager.getInternalMutablePackageInfo(context.packageName)
+    packageInfo.versionName = "1.0.0"
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class PerformanceTests : BaseTestCase() {
 
-    @Mock
-    lateinit var transportManagerMock: TransportManager
+  @Mock lateinit var transportManagerMock: TransportManager
 
-    @Mock
-    lateinit var timerMock: Timer
+  @Mock lateinit var timerMock: Timer
 
-    @Mock
-    lateinit var mockTransportManager: TransportManager
+  @Mock lateinit var mockTransportManager: TransportManager
 
-    @Mock
-    lateinit var mockClock: Clock
+  @Mock lateinit var mockClock: Clock
 
-    @Mock
-    lateinit var mockAppStateMonitor: AppStateMonitor
+  @Mock lateinit var mockAppStateMonitor: AppStateMonitor
 
-    @Captor
-    lateinit var argMetricCaptor: ArgumentCaptor<NetworkRequestMetric>
+  @Captor lateinit var argMetricCaptor: ArgumentCaptor<NetworkRequestMetric>
 
-    @Captor
-    lateinit var argumentsCaptor: ArgumentCaptor<TraceMetric>
+  @Captor lateinit var argumentsCaptor: ArgumentCaptor<TraceMetric>
 
-    var currentTime: Long = 1
+  var currentTime: Long = 1
 
-    @Before
-    override fun setUp() {
-        super.setUp()
-        initMocks(this)
+  @Before
+  override fun setUp() {
+    super.setUp()
+    initMocks(this)
 
-        `when`(timerMock.getMicros()).thenReturn(1000L)
-        `when`(timerMock.getDurationMicros()).thenReturn(2000L).thenReturn(3000L)
-        doAnswer {
-            Timer(currentTime)
-        }.`when`(mockClock).getTime()
-    }
+    `when`(timerMock.getMicros()).thenReturn(1000L)
+    `when`(timerMock.getDurationMicros()).thenReturn(2000L).thenReturn(3000L)
+    doAnswer { Timer(currentTime) }.`when`(mockClock).getTime()
+  }
 
-    @Test
-    fun `performance should delegate to FirebasePerformance#getInstance()`() {
-        assertThat(Firebase.performance).isSameInstanceAs(FirebasePerformance.getInstance())
-    }
+  @Test
+  fun `performance should delegate to FirebasePerformance#getInstance()`() {
+    assertThat(Firebase.performance).isSameInstanceAs(FirebasePerformance.getInstance())
+  }
 
-    @Test
-    fun `httpMetric wrapper test `() {
-        val metric = HttpMetric("https://www.google.com/", HttpMethod.GET, transportManagerMock, timerMock)
-        metric.trace {
-            setHttpResponseCode(200)
-        }
+  @Test
+  fun `httpMetric wrapper test `() {
+    val metric =
+      HttpMetric("https://www.google.com/", HttpMethod.GET, transportManagerMock, timerMock)
+    metric.trace { setHttpResponseCode(200) }
 
-        verify(transportManagerMock)
-            .log(argMetricCaptor.capture(), ArgumentMatchers.nullable(ApplicationProcessState::class.java))
+    verify(transportManagerMock)
+      .log(
+        argMetricCaptor.capture(),
+        ArgumentMatchers.nullable(ApplicationProcessState::class.java)
+      )
 
-        val metricValue = argMetricCaptor.getValue()
-        assertThat(metricValue.getHttpResponseCode()).isEqualTo(200)
-    }
+    val metricValue = argMetricCaptor.getValue()
+    assertThat(metricValue.getHttpResponseCode()).isEqualTo(200)
+  }
 
-    @Test
-    fun `trace wrapper test`() {
-        val trace = Trace("trace_1", mockTransportManager, mockClock, mockAppStateMonitor)
-        trace.trace {
-            incrementMetric("metric_1", 5)
-        }
+  @Test
+  fun `trace wrapper test`() {
+    val trace = Trace("trace_1", mockTransportManager, mockClock, mockAppStateMonitor)
+    trace.trace { incrementMetric("metric_1", 5) }
 
-        assertThat(getTraceCounter(trace)).hasSize(1)
-        assertThat(getTraceCounterCount(trace, "metric_1")).isEqualTo(5)
-        verify(mockTransportManager).log(argumentsCaptor.capture(), nullable(ApplicationProcessState::class.java))
-    }
+    assertThat(getTraceCounter(trace)).hasSize(1)
+    assertThat(getTraceCounterCount(trace, "metric_1")).isEqualTo(5)
+    verify(mockTransportManager)
+      .log(argumentsCaptor.capture(), nullable(ApplicationProcessState::class.java))
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun `library version should be registered with runtime`() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
 }
diff --git a/firebase-perf/ktx/src/test/kotlin/com/google/firebase/perf/metrics/TestUtil.kt b/firebase-perf/ktx/src/test/kotlin/com/google/firebase/perf/metrics/TestUtil.kt
index df215590fc8..88c5890f9bf 100644
--- a/firebase-perf/ktx/src/test/kotlin/com/google/firebase/perf/metrics/TestUtil.kt
+++ b/firebase-perf/ktx/src/test/kotlin/com/google/firebase/perf/metrics/TestUtil.kt
@@ -1,23 +1,25 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-//
-// You may obtain a copy of the License at
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.perf.metrics
 
 fun getTraceCounter(trace: Trace): Map<String, Counter> {
-    return trace.getCounters()
+  return trace.getCounters()
 }
 
 fun getTraceCounterCount(trace: Trace, counterName: String): Long {
-    return trace.getCounters().get(counterName)!!.getCount()
+  return trace.getCounters().get(counterName)!!.getCount()
 }
diff --git a/firebase-perf/lint-baseline.xml b/firebase-perf/lint-baseline.xml
new file mode 100644
index 00000000000..b51d842e4a9
--- /dev/null
+++ b/firebase-perf/lint-baseline.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 7.2.2" type="baseline" client="gradle" dependencies="false" name="AGP (7.2.2)" variant="all" version="7.2.2">
+
+    <issue
+        id="DuplicatePlatformClasses"
+        message="`commons-logging` defines classes that conflict with classes now provided by Android. Solutions include finding newer versions or alternative libraries that don&apos;t have the same problem (for example, for `httpclient` use `HttpUrlConnection` or `okhttp` instead), or repackaging the library using something like `jarjar`.">
+        <location
+            file="build.gradle"/>
+    </issue>
+
+    <issue
+        id="DuplicatePlatformClasses"
+        message="`httpclient` defines classes that conflict with classes now provided by Android. Solutions include finding newer versions or alternative libraries that don&apos;t have the same problem (for example, for `httpclient` use `HttpUrlConnection` or `okhttp` instead), or repackaging the library using something like `jarjar`.">
+        <location
+            file="build.gradle"/>
+    </issue>
+</issues>
diff --git a/firebase-perf/src/main/AndroidManifest.xml b/firebase-perf/src/main/AndroidManifest.xml
index 48ae28f8c6e..defc502af61 100644
--- a/firebase-perf/src/main/AndroidManifest.xml
+++ b/firebase-perf/src/main/AndroidManifest.xml
@@ -1,20 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?><!-- Copyright 2020 Google Inc. All Rights Reserved. -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.google.firebase.perf">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.INTERNET"/>
 
   <application>
-    <provider
-      android:authorities="${applicationId}.firebaseperfprovider"
-      android:exported="false"
-      android:initOrder="101"
-      android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
 
     <service
       android:exported="false"
-      android:name="com.google.firebase.components.ComponentDiscoveryService">
+      android:name="com.google.firebase.components.ComponentDiscoveryService"> <meta-data android:name="com.google.firebase.components:com.google.firebase.perf.FirebasePerfKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
 
       <meta-data
         android:name="com.google.firebase.components:com.google.firebase.perf.FirebasePerfRegistrar"
@@ -24,4 +18,4 @@
 
   <!-- line to test for static disable of the Firebase Perf SDK -->
   <!-- <meta-data android:name="firebase_performance_collection_enabled" android:value="false" /> -->
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfEarly.java b/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfEarly.java
new file mode 100644
index 00000000000..5b89deaad82
--- /dev/null
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfEarly.java
@@ -0,0 +1,62 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.perf;
+
+import android.content.Context;
+import androidx.annotation.Nullable;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.StartupTime;
+import com.google.firebase.perf.application.AppStateMonitor;
+import com.google.firebase.perf.config.ConfigResolver;
+import com.google.firebase.perf.metrics.AppStartTrace;
+import com.google.firebase.perf.session.SessionManager;
+import java.util.concurrent.Executor;
+
+/**
+ * The Firebase Performance early initialization.
+ *
+ * <p>Responsible for initializing the AppStartTrace, and early initialization of ConfigResolver
+ *
+ * @hide
+ */
+public class FirebasePerfEarly {
+
+  public FirebasePerfEarly(
+      FirebaseApp app, @Nullable StartupTime startupTime, Executor uiExecutor) {
+    Context context = app.getApplicationContext();
+
+    // Initialize ConfigResolver early for accessing device caching layer.
+    ConfigResolver configResolver = ConfigResolver.getInstance();
+    configResolver.setApplicationContext(context);
+
+    AppStateMonitor appStateMonitor = AppStateMonitor.getInstance();
+    appStateMonitor.registerActivityLifecycleCallbacks(context);
+    appStateMonitor.registerForAppColdStart(new FirebasePerformanceInitializer());
+
+    if (startupTime != null) {
+      AppStartTrace appStartTrace = AppStartTrace.getInstance();
+      appStartTrace.registerActivityLifecycleCallbacks(context);
+      uiExecutor.execute(new AppStartTrace.StartFromBackgroundRunnable(appStartTrace));
+    }
+
+    // TODO: Bring back Firebase Sessions dependency to watch for updates to sessions.
+
+    // In the case of cold start, we create a session and start collecting gauges as early as
+    // possible.
+    // There is code in SessionManager that prevents us from resetting the session twice in case
+    // of app cold start.
+    SessionManager.getInstance().initializeGaugeCollection();
+  }
+}
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfRegistrar.java b/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfRegistrar.java
index ef96888fd68..c01f035af1f 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfRegistrar.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfRegistrar.java
@@ -17,10 +17,13 @@
 import androidx.annotation.Keep;
 import com.google.android.datatransport.TransportFactory;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.StartupTime;
+import com.google.firebase.annotations.concurrent.UiThread;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentContainer;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.perf.injection.components.DaggerFirebasePerformanceComponent;
 import com.google.firebase.perf.injection.components.FirebasePerformanceComponent;
@@ -29,6 +32,7 @@
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.Executor;
 
 /**
  * {@link com.google.firebase.components.ComponentRegistrar} for the Firebase Performance SDK.
@@ -40,18 +44,36 @@
  */
 @Keep
 public class FirebasePerfRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-perf";
+  private static final String EARLY_LIBRARY_NAME = "fire-perf-early";
 
   @Override
   @Keep
   public List<Component<?>> getComponents() {
+    Qualified<Executor> uiExecutor = Qualified.qualified(UiThread.class, Executor.class);
     return Arrays.asList(
         Component.builder(FirebasePerformance.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.requiredProvider(RemoteConfigComponent.class))
             .add(Dependency.required(FirebaseInstallationsApi.class))
             .add(Dependency.requiredProvider(TransportFactory.class))
+            .add(Dependency.required(FirebasePerfEarly.class))
             .factory(FirebasePerfRegistrar::providesFirebasePerformance)
             .build(),
+        Component.builder(FirebasePerfEarly.class)
+            .name(EARLY_LIBRARY_NAME)
+            .add(Dependency.required(FirebaseApp.class))
+            .add(Dependency.optionalProvider(StartupTime.class))
+            .add(Dependency.required(uiExecutor))
+            .eagerInDefaultApp()
+            .factory(
+                container ->
+                    new FirebasePerfEarly(
+                        container.get(FirebaseApp.class),
+                        container.getProvider(StartupTime.class).get(),
+                        container.get(uiExecutor)))
+            .build(),
         /**
          * Fireperf SDK is lazily by {@link FirebasePerformanceInitializer} during {@link
          * com.google.firebase.perf.application.AppStateMonitor#onActivityResumed(Activity)}. we use
@@ -59,10 +81,12 @@ public List<Component<?>> getComponents() {
          * not to force initialize them at app startup (refer
          * https://github.com/google/guice/wiki/InjectingProviders#providers-for-lazy-loading)*
          */
-        LibraryVersionComponent.create("fire-perf", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 
   private static FirebasePerformance providesFirebasePerformance(ComponentContainer container) {
+    // Ensure FirebasePerfEarly was initialized
+    container.get(FirebasePerfEarly.class);
     FirebasePerformanceComponent component =
         DaggerFirebasePerformanceComponent.builder()
             .firebasePerformanceModule(
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformance.java b/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformance.java
index c73b559ce1b..40468566225 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformance.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformance.java
@@ -14,6 +14,8 @@
 
 package com.google.firebase.perf;
 
+import static com.google.firebase.perf.metrics.validator.PerfMetricValidator.validateAttribute;
+
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -34,7 +36,6 @@
 import com.google.firebase.perf.logging.ConsoleUrlGenerator;
 import com.google.firebase.perf.metrics.HttpMetric;
 import com.google.firebase.perf.metrics.Trace;
-import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
 import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Constants;
@@ -44,7 +45,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.net.URL;
-import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -364,10 +364,7 @@ private void checkAttribute(@Nullable String key, @Nullable String value) {
               Constants.MAX_TRACE_CUSTOM_ATTRIBUTES));
     }
 
-    String err = PerfMetricValidator.validateAttribute(new AbstractMap.SimpleEntry<>(key, value));
-    if (err != null) {
-      throw new IllegalArgumentException(err);
-    }
+    validateAttribute(key, value);
   }
 
   /**
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformanceInitializer.java b/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformanceInitializer.java
index 57bcab624c1..bfbe1c4c659 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformanceInitializer.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformanceInitializer.java
@@ -15,6 +15,7 @@
 package com.google.firebase.perf;
 
 import com.google.firebase.perf.application.AppStateMonitor;
+import com.google.firebase.perf.logging.AndroidLogger;
 
 /**
  * FirebasePerformanceInitializer to initialize FirebasePerformance during app cold start
@@ -22,10 +23,18 @@
  * @hide
  */
 public final class FirebasePerformanceInitializer implements AppStateMonitor.AppColdStartCallback {
+  private static final AndroidLogger logger = AndroidLogger.getInstance();
 
   @Override
   public void onAppColdStart() {
     // Initialize FirebasePerformance when app cold starts.
-    FirebasePerformance.getInstance();
+    try {
+      FirebasePerformance.getInstance();
+    } catch (IllegalStateException ex) {
+      logger.warn(
+          "FirebaseApp is not initialized. Firebase Performance will not be collecting any "
+              + "performance metrics until initialized. %s",
+          ex);
+    }
   }
 }
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/Performance.kt b/firebase-perf/src/main/java/com/google/firebase/perf/Performance.kt
new file mode 100644
index 00000000000..5d20ee5eb61
--- /dev/null
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/Performance.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.perf
+
+import androidx.annotation.Keep
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.perf.metrics.HttpMetric
+import com.google.firebase.perf.metrics.Trace
+
+/** Returns the [FirebasePerformance] instance of the default [FirebaseApp]. */
+val Firebase.performance: FirebasePerformance
+  get() = FirebasePerformance.getInstance()
+
+/**
+ * Measures the time it takes to run the [block] wrapped by calls to [start] and [stop] using
+ * [HttpMetric].
+ */
+inline fun HttpMetric.trace(block: HttpMetric.() -> Unit) {
+  start()
+  try {
+    block()
+  } finally {
+    stop()
+  }
+}
+
+/**
+ * Measures the time it takes to run the [block] wrapped by calls to [start] and [stop] using
+ * [Trace].
+ */
+inline fun <T> Trace.trace(block: Trace.() -> T): T {
+  start()
+  try {
+    return block()
+  } finally {
+    stop()
+  }
+}
+
+/**
+ * Creates a [Trace] object with given [name] and measures the time it takes to run the [block]
+ * wrapped by calls to [start] and [stop].
+ */
+inline fun <T> trace(name: String, block: Trace.() -> T): T = Trace.create(name).trace(block)
+
+/** @suppress */
+@Keep
+class FirebasePerfKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateMonitor.java b/firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateMonitor.java
index 6c1bd34e5d5..b014d82bb83 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateMonitor.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateMonitor.java
@@ -19,20 +19,21 @@
 import android.app.Application.ActivityLifecycleCallbacks;
 import android.content.Context;
 import android.os.Bundle;
-import android.util.SparseIntArray;
 import androidx.annotation.NonNull;
-import androidx.core.app.FrameMetricsAggregator;
-import com.google.android.gms.common.util.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.FragmentActivity;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.metrics.FrameMetricsCalculator.PerfFrameMetrics;
 import com.google.firebase.perf.metrics.Trace;
 import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Clock;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Constants.CounterNames;
+import com.google.firebase.perf.util.Optional;
+import com.google.firebase.perf.util.ScreenTraceUtil;
 import com.google.firebase.perf.util.Timer;
-import com.google.firebase.perf.util.Utils;
 import com.google.firebase.perf.v1.ApplicationProcessState;
 import com.google.firebase.perf.v1.TraceMetric;
 import java.lang.ref.WeakReference;
@@ -48,12 +49,16 @@
 public class AppStateMonitor implements ActivityLifecycleCallbacks {
 
   private static final AndroidLogger logger = AndroidLogger.getInstance();
-  private static final String FRAME_METRICS_AGGREGATOR_CLASSNAME =
-      "androidx.core.app.FrameMetricsAggregator";
 
   private static volatile AppStateMonitor instance;
 
   private final WeakHashMap<Activity, Boolean> activityToResumedMap = new WeakHashMap<>();
+  private final WeakHashMap<Activity, FrameMetricsRecorder> activityToRecorderMap =
+      new WeakHashMap<>();
+
+  // Map for holding the fragment state monitor to remove receiving the fragment state callbacks
+  private final WeakHashMap<Activity, FragmentStateMonitor> activityToFragmentStateMonitorMap =
+      new WeakHashMap<>();
   private final WeakHashMap<Activity, Trace> activityToScreenTraceMap = new WeakHashMap<>();
   private final Map<String, Long> metricToCountMap = new HashMap<>();
   private final Set<WeakReference<AppStateCallback>> appStateSubscribers = new HashSet<>();
@@ -65,8 +70,7 @@ public class AppStateMonitor implements ActivityLifecycleCallbacks {
   private final TransportManager transportManager;
   private final ConfigResolver configResolver;
   private final Clock clock;
-
-  private FrameMetricsAggregator frameMetricsAggregator;
+  private final boolean screenPerformanceRecordingSupported;
 
   private Timer resumeTime; // The time app comes to foreground
   private Timer stopTime; // The time app goes to background
@@ -75,7 +79,6 @@ public class AppStateMonitor implements ActivityLifecycleCallbacks {
 
   private boolean isRegisteredForLifecycleCallbacks = false;
   private boolean isColdStart = true;
-  private boolean hasFrameMetricsAggregator = false;
 
   public static AppStateMonitor getInstance() {
     if (instance == null) {
@@ -89,13 +92,23 @@ public static AppStateMonitor getInstance() {
   }
 
   AppStateMonitor(TransportManager transportManager, Clock clock) {
+    this(
+        transportManager,
+        clock,
+        ConfigResolver.getInstance(),
+        isScreenPerformanceRecordingSupported());
+  }
+
+  @VisibleForTesting
+  AppStateMonitor(
+      TransportManager transportManager,
+      Clock clock,
+      ConfigResolver configResolver,
+      boolean screenPerformanceRecordingSupported) {
     this.transportManager = transportManager;
     this.clock = clock;
-    configResolver = ConfigResolver.getInstance();
-    hasFrameMetricsAggregator = hasFrameMetricsAggregatorClass();
-    if (hasFrameMetricsAggregator) {
-      frameMetricsAggregator = new FrameMetricsAggregator();
-    }
+    this.configResolver = configResolver;
+    this.screenPerformanceRecordingSupported = screenPerformanceRecordingSupported;
   }
 
   public synchronized void registerActivityLifecycleCallbacks(Context context) {
@@ -139,21 +152,51 @@ public void incrementTsnsCount(int value) {
     tsnsCount.addAndGet(value);
   }
 
+  // Starts tracking the frame metrics for an activity.
+  private void startFrameMonitoring(Activity activity) {
+    if (isScreenTraceSupported() && configResolver.isPerformanceMonitoringEnabled()) {
+      FrameMetricsRecorder recorder = new FrameMetricsRecorder(activity);
+      activityToRecorderMap.put(activity, recorder);
+      if (activity instanceof FragmentActivity) {
+        FragmentStateMonitor fragmentStateMonitor =
+            new FragmentStateMonitor(clock, transportManager, this, recorder);
+        activityToFragmentStateMonitorMap.put(activity, fragmentStateMonitor);
+        FragmentActivity fragmentActivity = (FragmentActivity) activity;
+        fragmentActivity
+            .getSupportFragmentManager()
+            .registerFragmentLifecycleCallbacks(fragmentStateMonitor, true);
+      }
+    }
+  }
+
   @Override
-  public void onActivityCreated(Activity activity, Bundle savedInstanceState) {}
+  public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+    startFrameMonitoring(activity);
+  }
 
   @Override
-  public void onActivityDestroyed(Activity activity) {}
+  public void onActivityDestroyed(Activity activity) {
+    // Dereference FrameMetricsRecorder from the map because it holds an Activity reference
+    activityToRecorderMap.remove(activity);
+    // Dereference FragmentStateMonitor because it holds a FrameMetricsRecorder reference
+    if (activityToFragmentStateMonitorMap.containsKey(activity)) {
+      FragmentActivity fragmentActivity = (FragmentActivity) activity;
+      fragmentActivity
+          .getSupportFragmentManager()
+          .unregisterFragmentLifecycleCallbacks(activityToFragmentStateMonitorMap.remove(activity));
+    }
+  }
 
   @Override
   public synchronized void onActivityStarted(Activity activity) {
-    if (isScreenTraceSupported(activity) && configResolver.isPerformanceMonitoringEnabled()) {
+    if (isScreenTraceSupported() && configResolver.isPerformanceMonitoringEnabled()) {
+      if (!activityToRecorderMap.containsKey(activity)) {
+        // If performance monitoring is disabled at start and enabled at runtime, start monitoring
+        // the activity as the app comes to foreground.
+        startFrameMonitoring(activity);
+      }
       // Starts recording frame metrics for this activity.
-      /**
-       * TODO: Only add activities that are hardware acceleration enabled so that calling {@link
-       * FrameMetricsAggregator#remove(Activity)} will not throw exceptions.
-       */
-      frameMetricsAggregator.add(activity);
+      activityToRecorderMap.get(activity).start();
       // Start the Trace
       Trace screenTrace = new Trace(getScreenTraceName(activity), transportManager, clock, this);
       screenTrace.start();
@@ -163,7 +206,7 @@ public synchronized void onActivityStarted(Activity activity) {
 
   @Override
   public synchronized void onActivityStopped(Activity activity) {
-    if (isScreenTraceSupported(activity)) {
+    if (isScreenTraceSupported()) {
       sendScreenTrace(activity);
     }
 
@@ -185,7 +228,8 @@ public synchronized void onActivityResumed(Activity activity) {
     // cases:
     // 1. At app startup, first activity comes to foreground.
     // 2. app switch from background to foreground.
-    // 3. app already in foreground, current activity is replaced by another activity.
+    // 3. app already in foreground, current activity is replaced by another activity, or the
+    // current activity was paused then resumed without onStop, for example by an AlertDialog
     if (activityToResumedMap.isEmpty()) {
       // The first resumed activity means app comes to foreground.
       resumeTime = clock.getTime();
@@ -202,7 +246,8 @@ public synchronized void onActivityResumed(Activity activity) {
         updateAppState(ApplicationProcessState.FOREGROUND);
       }
     } else {
-      // case 3: app already in foreground, current activity is replaced by another activity.
+      // case 3: app already in foreground, current activity is replaced by another activity, or the
+      // current activity was paused then resumed without onStop, for example by an AlertDialog
       activityToResumedMap.put(activity, true);
     }
   }
@@ -245,7 +290,7 @@ public void unregisterForAppState(WeakReference<AppStateCallback> subscriber) {
    * @param subscriber the {@link AppColdStartCallback} instance.
    */
   public void registerForAppColdStart(AppColdStartCallback subscriber) {
-    synchronized (appStateSubscribers) {
+    synchronized (appColdStartSubscribers) {
       appColdStartSubscribers.add(subscriber);
     }
   }
@@ -270,7 +315,7 @@ private void updateAppState(ApplicationProcessState newState) {
 
   /** Send cold start update to registered subscribers. */
   private void sendAppColdStartUpdate() {
-    synchronized (appStateSubscribers) {
+    synchronized (appColdStartSubscribers) {
       for (Iterator<AppColdStartCallback> i = appColdStartSubscribers.iterator(); i.hasNext(); ) {
         AppColdStartCallback callback = i.next();
         if (callback != null) {
@@ -296,75 +341,23 @@ public void onActivitySaveInstanceState(Activity activity, Bundle outState) {}
   public void onActivityPaused(Activity activity) {}
 
   /**
-   * Send screen trace. If hardware acceleration is not enabled, all frame metrics will be zero and
-   * the trace will not be sent.
+   * Sends the screen trace for the provided activity.
    *
    * @param activity activity object.
    */
   private void sendScreenTrace(Activity activity) {
-    if (!activityToScreenTraceMap.containsKey(activity)) {
-      return;
-    }
     Trace screenTrace = activityToScreenTraceMap.get(activity);
     if (screenTrace == null) {
       return;
     }
     activityToScreenTraceMap.remove(activity);
 
-    int totalFrames = 0;
-    int slowFrames = 0;
-    int frozenFrames = 0;
-    /**
-     * Resets the metrics data and returns the currently-collected metrics. Note that {@link
-     * FrameMetricsAggregator#reset()} will not stop recording for the activity. The reason of using
-     * {@link FrameMetricsAggregator#reset()} is that {@link
-     * FrameMetricsAggregator#remove(Activity)} will throw exceptions for hardware acceleration
-     * disabled activities.
-     */
-    SparseIntArray[] arr = frameMetricsAggregator.reset();
-    if (arr != null) {
-      SparseIntArray frameTimes = arr[FrameMetricsAggregator.TOTAL_INDEX];
-      if (frameTimes != null) {
-        for (int i = 0; i < frameTimes.size(); i++) {
-          int frameTime = frameTimes.keyAt(i);
-          int numFrames = frameTimes.valueAt(i);
-          totalFrames += numFrames;
-          if (frameTime > Constants.FROZEN_FRAME_TIME) {
-            // Frozen frames mean the app appear frozen.  The recommended thresholds is 700ms
-            frozenFrames += numFrames;
-          }
-          if (frameTime > Constants.SLOW_FRAME_TIME) {
-            // Slow frames are anything above 16ms (i.e. 60 frames/second)
-            slowFrames += numFrames;
-          }
-        }
-      }
-    }
-    if (totalFrames == 0 && slowFrames == 0 && frozenFrames == 0) {
-      // All metrics are zero, no need to send screen trace.
-      // return;
-    }
-    // Only incrementMetric if corresponding metric is non-zero.
-    if (totalFrames > 0) {
-      screenTrace.putMetric(Constants.CounterNames.FRAMES_TOTAL.toString(), totalFrames);
-    }
-    if (slowFrames > 0) {
-      screenTrace.putMetric(Constants.CounterNames.FRAMES_SLOW.toString(), slowFrames);
-    }
-    if (frozenFrames > 0) {
-      screenTrace.putMetric(Constants.CounterNames.FRAMES_FROZEN.toString(), frozenFrames);
-    }
-    if (Utils.isDebugLoggingEnabled(activity.getApplicationContext())) {
-      logger.debug(
-          "sendScreenTrace name:"
-              + getScreenTraceName(activity)
-              + " _fr_tot:"
-              + totalFrames
-              + " _fr_slo:"
-              + slowFrames
-              + " _fr_fzn:"
-              + frozenFrames);
+    Optional<PerfFrameMetrics> perfFrameMetrics = activityToRecorderMap.get(activity).stop();
+    if (!perfFrameMetrics.isAvailable()) {
+      logger.warn("Failed to record frame data for %s.", activity.getClass().getSimpleName());
+      return;
     }
+    ScreenTraceUtil.addFrameCounters(screenTrace, perfFrameMetrics.get());
     // Stop and record trace
     screenTrace.stop();
   }
@@ -406,11 +399,10 @@ private void sendSessionLog(String name, Timer startTime, Timer endTime) {
   /**
    * Only send screen trace if FrameMetricsAggregator exists.
    *
-   * @param activity The Activity for which we're monitoring the screen rendering performance.
    * @return true if supported, false if not.
    */
-  private boolean isScreenTraceSupported(Activity activity) {
-    return hasFrameMetricsAggregator;
+  protected boolean isScreenTraceSupported() {
+    return screenPerformanceRecordingSupported;
   }
 
   /**
@@ -418,13 +410,8 @@ private boolean isScreenTraceSupported(Activity activity) {
    * updated to 26.1.0 (b/69954793), there will be ClassNotFoundException. This method is to check
    * if FrameMetricsAggregator exists to avoid ClassNotFoundException.
    */
-  private boolean hasFrameMetricsAggregatorClass() {
-    try {
-      Class<?> initializerClass = Class.forName(FRAME_METRICS_AGGREGATOR_CLASSNAME);
-      return true;
-    } catch (ClassNotFoundException e) {
-      return false;
-    }
+  private static boolean isScreenPerformanceRecordingSupported() {
+    return FrameMetricsRecorder.isFrameMetricsRecordingSupported();
   }
 
   /** An interface to be implemented by subscribers which needs to receive app state update. */
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateUpdateHandler.java b/firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateUpdateHandler.java
index edac15f5ab8..07e6c1cd300 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateUpdateHandler.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateUpdateHandler.java
@@ -15,7 +15,8 @@
 package com.google.firebase.perf.application;
 
 import androidx.annotation.NonNull;
-import com.google.android.gms.common.util.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
+
 import com.google.firebase.perf.application.AppStateMonitor.AppStateCallback;
 import com.google.firebase.perf.v1.ApplicationProcessState;
 import java.lang.ref.WeakReference;
@@ -31,6 +32,7 @@ public abstract class AppStateUpdateHandler implements AppStateCallback {
   // It must be a weak reference because unregisterForAppState() is called typically from
   // Trace.stop() and user may forget to call Trace.stop(), if it was a strong reference,
   // the registration in AppStateMonitor will prevent Trace to be deallocated.
+  /** @hide */
   private final WeakReference<AppStateCallback> appStateCallback;
 
   private boolean isRegisteredForAppState = false;
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/application/FragmentStateMonitor.java b/firebase-perf/src/main/java/com/google/firebase/perf/application/FragmentStateMonitor.java
new file mode 100644
index 00000000000..fba6cb0907a
--- /dev/null
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/application/FragmentStateMonitor.java
@@ -0,0 +1,108 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.perf.application;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.metrics.FrameMetricsCalculator.PerfFrameMetrics;
+import com.google.firebase.perf.metrics.Trace;
+import com.google.firebase.perf.transport.TransportManager;
+import com.google.firebase.perf.util.Clock;
+import com.google.firebase.perf.util.Constants;
+import com.google.firebase.perf.util.Optional;
+import com.google.firebase.perf.util.ScreenTraceUtil;
+import java.util.WeakHashMap;
+
+public class FragmentStateMonitor extends FragmentManager.FragmentLifecycleCallbacks {
+  private static final AndroidLogger logger = AndroidLogger.getInstance();
+  private final WeakHashMap<Fragment, Trace> fragmentToTraceMap = new WeakHashMap<>();
+  private final Clock clock;
+  private final TransportManager transportManager;
+  private final AppStateMonitor appStateMonitor;
+  private final FrameMetricsRecorder activityFramesRecorder;
+
+  public FragmentStateMonitor(
+      Clock clock,
+      TransportManager transportManager,
+      AppStateMonitor appStateMonitor,
+      FrameMetricsRecorder recorder) {
+    this.clock = clock;
+    this.transportManager = transportManager;
+    this.appStateMonitor = appStateMonitor;
+    this.activityFramesRecorder = recorder;
+  }
+
+  /**
+   * Fragment screen trace name is prefix "_st_" concatenates with Fragment's class name.
+   *
+   * @param fragment fragment object.
+   * @return Fragment screen trace name.
+   */
+  public String getFragmentScreenTraceName(Fragment fragment) {
+    return Constants.SCREEN_TRACE_PREFIX + fragment.getClass().getSimpleName();
+  }
+
+  @Override
+  public void onFragmentResumed(@NonNull FragmentManager fm, @NonNull Fragment f) {
+    super.onFragmentResumed(fm, f);
+    // Start Fragment screen trace
+    logger.debug("FragmentMonitor %s.onFragmentResumed", f.getClass().getSimpleName());
+    Trace fragmentTrace =
+        new Trace(getFragmentScreenTraceName(f), transportManager, clock, appStateMonitor);
+    fragmentTrace.start();
+
+    fragmentTrace.putAttribute(
+        Constants.PARENT_FRAGMENT_ATTRIBUTE_KEY,
+        f.getParentFragment() == null
+            ? Constants.PARENT_FRAGMENT_ATTRIBUTE_VALUE_NONE
+            : f.getParentFragment().getClass().getSimpleName());
+    if (f.getActivity() != null) {
+      fragmentTrace.putAttribute(
+          Constants.ACTIVITY_ATTRIBUTE_KEY, f.getActivity().getClass().getSimpleName());
+    }
+    fragmentToTraceMap.put(f, fragmentTrace);
+    activityFramesRecorder.startFragment(f);
+  }
+
+  @Override
+  public void onFragmentPaused(@NonNull FragmentManager fm, @NonNull Fragment f) {
+    super.onFragmentPaused(fm, f);
+    // Stop Fragment screen trace
+    logger.debug("FragmentMonitor %s.onFragmentPaused ", f.getClass().getSimpleName());
+    if (!fragmentToTraceMap.containsKey(f)) {
+      logger.warn("FragmentMonitor: missed a fragment trace from %s", f.getClass().getSimpleName());
+      return;
+    }
+
+    Trace fragmentTrace = fragmentToTraceMap.get(f);
+    fragmentToTraceMap.remove(f);
+
+    Optional<PerfFrameMetrics> frameMetricsData = activityFramesRecorder.stopFragment(f);
+    if (!frameMetricsData.isAvailable()) {
+      logger.warn("onFragmentPaused: recorder failed to trace %s", f.getClass().getSimpleName());
+      return;
+    }
+    ScreenTraceUtil.addFrameCounters(fragmentTrace, frameMetricsData.get());
+    fragmentTrace.stop();
+  }
+
+  @VisibleForTesting
+  WeakHashMap<Fragment, Trace> getFragmentToTraceMap() {
+    return fragmentToTraceMap;
+  }
+}
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/application/FrameMetricsRecorder.java b/firebase-perf/src/main/java/com/google/firebase/perf/application/FrameMetricsRecorder.java
new file mode 100644
index 00000000000..78e2c1f3fa3
--- /dev/null
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/application/FrameMetricsRecorder.java
@@ -0,0 +1,211 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.perf.application;
+
+import android.app.Activity;
+import android.os.Build;
+import android.util.SparseIntArray;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.core.app.FrameMetricsAggregator;
+import androidx.fragment.app.Fragment;
+import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.metrics.FrameMetricsCalculator;
+import com.google.firebase.perf.metrics.FrameMetricsCalculator.PerfFrameMetrics;
+import com.google.firebase.perf.util.Optional;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Provides FrameMetrics data from an Activity's Window. Encapsulates FrameMetricsAggregator.
+ *
+ * <p>IMPORTANT: each recorder holds a reference to an Activity, so it is very important to
+ * dereference each recorder at or before its Activity's onDestroy. Similar for Fragments.
+ *
+ * <p>Relationship of Fragment recording to Activity recording is like a stopwatch. The stopwatch
+ * itself is for the Activity, Fragments traces are laps in the stopwatch. Stopwatch can only ever
+ * be for the Activity by-definition because "frames" refer to a frame for a window, and
+ * FrameMetrics can only come from an Activity's Window. Fragment traces are laps in the stopwatch,
+ * because the frame metrics data is still for the Activity window, fragment traces are just
+ * intervals in the Activity frames recording that has the name "fragment X" attached to them.
+ */
+public class FrameMetricsRecorder {
+  private static final AndroidLogger logger = AndroidLogger.getInstance();
+  private static final String FRAME_METRICS_AGGREGATOR_CLASSNAME =
+      "androidx.core.app.FrameMetricsAggregator";
+
+  private final Activity activity;
+  private final FrameMetricsAggregator frameMetricsAggregator;
+  private final Map<Fragment, PerfFrameMetrics> fragmentSnapshotMap;
+
+  private boolean isRecording = false;
+
+  static boolean isFrameMetricsRecordingSupported() {
+    try {
+      Class<?> initializerClass = Class.forName(FRAME_METRICS_AGGREGATOR_CLASSNAME);
+      return true;
+    } catch (ClassNotFoundException e) {
+      return false;
+    }
+  }
+
+  /**
+   * Creates a recorder for a specific activity.
+   *
+   * @param activity the activity that the recorder is collecting data from.
+   */
+  public FrameMetricsRecorder(Activity activity) {
+    this(activity, new FrameMetricsAggregator(), new HashMap<>());
+  }
+
+  @VisibleForTesting
+  FrameMetricsRecorder(
+      Activity activity,
+      FrameMetricsAggregator frameMetricsAggregator,
+      Map<Fragment, PerfFrameMetrics> subTraceMap) {
+    this.activity = activity;
+    this.frameMetricsAggregator = frameMetricsAggregator;
+    this.fragmentSnapshotMap = subTraceMap;
+  }
+
+  /** Starts recording FrameMetrics for the activity window. */
+  public void start() {
+    if (isRecording) {
+      logger.debug(
+          "FrameMetricsAggregator is already recording %s", activity.getClass().getSimpleName());
+      return;
+    }
+    frameMetricsAggregator.add(activity);
+    isRecording = true;
+  }
+
+  /**
+   * Stops recording FrameMetrics for the activity window.
+   *
+   * @return FrameMetrics accumulated during the current recording.
+   */
+  public Optional<PerfFrameMetrics> stop() {
+    if (!isRecording) {
+      logger.debug("Cannot stop because no recording was started");
+      return Optional.absent();
+    }
+    if (!fragmentSnapshotMap.isEmpty()) {
+      // Instrumentation stops and still return activity data, but invalidate all dangling fragments
+      logger.debug(
+          "Sub-recordings are still ongoing! Sub-recordings should be stopped first before stopping Activity screen trace.");
+      fragmentSnapshotMap.clear();
+    }
+    Optional<PerfFrameMetrics> data = this.snapshot();
+    try {
+      // No reliable way to check for hardware-acceleration, so we must catch retroactively (#2736).
+      frameMetricsAggregator.remove(activity);
+    } catch (IllegalArgumentException | NullPointerException ex) {
+      // Both of these exceptions result from android.view.View.addFrameMetricsListener silently
+      // failing when the view is not hardware-accelerated. Successful addFrameMetricsListener
+      // stores an observer in a list, and initializes the list if it was uninitialized. Invoking
+      // View.removeFrameMetricsListener(listener) throws IAE if it doesn't exist in the list, or
+      // throws NPE if the list itself was never initialized (#4184).
+      if (ex instanceof NullPointerException && Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+        // Re-throw above API 28, since the NPE is fixed in API 29:
+        // https://android.googlesource.com/platform/frameworks/base/+/140ff5ea8e2d99edc3fbe63a43239e459334c76b
+        throw ex;
+      }
+      logger.warn(
+          "View not hardware accelerated. Unable to collect FrameMetrics. %s", ex.toString());
+      data = Optional.absent();
+    }
+    frameMetricsAggregator.reset();
+    isRecording = false;
+    return data;
+  }
+
+  /**
+   * Starts a Fragment sub-recording in the current Activity recording. Fragments are sub-recordings
+   * due to the way frame metrics work: frame metrics can only comes from an activity's window. An
+   * analogy for sub-recording is a lap in a stopwatch.
+   *
+   * @param fragment a Fragment to associate this sub-trace with.
+   */
+  public void startFragment(Fragment fragment) {
+    if (!isRecording) {
+      logger.debug("Cannot start sub-recording because FrameMetricsAggregator is not recording");
+      return;
+    }
+    if (fragmentSnapshotMap.containsKey(fragment)) {
+      logger.debug(
+          "Cannot start sub-recording because one is already ongoing with the key %s",
+          fragment.getClass().getSimpleName());
+      return;
+    }
+    Optional<PerfFrameMetrics> snapshot = this.snapshot();
+    if (!snapshot.isAvailable()) {
+      logger.debug("startFragment(%s): snapshot() failed", fragment.getClass().getSimpleName());
+      return;
+    }
+    fragmentSnapshotMap.put(fragment, snapshot.get());
+  }
+
+  /**
+   * Stops the sub-recording associated with the given Fragment. Fragments are sub-recordings due to
+   * the way frame metrics work: frame metrics can only comes from an activity's window. An analogy
+   * for sub-recording is a lap in a stopwatch.
+   *
+   * @param fragment the Fragment associated with the sub-recording to be stopped.
+   * @return FrameMetrics accumulated during this sub-recording.
+   */
+  public Optional<PerfFrameMetrics> stopFragment(Fragment fragment) {
+    if (!isRecording) {
+      logger.debug("Cannot stop sub-recording because FrameMetricsAggregator is not recording");
+      return Optional.absent();
+    }
+    if (!fragmentSnapshotMap.containsKey(fragment)) {
+      logger.debug(
+          "Sub-recording associated with key %s was not started or does not exist",
+          fragment.getClass().getSimpleName());
+      return Optional.absent();
+    }
+    PerfFrameMetrics snapshotStart = fragmentSnapshotMap.remove(fragment);
+    Optional<PerfFrameMetrics> snapshotEnd = this.snapshot();
+    if (!snapshotEnd.isAvailable()) {
+      logger.debug("stopFragment(%s): snapshot() failed", fragment.getClass().getSimpleName());
+      return Optional.absent();
+    }
+    return Optional.of(snapshotEnd.get().deltaFrameMetricsFromSnapshot(snapshotStart));
+  }
+
+  /**
+   * Snapshots total frames, slow frames, and frozen frames from SparseIntArray[] recorded by {@link
+   * FrameMetricsAggregator}.
+   *
+   * @return {@link PerfFrameMetrics} at the time of snapshot.
+   */
+  private Optional<PerfFrameMetrics> snapshot() {
+    if (!isRecording) {
+      logger.debug("No recording has been started.");
+      return Optional.absent();
+    }
+    SparseIntArray[] arr = this.frameMetricsAggregator.getMetrics();
+    if (arr == null) {
+      logger.debug("FrameMetricsAggregator.mMetrics is uninitialized.");
+      return Optional.absent();
+    }
+    SparseIntArray frameTimes = arr[FrameMetricsAggregator.TOTAL_INDEX];
+    if (frameTimes == null) {
+      logger.debug("FrameMetricsAggregator.mMetrics[TOTAL_INDEX] is uninitialized.");
+      return Optional.absent();
+    }
+    return Optional.of(FrameMetricsCalculator.calculateFrameMetrics(arr));
+  }
+}
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigResolver.java b/firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigResolver.java
index 2d4e0779938..762dff42a7e 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigResolver.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigResolver.java
@@ -23,6 +23,8 @@
 import com.google.firebase.perf.BuildConfig;
 import com.google.firebase.perf.config.ConfigurationConstants.CollectionDeactivated;
 import com.google.firebase.perf.config.ConfigurationConstants.CollectionEnabled;
+import com.google.firebase.perf.config.ConfigurationConstants.ExperimentTTID;
+import com.google.firebase.perf.config.ConfigurationConstants.FragmentSamplingRate;
 import com.google.firebase.perf.config.ConfigurationConstants.LogSourceName;
 import com.google.firebase.perf.config.ConfigurationConstants.NetworkEventCountBackground;
 import com.google.firebase.perf.config.ConfigurationConstants.NetworkEventCountForeground;
@@ -154,6 +156,15 @@ public Boolean getIsPerformanceCollectionEnabled() {
     return null;
   }
 
+  /**
+   * Returns whether data collection flag is fetched either through device cache or remote config.
+   */
+  public boolean isCollectionEnabledConfigValueAvailable() {
+    Optional<Boolean> remoteConfigValue = getRemoteConfigBoolean(SdkEnabled.getInstance());
+    Optional<Boolean> deviceCacheValue = getDeviceCacheBoolean(CollectionEnabled.getInstance());
+    return deviceCacheValue.isAvailable() || remoteConfigValue.isAvailable();
+  }
+
   /** Returns whether developers have deactivated Firebase Performance event collection. */
   @Nullable
   public Boolean getIsPerformanceCollectionDeactivated() {
@@ -284,89 +295,107 @@ private boolean isFireperfSdkVersionInList(String versions) {
   }
 
   /** Returns what percentage of Traces should be collected, range is [0.00f, 1.00f]. */
-  public float getTraceSamplingRate() {
+  public double getTraceSamplingRate() {
     // Order of precedence is:
     // 1. If the value exists through Firebase Remote Config, cache and return this value.
     // 2. If the value exists in device cache, return this value.
-    // 3. Otherwise, return default value.
+    // 3. If the Firebase Remote Config fetch failed, return the default "rc failure" value.
+    // 4. Otherwise, return default value.
     TraceSamplingRate config = TraceSamplingRate.getInstance();
 
     // 1. Reads value from Firebase Remote Config, saves this value in cache layer if valid.
-    Optional<Float> rcValue = getRemoteConfigFloat(config);
+    Optional<Double> rcValue = getRemoteConfigDouble(config);
     if (rcValue.isAvailable() && isSamplingRateValid(rcValue.get())) {
       deviceCacheManager.setValue(config.getDeviceCacheFlag(), rcValue.get());
       return rcValue.get();
     }
 
     // 2. Reads value from cache layer.
-    Optional<Float> deviceCacheValue = getDeviceCacheFloat(config);
+    Optional<Double> deviceCacheValue = getDeviceCacheDouble(config);
     if (deviceCacheValue.isAvailable() && isSamplingRateValid(deviceCacheValue.get())) {
       return deviceCacheValue.get();
     }
 
-    // 3. Returns default value if there is no valid value from above approaches.
+    // 3. Check if RC fetch failed.
+    if (remoteConfigManager.isLastFetchFailed()) {
+      return config.getDefaultOnRcFetchFail();
+    }
+
+    // 4. Returns default value if there is no valid value from above approaches.
     return config.getDefault();
   }
 
   /** Returns what percentage of NetworkRequest should be collected, range is [0.00f, 1.00f]. */
-  public float getNetworkRequestSamplingRate() {
+  public double getNetworkRequestSamplingRate() {
     // Order of precedence is:
     // 1. If the value exists through Firebase Remote Config, cache and return this value.
     // 2. If the value exists in device cache, return this value.
-    // 3. Otherwise, return default value.
+    // 3. If the Firebase Remote Config fetch failed, return the default "rc failure" value.
+    // 4. Otherwise, return default value.
     NetworkRequestSamplingRate config = NetworkRequestSamplingRate.getInstance();
 
     // 1. Reads value from Firebase Remote Config, saves this value in cache layer if valid.
-    Optional<Float> rcValue = getRemoteConfigFloat(config);
+    Optional<Double> rcValue = getRemoteConfigDouble(config);
     if (rcValue.isAvailable() && isSamplingRateValid(rcValue.get())) {
       deviceCacheManager.setValue(config.getDeviceCacheFlag(), rcValue.get());
       return rcValue.get();
     }
 
     // 2. Reads value from cache layer.
-    Optional<Float> deviceCacheValue = getDeviceCacheFloat(config);
+    Optional<Double> deviceCacheValue = getDeviceCacheDouble(config);
     if (deviceCacheValue.isAvailable() && isSamplingRateValid(deviceCacheValue.get())) {
       return deviceCacheValue.get();
     }
 
-    // 3. Returns default value if there is no valid value from above approaches.
+    // 3. Check if RC fetch failed.
+    if (remoteConfigManager.isLastFetchFailed()) {
+      return config.getDefaultOnRcFetchFail();
+    }
+
+    // 4. Returns default value if there is no valid value from above approaches.
     return config.getDefault();
   }
 
   /** Returns what percentage of Session gauge should be collected, range is [0.00f, 1.00f]. */
-  public float getSessionsSamplingRate() {
+  public double getSessionsSamplingRate() {
     // Order of precedence is:
     // 1. If the value exists in Android Manifest, convert from [0.00f, 100.00f] to [0.00f, 1.00f]
     // and return this value.
     // 2. If the value exists through Firebase Remote Config, cache and return this value.
     // 3. If the value exists in device cache, return this value.
-    // 4. Otherwise, return default value.
+    // 4. If the Firebase Remote Config fetch failed, return the default "rc failure" value.
+    // 5. Otherwise, return default value.
     SessionsSamplingRate config = SessionsSamplingRate.getInstance();
 
     // 1. Reads value in Android Manifest (it is set by developers during build time).
-    Optional<Float> metadataValue = getMetadataFloat(config);
+    Optional<Double> metadataValue = getMetadataDouble(config);
     if (metadataValue.isAvailable()) {
       // Sampling percentage from metadata needs to convert from [0.00f, 100.00f] to [0.00f, 1.00f].
-      float samplingRate = metadataValue.get() / 100.0f;
+      double samplingRate = metadataValue.get() / 100;
       if (isSamplingRateValid(samplingRate)) {
         return samplingRate;
       }
     }
 
     // 2. Reads value from Firebase Remote Config, saves this value in cache layer if valid.
-    Optional<Float> rcValue = getRemoteConfigFloat(config);
+    Optional<Double> rcValue = getRemoteConfigDouble(config);
     if (rcValue.isAvailable() && isSamplingRateValid(rcValue.get())) {
       deviceCacheManager.setValue(config.getDeviceCacheFlag(), rcValue.get());
       return rcValue.get();
     }
 
     // 3. Reads value from cache layer.
-    Optional<Float> deviceCacheValue = getDeviceCacheFloat(config);
+    Optional<Double> deviceCacheValue = getDeviceCacheDouble(config);
     if (deviceCacheValue.isAvailable() && isSamplingRateValid(deviceCacheValue.get())) {
       return deviceCacheValue.get();
     }
 
-    // 4. Returns default value if there is no valid value from above approaches.
+    // 4. Check if RC fetch failed.
+    if (remoteConfigManager.isLastFetchFailed()) {
+      return config.getDefaultOnRcFetchFail();
+    }
+
+    // 5. Returns default value if there is no valid value from above approaches.
     return config.getDefault();
   }
 
@@ -379,7 +408,8 @@ public long getSessionsCpuCaptureFrequencyForegroundMs() {
     // 1. If the value exists in Android Manifest, return this value.
     // 2. If the value exists through Firebase Remote Config, cache and return this value.
     // 3. If the value exists in device cache, return this value.
-    // 4. Otherwise, return default value.
+    // 4. If the Firebase Remote Config fetch failed, return default failure value.
+    // 5. Otherwise, return default value.
     SessionsCpuCaptureFrequencyForegroundMs config =
         SessionsCpuCaptureFrequencyForegroundMs.getInstance();
 
@@ -402,7 +432,12 @@ public long getSessionsCpuCaptureFrequencyForegroundMs() {
       return deviceCacheValue.get();
     }
 
-    // 4. Returns default value if there is no valid value from above approaches.
+    // 4. Check if RC fetch failed.
+    if (remoteConfigManager.isLastFetchFailed()) {
+      return config.getDefaultOnRcFetchFail();
+    }
+
+    // 5. Returns default value if there is no valid value from above approaches.
     return config.getDefault();
   }
 
@@ -451,7 +486,8 @@ public long getSessionsMemoryCaptureFrequencyForegroundMs() {
     // 1. If the value exists in Android Manifest, return this value.
     // 2. If the value exists through Firebase Remote Config, cache and return this value.
     // 3. If the value exists in device cache, return this value.
-    // 4. Otherwise, return default value.
+    // 4. If the Firebase Remote Config fetch failed, return default failure value.
+    // 5. Otherwise, return default value.
     SessionsMemoryCaptureFrequencyForegroundMs config =
         SessionsMemoryCaptureFrequencyForegroundMs.getInstance();
 
@@ -474,7 +510,12 @@ public long getSessionsMemoryCaptureFrequencyForegroundMs() {
       return deviceCacheValue.get();
     }
 
-    // 4. Returns default value if there is no valid value from above approaches.
+    // 4. Check if RC fetch failed.
+    if (remoteConfigManager.isLastFetchFailed()) {
+      return config.getDefaultOnRcFetchFail();
+    }
+
+    // 5. Returns default value if there is no valid value from above approaches.
     return config.getDefault();
   }
 
@@ -729,6 +770,75 @@ public String getAndCacheLogSourceName() {
     return configFlag.getDefault();
   }
 
+  /** Returns what percentage of fragment traces should be collected, range is [0.00f, 1.00f]. */
+  public double getFragmentSamplingRate() {
+    // Order of precedence is:
+    // 1. If the value exists in Android Manifest, convert from [0.00f, 100.00f] to [0.00f, 1.00f]
+    // and return this value.
+    // 2. If the value exists through Firebase Remote Config, cache and return this value.
+    // 3. If the value exists in device cache, return this value.
+    // 4. Otherwise, return default value.
+    FragmentSamplingRate config = FragmentSamplingRate.getInstance();
+
+    // 1. Reads value in Android Manifest (it is set by developers during build time).
+    Optional<Double> metadataValue = getMetadataDouble(config);
+    if (metadataValue.isAvailable()) {
+      // Sampling percentage from metadata needs to convert from [0.00f, 100.00f] to [0.00f, 1.00f].
+      double samplingRate = metadataValue.get() / 100.0f;
+      if (isSamplingRateValid(samplingRate)) {
+        return samplingRate;
+      }
+    }
+
+    // 2. Reads value from Firebase Remote Config, saves this value in cache layer if valid.
+    Optional<Double> rcValue = getRemoteConfigDouble(config);
+    if (rcValue.isAvailable() && isSamplingRateValid(rcValue.get())) {
+      deviceCacheManager.setValue(config.getDeviceCacheFlag(), rcValue.get());
+      return rcValue.get();
+    }
+
+    // 3. Reads value from cache layer.
+    Optional<Double> deviceCacheValue = getDeviceCacheDouble(config);
+    if (deviceCacheValue.isAvailable() && isSamplingRateValid(deviceCacheValue.get())) {
+      return deviceCacheValue.get();
+    }
+
+    // 4. Returns default value if there is no valid value from above approaches.
+    return config.getDefault();
+  }
+
+  /** Returns if _experiment_app_start_ttid should be captured. */
+  public boolean getIsExperimentTTIDEnabled() {
+    // Order of precedence is:
+    // 1. If the value exists in Android Manifest, return this value.
+    // 2. If the value exists through Firebase Remote Config, cache and return this value.
+    // 3. If the value exists in device cache, return this value.
+    // 4. Otherwise, return default value.
+    ExperimentTTID config = ExperimentTTID.getInstance();
+
+    // 1. Reads value in Android Manifest (it is set by developers during build time).
+    Optional<Boolean> metadataValue = getMetadataBoolean(config);
+    if (metadataValue.isAvailable()) {
+      return metadataValue.get();
+    }
+
+    // 2. Reads value from Firebase Remote Config, saves this value in cache layer if valid.
+    Optional<Boolean> rcValue = getRemoteConfigBoolean(config);
+    if (rcValue.isAvailable()) {
+      deviceCacheManager.setValue(config.getDeviceCacheFlag(), rcValue.get());
+      return rcValue.get();
+    }
+
+    // 3. Reads value from cache layer.
+    Optional<Boolean> deviceCacheValue = getDeviceCacheBoolean(config);
+    if (deviceCacheValue.isAvailable()) {
+      return deviceCacheValue.get();
+    }
+
+    // 4. Returns default value if there is no valid value from above approaches.
+    return config.getDefault();
+  }
+
   // endregion
 
   // Helper functions for interaction with Metadata layer.
@@ -736,8 +846,8 @@ private Optional<Boolean> getMetadataBoolean(ConfigurationFlag<Boolean> config)
     return metadataBundle.getBoolean(config.getMetadataFlag());
   }
 
-  private Optional<Float> getMetadataFloat(ConfigurationFlag<Float> config) {
-    return metadataBundle.getFloat(config.getMetadataFlag());
+  private Optional<Double> getMetadataDouble(ConfigurationFlag<Double> config) {
+    return metadataBundle.getDouble(config.getMetadataFlag());
   }
 
   private Optional<Long> getMetadataLong(ConfigurationFlag<Long> config) {
@@ -745,8 +855,8 @@ private Optional<Long> getMetadataLong(ConfigurationFlag<Long> config) {
   }
 
   // Helper functions for interaction with Firebase Remote Config.
-  private Optional<Float> getRemoteConfigFloat(ConfigurationFlag<Float> config) {
-    return remoteConfigManager.getFloat(config.getRemoteConfigFlag());
+  private Optional<Double> getRemoteConfigDouble(ConfigurationFlag<Double> config) {
+    return remoteConfigManager.getDouble(config.getRemoteConfigFlag());
   }
 
   private Optional<Long> getRemoteConfigLong(ConfigurationFlag<Long> config) {
@@ -770,8 +880,8 @@ private Long getRemoteConfigValue(ConfigurationFlag<Long> configFlag) {
   }
 
   // Helper functions for interaction with Device Caching layer.
-  private Optional<Float> getDeviceCacheFloat(ConfigurationFlag<Float> config) {
-    return deviceCacheManager.getFloat(config.getDeviceCacheFlag());
+  private Optional<Double> getDeviceCacheDouble(ConfigurationFlag<Double> config) {
+    return deviceCacheManager.getDouble(config.getDeviceCacheFlag());
   }
 
   private Optional<Long> getDeviceCacheLong(ConfigurationFlag<Long> config) {
@@ -787,7 +897,7 @@ private Optional<String> getDeviceCacheString(ConfigurationFlag<String> config)
   }
 
   // Helper functions for config value validation.
-  private boolean isSamplingRateValid(float samplingRate) {
+  private boolean isSamplingRateValid(double samplingRate) {
     return MIN_SAMPLING_RATE <= samplingRate && samplingRate <= MAX_SAMPLING_RATE;
   }
 
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigurationConstants.java b/firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigurationConstants.java
index d500ad8a89b..c8a2e5cbc77 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigurationConstants.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigurationConstants.java
@@ -130,7 +130,7 @@ protected String getDeviceCacheFlag() {
     }
   }
 
-  protected static final class TraceSamplingRate extends ConfigurationFlag<Float> {
+  protected static final class TraceSamplingRate extends ConfigurationFlag<Double> {
     private static TraceSamplingRate instance;
 
     private TraceSamplingRate() {
@@ -145,11 +145,17 @@ protected static synchronized TraceSamplingRate getInstance() {
     }
 
     @Override
-    protected Float getDefault() {
+    protected Double getDefault() {
       // Sampling rate range is [0.00f, 1.00f]. By default, sampling rate is 1.00f, which is 100%.
       // 0.00f means 0%, Fireperf will not capture any event for trace from the device,
       // 1.00f means 100%, Fireperf will capture all events for trace from the device.
-      return 1.00f;
+      return 1.0;
+    }
+
+    @Override
+    protected Double getDefaultOnRcFetchFail() {
+      // Reduce the typical default by 3 orders of magnitude.
+      return getDefault() / 1000;
     }
 
     @Override
@@ -163,7 +169,7 @@ protected String getDeviceCacheFlag() {
     }
   }
 
-  protected static final class NetworkRequestSamplingRate extends ConfigurationFlag<Float> {
+  protected static final class NetworkRequestSamplingRate extends ConfigurationFlag<Double> {
     private static NetworkRequestSamplingRate instance;
 
     private NetworkRequestSamplingRate() {
@@ -178,11 +184,17 @@ protected static synchronized NetworkRequestSamplingRate getInstance() {
     }
 
     @Override
-    protected Float getDefault() {
+    protected Double getDefault() {
       // Sampling rate range is [0.00f, 1.00f]. By default, sampling rate is 1.00f, which is 100%.
       // 0.00f means 0%, Fireperf will not capture any event for trace from the device,
       // 1.00f means 100%, Fireperf will capture all events for trace from the device.
-      return 1.00f;
+      return 1.0;
+    }
+
+    @Override
+    protected Double getDefaultOnRcFetchFail() {
+      // Reduce the typical default by 3 orders of magnitude.
+      return getDefault() / 1000;
     }
 
     @Override
@@ -218,6 +230,12 @@ protected Long getDefault() {
       return 100L;
     }
 
+    @Override
+    protected Long getDefaultOnRcFetchFail() {
+      // Increase the typical default by factor of 3.
+      return getDefault() * 3;
+    }
+
     @Override
     protected String getRemoteConfigFlag() {
       return "fpr_session_gauge_cpu_capture_frequency_fg_ms";
@@ -294,6 +312,12 @@ protected Long getDefault() {
       return 100L;
     }
 
+    @Override
+    protected Long getDefaultOnRcFetchFail() {
+      // Increase the typical default by factor of 3.
+      return getDefault() * 3;
+    }
+
     @Override
     protected String getRemoteConfigFlag() {
       return "fpr_session_gauge_memory_capture_frequency_fg_ms";
@@ -534,7 +558,7 @@ protected String getDeviceCacheFlag() {
     }
   }
 
-  protected static final class SessionsSamplingRate extends ConfigurationFlag<Float> {
+  protected static final class SessionsSamplingRate extends ConfigurationFlag<Double> {
     private static SessionsSamplingRate instance;
 
     private SessionsSamplingRate() {
@@ -549,8 +573,14 @@ public static synchronized SessionsSamplingRate getInstance() {
     }
 
     @Override
-    protected Float getDefault() {
-      return 0.01f;
+    protected Double getDefault() {
+      return 0.01;
+    }
+
+    @Override
+    protected Double getDefaultOnRcFetchFail() {
+      // Reduce the typical default by 3 orders of magnitude.
+      return getDefault() / 1000;
     }
 
     @Override
@@ -623,4 +653,77 @@ protected String getDeviceCacheFlag() {
       return "com.google.firebase.perf.LogSourceName";
     }
   }
+
+  protected static final class FragmentSamplingRate extends ConfigurationFlag<Double> {
+    private static FragmentSamplingRate instance;
+
+    private FragmentSamplingRate() {
+      super();
+    }
+
+    protected static synchronized FragmentSamplingRate getInstance() {
+      if (instance == null) {
+        instance = new FragmentSamplingRate();
+      }
+      return instance;
+    }
+
+    @Override
+    protected Double getDefault() {
+      // Sampling rate range is [0.00f, 1.00f]. By default, sampling rate is 0.00f, which is 0%.
+      // 0.00f means 0%, Fireperf will not capture any event for fragment trace from the device,
+      // 1.00f means 100%, Fireperf will capture all events for fragment trace from the device.
+      return 0.00;
+    }
+
+    @Override
+    protected String getRemoteConfigFlag() {
+      return "fpr_vc_fragment_sampling_rate";
+    }
+
+    @Override
+    protected String getDeviceCacheFlag() {
+      return "com.google.firebase.perf.FragmentSamplingRate";
+    }
+
+    @Override
+    protected String getMetadataFlag() {
+      return "fragment_sampling_percentage";
+    }
+  }
+
+  protected static final class ExperimentTTID extends ConfigurationFlag<Boolean> {
+    private static ExperimentTTID instance;
+
+    private ExperimentTTID() {
+      super();
+    }
+
+    protected static synchronized ExperimentTTID getInstance() {
+      if (instance == null) {
+        instance = new ExperimentTTID();
+      }
+      return instance;
+    }
+
+    @Override
+    protected Boolean getDefault() {
+      return false;
+    }
+
+    @Override
+    protected String getRemoteConfigFlag() {
+      return "fpr_experiment_app_start_ttid";
+    }
+
+    @Override
+    protected String getDeviceCacheFlag() {
+      return "com.google.firebase.perf.ExperimentTTID";
+    }
+
+    @Override
+    protected String getMetadataFlag() {
+      return "experiment_app_start_ttid";
+    }
+  }
 }
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigurationFlag.java b/firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigurationFlag.java
index 58e5e4fcd16..5c234f28e2a 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigurationFlag.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigurationFlag.java
@@ -27,6 +27,12 @@ abstract class ConfigurationFlag<T> {
   /* Default value for this flag. */
   protected abstract T getDefault();
 
+  /* Default value for this flag in the case that RC fetch explicitly failed. */
+  protected T getDefaultOnRcFetchFail() {
+    // Same as typical default unless overridden.
+    return getDefault();
+  }
+
   /* Configuration flag ID for Firebase Remote Config. */
   @Nullable
   String getRemoteConfigFlag() {
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/config/DeviceCacheManager.java b/firebase-perf/src/main/java/com/google/firebase/perf/config/DeviceCacheManager.java
index 012edfc8b81..a675f37e2f7 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/config/DeviceCacheManager.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/config/DeviceCacheManager.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.perf.config;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import androidx.annotation.Nullable;
@@ -49,6 +50,8 @@ public DeviceCacheManager(ExecutorService serialExecutor) {
     this.serialExecutor = serialExecutor;
   }
 
+  // TODO(b/258263016): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   public static synchronized DeviceCacheManager getInstance() {
     if (instance == null) {
       instance = new DeviceCacheManager(Executors.newSingleThreadExecutor());
@@ -206,9 +209,9 @@ public boolean setValue(String key, String value) {
    * Retrieves value stored in caching layer for {@code key}, if caching layer is not initialized,
    * or value with the desired type doesn't exist in caching layer, return {@code Optional.empty()}.
    */
-  public Optional<Float> getFloat(String key) {
+  public Optional<Double> getDouble(String key) {
     if (key == null) {
-      logger.debug("Key is null when getting float value on device cache.");
+      logger.debug("Key is null when getting double value on device cache.");
       return Optional.absent();
     }
 
@@ -224,11 +227,19 @@ public Optional<Float> getFloat(String key) {
     }
 
     try {
+      // SharedPreferences does not allow storing a Double directly. We store the double's bits as a
+      // long so here we convert that back to a double.
       // Default value should never be used because key existence is checked above.
-      return Optional.of(sharedPref.getFloat(key, 0.0f));
-    } catch (ClassCastException e) {
-      logger.debug(
-          "Key %s from sharedPreferences has type other than float: %s", key, e.getMessage());
+      return Optional.of(Double.longBitsToDouble(sharedPref.getLong(key, 0)));
+    } catch (ClassCastException unused) {
+      // In the past, we used to store a Float here instead of a Double. Before the value is
+      // overwritten for the first time, it will still have a Float and so this may be expected.
+      try {
+        return Optional.of(Float.valueOf(sharedPref.getFloat(key, 0.0f)).doubleValue());
+      } catch (ClassCastException e) {
+        logger.debug(
+            "Key %s from sharedPreferences has type other than double: %s", key, e.getMessage());
+      }
     }
     return Optional.absent();
   }
@@ -239,18 +250,22 @@ public Optional<Float> getFloat(String key) {
    *
    * @return whether provided value has been saved to device caching layer.
    */
-  public boolean setValue(String key, float value) {
+  public boolean setValue(String key, double value) {
     if (key == null) {
-      logger.debug("Key is null when setting float value on device cache.");
+      logger.debug("Key is null when setting double value on device cache.");
       return false;
     }
+
     if (sharedPref == null) {
       setContext(getFirebaseApplicationContext());
       if (sharedPref == null) {
         return false;
       }
     }
-    sharedPref.edit().putFloat(key, value).apply();
+    // SharedPreferences does not allow storing a Double directly. The main way to store it without
+    // losing precision is to store the double's bits as a long so it can then be converted back to
+    // a double.
+    sharedPref.edit().putLong(key, Double.doubleToRawLongBits(value)).apply();
     return true;
   }
 
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/config/RemoteConfigManager.java b/firebase-perf/src/main/java/com/google/firebase/perf/config/RemoteConfigManager.java
index 0986e123c16..0a20a09f84a 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/config/RemoteConfigManager.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/config/RemoteConfigManager.java
@@ -14,15 +14,20 @@
 
 package com.google.firebase.perf.config;
 
+import static com.google.firebase.perf.config.ConfigurationConstants.ExperimentTTID;
+
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import androidx.annotation.Keep;
 import androidx.annotation.Nullable;
-import com.google.android.gms.common.util.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
+
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.StartupTime;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.perf.logging.AndroidLogger;
-import com.google.firebase.perf.provider.FirebasePerfProvider;
 import com.google.firebase.perf.util.Optional;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigValue;
@@ -53,6 +58,7 @@ public class RemoteConfigManager {
   private static final long MIN_APP_START_CONFIG_FETCH_DELAY_MS = 5000;
   private static final int RANDOM_APP_START_CONFIG_FETCH_DELAY_MS = 25000;
 
+  private final DeviceCacheManager cache;
   private final ConcurrentHashMap<String, FirebaseRemoteConfigValue> allRcConfigMap;
   private final Executor executor;
   private final long appStartTimeInMs;
@@ -63,39 +69,49 @@ public class RemoteConfigManager {
   @Nullable private Provider<RemoteConfigComponent> firebaseRemoteConfigProvider;
   @Nullable private FirebaseRemoteConfig firebaseRemoteConfig;
 
+  // TODO(b/258263016): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   private RemoteConfigManager() {
     this(
+        DeviceCacheManager.getInstance(),
         new ThreadPoolExecutor(
             /* corePoolSize= */ 0,
             /* maximumPoolSize= */ 1,
             /* keepAliveTime= */ 0L,
             TimeUnit.SECONDS,
             new LinkedBlockingQueue<Runnable>()),
-        /* firebaseRemoteConfig= */ null // set once FirebaseRemoteConfig is initialized
-        );
+        /* firebaseRemoteConfig= */ null, // set once FirebaseRemoteConfig is initialized
+        MIN_APP_START_CONFIG_FETCH_DELAY_MS
+            + new Random().nextInt(RANDOM_APP_START_CONFIG_FETCH_DELAY_MS),
+        getInitialStartupMillis());
   }
 
-  RemoteConfigManager(Executor executor, FirebaseRemoteConfig firebaseRemoteConfig) {
-    this(
-        executor,
-        firebaseRemoteConfig,
-        MIN_APP_START_CONFIG_FETCH_DELAY_MS
-            + new Random().nextInt(RANDOM_APP_START_CONFIG_FETCH_DELAY_MS));
+  @VisibleForTesting
+  @SuppressWarnings("FirebaseUseExplicitDependencies")
+  static long getInitialStartupMillis() {
+    StartupTime startupTime = FirebaseApp.getInstance().get(StartupTime.class);
+    if (startupTime != null) {
+      return startupTime.getEpochMillis();
+    } else {
+      return System.currentTimeMillis();
+    }
   }
 
   @VisibleForTesting
   RemoteConfigManager(
+      DeviceCacheManager cache,
       Executor executor,
       FirebaseRemoteConfig firebaseRemoteConfig,
-      long appStartConfigFetchDelayInMs) {
+      long appStartConfigFetchDelayInMs,
+      long appStartTimeInMs) {
+    this.cache = cache;
     this.executor = executor;
     this.firebaseRemoteConfig = firebaseRemoteConfig;
     this.allRcConfigMap =
         firebaseRemoteConfig == null
             ? new ConcurrentHashMap<>()
             : new ConcurrentHashMap<>(firebaseRemoteConfig.getAll());
-    this.appStartTimeInMs =
-        TimeUnit.MICROSECONDS.toMillis(FirebasePerfProvider.getAppStartTime().getMicros());
+    this.appStartTimeInMs = appStartTimeInMs;
     this.appStartConfigFetchDelayInMs = appStartConfigFetchDelayInMs;
   }
 
@@ -124,23 +140,23 @@ public void setFirebaseRemoteConfigProvider(
   }
 
   /**
-   * Retrieves the double value of the given key from the remote config, converts to float type and
+   * Retrieves the double value of the given key from the remote config, converts to double type and
    * returns this value.
    *
    * @implNote Triggers a remote config fetch on a background thread if it hasn't yet been fetched.
    * @param key The key to fetch the double value for.
-   * @return The float value of the key or not present.
+   * @return The double value of the key or not present.
    */
-  public Optional<Float> getFloat(String key) {
+  public Optional<Double> getDouble(String key) {
     if (key == null) {
-      logger.debug("The key to get Remote Config float value is null.");
+      logger.debug("The key to get Remote Config double value is null.");
       return Optional.absent();
     }
 
     FirebaseRemoteConfigValue rcValue = getRemoteConfigValue(key);
     if (rcValue != null) {
       try {
-        return Optional.of(Double.valueOf(rcValue.asDouble()).floatValue());
+        return Optional.of(rcValue.asDouble());
       } catch (IllegalArgumentException e) {
         if (!rcValue.asString().isEmpty()) {
           logger.debug("Could not parse value: '%s' for key: '%s'.", rcValue.asString(), key);
@@ -245,8 +261,8 @@ public <T extends Object> T getRemoteConfigValueOrDefault(String key, T defaultV
         if (defaultValue instanceof Boolean) {
           valueToReturn = rcValue.asBoolean();
 
-        } else if (defaultValue instanceof Float) {
-          valueToReturn = Double.valueOf(rcValue.asDouble()).floatValue();
+        } else if (defaultValue instanceof Double) {
+          valueToReturn = rcValue.asDouble();
 
         } else if (defaultValue instanceof Long || defaultValue instanceof Integer) {
           valueToReturn = rcValue.asLong();
@@ -298,7 +314,9 @@ private FirebaseRemoteConfigValue getRemoteConfigValue(String key) {
   public boolean isLastFetchFailed() {
     return firebaseRemoteConfig == null
         || (firebaseRemoteConfig.getInfo().getLastFetchStatus()
-            == FirebaseRemoteConfig.LAST_FETCH_STATUS_FAILURE);
+            == FirebaseRemoteConfig.LAST_FETCH_STATUS_FAILURE)
+        || (firebaseRemoteConfig.getInfo().getLastFetchStatus()
+            == FirebaseRemoteConfig.LAST_FETCH_STATUS_THROTTLED);
   }
 
   /**
@@ -315,7 +333,7 @@ private void triggerRemoteConfigFetchIfNecessary() {
       return;
     }
     if (allRcConfigMap.isEmpty()) { // Initial fetch.
-      syncConfigValues(firebaseRemoteConfig.getAll());
+      allRcConfigMap.putAll(firebaseRemoteConfig.getAll());
     }
     if (shouldFetchAndActivateRemoteConfigValues()) {
       triggerFirebaseRemoteConfigFetchAndActivateOnSuccessfulFetch();
@@ -329,7 +347,10 @@ private void triggerFirebaseRemoteConfigFetchAndActivateOnSuccessfulFetch() {
         .addOnSuccessListener(executor, result -> syncConfigValues(firebaseRemoteConfig.getAll()))
         .addOnFailureListener(
             executor,
-            task -> {
+            ex -> {
+              logger.warn(
+                  "Call to Remote Config failed: %s. This may cause a degraded experience with Firebase Performance. Please reach out to Firebase Support https://firebase.google.com/support/",
+                  ex);
               firebaseRemoteConfigLastFetchTimestampMs = FETCH_NEVER_HAPPENED_TIMESTAMP_MS;
             });
   }
@@ -342,6 +363,21 @@ protected void syncConfigValues(Map<String, FirebaseRemoteConfigValue> newlyFetc
         allRcConfigMap.remove(existingKey);
       }
     }
+
+    // TODO: remove after experiment is over and experiment RC flag is no longer needed
+    // Save ExperimentTTID flag to device cache upon successful RC fetchAndActivate, because reading
+    // is done quite early and it is possible that RC isn't initialized yet.
+    ExperimentTTID flag = ExperimentTTID.getInstance();
+    FirebaseRemoteConfigValue rcValue = allRcConfigMap.get(flag.getRemoteConfigFlag());
+    if (rcValue != null) {
+      try {
+        cache.setValue(flag.getDeviceCacheFlag(), rcValue.asBoolean());
+      } catch (Exception exception) {
+        logger.debug("ExperimentTTID remote config flag has invalid value, expected boolean.");
+      }
+    } else {
+      logger.debug("ExperimentTTID remote config flag does not exist.");
+    }
   }
 
   @VisibleForTesting
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/ktx/Performance.kt b/firebase-perf/src/main/java/com/google/firebase/perf/ktx/Performance.kt
new file mode 100644
index 00000000000..21d0fde9fe9
--- /dev/null
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/ktx/Performance.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.perf.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.perf.FirebasePerformance
+import com.google.firebase.perf.metrics.HttpMetric
+import com.google.firebase.perf.metrics.Trace
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebasePerformance] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-perf-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.performance: FirebasePerformance
+  get() = FirebasePerformance.getInstance()
+
+/**
+ * Measures the time it takes to run the [block] wrapped by calls to [start] and [stop] using
+ * [HttpMetric].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-perf-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun HttpMetric.trace(block: HttpMetric.() -> Unit) {
+  start()
+  try {
+    block()
+  } finally {
+    stop()
+  }
+}
+
+/**
+ * Measures the time it takes to run the [block] wrapped by calls to [start] and [stop] using
+ * [Trace].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-perf-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <T> Trace.trace(block: Trace.() -> T): T {
+  start()
+  try {
+    return block()
+  } finally {
+    stop()
+  }
+}
+
+/**
+ * Creates a [Trace] object with given [name] and measures the time it takes to run the [block]
+ * wrapped by calls to [start] and [stop].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-perf-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+inline fun <T> trace(name: String, block: Trace.() -> T): T = Trace.create(name).trace(block)
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-perf-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+@Keep
+class FirebasePerfKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/logging/ConsoleUrlGenerator.java b/firebase-perf/src/main/java/com/google/firebase/perf/logging/ConsoleUrlGenerator.java
index 38b4d2c7642..063efd0b0a8 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/logging/ConsoleUrlGenerator.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/logging/ConsoleUrlGenerator.java
@@ -40,7 +40,7 @@ public static String generateDashboardUrl(String projectId, String packageName)
   public static String generateCustomTraceUrl(String projectId, String packageName, String name) {
     String rootUrl = getRootUrl(projectId, packageName);
     return String.format(
-        "%s/metrics/trace/DURATION_TRACE/%s?utm_source=%s&utm_medium=%s",
+        "%s/troubleshooting/trace/DURATION_TRACE/%s?utm_source=%s&utm_medium=%s",
         rootUrl, name, UTM_SOURCE, UTM_MEDIUM);
   }
 
@@ -54,7 +54,7 @@ public static String generateCustomTraceUrl(String projectId, String packageName
   public static String generateScreenTraceUrl(String projectId, String packageName, String name) {
     String rootUrl = getRootUrl(projectId, packageName);
     return String.format(
-        "%s/metrics/trace/SCREEN_TRACE/%s?utm_source=%s&utm_medium=%s",
+        "%s/troubleshooting/trace/SCREEN_TRACE/%s?utm_source=%s&utm_medium=%s",
         rootUrl, name, UTM_SOURCE, UTM_MEDIUM);
   }
 
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/metrics/AppStartTrace.java b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/AppStartTrace.java
index 3aa363e1338..07d9531edf3 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/metrics/AppStartTrace.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/AppStartTrace.java
@@ -14,22 +14,37 @@
 
 package com.google.firebase.perf.metrics;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.Application;
 import android.app.Application.ActivityLifecycleCallbacks;
 import android.content.Context;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.PowerManager;
+import android.os.Process;
+import android.view.View;
+import android.view.ViewTreeObserver;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.android.gms.common.util.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.lifecycle.ProcessLifecycleOwner;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.StartupTime;
+import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.logging.AndroidLogger;
-import com.google.firebase.perf.provider.FirebasePerfProvider;
 import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Clock;
 import com.google.firebase.perf.util.Constants;
+import com.google.firebase.perf.util.FirstDrawDoneListener;
+import com.google.firebase.perf.util.PreDrawListener;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.ApplicationProcessState;
 import com.google.firebase.perf.v1.TraceMetric;
@@ -55,8 +70,9 @@
  *
  * @hide
  */
-public class AppStartTrace implements ActivityLifecycleCallbacks {
+public class AppStartTrace implements ActivityLifecycleCallbacks, LifecycleObserver {
 
+  private static final @NonNull Timer PERF_CLASS_LOAD_TIME = new Clock().getTime();
   private static final long MAX_LATENCY_BEFORE_UI_INIT = TimeUnit.MINUTES.toMicros(1);
 
   // Core pool size 0 allows threads to shut down if they're idle
@@ -69,6 +85,8 @@ public class AppStartTrace implements ActivityLifecycleCallbacks {
   private boolean isRegisteredForLifecycleCallbacks = false;
   private final TransportManager transportManager;
   private final Clock clock;
+  private final ConfigResolver configResolver;
+  private final TraceMetric.Builder experimentTtid;
   private Context appContext;
   /**
    * The first time onCreate() of any activity is called, the activity is saved as launchActivity.
@@ -85,14 +103,28 @@ public class AppStartTrace implements ActivityLifecycleCallbacks {
    */
   private boolean isTooLateToInitUI = false;
 
-  private Timer appStartTime = null;
+  // Critical timestamps during app-start, on the main-thread. IMPORTANT: these must all be captured
+  // or modified on the main thread. Without this invariant, we cannot guarantee that null means "it
+  // hasn't happened".
+  private final @Nullable Timer processStartTime;
+  private final @Nullable Timer firebaseClassLoadTime;
   private Timer onCreateTime = null;
   private Timer onStartTime = null;
   private Timer onResumeTime = null;
+  private Timer firstForegroundTime = null;
+  private @Nullable Timer firstBackgroundTime = null;
+  private Timer preDrawPostTime = null;
+  private Timer preDrawPostAtFrontOfQueueTime = null;
+  private Timer onDrawPostAtFrontOfQueueTime = null;
 
   private PerfSession startSession;
   private boolean isStartedFromBackground = false;
 
+  // TODO: remove after experiment
+  private int onDrawCount = 0;
+  private final DrawCounter onDrawCounterListener = new DrawCounter();
+  private boolean systemForegroundCheck = false;
+
   /**
    * Called from onCreate() method of an activity by instrumented byte code.
    *
@@ -126,6 +158,8 @@ public static AppStartTrace getInstance() {
     return instance != null ? instance : getInstance(TransportManager.getInstance(), new Clock());
   }
 
+  // TODO(b/258263016): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   static AppStartTrace getInstance(TransportManager transportManager, Clock clock) {
     if (instance == null) {
       synchronized (AppStartTrace.class) {
@@ -134,36 +168,52 @@ static AppStartTrace getInstance(TransportManager transportManager, Clock clock)
               new AppStartTrace(
                   transportManager,
                   clock,
+                  ConfigResolver.getInstance(),
                   new ThreadPoolExecutor(
                       CORE_POOL_SIZE,
                       MAX_POOL_SIZE,
                       /* keepAliveTime= */ MAX_LATENCY_BEFORE_UI_INIT + 10,
                       TimeUnit.SECONDS,
-                      new LinkedBlockingQueue<>(1)));
+                      new LinkedBlockingQueue<>()));
         }
       }
     }
     return instance;
   }
 
+  @SuppressWarnings("FirebaseUseExplicitDependencies")
   AppStartTrace(
       @NonNull TransportManager transportManager,
       @NonNull Clock clock,
+      @NonNull ConfigResolver configResolver,
       @NonNull ExecutorService executorService) {
     this.transportManager = transportManager;
     this.clock = clock;
+    this.configResolver = configResolver;
     this.executorService = executorService;
+    this.experimentTtid = TraceMetric.newBuilder().setName("_experiment_app_start_ttid");
+    // Set the timestamp for process-start (beginning of BIND_APPLICATION), if available
+    this.processStartTime =
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
+            ? Timer.ofElapsedRealtime(Process.getStartElapsedRealtime())
+            : null;
+    // Set the timestamp for Firebase's first class's class-loading (approx.), if available
+    StartupTime firebaseStart = FirebaseApp.getInstance().get(StartupTime.class);
+    this.firebaseClassLoadTime =
+        firebaseStart != null ? Timer.ofElapsedRealtime(firebaseStart.getElapsedRealtime()) : null;
   }
 
-  /** Called from FirebasePerfProvider to register this callback. */
+  /** Called from FirebasePerfEarly to register this callback. */
   public synchronized void registerActivityLifecycleCallbacks(@NonNull Context context) {
     // Make sure the callback is registered only once.
     if (isRegisteredForLifecycleCallbacks) {
       return;
     }
+    ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
     Context appContext = context.getApplicationContext();
     if (appContext instanceof Application) {
       ((Application) appContext).registerActivityLifecycleCallbacks(this);
+      systemForegroundCheck = systemForegroundCheck || isAnyAppProcessInForeground(appContext);
       isRegisteredForLifecycleCallbacks = true;
       this.appContext = appContext;
     }
@@ -174,10 +224,98 @@ public synchronized void unregisterActivityLifecycleCallbacks() {
     if (!isRegisteredForLifecycleCallbacks) {
       return;
     }
+    ProcessLifecycleOwner.get().getLifecycle().removeObserver(this);
     ((Application) appContext).unregisterActivityLifecycleCallbacks(this);
     isRegisteredForLifecycleCallbacks = false;
   }
 
+  /**
+   * Gets the timestamp that marks the beginning of app start, defined as the beginning of
+   * BIND_APPLICATION, when the forked process is about to start loading the app's resources and
+   * classes. Fallback to class-load time of a Firebase class for compatibility below API 24.
+   *
+   * @return {@link Timer} at the beginning of app start by Firebase-Performance definition.
+   */
+  private @NonNull Timer getStartTimerCompat() {
+    // Preferred: Android system API provides BIND_APPLICATION time
+    if (processStartTime != null) {
+      return processStartTime;
+    }
+    // Fallback: static initializer time (during class-load) of a Firebase class
+    return getClassLoadTimeCompat();
+  }
+
+  /**
+   * Timestamp during class load. This timestamp is captured in a static initializer during class
+   * loading of a particular Firebase class, the order of which CANNOT be guaranteed to be prior to
+   * all other classes of an app, nor prior to resource-loading of an app. Thus this timestamp is
+   * NOT PREFERRED to be used as starting-point of app-start.
+   *
+   * @return {@link Timer} captured by static-initializer during class-loading of a Firebase class.
+   */
+  private @NonNull Timer getClassLoadTimeCompat() {
+    // Prefered: static-initializer time of the 1st Firebase class during init
+    if (firebaseClassLoadTime != null) {
+      return firebaseClassLoadTime;
+    }
+    // Fallback: static-initializer time of the current class
+    return PERF_CLASS_LOAD_TIME;
+  }
+
+  private void recordPreDraw() {
+    if (preDrawPostTime != null) {
+      return;
+    }
+    this.preDrawPostTime = clock.getTime();
+    this.experimentTtid
+        .setClientStartTimeUs(getStartTimerCompat().getMicros())
+        .setDurationUs(getStartTimerCompat().getDurationMicros(this.preDrawPostTime));
+    logExperimentTrace(this.experimentTtid);
+  }
+
+  private void recordPreDrawFrontOfQueue() {
+    if (preDrawPostAtFrontOfQueueTime != null) {
+      return;
+    }
+    this.preDrawPostAtFrontOfQueueTime = clock.getTime();
+    this.experimentTtid.addSubtraces(
+        TraceMetric.newBuilder()
+            .setName("_experiment_preDrawFoQ")
+            .setClientStartTimeUs(getStartTimerCompat().getMicros())
+            .setDurationUs(
+                getStartTimerCompat().getDurationMicros(this.preDrawPostAtFrontOfQueueTime))
+            .build());
+    logExperimentTrace(this.experimentTtid);
+  }
+
+  private void recordOnDrawFrontOfQueue() {
+    if (onDrawPostAtFrontOfQueueTime != null) {
+      return;
+    }
+    this.onDrawPostAtFrontOfQueueTime = clock.getTime();
+
+    this.experimentTtid.addSubtraces(
+        TraceMetric.newBuilder()
+            .setName("_experiment_onDrawFoQ")
+            .setClientStartTimeUs(getStartTimerCompat().getMicros())
+            .setDurationUs(
+                getStartTimerCompat().getDurationMicros(this.onDrawPostAtFrontOfQueueTime))
+            .build());
+    if (processStartTime != null) {
+      this.experimentTtid.addSubtraces(
+          TraceMetric.newBuilder()
+              .setName("_experiment_procStart_to_classLoad")
+              .setClientStartTimeUs(getStartTimerCompat().getMicros())
+              .setDurationUs(getStartTimerCompat().getDurationMicros(getClassLoadTimeCompat()))
+              .build());
+    }
+    this.experimentTtid.putCustomAttributes(
+        "systemDeterminedForeground", systemForegroundCheck ? "true" : "false");
+    this.experimentTtid.putCounters("onDrawCount", onDrawCount);
+    this.experimentTtid.addPerfSessions(this.startSession.build());
+    logExperimentTrace(this.experimentTtid);
+  }
+
   @Override
   public synchronized void onActivityCreated(Activity activity, Bundle savedInstanceState) {
     if (isStartedFromBackground || onCreateTime != null // An activity already called onCreate()
@@ -185,11 +323,11 @@ public synchronized void onActivityCreated(Activity activity, Bundle savedInstan
       return;
     }
 
+    systemForegroundCheck = systemForegroundCheck || isAnyAppProcessInForeground(appContext);
     launchActivity = new WeakReference<Activity>(activity);
     onCreateTime = clock.getTime();
 
-    if (FirebasePerfProvider.getAppStartTime().getDurationMicros(onCreateTime)
-        > MAX_LATENCY_BEFORE_UI_INIT) {
+    if (getStartTimerCompat().getDurationMicros(onCreateTime) > MAX_LATENCY_BEFORE_UI_INIT) {
       isTooLateToInitUI = true;
     }
   }
@@ -206,62 +344,89 @@ public synchronized void onActivityStarted(Activity activity) {
 
   @Override
   public synchronized void onActivityResumed(Activity activity) {
-    if (isStartedFromBackground
-        || onResumeTime != null // An activity already called onResume()
-        || isTooLateToInitUI) {
+    if (isStartedFromBackground || isTooLateToInitUI) {
+      return;
+    }
+
+    // Shadow-launch experiment of new app start time
+    final boolean isExperimentTTIDEnabled = configResolver.getIsExperimentTTIDEnabled();
+    if (isExperimentTTIDEnabled) {
+      View rootView = activity.findViewById(android.R.id.content);
+      rootView.getViewTreeObserver().addOnDrawListener(onDrawCounterListener);
+      FirstDrawDoneListener.registerForNextDraw(rootView, this::recordOnDrawFrontOfQueue);
+      PreDrawListener.registerForNextDraw(
+          rootView, this::recordPreDraw, this::recordPreDrawFrontOfQueue);
+    }
+
+    if (onResumeTime != null) { // An activity already called onResume()
       return;
     }
 
     appStartActivity = new WeakReference<Activity>(activity);
 
     onResumeTime = clock.getTime();
-    this.appStartTime = FirebasePerfProvider.getAppStartTime();
     this.startSession = SessionManager.getInstance().perfSession();
     AndroidLogger.getInstance()
         .debug(
             "onResume(): "
                 + activity.getClass().getName()
                 + ": "
-                + this.appStartTime.getDurationMicros(onResumeTime)
+                + getClassLoadTimeCompat().getDurationMicros(onResumeTime)
                 + " microseconds");
 
     // Log the app start trace in a non-main thread.
     executorService.execute(this::logAppStartTrace);
 
-    if (isRegisteredForLifecycleCallbacks) {
+    if (!isExperimentTTIDEnabled) {
       // After AppStart trace is logged, we can unregister this callback.
       unregisterActivityLifecycleCallbacks();
     }
   }
 
+  /** Helper for logging all experiments in one trace. */
+  private void logExperimentTrace(TraceMetric.Builder metric) {
+    if (this.preDrawPostTime == null
+        || this.preDrawPostAtFrontOfQueueTime == null
+        || this.onDrawPostAtFrontOfQueueTime == null) {
+      return;
+    }
+    executorService.execute(
+        () -> transportManager.log(metric.build(), ApplicationProcessState.FOREGROUND_BACKGROUND));
+    // After logging the experiment trace, we can unregister ourself from lifecycle listeners.
+    unregisterActivityLifecycleCallbacks();
+  }
+
   private void logAppStartTrace() {
     TraceMetric.Builder metric =
         TraceMetric.newBuilder()
             .setName(Constants.TraceNames.APP_START_TRACE_NAME.toString())
-            .setClientStartTimeUs(getappStartTime().getMicros())
-            .setDurationUs(getappStartTime().getDurationMicros(onResumeTime));
+            .setClientStartTimeUs(getClassLoadTimeCompat().getMicros())
+            .setDurationUs(getClassLoadTimeCompat().getDurationMicros(onResumeTime));
     List<TraceMetric> subtraces = new ArrayList<>(/* initialCapacity= */ 3);
 
     TraceMetric.Builder traceMetricBuilder =
         TraceMetric.newBuilder()
             .setName(Constants.TraceNames.ON_CREATE_TRACE_NAME.toString())
-            .setClientStartTimeUs(getappStartTime().getMicros())
-            .setDurationUs(getappStartTime().getDurationMicros(onCreateTime));
-    subtraces.add(traceMetricBuilder.build());
-
-    traceMetricBuilder = TraceMetric.newBuilder();
-    traceMetricBuilder
-        .setName(Constants.TraceNames.ON_START_TRACE_NAME.toString())
-        .setClientStartTimeUs(onCreateTime.getMicros())
-        .setDurationUs(onCreateTime.getDurationMicros(onStartTime));
+            .setClientStartTimeUs(getClassLoadTimeCompat().getMicros())
+            .setDurationUs(getClassLoadTimeCompat().getDurationMicros(onCreateTime));
     subtraces.add(traceMetricBuilder.build());
 
-    traceMetricBuilder = TraceMetric.newBuilder();
-    traceMetricBuilder
-        .setName(Constants.TraceNames.ON_RESUME_TRACE_NAME.toString())
-        .setClientStartTimeUs(onStartTime.getMicros())
-        .setDurationUs(onStartTime.getDurationMicros(onResumeTime));
-    subtraces.add(traceMetricBuilder.build());
+    // OnStartTime is not captured in all situations, so checking for valid value before using it.
+    if (onStartTime != null) {
+      traceMetricBuilder = TraceMetric.newBuilder();
+      traceMetricBuilder
+          .setName(Constants.TraceNames.ON_START_TRACE_NAME.toString())
+          .setClientStartTimeUs(onCreateTime.getMicros())
+          .setDurationUs(onCreateTime.getDurationMicros(onStartTime));
+      subtraces.add(traceMetricBuilder.build());
+
+      traceMetricBuilder = TraceMetric.newBuilder();
+      traceMetricBuilder
+          .setName(Constants.TraceNames.ON_RESUME_TRACE_NAME.toString())
+          .setClientStartTimeUs(onStartTime.getMicros())
+          .setDurationUs(onStartTime.getDurationMicros(onResumeTime));
+      subtraces.add(traceMetricBuilder.build());
+    }
 
     metric.addAllSubtraces(subtraces).addPerfSessions(this.startSession.build());
 
@@ -269,10 +434,53 @@ private void logAppStartTrace() {
   }
 
   @Override
-  public void onActivityPaused(Activity activity) {}
+  public void onActivityPaused(Activity activity) {
+    if (isStartedFromBackground
+        || isTooLateToInitUI
+        || !configResolver.getIsExperimentTTIDEnabled()) {
+      return;
+    }
+    View rootView = activity.findViewById(android.R.id.content);
+    rootView.getViewTreeObserver().removeOnDrawListener(onDrawCounterListener);
+  }
 
   @Override
-  public synchronized void onActivityStopped(Activity activity) {}
+  public void onActivityStopped(Activity activity) {}
+
+  /** App is entering foreground. Keep annotation is required so R8 does not remove this method. */
+  @Keep
+  @OnLifecycleEvent(Lifecycle.Event.ON_START)
+  public void onAppEnteredForeground() {
+    if (isStartedFromBackground || isTooLateToInitUI || firstForegroundTime != null) {
+      return;
+    }
+    // firstForeground is equivalent to the first Activity onStart. This marks the beginning of
+    // observable backgrounding. Prior to this point, backgrounding cannot be observed.
+    firstForegroundTime = clock.getTime();
+    this.experimentTtid.addSubtraces(
+        TraceMetric.newBuilder()
+            .setName("_experiment_firstForegrounding")
+            .setClientStartTimeUs(getStartTimerCompat().getMicros())
+            .setDurationUs(getStartTimerCompat().getDurationMicros(firstForegroundTime))
+            .build());
+  }
+
+  /** App is entering background. Keep annotation is required so R8 does not remove this method. */
+  @Keep
+  @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+  public void onAppEnteredBackground() {
+    if (isStartedFromBackground || isTooLateToInitUI || firstBackgroundTime != null) {
+      return;
+    }
+    firstBackgroundTime = clock.getTime();
+    // TODO: remove this subtrace after the experiment
+    this.experimentTtid.addSubtraces(
+        TraceMetric.newBuilder()
+            .setName("_experiment_firstBackgrounding")
+            .setClientStartTimeUs(getStartTimerCompat().getMicros())
+            .setDurationUs(getStartTimerCompat().getDurationMicros(firstBackgroundTime))
+            .build());
+  }
 
   @Override
   public void onActivityDestroyed(Activity activity) {}
@@ -280,11 +488,72 @@ public void onActivityDestroyed(Activity activity) {}
   @Override
   public void onActivitySaveInstanceState(Activity activity, Bundle outState) {}
 
+  /**
+   * Returns whether any process corresponding to the package for the provided context is visible
+   * (in other words, whether the app is currently in the foreground).
+   *
+   * @param appContext The application's context.
+   */
+  public static boolean isAnyAppProcessInForeground(Context appContext) {
+    // Do not call ProcessStats.getActivityManger, caching will break tests that indirectly depend
+    // on ProcessStats.
+    ActivityManager activityManager =
+        (ActivityManager) appContext.getSystemService(Context.ACTIVITY_SERVICE);
+    if (activityManager == null) {
+      return true;
+    }
+    List<ActivityManager.RunningAppProcessInfo> appProcesses =
+        activityManager.getRunningAppProcesses();
+    if (appProcesses != null) {
+      String appProcessName = appContext.getPackageName();
+      String allowedAppProcessNamePrefix = appProcessName + ":";
+      for (ActivityManager.RunningAppProcessInfo appProcess : appProcesses) {
+        if (appProcess.importance != ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
+          continue;
+        }
+        if (appProcess.processName.equals(appProcessName)
+            || appProcess.processName.startsWith(allowedAppProcessNamePrefix)) {
+          boolean isAppInForeground = true;
+
+          // For the case when the app is in foreground and the device transitions to sleep mode,
+          // the importance of the process is set to IMPORTANCE_TOP_SLEEPING. However, this
+          // importance level was introduced in M. Pre M, the process importance is not changed to
+          // IMPORTANCE_TOP_SLEEPING when the display turns off. So we need to rely also on the
+          // state of the display to decide if any app process is really visible.
+          if (Build.VERSION.SDK_INT < 23 /* M */) {
+            isAppInForeground = isScreenOn(appContext);
+          }
+
+          if (isAppInForeground) {
+            return true;
+          }
+        }
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Returns whether the device screen is on.
+   *
+   * @param appContext The application's context.
+   */
+  public static boolean isScreenOn(Context appContext) {
+    PowerManager powerManager = (PowerManager) appContext.getSystemService(Context.POWER_SERVICE);
+    if (powerManager == null) {
+      return true;
+    }
+    return (Build.VERSION.SDK_INT >= 20 /* KITKAT_WATCH */)
+        ? powerManager.isInteractive()
+        : powerManager.isScreenOn();
+  }
+
   /**
    * We use StartFromBackgroundRunnable to detect if app is started from background or foreground.
    * If app is started from background, we do not generate AppStart trace. This runnable is posted
-   * to main UI thread from FirebasePerfProvider. If app is started from background, this runnable
-   * will be executed before any activity's onCreate() method. If app is started from foreground,
+   * to main UI thread from FirebasePerfEarly. If app is started from background, this runnable will
+   * be executed before any activity's onCreate() method. If app is started from foreground,
    * activity's onCreate() method is executed before this runnable.
    */
   public static class StartFromBackgroundRunnable implements Runnable {
@@ -303,6 +572,13 @@ public void run() {
     }
   }
 
+  private final class DrawCounter implements ViewTreeObserver.OnDrawListener {
+    @Override
+    public void onDraw() {
+      onDrawCount++;
+    }
+  }
+
   @VisibleForTesting
   @Nullable
   Activity getLaunchActivity() {
@@ -315,11 +591,6 @@ Activity getAppStartActivity() {
     return appStartActivity.get();
   }
 
-  @VisibleForTesting
-  Timer getappStartTime() {
-    return appStartTime;
-  }
-
   @VisibleForTesting
   Timer getOnCreateTime() {
     return onCreateTime;
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/metrics/FrameMetricsCalculator.java b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/FrameMetricsCalculator.java
new file mode 100644
index 00000000000..2d4dabc1057
--- /dev/null
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/FrameMetricsCalculator.java
@@ -0,0 +1,100 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.perf.metrics;
+
+import android.util.SparseIntArray;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.FrameMetricsAggregator;
+import com.google.firebase.perf.util.Constants;
+
+/**
+ * FrameMetricsCalculator helps calculate total frames, slow frames, and frozen frames from metrics
+ * collected by {@link FrameMetricsAggregator}
+ *
+ * @hide
+ */
+public class FrameMetricsCalculator {
+  public static class PerfFrameMetrics {
+    int totalFrames = 0;
+    int slowFrames = 0;
+    int frozenFrames = 0;
+
+    public PerfFrameMetrics(int totalFrames, int slowFrames, int frozenFrames) {
+      this.totalFrames = totalFrames;
+      this.slowFrames = slowFrames;
+      this.frozenFrames = frozenFrames;
+    }
+
+    public int getFrozenFrames() {
+      return frozenFrames;
+    }
+
+    public int getSlowFrames() {
+      return slowFrames;
+    }
+
+    public int getTotalFrames() {
+      return totalFrames;
+    }
+
+    /**
+     * Subtracts frame-time counts of the argument object (that) from the current object (this).
+     *
+     * @param that the subtrahend PerfFrameMetrics object.
+     * @return difference of this and the argument.
+     */
+    public PerfFrameMetrics deltaFrameMetricsFromSnapshot(PerfFrameMetrics that) {
+      int newTotalFrames = this.totalFrames - that.getTotalFrames();
+      int newSlowFrames = this.slowFrames - that.getSlowFrames();
+      int newFrozenFrames = this.frozenFrames - that.getFrozenFrames();
+      return new PerfFrameMetrics(newTotalFrames, newSlowFrames, newFrozenFrames);
+    }
+  }
+
+  /**
+   * Calculate total frames, slow frames, and frozen frames from SparseIntArray[] recorded by {@link
+   * FrameMetricsAggregator}.
+   *
+   * @param arr the metrics data collected by {@link FrameMetricsAggregator#getMetrics()}
+   * @return the frame metrics
+   */
+  public static @NonNull PerfFrameMetrics calculateFrameMetrics(@Nullable SparseIntArray[] arr) {
+    int totalFrames = 0;
+    int slowFrames = 0;
+    int frozenFrames = 0;
+
+    if (arr != null) {
+      SparseIntArray frameTimes = arr[FrameMetricsAggregator.TOTAL_INDEX];
+      if (frameTimes != null) {
+        for (int i = 0; i < frameTimes.size(); i++) {
+          int frameTime = frameTimes.keyAt(i);
+          int numFrames = frameTimes.valueAt(i);
+          totalFrames += numFrames;
+          if (frameTime > Constants.FROZEN_FRAME_TIME) {
+            // Frozen frames mean the app appear frozen.  The recommended thresholds is 700ms
+            frozenFrames += numFrames;
+          }
+          if (frameTime > Constants.SLOW_FRAME_TIME) {
+            // Slow frames are anything above 16ms (i.e. 60 frames/second)
+            slowFrames += numFrames;
+          }
+        }
+      }
+    }
+    // Only incrementMetric if corresponding metric is non-zero.
+    return new PerfFrameMetrics(totalFrames, slowFrames, frozenFrames);
+  }
+}
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/metrics/HttpMetric.java b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/HttpMetric.java
index 1e05584ac50..04177ba30ee 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/metrics/HttpMetric.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/HttpMetric.java
@@ -14,18 +14,18 @@
 
 package com.google.firebase.perf.metrics;
 
+import static com.google.firebase.perf.metrics.validator.PerfMetricValidator.validateAttribute;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.firebase.perf.FirebasePerformance.HttpMethod;
 import com.google.firebase.perf.FirebasePerformanceAttributable;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.logging.AndroidLogger;
-import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Timer;
 import java.net.URL;
-import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -181,15 +181,13 @@ public void putAttribute(@NonNull String attribute, @NonNull String value) {
     }
   }
 
-  private void checkAttribute(@Nullable String attribute, @Nullable String value) {
+  private void checkAttribute(@NonNull String key, @NonNull String value) {
     if (isStopped) {
       throw new IllegalArgumentException(
           "HttpMetric has been logged already so unable to modify attributes");
     }
-    if (attribute == null || value == null) {
-      throw new IllegalArgumentException("Attribute must not have null key or value.");
-    }
-    if (!customAttributesMap.containsKey(attribute)
+
+    if (!customAttributesMap.containsKey(key)
         && customAttributesMap.size() >= Constants.MAX_TRACE_CUSTOM_ATTRIBUTES) {
       throw new IllegalArgumentException(
           String.format(
@@ -197,11 +195,7 @@ private void checkAttribute(@Nullable String attribute, @Nullable String value)
               "Exceeds max limit of number of attributes - %d",
               Constants.MAX_TRACE_CUSTOM_ATTRIBUTES));
     }
-    String err =
-        PerfMetricValidator.validateAttribute(new AbstractMap.SimpleEntry<>(attribute, value));
-    if (err != null) {
-      throw new IllegalArgumentException(err);
-    }
+    validateAttribute(key, value);
   }
 
   /**
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/metrics/Trace.java b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/Trace.java
index 737fb13b783..5db905227b3 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/metrics/Trace.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/Trace.java
@@ -14,18 +14,22 @@
 
 package com.google.firebase.perf.metrics;
 
+import static com.google.firebase.perf.metrics.validator.PerfMetricValidator.validateAttribute;
+import static com.google.firebase.perf.metrics.validator.PerfMetricValidator.validateMetricName;
+import static com.google.firebase.perf.metrics.validator.PerfMetricValidator.validateTraceName;
+
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.android.gms.common.util.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
+
 import com.google.firebase.perf.FirebasePerformanceAttributable;
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.application.AppStateUpdateHandler;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.logging.AndroidLogger;
-import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
 import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.session.SessionAwareObject;
 import com.google.firebase.perf.session.SessionManager;
@@ -35,7 +39,6 @@
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Timer;
 import java.lang.ref.WeakReference;
-import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -209,7 +212,7 @@ public void start() {
       return;
     }
 
-    String err = PerfMetricValidator.validateTraceName(name);
+    String err = validateTraceName(name);
 
     if (err != null) {
       logger.error("Cannot start trace '%s'. Trace name is invalid.(%s)", name, err);
@@ -326,7 +329,7 @@ private Counter obtainOrCreateCounterByName(@NonNull String counterName) {
    */
   @Keep
   public void incrementMetric(@NonNull String metricName, long incrementBy) {
-    String err = PerfMetricValidator.validateMetricName(metricName);
+    String err = validateMetricName(metricName);
     if (err != null) {
       logger.error("Cannot increment metric '%s'. Metric name is invalid.(%s)", metricName, err);
       return;
@@ -382,7 +385,7 @@ public long getLongMetric(@NonNull String metricName) {
    */
   @Keep
   public void putMetric(@NonNull String metricName, long value) {
-    String err = PerfMetricValidator.validateMetricName(metricName);
+    String err = validateMetricName(metricName);
     if (err != null) {
       logger.error(
           "Cannot set value for metric '%s'. Metric name is invalid.(%s)", metricName, err);
@@ -498,7 +501,7 @@ protected void finalize() throws Throwable {
   /** @hide */
   @VisibleForTesting
   @NonNull
-  String getName() {
+  public String getName() {
     return name;
   }
 
@@ -630,6 +633,7 @@ private void checkAttribute(@NonNull String key, @NonNull String value) {
       throw new IllegalArgumentException(
           String.format(Locale.ENGLISH, "Trace '%s' has been stopped", name));
     }
+
     if (!customAttributesMap.containsKey(key)
         && customAttributesMap.size() >= Constants.MAX_TRACE_CUSTOM_ATTRIBUTES) {
       throw new IllegalArgumentException(
@@ -638,10 +642,7 @@ private void checkAttribute(@NonNull String key, @NonNull String value) {
               "Exceeds max limit of number of attributes - %d",
               Constants.MAX_TRACE_CUSTOM_ATTRIBUTES));
     }
-    String err = PerfMetricValidator.validateAttribute(new AbstractMap.SimpleEntry<>(key, value));
-    if (err != null) {
-      throw new IllegalArgumentException(err);
-    }
+    validateAttribute(key, value);
   }
 
   /**
@@ -689,8 +690,7 @@ public Map<String, String> getAttributes() {
    * Describes the kinds of special objects contained in this Parcelable's marshalled
    * representation.
    *
-   * @see <a href="https://developer.android.com/reference/android/os/Parcelable.html">
-   *     https://developer.android.com/reference/android/os/Parcelable.html</a>
+   * @see Parcelable
    * @return always returns 0.
    */
   @Keep
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidator.java b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidator.java
index 1bdf45115d9..6a9dc70d624 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidator.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidator.java
@@ -14,6 +14,8 @@
 
 package com.google.firebase.perf.metrics.validator;
 
+import static com.google.firebase.perf.metrics.validator.PerfMetricValidator.validateAttribute;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.firebase.perf.logging.AndroidLogger;
@@ -144,7 +146,7 @@ private boolean isValidTrace(@Nullable TraceMetric trace, int deep) {
         return false;
       }
     }
-    if (!hasValidAttributes(trace.getCustomAttributesMap())) {
+    if (!areAllAttributesValid(trace.getCustomAttributesMap())) {
       return false;
     }
     return true;
@@ -178,11 +180,12 @@ private boolean isValidCounterId(@Nullable String counterId) {
     return true;
   }
 
-  private boolean hasValidAttributes(Map<String, String> customAttributes) {
+  private boolean areAllAttributesValid(Map<String, String> customAttributes) {
     for (Map.Entry<String, String> entry : customAttributes.entrySet()) {
-      String err = PerfMetricValidator.validateAttribute(entry);
-      if (err != null) {
-        logger.warn(err);
+      try {
+        validateAttribute(entry.getKey(), entry.getValue());
+      } catch (IllegalArgumentException exception) {
+        logger.warn(exception.getLocalizedMessage());
         return false;
       }
     }
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/PerfMetricValidator.java b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/PerfMetricValidator.java
index d659eef92c6..8791f0e9742 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/PerfMetricValidator.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/PerfMetricValidator.java
@@ -23,7 +23,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 
 /** An abstract class providing an interface to validate PerfMetric */
 public abstract class PerfMetricValidator {
@@ -135,33 +134,41 @@ public static String validateMetricName(@Nullable String str) {
   /**
    * Checks whether the given map entry fits key/value constraints for a Trace Attribute.
    *
-   * @param attribute A key/value pair for an Attribute
+   * @param key Key for the Attribute
+   * @param value Value for the Attribute
    * @return null if the entry can be used as an Attribute, if not, an error string explaining why
    *     it can't be used.
    */
-  @Nullable
-  public static String validateAttribute(@NonNull Map.Entry<String, String> attribute) {
-    String key = attribute.getKey();
-    String value = attribute.getValue();
-    if (key == null) {
-      return "Attribute key must not be null";
-    } else if (value == null) {
-      return "Attribute value must not be null";
-    } else if (key.length() > Constants.MAX_ATTRIBUTE_KEY_LENGTH) {
-      return String.format(
-          Locale.US,
-          "Attribute key length must not exceed %d characters",
-          Constants.MAX_ATTRIBUTE_KEY_LENGTH);
-    } else if (value.length() > Constants.MAX_ATTRIBUTE_VALUE_LENGTH) {
-      return String.format(
-          Locale.US,
-          "Attribute value length must not exceed %d characters",
-          Constants.MAX_ATTRIBUTE_VALUE_LENGTH);
-    } else if (!key.matches("^(?!(firebase_|google_|ga_))[A-Za-z][A-Za-z_0-9]*")) {
-      return "Attribute key must start with letter, must only contain alphanumeric characters and"
-          + " underscore and must not start with \"firebase_\", \"google_\" and \"ga_";
+  public static void validateAttribute(@NonNull String key, @NonNull String value) {
+    if (key == null || key.length() == 0) {
+      throw new IllegalArgumentException("Attribute key must not be null or empty");
+    }
+
+    if (value == null || value.length() == 0) {
+      throw new IllegalArgumentException("Attribute value must not be null or empty");
+    }
+
+    if (key.length() > Constants.MAX_ATTRIBUTE_KEY_LENGTH) {
+      throw new IllegalArgumentException(
+          String.format(
+              Locale.US,
+              "Attribute key length must not exceed %d characters",
+              Constants.MAX_ATTRIBUTE_KEY_LENGTH));
+    }
+
+    if (value.length() > Constants.MAX_ATTRIBUTE_VALUE_LENGTH) {
+      throw new IllegalArgumentException(
+          String.format(
+              Locale.US,
+              "Attribute value length must not exceed %d characters",
+              Constants.MAX_ATTRIBUTE_VALUE_LENGTH));
+    }
+
+    if (!key.matches("^(?!(firebase_|google_|ga_))[A-Za-z][A-Za-z_0-9]*")) {
+      throw new IllegalArgumentException(
+          "Attribute key must start with letter, must only contain alphanumeric characters and"
+              + " underscore and must not start with \"firebase_\", \"google_\" and \"ga_");
     }
-    return null;
   }
 
   public abstract boolean isValidPerfMetric();
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/network/FirebasePerfUrlConnection.java b/firebase-perf/src/main/java/com/google/firebase/perf/network/FirebasePerfUrlConnection.java
index aa7b145d273..07f58bdee1b 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/network/FirebasePerfUrlConnection.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/network/FirebasePerfUrlConnection.java
@@ -58,6 +58,9 @@ public static InputStream openStream(final URL url) throws IOException {
    */
   static InputStream openStream(URLWrapper wrapper, TransportManager transportManager, Timer timer)
       throws IOException {
+    if (!TransportManager.getInstance().isInitialized()) {
+      return wrapper.openConnection().getInputStream();
+    }
     timer.reset();
     long startTime = timer.getMicros();
     NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager);
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/provider/FirebasePerfProvider.java b/firebase-perf/src/main/java/com/google/firebase/perf/provider/FirebasePerfProvider.java
deleted file mode 100644
index cd3df8158fb..00000000000
--- a/firebase-perf/src/main/java/com/google/firebase/perf/provider/FirebasePerfProvider.java
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-//
-// You may obtain a copy of the License at
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.perf.provider;
-
-import android.app.Application;
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.pm.ProviderInfo;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Looper;
-import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.gms.common.internal.Preconditions;
-import com.google.android.gms.common.util.VisibleForTesting;
-import com.google.firebase.perf.FirebasePerformanceInitializer;
-import com.google.firebase.perf.application.AppStateMonitor;
-import com.google.firebase.perf.config.ConfigResolver;
-import com.google.firebase.perf.metrics.AppStartTrace;
-import com.google.firebase.perf.session.SessionManager;
-import com.google.firebase.perf.util.Clock;
-import com.google.firebase.perf.util.Timer;
-
-/** Initializes app start time at app startup time. */
-@Keep
-public class FirebasePerfProvider extends ContentProvider {
-
-  private static final Timer APP_START_TIME = new Clock().getTime();
-  /** Should match the {@link FirebasePerfProvider} authority if $androidId is empty. */
-  @VisibleForTesting
-  static final String EMPTY_APPLICATION_ID_PROVIDER_AUTHORITY =
-      "com.google.firebase.firebaseperfprovider";
-
-  private final Handler mainHandler = new Handler(Looper.getMainLooper());
-
-  public static Timer getAppStartTime() {
-    return APP_START_TIME;
-  }
-
-  @Override
-  public void attachInfo(Context context, ProviderInfo info) {
-    // super.attachInfo calls onCreate(). Fail as early as possible.
-    checkContentProviderAuthority(info);
-    super.attachInfo(context, info);
-
-    // Initialize ConfigResolver early for accessing device caching layer.
-    ConfigResolver configResolver = ConfigResolver.getInstance();
-    configResolver.setContentProviderContext(getContext());
-
-    AppStateMonitor appStateMonitor = AppStateMonitor.getInstance();
-    appStateMonitor.registerActivityLifecycleCallbacks(getContext());
-    appStateMonitor.registerForAppColdStart(new FirebasePerformanceInitializer());
-
-    AppStartTrace appStartTrace = AppStartTrace.getInstance();
-    appStartTrace.registerActivityLifecycleCallbacks(getContext());
-
-    mainHandler.post(new AppStartTrace.StartFromBackgroundRunnable(appStartTrace));
-
-    // In the case of cold start, we create a session and start collecting gauges as early as
-    // possible.
-    // There is code in SessionManager that prevents us from resetting the session twice in case
-    // of app cold start.
-    SessionManager.getInstance().initializeGaugeCollection();
-  }
-
-  /** Called before {@link Application#onCreate()}. */
-  @Override
-  public boolean onCreate() {
-    return false;
-  }
-
-  /**
-   * Check that the content provider's authority does not use firebase-common's package name. If it
-   * does, crash in order to alert the developer of the problem before they distribute the app.
-   */
-  private static void checkContentProviderAuthority(@NonNull ProviderInfo info) {
-    Preconditions.checkNotNull(info, "FirebasePerfProvider ProviderInfo cannot be null.");
-    if (EMPTY_APPLICATION_ID_PROVIDER_AUTHORITY.equals(info.authority)) {
-      throw new IllegalStateException(
-          "Incorrect provider authority in manifest. Most likely due to a missing "
-              + "applicationId variable in application's build.gradle.");
-    }
-  }
-
-  @Nullable
-  @Override
-  public Cursor query(
-      Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public String getType(Uri uri) {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public Uri insert(Uri uri, ContentValues values) {
-    return null;
-  }
-
-  @Override
-  public int delete(Uri uri, String selection, String[] selectionArgs) {
-    return 0;
-  }
-
-  @Override
-  public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-    return 0;
-  }
-}
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/session/PerfSession.java b/firebase-perf/src/main/java/com/google/firebase/perf/session/PerfSession.java
index d6f9aed0e3f..160a4507560 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/session/PerfSession.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/session/PerfSession.java
@@ -24,7 +24,6 @@
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.SessionVerbosity;
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 /** Details of a session including a unique Id and related information. */
@@ -38,10 +37,9 @@ public class PerfSession implements Parcelable {
   /*
    * Creates a PerfSession object and decides what metrics to collect.
    */
-  public static PerfSession create() {
-    String sessionId = UUID.randomUUID().toString().replace("-", "");
-
-    PerfSession session = new PerfSession(sessionId, new Clock());
+  public static PerfSession createWithId(@NonNull String sessionId) {
+    String prunedSessionId = sessionId.replace("-", "");
+    PerfSession session = new PerfSession(prunedSessionId, new Clock());
     session.setGaugeAndEventCollectionEnabled(shouldCollectGaugesAndEvents());
 
     return session;
@@ -108,7 +106,7 @@ static boolean isVerbose(@NonNull com.google.firebase.perf.v1.PerfSession perfSe
    * Checks if it has been more than {@link ConfigResolver#getSessionsMaxDurationMinutes()} time
    * since the creation time of the current session.
    */
-  public boolean isExpired() {
+  public boolean isSessionRunningTooLong() {
     return TimeUnit.MICROSECONDS.toMinutes(creationTime.getDurationMicros())
         > ConfigResolver.getInstance().getSessionsMaxDurationMinutes();
   }
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/session/SessionManager.java b/firebase-perf/src/main/java/com/google/firebase/perf/session/SessionManager.java
index b482268adb3..79d034b9b0b 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/session/SessionManager.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/session/SessionManager.java
@@ -17,7 +17,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import androidx.annotation.Keep;
-import com.google.android.gms.common.util.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.application.AppStateUpdateHandler;
 import com.google.firebase.perf.session.gauges.GaugeManager;
@@ -28,6 +28,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -57,7 +58,11 @@ public final PerfSession perfSession() {
   }
 
   private SessionManager() {
-    this(GaugeManager.getInstance(), PerfSession.create(), AppStateMonitor.getInstance());
+    // Generate a new sessionID for every cold start.
+    this(
+        GaugeManager.getInstance(),
+        PerfSession.createWithId(UUID.randomUUID().toString()),
+        AppStateMonitor.getInstance());
   }
 
   @VisibleForTesting
@@ -70,15 +75,15 @@ public SessionManager(
   }
 
   /**
-   * Finalizes gauge initialization during app start. This must be called before app start finishes
-   * (currently that is before onResume finishes), because {@link #perfSession} can be changed by
-   * {@link #onUpdateAppState(ApplicationProcessState)} once {@link AppStateMonitor#isColdStart()}
-   * becomes false.
+   * Finalizes gauge initialization during cold start. This must be called before app start finishes
+   * (currently that is before onResume finishes) to ensure gauge collection starts on time.
    */
   public void setApplicationContext(final Context appContext) {
     // Get PerfSession in main thread first, because it is possible that app changes fg/bg state
     // which creates a new perfSession, before the following is executed in background thread
     final PerfSession appStartSession = perfSession;
+    // TODO(b/258263016): Migrate to go/firebase-android-executors
+    @SuppressLint("ThreadPoolCreation")
     ExecutorService executorService = Executors.newSingleThreadExecutor();
     syncInitFuture =
         executorService.submit(
@@ -102,40 +107,51 @@ public void onUpdateAppState(ApplicationProcessState newAppState) {
     }
 
     if (newAppState == ApplicationProcessState.FOREGROUND) {
-      updatePerfSession(newAppState);
-
-    } else if (!updatePerfSessionIfExpired()) {
-      startOrStopCollectingGauges(newAppState);
+      // A new foregrounding of app will force a new sessionID generation.
+      PerfSession session = PerfSession.createWithId(UUID.randomUUID().toString());
+      updatePerfSession(session);
+    } else {
+      // If the session is running for too long, generate a new session and collect gauges as
+      // necessary.
+      if (perfSession.isSessionRunningTooLong()) {
+        PerfSession session = PerfSession.createWithId(UUID.randomUUID().toString());
+        updatePerfSession(session);
+      } else {
+        // For any other state change of the application, modify gauge collection state as
+        // necessary.
+        startOrStopCollectingGauges(newAppState);
+      }
     }
   }
 
   /**
-   * Updates the current {@link PerfSession} if it has expired/timed out.
+   * Checks if the current {@link PerfSession} is expired/timed out. If so, stop collecting gauges.
    *
-   * @return {@code true} if {@link PerfSession} is updated, {@code false} otherwise.
-   * @see PerfSession#isExpired()
+   * @see PerfSession#isSessionRunningTooLong()
    */
-  public boolean updatePerfSessionIfExpired() {
-    if (perfSession.isExpired()) {
-      updatePerfSession(appStateMonitor.getAppState());
-      return true;
+  public void stopGaugeCollectionIfSessionRunningTooLong() {
+    if (perfSession.isSessionRunningTooLong()) {
+      gaugeManager.stopCollectingGauges();
     }
-
-    return false;
   }
 
   /**
-   * Updates the currently associated {@link #perfSession} and broadcast the event.
+   * Updates the currently associated {@link #perfSession} and broadcast the change.
    *
-   * <p>Creation of new {@link PerfSession} will log the {@link GaugeMetadata} and start/stop the
-   * collection of {@link GaugeMetric} depending upon Session verbosity.
+   * <p>Uses the provided PerfSession {@link PerfSession}, log the {@link GaugeMetadata} and
+   * start/stop the collection of {@link GaugeMetric} depending upon Session verbosity.
    *
    * @see PerfSession#isVerbose()
    */
-  public void updatePerfSession(ApplicationProcessState currentAppState) {
-    synchronized (clients) {
-      perfSession = PerfSession.create();
+  public void updatePerfSession(PerfSession perfSession) {
+    // Do not update the perf session if it is the exact same sessionId.
+    if (perfSession.sessionId() == this.perfSession.sessionId()) {
+      return;
+    }
+
+    this.perfSession = perfSession;
 
+    synchronized (clients) {
       for (Iterator<WeakReference<SessionAwareObject>> i = clients.iterator(); i.hasNext(); ) {
         SessionAwareObject callback = i.next().get();
         if (callback != null) {
@@ -148,8 +164,11 @@ public void updatePerfSession(ApplicationProcessState currentAppState) {
       }
     }
 
-    logGaugeMetadataIfCollectionEnabled(currentAppState);
-    startOrStopCollectingGauges(currentAppState);
+    // Log the gauge metadata event if data collection is enabled.
+    logGaugeMetadataIfCollectionEnabled(appStateMonitor.getAppState());
+
+    // Start of stop the gauge data collection.
+    startOrStopCollectingGauges(appStateMonitor.getAppState());
   }
 
   /**
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/CpuGaugeCollector.java b/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/CpuGaugeCollector.java
index c34fd31dc72..e33d363c0aa 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/CpuGaugeCollector.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/CpuGaugeCollector.java
@@ -16,6 +16,7 @@
 
 import static android.system.Os.sysconf;
 
+import android.annotation.SuppressLint;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.system.OsConstants;
@@ -80,6 +81,8 @@ public class CpuGaugeCollector {
   @Nullable private ScheduledFuture cpuMetricCollectorJob = null;
   private long cpuMetricCollectionRateMs = UNSET_CPU_METRIC_COLLECTION_RATE;
 
+  // TODO(b/258263016): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   CpuGaugeCollector() {
     cpuMetricReadings = new ConcurrentLinkedQueue<>();
     cpuMetricCollectorExecutor = Executors.newSingleThreadScheduledExecutor();
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/GaugeManager.java b/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/GaugeManager.java
index 33699409e6b..0d15d3519c1 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/GaugeManager.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/GaugeManager.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.perf.session.gauges;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import androidx.annotation.Keep;
 import androidx.annotation.Nullable;
@@ -63,9 +64,11 @@ public class GaugeManager {
   private ApplicationProcessState applicationProcessState =
       ApplicationProcessState.APPLICATION_PROCESS_STATE_UNKNOWN;
 
+  // TODO(b/258263016): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   private GaugeManager() {
     this(
-        new Lazy<>(() -> Executors.newSingleThreadScheduledExecutor()),
+        new Lazy<>(Executors::newSingleThreadScheduledExecutor),
         TransportManager.getInstance(),
         ConfigResolver.getInstance(),
         null,
@@ -267,7 +270,6 @@ public boolean logGaugeMetadata(String sessionId, ApplicationProcessState appSta
 
   private GaugeMetadata getGaugeMetadata() {
     return GaugeMetadata.newBuilder()
-        .setProcessName(gaugeMetadataManager.getProcessName())
         .setDeviceRamSizeKb(gaugeMetadataManager.getDeviceRamSizeKb())
         .setMaxAppJavaHeapMemoryKb(gaugeMetadataManager.getMaxAppJavaHeapMemoryKb())
         .setMaxEncouragedAppJavaHeapMemoryKb(
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/GaugeMetadataManager.java b/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/GaugeMetadataManager.java
index 18ec46e15df..6b4466dfc35 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/GaugeMetadataManager.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/GaugeMetadataManager.java
@@ -19,7 +19,6 @@
 import android.content.Context;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.util.StorageUnit;
@@ -28,7 +27,6 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -43,7 +41,6 @@ class GaugeMetadataManager {
   private final Runtime runtime;
   private final ActivityManager activityManager;
   private final MemoryInfo memoryInfo;
-  private final String currentProcessName;
   private final Context appContext;
 
   GaugeMetadataManager(Context appContext) {
@@ -57,15 +54,6 @@ class GaugeMetadataManager {
     this.activityManager = (ActivityManager) appContext.getSystemService(Context.ACTIVITY_SERVICE);
     memoryInfo = new ActivityManager.MemoryInfo();
     activityManager.getMemoryInfo(memoryInfo);
-
-    // Assign the current process name here to avoid iterating through all the running processes
-    // each time getCurrentProcessName() is called.
-    currentProcessName = getCurrentProcessName();
-  }
-
-  /** Returns the name of the process FirebaseApp is associated with. */
-  public String getProcessName() {
-    return currentProcessName;
   }
 
   /**
@@ -112,23 +100,4 @@ int readTotalRAM(String procFileName) {
 
     return 0;
   }
-
-  /** Returns the name of the process the Application is associated with. */
-  private String getCurrentProcessName() {
-    int myProcessPid = android.os.Process.myPid();
-
-    @Nullable
-    List<ActivityManager.RunningAppProcessInfo> runningAppProcessInfos =
-        activityManager.getRunningAppProcesses();
-
-    if (runningAppProcessInfos != null) {
-      for (ActivityManager.RunningAppProcessInfo processInfo : runningAppProcessInfos) {
-        if (processInfo.pid == myProcessPid) {
-          return processInfo.processName;
-        }
-      }
-    }
-
-    return appContext.getPackageName();
-  }
 }
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/MemoryGaugeCollector.java b/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/MemoryGaugeCollector.java
index 8c3a3706a19..b221ba07760 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/MemoryGaugeCollector.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/MemoryGaugeCollector.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.perf.session.gauges;
 
+import android.annotation.SuppressLint;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.perf.logging.AndroidLogger;
@@ -52,6 +53,8 @@ public class MemoryGaugeCollector {
   @Nullable private ScheduledFuture memoryMetricCollectorJob = null;
   private long memoryMetricCollectionRateMs = UNSET_MEMORY_METRIC_COLLECTION_RATE;
 
+  // TODO(b/258263016): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   MemoryGaugeCollector() {
     this(Executors.newSingleThreadScheduledExecutor(), Runtime.getRuntime());
   }
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/transport/RateLimiter.java b/firebase-perf/src/main/java/com/google/firebase/perf/transport/RateLimiter.java
index b90b8346079..efcc15f33ff 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/transport/RateLimiter.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/transport/RateLimiter.java
@@ -20,7 +20,8 @@
 
 import android.content.Context;
 import androidx.annotation.NonNull;
-import com.google.android.gms.common.util.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
+
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.metrics.resource.ResourceType;
@@ -46,8 +47,10 @@ final class RateLimiter {
 
   /** Gets the sampling and rate limiting configs. */
   private final ConfigResolver configResolver;
-  /** The app's bucket ID for sampling, a number in [0.0f, 1.0f). */
-  private final float samplingBucketId;
+  /** The app's bucket ID for sampling, a number in [0.0, 1.0). */
+  private final double samplingBucketId;
+
+  private final double fragmentBucketId;
 
   private RateLimiterImpl traceLimiter = null;
   private RateLimiterImpl networkLimiter = null;
@@ -63,26 +66,37 @@ final class RateLimiter {
    * @param capacity token bucket capacity
    */
   public RateLimiter(@NonNull Context appContext, final Rate rate, final long capacity) {
-    this(rate, capacity, new Clock(), getSamplingBucketId(), ConfigResolver.getInstance());
+    this(
+        rate,
+        capacity,
+        new Clock(),
+        getSamplingBucketId(),
+        getSamplingBucketId(),
+        ConfigResolver.getInstance());
     this.isLogcatEnabled = Utils.isDebugLoggingEnabled(appContext);
   }
 
   /** Generates a bucket id between [0.0f, 1.0f) for sampling, it is sticky across app lifecycle. */
   @VisibleForTesting
-  static float getSamplingBucketId() {
-    return new Random().nextFloat();
+  static double getSamplingBucketId() {
+    return new Random().nextDouble();
   }
 
   RateLimiter(
       final Rate rate,
       final long capacity,
       final Clock clock,
-      float samplingBucketId,
+      double samplingBucketId,
+      double fragmentBucketId,
       ConfigResolver configResolver) {
     Utils.checkArgument(
-        0.0f <= samplingBucketId && samplingBucketId < 1.0f,
-        "Sampling bucket ID should be in range [0.0f, 1.0f).");
+        0.0 <= samplingBucketId && samplingBucketId < 1.0,
+        "Sampling bucket ID should be in range [0.0, 1.0).");
+    Utils.checkArgument(
+        0.0 <= fragmentBucketId && fragmentBucketId < 1.0,
+        "Fragment sampling bucket ID should be in range [0.0, 1.0).");
     this.samplingBucketId = samplingBucketId;
+    this.fragmentBucketId = fragmentBucketId;
     this.configResolver = configResolver;
 
     traceLimiter =
@@ -94,16 +108,32 @@ static float getSamplingBucketId() {
 
   /** Returns whether device is allowed to send trace events based on trace sampling rate. */
   private boolean isDeviceAllowedToSendTraces() {
-    float validTraceSamplingBucketIdThreshold = configResolver.getTraceSamplingRate();
+    double validTraceSamplingBucketIdThreshold = configResolver.getTraceSamplingRate();
     return samplingBucketId < validTraceSamplingBucketIdThreshold;
   }
 
   /** Returns whether device is allowed to send network events based on network sampling rate. */
   private boolean isDeviceAllowedToSendNetworkEvents() {
-    float validNetworkSamplingBucketIdThreshold = configResolver.getNetworkRequestSamplingRate();
+    double validNetworkSamplingBucketIdThreshold = configResolver.getNetworkRequestSamplingRate();
     return samplingBucketId < validNetworkSamplingBucketIdThreshold;
   }
 
+  /**
+   * Returns whether device is allowed to send Fragment screen trace events based on Fragment screen
+   * trace sampling rate.
+   */
+  private boolean isDeviceAllowedToSendFragmentScreenTraces() {
+    double validFragmentSamplingBucketIdThreshold = configResolver.getFragmentSamplingRate();
+    return fragmentBucketId < validFragmentSamplingBucketIdThreshold;
+  }
+
+  /** Identifies if the {@link PerfMetric} is a Fragment screen trace */
+  protected boolean isFragmentScreenTrace(PerfMetric metric) {
+    return metric.hasTraceMetric()
+        && metric.getTraceMetric().getName().startsWith(Constants.SCREEN_TRACE_PREFIX)
+        && metric.getTraceMetric().containsCustomAttributes(Constants.ACTIVITY_ATTRIBUTE_KEY);
+  }
+
   /**
    * Check if the {@link PerfMetric} should be rate limited.
    *
@@ -140,6 +170,12 @@ boolean isEventSampled(PerfMetric metric) {
       return false;
     }
 
+    if (isFragmentScreenTrace(metric)
+        && !(isDeviceAllowedToSendFragmentScreenTraces()
+            || hasVerboseSessions(metric.getTraceMetric().getPerfSessionsList()))) {
+      return false;
+    }
+
     if (metric.hasNetworkRequestMetric()
         && !(isDeviceAllowedToSendNetworkEvents()
             || hasVerboseSessions(metric.getNetworkRequestMetric().getPerfSessionsList()))) {
@@ -207,6 +243,11 @@ boolean getIsDeviceAllowedToSendNetworkEvents() {
     return isDeviceAllowedToSendNetworkEvents();
   }
 
+  @VisibleForTesting
+  boolean getIsDeviceAllowedToSendFragmentScreenTraces() {
+    return isDeviceAllowedToSendFragmentScreenTraces();
+  }
+
   /** The implementation of Token Bucket rate limiter. */
   static class RateLimiterImpl {
 
@@ -224,7 +265,7 @@ static class RateLimiterImpl {
     // Token bucket capacity, also the initial number of tokens in the bucket.
     private long capacity;
     // Number of tokens in the bucket.
-    private long tokenCount;
+    private double tokenCount;
 
     private Rate foregroundRate;
     private Rate backgroundRate;
@@ -258,22 +299,16 @@ static class RateLimiterImpl {
      */
     synchronized boolean check(@NonNull PerfMetric metric) {
       Timer now = clock.getTime();
-      long newTokens =
-          Math.max(
-              0,
-              (long)
-                  (lastTimeTokenReplenished.getDurationMicros(now)
-                      * rate.getTokensPerSeconds()
-                      / MICROS_IN_A_SECOND));
-      tokenCount = Math.min(tokenCount + newTokens, capacity);
-      if (newTokens > 0) {
-        lastTimeTokenReplenished =
-            new Timer(
-                lastTimeTokenReplenished.getMicros()
-                    + (long) (newTokens * MICROS_IN_A_SECOND / rate.getTokensPerSeconds()));
+      double newTokens =
+          (lastTimeTokenReplenished.getDurationMicros(now)
+              * rate.getTokensPerSeconds()
+              / MICROS_IN_A_SECOND);
+      if (newTokens > 0.0) {
+        tokenCount = Math.min(tokenCount + newTokens, capacity);
+        lastTimeTokenReplenished = now;
       }
-      if (tokenCount > 0) {
-        tokenCount--;
+      if (tokenCount >= 1.0) {
+        tokenCount -= 1.0;
         return true;
       }
       if (isLogcatEnabled) {
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/transport/TransportManager.java b/firebase-perf/src/main/java/com/google/firebase/perf/transport/TransportManager.java
index fab187ee6bf..9600b099a6d 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/transport/TransportManager.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/transport/TransportManager.java
@@ -17,6 +17,7 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -125,6 +126,8 @@ public class TransportManager implements AppStateCallback {
 
   private boolean isForegroundState = false;
 
+  // TODO(b/258263016): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   private TransportManager() {
     // MAX_POOL_SIZE must always be 1. We only allow one thread in this Executor. The reason
     // we specifically use a ThreadPoolExecutor rather than generating one from ExecutorService
@@ -378,9 +381,8 @@ private void syncLog(PerfMetric.Builder perfMetricBuilder, ApplicationProcessSta
     if (isAllowedToDispatch(perfMetric)) {
       dispatchLog(perfMetric);
 
-      // TODO(b/172008005): This might not be the best place for this call, consider utilizing a
-      //  callback in the SessionManager itself.
-      SessionManager.getInstance().updatePerfSessionIfExpired();
+      // Check if the session is expired. If so, stop gauge collection.
+      SessionManager.getInstance().stopGaugeCollectionIfSessionRunningTooLong();
     }
   }
 
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/util/Constants.java b/firebase-perf/src/main/java/com/google/firebase/perf/util/Constants.java
index 9050c06d6e5..d830a7c7336 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/util/Constants.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/util/Constants.java
@@ -22,8 +22,8 @@ public class Constants {
   public static final String PREFS_NAME = "FirebasePerfSharedPrefs";
   public static final String ENABLE_DISABLE = "isEnabled";
 
-  public static final float MIN_SAMPLING_RATE = 0.00f;
-  public static final float MAX_SAMPLING_RATE = 1.00f;
+  public static final double MIN_SAMPLING_RATE = 0.0;
+  public static final double MAX_SAMPLING_RATE = 1.0;
 
   // Max length of URL.
   public static final int MAX_URL_LENGTH = 2000;
@@ -52,6 +52,15 @@ public class Constants {
   /** Screen trace name is the prefix plus activity class name. */
   public static final String SCREEN_TRACE_PREFIX = "_st_";
 
+  /** Attribute key for the parent fragment of a fragment screen trace. */
+  public static final String PARENT_FRAGMENT_ATTRIBUTE_KEY = "Parent_fragment";
+
+  /** Attribute key for the hosting activity of a fragment screen trace. */
+  public static final String ACTIVITY_ATTRIBUTE_KEY = "Hosting_activity";
+
+  /** Attribute value for when the current fragment does not have a parent fragment. */
+  public static final String PARENT_FRAGMENT_ATTRIBUTE_VALUE_NONE = "No parent";
+
   /** frames longer than 16 ms are slow frames */
   public static final int SLOW_FRAME_TIME = 16;
 
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/util/FirstDrawDoneListener.java b/firebase-perf/src/main/java/com/google/firebase/perf/util/FirstDrawDoneListener.java
new file mode 100644
index 00000000000..f6c7d0a8b84
--- /dev/null
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/util/FirstDrawDoneListener.java
@@ -0,0 +1,100 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.perf.util;
+
+import android.annotation.SuppressLint;
+import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * OnDrawListener that unregisters itself and invokes callback when the next draw is done. This API
+ * 16+ implementation is an approximation of the initial-display-time defined by Android Vitals.
+ */
+public class FirstDrawDoneListener implements ViewTreeObserver.OnDrawListener {
+  // TODO(b/258263016): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
+  private final Handler mainThreadHandler = new Handler(Looper.getMainLooper());
+
+  private final AtomicReference<View> viewReference;
+  private final Runnable callback;
+
+  /** Registers a post-draw callback for the next draw of a view. */
+  public static void registerForNextDraw(View view, Runnable drawDoneCallback) {
+    final FirstDrawDoneListener listener = new FirstDrawDoneListener(view, drawDoneCallback);
+    // Handle bug prior to API 26 where OnDrawListener from the floating ViewTreeObserver is not
+    // merged into the real ViewTreeObserver.
+    // https://android.googlesource.com/platform/frameworks/base/+/9f8ec54244a5e0343b9748db3329733f259604f3
+    if (Build.VERSION.SDK_INT < 26 && !isAliveAndAttached(view)) {
+      view.addOnAttachStateChangeListener(
+          new View.OnAttachStateChangeListener() {
+            @Override
+            public void onViewAttachedToWindow(View view) {
+              view.getViewTreeObserver().addOnDrawListener(listener);
+              view.removeOnAttachStateChangeListener(this);
+            }
+
+            @Override
+            public void onViewDetachedFromWindow(View view) {
+              view.removeOnAttachStateChangeListener(this);
+            }
+          });
+    } else {
+      view.getViewTreeObserver().addOnDrawListener(listener);
+    }
+  }
+
+  private FirstDrawDoneListener(View view, Runnable callback) {
+    this.viewReference = new AtomicReference<>(view);
+    this.callback = callback;
+  }
+
+  @Override
+  public void onDraw() {
+    // Set viewReference to null so any onDraw past the first is a no-op
+    View view = viewReference.getAndSet(null);
+    if (view == null) {
+      return;
+    }
+    // OnDrawListeners cannot be removed within onDraw, so we remove it with a
+    // GlobalLayoutListener
+    view.getViewTreeObserver()
+        .addOnGlobalLayoutListener(() -> view.getViewTreeObserver().removeOnDrawListener(this));
+    mainThreadHandler.postAtFrontOfQueue(callback);
+  }
+
+  /**
+   * Helper to avoid <a
+   * href="https://android.googlesource.com/platform/frameworks/base/+/9f8ec54244a5e0343b9748db3329733f259604f3">bug
+   * prior to API 26</a>, where the floating ViewTreeObserver's OnDrawListeners are not merged into
+   * the real ViewTreeObserver during attach.
+   *
+   * @return true if the View is already attached and the ViewTreeObserver is not a floating
+   *     placeholder.
+   */
+  private static boolean isAliveAndAttached(View view) {
+    return view.getViewTreeObserver().isAlive() && isAttachedToWindow(view);
+  }
+
+  /** Backport {@link View#isAttachedToWindow()} which is API 19+ only. */
+  private static boolean isAttachedToWindow(View view) {
+    if (Build.VERSION.SDK_INT >= 19) {
+      return view.isAttachedToWindow();
+    }
+    return view.getWindowToken() != null;
+  }
+}
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/util/ImmutableBundle.java b/firebase-perf/src/main/java/com/google/firebase/perf/util/ImmutableBundle.java
index 4d51cd7dda3..0c6207dba44 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/util/ImmutableBundle.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/util/ImmutableBundle.java
@@ -68,21 +68,26 @@ public Optional<Boolean> getBoolean(String key) {
   }
 
   /**
-   * Returns float value associated with the given key, or not present if no mapping of the desired
+   * Returns double value associated with the given key, or not present if no mapping of the desired
    * type exists for the given key.
    */
-  public Optional<Float> getFloat(String key) {
+  public Optional<Double> getDouble(String key) {
     if (!containsKey(key)) {
       return Optional.absent();
     }
 
-    try {
-      Object o = bundle.get(key);
-      return Optional.fromNullable((Float) o);
-    } catch (ClassCastException e) {
-      logger.debug("Metadata key %s contains type other than float: %s", key, e.getMessage());
+    Object o = bundle.get(key);
+    if (o == null) {
+      return Optional.absent();
+    }
+    if (o instanceof Float) {
+      return Optional.of(((Float) o).doubleValue());
+    }
+    if (o instanceof Double) {
+      return Optional.of((Double) o);
     }
 
+    logger.debug("Metadata key %s contains type other than double: %s", key);
     return Optional.absent();
   }
 
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/util/PreDrawListener.java b/firebase-perf/src/main/java/com/google/firebase/perf/util/PreDrawListener.java
new file mode 100644
index 00000000000..8241dd9a50a
--- /dev/null
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/util/PreDrawListener.java
@@ -0,0 +1,62 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.perf.util;
+
+import android.annotation.SuppressLint;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * OnPreDraw listener that unregisters itself and post a callback to the main thread during
+ * OnPreDraw. This is an approximation of the initial-display time defined by Android Vitals.
+ */
+public class PreDrawListener implements ViewTreeObserver.OnPreDrawListener {
+  // TODO(b/258263016): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
+  private final Handler mainThreadHandler = new Handler(Looper.getMainLooper());
+
+  private final AtomicReference<View> viewReference;
+  private final Runnable callbackBoQ;
+  private final Runnable callbackFoQ;
+
+  /** Registers a post-draw callback for the next draw of a view. */
+  public static void registerForNextDraw(
+      View view, Runnable drawDoneCallbackBoQ, Runnable drawDoneCallbackFoQ) {
+    final PreDrawListener listener =
+        new PreDrawListener(view, drawDoneCallbackBoQ, drawDoneCallbackFoQ);
+    view.getViewTreeObserver().addOnPreDrawListener(listener);
+  }
+
+  private PreDrawListener(View view, Runnable callbackBoQ, Runnable callbackFoQ) {
+    this.viewReference = new AtomicReference<>(view);
+    this.callbackBoQ = callbackBoQ;
+    this.callbackFoQ = callbackFoQ;
+  }
+
+  @Override
+  public boolean onPreDraw() {
+    // Set viewReference to null so any onPreDraw past the first is a no-op
+    View view = viewReference.getAndSet(null);
+    if (view == null) {
+      return true;
+    }
+    view.getViewTreeObserver().removeOnPreDrawListener(this);
+    mainThreadHandler.post(callbackBoQ);
+    mainThreadHandler.postAtFrontOfQueue(callbackFoQ);
+    return true;
+  }
+}
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/util/ScreenTraceUtil.java b/firebase-perf/src/main/java/com/google/firebase/perf/util/ScreenTraceUtil.java
new file mode 100644
index 00000000000..ddac6aedf86
--- /dev/null
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/util/ScreenTraceUtil.java
@@ -0,0 +1,58 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.perf.util;
+
+import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.metrics.FrameMetricsCalculator.PerfFrameMetrics;
+import com.google.firebase.perf.metrics.Trace;
+
+/** Utility class for screen traces. */
+public class ScreenTraceUtil {
+  private static final AndroidLogger logger = AndroidLogger.getInstance();
+
+  /**
+   * Set the metrics of total frames, slow frames, and frozen frames for the given screen trace.
+   *
+   * @param screenTrace a screen trace
+   * @param perfFrameMetrics frame metrics calculated by {@link
+   *     com.google.firebase.perf.metrics.FrameMetricsCalculator#calculateFrameMetrics}
+   * @return the screen trace with frame metrics added.
+   */
+  public static Trace addFrameCounters(Trace screenTrace, PerfFrameMetrics perfFrameMetrics) {
+    // Only putMetric if corresponding metric is greater than zero.
+    if (perfFrameMetrics.getTotalFrames() > 0) {
+      screenTrace.putMetric(
+          Constants.CounterNames.FRAMES_TOTAL.toString(), perfFrameMetrics.getTotalFrames());
+    }
+    if (perfFrameMetrics.getSlowFrames() > 0) {
+      screenTrace.putMetric(
+          Constants.CounterNames.FRAMES_SLOW.toString(), perfFrameMetrics.getSlowFrames());
+    }
+    if (perfFrameMetrics.getFrozenFrames() > 0) {
+      screenTrace.putMetric(
+          Constants.CounterNames.FRAMES_FROZEN.toString(), perfFrameMetrics.getFrozenFrames());
+    }
+    logger.debug(
+        "Screen trace: "
+            + screenTrace.getName()
+            + " _fr_tot:"
+            + perfFrameMetrics.getTotalFrames()
+            + " _fr_slo:"
+            + perfFrameMetrics.getSlowFrames()
+            + " _fr_fzn:"
+            + perfFrameMetrics.getFrozenFrames());
+    return screenTrace;
+  }
+}
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/util/Timer.java b/firebase-perf/src/main/java/com/google/firebase/perf/util/Timer.java
index d7f27ecb54d..fcc7862b35b 100644
--- a/firebase-perf/src/main/java/com/google/firebase/perf/util/Timer.java
+++ b/firebase-perf/src/main/java/com/google/firebase/perf/util/Timer.java
@@ -14,92 +14,134 @@
 
 package com.google.firebase.perf.util;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.os.SystemClock;
 import androidx.annotation.NonNull;
-import com.google.android.gms.common.util.VisibleForTesting;
-import java.util.concurrent.TimeUnit;
-
-/** A Timer class provides both wall-clock (epoch) time and high resolution time (nano time). */
+import androidx.annotation.VisibleForTesting;
+
+/**
+ * A Timer class provides both wall-clock (epoch) time and monotonic time (elapsedRealtime).
+ * Timestamps are captured with millisecond-precision, because that's the time unit most widely
+ * available in Android APIs. However, private fields and public method returns are in microseconds
+ * due to Fireperf proto requirements.
+ */
 public class Timer implements Parcelable {
 
-  /** Wall-clock time or epoch time in microseconds, */
-  private long timeInMicros;
   /**
-   * High resolution time in nanoseconds. High resolution time should only be used to calculate
-   * duration or latency. It is not wall-clock time.
+   * Wall-clock time or epoch time in microseconds. Do NOT use for duration because wall-clock is
+   * not guaranteed to be monotonic: it can be set by the user or the phone network, thus it may
+   * jump forwards or backwards unpredictably. {@see SystemClock}
+   */
+  private long wallClockMicros;
+  /**
+   * Monotonic time measured in the {@link SystemClock#elapsedRealtime()} timebase. Only used to
+   * compute duration between 2 timestamps in the same timebase. It is NOT wall-clock time.
+   */
+  private long elapsedRealtimeMicros;
+
+  /**
+   * Returns a new Timer object as if it was stamped at the given elapsedRealtime. Uses current
+   * wall-clock as a reference to extrapolate the wall-clock at the given elapsedRealtime.
+   *
+   * @param elapsedRealtimeMillis timestamp in the {@link SystemClock#elapsedRealtime()} timebase
    */
-  private long highResTime;
+  public static Timer ofElapsedRealtime(final long elapsedRealtimeMillis) {
+    long elapsedRealtimeMicros = MILLISECONDS.toMicros(elapsedRealtimeMillis);
+    long wallClockMicros = wallClockMicros() + (elapsedRealtimeMicros - elapsedRealtimeMicros());
+    return new Timer(wallClockMicros, elapsedRealtimeMicros);
+  }
 
   /**
-   * Construct Timer object using System clock. Make it package visible to be only accessible from
-   * com.google.firebase.perf.util.Clock.
+   * Helper to get current wall-clock time from system API.
+   *
+   * @return wall-clock time in microseconds.
    */
+  private static long wallClockMicros() {
+    return MILLISECONDS.toMicros(System.currentTimeMillis());
+  }
+
+  /**
+   * Helper to get current {@link SystemClock#elapsedRealtime()} from system API.
+   *
+   * @return wall-clock time in microseconds.
+   */
+  private static long elapsedRealtimeMicros() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+      return NANOSECONDS.toMicros(SystemClock.elapsedRealtimeNanos());
+    }
+    return MILLISECONDS.toMicros(SystemClock.elapsedRealtime());
+  }
+
+  // TODO: make all constructors private, use public static factory methods, per Effective Java
+  /** Construct Timer object using System clock. */
   public Timer() {
-    timeInMicros = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis());
-    highResTime = System.nanoTime();
+    this(wallClockMicros(), elapsedRealtimeMicros());
   }
 
   /**
-   * Construct a Timer object with input wall-clock time, assume high resolution time is same as
-   * wall-clock time.
+   * Construct a Timer object with input wall-clock time and elapsedRealtime.
    *
-   * @param time wall-clock time in microseconds
+   * @param epochMicros wall-clock time in milliseconds since epoch
+   * @param elapsedRealtimeMicros monotonic time in microseconds in the {@link
+   *     SystemClock#elapsedRealtime()} timebase
    */
   @VisibleForTesting
-  public Timer(long time) {
-    this.timeInMicros = time;
-    highResTime = TimeUnit.MICROSECONDS.toNanos(time);
+  Timer(long epochMicros, long elapsedRealtimeMicros) {
+    this.wallClockMicros = epochMicros;
+    this.elapsedRealtimeMicros = elapsedRealtimeMicros;
   }
 
   /**
-   * Construct a Timer object with input wall-clock time and high resolution time.
+   * TEST-ONLY constructor that sets both wall-clock time and elapsedRealtime to the same input
+   * value. Do NOT use this for any real logic because this is mixing 2 different time-bases.
    *
-   * @param time wall-clock time in microseconds
-   * @param highResTime high resolution time in nanoseconds
+   * @param testTime value to set both wall-clock and elapsedRealtime to for testing purposes
    */
   @VisibleForTesting
-  public Timer(long time, long highResTime) {
-    this.timeInMicros = time;
-    this.highResTime = highResTime;
+  public Timer(long testTime) {
+    this(testTime, testTime);
   }
 
   private Timer(Parcel in) {
-    timeInMicros = in.readLong();
-    highResTime = in.readLong();
+    this(in.readLong(), in.readLong());
   }
 
   /** resets the start time */
   public void reset() {
-    timeInMicros = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis());
-    highResTime = System.nanoTime();
+    // TODO: consider removing this method and make Timer immutable thus fully thread-safe
+    wallClockMicros = wallClockMicros();
+    elapsedRealtimeMicros = elapsedRealtimeMicros();
   }
 
   /** Return wall-clock time in microseconds. */
   public long getMicros() {
-    return timeInMicros;
+    return wallClockMicros;
   }
 
   /**
-   * Calculate duration in microseconds using the the high resolution time.
+   * Calculate duration in microseconds using elapsedRealtime.
    *
    * <p>The start time is this Timer object, end time is current time.
    *
    * @return duration in microseconds.
    */
   public long getDurationMicros() {
-    return TimeUnit.NANOSECONDS.toMicros(System.nanoTime() - this.highResTime);
+    return getDurationMicros(new Timer());
   }
 
   /**
-   * Calculate duration in microseconds using the the high resolution time. The start time is this
-   * Timer object.
+   * Calculate duration in microseconds using elapsedRealtime. The start time is this Timer object.
    *
    * @param end end Timer object
    * @return duration in microseconds.
    */
   public long getDurationMicros(@NonNull final Timer end) {
-    return TimeUnit.NANOSECONDS.toMicros(end.highResTime - this.highResTime);
+    return end.elapsedRealtimeMicros - this.elapsedRealtimeMicros;
   }
 
   /**
@@ -111,17 +153,7 @@ public long getDurationMicros(@NonNull final Timer end) {
    *     was created.
    */
   public long getCurrentTimestampMicros() {
-    return timeInMicros + getDurationMicros();
-  }
-
-  /**
-   * Return high resolution time in microseconds, only useful for testing..
-   *
-   * @return high resolution time in microseconds.
-   */
-  @VisibleForTesting
-  public long getHighResTime() {
-    return TimeUnit.NANOSECONDS.toMicros(highResTime);
+    return wallClockMicros + getDurationMicros();
   }
 
   /**
@@ -132,8 +164,8 @@ public long getHighResTime() {
    * @param flags always will be the value 0.
    */
   public void writeToParcel(Parcel out, int flags) {
-    out.writeLong(timeInMicros);
-    out.writeLong(highResTime);
+    out.writeLong(wallClockMicros);
+    out.writeLong(elapsedRealtimeMicros);
   }
 
   /**
diff --git a/firebase-perf/src/main/proto/firebase/perf/v1/perf_metric.proto b/firebase-perf/src/main/proto/firebase/perf/v1/perf_metric.proto
index 8f4a0fd10da..8da196c0281 100644
--- a/firebase-perf/src/main/proto/firebase/perf/v1/perf_metric.proto
+++ b/firebase-perf/src/main/proto/firebase/perf/v1/perf_metric.proto
@@ -266,11 +266,8 @@ message AndroidMemoryReading {
 //
 // Next tag: 7
 message GaugeMetadata {
-  // The process in which Firebase instance is initialized and collecting data.
-  // Fireperf sdk collects information in the context of a process (instead of
-  // the whole app). The process name helps developer identifies which process
-  // are the gauge data coming from.
-  optional string process_name = 1;
+  // Deprecated on 09/2022.
+  optional string process_name = 1 [deprecated = true];
 
   // Clock rate of the cpu of the device, in kHz.
   optional int32 cpu_clock_rate_khz = 2;
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerfRegistrarTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerfRegistrarTest.java
index 8fd5c68d354..7df39fe6a1e 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerfRegistrarTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerfRegistrarTest.java
@@ -18,11 +18,15 @@
 
 import com.google.android.datatransport.TransportFactory;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.StartupTime;
+import com.google.firebase.annotations.concurrent.UiThread;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
 import java.util.List;
+import java.util.concurrent.Executor;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -35,9 +39,7 @@ public void testGetComponents() {
     FirebasePerfRegistrar firebasePerfRegistrar = new FirebasePerfRegistrar();
     List<Component<?>> components = firebasePerfRegistrar.getComponents();
 
-    // Note: Although we have 3 deps but looks like size doesn't count deps towards interface like
-    // FirebaseInstallationsApi
-    assertThat(components).hasSize(2);
+    assertThat(components).hasSize(3);
 
     Component<?> firebasePerfComponent = components.get(0);
 
@@ -46,8 +48,19 @@ public void testGetComponents() {
             Dependency.required(FirebaseApp.class),
             Dependency.requiredProvider(RemoteConfigComponent.class),
             Dependency.required(FirebaseInstallationsApi.class),
-            Dependency.requiredProvider(TransportFactory.class));
+            Dependency.requiredProvider(TransportFactory.class),
+            Dependency.required(FirebasePerfEarly.class));
 
     assertThat(firebasePerfComponent.isLazy()).isTrue();
+
+    Component<?> firebasePerfEarlyComponent = components.get(1);
+
+    assertThat(firebasePerfEarlyComponent.getDependencies())
+        .containsExactly(
+            Dependency.required(Qualified.qualified(UiThread.class, Executor.class)),
+            Dependency.required(FirebaseApp.class),
+            Dependency.optionalProvider(StartupTime.class));
+
+    assertThat(firebasePerfEarlyComponent.isLazy()).isFalse();
   }
 }
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTest.java
index 0316cb0dea8..cd41c5a3adf 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTest.java
@@ -23,6 +23,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 import androidx.annotation.Nullable;
@@ -50,6 +51,7 @@
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowPackageManager;
 
 /** Unit tests for {@link FirebasePerformance}. */
 @RunWith(RobolectricTestRunner.class)
@@ -81,6 +83,14 @@ public void setUp() throws NameNotFoundException {
     FirebaseApp.clearInstancesForTest();
 
     Context context = ApplicationProvider.getApplicationContext();
+    ShadowPackageManager shadowPackageManager = shadowOf(context.getPackageManager());
+
+    PackageInfo packageInfo =
+        shadowPackageManager.getInternalMutablePackageInfo(context.getPackageName());
+    packageInfo.versionName = "1.0.0";
+
+    packageInfo.applicationInfo.metaData.clear();
+
     FirebaseApp.initializeApp(context, options);
     for (int i = 0; i <= Constants.MAX_TRACE_CUSTOM_ATTRIBUTES; i++) {
       FirebasePerformance.getInstance().removeAttribute("dim" + i);
@@ -90,11 +100,6 @@ public void setUp() throws NameNotFoundException {
     sharedPreferences.edit().clear().commit();
     DeviceCacheManager.clearInstance();
 
-    shadowOf(context.getPackageManager())
-        .getInternalMutablePackageInfo(context.getPackageName())
-        .applicationInfo
-        .metaData
-        .clear();
     spyRemoteConfigManager = spy(RemoteConfigManager.getInstance());
     ConfigResolver.clearInstance();
     spyConfigResolver = spy(ConfigResolver.getInstance());
@@ -544,8 +549,9 @@ private FirebasePerformance initializeFirebasePerformancePreferences(
       Boolean sharedPreferencesEnabledDisabledKey,
       Provider<RemoteConfigComponent> firebaseRemoteConfigProvider,
       Provider<TransportFactory> transportFactoryProvider) {
+    Context context = ApplicationProvider.getApplicationContext();
     DeviceCacheManager deviceCacheManager = new DeviceCacheManager(fakeDirectExecutorService);
-    deviceCacheManager.setContext(ApplicationProvider.getApplicationContext());
+    deviceCacheManager.setContext(context);
     if (sharedPreferencesEnabledDisabledKey != null) {
       deviceCacheManager.setValue(Constants.ENABLE_DISABLE, sharedPreferencesEnabledDisabledKey);
     }
@@ -560,7 +566,6 @@ private FirebasePerformance initializeFirebasePerformancePreferences(
       bundle.putBoolean(FIREPERF_FORCE_DEACTIVATED_KEY, metadataFireperfForceDeactivatedKey);
     }
 
-    Context context = ApplicationProvider.getApplicationContext();
     shadowOf(context.getPackageManager())
         .getInternalMutablePackageInfo(context.getPackageName())
         .applicationInfo
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTestBase.java b/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTestBase.java
index e542123e8fa..b31696d963b 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTestBase.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTestBase.java
@@ -14,7 +14,10 @@
 
 package com.google.firebase.perf;
 
+import static org.robolectric.Shadows.shadowOf;
+
 import android.content.Context;
+import android.content.pm.PackageInfo;
 import android.os.Bundle;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.firebase.FirebaseApp;
@@ -25,6 +28,7 @@
 import com.google.firebase.perf.util.ImmutableBundle;
 import org.junit.After;
 import org.junit.Before;
+import org.robolectric.shadows.ShadowPackageManager;
 
 public class FirebasePerformanceTestBase {
 
@@ -53,6 +57,13 @@ public class FirebasePerformanceTestBase {
   @Before
   public void setUpFirebaseApp() {
     appContext = ApplicationProvider.getApplicationContext();
+
+    ShadowPackageManager shadowPackageManager = shadowOf(appContext.getPackageManager());
+
+    PackageInfo packageInfo =
+        shadowPackageManager.getInternalMutablePackageInfo(appContext.getPackageName());
+    packageInfo.versionName = "1.0.0";
+
     FirebaseOptions options =
         new FirebaseOptions.Builder()
             .setApplicationId(FAKE_FIREBASE_APPLICATION_ID)
@@ -87,6 +98,6 @@ private static void forceVerboseSessionWithSamplingPercentage(long samplingPerce
     bundle.putFloat("sessions_sampling_percentage", samplingPercentage);
     ConfigResolver.getInstance().setMetadataBundle(new ImmutableBundle(bundle));
 
-    SessionManager.getInstance().setPerfSession(PerfSession.create());
+    SessionManager.getInstance().setPerfSession(PerfSession.createWithId("sessionId"));
   }
 }
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/PerformanceTests.kt b/firebase-perf/src/test/java/com/google/firebase/perf/PerformanceTests.kt
new file mode 100644
index 00000000000..e8844e0cc43
--- /dev/null
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/PerformanceTests.kt
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.perf
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import com.google.firebase.perf.FirebasePerformance.HttpMethod
+import com.google.firebase.perf.application.AppStateMonitor
+import com.google.firebase.perf.metrics.HttpMetric
+import com.google.firebase.perf.metrics.Trace
+import com.google.firebase.perf.metrics.getTraceCounter
+import com.google.firebase.perf.metrics.getTraceCounterCount
+import com.google.firebase.perf.transport.TransportManager
+import com.google.firebase.perf.util.Clock
+import com.google.firebase.perf.util.Timer
+import com.google.firebase.perf.v1.ApplicationProcessState
+import com.google.firebase.perf.v1.NetworkRequestMetric
+import com.google.firebase.perf.v1.TraceMetric
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.ArgumentMatchers
+import org.mockito.ArgumentMatchers.nullable
+import org.mockito.Captor
+import org.mockito.Mock
+import org.mockito.Mockito.doAnswer
+import org.mockito.Mockito.verify
+import org.mockito.Mockito.`when`
+import org.mockito.MockitoAnnotations.initMocks
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows
+
+const val APP_ID = "1:149208680807:android:0000000000000000"
+const val API_KEY = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  open fun setUp() {
+    val context = ApplicationProvider.getApplicationContext<Context>()
+    val shadowPackageManager = Shadows.shadowOf(context.packageManager)
+    val packageInfo = shadowPackageManager.getInternalMutablePackageInfo(context.packageName)
+    packageInfo.versionName = "1.0.0"
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class PerformanceTests : BaseTestCase() {
+
+  @Mock lateinit var transportManagerMock: TransportManager
+
+  @Mock lateinit var timerMock: Timer
+
+  @Mock lateinit var mockTransportManager: TransportManager
+
+  @Mock lateinit var mockClock: Clock
+
+  @Mock lateinit var mockAppStateMonitor: AppStateMonitor
+
+  @Captor lateinit var argMetricCaptor: ArgumentCaptor<NetworkRequestMetric>
+
+  @Captor lateinit var argumentsCaptor: ArgumentCaptor<TraceMetric>
+
+  var currentTime: Long = 1
+
+  @Before
+  override fun setUp() {
+    super.setUp()
+    initMocks(this)
+
+    `when`(timerMock.getMicros()).thenReturn(1000L)
+    `when`(timerMock.getDurationMicros()).thenReturn(2000L).thenReturn(3000L)
+    doAnswer { Timer(currentTime) }.`when`(mockClock).getTime()
+  }
+
+  @Test
+  fun `performance should delegate to FirebasePerformance#getInstance()`() {
+    assertThat(Firebase.performance).isSameInstanceAs(FirebasePerformance.getInstance())
+  }
+
+  @Test
+  fun `httpMetric wrapper test `() {
+    val metric =
+      HttpMetric("https://www.google.com/", HttpMethod.GET, transportManagerMock, timerMock)
+    metric.trace { setHttpResponseCode(200) }
+
+    verify(transportManagerMock)
+      .log(
+        argMetricCaptor.capture(),
+        ArgumentMatchers.nullable(ApplicationProcessState::class.java)
+      )
+
+    val metricValue = argMetricCaptor.getValue()
+    assertThat(metricValue.getHttpResponseCode()).isEqualTo(200)
+  }
+
+  @Test
+  fun `trace wrapper test`() {
+    val trace = Trace("trace_1", mockTransportManager, mockClock, mockAppStateMonitor)
+    trace.trace { incrementMetric("metric_1", 5) }
+
+    assertThat(getTraceCounter(trace)).hasSize(1)
+    assertThat(getTraceCounterCount(trace, "metric_1")).isEqualTo(5)
+    verify(mockTransportManager)
+      .log(argumentsCaptor.capture(), nullable(ApplicationProcessState::class.java))
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java
index 111d3ce140e..398ba4ef0e0 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java
@@ -15,6 +15,7 @@
 package com.google.firebase.perf.application;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.firebase.perf.application.AppStateMonitor.AppStateCallback;
 import static com.google.firebase.perf.v1.ApplicationProcessState.FOREGROUND_BACKGROUND;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.nullable;
@@ -38,7 +39,6 @@
 import com.google.firebase.perf.config.DeviceCacheManager;
 import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.metrics.Trace;
-import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.perf.session.gauges.GaugeManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Clock;
@@ -46,7 +46,6 @@
 import com.google.firebase.perf.util.ImmutableBundle;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.ApplicationProcessState;
-import com.google.firebase.perf.v1.PerfSession;
 import com.google.firebase.perf.v1.TraceMetric;
 import com.google.testing.timing.FakeDirectExecutorService;
 import java.lang.ref.WeakReference;
@@ -524,7 +523,7 @@ public void foregroundTrace_perfMonEnabledAtRuntime_traceCreated() {
   }
 
   @Test
-  public void foreGroundTrace_perfMonDeactivated_traceCreated() {
+  public void foregroundTrace_perfMonDeactivated_traceCreated() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
 
     // Firebase Performance is deactivated at build time.
@@ -670,9 +669,11 @@ public void activityStateChanges_singleSubscriber_callbackIsCalled() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
     Map<Integer, ApplicationProcessState> subscriberState = new HashMap<>();
 
+    // Register callbacks, but note that each callback is saved in a local variable. Otherwise
+    // WeakReference can get garbage collected, making this test flaky.
     final int subscriber1 = 1;
-    monitor.registerForAppState(
-        new WeakReference<>(newState -> subscriberState.put(subscriber1, newState)));
+    AppStateCallback callback1 = newState -> subscriberState.put(subscriber1, newState);
+    monitor.registerForAppState(new WeakReference<>(callback1));
 
     // Activity comes to Foreground
     monitor.onActivityResumed(activity1);
@@ -688,17 +689,19 @@ public void activityStateChanges_multipleSubscribers_callbackCalledOnEachSubscri
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
     Map<Integer, ApplicationProcessState> subscriberState = new HashMap<>();
 
+    // Register callbacks, but note that each callback is saved in a local variable. Otherwise
+    // WeakReference can get garbage collected, making this test flaky.
     final int subscriber1 = 1;
-    monitor.registerForAppState(
-        new WeakReference<>(newState -> subscriberState.put(subscriber1, newState)));
+    AppStateCallback callback1 = newState -> subscriberState.put(subscriber1, newState);
+    monitor.registerForAppState(new WeakReference<>(callback1));
 
     final int subscriber2 = 2;
-    monitor.registerForAppState(
-        new WeakReference<>(newState -> subscriberState.put(subscriber2, newState)));
+    AppStateCallback callback2 = newState -> subscriberState.put(subscriber2, newState);
+    monitor.registerForAppState(new WeakReference<>(callback2));
 
     final int subscriber3 = 3;
-    monitor.registerForAppState(
-        new WeakReference<>(newState -> subscriberState.put(subscriber3, newState)));
+    AppStateCallback callback3 = newState -> subscriberState.put(subscriber3, newState);
+    monitor.registerForAppState(new WeakReference<>(callback3));
 
     // Activity comes to Foreground
     monitor.onActivityResumed(activity1);
@@ -768,32 +771,6 @@ public void appColdStart_singleSubscriberRegistersForMultipleTimes_oneCallbackIs
     verify(mockInitializer1, times(1)).onAppColdStart();
   }
 
-  @Test
-  public void updatePerfSession_isAfterSendingForegroundOrBackgroundSession() {
-    AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
-    monitor.registerForAppState(SessionManager.getInstance().getAppStateCallback());
-    monitor.setStopTime(new Timer(currentTime));
-    monitor.setIsColdStart(false);
-    // Mandatory due to circular dependencies of singletons AppStateMonitor and SessionManager
-    AppStateMonitor.getInstance().setIsColdStart(false);
-
-    // Foreground -> Background, sends _fs
-    PerfSession currentSession = SessionManager.getInstance().perfSession().build();
-    monitor.onActivityResumed(activity1);
-
-    verify(transportManager, times(1)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND));
-    PerfSession sentSession = argTraceMetric.getValue().getPerfSessions(0);
-    Assert.assertEquals(currentSession, sentSession);
-
-    // Background -> Foreground, sends _bs
-    currentSession = SessionManager.getInstance().perfSession().build();
-    monitor.onActivityStopped(activity1);
-
-    verify(transportManager, times(2)).log(argTraceMetric.capture(), eq(FOREGROUND_BACKGROUND));
-    sentSession = argTraceMetric.getValue().getPerfSessions(0);
-    Assert.assertEquals(currentSession, sentSession);
-  }
-
   private static Activity createFakeActivity(boolean isHardwareAccelerated) {
     ActivityController<Activity> fakeActivityController = Robolectric.buildActivity(Activity.class);
 
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/application/FragmentStateMonitorTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/application/FragmentStateMonitorTest.java
new file mode 100644
index 00000000000..fd7814f8175
--- /dev/null
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/application/FragmentStateMonitorTest.java
@@ -0,0 +1,296 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.perf.application;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.WindowManager;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import com.google.firebase.perf.FirebasePerformanceTestBase;
+import com.google.firebase.perf.config.ConfigResolver;
+import com.google.firebase.perf.config.DeviceCacheManager;
+import com.google.firebase.perf.metrics.FrameMetricsCalculator.PerfFrameMetrics;
+import com.google.firebase.perf.metrics.Trace;
+import com.google.firebase.perf.transport.TransportManager;
+import com.google.firebase.perf.util.Clock;
+import com.google.firebase.perf.util.Constants;
+import com.google.firebase.perf.util.Constants.CounterNames;
+import com.google.firebase.perf.util.Optional;
+import com.google.firebase.perf.util.Timer;
+import com.google.firebase.perf.v1.ApplicationProcessState;
+import com.google.firebase.perf.v1.TraceMetric;
+import java.util.WeakHashMap;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.stubbing.Answer;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.android.controller.ActivityController;
+
+class FragmentMonitorMockFragment extends Fragment {}
+
+/** Unit tests for {@link com.google.firebase.perf.application.FragmentStateMonitor}. */
+@RunWith(RobolectricTestRunner.class)
+public class FragmentStateMonitorTest extends FirebasePerformanceTestBase {
+
+  @Mock private Clock clock;
+  @Mock private Fragment mockFragment;
+  @Mock private FragmentManager mockFragmentManager;
+  @Mock private TransportManager mockTransportManager;
+  @Mock private AppCompatActivity mockActivity;
+  @Mock private AppStateMonitor appStateMonitor;
+  @Mock private FrameMetricsRecorder recorder;
+  @Mock private PerfFrameMetrics frameCounts1;
+  @Mock private PerfFrameMetrics frameCounts2;
+  @Mock private ConfigResolver configResolver;
+  @Mock private Bundle savedInstanceState;
+  @Mock private Fragment mockFragment1;
+  @Mock private Fragment mockFragment2;
+
+  @Captor private ArgumentCaptor<TraceMetric> argTraceMetric;
+
+  private Activity activity;
+  private long currentTime = 0;
+  private static final String longFragmentName =
+      "_st_NeverGonnaGiveYouUpNeverGonnaLetYouDownNeverGonnaRunAroundAndDesertYouNeverGonnaMakeYouCryNeverGonnaSayGoodbyeNeverGonnaTellALieAndHurtYou";
+
+  @Before
+  public void setUp() {
+    currentTime = 0;
+    initMocks(this);
+    doAnswer((Answer<Timer>) invocationOnMock -> new Timer(currentTime)).when(clock).getTime();
+
+    DeviceCacheManager.clearInstance();
+    when(configResolver.isPerformanceMonitoringEnabled()).thenReturn(true);
+
+    doNothing().when(recorder).start();
+    doNothing().when(recorder).startFragment(any());
+
+    activity = createFakeActivity(true);
+
+    // Sample frame counts.
+    frameCounts1 = new PerfFrameMetrics(9, 5, 3);
+    frameCounts2 = new PerfFrameMetrics(14, 9, 4);
+
+    savedInstanceState = mock(Bundle.class);
+    appStateMonitor = mock(AppStateMonitor.class);
+    mockFragment1 = mock(Fragment.class);
+    mockFragment2 = mock(Fragment.class);
+  }
+
+  /************ Trace Creation Tests ****************/
+
+  @Test
+  public void fragmentTraceName_validFragment_validFragmentScreenTraceNameGenerated() {
+    FragmentStateMonitor monitor =
+        new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, recorder);
+    Fragment testFragment = new FragmentMonitorMockFragment();
+    assertThat(monitor.getFragmentScreenTraceName(testFragment))
+        .isEqualTo("_st_FragmentMonitorMockFragment");
+  }
+
+  @Test
+  public void
+      lifecycleCallbacks_differentFrameMetricsCapturedByFrameRecorder_logFragmentScreenTrace() {
+    FragmentStateMonitor monitor =
+        new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, recorder);
+    when(recorder.stopFragment(any())).thenReturn(Optional.of(frameCounts1));
+    monitor.onFragmentResumed(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(0)).log(any(TraceMetric.class), any());
+    monitor.onFragmentPaused(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(1)).log(any(TraceMetric.class), any());
+
+    when(recorder.stopFragment(any())).thenReturn(Optional.of(frameCounts2));
+    monitor.onFragmentResumed(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(1)).log(any(TraceMetric.class), any());
+    monitor.onFragmentPaused(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(2)).log(any(TraceMetric.class), any());
+  }
+
+  @Test
+  public void lifecycleCallbacks_onPausedCalledTwice_logFragmentScreenTraceOnce() {
+    FragmentStateMonitor monitor =
+        new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, recorder);
+    when(recorder.stopFragment(any())).thenReturn(Optional.of(frameCounts1));
+    monitor.onFragmentResumed(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(0)).log(any(TraceMetric.class), any());
+
+    monitor.onFragmentPaused(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(1)).log(any(TraceMetric.class), any());
+
+    monitor.onFragmentPaused(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(1)).log(any(TraceMetric.class), any());
+  }
+
+  @Test
+  public void lifecycleCallbacks_onPausedCalledBeforeOnResume_doesNotLogFragmentScreenTrace() {
+    FragmentStateMonitor monitor =
+        new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, recorder);
+    when(recorder.stopFragment(any())).thenReturn(Optional.of(frameCounts1));
+
+    monitor.onFragmentPaused(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(0)).log(any(TraceMetric.class), any());
+
+    monitor.onFragmentResumed(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(0)).log(any(TraceMetric.class), any());
+  }
+
+  @Test
+  public void
+      lifecycleCallbacks_differentFrameMetricsCapturedByFrameRecorder_logFragmentScreenTraceWithCorrectFrames() {
+    FragmentStateMonitor monitor =
+        new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, recorder);
+    when(recorder.stopFragment(any())).thenReturn(Optional.of(frameCounts1));
+    monitor.onFragmentResumed(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(0)).log(any(TraceMetric.class), any());
+
+    monitor.onFragmentPaused(mockFragmentManager, mockFragment);
+
+    verify(mockTransportManager, times(1))
+        .log(argTraceMetric.capture(), nullable(ApplicationProcessState.class));
+    TraceMetric metric = argTraceMetric.getValue();
+    assertThat((long) metric.getCountersMap().get(CounterNames.FRAMES_TOTAL.toString()))
+        .isEqualTo(frameCounts1.getTotalFrames());
+    assertThat((long) metric.getCountersMap().get(CounterNames.FRAMES_SLOW.toString()))
+        .isEqualTo(frameCounts1.getSlowFrames());
+    assertThat((long) metric.getCountersMap().get(CounterNames.FRAMES_FROZEN.toString()))
+        .isEqualTo(frameCounts1.getFrozenFrames());
+  }
+
+  /** Simulate call order of activity + fragment lifecycle events */
+  @Test
+  public void lifecycleCallbacks_cleansUpMap_duringFragmentTransitions() {
+    doNothing().when(recorder).startFragment(any());
+    when(recorder.stopFragment(any())).thenReturn(Optional.of(frameCounts1));
+    when(mockActivity.getSupportFragmentManager()).thenReturn(mockFragmentManager);
+
+    FragmentStateMonitor fragmentMonitor =
+        new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, recorder);
+    WeakHashMap<Fragment, Trace> fragmentToTraceMap = fragmentMonitor.getFragmentToTraceMap();
+
+    // Activity_A starts
+    fragmentMonitor.onFragmentCreated(mockFragmentManager, mockFragment1, savedInstanceState);
+    fragmentMonitor.onFragmentStarted(mockFragmentManager, mockFragment1);
+    assertThat(fragmentToTraceMap.size()).isEqualTo(0);
+    fragmentMonitor.onFragmentResumed(mockFragmentManager, mockFragment1);
+    assertThat(fragmentToTraceMap.size()).isEqualTo(1);
+    // Activity A is starting Activity B
+    fragmentMonitor.onFragmentPaused(mockFragmentManager, mockFragment1);
+    assertThat(fragmentToTraceMap.size()).isEqualTo(0);
+    fragmentMonitor.onFragmentCreated(mockFragmentManager, mockFragment2, savedInstanceState);
+    fragmentMonitor.onFragmentStarted(mockFragmentManager, mockFragment2);
+    fragmentMonitor.onFragmentResumed(mockFragmentManager, mockFragment2);
+    assertThat(fragmentToTraceMap.size()).isEqualTo(1);
+  }
+
+  @Test
+  public void fragmentTraceCreation_whenFrameMetricsIsAbsent_dropsTrace() {
+    FragmentStateMonitor monitor =
+        new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, recorder);
+    when(recorder.stopFragment(any())).thenReturn(Optional.absent());
+    monitor.onFragmentResumed(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(0)).log(any(TraceMetric.class), any());
+
+    monitor.onFragmentPaused(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(0)).log(any(TraceMetric.class), any());
+  }
+
+  @Test
+  public void fragmentTraceCreation_dropsTrace_whenFragmentNameTooLong() {
+    AppStateMonitor appStateMonitor =
+        spy(new AppStateMonitor(mockTransportManager, clock, configResolver, true));
+    FragmentStateMonitor fragmentMonitor =
+        spy(new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, recorder));
+    when(appStateMonitor.isScreenTraceSupported()).thenReturn(true);
+    doReturn(longFragmentName)
+        .when(fragmentMonitor)
+        .getFragmentScreenTraceName(nullable(Fragment.class));
+    when(recorder.stopFragment(any())).thenReturn(Optional.of(frameCounts1));
+
+    fragmentMonitor.onFragmentResumed(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(0)).log(any(TraceMetric.class), any());
+    fragmentMonitor.onFragmentPaused(mockFragmentManager, mockFragment);
+    verify(mockTransportManager, times(0)).log(any(TraceMetric.class), any());
+  }
+
+  @Test
+  public void fragmentTraceCreation_hasParentFragment_addsParentFragmentAttribute() {
+    FragmentStateMonitor monitor =
+        new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, recorder);
+    when(recorder.stopFragment(any())).thenReturn(Optional.of(frameCounts1));
+    Fragment mockParent = mock(Fragment.class);
+    when(mockFragment.getParentFragment()).thenReturn(mockParent);
+
+    monitor.onFragmentResumed(mockFragmentManager, mockFragment);
+    monitor.onFragmentPaused(mockFragmentManager, mockFragment);
+
+    verify(mockTransportManager, times(1)).log(argTraceMetric.capture(), any());
+    TraceMetric metric = argTraceMetric.getValue();
+    assertThat(metric.getCustomAttributesMap().get(Constants.PARENT_FRAGMENT_ATTRIBUTE_KEY))
+        .isEqualTo("Fragment");
+  }
+
+  @Test
+  public void fragmentTraceCreation_noParentFragment_addsSpecialAttributeValue() {
+    FragmentStateMonitor monitor =
+        new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, recorder);
+    when(recorder.stopFragment(any())).thenReturn(Optional.of(frameCounts1));
+
+    monitor.onFragmentResumed(mockFragmentManager, mockFragment);
+    monitor.onFragmentPaused(mockFragmentManager, mockFragment);
+
+    verify(mockTransportManager, times(1)).log(argTraceMetric.capture(), any());
+    TraceMetric metric = argTraceMetric.getValue();
+    assertThat(metric.getCustomAttributesMap().get(Constants.PARENT_FRAGMENT_ATTRIBUTE_KEY))
+        .isEqualTo(Constants.PARENT_FRAGMENT_ATTRIBUTE_VALUE_NONE);
+  }
+
+  private static Activity createFakeActivity(boolean isHardwareAccelerated) {
+    ActivityController<Activity> fakeActivityController = Robolectric.buildActivity(Activity.class);
+
+    if (isHardwareAccelerated) {
+      fakeActivityController
+          .get()
+          .getWindow()
+          .addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
+    } else {
+      fakeActivityController
+          .get()
+          .getWindow()
+          .clearFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
+    }
+
+    return fakeActivityController.start().get();
+  }
+}
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/application/FrameMetricsRecorderTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/application/FrameMetricsRecorderTest.java
new file mode 100644
index 00000000000..1119720ecb9
--- /dev/null
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/application/FrameMetricsRecorderTest.java
@@ -0,0 +1,258 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.perf.application;
+
+import static androidx.core.app.FrameMetricsAggregator.TOTAL_INDEX;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import android.app.Activity;
+import android.util.SparseIntArray;
+import android.view.WindowManager;
+import androidx.core.app.FrameMetricsAggregator;
+import androidx.fragment.app.Fragment;
+import com.google.firebase.perf.FirebasePerformanceTestBase;
+import com.google.firebase.perf.metrics.FrameMetricsCalculator.PerfFrameMetrics;
+import com.google.firebase.perf.util.Optional;
+import java.util.HashMap;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.android.controller.ActivityController;
+
+/** Unit tests for {@link com.google.firebase.perf.application.FrameMetricsRecorder}. */
+@RunWith(RobolectricTestRunner.class)
+public class FrameMetricsRecorderTest extends FirebasePerformanceTestBase {
+  private final int[][] frameTimesDefault = {{1, 1}, {17, 1}, {800, 1}};
+  private final int[][] frameTimes1 = {{1, 1}, {17, 3}, {800, 1}};
+  private final int[][] frameTimes2 = {{1, 5}, {18, 5}, {800, 4}};
+
+  private Activity activity;
+  private FrameMetricsRecorder recorder;
+
+  @Mock private FrameMetricsAggregator fma;
+
+  @Before
+  public void setUp() {
+    initMocks(this);
+    activity = createFakeActivity(true);
+    recorder = new FrameMetricsRecorder(activity, fma, new HashMap<>());
+    stubFrameMetricsAggregatorData(fma, frameTimesDefault);
+  }
+
+  @Test
+  public void stop_whileNotStarted_returnsEmptyResult() {
+    // nothing ever started
+    Optional<PerfFrameMetrics> result = recorder.stop();
+    assertThat(result.isAvailable()).isFalse();
+    // previous recording ended but no one has not started
+    recorder.start();
+    recorder.stop();
+    Optional<PerfFrameMetrics> result2 = recorder.stop();
+    assertThat(result2.isAvailable()).isFalse();
+  }
+
+  @Test
+  public void startAndStop_calledTwice_ignoresSecondCall() {
+    recorder.start();
+    recorder.start(); // 2nd call is ignored
+    stubFrameMetricsAggregatorData(fma, new int[][] {{1, 1}, {17, 3}, {800, 1}});
+    Optional<PerfFrameMetrics> result1 = recorder.stop();
+    stubFrameMetricsAggregatorData(fma, frameTimes2); // 2nd call is ignored
+    Optional<PerfFrameMetrics> result2 = recorder.stop();
+
+    assertThat(result1.isAvailable()).isTrue();
+    assertThat(result2.isAvailable()).isFalse();
+
+    assertThat(result1.get().getTotalFrames()).isEqualTo(1 + 3 + 1);
+    assertThat(result1.get().getSlowFrames()).isEqualTo(3 + 1);
+    assertThat(result1.get().getFrozenFrames()).isEqualTo(1);
+  }
+
+  @Test
+  public void startAndStop_calledInCorrectOrder_returnsValidResult() {
+    recorder.start();
+    Optional<PerfFrameMetrics> result = recorder.stop();
+    assertThat(result.isAvailable()).isTrue();
+    assertThat(result.get().getTotalFrames()).isEqualTo(3);
+    assertThat(result.get().getSlowFrames()).isEqualTo(2);
+    assertThat(result.get().getFrozenFrames()).isEqualTo(1);
+  }
+
+  @Test
+  public void startAndStopSubTrace_activityRecordingNeverStarted_returnsEmptyResult() {
+    Fragment fragment = new Fragment();
+
+    stubFrameMetricsAggregatorData(fma, frameTimes1);
+    recorder.startFragment(fragment);
+    stubFrameMetricsAggregatorData(fma, frameTimes2);
+    Optional<PerfFrameMetrics> result = recorder.stopFragment(fragment);
+    assertThat(result.isAvailable()).isFalse();
+  }
+
+  @Test
+  public void startAndStopSubTrace_activityRecordingHasEnded_returnsEmptyResult() {
+    Fragment fragment = new Fragment();
+
+    recorder.start();
+    recorder.stop();
+    stubFrameMetricsAggregatorData(fma, frameTimes1);
+    recorder.startFragment(fragment);
+    stubFrameMetricsAggregatorData(fma, frameTimes2);
+    Optional<PerfFrameMetrics> result = recorder.stopFragment(fragment);
+    assertThat(result.isAvailable()).isFalse();
+  }
+
+  /**
+   * This scenario happens only when we hook on to the same instance of fragment twice, which should
+   * never happen
+   */
+  @Test
+  public void startAndStopSubTrace_whenCalledTwice_ignoresSecondCall() {
+    Fragment fragment = new Fragment();
+
+    // comments are in this format: total frames, slow frames, frozen frames
+    recorder.start();
+    stubFrameMetricsAggregatorData(fma, new int[][] {{1, 1}, {17, 1}, {800, 1}}); // 3, 2, 1
+    recorder.startFragment(fragment);
+    stubFrameMetricsAggregatorData(fma, new int[][] {{1, 2}, {17, 3}, {800, 2}}); // ignored
+    recorder.startFragment(fragment); // this call is ignored
+    stubFrameMetricsAggregatorData(fma, new int[][] {{1, 5}, {17, 4}, {800, 5}}); // 14, 9, 5
+    Optional<PerfFrameMetrics> result1 = recorder.stopFragment(fragment);
+    stubFrameMetricsAggregatorData(fma, new int[][] {{1, 6}, {17, 5}, {800, 5}}); // ignored
+    Optional<PerfFrameMetrics> result2 = recorder.stopFragment(fragment); // this call is ignored
+
+    // total = 14 - 3 = 11, slow = 9 - 2 = 7, frozen = 5 - 1 = 4
+    assertThat(result1.get().getTotalFrames()).isEqualTo(14 - 3);
+    assertThat(result1.get().getSlowFrames()).isEqualTo(9 - 2);
+    assertThat(result1.get().getFrozenFrames()).isEqualTo(5 - 1);
+    assertThat(result2.isAvailable()).isFalse();
+  }
+
+  @Test
+  public void stopAndStopSubTrace_whenNoSubTraceWithGivenKeyExists_returnsEmptyResult() {
+    Fragment fragment1 = new Fragment();
+    Fragment fragment2 = new Fragment();
+
+    recorder.start();
+
+    recorder.startFragment(fragment1);
+    Optional<PerfFrameMetrics> result = recorder.stopFragment(fragment2);
+
+    assertThat(result.isAvailable()).isFalse();
+  }
+
+  @Test
+  public void startAndStopSubTrace_duringActivityRecording_returnsValidResult() {
+    Fragment fragment = new Fragment();
+    recorder.start();
+    stubFrameMetricsAggregatorData(fma, frameTimes1);
+    recorder.startFragment(fragment);
+    stubFrameMetricsAggregatorData(fma, frameTimes2);
+    Optional<PerfFrameMetrics> result = recorder.stopFragment(fragment);
+    assertThat(result.isAvailable()).isTrue();
+    // frameTimes2 - frameTimes1
+    assertThat(result.get().getTotalFrames()).isEqualTo(9);
+    assertThat(result.get().getSlowFrames()).isEqualTo(5);
+    assertThat(result.get().getFrozenFrames()).isEqualTo(3);
+  }
+
+  @Test
+  public void startAndStopSubTrace_whenTwoSubTracesOverlap_returnsCorrectResults() {
+    Fragment fragment1 = new Fragment();
+    Fragment fragment2 = new Fragment();
+    recorder.start();
+    // comments are in this format: total frames, slow frames, frozen frames
+    stubFrameMetricsAggregatorData(fma, new int[][] {{1, 1}, {17, 1}, {800, 1}}); // 3, 2, 1
+    recorder.startFragment(fragment1);
+    stubFrameMetricsAggregatorData(fma, new int[][] {{1, 2}, {17, 3}, {800, 2}}); // 7, 5, 2
+    recorder.startFragment(fragment2);
+    stubFrameMetricsAggregatorData(fma, new int[][] {{1, 5}, {17, 4}, {800, 5}}); // 14, 9, 5
+    Optional<PerfFrameMetrics> subTrace1 = recorder.stopFragment(fragment1);
+    stubFrameMetricsAggregatorData(fma, new int[][] {{1, 6}, {17, 5}, {800, 5}}); // 16, 10, 5
+    Optional<PerfFrameMetrics> subTrace2 = recorder.stopFragment(fragment2);
+
+    // 3rd snapshot - 1st snapshot
+    assertThat(subTrace1.get().getTotalFrames()).isEqualTo(14 - 3);
+    assertThat(subTrace1.get().getSlowFrames()).isEqualTo(9 - 2);
+    assertThat(subTrace1.get().getFrozenFrames()).isEqualTo(5 - 1);
+    // 4th snapshot - 2nd snapshot
+    assertThat(subTrace2.get().getTotalFrames()).isEqualTo(16 - 7);
+    assertThat(subTrace2.get().getSlowFrames()).isEqualTo(10 - 5);
+    assertThat(subTrace2.get().getFrozenFrames()).isEqualTo(5 - 2);
+  }
+
+  /**
+   * This case happens when AppStateMonitor calls stop() before all Fragment traces are stopped by
+   * stopFragment(fragment), leaving some dangling fragment traces that are invalid. Even if
+   * activity recording starts again later, then stopFragment(fragment) is called, it should not
+   * return a result which is incorrect.
+   */
+  @Test
+  public void
+      startAndStopSubTrace_notContainedWithinActivityRecordingStartAndStop_returnsEmptyResult() {
+    Fragment fragment = new Fragment();
+    recorder.start();
+    stubFrameMetricsAggregatorData(fma, frameTimesDefault);
+    recorder.startFragment(fragment);
+    stubFrameMetricsAggregatorData(fma, frameTimes1);
+    recorder.stop();
+    recorder.start();
+    stubFrameMetricsAggregatorData(fma, frameTimes2);
+    Optional<PerfFrameMetrics> result = recorder.stopFragment(fragment); // invalid dangling trace
+    assertThat(result.isAvailable()).isFalse();
+  }
+
+  private static Activity createFakeActivity(boolean isHardwareAccelerated) {
+    ActivityController<Activity> fakeActivityController = Robolectric.buildActivity(Activity.class);
+
+    if (isHardwareAccelerated) {
+      fakeActivityController
+          .get()
+          .getWindow()
+          .addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
+    } else {
+      fakeActivityController
+          .get()
+          .getWindow()
+          .clearFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
+    }
+
+    return fakeActivityController.start().get();
+  }
+
+  private static SparseIntArray createFrameMetricsAggregatorData(int[][] frameTimes) {
+    SparseIntArray sparseIntArray = new SparseIntArray();
+    for (int[] bucket : frameTimes) {
+      sparseIntArray.append(bucket[0], bucket[1]);
+    }
+    return sparseIntArray;
+  }
+
+  private static void stubFrameMetricsAggregatorData(
+      FrameMetricsAggregator mockFMA, int[][] frameTimes) {
+    SparseIntArray totalIndexValue = createFrameMetricsAggregatorData(frameTimes);
+    SparseIntArray[] mMetrics = new SparseIntArray[9];
+    mMetrics[TOTAL_INDEX] = totalIndexValue;
+    doReturn(mMetrics).when(mockFMA).getMetrics();
+    doReturn(mMetrics).when(mockFMA).remove(any());
+    doReturn(mMetrics).when(mockFMA).reset();
+  }
+}
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigResolverTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigResolverTest.java
index 068c5382cd4..0f9bee9c880 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigResolverTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigResolverTest.java
@@ -25,7 +25,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
-import static org.robolectric.util.ReflectionHelpers.setStaticField;
 
 import android.os.Bundle;
 import androidx.test.core.app.ApplicationProvider;
@@ -33,12 +32,13 @@
 import com.google.firebase.perf.FirebasePerformanceTestBase;
 import com.google.firebase.perf.util.ImmutableBundle;
 import com.google.firebase.perf.util.Optional;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.util.ReflectionHelpers;
 
 /** Unit tests for {@link ConfigResolver}. */
 @RunWith(RobolectricTestRunner.class)
@@ -126,6 +126,11 @@ public class ConfigResolverTest extends FirebasePerformanceTestBase {
   private static final String SESSIONS_MAX_DURATION_MIN_CACHE_KEY =
       "com.google.firebase.perf.SessionsMaxDurationMinutes";
 
+  // Fragment trace sampling rate flags
+  private static final String FRAGMENT_SAMPLING_RATE_FRC_KEY = "fpr_vc_fragment_sampling_rate";
+  private static final String FRAGMENT_SAMPLING_RATE_CACHE_KEY =
+      "com.google.firebase.perf.FragmentSamplingRate";
+
   private ConfigResolver testConfigResolver;
 
   @Mock private RemoteConfigManager mockRemoteConfigManager;
@@ -164,23 +169,6 @@ public void getIsServiceCollectionEnabled_sdkDisabledVersionAndSdkEnabled_return
     assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isTrue();
   }
 
-  @Test
-  public void getIsServiceCollectionEnabled_sdkDisabledVersionIsRed_returnsFalse() {
-    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
-    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
-        .thenReturn(Optional.of(true));
-
-    // Disable SDK version.
-    setStaticField(
-        BuildConfig.class,
-        /* fieldName= */ "FIREPERF_VERSION_NAME",
-        /* fieldNewValue= */ "1.0.0.111111111");
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.of("1.0.0.111111111"));
-
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isFalse();
-  }
-
   @Test
   public void getIsServiceCollectionEnabled_sdkDisabled_returnsFalse() {
     when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
@@ -192,23 +180,6 @@ public void getIsServiceCollectionEnabled_sdkDisabled_returnsFalse() {
     assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isFalse();
   }
 
-  @Test
-  public void getIsServiceCollectionEnabled_sdkDisabledVersionAndSdkDisabled_returnsFalse() {
-    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
-    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
-        .thenReturn(Optional.of(false));
-
-    // Disable SDK version.
-    setStaticField(
-        BuildConfig.class,
-        /* fieldName= */ "FIREPERF_VERSION_NAME",
-        /* fieldNewValue= */ "1.0.0.111111111");
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.of("1.0.0.111111111"));
-
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isFalse();
-  }
-
   @Test
   public void getIsServiceCollectionEnabled_lastFetchSucceededFromFrc_returnFrcValue() {
     // As long as SDK version is not disabled, it depends on SDK enabled flag only for
@@ -288,80 +259,6 @@ public void getIsServiceCollectionEnabled_sdkEnabledFlagNoFrc_returnDefaultValue
     verify(mockDeviceCacheManager, never()).setValue(any(), anyBoolean());
   }
 
-  @Test
-  public void
-      getIsServiceCollectionEnabled_sdkDisabledVersionFlagFetchSucceededFromFrc_returnFrcValue() {
-    // As long as SDK enabled flag is enabled, it depends on SDK disabled version only for
-    // enabled/disabled.
-    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
-    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
-        .thenReturn(Optional.of(true));
-
-    // Mock that current Fireperf SDK version is disabled.
-    setStaticField(
-        BuildConfig.class,
-        /* fieldName= */ "FIREPERF_VERSION_NAME",
-        /* fieldNewValue= */ "1.0.0.111111111");
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.of("1.0.0.111111111"));
-
-    // Assert that final result is false, and FRC value is cached.
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isFalse();
-    verify(mockDeviceCacheManager, times(1))
-        .setValue(eq(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_CACHE_KEY), eq("1.0.0.111111111"));
-  }
-
-  @Test
-  public void
-      getIsServiceCollectionEnabled_sdkDisabledVersionFlagFetchFailedFromFrc_returnFrcValue() {
-    // As long as SDK enabled flag is enabled, it depends on SDK disabled version only for
-    // enabled/disabled.
-    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
-        .thenReturn(Optional.absent());
-    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_CACHE_KEY))
-        .thenReturn(Optional.absent());
-
-    // Mock that Fireperf SDK version is disabled by FRC, but fetch status is failure.
-    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(true);
-    setStaticField(
-        BuildConfig.class,
-        /* fieldName= */ "FIREPERF_VERSION_NAME",
-        /* fieldNewValue= */ "1.0.0.111111111");
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.of("1.0.0.111111111"));
-
-    // Assert that final result is false. cache FRC value because it is most recent available value.
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isFalse();
-    verify(mockDeviceCacheManager, times(1))
-        .setValue(eq(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_CACHE_KEY), eq("1.0.0.111111111"));
-  }
-
-  @Test
-  public void getIsServiceCollectionEnabled_sdkDisabledVersionFlagNoFrc_returnCacheValue() {
-    // As long as SDK enabled flag is enabled, it depends on SDK disabled version only for
-    // enabled/disabled.
-    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
-        .thenReturn(Optional.absent());
-    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_CACHE_KEY))
-        .thenReturn(Optional.absent());
-
-    // Mock that Fireperf SDK version is not set by FRC.
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.absent());
-
-    // Mock device caching value that includes current SDK version.
-    setStaticField(
-        BuildConfig.class,
-        /* fieldName= */ "FIREPERF_VERSION_NAME",
-        /* fieldNewValue= */ "1.0.0.111111111");
-    when(mockDeviceCacheManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_CACHE_KEY))
-        .thenReturn(Optional.of("1.0.0.111111111"));
-
-    // Assert that final result is false, and no value is cached.
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isFalse();
-    verify(mockDeviceCacheManager, never()).setValue(any(), anyString());
-  }
-
   @Test
   public void getIsServiceCollectionEnabled_sdkDisabledVersionFlagNoFrc_returnDefaultValue() {
     // As long as SDK enabled flag is enabled, it depends on SDK disabled version only for
@@ -386,110 +283,79 @@ public void getIsServiceCollectionEnabled_sdkDisabledVersionFlagNoFrc_returnDefa
 
   @Test
   public void
-      getIsServiceCollectionEnabled_frcFetchSucceedAndFprFlagEnabled_disabledVersionsAreHonored() {
-    // As long as SDK enabled flag is enabled, it depends on SDK disabled version only for
-    // enabled/disabled.
-    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+      getIsPerformanceCollectionConfigValueAvailable_noDeviceCacheNoRemoteConfig_returnsFalse() {
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
         .thenReturn(Optional.absent());
-    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_CACHE_KEY))
-        .thenReturn(Optional.of(true));
     when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
-
-    setStaticField(
-        BuildConfig.class,
-        /* fieldName= */ "FIREPERF_VERSION_NAME",
-        /* fieldNewValue= */ "1.0.0.111111111");
-
-    // Handling for empty string.
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.of(""));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isTrue();
-
-    // Handling for random space in empty string.
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.of("   "));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isTrue();
-
-    // Handling for empty string but ";" separated.
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.of("  ;   "));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isTrue();
-
-    // Handling for exact one version.
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.of(" 1.0.0.111111111"));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isFalse();
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.of("1.2.0.222222222"));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isTrue();
-
-    // Handling for multiple ";" separated versions with no space between.
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.of("1.2.0.222222222;1.0.0.111111111;1.3.0.333333333"));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isFalse();
-
-    // Handling for multiple ";" separated versions with random space between.
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.of("1.2.0.222222222 ;  1.0.0.111111111; 1.3.0.333333333"));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isFalse();
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
-        .thenReturn(Optional.of("; 1.2.0.222222222;   1.3.0.333333333"));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isTrue();
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.absent());
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isFalse();
   }
 
   @Test
   public void
-      getIsServiceCollectionEnabled_noFrcForSdkDisabledVersioned_disabledVersionsOnCacheAreHonored() {
-    // As long as SDK enabled flag is enabled, it depends on SDK disabled version only for
-    // enabled/disabled.
-    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
-        .thenReturn(Optional.absent());
-    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_CACHE_KEY))
+      getIsPerformanceCollectionConfigValueAvailable_noDeviceCacheHasRemoteConfigValueFalse_returnsTrue() {
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
         .thenReturn(Optional.absent());
     when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.of(false));
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isTrue();
+  }
 
-    when(mockRemoteConfigManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_FRC_KEY))
+  @Test
+  public void
+      getIsPerformanceCollectionConfigValueAvailable_HasDeviceCacheNoRemoteConfigValue_returnsTrue() {
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
+        .thenReturn(Optional.of(false));
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
         .thenReturn(Optional.absent());
-    setStaticField(
-        BuildConfig.class,
-        /* fieldName= */ "FIREPERF_VERSION_NAME",
-        /* fieldNewValue= */ "1.0.0.111111111");
-
-    // Handling for empty string.
-    when(mockDeviceCacheManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_CACHE_KEY))
-        .thenReturn(Optional.of(""));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isTrue();
-
-    // Handling for random space in empty string.
-    when(mockDeviceCacheManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_CACHE_KEY))
-        .thenReturn(Optional.of("   "));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isTrue();
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isTrue();
+  }
 
-    // Handling for empty string but ";" separated.
-    when(mockDeviceCacheManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_CACHE_KEY))
-        .thenReturn(Optional.of("  ;   "));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isTrue();
+  @Test
+  public void
+      getIsPerformanceCollectionConfigValueAvailable_HasDeviceCacheFalseHasRemoteConfigValueFalse_returnsTrue() {
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
+        .thenReturn(Optional.of(false));
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.of(false));
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isTrue();
+  }
 
-    // Handling for exact one version.
-    when(mockDeviceCacheManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_CACHE_KEY))
-        .thenReturn(Optional.of(" 1.0.0.111111111"));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isFalse();
-    when(mockDeviceCacheManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_CACHE_KEY))
-        .thenReturn(Optional.of("1.2.0.222222222"));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isTrue();
+  @Test
+  public void
+      getIsPerformanceCollectionConfigValueAvailable_noDeviceCacheHasRemoteConfigValueTrue_returnsTrue() {
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
+        .thenReturn(Optional.of(false));
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.of(true));
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isTrue();
+  }
 
-    // Handling for multiple ";" separated versions with no space between.
-    when(mockDeviceCacheManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_CACHE_KEY))
-        .thenReturn(Optional.of("1.2.0.222222222;1.0.0.111111111;1.3.0.333333333"));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isFalse();
+  @Test
+  public void
+      getIsPerformanceCollectionConfigValueAvailable_hasDeviceCacheHasRemoteConfigValueFalse_returnsTrue() {
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
+        .thenReturn(Optional.of(true));
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.of(false));
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isTrue();
+  }
 
-    // Handling for multiple ";" separated versions with random space between.
-    when(mockDeviceCacheManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_CACHE_KEY))
-        .thenReturn(Optional.of("1.2.0.222222222 ;  1.0.0.111111111; 1.3.0.333333333"));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isFalse();
-    when(mockDeviceCacheManager.getString(FIREBASE_PERFORMANCE_DISABLED_VERSIONS_CACHE_KEY))
-        .thenReturn(Optional.of("; 1.2.0.222222222;   1.3.0.333333333"));
-    assertThat(testConfigResolver.getIsServiceCollectionEnabled()).isTrue();
+  @Test
+  public void
+      getIsPerformanceCollectionConfigValueAvailable_hasDeviceCacheHasRemoteConfig_returnsTrue() {
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
+        .thenReturn(Optional.of(true));
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.of(true));
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isTrue();
   }
 
   @Test
@@ -642,6 +508,18 @@ public void getSessionsCpuCaptureFrequencyForegroundMs_validMetadata_notSaveMeta
     assertThat(testConfigResolver.getSessionsCpuCaptureFrequencyForegroundMs()).isEqualTo(100L);
   }
 
+  @Test
+  public void
+      getSessionsCpuCaptureFrequencyForegroundMs_remoteConfigFetchFailed_returnDefaultRCValue() {
+    when(mockRemoteConfigManager.getLong(SESSIONS_CPU_CAPTURE_FREQUENCY_FG_MS_FRC_KEY))
+        .thenReturn(Optional.absent());
+    when(mockDeviceCacheManager.getLong(SESSIONS_CPU_CAPTURE_FREQUENCY_FG_MS_CACHE_KEY))
+        .thenReturn(Optional.absent());
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(true);
+
+    assertThat(testConfigResolver.getSessionsCpuCaptureFrequencyForegroundMs()).isEqualTo(300L);
+  }
+
   @Test
   public void
       getSessionsCpuCaptureFrequencyForegroundMs_invalidAndroidMetadataBundle_returnRemoteConfigValue() {
@@ -1046,6 +924,18 @@ public void getSessionsMemoryCaptureFrequencyForegroundMs_validMetadata_notSaveM
     assertThat(testConfigResolver.getSessionsMemoryCaptureFrequencyForegroundMs()).isEqualTo(100L);
   }
 
+  @Test
+  public void
+      getSessionsMemoryCaptureFrequencyForegroundMs_remoteConfigFetchFailed_returnDefaultRCValue() {
+    when(mockRemoteConfigManager.getLong(SESSIONS_MEMORY_CAPTURE_FREQUENCY_FG_MS_FRC_KEY))
+        .thenReturn(Optional.absent());
+    when(mockDeviceCacheManager.getLong(SESSIONS_MEMORY_CAPTURE_FREQUENCY_FG_MS_CACHE_KEY))
+        .thenReturn(Optional.absent());
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(true);
+
+    assertThat(testConfigResolver.getSessionsMemoryCaptureFrequencyForegroundMs()).isEqualTo(300L);
+  }
+
   @Test
   public void
       getSessionsMemoryCaptureFrequencyForegroundMs_invalidAndroidMetadataBundle_returnRemoteConfigValue() {
@@ -1640,358 +1530,390 @@ public void getSessionsMaxDurationMinutes_invalidCache_returnDefaultValue() {
 
   @Test
   public void getTraceSamplingRate_noRemoteConfig_returnsDefault() {
-    when(mockRemoteConfigManager.getFloat(TRACE_SAMPLING_RATE_FRC_KEY))
+    when(mockRemoteConfigManager.getDouble(TRACE_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.absent());
+    when(mockDeviceCacheManager.getDouble(TRACE_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(1.00));
+
+    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(1.00);
+  }
+
+  @Test
+  public void getTraceSamplingRate_remoteConfigFetchFailed_returnsRCFailureDefault() {
+    when(mockRemoteConfigManager.getDouble(TRACE_SAMPLING_RATE_FRC_KEY))
         .thenReturn(Optional.absent());
-    when(mockDeviceCacheManager.getFloat(TRACE_SAMPLING_RATE_CACHE_KEY))
-        .thenReturn(Optional.of(1.00f));
+    when(mockDeviceCacheManager.getDouble(TRACE_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.absent());
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(true);
 
-    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(1.00f);
+    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(1.00 / 1000);
   }
 
   @Test
   public void getTraceSamplingRate_noRemoteConfigHasCache_returnsCache() {
-    when(mockRemoteConfigManager.getFloat(TRACE_SAMPLING_RATE_FRC_KEY))
+    when(mockRemoteConfigManager.getDouble(TRACE_SAMPLING_RATE_FRC_KEY))
         .thenReturn(Optional.absent());
-    when(mockDeviceCacheManager.getFloat(TRACE_SAMPLING_RATE_CACHE_KEY))
-        .thenReturn(Optional.of(0.01f));
+    when(mockDeviceCacheManager.getDouble(TRACE_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(0.01));
 
-    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(0.01f);
+    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(0.01);
   }
 
   @Test
   public void getTraceSamplingRate_validRemoteConfig_returnsRemoteConfigValue() {
-    when(mockRemoteConfigManager.getFloat(TRACE_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(0.01f));
-    when(mockDeviceCacheManager.getFloat(TRACE_SAMPLING_RATE_CACHE_KEY))
-        .thenReturn(Optional.of(0.02f));
+    when(mockRemoteConfigManager.getDouble(TRACE_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.01));
+    when(mockDeviceCacheManager.getDouble(TRACE_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(0.02));
 
-    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(0.01f);
-    verify(mockDeviceCacheManager, times(1)).setValue(eq(TRACE_SAMPLING_RATE_CACHE_KEY), eq(0.01f));
+    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(0.01);
+    verify(mockDeviceCacheManager, times(1)).setValue(eq(TRACE_SAMPLING_RATE_CACHE_KEY), eq(0.01));
   }
 
   @Test
   public void getTraceSamplingRate_remoteConfigValueTooHigh_returnsDefaultValue() {
-    when(mockRemoteConfigManager.getFloat(TRACE_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(1.01f));
-    when(mockDeviceCacheManager.getFloat(TRACE_SAMPLING_RATE_CACHE_KEY))
+    when(mockRemoteConfigManager.getDouble(TRACE_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(1.01));
+    when(mockDeviceCacheManager.getDouble(TRACE_SAMPLING_RATE_CACHE_KEY))
         .thenReturn(Optional.absent());
 
-    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(1.00f);
+    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(1.00);
     verify(mockDeviceCacheManager, never()).setValue(anyString(), anyLong());
   }
 
   @Test
   public void getTraceSamplingRate_remoteConfigValueTooLow_returnsDefaultValue() {
-    when(mockRemoteConfigManager.getFloat(TRACE_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(-0.01f));
-    when(mockDeviceCacheManager.getFloat(TRACE_SAMPLING_RATE_CACHE_KEY))
+    when(mockRemoteConfigManager.getDouble(TRACE_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(-0.01));
+    when(mockDeviceCacheManager.getDouble(TRACE_SAMPLING_RATE_CACHE_KEY))
         .thenReturn(Optional.absent());
 
-    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(1.00f);
+    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(1.00);
     verify(mockDeviceCacheManager, never()).setValue(anyString(), anyLong());
   }
 
   @Test
   public void getTraceSamplingRate_10digitRemoteConfig_returnsRemoteConfigValue() {
-    when(mockRemoteConfigManager.getFloat(TRACE_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(0.0000000001f));
+    when(mockRemoteConfigManager.getDouble(TRACE_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.0000000001));
 
-    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(0.0000000001f);
+    assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(0.0000000001);
   }
 
   @Test
   public void getNetworkRequestSamplingRate_noRemoteConfig_returnsDefault() {
-    when(mockRemoteConfigManager.getFloat(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
+    when(mockRemoteConfigManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
         .thenReturn(Optional.absent());
-    when(mockDeviceCacheManager.getFloat(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY))
+    when(mockDeviceCacheManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY))
         .thenReturn(Optional.absent());
 
-    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(1.00f);
+    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(1.00);
+  }
+
+  @Test
+  public void getNetworkRequestSamplingRate_remoteConfigFetchFailed_returnsRCFailureDefault() {
+    when(mockRemoteConfigManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.absent());
+    when(mockDeviceCacheManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.absent());
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(true);
+
+    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(1.00 / 1000);
   }
 
   @Test
   public void getNetworkRequestSamplingRate_noRemoteConfigHasCache_returnsCache() {
-    when(mockRemoteConfigManager.getFloat(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
+    when(mockRemoteConfigManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
         .thenReturn(Optional.absent());
-    when(mockDeviceCacheManager.getFloat(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY))
-        .thenReturn(Optional.of(0.01f));
+    when(mockDeviceCacheManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(0.01));
 
-    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(0.01f);
+    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(0.01);
   }
 
   @Test
   public void getNetworkRequestSamplingRate_validRemoteConfig_returnsRemoteConfigValue() {
-    when(mockRemoteConfigManager.getFloat(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(0.01f));
-    when(mockDeviceCacheManager.getFloat(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY))
+    when(mockRemoteConfigManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.01));
+    when(mockDeviceCacheManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY))
         .thenReturn(Optional.absent());
 
-    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(0.01f);
+    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(0.01);
     verify(mockDeviceCacheManager, times(1))
-        .setValue(eq(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY), eq(0.01f));
+        .setValue(eq(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY), eq(0.01));
   }
 
   @Test
   public void getNetworkRequestSamplingRate_remoteConfigValueTooHigh_returnsDefaultValue() {
-    when(mockRemoteConfigManager.getFloat(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(1.01f));
-    when(mockDeviceCacheManager.getFloat(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY))
+    when(mockRemoteConfigManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(1.01));
+    when(mockDeviceCacheManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY))
         .thenReturn(Optional.absent());
 
-    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(1.00f);
+    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(1.00);
     verify(mockDeviceCacheManager, never()).setValue(anyString(), anyLong());
   }
 
   @Test
   public void getNetworkRequestSamplingRate_remoteConfigValueTooLow_returnsDefaultValue() {
-    when(mockDeviceCacheManager.getFloat(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY))
+    when(mockDeviceCacheManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_CACHE_KEY))
         .thenReturn(Optional.absent());
-    when(mockRemoteConfigManager.getFloat(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(-0.01f));
+    when(mockRemoteConfigManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(-0.01));
 
-    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(1.00f);
+    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(1.00);
     verify(mockDeviceCacheManager, never()).setValue(anyString(), anyLong());
   }
 
   @Test
   public void getNetworkRequestSamplingRate_10digitRemoteConfig_returnsRemoteConfigValue() {
-    when(mockRemoteConfigManager.getFloat(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(0.0000000001f));
+    when(mockRemoteConfigManager.getDouble(NETWORK_REQUEST_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.0000000001));
 
-    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(0.0000000001f);
+    assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(0.0000000001);
   }
 
   @Test
   public void getSessionsSamplingRate_validMetadata_returnsMetadata() {
     // #1 pass: Validate that method returns Remote Config Value when there is no metadata value.
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(0.01f));
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.01));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01);
 
     // #2 pass: Validate that method returns Metadata value which takes higher precedence.
     Bundle bundle = new Bundle();
-    bundle.putFloat("sessions_sampling_percentage", 20.0f);
+    bundle.putDouble("sessions_sampling_percentage", 20.0);
     testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.2f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.2);
   }
 
   @Test
   public void getSessionsSamplingRate_validMetadata_notSaveMetadataInCache() {
     Bundle bundle = new Bundle();
-    bundle.putFloat("sessions_sampling_percentage", 20.0f);
+    bundle.putDouble("sessions_sampling_percentage", 20.0);
     testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.2f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.2);
 
     verify(mockDeviceCacheManager, never()).setValue(any(), any());
   }
 
   @Test
   public void getSessionsSamplingRate_invalidAndroidMetadataBundle_returnDefaultValue() {
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
         .thenReturn(Optional.absent());
-    when(mockDeviceCacheManager.getFloat(SESSION_SAMPLING_RATE_CACHE_KEY))
+    when(mockDeviceCacheManager.getDouble(SESSION_SAMPLING_RATE_CACHE_KEY))
         .thenReturn(Optional.absent());
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01);
 
     // Case #1: Android Metadata bundle value is too high.
     Bundle bundle = new Bundle();
-    bundle.putFloat("sessions_sampling_percentage", 200.00f);
+    bundle.putDouble("sessions_sampling_percentage", 200.00);
     testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01);
 
     // Case #2: Android Metadata bundle value is too low.
     bundle = new Bundle();
-    bundle.putFloat("sessions_sampling_percentage", -1.00f);
+    bundle.putDouble("sessions_sampling_percentage", -1.00);
     testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01);
   }
 
   @Test
   public void getSessionsSamplingRate_invalidAndroidMetadataBundle_returnRemoteConfigValue() {
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(0.25f));
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.25));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.25f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.25);
 
     // Case #1: Android Metadata bundle value is too high.
     Bundle bundle = new Bundle();
-    bundle.putFloat("sessions_sampling_percentage", 200.00f);
+    bundle.putDouble("sessions_sampling_percentage", 200.00);
     testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.25f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.25);
 
     // Case #2: Android Metadata bundle value is too low.
     bundle = new Bundle();
-    bundle.putFloat("sessions_sampling_percentage", -1.00f);
+    bundle.putDouble("sessions_sampling_percentage", -1.00);
     testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.25f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.25);
   }
 
   @Test
   public void getSessionsSamplingRate_invalidMetadataBundle_returnCacheValue() {
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
         .thenReturn(Optional.absent());
-    when(mockDeviceCacheManager.getFloat(SESSION_SAMPLING_RATE_CACHE_KEY))
-        .thenReturn(Optional.of(1.0f));
+    when(mockDeviceCacheManager.getDouble(SESSION_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(1.0));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(1.0f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(1.0);
 
     // Case #1: Android Metadata bundle value is too high.
     Bundle bundle = new Bundle();
-    bundle.putFloat("sessions_sampling_percentage", 200.00f);
+    bundle.putDouble("sessions_sampling_percentage", 200.00);
     testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(1.0f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(1.0);
 
     // Case #2: Android Metadata bundle value is too low.
     bundle = new Bundle();
-    bundle.putFloat("sessions_sampling_percentage", -1.00f);
+    bundle.putDouble("sessions_sampling_percentage", -1.00);
     testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(1.0f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(1.0);
   }
 
   @Test
   public void getSessionsSamplingRate_validRemoteConfig_returnRemoteConfigValue() {
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(0.25f));
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.25));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.25f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.25);
     verify(mockDeviceCacheManager, times(1))
-        .setValue(eq(SESSION_SAMPLING_RATE_CACHE_KEY), eq(0.25f));
+        .setValue(eq(SESSION_SAMPLING_RATE_CACHE_KEY), eq(0.25));
 
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(0.0f));
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.0));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.0f);
-    verify(mockDeviceCacheManager, times(1))
-        .setValue(eq(SESSION_SAMPLING_RATE_CACHE_KEY), eq(0.0f));
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.0);
+    verify(mockDeviceCacheManager, times(1)).setValue(eq(SESSION_SAMPLING_RATE_CACHE_KEY), eq(0.0));
 
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(0.00005f));
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.00005));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.00005f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.00005);
     verify(mockDeviceCacheManager, times(1))
-        .setValue(eq(SESSION_SAMPLING_RATE_CACHE_KEY), eq(0.00005f));
+        .setValue(eq(SESSION_SAMPLING_RATE_CACHE_KEY), eq(0.00005));
 
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(0.0000000001f));
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.0000000001));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.0000000001f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.0000000001);
     verify(mockDeviceCacheManager, times(1))
-        .setValue(eq(SESSION_SAMPLING_RATE_CACHE_KEY), eq(0.0000000001f));
+        .setValue(eq(SESSION_SAMPLING_RATE_CACHE_KEY), eq(0.0000000001));
   }
 
   @Test
   public void getSessionsSamplingRate_invalidRemoteConfig_returnDefaultValue() {
     // Mock behavior that device cache doesn't have session sampling rate value.
-    when(mockDeviceCacheManager.getFloat(SESSION_SAMPLING_RATE_CACHE_KEY))
+    when(mockDeviceCacheManager.getDouble(SESSION_SAMPLING_RATE_CACHE_KEY))
         .thenReturn(Optional.absent());
 
     // Case #1: Firebase Remote Config value is too high.
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(1.01f));
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(1.01));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01);
     verify(mockDeviceCacheManager, never()).setValue(any(), any());
 
     // Case #2: Firebase Remote Config value is too low.
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(-0.1f));
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(-0.1));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01);
     verify(mockDeviceCacheManager, never()).setValue(any(), any());
   }
 
   @Test
   public void getSessionsSamplingRate_invalidRemoteConfig_returnCacheValue() {
     // Mock behavior that device cache doesn't have session sampling rate value.
-    when(mockDeviceCacheManager.getFloat(SESSION_SAMPLING_RATE_CACHE_KEY))
-        .thenReturn(Optional.of(0.25f));
+    when(mockDeviceCacheManager.getDouble(SESSION_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(0.25));
 
     // Case #1: Firebase Remote Config value is too high.
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(1.01f));
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(1.01));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.25f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.25);
     verify(mockDeviceCacheManager, never()).setValue(any(), any());
 
     // Case #2: Firebase Remote Config value is too low.
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(-0.1f));
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(-0.1));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.25f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.25);
     verify(mockDeviceCacheManager, never()).setValue(any(), any());
   }
 
+  @Test
+  public void getSessionsSamplingRate_remoteConfigFetchFailed_returnsRCFailureDefault() {
+    when(mockDeviceCacheManager.getDouble(SESSION_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.absent());
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.absent());
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(true);
+
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01 / 1000);
+  }
+
   @Test
   public void getSessionsSamplingRate_validCache_returnCacheValue() {
-    when(mockDeviceCacheManager.getFloat(SESSION_SAMPLING_RATE_CACHE_KEY))
-        .thenReturn(Optional.of(1.0f));
+    when(mockDeviceCacheManager.getDouble(SESSION_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(1.0));
 
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
         .thenReturn(Optional.absent());
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(1.0f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(1.0);
   }
 
   @Test
   public void getSessionsSamplingRate_invalidCache_returnDefaultValue() {
     // Mock behavior that remote config doesn't have session sampling rate value.
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
         .thenReturn(Optional.absent());
 
     // Case #1: Device Cache value is too high.
-    when(mockDeviceCacheManager.getFloat(SESSION_SAMPLING_RATE_CACHE_KEY))
-        .thenReturn(Optional.of(10.0f));
+    when(mockDeviceCacheManager.getDouble(SESSION_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(10.0));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01);
 
     // Case #2: Device Cache value is too low.
-    when(mockDeviceCacheManager.getFloat(SESSION_SAMPLING_RATE_CACHE_KEY))
-        .thenReturn(Optional.of(-1.0f));
+    when(mockDeviceCacheManager.getDouble(SESSION_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(-1.0));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01);
   }
 
   @Test
   public void
       getSessionsSamplingRate_metadataAndRemoteConfigAndCacheAreSet_metadataHasHighestConfigPrecedence() {
     // Set cache value.
-    when(mockDeviceCacheManager.getFloat(SESSION_SAMPLING_RATE_CACHE_KEY))
-        .thenReturn(Optional.of(0.2f));
+    when(mockDeviceCacheManager.getDouble(SESSION_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(0.2));
 
     // Set remote config value.
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(0.3f));
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.3));
 
     // Set Android Manifest value.
     Bundle bundle = new Bundle();
-    bundle.putFloat("sessions_sampling_percentage", 4.0f);
+    bundle.putDouble("sessions_sampling_percentage", 4.0);
     testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.04f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.04);
   }
 
   @Test
   public void
       getSessionsSamplingRate_remoteConfigAndCacheAreSet_remoteConfigHasHighestConfigPrecedence() {
     // Set cache value.
-    when(mockDeviceCacheManager.getFloat(SESSION_SAMPLING_RATE_CACHE_KEY))
-        .thenReturn(Optional.of(0.2f));
+    when(mockDeviceCacheManager.getDouble(SESSION_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(0.2));
 
     // Set remote config value.
-    when(mockRemoteConfigManager.getFloat(SESSION_SAMPLING_RATE_FRC_KEY))
-        .thenReturn(Optional.of(0.3f));
+    when(mockRemoteConfigManager.getDouble(SESSION_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.3));
 
-    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.3f);
+    assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.3);
   }
 
   @Test
@@ -2290,70 +2212,6 @@ public void getRateLimitSec_invalidCache_returnsDefault() {
     verify(mockDeviceCacheManager, never()).setValue(anyString(), anyLong());
   }
 
-  @Test
-  public void getAndCacheLogSourceName_noRemoteConfigOrCacheValue_returnsDefaultButNotSaveCache() {
-    ReflectionHelpers.setStaticField(BuildConfig.class, "TRANSPORT_LOG_SRC", "FIREPERF");
-    ReflectionHelpers.setStaticField(
-        BuildConfig.class, "ENFORCE_DEFAULT_LOG_SRC", Boolean.valueOf(false));
-
-    when(mockRemoteConfigManager.getRemoteConfigValueOrDefault("fpr_log_source", -1L))
-        .thenReturn(-1L);
-    when(mockDeviceCacheManager.getString("com.google.firebase.perf.LogSourceName"))
-        .thenReturn(Optional.of("FIREPERF"));
-
-    assertThat(testConfigResolver.getAndCacheLogSourceName()).isEqualTo("FIREPERF");
-    // Default value is saved at device cache because it can always read from build constant.
-    verify(mockDeviceCacheManager, never())
-        .setValue(eq("com.google.firebase.perf.LogSourceName"), anyString());
-  }
-
-  @Test
-  public void getAndCacheLogSourceName_notNullCacheValue_returnsCache() {
-    ReflectionHelpers.setStaticField(BuildConfig.class, "TRANSPORT_LOG_SRC", "FIREPERF");
-    ReflectionHelpers.setStaticField(
-        BuildConfig.class, "ENFORCE_DEFAULT_LOG_SRC", Boolean.valueOf(false));
-
-    when(mockRemoteConfigManager.getRemoteConfigValueOrDefault("fpr_log_source", -1L))
-        .thenReturn(-1L);
-    when(mockDeviceCacheManager.getString("com.google.firebase.perf.LogSourceName"))
-        .thenReturn(Optional.of("FIREPERF_INTERNAL_LOW"));
-
-    assertThat(testConfigResolver.getAndCacheLogSourceName()).isEqualTo("FIREPERF_INTERNAL_LOW");
-    verify(mockDeviceCacheManager, never())
-        .setValue(eq("com.google.firebase.perf.LogSourceName"), anyString());
-  }
-
-  @Test
-  public void getAndCacheLogSourceName_nullCacheValue_returnsDefault() {
-    ReflectionHelpers.setStaticField(BuildConfig.class, "TRANSPORT_LOG_SRC", "FIREPERF");
-    ReflectionHelpers.setStaticField(
-        BuildConfig.class, "ENFORCE_DEFAULT_LOG_SRC", Boolean.valueOf(false));
-
-    when(mockRemoteConfigManager.getRemoteConfigValueOrDefault("fpr_log_source", -1L))
-        .thenReturn(-1L);
-    when(mockDeviceCacheManager.getString("com.google.firebase.perf.LogSourceName"))
-        .thenReturn(Optional.absent());
-
-    assertThat(testConfigResolver.getAndCacheLogSourceName()).isEqualTo("FIREPERF");
-    verify(mockDeviceCacheManager, never())
-        .setValue(eq("com.google.firebase.perf.LogSourceName"), anyString());
-  }
-
-  @Test
-  public void getAndCacheLogSourceName_defaultValueIsNotFireperf_returnsNewDefault() {
-    ReflectionHelpers.setStaticField(
-        BuildConfig.class, "TRANSPORT_LOG_SRC", "FIREPERF_INTERNAL_HIGH");
-    ReflectionHelpers.setStaticField(
-        BuildConfig.class, "ENFORCE_DEFAULT_LOG_SRC", Boolean.valueOf(false));
-
-    when(mockRemoteConfigManager.getRemoteConfigValueOrDefault("fpr_log_source", -1L))
-        .thenReturn(-1L);
-    when(mockDeviceCacheManager.getString("com.google.firebase.perf.LogSourceName"))
-        .thenReturn(Optional.of("FIREPERF_INTERNAL_HIGH"));
-
-    assertThat(testConfigResolver.getAndCacheLogSourceName()).isEqualTo("FIREPERF_INTERNAL_HIGH");
-  }
-
   // TODO: Commenting out the Flaky test.
   //  This test is failing sometimes because when ":test" is run ReflectionHelpers is not able to
   //  reflectively modify the static fields for "BuildConfig.class". Running ":testDebugUnitTest"
@@ -2377,109 +2235,255 @@ public void getAndCacheLogSourceName_defaultValueIsNotFireperf_returnsNewDefault
   //  }
 
   @Test
-  public void getAndCacheLogSourceName_getFromRemoteConfig_returnsCacheAtNextTime() {
-    ReflectionHelpers.setStaticField(BuildConfig.class, "TRANSPORT_LOG_SRC", "FIREPERF");
-    ReflectionHelpers.setStaticField(
-        BuildConfig.class, "ENFORCE_DEFAULT_LOG_SRC", Boolean.valueOf(false));
+  public void getFragmentSamplingRate_validMetadata_returnsMetadata() {
+    // #1 pass: Validate that method returns Remote Config Value when there is no metadata value.
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.01));
 
-    // #1 call: valid remote config value is returned, therefore returns this value and store at
-    // cache.
-    when(mockRemoteConfigManager.getRemoteConfigValueOrDefault("fpr_log_source", -1L))
-        .thenReturn(675L); // FIREPERF_INTERNAL_LOW
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.01);
 
-    assertThat(testConfigResolver.getAndCacheLogSourceName()).isEqualTo("FIREPERF_INTERNAL_LOW");
-    verify(mockDeviceCacheManager, never()).getString(eq("com.google.firebase.perf.LogSourceName"));
-    verify(mockDeviceCacheManager, times(1))
-        .setValue(eq("com.google.firebase.perf.LogSourceName"), eq("FIREPERF_INTERNAL_LOW"));
+    // #2 pass: Validate that method returns Metadata value which takes higher precedence.
+    Bundle bundle = new Bundle();
+    bundle.putDouble("fragment_sampling_percentage", 20.0);
+    testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
-    // #2 call: There is no remote config value, therefore returns value stored at cache.
-    when(mockRemoteConfigManager.getRemoteConfigValueOrDefault("fpr_log_source", -1L))
-        .thenReturn(-1L);
-    when(mockDeviceCacheManager.getString("com.google.firebase.perf.LogSourceName"))
-        .thenReturn(Optional.of("FIREPERF_INTERNAL_LOW"));
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.2);
+  }
 
-    assertThat(testConfigResolver.getAndCacheLogSourceName()).isEqualTo("FIREPERF_INTERNAL_LOW");
-    verify(mockDeviceCacheManager, times(1))
-        .getString(eq("com.google.firebase.perf.LogSourceName"));
-    verify(mockDeviceCacheManager, never())
-        .setValue(eq("com.google.firebase.perf.LogSourceName"), eq("FIREPERF"));
+  @Test
+  public void getFragmentSamplingRate_validMetadata_notSaveMetadataInCache() {
+    Bundle bundle = new Bundle();
+    bundle.putDouble("fragment_sampling_percentage", 20.0);
+    testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.2);
+
+    verify(mockDeviceCacheManager, never()).setValue(any(), any());
+  }
+
+  @Test
+  public void getFragmentSamplingRate_invalidAndroidMetadataBundle_returnDefaultValue() {
+    double defaultValue = ConfigurationConstants.FragmentSamplingRate.getInstance().getDefault();
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.absent());
+    when(mockDeviceCacheManager.getDouble(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.absent());
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
+
+    // Case #1: Android Metadata bundle value is too high.
+    Bundle bundle = new Bundle();
+    bundle.putDouble("fragment_sampling_percentage", 200.00);
+    testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
+
+    // Case #2: Android Metadata bundle value is too low.
+    bundle = new Bundle();
+    bundle.putDouble("fragment_sampling_percentage", -1.00);
+    testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
+  }
+
+  @Test
+  public void getFragmentSamplingRate_invalidAndroidMetadataBundle_returnRemoteConfigValue() {
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.25));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.25);
+
+    // Case #1: Android Metadata bundle value is too high.
+    Bundle bundle = new Bundle();
+    bundle.putDouble("fragment_sampling_percentage", 200.00);
+    testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.25);
+
+    // Case #2: Android Metadata bundle value is too low.
+    bundle = new Bundle();
+    bundle.putDouble("fragment_sampling_percentage", -1.00);
+    testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.25);
+  }
+
+  @Test
+  public void getFragmentSamplingRate_invalidMetadataBundle_returnCacheValue() {
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.absent());
+    when(mockDeviceCacheManager.getDouble(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(1.0));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(1.0);
+
+    // Case #1: Android Metadata bundle value is too high.
+    Bundle bundle = new Bundle();
+    bundle.putDouble("fragment_sampling_percentage", 200.00);
+    testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(1.0);
+
+    // Case #2: Android Metadata bundle value is too low.
+    bundle = new Bundle();
+    bundle.putDouble("fragment_sampling_percentage", -1.00);
+    testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(1.0);
   }
 
   @Test
-  public void getAndCacheLogSourceName_cacheExistsAndGetNewFromRemoteConfig_cacheUpdated() {
-    ReflectionHelpers.setStaticField(BuildConfig.class, "TRANSPORT_LOG_SRC", "FIREPERF");
-    ReflectionHelpers.setStaticField(
-        BuildConfig.class, "ENFORCE_DEFAULT_LOG_SRC", Boolean.valueOf(false));
+  public void getFragmentSamplingRate_validRemoteConfig_returnRemoteConfigValue() {
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.25));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.25);
+    verify(mockDeviceCacheManager, times(1))
+        .setValue(eq(FRAGMENT_SAMPLING_RATE_CACHE_KEY), eq(0.25));
 
-    // #1 call: valid remote config value is returned, therefore returns this value and store at
-    // cache.
-    when(mockRemoteConfigManager.getRemoteConfigValueOrDefault("fpr_log_source", -1L))
-        .thenReturn(461L); // FIREPERF_AUTOPUSH
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.0));
 
-    assertThat(testConfigResolver.getAndCacheLogSourceName()).isEqualTo("FIREPERF_AUTOPUSH");
-    verify(mockDeviceCacheManager, never()).getString(eq("com.google.firebase.perf.LogSourceName"));
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.0);
     verify(mockDeviceCacheManager, times(1))
-        .setValue(eq("com.google.firebase.perf.LogSourceName"), eq("FIREPERF_AUTOPUSH"));
+        .setValue(eq(FRAGMENT_SAMPLING_RATE_CACHE_KEY), eq(0.0));
 
-    // #2 call: There is new remote config value, therefore saves new value stored at cache.
-    when(mockRemoteConfigManager.getRemoteConfigValueOrDefault("fpr_log_source", -1L))
-        .thenReturn(675L); // FIREPERF_INTERNAL_LOW
-    when(mockDeviceCacheManager.getString("com.google.firebase.perf.LogSourceName"))
-        .thenReturn(Optional.of("FIREPERF_INTERNAL_LOW"));
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.00005));
 
-    // #3 call: There is no remote config value, returns updated value stored at cache.
-    assertThat(testConfigResolver.getAndCacheLogSourceName()).isEqualTo("FIREPERF_INTERNAL_LOW");
-    verify(mockDeviceCacheManager, never()).getString(eq("com.google.firebase.perf.LogSourceName"));
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.00005);
     verify(mockDeviceCacheManager, times(1))
-        .setValue(eq("com.google.firebase.perf.LogSourceName"), eq("FIREPERF_INTERNAL_LOW"));
+        .setValue(eq(FRAGMENT_SAMPLING_RATE_CACHE_KEY), eq(0.00005));
+
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.0000000001));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.0000000001);
+    verify(mockDeviceCacheManager, times(1))
+        .setValue(eq(FRAGMENT_SAMPLING_RATE_CACHE_KEY), eq(0.0000000001));
   }
 
   @Test
-  public void getAndCacheLogSourceName_invalidRemoteConfigData_returnsDefault() {
-    ReflectionHelpers.setStaticField(BuildConfig.class, "TRANSPORT_LOG_SRC", "FIREPERF");
-    ReflectionHelpers.setStaticField(
-        BuildConfig.class, "ENFORCE_DEFAULT_LOG_SRC", Boolean.valueOf(false));
+  public void getFragmentSamplingRate_invalidRemoteConfig_returnDefaultValue() {
+    double defaultValue = ConfigurationConstants.FragmentSamplingRate.getInstance().getDefault();
+    // Mock behavior that device cache doesn't have session sampling rate value.
+    when(mockDeviceCacheManager.getDouble(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.absent());
 
-    when(mockRemoteConfigManager.getRemoteConfigValueOrDefault("fpr_log_source", -1L))
-        .thenReturn(123L); // invalid log source.
-    when(mockDeviceCacheManager.getString("com.google.firebase.perf.LogSourceName"))
-        .thenReturn(Optional.of("FIREPERF"));
+    // Case #1: Firebase Remote Config value is too high.
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(1.01));
 
-    assertThat(testConfigResolver.getAndCacheLogSourceName()).isEqualTo("FIREPERF");
-    verify(mockDeviceCacheManager, never())
-        .setValue(eq("com.google.firebase.perf.LogSourceName"), anyString());
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
+    verify(mockDeviceCacheManager, never()).setValue(any(), any());
+
+    // Case #2: Firebase Remote Config value is too low.
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(-0.1));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
+    verify(mockDeviceCacheManager, never()).setValue(any(), any());
   }
 
   @Test
-  public void getAndCacheLogSourceName_invalidRemoteConfigData_returnsCache() {
-    ReflectionHelpers.setStaticField(BuildConfig.class, "TRANSPORT_LOG_SRC", "FIREPERF");
-    ReflectionHelpers.setStaticField(
-        BuildConfig.class, "ENFORCE_DEFAULT_LOG_SRC", Boolean.valueOf(false));
+  public void getFragmentSamplingRate_invalidRemoteConfig_returnCacheValue() {
+    // Mock behavior that device cache doesn't have session sampling rate value.
+    when(mockDeviceCacheManager.getDouble(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(0.25));
+
+    // Case #1: Firebase Remote Config value is too high.
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(1.01));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.25);
+    verify(mockDeviceCacheManager, never()).setValue(any(), any());
+
+    // Case #2: Firebase Remote Config value is too low.
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(-0.1));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.25);
+    verify(mockDeviceCacheManager, never()).setValue(any(), any());
+  }
+
+  @Test
+  public void getFragmentSamplingRate_validCache_returnCacheValue() {
+    when(mockDeviceCacheManager.getDouble(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(1.0));
 
-    when(mockRemoteConfigManager.getRemoteConfigValueOrDefault("fpr_log_source", -1L))
-        .thenReturn(123L); // invalid log source.
-    when(mockDeviceCacheManager.getString("com.google.firebase.perf.LogSourceName"))
-        .thenReturn(Optional.of("FIREPERF_AUTOPUSH"));
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.absent());
 
-    assertThat(testConfigResolver.getAndCacheLogSourceName()).isEqualTo("FIREPERF_AUTOPUSH");
-    verify(mockDeviceCacheManager, never())
-        .setValue(eq("com.google.firebase.perf.LogSourceName"), anyString());
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(1.0);
+  }
+
+  @Test
+  public void getFragmentSamplingRate_invalidCache_returnDefaultValue() {
+    double defaultValue = ConfigurationConstants.FragmentSamplingRate.getInstance().getDefault();
+    // Mock behavior that remote config doesn't have session sampling rate value.
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.absent());
+
+    // Case #1: Device Cache value is too high.
+    when(mockDeviceCacheManager.getDouble(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(10.0));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
+
+    // Case #2: Device Cache value is too low.
+    when(mockDeviceCacheManager.getDouble(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(-1.0));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
   }
 
   @Test
   public void
-      getAndCacheLogSourceName_bothRemoteConfigAndCacheExist_returnsAndCacheRemoteConfigData() {
-    ReflectionHelpers.setStaticField(BuildConfig.class, "TRANSPORT_LOG_SRC", "FIREPERF");
-    ReflectionHelpers.setStaticField(
-        BuildConfig.class, "ENFORCE_DEFAULT_LOG_SRC", Boolean.valueOf(false));
+      getFragmentSamplingRate_metadataAndRemoteConfigAndCacheAreSet_metadataHasHighestConfigPrecedence() {
+    // Set cache value.
+    when(mockDeviceCacheManager.getDouble(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(0.2));
 
-    when(mockRemoteConfigManager.getRemoteConfigValueOrDefault("fpr_log_source", -1L))
-        .thenReturn(675L); // FIREPERF_INTERNAL_LOW.
-    when(mockDeviceCacheManager.getString("com.google.firebase.perf.LogSourceName"))
-        .thenReturn(Optional.of("FIREPERF_INTERNAL_HIGH"));
+    // Set remote config value.
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.3));
 
-    assertThat(testConfigResolver.getAndCacheLogSourceName()).isEqualTo("FIREPERF_INTERNAL_LOW");
-    verify(mockDeviceCacheManager, times(1))
-        .setValue(eq("com.google.firebase.perf.LogSourceName"), eq("FIREPERF_INTERNAL_LOW"));
+    // Set Android Manifest value.
+    Bundle bundle = new Bundle();
+    bundle.putDouble("fragment_sampling_percentage", 4.0);
+    testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.04);
+  }
+
+  @Test
+  public void
+      getFragmentSamplingRate_remoteConfigAndCacheAreSet_remoteConfigHasHighestConfigPrecedence() {
+    // Set cache value.
+    when(mockDeviceCacheManager.getDouble(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
+        .thenReturn(Optional.of(0.2));
+
+    // Set remote config value.
+    when(mockRemoteConfigManager.getDouble(FRAGMENT_SAMPLING_RATE_FRC_KEY))
+        .thenReturn(Optional.of(0.3));
+
+    assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(0.3);
+  }
+
+  private static void setStaticFinalField(Class clazz, String fieldName, Object value) {
+    try {
+      Field field = clazz.getDeclaredField(fieldName);
+      if (field != null) {
+        field.setAccessible(true);
+
+        Field modifiersField = Field.class.getDeclaredField("modifiers");
+        modifiersField.setAccessible(true);
+        modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+
+        field.set(null, value);
+      }
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
   }
 }
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigurationConstantsTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigurationConstantsTest.java
index 5f8b17434a2..76347c85d94 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigurationConstantsTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigurationConstantsTest.java
@@ -18,6 +18,7 @@
 
 import com.google.firebase.perf.config.ConfigurationConstants.CollectionDeactivated;
 import com.google.firebase.perf.config.ConfigurationConstants.CollectionEnabled;
+import com.google.firebase.perf.config.ConfigurationConstants.FragmentSamplingRate;
 import com.google.firebase.perf.config.ConfigurationConstants.LogSourceName;
 import com.google.firebase.perf.config.ConfigurationConstants.NetworkEventCountBackground;
 import com.google.firebase.perf.config.ConfigurationConstants.NetworkEventCountForeground;
@@ -90,6 +91,7 @@ public void getInstance_SessionsCpuCaptureFrequencyForegroundMs_validateConstant
         SessionsCpuCaptureFrequencyForegroundMs.getInstance();
 
     assertThat(configFlag.getDefault()).isEqualTo(100L);
+    assertThat(configFlag.getDefaultOnRcFetchFail()).isEqualTo(300L);
     assertThat(configFlag.getDeviceCacheFlag())
         .isEqualTo("com.google.firebase.perf.SessionsCpuCaptureFrequencyForegroundMs");
     assertThat(configFlag.getRemoteConfigFlag())
@@ -116,6 +118,7 @@ public void getInstance_SessionsMemoryCaptureFrequencyForegroundMs_validateConst
         SessionsMemoryCaptureFrequencyForegroundMs.getInstance();
 
     assertThat(configFlag.getDefault()).isEqualTo(100L);
+    assertThat(configFlag.getDefaultOnRcFetchFail()).isEqualTo(300L);
     assertThat(configFlag.getDeviceCacheFlag())
         .isEqualTo("com.google.firebase.perf.SessionsMemoryCaptureFrequencyForegroundMs");
     assertThat(configFlag.getRemoteConfigFlag())
@@ -151,7 +154,8 @@ public void getInstance_SessionsMaxDuration_validateConstants() {
   public void getInstance_TraceSamplingRate_validateConstants() {
     TraceSamplingRate configFlag = TraceSamplingRate.getInstance();
 
-    assertThat(configFlag.getDefault()).isEqualTo(1.00f);
+    assertThat(configFlag.getDefault()).isEqualTo(1.00);
+    assertThat(configFlag.getDefaultOnRcFetchFail()).isEqualTo(0.001);
     assertThat(configFlag.getDeviceCacheFlag())
         .isEqualTo("com.google.firebase.perf.TraceSamplingRate");
     assertThat(configFlag.getRemoteConfigFlag()).isEqualTo("fpr_vc_trace_sampling_rate");
@@ -162,7 +166,8 @@ public void getInstance_TraceSamplingRate_validateConstants() {
   public void getInstance_NetworkRequestSamplingRate_validateConstants() {
     NetworkRequestSamplingRate configFlag = NetworkRequestSamplingRate.getInstance();
 
-    assertThat(configFlag.getDefault()).isEqualTo(1.00f);
+    assertThat(configFlag.getDefault()).isEqualTo(1.00);
+    assertThat(configFlag.getDefaultOnRcFetchFail()).isEqualTo(0.001);
     assertThat(configFlag.getDeviceCacheFlag())
         .isEqualTo("com.google.firebase.perf.NetworkRequestSamplingRate");
     assertThat(configFlag.getRemoteConfigFlag()).isEqualTo("fpr_vc_network_request_sampling_rate");
@@ -173,7 +178,8 @@ public void getInstance_NetworkRequestSamplingRate_validateConstants() {
   public void getInstance_SessionsSamplingRate_validateConstants() {
     SessionsSamplingRate configFlag = SessionsSamplingRate.getInstance();
 
-    assertThat(configFlag.getDefault()).isEqualTo(0.01f);
+    assertThat(configFlag.getDefault()).isEqualTo(0.01);
+    assertThat(configFlag.getDefaultOnRcFetchFail()).isEqualTo(0.00001);
     assertThat(configFlag.getDeviceCacheFlag())
         .isEqualTo("com.google.firebase.perf.SessionSamplingRate");
     assertThat(configFlag.getRemoteConfigFlag()).isEqualTo("fpr_vc_session_sampling_rate");
@@ -253,4 +259,15 @@ public void getInstance_LogSourceName_validateConstants() {
     assertThat(LogSourceName.getLogSourceName(675L)).isEqualTo("FIREPERF_INTERNAL_LOW");
     assertThat(LogSourceName.getLogSourceName(676L)).isEqualTo("FIREPERF_INTERNAL_HIGH");
   }
+
+  @Test
+  public void getInstance_FragmentSamplingRate_validateConstants() {
+    FragmentSamplingRate configFlag = FragmentSamplingRate.getInstance();
+
+    assertThat(configFlag.getDefault()).isEqualTo(0.0);
+    assertThat(configFlag.getDeviceCacheFlag())
+        .isEqualTo("com.google.firebase.perf.FragmentSamplingRate");
+    assertThat(configFlag.getRemoteConfigFlag()).isEqualTo("fpr_vc_fragment_sampling_rate");
+    assertThat(configFlag.getMetadataFlag()).isEqualTo("fragment_sampling_percentage");
+  }
 }
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/config/DeviceCacheManagerTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/config/DeviceCacheManagerTest.java
index a537f15536c..cbe9ad21e5d 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/config/DeviceCacheManagerTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/config/DeviceCacheManagerTest.java
@@ -16,8 +16,11 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.content.Context;
+import android.content.SharedPreferences;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.perf.FirebasePerformanceTestBase;
+import com.google.firebase.perf.util.Constants;
 import com.google.testing.timing.FakeScheduledExecutorService;
 import org.junit.Before;
 import org.junit.Test;
@@ -171,64 +174,91 @@ public void setValueString_keyIsNull_returnsFalse() {
   }
 
   @Test
-  public void getFloat_valueIsNotSet_returnsEmpty() {
+  public void getDouble_valueIsNotSet_returnsEmpty() {
     deviceCacheManager.setContext(appContext);
     fakeScheduledExecutorService.runAll();
 
-    assertThat(deviceCacheManager.getFloat("some_key").isAvailable()).isFalse();
+    assertThat(deviceCacheManager.getDouble("some_key").isAvailable()).isFalse();
   }
 
   @Test
-  public void getFloat_contextAndValueNotSet_returnsEmpty() {
+  public void getDouble_contextAndValueNotSet_returnsEmpty() {
     DeviceCacheManager.clearInstance();
     deviceCacheManager = new DeviceCacheManager(fakeScheduledExecutorService);
 
     assertThat(fakeScheduledExecutorService.isEmpty()).isTrue();
-    assertThat(deviceCacheManager.getFloat("some_key").isAvailable()).isFalse();
+    assertThat(deviceCacheManager.getDouble("some_key").isAvailable()).isFalse();
   }
 
   @Test
-  public void getFloat_valueIsSet_returnsSetValue() {
+  public void getDouble_valueIsSet_returnsSetValue() {
     deviceCacheManager.setContext(appContext);
     fakeScheduledExecutorService.runAll();
-    deviceCacheManager.setValue("some_key", 1.2f);
+    deviceCacheManager.setValue("some_key", 1.2);
 
-    assertThat(deviceCacheManager.getFloat("some_key").get()).isEqualTo(1.2f);
+    assertThat(deviceCacheManager.getDouble("some_key").get()).isEqualTo(1.2);
   }
 
   @Test
-  public void getFloat_firebaseAppNotExist_returnsEmpty() {
+  public void getDouble_valueIsSetAsFloat_returnsSetValue() {
+    deviceCacheManager.setContext(appContext);
+    fakeScheduledExecutorService.runAll();
+
+    // Manually setting a Float to simulate it being cached from a previous SDK version.
+    SharedPreferences sharedPreferences =
+        appContext.getSharedPreferences(Constants.PREFS_NAME, Context.MODE_PRIVATE);
+    sharedPreferences.edit().putFloat("some_key", 1.2f).apply();
+
+    assertThat(deviceCacheManager.getDouble("some_key").get()).isWithin(0.001).of(1.2);
+  }
+
+  @Test
+  public void getDouble_firebaseAppNotExist_returnsEmpty() {
     DeviceCacheManager.clearInstance();
     FirebaseApp.clearInstancesForTest();
     deviceCacheManager = new DeviceCacheManager(fakeScheduledExecutorService);
-    deviceCacheManager.setValue("some_key", 1.2f);
+    deviceCacheManager.setValue("some_key", 1.2);
 
     assertThat(fakeScheduledExecutorService.isEmpty()).isTrue();
-    assertThat(deviceCacheManager.getFloat("some_key").isAvailable()).isFalse();
+    assertThat(deviceCacheManager.getDouble("some_key").isAvailable()).isFalse();
   }
 
   @Test
-  public void setValueFloat_setTwice_canGetLatestValue() {
+  public void setValueDouble_setTwice_canGetLatestValue() {
     deviceCacheManager.setContext(appContext);
     fakeScheduledExecutorService.runAll();
-    deviceCacheManager.setValue("some_key", 1.01f);
-    assertThat(deviceCacheManager.getFloat("some_key").get()).isEqualTo(1.01f);
+    deviceCacheManager.setValue("some_key", 1.01);
+    assertThat(deviceCacheManager.getDouble("some_key").get()).isEqualTo(1.01);
+
+    deviceCacheManager.setValue("some_key", 0.01);
+    assertThat(deviceCacheManager.getDouble("some_key").get()).isEqualTo(0.01);
+  }
+
+  @Test
+  public void setValueDouble_wasSetAsFloat_canGetLatestValue() {
+    deviceCacheManager.setContext(appContext);
+    fakeScheduledExecutorService.runAll();
+
+    // Manually setting a Float to simulate it being cached from a previous SDK version.
+    SharedPreferences sharedPreferences =
+        appContext.getSharedPreferences(Constants.PREFS_NAME, Context.MODE_PRIVATE);
+    sharedPreferences.edit().putFloat("some_key", 1.2f).apply();
 
-    deviceCacheManager.setValue("some_key", 0.01f);
-    assertThat(deviceCacheManager.getFloat("some_key").get()).isEqualTo(0.01f);
+    deviceCacheManager.setValue("some_key", 0.01);
+    assertThat(deviceCacheManager.getDouble("some_key").get()).isEqualTo(0.01);
   }
 
   @Test
-  public void setValueFloat_contextNotSet_returnsEmpty() {
-    deviceCacheManager.setValue("some_key", 100.0f);
-    assertThat(deviceCacheManager.getFloat("some_key").isAvailable()).isFalse();
+  public void setValueDouble_contextNotSet_returnsEmpty() {
+    deviceCacheManager.setValue("some_key", 100.0);
+    assertThat(deviceCacheManager.getDouble("some_key").isAvailable()).isFalse();
   }
 
   @Test
-  public void setValueFloat_keyIsNull_returnsFalse() {
+  public void setValueDouble_keyIsNull_returnsFalse() {
     deviceCacheManager.setContext(appContext);
     fakeScheduledExecutorService.runAll();
-    assertThat(deviceCacheManager.setValue(null, 10.0f)).isFalse();
+    assertThat(deviceCacheManager.setValue(null, 10.0)).isFalse();
   }
 
   @Test
@@ -292,6 +322,6 @@ public void setValueLong_contextNotSet_returnsEmpty() {
   public void setValueLong_keyIsNull_returnsFalse() {
     deviceCacheManager.setContext(appContext);
     fakeScheduledExecutorService.runAll();
-    assertThat(deviceCacheManager.setValue(null, 10.0f)).isFalse();
+    assertThat(deviceCacheManager.setValue(null, 10.0)).isFalse();
   }
 }
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/config/RemoteConfigManagerTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/config/RemoteConfigManagerTest.java
index 9855d3cfe62..fea3de49acf 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/config/RemoteConfigManagerTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/config/RemoteConfigManagerTest.java
@@ -25,9 +25,9 @@
 import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.provider.FirebasePerfProvider;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings;
@@ -48,11 +48,16 @@
 public final class RemoteConfigManagerTest extends FirebasePerformanceTestBase {
 
   private static final String FIREPERF_FRC_NAMESPACE_NAME = "fireperf";
+  private static final FirebaseRemoteConfigValue TRUE_VALUE =
+      new RemoteConfigValueImplForTest("true");
+  private static final FirebaseRemoteConfigValue FALSE_VALUE =
+      new RemoteConfigValueImplForTest("false");
 
   @Mock private FirebaseRemoteConfig mockFirebaseRemoteConfig;
   @Mock private RemoteConfigComponent mockFirebaseRemoteConfigComponent;
   @Mock private Provider<RemoteConfigComponent> mockFirebaseRemoteConfigProvider;
 
+  private DeviceCacheManager cacheManager;
   private FakeScheduledExecutorService fakeExecutor;
 
   @Before
@@ -60,6 +65,8 @@ public void setUp() {
     initMocks(this);
 
     fakeExecutor = new FakeScheduledExecutorService();
+    // DeviceCacheManager initialization requires immediate blocking task execution in its executor
+    cacheManager = new DeviceCacheManager(MoreExecutors.newDirectExecutorService());
 
     when(mockFirebaseRemoteConfigProvider.get()).thenReturn(mockFirebaseRemoteConfigComponent);
     when(mockFirebaseRemoteConfigComponent.get(FIREPERF_FRC_NAMESPACE_NAME))
@@ -78,24 +85,24 @@ public void getInstance_verifiesSingleton() {
   // region Tests that verify output of valid/invalid Firebase Remote Config values.
 
   @Test
-  public void getFloat_keyIsNull_returnsEmpty() {
+  public void getDouble_keyIsNull_returnsEmpty() {
     RemoteConfigManager testRemoteConfigManager =
         setupTestRemoteConfigManager(createDefaultRcConfigMap());
 
-    assertThat(testRemoteConfigManager.getFloat(null).isAvailable()).isFalse();
+    assertThat(testRemoteConfigManager.getDouble(null).isAvailable()).isFalse();
   }
 
   @Test
-  public void getFloat_invalidFrcType_returnsEmpty() {
+  public void getDouble_invalidFrcType_returnsEmpty() {
     Map<String, FirebaseRemoteConfigValue> configs = createDefaultRcConfigMap();
     configs.put("some_key", new RemoteConfigValueImplForTest(/* throwsException= */ true));
     RemoteConfigManager testRemoteConfigManager = setupTestRemoteConfigManager(configs);
 
-    assertThat(testRemoteConfigManager.getFloat("some_key").isAvailable()).isFalse();
+    assertThat(testRemoteConfigManager.getDouble("some_key").isAvailable()).isFalse();
   }
 
   @Test
-  public void getFloat_validFrcValue_returnsValue() {
+  public void getDouble_validFrcValue_returnsValue() {
     Map<String, FirebaseRemoteConfigValue> configs = createDefaultRcConfigMap();
     configs.put("some_key1", new RemoteConfigValueImplForTest("100.0f"));
     configs.put("some_key2", new RemoteConfigValueImplForTest("1.0f"));
@@ -105,12 +112,12 @@ public void getFloat_validFrcValue_returnsValue() {
     configs.put("some_key6", new RemoteConfigValueImplForTest("0.01f"));
     RemoteConfigManager testRemoteConfigManager = setupTestRemoteConfigManager(configs);
 
-    assertThat(testRemoteConfigManager.getFloat("some_key1").get()).isEqualTo(100.0f);
-    assertThat(testRemoteConfigManager.getFloat("some_key2").get()).isEqualTo(1.0f);
-    assertThat(testRemoteConfigManager.getFloat("some_key3").get()).isEqualTo(0.0f);
-    assertThat(testRemoteConfigManager.getFloat("some_key4").get()).isEqualTo(0.001f);
-    assertThat(testRemoteConfigManager.getFloat("some_key5").get()).isEqualTo(0.123f);
-    assertThat(testRemoteConfigManager.getFloat("some_key6").get()).isEqualTo(0.01f);
+    assertThat(testRemoteConfigManager.getDouble("some_key1").get()).isEqualTo(100.0);
+    assertThat(testRemoteConfigManager.getDouble("some_key2").get()).isEqualTo(1.0);
+    assertThat(testRemoteConfigManager.getDouble("some_key3").get()).isEqualTo(0.0);
+    assertThat(testRemoteConfigManager.getDouble("some_key4").get()).isEqualTo(0.001);
+    assertThat(testRemoteConfigManager.getDouble("some_key5").get()).isEqualTo(0.123);
+    assertThat(testRemoteConfigManager.getDouble("some_key6").get()).isEqualTo(0.01);
   }
 
   @Test
@@ -230,6 +237,29 @@ public void getString_validFrcValue_updatesWithNewValue() {
     assertThat(testRemoteConfigManager.getString("some_key3").isAvailable()).isFalse();
   }
 
+  @Test
+  public void syncConfigValues_savesNewlyFetchedValueToDeviceCache() {
+    Map<String, FirebaseRemoteConfigValue> configs = new HashMap<>();
+    ConfigurationConstants.ExperimentTTID flag =
+        ConfigurationConstants.ExperimentTTID.getInstance();
+    configs.put(flag.getRemoteConfigFlag(), TRUE_VALUE);
+    RemoteConfigManager testRemoteConfigManager = setupTestRemoteConfigManager(configs);
+
+    assertThat(cacheManager.getBoolean(flag.getDeviceCacheFlag()).isAvailable()).isFalse();
+
+    configs.put(flag.getRemoteConfigFlag(), FALSE_VALUE);
+    testRemoteConfigManager.syncConfigValues(configs);
+
+    assertThat(cacheManager.getBoolean(flag.getDeviceCacheFlag()).isAvailable()).isTrue();
+    assertThat(cacheManager.getBoolean(flag.getDeviceCacheFlag()).get()).isFalse();
+
+    configs.put(flag.getRemoteConfigFlag(), TRUE_VALUE);
+    testRemoteConfigManager.syncConfigValues(configs);
+
+    assertThat(cacheManager.getBoolean(flag.getDeviceCacheFlag()).isAvailable()).isTrue();
+    assertThat(cacheManager.getBoolean(flag.getDeviceCacheFlag()).get()).isTrue();
+  }
+
   @Test
   public void getRemoteConfigValueOrDefaultLong_invalidFrcValue_returnsDefaultValue() {
     Map<String, FirebaseRemoteConfigValue> configs = createDefaultRcConfigMap();
@@ -241,15 +271,15 @@ public void getRemoteConfigValueOrDefaultLong_invalidFrcValue_returnsDefaultValu
   }
 
   @Test
-  public void getRemoteConfigValueOrDefaultFloat_invalidFrcValue_returnsDefaultValue() {
+  public void getRemoteConfigValueOrDefaultDouble_invalidFrcValue_returnsDefaultValue() {
     Map<String, FirebaseRemoteConfigValue> configs = createDefaultRcConfigMap();
     configs.put("some_key", new RemoteConfigValueImplForTest(/* throwsException= */ true));
     RemoteConfigManager testRemoteConfigManager = setupTestRemoteConfigManager(configs);
 
-    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0f))
-        .isEqualTo(5.0f);
-    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 7.0f))
-        .isEqualTo(7.0f);
+    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0))
+        .isEqualTo(5.0);
+    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 7.0))
+        .isEqualTo(7.0);
   }
 
   @Test
@@ -271,13 +301,13 @@ public void getRemoteConfigValueOrDefaultLong_nullFrc_returnsDefaultValue() {
   }
 
   @Test
-  public void getRemoteConfigValueOrDefaultFloat_nullFrc_returnsDefaultValue() {
+  public void getRemoteConfigValueOrDefaultDouble_nullFrc_returnsDefaultValue() {
     RemoteConfigManager testRemoteConfigManager =
         setupRemoteConfigManagerWithUninitializedFirebaseRemoteConfigAndFirebaseApp(
             createDefaultRcConfigMap());
 
-    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0f))
-        .isEqualTo(5.0f);
+    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0))
+        .isEqualTo(5.0);
   }
 
   @Test
@@ -314,15 +344,15 @@ public void getRemoteConfigValueOrDefaultLong_frcInjectedAfterInit_returnsFrcVal
   }
 
   @Test
-  public void getRemoteConfigValueOrDefaultFloat_frcInjectedAfterInit_returnsFrcValue() {
+  public void getRemoteConfigValueOrDefaultDouble_frcInjectedAfterInit_returnsFrcValue() {
     Map<String, FirebaseRemoteConfigValue> configs = createDefaultRcConfigMap();
     RemoteConfigManager testRemoteConfigManager =
         setupRemoteConfigManagerWithUninitializedFirebaseRemoteConfigAndFirebaseApp(configs);
-    configs.put("some_key", new RemoteConfigValueImplForTest("25.0f"));
+    configs.put("some_key", new RemoteConfigValueImplForTest("25.0"));
     testRemoteConfigManager.setFirebaseRemoteConfigProvider(mockFirebaseRemoteConfigProvider);
 
-    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0f))
-        .isEqualTo(25.0f);
+    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0))
+        .isEqualTo(25.0);
   }
 
   @Test
@@ -362,13 +392,13 @@ public void getRemoteConfigValueOrDefaultLong_frcValueSourceIsRemote_returnsFrcV
   }
 
   @Test
-  public void getRemoteConfigValueOrDefaultFloat_frcValueSourceIsRemote_returnsFrcValue() {
+  public void getRemoteConfigValueOrDefaultDouble_frcValueSourceIsRemote_returnsFrcValue() {
     Map<String, FirebaseRemoteConfigValue> configs = createDefaultRcConfigMap();
-    configs.put("some_key", new RemoteConfigValueImplForTest("4.0f"));
+    configs.put("some_key", new RemoteConfigValueImplForTest("4.0"));
     RemoteConfigManager testRemoteConfigManager = setupTestRemoteConfigManager(configs);
 
-    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0f))
-        .isEqualTo(4.0f);
+    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0))
+        .isEqualTo(4.0);
   }
 
   @Test
@@ -427,25 +457,25 @@ public void getRemoteConfigValueOrDefaultLong_frcValueSourceIsNotRemote_returnsD
   }
 
   @Test
-  public void getRemoteConfigValueOrDefaultFloat_frcValueSourceIsNotRemote_returnsDefaultValue() {
+  public void getRemoteConfigValueOrDefaultDouble_frcValueSourceIsNotRemote_returnsDefaultValue() {
     Map<String, FirebaseRemoteConfigValue> configs = createDefaultRcConfigMap();
     RemoteConfigManager testRemoteConfigManager = setupTestRemoteConfigManager(configs);
 
     // Pass 1: Test with VALUE_SOURCE_DEFAULT
     configs.put(
         "some_key",
-        new RemoteConfigValueImplForTest("4.0f", FirebaseRemoteConfig.VALUE_SOURCE_DEFAULT));
+        new RemoteConfigValueImplForTest("4.0", FirebaseRemoteConfig.VALUE_SOURCE_DEFAULT));
 
-    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0f))
-        .isEqualTo(5.0f);
+    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0))
+        .isEqualTo(5.0);
 
     // Pass 2: Test with VALUE_SOURCE_STATIC
     configs.put(
         "some_key",
-        new RemoteConfigValueImplForTest("4.0f", FirebaseRemoteConfig.VALUE_SOURCE_STATIC));
+        new RemoteConfigValueImplForTest("4.0", FirebaseRemoteConfig.VALUE_SOURCE_STATIC));
 
-    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0f))
-        .isEqualTo(5.0f);
+    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0))
+        .isEqualTo(5.0);
   }
 
   @Test
@@ -543,8 +573,8 @@ public void getRemoteConfigValueOrDefaultLong_triggersRcFetchOnceAndOnlyOnce() {
   }
 
   @Test
-  public void getRemoteConfigValueOrDefaultFloat_triggersRcFetchOnceAndOnlyOnce() {
-    verifyRcTriggersFetchOnceAndOnlyOnceFor(5.0f);
+  public void getRemoteConfigValueOrDefaultDouble_triggersRcFetchOnceAndOnlyOnce() {
+    verifyRcTriggersFetchOnceAndOnlyOnceFor(5.0);
   }
 
   @Test
@@ -591,8 +621,8 @@ public void getRemoteConfigValueOrDefaultLong_triggersOneRcFetchIfPreviousFetchW
   }
 
   @Test
-  public void getRemoteConfigValueOrDefaultFloat_triggersOneRcFetchIfPreviousFetchWasTooLongAgo() {
-    verifyRcTriggersOneFetchIfPreviousFetchWasTooLongAgoFor(5.0f);
+  public void getRemoteConfigValueOrDefaultDouble_triggersOneRcFetchIfPreviousFetchWasTooLongAgo() {
+    verifyRcTriggersOneFetchIfPreviousFetchWasTooLongAgoFor(5.0);
   }
 
   @Test
@@ -666,25 +696,25 @@ public void getString_lastFetchIsLongAgo_triggersOneRcFetch() {
   }
 
   @Test
-  public void getRemoteConfigValueOrDefaultFloat_scalesFrcValue() {
+  public void getRemoteConfigValueOrDefaultDouble_scalesFrcValue() {
     Map<String, FirebaseRemoteConfigValue> configs = createDefaultRcConfigMap();
-    configs.put("some_key", new RemoteConfigValueImplForTest("0.5f"));
+    configs.put("some_key", new RemoteConfigValueImplForTest("0.5"));
     RemoteConfigManager testRemoteConfigManager = setupTestRemoteConfigManager(configs);
 
-    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0f))
-        .isEqualTo(0.5f);
+    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0))
+        .isEqualTo(0.5);
   }
 
   @Test
-  public void getRemoteConfigValueOrDefaultFloat_scalesVerySmallFrcValue() {
+  public void getRemoteConfigValueOrDefaultDouble_scalesVerySmallFrcValue() {
     Map<String, FirebaseRemoteConfigValue> configs = createDefaultRcConfigMap();
-    configs.put("some_key", new RemoteConfigValueImplForTest("0.000005f"));
+    configs.put("some_key", new RemoteConfigValueImplForTest("0.000005"));
     RemoteConfigManager testRemoteConfigManager = setupTestRemoteConfigManager(configs);
 
-    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0f))
-        .isAtMost(0.000005f);
-    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0f))
-        .isAtLeast(0.0000049f);
+    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0))
+        .isAtMost(0.000005);
+    assertThat(testRemoteConfigManager.getRemoteConfigValueOrDefault("some_key", 5.0))
+        .isAtLeast(0.0000049);
   }
 
   @Test
@@ -693,8 +723,8 @@ public void getRemoteConfigValueOrDefaultLong_allowsRefetchOnFailure() {
   }
 
   @Test
-  public void getRemoteConfigValueOrDefaultFloat_allowsRefetchOnFailure() {
-    verifyRcAllowsRefetchOnFailureFor(5.0f);
+  public void getRemoteConfigValueOrDefaultDouble_allowsRefetchOnFailure() {
+    verifyRcAllowsRefetchOnFailureFor(5.0);
   }
 
   @Test
@@ -782,7 +812,16 @@ public void isLastFetchFailed_frcIsNonNullAndStatusFailed_returnsTrue() {
   }
 
   @Test
-  public void isLastFetchFailed_frcIsNonNullAndStatusOtherThanFailed_returnsFalse() {
+  public void isLastFetchFailed_frcIsNonNullAndStatusThrottled_returnsTrue() {
+    RemoteConfigManager testRemoteConfigManager =
+        setupTestRemoteConfigManager(createDefaultRcConfigMap());
+    simulateFirebaseRemoteConfigLastFetchStatus(FirebaseRemoteConfig.LAST_FETCH_STATUS_THROTTLED);
+
+    assertThat(testRemoteConfigManager.isLastFetchFailed()).isTrue();
+  }
+
+  @Test
+  public void isLastFetchFailed_frcIsNonNullAndStatusOtherThanFailedOrThrottled_returnsFalse() {
     RemoteConfigManager testRemoteConfigManager =
         setupTestRemoteConfigManager(createDefaultRcConfigMap());
 
@@ -792,9 +831,6 @@ public void isLastFetchFailed_frcIsNonNullAndStatusOtherThanFailed_returnsFalse(
 
     simulateFirebaseRemoteConfigLastFetchStatus(FirebaseRemoteConfig.LAST_FETCH_STATUS_SUCCESS);
     assertThat(testRemoteConfigManager.isLastFetchFailed()).isFalse();
-
-    simulateFirebaseRemoteConfigLastFetchStatus(FirebaseRemoteConfig.LAST_FETCH_STATUS_THROTTLED);
-    assertThat(testRemoteConfigManager.isLastFetchFailed()).isFalse();
   }
 
   @Test
@@ -809,15 +845,14 @@ public void triggerRemoteConfigFetchIfNecessary_doesNotFetchBeforeAppStartRandom
                 appStartConfigFetchDelay));
 
     // Simulate time fast forward to some time before fetch time is up
-    long appStartTimeInMs =
-        TimeUnit.MICROSECONDS.toMillis(FirebasePerfProvider.getAppStartTime().getMicros());
+    long appStartTimeInMs = System.currentTimeMillis();
     when(remoteConfigManagerPartialMock.getCurrentSystemTimeMillis())
         .thenReturn(appStartTimeInMs + appStartConfigFetchDelay - 2000);
 
     simulateFirebaseRemoteConfigLastFetchStatus(
         FirebaseRemoteConfig.LAST_FETCH_STATUS_NO_FETCH_YET);
     remoteConfigManagerPartialMock.getRemoteConfigValueOrDefault("some_key", 5L);
-    remoteConfigManagerPartialMock.getRemoteConfigValueOrDefault("some_other_key", 5.0f);
+    remoteConfigManagerPartialMock.getRemoteConfigValueOrDefault("some_other_key", 5.0);
     remoteConfigManagerPartialMock.getRemoteConfigValueOrDefault("some_other_key_2", true);
     remoteConfigManagerPartialMock.getRemoteConfigValueOrDefault("some_other_key_3", "1.0.0");
 
@@ -836,8 +871,7 @@ public void triggerRemoteConfigFetchIfNecessary_fetchesAfterAppStartRandomDelay(
                 appStartConfigFetchDelay));
 
     // Simulate time fast forward to 2s after fetch delay time is up
-    long appStartTimeInMs =
-        TimeUnit.MICROSECONDS.toMillis(FirebasePerfProvider.getAppStartTime().getMicros());
+    long appStartTimeInMs = System.currentTimeMillis();
     when(remoteConfigManagerPartialMock.getCurrentSystemTimeMillis())
         .thenReturn(appStartTimeInMs + appStartConfigFetchDelay + 2000);
 
@@ -889,10 +923,18 @@ private RemoteConfigManager setupTestRemoteConfigManager(
     when(mockFirebaseRemoteConfig.getAll()).thenReturn(configs);
     if (initializeFrc) {
       return new RemoteConfigManager(
-          fakeExecutor, mockFirebaseRemoteConfig, appStartConfigFetchDelayInMs);
+          cacheManager,
+          fakeExecutor,
+          mockFirebaseRemoteConfig,
+          appStartConfigFetchDelayInMs,
+          RemoteConfigManager.getInitialStartupMillis());
     } else {
       return new RemoteConfigManager(
-          fakeExecutor, /* firebaseRemoteConfig= */ null, appStartConfigFetchDelayInMs);
+          cacheManager,
+          fakeExecutor,
+          /* firebaseRemoteConfig= */ null,
+          appStartConfigFetchDelayInMs,
+          RemoteConfigManager.getInitialStartupMillis());
     }
   }
 
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/ktx/PerformanceTests.kt b/firebase-perf/src/test/java/com/google/firebase/perf/ktx/PerformanceTests.kt
new file mode 100644
index 00000000000..f5d02ea6b35
--- /dev/null
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/ktx/PerformanceTests.kt
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.perf.ktx
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.perf.FirebasePerformance
+import com.google.firebase.perf.FirebasePerformance.HttpMethod
+import com.google.firebase.perf.application.AppStateMonitor
+import com.google.firebase.perf.metrics.HttpMetric
+import com.google.firebase.perf.metrics.Trace
+import com.google.firebase.perf.metrics.getTraceCounter
+import com.google.firebase.perf.metrics.getTraceCounterCount
+import com.google.firebase.perf.transport.TransportManager
+import com.google.firebase.perf.util.Clock
+import com.google.firebase.perf.util.Timer
+import com.google.firebase.perf.v1.ApplicationProcessState
+import com.google.firebase.perf.v1.NetworkRequestMetric
+import com.google.firebase.perf.v1.TraceMetric
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.ArgumentMatchers
+import org.mockito.ArgumentMatchers.nullable
+import org.mockito.Captor
+import org.mockito.Mock
+import org.mockito.Mockito.doAnswer
+import org.mockito.Mockito.verify
+import org.mockito.Mockito.`when`
+import org.mockito.MockitoAnnotations.initMocks
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows
+
+const val APP_ID = "1:149208680807:android:0000000000000000"
+const val API_KEY = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  open fun setUp() {
+    val context = ApplicationProvider.getApplicationContext<Context>()
+    val shadowPackageManager = Shadows.shadowOf(context.packageManager)
+    val packageInfo = shadowPackageManager.getInternalMutablePackageInfo(context.packageName)
+    packageInfo.versionName = "1.0.0"
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class PerformanceTests : BaseTestCase() {
+
+  @Mock lateinit var transportManagerMock: TransportManager
+
+  @Mock lateinit var timerMock: Timer
+
+  @Mock lateinit var mockTransportManager: TransportManager
+
+  @Mock lateinit var mockClock: Clock
+
+  @Mock lateinit var mockAppStateMonitor: AppStateMonitor
+
+  @Captor lateinit var argMetricCaptor: ArgumentCaptor<NetworkRequestMetric>
+
+  @Captor lateinit var argumentsCaptor: ArgumentCaptor<TraceMetric>
+
+  var currentTime: Long = 1
+
+  @Before
+  override fun setUp() {
+    super.setUp()
+    initMocks(this)
+
+    `when`(timerMock.getMicros()).thenReturn(1000L)
+    `when`(timerMock.getDurationMicros()).thenReturn(2000L).thenReturn(3000L)
+    doAnswer { Timer(currentTime) }.`when`(mockClock).getTime()
+  }
+
+  @Test
+  fun `performance should delegate to FirebasePerformance#getInstance()`() {
+    assertThat(Firebase.performance).isSameInstanceAs(FirebasePerformance.getInstance())
+  }
+
+  @Test
+  fun `httpMetric wrapper test `() {
+    val metric =
+      HttpMetric("https://www.google.com/", HttpMethod.GET, transportManagerMock, timerMock)
+    metric.trace { setHttpResponseCode(200) }
+
+    verify(transportManagerMock)
+      .log(
+        argMetricCaptor.capture(),
+        ArgumentMatchers.nullable(ApplicationProcessState::class.java)
+      )
+
+    val metricValue = argMetricCaptor.getValue()
+    assertThat(metricValue.getHttpResponseCode()).isEqualTo(200)
+  }
+
+  @Test
+  fun `trace wrapper test`() {
+    val trace = Trace("trace_1", mockTransportManager, mockClock, mockAppStateMonitor)
+    trace.trace { incrementMetric("metric_1", 5) }
+
+    assertThat(getTraceCounter(trace)).hasSize(1)
+    assertThat(getTraceCounterCount(trace, "metric_1")).isEqualTo(5)
+    verify(mockTransportManager)
+      .log(argumentsCaptor.capture(), nullable(ApplicationProcessState::class.java))
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/logging/ConsoleUrlGeneratorTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/logging/ConsoleUrlGeneratorTest.java
index 13483abb4f6..ac26fa73421 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/logging/ConsoleUrlGeneratorTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/logging/ConsoleUrlGeneratorTest.java
@@ -35,7 +35,7 @@ public void testCustomTraceUrl() {
         ConsoleUrlGenerator.generateCustomTraceUrl("test-project", "test-package", "test-trace");
     assertThat(url)
         .isEqualTo(
-            "https://console.firebase.google.com/project/test-project/performance/app/android:test-package/metrics/trace/DURATION_TRACE/test-trace?utm_source=perf-android-sdk&utm_medium=android-ide");
+            "https://console.firebase.google.com/project/test-project/performance/app/android:test-package/troubleshooting/trace/DURATION_TRACE/test-trace?utm_source=perf-android-sdk&utm_medium=android-ide");
   }
 
   @Test
@@ -44,6 +44,6 @@ public void testScreenTraceUrl() {
         ConsoleUrlGenerator.generateScreenTraceUrl("test-project", "test-package", "test-trace");
     assertThat(url)
         .isEqualTo(
-            "https://console.firebase.google.com/project/test-project/performance/app/android:test-package/metrics/trace/SCREEN_TRACE/test-trace?utm_source=perf-android-sdk&utm_medium=android-ide");
+            "https://console.firebase.google.com/project/test-project/performance/app/android:test-package/troubleshooting/trace/SCREEN_TRACE/test-trace?utm_source=perf-android-sdk&utm_medium=android-ide");
   }
 }
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java
index a344bac179b..36ae3d10116 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/AppStartTraceTest.java
@@ -14,19 +14,27 @@
 
 package com.google.firebase.perf.metrics;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Activity;
-import android.content.pm.ProviderInfo;
+import android.content.Context;
 import android.os.Bundle;
+import android.os.Looper;
+import android.os.Process;
+import android.os.SystemClock;
+import android.view.View;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.provider.FirebasePerfProvider;
+import com.google.firebase.perf.config.ConfigResolver;
+import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Clock;
@@ -35,6 +43,7 @@
 import com.google.firebase.perf.v1.ApplicationProcessState;
 import com.google.firebase.perf.v1.TraceMetric;
 import com.google.testing.timing.FakeScheduledExecutorService;
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Assert;
@@ -47,28 +56,28 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
+import org.robolectric.shadows.ShadowSystemClock;
 
 /** Unit tests for {@link AppStartTrace}. */
 @RunWith(RobolectricTestRunner.class)
+@LooperMode(LooperMode.Mode.PAUSED)
 public class AppStartTraceTest extends FirebasePerformanceTestBase {
 
   @Mock private Clock clock;
   @Mock private TransportManager transportManager;
+  @Mock private ConfigResolver configResolver;
   @Mock private Activity activity1;
   @Mock private Activity activity2;
   @Mock private Bundle bundle;
 
+  private final Context appContext = ApplicationProvider.getApplicationContext();
   private ArgumentCaptor<TraceMetric> traceArgumentCaptor;
 
   // a mocked current wall-clock time in microseconds.
   private long currentTime = 0;
 
-  // wall-clock time in microseconds
-  private long appStartTime;
-
-  // high resolution time in microseconds
-  private long appStartHRT;
-
   @Before
   public void setUp() {
     initMocks(this);
@@ -83,21 +92,20 @@ public Timer answer(InvocationOnMock invocationOnMock) throws Throwable {
         .getTime();
     transportManager = mock(TransportManager.class);
     traceArgumentCaptor = ArgumentCaptor.forClass(TraceMetric.class);
-    appStartTime = FirebasePerfProvider.getAppStartTime().getMicros();
-    appStartHRT = FirebasePerfProvider.getAppStartTime().getHighResTime();
   }
 
   @After
   public void reset() {
-    SessionManager.getInstance()
-        .setPerfSession(com.google.firebase.perf.session.PerfSession.create());
+    SessionManager.getInstance().updatePerfSession(PerfSession.createWithId("randomSessionId"));
   }
 
   /** Test activity sequentially goes through onCreate()->onStart()->onResume() state change. */
   @Test
   public void testLaunchActivity() {
     FakeScheduledExecutorService fakeExecutorService = new FakeScheduledExecutorService();
-    AppStartTrace trace = new AppStartTrace(transportManager, clock, fakeExecutorService);
+    AppStartTrace trace =
+        new AppStartTrace(transportManager, clock, configResolver, fakeExecutorService);
+    trace.registerActivityLifecycleCallbacks(appContext);
     // first activity goes through onCreate()->onStart()->onResume() state change.
     currentTime = 1;
     trace.onActivityCreated(activity1, bundle);
@@ -144,14 +152,10 @@ private void verifyFinalState(
     TraceMetric metric = traceArgumentCaptor.getValue();
 
     Assert.assertEquals(Constants.TraceNames.APP_START_TRACE_NAME.toString(), metric.getName());
-    Assert.assertEquals(appStartTime, metric.getClientStartTimeUs());
-    Assert.assertEquals(resumeTime - appStartHRT, metric.getDurationUs());
 
     Assert.assertEquals(3, metric.getSubtracesCount());
     Assert.assertEquals(
         Constants.TraceNames.ON_CREATE_TRACE_NAME.toString(), metric.getSubtraces(0).getName());
-    Assert.assertEquals(appStartTime, metric.getSubtraces(0).getClientStartTimeUs());
-    Assert.assertEquals(createTime - appStartHRT, metric.getSubtraces(0).getDurationUs());
 
     Assert.assertEquals(
         Constants.TraceNames.ON_START_TRACE_NAME.toString(), metric.getSubtraces(1).getName());
@@ -173,7 +177,9 @@ private void verifyFinalState(
   @Test
   public void testInterleavedActivity() {
     FakeScheduledExecutorService fakeExecutorService = new FakeScheduledExecutorService();
-    AppStartTrace trace = new AppStartTrace(transportManager, clock, fakeExecutorService);
+    AppStartTrace trace =
+        new AppStartTrace(transportManager, clock, configResolver, fakeExecutorService);
+    trace.registerActivityLifecycleCallbacks(appContext);
     // first activity onCreate()
     currentTime = 1;
     trace.onActivityCreated(activity1, bundle);
@@ -208,9 +214,14 @@ public void testInterleavedActivity() {
   @Test
   public void testDelayedAppStart() {
     FakeScheduledExecutorService fakeExecutorService = new FakeScheduledExecutorService();
-    AppStartTrace trace = new AppStartTrace(transportManager, clock, fakeExecutorService);
+    AppStartTrace trace =
+        new AppStartTrace(transportManager, clock, configResolver, fakeExecutorService);
+    trace.registerActivityLifecycleCallbacks(appContext);
     // Delays activity creation after 1 minute from app start time.
-    currentTime = appStartTime + TimeUnit.MINUTES.toMicros(1) + 1;
+    currentTime =
+        TimeUnit.MILLISECONDS.toMicros(SystemClock.elapsedRealtime())
+            + TimeUnit.MINUTES.toMicros(1)
+            + 1;
     trace.onActivityCreated(activity1, bundle);
     Assert.assertEquals(currentTime, trace.getOnCreateTime().getMicros());
     ++currentTime;
@@ -229,7 +240,8 @@ public void testDelayedAppStart() {
   @Test
   public void testStartFromBackground() {
     FakeScheduledExecutorService fakeExecutorService = new FakeScheduledExecutorService();
-    AppStartTrace trace = new AppStartTrace(transportManager, clock, fakeExecutorService);
+    AppStartTrace trace =
+        new AppStartTrace(transportManager, clock, configResolver, fakeExecutorService);
     trace.setIsStartFromBackground();
     trace.onActivityCreated(activity1, bundle);
     Assert.assertNull(trace.getOnCreateTime());
@@ -247,20 +259,51 @@ public void testStartFromBackground() {
   }
 
   @Test
-  public void testFirebasePerfProviderOnAttachInfo_initializesGaugeCollection() {
-    com.google.firebase.perf.session.PerfSession mockPerfSession =
-        mock(com.google.firebase.perf.session.PerfSession.class);
-    when(mockPerfSession.sessionId()).thenReturn("sessionId");
-    when(mockPerfSession.isGaugeAndEventCollectionEnabled()).thenReturn(true);
-
-    SessionManager.getInstance().setPerfSession(mockPerfSession);
-    String oldSessionId = SessionManager.getInstance().perfSession().sessionId();
-    Assert.assertEquals(oldSessionId, SessionManager.getInstance().perfSession().sessionId());
+  @Config(sdk = 26)
+  public void timeToInitialDisplay_isLogged() {
+    // Test setup
+    when(clock.getTime()).thenCallRealMethod(); // Use robolectric shadows to manipulate time
+    View testView = new View(appContext);
+    when(activity1.findViewById(android.R.id.content)).thenReturn(testView);
+    when(activity2.findViewById(android.R.id.content)).thenReturn(testView);
+    when(configResolver.getIsExperimentTTIDEnabled()).thenReturn(true);
+    FakeScheduledExecutorService fakeExecutorService = new FakeScheduledExecutorService();
+    AppStartTrace trace =
+        new AppStartTrace(transportManager, clock, configResolver, fakeExecutorService);
+    trace.registerActivityLifecycleCallbacks(appContext);
+    // Simulate resume and manually stepping time forward
+    ShadowSystemClock.advanceBy(Duration.ofMillis(1000));
+    long resumeTime = TimeUnit.NANOSECONDS.toMicros(SystemClock.elapsedRealtimeNanos());
+    trace.onActivityCreated(activity1, bundle);
+    trace.onActivityStarted(activity1);
+    trace.onActivityResumed(activity1);
+    // Experiment: simulate new activity before draw
+    trace.onActivityStarted(activity2);
+    trace.onActivityResumed(activity2);
+    trace.onActivityPaused(activity1);
+    trace.onActivityStopped(activity1);
+    trace.onActivityDestroyed(activity1);
+    fakeExecutorService.runAll();
+    // only the old original _as should have been sent
+    verify(transportManager, times(1))
+        .log(isA(TraceMetric.class), isA(ApplicationProcessState.class));
 
-    FirebasePerfProvider provider = new FirebasePerfProvider();
-    provider.attachInfo(ApplicationProvider.getApplicationContext(), new ProviderInfo());
+    // Simulate draw and manually stepping time forward
+    ShadowSystemClock.advanceBy(Duration.ofMillis(1000));
+    long drawTime = TimeUnit.NANOSECONDS.toMicros(SystemClock.elapsedRealtimeNanos());
+    testView.getViewTreeObserver().dispatchOnPreDraw();
+    testView.getViewTreeObserver().dispatchOnDraw();
+    shadowOf(Looper.getMainLooper()).idle();
+    fakeExecutorService.runNext();
+    verify(transportManager, times(2))
+        .log(traceArgumentCaptor.capture(), isA(ApplicationProcessState.class));
 
-    Assert.assertEquals(oldSessionId, SessionManager.getInstance().perfSession().sessionId());
-    verify(mockPerfSession, times(2)).isGaugeAndEventCollectionEnabled();
+    // Verify ttid trace is being logged
+    TraceMetric ttid = traceArgumentCaptor.getValue();
+    long appStartTime = TimeUnit.MILLISECONDS.toMicros(Process.getStartElapsedRealtime());
+    assertThat(ttid.getName()).isEqualTo("_experiment_app_start_ttid");
+    assertThat(ttid.getDurationUs()).isNotEqualTo(resumeTime - appStartTime);
+    assertThat(ttid.getDurationUs()).isEqualTo(drawTime - appStartTime);
+    assertThat(ttid.getSubtracesCount()).isEqualTo(3);
   }
 }
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/FrameMetricsCalculatorTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/FrameMetricsCalculatorTest.java
new file mode 100644
index 00000000000..02bb9a158c2
--- /dev/null
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/FrameMetricsCalculatorTest.java
@@ -0,0 +1,117 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.perf.metrics;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.util.SparseIntArray;
+import androidx.core.app.FrameMetricsAggregator;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Unit tests for {@link FrameMetricsCalculator}. */
+@RunWith(RobolectricTestRunner.class)
+public class FrameMetricsCalculatorTest {
+  @Test
+  public void calculateFrameMetrics_sparseIntArrayIsNull_returnsFrameMetricsWithAllZeros() {
+    SparseIntArray[] arr = new SparseIntArray[1];
+    arr[FrameMetricsAggregator.TOTAL_INDEX] = null;
+    FrameMetricsCalculator.PerfFrameMetrics metrics =
+        FrameMetricsCalculator.calculateFrameMetrics(arr);
+    assertThat(metrics.getTotalFrames()).isEqualTo(0);
+    assertThat(metrics.getSlowFrames()).isEqualTo(0);
+    assertThat(metrics.getFrozenFrames()).isEqualTo(0);
+  }
+
+  @Test
+  public void calculateFrameMetrics_validSparseIntArray_returnsCorrectFrameMetrics() {
+    // Slow frames have duration greater than 16ms and frozen frames have duration greater than
+    // 700ms. The key value pair means (duration, num_of_samples).
+    SparseIntArray sparseIntArray = new SparseIntArray();
+    sparseIntArray.append(5, 3);
+    sparseIntArray.append(20, 2);
+    sparseIntArray.append(800, 5);
+    SparseIntArray[] arr = new SparseIntArray[1];
+    arr[FrameMetricsAggregator.TOTAL_INDEX] = sparseIntArray;
+
+    FrameMetricsCalculator.PerfFrameMetrics metrics =
+        FrameMetricsCalculator.calculateFrameMetrics(arr);
+
+    // we should expect 3+2+5=10 total frames, 2+5=7 slow frames, and 5 frozen frames.
+    assertThat(metrics.getTotalFrames()).isEqualTo(10);
+    assertThat(metrics.getSlowFrames()).isEqualTo(7);
+    assertThat(metrics.getFrozenFrames()).isEqualTo(5);
+  }
+
+  @Test
+  public void
+      calculateFrameMetrics_validSparseIntArrayWithoutFrozenFrames_returnsCorrectFrameMetrics() {
+    // Slow frames have duration greater than 16ms and frozen frames have duration greater than
+    // 700ms. The key value pair means (duration, num_of_samples).
+    SparseIntArray sparseIntArray = new SparseIntArray();
+    sparseIntArray.append(5, 3);
+    sparseIntArray.append(20, 2);
+    SparseIntArray[] arr = new SparseIntArray[1];
+    arr[FrameMetricsAggregator.TOTAL_INDEX] = sparseIntArray;
+
+    FrameMetricsCalculator.PerfFrameMetrics metrics =
+        FrameMetricsCalculator.calculateFrameMetrics(arr);
+
+    // we should expect 3+2=5 total frames, 2 slow frames, and 0 frozen frames.
+    assertThat(metrics.getTotalFrames()).isEqualTo(5);
+    assertThat(metrics.getSlowFrames()).isEqualTo(2);
+    assertThat(metrics.getFrozenFrames()).isEqualTo(0);
+  }
+
+  @Test
+  public void
+      calculateFrameMetrics_validSparseIntArrayWithoutSlowFrames_returnsCorrectFrameMetrics() {
+    // Slow frames have duration greater than 16ms and frozen frames have duration greater than
+    // 700ms. The key value pair means (duration, num_of_samples).
+    SparseIntArray sparseIntArray = new SparseIntArray();
+    sparseIntArray.append(5, 3);
+    sparseIntArray.append(701, 2);
+    SparseIntArray[] arr = new SparseIntArray[1];
+    arr[FrameMetricsAggregator.TOTAL_INDEX] = sparseIntArray;
+
+    FrameMetricsCalculator.PerfFrameMetrics metrics =
+        FrameMetricsCalculator.calculateFrameMetrics(arr);
+
+    // we should expect 3+2=5 total frames, 0+2=2 slow frames, and 2 frozen frames.
+    assertThat(metrics.getTotalFrames()).isEqualTo(5);
+    assertThat(metrics.getSlowFrames()).isEqualTo(2);
+    assertThat(metrics.getFrozenFrames()).isEqualTo(2);
+  }
+
+  @Test
+  public void
+      calculateFrameMetrics_validSparseIntArrayWithoutSlowFramesOrFrozenFrames_returnsCorrectFrameMetrics() {
+    // Slow frames have duration greater than 16ms and frozen frames have duration greater than
+    // 700ms. The key value pair means (duration, num_of_samples).
+    SparseIntArray sparseIntArray = new SparseIntArray();
+    sparseIntArray.append(5, 3);
+    SparseIntArray[] arr = new SparseIntArray[1];
+    arr[FrameMetricsAggregator.TOTAL_INDEX] = sparseIntArray;
+
+    FrameMetricsCalculator.PerfFrameMetrics metrics =
+        FrameMetricsCalculator.calculateFrameMetrics(arr);
+
+    // we should expect 3 total frames, 0 slow frames, and 0 frozen frames.
+    assertThat(metrics.getTotalFrames()).isEqualTo(3);
+    assertThat(metrics.getSlowFrames()).isEqualTo(0);
+    assertThat(metrics.getFrozenFrames()).isEqualTo(0);
+  }
+}
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java
index 462ddea7eea..61b3823741d 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java
@@ -28,7 +28,6 @@
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Timer;
-import com.google.firebase.perf.v1.ApplicationProcessState;
 import com.google.firebase.perf.v1.NetworkRequestMetric;
 import com.google.firebase.perf.v1.NetworkRequestMetric.HttpMethod;
 import java.nio.charset.StandardCharsets;
@@ -226,7 +225,8 @@ public void testSessionIdAdditionInNetworkRequestMetric() {
     assertThat(this.networkMetricBuilder.getSessions()).isEmpty();
 
     int numberOfSessionIds = metricBuilder.getSessions().size();
-    SessionManager.getInstance().updatePerfSession(ApplicationProcessState.FOREGROUND);
+    PerfSession perfSession = PerfSession.createWithId("testSessionId");
+    SessionManager.getInstance().updatePerfSession(perfSession);
 
     assertThat(metricBuilder.getSessions().size()).isEqualTo(numberOfSessionIds + 1);
   }
@@ -242,26 +242,11 @@ public void testSessionIdNotAddedIfPerfSessionIsNull() {
 
     int numberOfSessionIds = metricBuilder.getSessions().size();
 
-    new SessionManager(mock(GaugeManager.class), null, mock(AppStateMonitor.class))
-        .onUpdateAppState(ApplicationProcessState.FOREGROUND);
+    new SessionManager(mock(GaugeManager.class), null, mock(AppStateMonitor.class));
 
     assertThat(metricBuilder.getSessions()).hasSize(numberOfSessionIds);
   }
 
-  @Test
-  public void testSessionIdNotAddedForBackgroundInNetworkRequestMetric() {
-    NetworkRequestMetricBuilder metricBuilder =
-        NetworkRequestMetricBuilder.builder(mockTransportManager);
-    metricBuilder.setRequestStartTimeMicros(/* time= */ 2000);
-
-    assertThat(this.networkMetricBuilder.getSessions()).isNotNull();
-    assertThat(this.networkMetricBuilder.getSessions()).isEmpty();
-
-    int numberOfSessionIds = metricBuilder.getSessions().size();
-    SessionManager.getInstance().onUpdateAppState(ApplicationProcessState.BACKGROUND);
-    assertThat(metricBuilder.getSessions().size() == numberOfSessionIds).isTrue();
-  }
-
   @Test
   public void testSetRequestStartTimeMicrosTriggerSingleGaugeCollectionOnVerboseSession() {
     forceVerboseSession();
@@ -343,7 +328,7 @@ public void testUpdateSessionWithValidSessionIsAdded() {
     networkMetricBuilder.setRequestStartTimeMicros(/* time= */ 2000);
 
     assertThat(networkMetricBuilder.getSessions()).hasSize(1);
-    networkMetricBuilder.updateSession(PerfSession.create());
+    networkMetricBuilder.updateSession(PerfSession.createWithId("testSessionId"));
     assertThat(networkMetricBuilder.getSessions()).hasSize(2);
   }
 
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TestUtil.kt b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TestUtil.kt
new file mode 100644
index 00000000000..88c5890f9bf
--- /dev/null
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TestUtil.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.perf.metrics
+
+fun getTraceCounter(trace: Trace): Map<String, Counter> {
+  return trace.getCounters()
+}
+
+fun getTraceCounterCount(trace: Trace, counterName: String): Long {
+  return trace.getCounters().get(counterName)!!.getCount()
+}
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceTest.java
index 62308edb4fe..0be443031f2 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceTest.java
@@ -1016,7 +1016,8 @@ public void testSessionIdAdditionInTrace() {
 
     int numberOfSessionIds = trace.getSessions().size();
 
-    SessionManager.getInstance().updatePerfSession(ApplicationProcessState.FOREGROUND);
+    PerfSession perfSession = PerfSession.createWithId("test_session_id");
+    SessionManager.getInstance().updatePerfSession(perfSession);
     assertThat(trace.getSessions()).hasSize(numberOfSessionIds + 1);
 
     trace.stop();
@@ -1031,23 +1032,7 @@ public void testSessionIdNotAddedIfPerfSessionIsNull() {
 
     int numberOfSessionIds = trace.getSessions().size();
 
-    new SessionManager(mock(GaugeManager.class), null, mock(AppStateMonitor.class))
-        .onUpdateAppState(ApplicationProcessState.FOREGROUND);
-
-    assertThat(trace.getSessions()).hasSize(numberOfSessionIds);
-
-    trace.stop();
-  }
-
-  @Test
-  public void testSessionIdNotAddedInBackgroundInTrace() {
-    Trace trace = Trace.getTrace("myRandomTrace4");
-    trace.start();
-
-    assertThat(trace.getSessions()).isNotNull();
-
-    int numberOfSessionIds = trace.getSessions().size();
-    SessionManager.getInstance().onUpdateAppState(ApplicationProcessState.BACKGROUND);
+    new SessionManager(mock(GaugeManager.class), null, mock(AppStateMonitor.class));
 
     assertThat(trace.getSessions()).hasSize(numberOfSessionIds);
 
@@ -1086,7 +1071,7 @@ public void testUpdateSessionWithValidSessionIsAdded() {
     trace.start();
 
     assertThat(trace.getSessions()).hasSize(1);
-    trace.updateSession(PerfSession.create());
+    trace.updateSession(PerfSession.createWithId("test_session_id"));
     assertThat(trace.getSessions()).hasSize(2);
 
     trace.stop();
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfGaugeManagerValidatorTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfGaugeManagerValidatorTest.java
index cbc2137f541..02f0ef21314 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfGaugeManagerValidatorTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfGaugeManagerValidatorTest.java
@@ -56,7 +56,6 @@ public void testGaugeMetricIsValid() {
     // Construct GaugeMetadata
     GaugeMetadata gaugeMetadata =
         createValidGaugeMetadata(
-            "processName",
             /* deviceRamSizeKb= */ 2000,
             /* maxAppJavaHeapMemoryKb= */ 1000,
             /* maxEncouragedAppJavaHeapMemoryKb= */ 800);
@@ -115,7 +114,6 @@ public void testGaugeMetricWithOnlyMemoryMetricIsValid() {
   public void testGaugeMetricWithOnlyGaugeMetadataIsValid() {
     GaugeMetadata gaugeMetadata =
         createValidGaugeMetadata(
-            "processName",
             /* deviceRamSizeKb= */ 2000,
             /* maxAppJavaHeapMemoryKb= */ 1000,
             /* maxEncouragedAppJavaHeapMemoryKb= */ 800);
@@ -134,7 +132,6 @@ public void testGaugeMetricWithOnlyGaugeMetadataIsValid() {
   public void testGaugeMetadataWithoutMaxJavaHeapIsNotValid() {
     GaugeMetadata gaugeMetadata =
         GaugeMetadata.newBuilder()
-            .setProcessName("processName")
             .setDeviceRamSizeKb(2000)
             .setMaxEncouragedAppJavaHeapMemoryKb(800)
             .build();
@@ -202,12 +199,8 @@ private AndroidMemoryReading createValidAndroidMetricReading(int currentUsedAppJ
   }
 
   private GaugeMetadata createValidGaugeMetadata(
-      String processName,
-      int deviceRamSizeKb,
-      int maxAppJavaHeapMemoryKb,
-      int maxEncouragedAppJavaHeapMemoryKb) {
+      int deviceRamSizeKb, int maxAppJavaHeapMemoryKb, int maxEncouragedAppJavaHeapMemoryKb) {
     GaugeMetadata.Builder fakeGaugeMetadataBuilder = GaugeMetadata.newBuilder();
-    fakeGaugeMetadataBuilder.setProcessName(processName);
     fakeGaugeMetadataBuilder.setDeviceRamSizeKb(deviceRamSizeKb);
     fakeGaugeMetadataBuilder.setMaxAppJavaHeapMemoryKb(maxAppJavaHeapMemoryKb);
     fakeGaugeMetadataBuilder.setMaxEncouragedAppJavaHeapMemoryKb(maxEncouragedAppJavaHeapMemoryKb);
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidatorTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidatorTest.java
index fefc9f34857..95245c7ffd4 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidatorTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidatorTest.java
@@ -169,47 +169,77 @@ public void screenTrace_shouldNotAllowNonPositiveTotalFrames() {
   }
 
   @Test
-  public void testInvalidCustomAttribute() {
+  public void traceValidator_customAttributeWithUnderscorePrefix_marksPerfMetricInvalid() {
     TraceMetric.Builder trace = createValidTraceMetric().putCustomAttributes("_test", "value");
     assertThat(new FirebasePerfTraceValidator(trace.build()).isValidPerfMetric()).isFalse();
+  }
 
-    trace = createValidTraceMetric();
-    trace.clearCustomAttributes().putCustomAttributes("0_test", "value");
+  @Test
+  public void traceValidator_customAttributeWithNumberPrefix_marksPerfMetricInvalid() {
+    TraceMetric.Builder trace = createValidTraceMetric().putCustomAttributes("0_test", "value");
     assertThat(new FirebasePerfTraceValidator(trace.build()).isValidPerfMetric()).isFalse();
+  }
 
-    trace = trace.clone();
-    trace.clearCustomAttributes().putCustomAttributes("google_test", "value");
+  @Test
+  public void traceValidator_customAttributeWithGooglePrefix_marksPerfMetricInvalid() {
+    TraceMetric.Builder trace =
+        createValidTraceMetric().putCustomAttributes("google_test", "value");
+    assertThat(new FirebasePerfTraceValidator(trace.build()).isValidPerfMetric()).isFalse();
+  }
+
+  @Test
+  public void traceValidator_customAttributeWithFirebasePrefix_marksPerfMetricInvalid() {
+    TraceMetric.Builder trace =
+        createValidTraceMetric().putCustomAttributes("firebase_test", "value");
     assertThat(new FirebasePerfTraceValidator(trace.build()).isValidPerfMetric()).isFalse();
+  }
 
-    trace = trace.clone();
-    trace.clearCustomAttributes().putCustomAttributes("firebase_test", "value");
+  @Test
+  public void traceValidator_customAttributeWithGAPrefix_marksPerfMetricInvalid() {
+    TraceMetric.Builder trace = createValidTraceMetric().putCustomAttributes("ga_test", "value");
     assertThat(new FirebasePerfTraceValidator(trace.build()).isValidPerfMetric()).isFalse();
+  }
 
-    trace = trace.clone();
-    trace.clearCustomAttributes().putCustomAttributes("ga_test", "value");
+  @Test
+  public void traceValidator_customAttributeEmptyValue_marksPerfMetricInvalid() {
+    TraceMetric.Builder trace = createValidTraceMetric().putCustomAttributes("key", "");
     assertThat(new FirebasePerfTraceValidator(trace.build()).isValidPerfMetric()).isFalse();
+  }
+
+  @Test
+  public void traceValidator_customAttributeEmptyKey_marksPerfMetricInvalid() {
+    TraceMetric.Builder trace = createValidTraceMetric().putCustomAttributes("", "value");
+    assertThat(new FirebasePerfTraceValidator(trace.build()).isValidPerfMetric()).isFalse();
+  }
+
+  @Test
+  public void traceValidator_customAttributeEmptyKeyAndValue_marksPerfMetricInvalid() {
+    TraceMetric.Builder trace = createValidTraceMetric().putCustomAttributes("", "");
+    assertThat(new FirebasePerfTraceValidator(trace.build()).isValidPerfMetric()).isFalse();
+  }
+
+  @Test
+  public void traceValidator_customAttributeWithLongKey_marksPerfMetricInvalid() {
 
     StringBuilder longString = new StringBuilder();
     for (int i = 0; i <= Constants.MAX_ATTRIBUTE_KEY_LENGTH; i++) {
       longString.append("a");
     }
-
-    trace = trace.clone();
-    trace.clearCustomAttributes().putCustomAttributes(longString.toString(), "value");
+    TraceMetric.Builder trace =
+        createValidTraceMetric().putCustomAttributes(longString.toString(), "value");
     assertThat(new FirebasePerfTraceValidator(trace.build()).isValidPerfMetric()).isFalse();
+  }
+
+  @Test
+  public void traceValidator_customAttributeWithLongValue_marksPerfMetricInvalid() {
 
-    longString = new StringBuilder();
+    StringBuilder longString = new StringBuilder();
     for (int i = 0; i <= Constants.MAX_ATTRIBUTE_VALUE_LENGTH; i++) {
       longString.append("a");
     }
-
-    trace = trace.clone();
-    trace.clearCustomAttributes().putCustomAttributes("key", longString.toString());
+    TraceMetric.Builder trace =
+        createValidTraceMetric().putCustomAttributes("key", longString.toString());
     assertThat(new FirebasePerfTraceValidator(trace.build()).isValidPerfMetric()).isFalse();
-
-    trace = trace.clone();
-    trace.clearCustomAttributes().putCustomAttributes("test", "value");
-    assertThat(new FirebasePerfTraceValidator(trace.build()).isValidPerfMetric()).isTrue();
   }
 
   @Test
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfHttpClientTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfHttpClientTest.java
index 0fb53cf81e8..9511d5fba86 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfHttpClientTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfHttpClientTest.java
@@ -17,6 +17,7 @@
 import static com.google.firebase.perf.testutil.Assert.assertThrows;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.eq;
@@ -158,12 +159,12 @@ public void testRequestHandler() throws IOException, URISyntaxException {
     FirebasePerfHttpClient.execute(client, request, handler, timer, transportManager);
 
     ArgumentCaptor<HttpUriRequest> argRequest = ArgumentCaptor.forClass(HttpUriRequest.class);
-    ArgumentCaptor<ResponseHandlerInterface> argHandler =
-        ArgumentCaptor.forClass(ResponseHandlerInterface.class);
+    ArgumentCaptor<InstrumentApacheHttpResponseHandler> argHandler =
+        ArgumentCaptor.forClass(InstrumentApacheHttpResponseHandler.class);
     verify(client).execute(argRequest.capture(), argHandler.capture());
     verify(timer).reset();
     assertSame(argRequest.getValue(), request);
-    assertTrue(argHandler.getValue() instanceof InstrumentApacheHttpResponseHandler);
+    assertNotNull(argHandler.getValue());
   }
 
   @Test
@@ -176,13 +177,13 @@ public void testRequestHandlerContext() throws IOException, URISyntaxException {
     FirebasePerfHttpClient.execute(client, request, handler, context, timer, transportManager);
 
     ArgumentCaptor<HttpUriRequest> argRequest = ArgumentCaptor.forClass(HttpUriRequest.class);
-    ArgumentCaptor<ResponseHandlerInterface> argHandler =
-        ArgumentCaptor.forClass(ResponseHandlerInterface.class);
+    ArgumentCaptor<InstrumentApacheHttpResponseHandler> argHandler =
+        ArgumentCaptor.forClass(InstrumentApacheHttpResponseHandler.class);
     ArgumentCaptor<HttpContext> argContext = ArgumentCaptor.forClass(HttpContext.class);
     verify(client).execute(argRequest.capture(), argHandler.capture(), argContext.capture());
     verify(timer).reset();
     assertSame(argRequest.getValue(), request);
-    assertTrue(argHandler.getValue() instanceof InstrumentApacheHttpResponseHandler);
+    assertNotNull(argHandler.getValue());
     assertSame(argContext.getValue(), context);
   }
 
@@ -197,13 +198,13 @@ public void testHostRequestHandler() throws IOException, URISyntaxException {
 
     ArgumentCaptor<HttpHost> argHost = ArgumentCaptor.forClass(HttpHost.class);
     ArgumentCaptor<HttpRequest> argRequest = ArgumentCaptor.forClass(HttpRequest.class);
-    ArgumentCaptor<ResponseHandlerInterface> argHandler =
-        ArgumentCaptor.forClass(ResponseHandlerInterface.class);
+    ArgumentCaptor<InstrumentApacheHttpResponseHandler> argHandler =
+        ArgumentCaptor.forClass(InstrumentApacheHttpResponseHandler.class);
     verify(client).execute(argHost.capture(), argRequest.capture(), argHandler.capture());
     verify(timer).reset();
     assertSame(argHost.getValue(), host);
     assertSame(argRequest.getValue(), request);
-    assertTrue(argHandler.getValue() instanceof InstrumentApacheHttpResponseHandler);
+    assertNotNull(argHandler.getValue());
   }
 
   @Test
@@ -219,8 +220,8 @@ public void testHostRequestHandlerContext() throws IOException, URISyntaxExcepti
 
     ArgumentCaptor<HttpHost> argHost = ArgumentCaptor.forClass(HttpHost.class);
     ArgumentCaptor<HttpRequest> argRequest = ArgumentCaptor.forClass(HttpRequest.class);
-    ArgumentCaptor<ResponseHandlerInterface> argHandler =
-        ArgumentCaptor.forClass(ResponseHandlerInterface.class);
+    ArgumentCaptor<InstrumentApacheHttpResponseHandler> argHandler =
+        ArgumentCaptor.forClass(InstrumentApacheHttpResponseHandler.class);
     ArgumentCaptor<HttpContext> argContext = ArgumentCaptor.forClass(HttpContext.class);
     verify(client)
         .execute(
@@ -228,7 +229,7 @@ public void testHostRequestHandlerContext() throws IOException, URISyntaxExcepti
     verify(timer).reset();
     assertSame(argHost.getValue(), host);
     assertSame(argRequest.getValue(), request);
-    assertTrue(argHandler.getValue() instanceof InstrumentApacheHttpResponseHandler);
+    assertNotNull(argHandler.getValue());
     assertSame(argContext.getValue(), context);
   }
 
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/session/PerfSessionTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/session/PerfSessionTest.java
index 73878003acd..43257987b0f 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/session/PerfSessionTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/session/PerfSessionTest.java
@@ -74,7 +74,7 @@ public void instanceCreation() {
   public void shouldCollectGaugesAndEvents_perfMonDisabledAtRuntime_sessionNotVerbose() {
     ConfigResolver configResolver = ConfigResolver.getInstance();
     Bundle bundle = new Bundle();
-    bundle.putFloat("sessions_sampling_percentage", 100f);
+    bundle.putFloat("sessions_sampling_percentage", 100);
     configResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
     // By default, session is verbose if developer has set 100% of session verbosity.
@@ -96,7 +96,7 @@ public void shouldCollectGaugesAndEvents_perfMonDisabledAtBuildtime_verbosityDep
     ConfigResolver configResolver = ConfigResolver.getInstance();
     // Developer disables Performance collection at AndroidManifest.
     Bundle bundle = new Bundle();
-    bundle.putFloat("sessions_sampling_percentage", 100f);
+    bundle.putFloat("sessions_sampling_percentage", 100);
     bundle.putBoolean("firebase_performance_collection_enabled", false);
     configResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
@@ -119,7 +119,7 @@ public void shouldCollectGaugesAndEvents_perfMonDisabledAtBuildtime_verbosityDep
   public void shouldCollectGaugesAndEvents_perfMonDeactivated_sessionNotVerbose() {
     ConfigResolver configResolver = ConfigResolver.getInstance();
     Bundle bundle = new Bundle();
-    bundle.putFloat("sessions_sampling_percentage", 100f);
+    bundle.putFloat("sessions_sampling_percentage", 100);
     bundle.putBoolean("firebase_performance_collection_deactivated", true);
     configResolver.setMetadataBundle(new ImmutableBundle(bundle));
 
@@ -160,21 +160,21 @@ public void testPerfSessionConversionWithoutVerbosity() {
   @Test
   public void testPerfSessionsCreateDisabledGaugeCollectionWhenVerboseSessionForceDisabled() {
     forceNonVerboseSession();
-    PerfSession testPerfSession = PerfSession.create();
+    PerfSession testPerfSession = PerfSession.createWithId("sessionId");
     assertThat(testPerfSession.isGaugeAndEventCollectionEnabled()).isFalse();
   }
 
   @Test
   public void testPerfSessionsCreateDisabledGaugeCollectionWhenSessionsFeatureDisabled() {
     forceSessionsFeatureDisabled();
-    PerfSession testPerfSession = PerfSession.create();
+    PerfSession testPerfSession = PerfSession.createWithId("sessionId");
     assertThat(testPerfSession.isGaugeAndEventCollectionEnabled()).isFalse();
   }
 
   @Test
   public void testPerfSessionsCreateEnablesGaugeCollectionWhenVerboseSessionForceEnabled() {
     forceVerboseSession();
-    PerfSession testPerfSession = PerfSession.create();
+    PerfSession testPerfSession = PerfSession.createWithId("sessionId");
     assertThat(testPerfSession.isGaugeAndEventCollectionEnabled()).isTrue();
   }
 
@@ -185,16 +185,16 @@ public void testBuildAndSortMovesTheVerboseSessionToTop() {
 
     // Next, create 3 non-verbose sessions
     List<PerfSession> sessions = new ArrayList<>();
-    sessions.add(PerfSession.create());
-    sessions.add(PerfSession.create());
-    sessions.add(PerfSession.create());
+    sessions.add(PerfSession.createWithId("sessionId1"));
+    sessions.add(PerfSession.createWithId("sessionId2"));
+    sessions.add(PerfSession.createWithId("sessionId3"));
 
     // Force all the sessions from now onwards to be verbose
     forceVerboseSession();
 
     // Next, create 2 verbose sessions
-    sessions.add(PerfSession.create());
-    sessions.add(PerfSession.create());
+    sessions.add(PerfSession.createWithId("sessionId4"));
+    sessions.add(PerfSession.createWithId("sessionId5"));
 
     // Verify that the first session in the list of sessions was not verbose
     assertThat(sessions.get(0).isVerbose()).isFalse();
@@ -217,7 +217,7 @@ public void testIsExpiredReturnsFalseWhenCurrentSessionLengthIsLessThanMaxSessio
     when(mockClock.getTime()).thenReturn(mockTimer);
 
     PerfSession session = new PerfSession("sessionId", mockClock);
-    assertThat(session.isExpired()).isFalse();
+    assertThat(session.isSessionRunningTooLong()).isFalse();
   }
 
   @Test
@@ -228,7 +228,7 @@ public void testIsExpiredReturnsFalseWhenCurrentSessionLengthIsEqualToMaxSession
     when(mockClock.getTime()).thenReturn(mockTimer);
 
     PerfSession session = new PerfSession("sessionId", mockClock);
-    assertThat(session.isExpired()).isFalse();
+    assertThat(session.isSessionRunningTooLong()).isFalse();
   }
 
   @Test
@@ -239,6 +239,6 @@ public void testIsExpiredReturnsTrueWhenCurrentSessionLengthIsGreaterThanMaxSess
     when(mockClock.getTime()).thenReturn(mockTimer);
 
     PerfSession session = new PerfSession("sessionId", mockClock);
-    assertThat(session.isExpired()).isTrue();
+    assertThat(session.isSessionRunningTooLong()).isTrue();
   }
 }
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/session/SessionManagerTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/session/SessionManagerTest.java
index cbe4da788cd..f3e3795f3f8 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/session/SessionManagerTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/session/SessionManagerTest.java
@@ -19,6 +19,7 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -30,9 +31,12 @@
 import com.google.firebase.perf.FirebasePerformanceTestBase;
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.session.gauges.GaugeManager;
+import com.google.firebase.perf.util.Clock;
+import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.ApplicationProcessState;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,6 +56,8 @@ public class SessionManagerTest extends FirebasePerformanceTestBase {
   @Mock private AppStateMonitor mockAppStateMonitor;
   @Mock private Context mockApplicationContext;
 
+  @Mock private Clock mockClock;
+
   @Before
   public void setUp() {
     initMocks(this);
@@ -118,7 +124,7 @@ public void testOnUpdateAppStateDoesntGenerateNewSessionIdOnBackgroundState() {
 
   @Test
   public void testOnUpdateAppStateGeneratesNewSessionIdOnBackgroundStateIfPerfSessionExpires() {
-    when(mockPerfSession.isExpired()).thenReturn(true);
+    when(mockPerfSession.isSessionRunningTooLong()).thenReturn(true);
     SessionManager testSessionManager =
         new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
     String oldSessionId = testSessionManager.perfSession().sessionId();
@@ -175,7 +181,7 @@ public void testOnUpdateAppStateGeneratesNewSessionIdOnBackgroundStateIfPerfSess
   @Test
   public void
       testOnUpdateAppStateMakesGaugeManagerLogGaugeMetadataOnBackgroundAppStateIfSessionIsVerboseAndTimedOut() {
-    when(mockPerfSession.isExpired()).thenReturn(true);
+    when(mockPerfSession.isSessionRunningTooLong()).thenReturn(true);
     forceVerboseSession();
 
     SessionManager testSessionManager =
@@ -196,17 +202,20 @@ public void testOnUpdateAppStateMakesGaugeManagerStartCollectingGaugesIfSessionI
     testSessionManager.onUpdateAppState(ApplicationProcessState.FOREGROUND);
 
     verify(mockGaugeManager)
-        .startCollectingGauges(
-            AdditionalMatchers.not(eq(mockPerfSession)), eq(ApplicationProcessState.FOREGROUND));
+        .startCollectingGauges(AdditionalMatchers.not(eq(mockPerfSession)), any());
   }
 
+  // LogGaugeData on new perf session when Verbose
+  // NotLogGaugeData on new perf session when not Verbose
+  // Mark Session as expired after time limit.
+
   @Test
   public void testOnUpdateAppStateMakesGaugeManagerStopCollectingGaugesIfSessionIsNonVerbose() {
     forceNonVerboseSession();
 
     SessionManager testSessionManager =
         new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    testSessionManager.onUpdateAppState(ApplicationProcessState.FOREGROUND);
+    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId"));
 
     verify(mockGaugeManager).stopCollectingGauges();
   }
@@ -216,140 +225,74 @@ public void testOnUpdateAppStateMakesGaugeManagerStopCollectingGaugesWhenSession
     forceSessionsFeatureDisabled();
 
     SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, PerfSession.create(), mockAppStateMonitor);
-    testSessionManager.onUpdateAppState(ApplicationProcessState.FOREGROUND);
+        new SessionManager(
+            mockGaugeManager, PerfSession.createWithId("testSessionId"), mockAppStateMonitor);
+    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId2"));
 
     verify(mockGaugeManager).stopCollectingGauges();
   }
 
   @Test
   public void testGaugeMetadataIsFlushedOnlyWhenNewVerboseSessionIsCreated() {
-    when(mockPerfSession.isExpired()).thenReturn(false);
-
-    // Forcing a verbose session will enable Gauge collection
-    forceVerboseSession();
-    SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, PerfSession.create(), mockAppStateMonitor);
-
-    // A new session is created when the app comes to foreground
-    testSessionManager.onUpdateAppState(ApplicationProcessState.FOREGROUND);
-    String sessionId1 = testSessionManager.perfSession().sessionId();
-
-    // Session ID should remain unchanged when the app goes to background
-    testSessionManager.onUpdateAppState(ApplicationProcessState.BACKGROUND);
-    String sessionId2 = testSessionManager.perfSession().sessionId();
-    assertThat(sessionId2).matches(sessionId1);
+    when(mockPerfSession.isSessionRunningTooLong()).thenReturn(false);
 
-    // Forcing a non-verbose session will disable Gauge collection
+    // Start with a non verbose session
     forceNonVerboseSession();
-
-    // A new session is created when the app comes to foreground
-    testSessionManager.onUpdateAppState(ApplicationProcessState.FOREGROUND);
-    String sessionId3 = testSessionManager.perfSession().sessionId();
-    assertThat(sessionId3).doesNotMatch(sessionId2);
-
-    verify(mockGaugeManager, times(1))
-        .logGaugeMetadata(
-            eq(sessionId1), eq(com.google.firebase.perf.v1.ApplicationProcessState.FOREGROUND));
-  }
-
-  @Test
-  public void testSessionIdUpdatesIfPerfSessionExpires() {
-    when(mockPerfSession.isExpired()).thenReturn(true);
-    SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    String oldSessionId = testSessionManager.perfSession().sessionId();
-
-    assertThat(oldSessionId).isNotNull();
-    assertThat(oldSessionId).isEqualTo(testSessionManager.perfSession().sessionId());
-
-    testSessionManager.updatePerfSessionIfExpired();
-    assertThat(oldSessionId).isNotEqualTo(testSessionManager.perfSession().sessionId());
-  }
-
-  @Test
-  public void testSessionIdDoesntUpdateIfPerfSessionDoesntExpires() {
-    when(mockPerfSession.isExpired()).thenReturn(false);
     SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    String oldSessionId = testSessionManager.perfSession().sessionId();
+        new SessionManager(
+            mockGaugeManager, PerfSession.createWithId("testSessionId1"), mockAppStateMonitor);
 
-    assertThat(oldSessionId).isNotNull();
-    assertThat(oldSessionId).isEqualTo(testSessionManager.perfSession().sessionId());
-
-    testSessionManager.updatePerfSessionIfExpired();
-    assertThat(oldSessionId).isEqualTo(testSessionManager.perfSession().sessionId());
-  }
+    verify(mockGaugeManager, times(0))
+        .logGaugeMetadata(
+            eq("testSessionId1"),
+            eq(com.google.firebase.perf.v1.ApplicationProcessState.FOREGROUND));
 
-  @Test
-  public void testPerfSessionExpiredMakesGaugeManagerLogGaugeMetadataIfSessionIsVerbose() {
-    when(mockPerfSession.isExpired()).thenReturn(true);
+    // Forcing a verbose session will enable Gauge collection
     forceVerboseSession();
+    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId2"));
+    verify(mockGaugeManager, times(1)).logGaugeMetadata(eq("testSessionId2"), any());
 
-    SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    testSessionManager.updatePerfSessionIfExpired();
-
-    verify(mockGaugeManager)
-        .logGaugeMetadata(
-            anyString(), nullable(com.google.firebase.perf.v1.ApplicationProcessState.class));
+    // Force a non-verbose session and verify if we are not logging metadata
+    forceVerboseSession();
+    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId3"));
+    verify(mockGaugeManager, times(1)).logGaugeMetadata(eq("testSessionId3"), any());
   }
 
   @Test
-  public void testPerfSessionExpiredDoesntMakeGaugeManagerLogGaugeMetadataIfSessionIsNonVerbose() {
-    when(mockPerfSession.isExpired()).thenReturn(true);
-    forceNonVerboseSession();
+  public void testSessionIdDoesNotUpdateIfPerfSessionRunsTooLong() {
+    Timer mockTimer = mock(Timer.class);
+    when(mockClock.getTime()).thenReturn(mockTimer);
 
+    PerfSession session = new PerfSession("sessionId", mockClock);
     SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    testSessionManager.updatePerfSessionIfExpired();
+        new SessionManager(mockGaugeManager, session, mockAppStateMonitor);
 
-    verify(mockGaugeManager, never())
-        .logGaugeMetadata(
-            anyString(), nullable(com.google.firebase.perf.v1.ApplicationProcessState.class));
-  }
+    assertThat(session.isSessionRunningTooLong()).isFalse();
 
-  @Test
-  public void testPerfSessionExpiredMakesGaugeManagerStartCollectingGaugesIfSessionIsVerbose() {
-    when(mockPerfSession.isExpired()).thenReturn(true);
-    forceVerboseSession();
+    when(mockTimer.getDurationMicros())
+        .thenReturn(TimeUnit.HOURS.toMicros(5)); // Default Max Session Length is 4 hours
+    assertThat(session.isSessionRunningTooLong()).isTrue();
 
-    SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    testSessionManager.updatePerfSessionIfExpired();
-
-    verify(mockGaugeManager)
-        .startCollectingGauges(
-            AdditionalMatchers.not(eq(mockPerfSession)),
-            nullable(com.google.firebase.perf.v1.ApplicationProcessState.class));
+    assertThat(testSessionManager.perfSession().sessionId()).isEqualTo("sessionId");
   }
 
   @Test
-  public void
-      testPerfSessionExpiredDoesntMakeGaugeManagerStartCollectingGaugesIfSessionIsNonVerbose() {
-    when(mockPerfSession.isExpired()).thenReturn(true);
-    forceNonVerboseSession();
+  public void testPerfSessionExpiredMakesGaugeManagerStopsCollectingGaugesIfSessionIsVerbose() {
+    forceVerboseSession();
+    Timer mockTimer = mock(Timer.class);
+    when(mockClock.getTime()).thenReturn(mockTimer);
 
+    PerfSession session = new PerfSession("sessionId", mockClock);
     SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    testSessionManager.updatePerfSessionIfExpired();
+        new SessionManager(mockGaugeManager, session, mockAppStateMonitor);
 
-    verify(mockGaugeManager, never())
-        .startCollectingGauges(
-            eq(mockPerfSession),
-            nullable(com.google.firebase.perf.v1.ApplicationProcessState.class));
-  }
-
-  @Test
-  public void testPerfSessionExpiredMakesGaugeManagerStopCollectingGaugesIfSessionIsNonVerbose() {
-    when(mockPerfSession.isExpired()).thenReturn(true);
-    forceNonVerboseSession();
+    assertThat(session.isSessionRunningTooLong()).isFalse();
 
-    SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    testSessionManager.updatePerfSessionIfExpired();
+    when(mockTimer.getDurationMicros())
+        .thenReturn(TimeUnit.HOURS.toMicros(5)); // Default Max Session Length is 4 hours
 
-    verify(mockGaugeManager).stopCollectingGauges();
+    assertThat(session.isSessionRunningTooLong()).isTrue();
+    verify(mockGaugeManager, times(0)).logGaugeMetadata(any(), any());
   }
 
   @Test
@@ -360,7 +303,7 @@ public void testPerfSession_sessionAwareObjects_doesntNotifyIfNotRegistered() {
     FakeSessionAwareObject spySessionAwareObjectOne = spy(new FakeSessionAwareObject());
     FakeSessionAwareObject spySessionAwareObjectTwo = spy(new FakeSessionAwareObject());
 
-    testSessionManager.updatePerfSession(ApplicationProcessState.FOREGROUND);
+    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId1"));
 
     verify(spySessionAwareObjectOne, never())
         .updateSession(ArgumentMatchers.nullable(PerfSession.class));
@@ -379,8 +322,8 @@ public void testPerfSession_sessionAwareObjects_NotifiesIfRegistered() {
     testSessionManager.registerForSessionUpdates(new WeakReference<>(spySessionAwareObjectOne));
     testSessionManager.registerForSessionUpdates(new WeakReference<>(spySessionAwareObjectTwo));
 
-    testSessionManager.updatePerfSession(ApplicationProcessState.FOREGROUND);
-    testSessionManager.updatePerfSession(ApplicationProcessState.BACKGROUND);
+    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId1"));
+    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId2"));
 
     verify(spySessionAwareObjectOne, times(2))
         .updateSession(ArgumentMatchers.nullable(PerfSession.class));
@@ -404,11 +347,11 @@ public void testPerfSession_sessionAwareObjects_DoesNotNotifyIfUnregistered() {
     testSessionManager.registerForSessionUpdates(weakSpySessionAwareObjectOne);
     testSessionManager.registerForSessionUpdates(weakSpySessionAwareObjectTwo);
 
-    testSessionManager.updatePerfSession(ApplicationProcessState.FOREGROUND);
+    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId1"));
 
     testSessionManager.unregisterForSessionUpdates(weakSpySessionAwareObjectOne);
     testSessionManager.unregisterForSessionUpdates(weakSpySessionAwareObjectTwo);
-    testSessionManager.updatePerfSession(ApplicationProcessState.BACKGROUND);
+    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId2"));
 
     verify(spySessionAwareObjectOne, times(1))
         .updateSession(ArgumentMatchers.nullable(PerfSession.class));
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeManagerTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeManagerTest.java
index 7acc4b2b97d..5090d66c8b9 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeManagerTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeManagerTest.java
@@ -637,7 +637,6 @@ public void testStartGaugeManagerWithNewSessionIdAndNewAppState() {
 
   @Test
   public void testLogGaugeMetadataSendDataToTransport() {
-    when(fakeGaugeMetadataManager.getProcessName()).thenReturn("processName");
     when(fakeGaugeMetadataManager.getDeviceRamSizeKb()).thenReturn(2000);
     when(fakeGaugeMetadataManager.getMaxAppJavaHeapMemoryKb()).thenReturn(1000);
     when(fakeGaugeMetadataManager.getMaxEncouragedAppJavaHeapMemoryKb()).thenReturn(800);
@@ -649,7 +648,6 @@ public void testLogGaugeMetadataSendDataToTransport() {
     GaugeMetadata recordedGaugeMetadata = recordedGaugeMetric.getGaugeMetadata();
 
     assertThat(recordedGaugeMetric.getSessionId()).isEqualTo("sessionId");
-    assertThat(recordedGaugeMetadata.getProcessName()).isEqualTo("processName");
 
     assertThat(recordedGaugeMetadata.getDeviceRamSizeKb())
         .isEqualTo(fakeGaugeMetadataManager.getDeviceRamSizeKb());
@@ -699,7 +697,6 @@ public void testLogGaugeMetadataLogsAfterApplicationContextIsSet() {
     GaugeMetadata recordedGaugeMetadata = recordedGaugeMetric.getGaugeMetadata();
 
     assertThat(recordedGaugeMetric.getSessionId()).isEqualTo("sessionId");
-    assertThat(recordedGaugeMetadata.hasProcessName()).isTrue();
   }
 
   @Test
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeMetadataManagerTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeMetadataManagerTest.java
index 07366aa2a20..292747121dd 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeMetadataManagerTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeMetadataManagerTest.java
@@ -16,13 +16,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.robolectric.Shadows.shadowOf;
 
 import android.app.ActivityManager;
-import android.app.ActivityManager.RunningAppProcessInfo;
 import android.content.Context;
 import android.os.Environment;
 import androidx.test.core.app.ApplicationProvider;
@@ -32,8 +29,6 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -78,38 +73,6 @@ private void mockMemory() {
     shadowOf(activityManager).setMemoryClass(RUNTIME_MAX_ENCOURAGED_MEMORY_MB);
   }
 
-  @Test
-  public void testInitialization_getProcessNameReturnsNull_doesNotCrash() {
-    ActivityManager activityManagerPartialMock = spy(activityManager);
-    when(activityManagerPartialMock.getRunningAppProcesses()).thenReturn(null);
-
-    assertThat(new GaugeMetadataManager(runtime, appContext)).isNotNull();
-  }
-
-  @Test
-  public void testGetProcessName_noProcessInfoList_returnsPackageName() {
-    shadowOf(activityManager).setProcesses(new ArrayList<>());
-    assertThat(new GaugeMetadataManager(runtime, appContext).getProcessName())
-        .isEqualTo(appContext.getPackageName());
-  }
-
-  @Test
-  public void testGetProcessName_processListWithoutCurrentPid_returnsPackageName() {
-    shadowOf(activityManager)
-        .setProcesses(
-            generateFakeAppProcessInfoListThatContainsPid(android.os.Process.myPid() + 100));
-    assertThat(new GaugeMetadataManager(runtime, appContext).getProcessName())
-        .isEqualTo(appContext.getPackageName());
-  }
-
-  @Test
-  public void testGetProcessName_processListWithCurrentPid_returnsProcessName() {
-    shadowOf(activityManager)
-        .setProcesses(generateFakeAppProcessInfoListThatContainsPid(android.os.Process.myPid()));
-    assertThat(new GaugeMetadataManager(runtime, appContext).getProcessName())
-        .isEqualTo("fakeProcessName");
-  }
-
   @Test
   public void testGetMaxAppJavaHeapMemory_returnsExpectedValue() {
     assertThat(testGaugeMetadataManager.getMaxAppJavaHeapMemoryKb()).isGreaterThan(0);
@@ -146,17 +109,6 @@ private String createFakeMemInfoFile() throws IOException {
     return file.getAbsolutePath();
   }
 
-  private List<RunningAppProcessInfo> generateFakeAppProcessInfoListThatContainsPid(int pid) {
-    ActivityManager.RunningAppProcessInfo fakeProcessInfoList = new RunningAppProcessInfo();
-    fakeProcessInfoList.pid = pid;
-    fakeProcessInfoList.processName = "fakeProcessName";
-
-    List<RunningAppProcessInfo> processInfoList = new ArrayList<>();
-    processInfoList.add(fakeProcessInfoList);
-
-    return processInfoList;
-  }
-
   private static final String MEM_INFO_CONTENTS =
       "MemTotal:        "
           + DEVICE_RAM_SIZE_KB
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/transport/RateLimiterTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/transport/RateLimiterTest.java
index e808e4dfe7c..2d809a4729c 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/transport/RateLimiterTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/transport/RateLimiterTest.java
@@ -62,7 +62,6 @@ public class RateLimiterTest extends FirebasePerformanceTestBase {
   private static final Rate FOUR_TOKENS_PER_MINUTE = new Rate(4, 1, MINUTES);
   private static final Rate TWO_TOKENS_PER_SECOND = new Rate(2, 1, SECONDS);
   private static final Rate THREE_TOKENS_PER_SECOND = new Rate(3, 1, SECONDS);
-  private static final Rate TEN_TOKENS_PER_SECOND = new Rate(10, 1, SECONDS);
 
   @Before
   public void setUp() {
@@ -85,42 +84,39 @@ public void testRateLimitImpl() {
     makeConfigResolverReturnDefaultValues();
 
     // Make Config Resolver returns default value for resource sampling rate.
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0f);
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(1.0f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(1.0);
 
     // allow 2 logs every minute. token bucket capacity is 2.
     // clock is 0, token count is 2.
     RateLimiterImpl limiterImpl =
         new RateLimiterImpl(TWO_TOKENS_PER_MINUTE, 2, mClock, mockConfigResolver, NETWORK, false);
     PerfMetric metric = PerfMetric.getDefaultInstance();
-    // clock is 15 seconds, token count is 1.
-    currentTime = currentTime.plusSeconds(15);
+    // clock is 30 seconds, count is 2, afterwards is 1
+    currentTime = currentTime.plusSeconds(30);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 30 seconds, count is 1.
+    // clock is 45 seconds, count is 1.5, afterwards is 0.5
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 45 seconds, count is 0.
+    // clock is 60 seconds, count is 1, afterwards is 0
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 60 seconds, count is 1
-    currentTime = currentTime.plusSeconds(15);
-    assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 75 seconds, count is 0,
+    // clock is 75 seconds, count is 0.5, afterwards is 0.5
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiterImpl.check(metric)).isFalse();
-    // clock is 90 seconds, count is 1
+    // clock is 90 seconds, count is 1, afterwards is 0
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 105 seconds, count is 0
+    // clock is 105 seconds, count is 0.5, afterwards is 0.5
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiterImpl.check(metric)).isFalse();
-    // clock is 120 seconds, count is 1,
+    // clock is 120 seconds, count is 1, afterwards is 1
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 135 seconds, count is 0,
+    // clock is 135 seconds, count is 0.5, afterwards is 0.5
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiterImpl.check(metric)).isFalse();
-    // clock is 150 seconds, count is 1,
+    // clock is 150 seconds, count is 1, afterwards is 1
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiterImpl.check(metric)).isTrue();
   }
@@ -132,36 +128,36 @@ public void testRateLimiterImplWithIrregularTimeIntervals() {
     makeConfigResolverReturnDefaultValues();
 
     // Make Config Resolver returns default value for resource sampling rate.
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0f);
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(1.0f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(1.0);
 
     // allow 2 logs every minute. token bucket capacity is 2.
-    // clock is 0, token count is 2.
+    // clock is 0s, token count is 2.0.
     RateLimiterImpl limiterImpl =
         new RateLimiterImpl(TWO_TOKENS_PER_MINUTE, 2, mClock, mockConfigResolver, NETWORK, false);
     PerfMetric metric = PerfMetric.getDefaultInstance();
-    // clock is 20 seconds, count before check is 2, 0 new tokens added, count after check is 1
+    // clock is 20s, count before check is 2.00, 0.00 new tokens added, count after check is 1.00
     currentTime = currentTime.plusSeconds(20);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 40 seconds, count before check is 1, 1 new tokens added, count after check is 1
-    currentTime = currentTime.plusSeconds(20);
+    // clock is 60s, count before check is 1.00, 1.00 new tokens added, count after check is 1.00
+    currentTime = currentTime.plusSeconds(40);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 59 seconds, count before check is 1, 0 new tokens added, count after check is 0
-    currentTime = currentTime.plusSeconds(19);
+    // clock is 89s, count before check is 1.00, 0.96 new tokens added, count after check is 0.96
+    currentTime = currentTime.plusSeconds(29);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 60 seconds, count before check is 0, 1 new tokens added, count after check is 0
-    currentTime = currentTime.plusSeconds(1);
+    // clock is 95s, count before check is 0.96, 0.20 new tokens added, count after check is 0.16
+    currentTime = currentTime.plusSeconds(6);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 80 seconds, count before check is 0, 0 new tokens added, count after check is 0
-    currentTime = currentTime.plusSeconds(20);
+    // clock is 110s, count before check is 0.16, 0.50 new tokens added, count after check is 0.66
+    currentTime = currentTime.plusSeconds(15);
     assertThat(limiterImpl.check(metric)).isFalse();
-    // clock is 130 seconds, count before check is 0, 2 new tokens added, count after check is 1
+    // clock is 160s, count before check is 0.66, 1.34 new tokens added, count after check is 1.00
     currentTime = currentTime.plusSeconds(50);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 131 seconds, count before check is 1, 0 new tokens added, count after check is 0
+    // clock is 161s, count before check is 1.00, 0.03 new tokens added, count after check is 0.03
     currentTime = currentTime.plusSeconds(1);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 132 seconds, count before check is 0, 0 new tokens added, count after check is 0
+    // clock is 162s, count before check is 0.03, 0.03 new tokens added, count after check is 0.06
     currentTime = currentTime.plusSeconds(1);
     assertThat(limiterImpl.check(metric)).isFalse();
   }
@@ -173,8 +169,8 @@ public void testRateLimiterImplWithIrregularTimeIntervals() {
     makeConfigResolverReturnDefaultValues();
 
     // Make Config Resolver returns default value for resource sampling rate.
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0f);
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(1.0f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(1.0);
 
     // allow 2 logs every minute. token bucket capacity is 2.
     // clock is 0, token count is 2.
@@ -182,29 +178,29 @@ public void testRateLimiterImplWithIrregularTimeIntervals() {
         new RateLimiterImpl(TWO_TOKENS_PER_MINUTE, 2, mClock, mockConfigResolver, NETWORK, false);
     PerfMetric metric = PerfMetric.getDefaultInstance();
 
-    // clock is 20 seconds, count before check is 2, 0 new tokens added, count after check is 1
-    currentTime = currentTime.plusSeconds(20);
+    // clock is 0, count before check is 2, 0 new tokens added, count after check is 1
+    currentTime = currentTime.plusSeconds(0);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 40 seconds, count before check is 1, 1 new tokens added, count after check is 1
-    currentTime = currentTime.plusSeconds(20);
+    // clock is 30, count before check is 1, 1 new tokens added, count after check is 1
+    currentTime = currentTime.plusSeconds(30);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 59 seconds, count before check is 1, 0 new tokens added, count after check is 0
-    currentTime = currentTime.plusSeconds(19);
+    // clock is 59, count before check is 1, 0.96 new tokens added, count after check is 0.96
+    currentTime = currentTime.plusSeconds(29);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 60 seconds, count before check is 0, 1 new tokens added, count after check is 0
+    // clock is 60, count before check is 0.96, 0.04 new tokens added, count after check is 0
     currentTime = currentTime.plusSeconds(1);
     assertThat(limiterImpl.check(metric)).isTrue();
 
-    // clock is 660 seconds, count before check is 0, 2 new tokens added, count after check is 1
+    // clock is 660, count before check is 0, 2 new tokens added, count after check is 1
     currentTime = currentTime.plusSeconds(600);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 661 seconds, count before check is 1, 0 new tokens added, count after check is 0
+    // clock is 661, count before check is 1, 0.03 new tokens added, count after check is 0.03
     currentTime = currentTime.plusSeconds(1);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 662 seconds, count before check is 0, 0 new tokens added, count after check is 0
+    // clock is 662, count before check is 0.03, 0.03 new tokens added, count after check is 0.06
     currentTime = currentTime.plusSeconds(1);
     assertThat(limiterImpl.check(metric)).isFalse();
-    // clock is 663 seconds, count before check is 0, 0 new tokens added, count after check is 0
+    // clock is 663, count before check is 0.06, 0.03 new tokens added, count after check is 0.10
     currentTime = currentTime.plusSeconds(1);
     assertThat(limiterImpl.check(metric)).isFalse();
   }
@@ -215,8 +211,8 @@ public void testRateLimiterImplWithBursts_rateLessThanCapacity_doesNotAllowMoreT
     makeConfigResolverReturnDefaultValues();
 
     // Make Config Resolver returns default value for resource sampling rate.
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0f);
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(1.0f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(1.0);
 
     // allow 3 logs per second. token bucket capacity is 4.
     RateLimiterImpl limiterImpl =
@@ -263,8 +259,8 @@ public void testRateLimiterImplWithBursts_rateMoreThanCapacity_doesNotAllowMoreT
     makeConfigResolverReturnDefaultValues();
 
     // Make Config Resolver returns default value for resource sampling rate.
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0f);
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(1.0f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(1.0);
 
     // allow 3 logs per second. token bucket capacity is 2.
     RateLimiterImpl limiterImpl =
@@ -311,14 +307,14 @@ public void testRateLimit() {
     makeConfigResolverReturnDefaultValues();
 
     // Make Config Resolver returns default value for resource sampling rate.
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0f);
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(1.0f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(1.0);
 
     // allow 2 logs every minute. token bucket capacity is 2.
     // clock is 0, token count is 2.
 
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, 0, mockConfigResolver);
     PerfMetric metric = PerfMetric.getDefaultInstance();
     // if PerfMetric object has neither TraceMetric or NetworkRequestMetric field set, always return
     // true.
@@ -330,56 +326,56 @@ public void testRateLimit() {
         PerfMetric.newBuilder()
             .setNetworkRequestMetric(NetworkRequestMetric.getDefaultInstance())
             .build();
-    // clock is 15 seconds, token count is 1.
+    // clock is 15 seconds, token count afterwards is 1.
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiter.isEventRateLimited(trace)).isFalse();
     assertThat(limiter.isEventRateLimited(network)).isFalse();
-    // clock is 30 seconds, count is 0.
+    // clock is 30 seconds, count afterwards is 0.5.
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiter.isEventRateLimited(trace)).isFalse();
     assertThat(limiter.isEventRateLimited(network)).isFalse();
-    // clock is 45 seconds, count is 0.
+    // clock is 45 seconds, count afterwards is 0
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiter.isEventRateLimited(trace)).isFalse();
     assertThat(limiter.isEventRateLimited(network)).isFalse();
-    // clock is 60 seconds, count is 0
-    currentTime = currentTime.plusSeconds(15);
-    assertThat(limiter.isEventRateLimited(trace)).isFalse();
-    assertThat(limiter.isEventRateLimited(network)).isFalse();
-    // clock is 75 seconds, count is 0,
+    // clock is 60 seconds, count afterwards is 0.5
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiter.isEventRateLimited(trace)).isTrue();
     assertThat(limiter.isEventRateLimited(network)).isTrue();
-    // clock is 90 seconds, count is 0
+    // clock is 75 seconds, count afterwards is 0
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiter.isEventRateLimited(trace)).isFalse();
     assertThat(limiter.isEventRateLimited(network)).isFalse();
-    // clock is 105 seconds, count is 0
+    // clock is 90 seconds, count afterwards is 0.5
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiter.isEventRateLimited(trace)).isTrue();
     assertThat(limiter.isEventRateLimited(network)).isTrue();
-    // clock is 120 seconds, count is 0,
+    // clock is 105 seconds, count afterwards is 0
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiter.isEventRateLimited(trace)).isFalse();
     assertThat(limiter.isEventRateLimited(network)).isFalse();
-    // clock is 135 seconds, count is 0,
+    // clock is 120 seconds, count afterwards is 0.5
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiter.isEventRateLimited(trace)).isTrue();
     assertThat(limiter.isEventRateLimited(network)).isTrue();
-    // clock is 150 seconds, count is 0,
+    // clock is 135 seconds, count afterwards is 0
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiter.isEventRateLimited(trace)).isFalse();
     assertThat(limiter.isEventRateLimited(network)).isFalse();
+    // clock is 150 seconds, count afterwards is 0.5
+    currentTime = currentTime.plusSeconds(15);
+    assertThat(limiter.isEventRateLimited(trace)).isTrue();
+    assertThat(limiter.isEventRateLimited(network)).isTrue();
   }
 
   @Test
   public void testDeviceSampling_tracesEnabledButNetworkDisabled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.5f);
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.02f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.5);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.02);
 
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.49f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.49f, 0, mockConfigResolver);
 
     assertThat(limiter.getIsDeviceAllowedToSendTraces()).isTrue();
     assertThat(limiter.getIsDeviceAllowedToSendNetworkEvents()).isFalse();
@@ -388,23 +384,84 @@ public void testDeviceSampling_tracesEnabledButNetworkDisabled() {
   @Test
   public void testDeviceSampling_tracesDisabledButNetworkEnabled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.02f);
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.5f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.02);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.5);
 
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.49f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.49f, 0, mockConfigResolver);
 
     assertThat(limiter.getIsDeviceAllowedToSendNetworkEvents()).isTrue();
     assertThat(limiter.getIsDeviceAllowedToSendTraces()).isFalse();
   }
 
+  @Test
+  public void testDeviceSampling_tracesEnabledButFragmentDisabled_dropsFragmentTrace() {
+    makeConfigResolverReturnDefaultValues();
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.5);
+    when(mockConfigResolver.getFragmentSamplingRate()).thenReturn(0.02);
+
+    RateLimiter limiter =
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.49f, 0.49f, mockConfigResolver);
+
+    assertThat(limiter.getIsDeviceAllowedToSendFragmentScreenTraces()).isFalse();
+    assertThat(limiter.getIsDeviceAllowedToSendTraces()).isTrue();
+
+    // Fragment trace should be dropped
+    PerfMetric fragmentTrace =
+        PerfMetric.newBuilder()
+            .setTraceMetric(
+                TraceMetric.newBuilder()
+                    .setName("_st_TestFragment")
+                    .putCustomAttributes(Constants.ACTIVITY_ATTRIBUTE_KEY, "TestActivity")
+                    .addAllPerfSessions(Arrays.asList(createNonVerbosePerfSessions())))
+            .build();
+    assertThat(limiter.isFragmentScreenTrace(fragmentTrace)).isTrue();
+    assertThat(limiter.isEventSampled(fragmentTrace)).isFalse();
+
+    // Non-fragment trace should be sampled
+    PerfMetric activityTrace =
+        PerfMetric.newBuilder()
+            .setTraceMetric(
+                TraceMetric.newBuilder()
+                    .setName("_st_TestActivity")
+                    .addAllPerfSessions(Arrays.asList(createNonVerbosePerfSessions())))
+            .build();
+    assertThat(limiter.isFragmentScreenTrace(activityTrace)).isFalse();
+    assertThat(limiter.isEventSampled(activityTrace)).isTrue();
+  }
+
+  @Test
+  public void testDeviceSampling_tracesDisabledButFragmentEnabled_dropsFragmentTrace() {
+    makeConfigResolverReturnDefaultValues();
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.02);
+    when(mockConfigResolver.getFragmentSamplingRate()).thenReturn(0.5);
+
+    RateLimiter limiter =
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.49f, 0.49f, mockConfigResolver);
+
+    assertThat(limiter.getIsDeviceAllowedToSendFragmentScreenTraces()).isTrue();
+    assertThat(limiter.getIsDeviceAllowedToSendTraces()).isFalse();
+
+    // All traces including fragment trace should be dropped
+    PerfMetric trace =
+        PerfMetric.newBuilder()
+            .setTraceMetric(
+                TraceMetric.newBuilder()
+                    .setName("_st_TestFragment")
+                    .putCustomAttributes(Constants.ACTIVITY_ATTRIBUTE_KEY, "TestActivity")
+                    .addAllPerfSessions(Arrays.asList(createNonVerbosePerfSessions())))
+            .build();
+    assertThat(limiter.isFragmentScreenTrace(trace)).isTrue();
+    assertThat(limiter.isEventSampled(trace)).isFalse();
+  }
+
   @Test
   public void getIsDeviceAllowedToSendTraces_8digitSamplingRate_traceIsEnabled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.00000001f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.00000001);
 
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.000000005f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.000000005f, 0, mockConfigResolver);
 
     assertThat(limiter.getIsDeviceAllowedToSendTraces()).isTrue();
   }
@@ -412,10 +469,10 @@ public void getIsDeviceAllowedToSendTraces_8digitSamplingRate_traceIsEnabled() {
   @Test
   public void getIsDeviceAllowedToSendTraces_8digitSamplingRate_traceIsDisabled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.00000001f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.00000001);
 
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.000000011f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.000000011f, 0, mockConfigResolver);
 
     assertThat(limiter.getIsDeviceAllowedToSendTraces()).isFalse();
   }
@@ -423,10 +480,10 @@ public void getIsDeviceAllowedToSendTraces_8digitSamplingRate_traceIsDisabled()
   @Test
   public void getIsDeviceAllowedToSendNetwork_8digitSamplingRate_networkIsEnabled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.00000001f);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.00000001);
 
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.000000005f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.000000005f, 0, mockConfigResolver);
 
     assertThat(limiter.getIsDeviceAllowedToSendNetworkEvents()).isTrue();
   }
@@ -434,22 +491,44 @@ public void getIsDeviceAllowedToSendNetwork_8digitSamplingRate_networkIsEnabled(
   @Test
   public void getIsDeviceAllowedToSendNetwork_8digitSamplingRate_networkIsDisabled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.00000001f);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.00000001);
 
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.000000011f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.000000011f, 0, mockConfigResolver);
 
     assertThat(limiter.getIsDeviceAllowedToSendNetworkEvents()).isFalse();
   }
 
+  @Test
+  public void getIsDeviceAllowedToSendFragmentScreenTraces_8digitSamplingRate_fragmentIsEnabled() {
+    makeConfigResolverReturnDefaultValues();
+    when(mockConfigResolver.getFragmentSamplingRate()).thenReturn(0.00000001);
+
+    RateLimiter limiter =
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, 0.000000005f, mockConfigResolver);
+
+    assertThat(limiter.getIsDeviceAllowedToSendFragmentScreenTraces()).isTrue();
+  }
+
+  @Test
+  public void getIsDeviceAllowedToSendFragmentScreenTraces_8digitSamplingRate_fragmentIsDisabled() {
+    makeConfigResolverReturnDefaultValues();
+    when(mockConfigResolver.getFragmentSamplingRate()).thenReturn(0.00000001);
+
+    RateLimiter limiter =
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0, 0.000000011f, mockConfigResolver);
+
+    assertThat(limiter.getIsDeviceAllowedToSendFragmentScreenTraces()).isFalse();
+  }
+
   @Test
   public void testDeviceSampling_bothTracesAndNetworkEnabled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.5f);
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.5f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.5);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.5);
 
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.49f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.49f, 0, mockConfigResolver);
 
     assertThat(limiter.getIsDeviceAllowedToSendTraces()).isTrue();
     assertThat(limiter.getIsDeviceAllowedToSendNetworkEvents()).isTrue();
@@ -458,27 +537,51 @@ public void testDeviceSampling_bothTracesAndNetworkEnabled() {
   @Test
   public void testDeviceSampling_bothTracesAndNetworkDisabled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.5f);
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.5f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.5);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.5);
 
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.51f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.51f, 0, mockConfigResolver);
 
     assertThat(limiter.getIsDeviceAllowedToSendTraces()).isFalse();
     assertThat(limiter.getIsDeviceAllowedToSendNetworkEvents()).isFalse();
   }
 
+  @Test
+  public void testDeviceSampling_bothTracesAndFragmentEnabled_acceptsFragmentTrace() {
+    makeConfigResolverReturnDefaultValues();
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.5);
+    when(mockConfigResolver.getFragmentSamplingRate()).thenReturn(0.5);
+
+    RateLimiter limiter =
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.49f, 0.49f, mockConfigResolver);
+
+    assertThat(limiter.getIsDeviceAllowedToSendTraces()).isTrue();
+    assertThat(limiter.getIsDeviceAllowedToSendFragmentScreenTraces()).isTrue();
+
+    PerfMetric trace =
+        PerfMetric.newBuilder()
+            .setTraceMetric(
+                TraceMetric.newBuilder()
+                    .setName("_st_TestFragment")
+                    .putCustomAttributes(Constants.ACTIVITY_ATTRIBUTE_KEY, "TestActivity")
+                    .addAllPerfSessions(Arrays.asList(createNonVerbosePerfSessions())))
+            .build();
+    assertThat(limiter.isFragmentScreenTrace(trace)).isTrue();
+    assertThat(limiter.isEventSampled(trace)).isTrue();
+  }
+
   @Test
   public void testDeviceSampling_changeInTraceSamplingRateIsImmediatelyEffective() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.5f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.5);
 
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.51f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.51f, 0, mockConfigResolver);
 
     assertThat(limiter.getIsDeviceAllowedToSendTraces()).isFalse();
 
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.75f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.75);
 
     assertThat(limiter.getIsDeviceAllowedToSendTraces()).isTrue();
   }
@@ -486,18 +589,33 @@ public void testDeviceSampling_changeInTraceSamplingRateIsImmediatelyEffective()
   @Test
   public void testDeviceSampling_changeInNetworkSamplingRateIsImmediatelyEffective() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.5f);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.5);
 
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.51f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.51f, 0, mockConfigResolver);
 
     assertThat(limiter.getIsDeviceAllowedToSendNetworkEvents()).isFalse();
 
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.75f);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.75);
 
     assertThat(limiter.getIsDeviceAllowedToSendNetworkEvents()).isTrue();
   }
 
+  @Test
+  public void testDeviceSampling_changeInFragmentSamplingRateIsImmediatelyEffective() {
+    makeConfigResolverReturnDefaultValues();
+    when(mockConfigResolver.getFragmentSamplingRate()).thenReturn(0.5);
+
+    RateLimiter limiter =
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0, 0.51f, mockConfigResolver);
+
+    assertThat(limiter.getIsDeviceAllowedToSendFragmentScreenTraces()).isFalse();
+
+    when(mockConfigResolver.getFragmentSamplingRate()).thenReturn(0.75);
+
+    assertThat(limiter.getIsDeviceAllowedToSendFragmentScreenTraces()).isTrue();
+  }
+
   @Test
   public void getRateFromNetworkParams_nonDefaultValues_worksCorrectly() {
     makeConfigResolverReturnDefaultValues();
@@ -600,16 +718,19 @@ public void testChangeRate() {
     RateLimiterImpl limiterImpl =
         new RateLimiterImpl(TWO_TOKENS_PER_MINUTE, 2, mClock, mockConfigResolver, TRACE, false);
     PerfMetric metric = PerfMetric.getDefaultInstance();
-    // clock is 15 seconds, token count is 1.
-    currentTime = currentTime.plusSeconds(15);
+    // clock is 0 seconds, token count is 2, afterwards is 1
+    currentTime = currentTime.plusSeconds(0);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 30 seconds, count is 0.
+    // clock is 15 seconds, count is 1.5, afterwards is 0.5
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 45 seconds, count is 0.
+    // clock is 30 seconds, count is 1, afterwards is 0
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiterImpl.check(metric)).isTrue();
-    // clock is 60 seconds, count is 0
+    // clock is 45 seconds, count is 0.5, afterwards is 0.5
+    currentTime = currentTime.plusSeconds(15);
+    assertThat(limiterImpl.check(metric)).isFalse();
+    // clock is 60 seconds, count is 1, afterwards is 0
     currentTime = currentTime.plusSeconds(15);
     assertThat(limiterImpl.check(metric)).isTrue();
 
@@ -671,7 +792,7 @@ public void samplingBucketIdRandomness() {
   public void testBackgroundTraceWithCountersIsNotRateLimitApplicable() {
     makeConfigResolverReturnDefaultValues();
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, 0.99f, mockConfigResolver);
 
     PerfMetric metric =
         PerfMetric.newBuilder()
@@ -688,7 +809,7 @@ public void testBackgroundTraceWithCountersIsNotRateLimitApplicable() {
   public void testBackgroundTraceWithoutCountersIsRateLimitApplicable() {
     makeConfigResolverReturnDefaultValues();
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, 0.99f, mockConfigResolver);
 
     PerfMetric metric =
         PerfMetric.newBuilder()
@@ -704,7 +825,7 @@ public void testBackgroundTraceWithoutCountersIsRateLimitApplicable() {
   public void testForegroundTraceWithCountersIsNotRateLimitApplicable() {
     makeConfigResolverReturnDefaultValues();
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, 0.99f, mockConfigResolver);
 
     PerfMetric metric =
         PerfMetric.newBuilder()
@@ -721,7 +842,7 @@ public void testForegroundTraceWithCountersIsNotRateLimitApplicable() {
   public void testForegroundTraceWithoutCountersIsRateLimitApplicable() {
     makeConfigResolverReturnDefaultValues();
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, 0.99f, mockConfigResolver);
 
     PerfMetric metric =
         PerfMetric.newBuilder()
@@ -736,7 +857,7 @@ public void testForegroundTraceWithoutCountersIsRateLimitApplicable() {
   public void testGaugeMetricIsNotRateLimitApplicable() {
     makeConfigResolverReturnDefaultValues();
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, 0.99f, mockConfigResolver);
 
     PerfMetric metric =
         PerfMetric.newBuilder().setGaugeMetric(GaugeMetric.getDefaultInstance()).build();
@@ -748,7 +869,7 @@ public void testGaugeMetricIsNotRateLimitApplicable() {
   public void testTraceMetricNoSpecialNameIsRateLimitApplicable() {
     makeConfigResolverReturnDefaultValues();
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, 0.99f, mockConfigResolver);
 
     PerfMetric metric =
         PerfMetric.newBuilder()
@@ -762,7 +883,7 @@ public void testTraceMetricNoSpecialNameIsRateLimitApplicable() {
   public void testNetworkRequestMetricIsRateLimitApplicable() {
     makeConfigResolverReturnDefaultValues();
     RateLimiter limiter =
-        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, mockConfigResolver);
+        new RateLimiter(TWO_TOKENS_PER_MINUTE, 2, mClock, 0.99f, 0.99f, mockConfigResolver);
 
     PerfMetric metric =
         PerfMetric.newBuilder()
@@ -775,7 +896,7 @@ public void testNetworkRequestMetricIsRateLimitApplicable() {
   @Test
   public void testTracesAreNotSampledWhenSessionIsVerboseAndSamplingEnabled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.70f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.70);
 
     // Passing a value for samplingBucketId which is greater than the sampling rate ensures that
     // the sampling will be enabled causing all the metrics to be dropped
@@ -785,6 +906,7 @@ public void testTracesAreNotSampledWhenSessionIsVerboseAndSamplingEnabled() {
             /* capacity= */ 2,
             mClock,
             /* samplingBucketId= */ 0.71f,
+            /* fragmentBucketId= */ 0,
             mockConfigResolver);
     assertThat(limiter.getIsDeviceAllowedToSendTraces()).isFalse();
 
@@ -801,7 +923,7 @@ public void testTracesAreNotSampledWhenSessionIsVerboseAndSamplingEnabled() {
   @Test
   public void testNetworkRequestsAreNotSampledWhenSessionIsVerboseAndSamplingEnabled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.70f);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.70);
 
     // Passing a value for samplingBucketId which is greater than the sampling rate ensures that
     // the sampling will be enabled causing all the metrics to be dropped
@@ -811,6 +933,7 @@ public void testNetworkRequestsAreNotSampledWhenSessionIsVerboseAndSamplingEnabl
             /* capacity= */ 2,
             mClock,
             /* samplingBucketId= */ 0.71f,
+            /* fragmentBucketId= */ 0,
             mockConfigResolver);
     assertThat(limiter.getIsDeviceAllowedToSendNetworkEvents()).isFalse();
 
@@ -824,10 +947,41 @@ public void testNetworkRequestsAreNotSampledWhenSessionIsVerboseAndSamplingEnabl
     assertThat(limiter.isEventSampled(network)).isTrue();
   }
 
+  @Test
+  public void isEventSampled_fragmentWithVerboseSessionEnabled_returnsTrue() {
+    makeConfigResolverReturnDefaultValues();
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0);
+    when(mockConfigResolver.getFragmentSamplingRate()).thenReturn(0.70);
+
+    // Passing a value for samplingBucketId which is greater than the sampling rate means that
+    // the sampling dice roll failed causing all the metrics to be dropped
+    RateLimiter limiter =
+        new RateLimiter(
+            /* rate= */ TWO_TOKENS_PER_SECOND,
+            /* capacity= */ 2,
+            mClock,
+            /* samplingBucketId= */ 0,
+            /* fragmentBucketId= */ 0.71f,
+            mockConfigResolver);
+    assertThat(limiter.getIsDeviceAllowedToSendTraces()).isTrue();
+    assertThat(limiter.getIsDeviceAllowedToSendFragmentScreenTraces()).isFalse();
+
+    PerfMetric trace =
+        PerfMetric.newBuilder()
+            .setTraceMetric(
+                TraceMetric.newBuilder()
+                    .setName("_st_TestFragment")
+                    .putCustomAttributes(Constants.ACTIVITY_ATTRIBUTE_KEY, "TestActivity")
+                    .addAllPerfSessions(Arrays.asList(createVerbosePerfSessions())))
+            .build();
+    assertThat(limiter.isFragmentScreenTrace(trace)).isTrue();
+    assertThat(limiter.isEventSampled(trace)).isTrue();
+  }
+
   @Test
   public void testTracesAreSampledWhenSessionIsNonVerboseAndSamplingEnabled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.70f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.70);
 
     // Passing a value for samplingBucketId which is greater than the sampling rate ensures that
     // the sampling will be enabled causing all the metrics to be dropped
@@ -837,6 +991,7 @@ public void testTracesAreSampledWhenSessionIsNonVerboseAndSamplingEnabled() {
             /* capacity= */ 2,
             mClock,
             /* samplingBucketId= */ 0.71f,
+            /* fragmentBucketId= */ 0,
             mockConfigResolver);
     assertThat(limiter.getIsDeviceAllowedToSendTraces()).isFalse();
 
@@ -853,7 +1008,7 @@ public void testTracesAreSampledWhenSessionIsNonVerboseAndSamplingEnabled() {
   @Test
   public void testNetworkRequestsAreSampledWhenSessionIsNonVerboseAndSamplingEnabled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.70f);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.70);
 
     // Passing a value for samplingBucketId which is greater than the sampling rate ensures that
     // the sampling will be enabled causing all the metrics to be dropped
@@ -863,6 +1018,7 @@ public void testNetworkRequestsAreSampledWhenSessionIsNonVerboseAndSamplingEnabl
             /* capacity= */ 2,
             mClock,
             /* samplingBucketId= */ 0.71f,
+            /* fragmentBucketId= */ 0,
             mockConfigResolver);
     assertThat(limiter.getIsDeviceAllowedToSendNetworkEvents()).isFalse();
 
@@ -876,11 +1032,43 @@ public void testNetworkRequestsAreSampledWhenSessionIsNonVerboseAndSamplingEnabl
     assertThat(limiter.isEventSampled(network)).isFalse();
   }
 
+  @Test
+  public void isEventSampled_fragmentWithVerboseSessionDisabled_returnsFalse() {
+    makeConfigResolverReturnDefaultValues();
+    when(mockConfigResolver.getFragmentSamplingRate()).thenReturn(0.70);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(1.0);
+
+    // Passing a value for samplingBucketId which is greater than the sampling rate means that
+    // the sampling dice roll failed causing all the metrics to be dropped
+    RateLimiter limiter =
+        new RateLimiter(
+            /* rate= */ TWO_TOKENS_PER_SECOND,
+            /* capacity= */ 2,
+            mClock,
+            /* samplingBucketId= */ 0,
+            /* fragmentBucketId= */ 0.71f,
+            mockConfigResolver);
+    assertThat(limiter.getIsDeviceAllowedToSendTraces()).isTrue();
+    assertThat(limiter.getIsDeviceAllowedToSendFragmentScreenTraces()).isFalse();
+
+    PerfMetric trace =
+        PerfMetric.newBuilder()
+            .setTraceMetric(
+                TraceMetric.newBuilder()
+                    .setName("_st_TestFragment")
+                    .putCustomAttributes(Constants.ACTIVITY_ATTRIBUTE_KEY, "TestActivity")
+                    .addAllPerfSessions(Arrays.asList(createNonVerbosePerfSessions())))
+            .build();
+    assertThat(limiter.isFragmentScreenTrace(trace)).isTrue();
+    assertThat(limiter.isEventSampled(trace)).isFalse();
+  }
+
   @Test
   public void testGaugesAreNeverSampled() {
     makeConfigResolverReturnDefaultValues();
-    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.70f);
-    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.70f);
+    when(mockConfigResolver.getTraceSamplingRate()).thenReturn(0.70);
+    when(mockConfigResolver.getNetworkRequestSamplingRate()).thenReturn(0.70);
+    when(mockConfigResolver.getFragmentSamplingRate()).thenReturn(0.70);
 
     // Passing a value for samplingBucketId which is greater than the sampling rate ensures that
     // the sampling will be enabled causing all the metrics to be dropped
@@ -890,6 +1078,7 @@ public void testGaugesAreNeverSampled() {
             /* capacity= */ 2,
             mClock,
             /* samplingBucketId= */ 0.71f,
+            /* fragmentBucketId= */ 0.71f,
             mockConfigResolver);
     assertThat(limiter.getIsDeviceAllowedToSendTraces()).isFalse();
     assertThat(limiter.getIsDeviceAllowedToSendNetworkEvents()).isFalse();
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/transport/TransportManagerTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/transport/TransportManagerTest.java
index aa020632fed..5376265aa0e 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/transport/TransportManagerTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/transport/TransportManagerTest.java
@@ -24,7 +24,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
+import static org.robolectric.Shadows.shadowOf;
 
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import androidx.test.core.app.ApplicationProvider;
 import com.google.android.datatransport.TransportFactory;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
@@ -64,6 +68,7 @@
 import org.mockito.verification.VerificationMode;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
 
 /** Unit tests for {@link TransportManager}. */
 @Config(shadows = ShadowPreconditions.class)
@@ -1195,11 +1200,11 @@ public void logNetworkMetric_sessionEnabled_doesNotStripOffSessionId() {
   }
 
   @Test
-  public void logTraceMetric_perfSessionExpired_updatesSessionId() {
+  public void logTraceMetric_perfSessionExpired_doesNotUpdateSessionId() {
     com.google.firebase.perf.session.PerfSession mockPerfSession =
         mock(com.google.firebase.perf.session.PerfSession.class);
     when(mockPerfSession.sessionId()).thenReturn("sessionId");
-    when(mockPerfSession.isExpired()).thenReturn(true);
+    when(mockPerfSession.isSessionRunningTooLong()).thenReturn(true);
 
     SessionManager.getInstance().setPerfSession(mockPerfSession);
     String oldSessionId = SessionManager.getInstance().perfSession().sessionId();
@@ -1208,15 +1213,15 @@ public void logTraceMetric_perfSessionExpired_updatesSessionId() {
     testTransportManager.log(createValidTraceMetric(), ApplicationProcessState.BACKGROUND);
     fakeExecutorService.runAll();
 
-    assertThat(oldSessionId).isNotEqualTo(SessionManager.getInstance().perfSession().sessionId());
+    assertThat(oldSessionId).isEqualTo(SessionManager.getInstance().perfSession().sessionId());
   }
 
   @Test
-  public void logNetworkMetric_perfSessionExpired_updatesSessionId() {
+  public void logNetworkMetric_perfSessionExpired_doesNotUpdateSessionId() {
     com.google.firebase.perf.session.PerfSession mockPerfSession =
         mock(com.google.firebase.perf.session.PerfSession.class);
     when(mockPerfSession.sessionId()).thenReturn("sessionId");
-    when(mockPerfSession.isExpired()).thenReturn(true);
+    when(mockPerfSession.isSessionRunningTooLong()).thenReturn(true);
 
     SessionManager.getInstance().setPerfSession(mockPerfSession);
     String oldSessionId = SessionManager.getInstance().perfSession().sessionId();
@@ -1225,15 +1230,15 @@ public void logNetworkMetric_perfSessionExpired_updatesSessionId() {
     testTransportManager.log(createValidNetworkRequestMetric(), ApplicationProcessState.BACKGROUND);
     fakeExecutorService.runAll();
 
-    assertThat(oldSessionId).isNotEqualTo(SessionManager.getInstance().perfSession().sessionId());
+    assertThat(oldSessionId).isEqualTo(SessionManager.getInstance().perfSession().sessionId());
   }
 
   @Test
-  public void logGaugeMetric_perfSessionExpired_updatesSessionId() {
+  public void logGaugeMetric_perfSessionExpired_doesNotUpdateSessionId() {
     com.google.firebase.perf.session.PerfSession mockPerfSession =
         mock(com.google.firebase.perf.session.PerfSession.class);
     when(mockPerfSession.sessionId()).thenReturn("sessionId");
-    when(mockPerfSession.isExpired()).thenReturn(true);
+    when(mockPerfSession.isSessionRunningTooLong()).thenReturn(true);
 
     SessionManager.getInstance().setPerfSession(mockPerfSession);
     String oldSessionId = SessionManager.getInstance().perfSession().sessionId();
@@ -1242,7 +1247,7 @@ public void logGaugeMetric_perfSessionExpired_updatesSessionId() {
     testTransportManager.log(createValidGaugeMetric(), ApplicationProcessState.FOREGROUND);
     fakeExecutorService.runAll();
 
-    assertThat(oldSessionId).isNotEqualTo(SessionManager.getInstance().perfSession().sessionId());
+    assertThat(oldSessionId).isEqualTo(SessionManager.getInstance().perfSession().sessionId());
   }
 
   @Test
@@ -1250,7 +1255,7 @@ public void logTraceMetric_perfSessionNotExpired_doesNotUpdateSessionId() {
     com.google.firebase.perf.session.PerfSession mockPerfSession =
         mock(com.google.firebase.perf.session.PerfSession.class);
     when(mockPerfSession.sessionId()).thenReturn("sessionId");
-    when(mockPerfSession.isExpired()).thenReturn(false);
+    when(mockPerfSession.isSessionRunningTooLong()).thenReturn(false);
 
     SessionManager.getInstance().setPerfSession(mockPerfSession);
     String oldSessionId = SessionManager.getInstance().perfSession().sessionId();
@@ -1267,7 +1272,7 @@ public void logNetworkMetric_perfSessionNotExpired_doesNotUpdateSessionId() {
     com.google.firebase.perf.session.PerfSession mockPerfSession =
         mock(com.google.firebase.perf.session.PerfSession.class);
     when(mockPerfSession.sessionId()).thenReturn("sessionId");
-    when(mockPerfSession.isExpired()).thenReturn(false);
+    when(mockPerfSession.isSessionRunningTooLong()).thenReturn(false);
 
     SessionManager.getInstance().setPerfSession(mockPerfSession);
     String oldSessionId = SessionManager.getInstance().perfSession().sessionId();
@@ -1284,7 +1289,7 @@ public void logGaugeMetric_perfSessionNotExpired_doesNotUpdateSessionId() {
     com.google.firebase.perf.session.PerfSession mockPerfSession =
         mock(com.google.firebase.perf.session.PerfSession.class);
     when(mockPerfSession.sessionId()).thenReturn("sessionId");
-    when(mockPerfSession.isExpired()).thenReturn(false);
+    when(mockPerfSession.isSessionRunningTooLong()).thenReturn(false);
 
     SessionManager.getInstance().setPerfSession(mockPerfSession);
     String oldSessionId = SessionManager.getInstance().perfSession().sessionId();
@@ -1393,6 +1398,16 @@ private void initializeTransport(boolean shouldInitialize) {
     clearLastLoggedEvents();
 
     if (shouldInitialize) {
+      // Set the version name since Firebase sessions needs it.
+      Context context = ApplicationProvider.getApplicationContext();
+      ShadowPackageManager shadowPackageManager = shadowOf(context.getPackageManager());
+
+      PackageInfo packageInfo =
+          shadowPackageManager.getInternalMutablePackageInfo(context.getPackageName());
+      packageInfo.versionName = "1.0.0";
+
+      packageInfo.applicationInfo.metaData.clear();
+
       testTransportManager = TransportManager.getInstance();
       testTransportManager.initializeForTest(
           FirebaseApp.getInstance(),
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/util/FirstDrawDoneListenerTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/util/FirstDrawDoneListenerTest.java
new file mode 100644
index 00000000000..76aad67e5b7
--- /dev/null
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/util/FirstDrawDoneListenerTest.java
@@ -0,0 +1,181 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+//
+// You may obtain a copy of the License at
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.perf.util;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.ViewTreeObserver.OnDrawListener;
+import androidx.test.core.app.ApplicationProvider;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
+
+/** Unit tests for {@link FirstDrawDoneListener}. */
+@RunWith(RobolectricTestRunner.class)
+@LooperMode(LooperMode.Mode.PAUSED)
+public class FirstDrawDoneListenerTest {
+  private View testView;
+
+  @Before
+  public void setUp() {
+    testView = new View(ApplicationProvider.getApplicationContext());
+  }
+
+  @Test
+  @Config(sdk = 25)
+  public void registerForNextDraw_delaysAddingListenerForAPIsBelow26()
+      throws NoSuchFieldException, IllegalAccessException, ClassNotFoundException {
+    ArrayList<OnDrawListener> mOnDrawListeners =
+        initViewTreeObserverWithListener(testView.getViewTreeObserver());
+    assertThat(mOnDrawListeners.size()).isEqualTo(0);
+
+    // OnDrawListener is not registered, it is delayed for later
+    FirstDrawDoneListener.registerForNextDraw(testView, () -> {});
+    assertThat(mOnDrawListeners.size()).isEqualTo(0);
+
+    // Register listener after the view is attached to a window
+    List<View.OnAttachStateChangeListener> attachListeners = dispatchAttachedToWindow(testView);
+    assertThat(mOnDrawListeners.size()).isEqualTo(1);
+    assertThat(mOnDrawListeners.get(0)).isInstanceOf(FirstDrawDoneListener.class);
+    assertThat(attachListeners).isEmpty();
+  }
+
+  @Test
+  @Config(sdk = 26)
+  public void registerForNextDraw_directlyAddsListenerForApi26AndAbove()
+      throws NoSuchFieldException, IllegalAccessException {
+    ArrayList<OnDrawListener> mOnDrawListeners =
+        initViewTreeObserverWithListener(testView.getViewTreeObserver());
+    assertThat(mOnDrawListeners.size()).isEqualTo(0);
+
+    // Immediately register an OnDrawListener to ViewTreeObserver
+    FirstDrawDoneListener.registerForNextDraw(testView, () -> {});
+    assertThat(mOnDrawListeners.size()).isEqualTo(1);
+    assertThat(mOnDrawListeners.get(0)).isInstanceOf(FirstDrawDoneListener.class);
+  }
+
+  @Test
+  @Config(sdk = 26)
+  public void onDraw_postsCallbackToFrontOfQueue() {
+    Handler handler = new Handler(Looper.getMainLooper());
+    Runnable drawDoneCallback = mock(Runnable.class);
+    Runnable otherCallback = mock(Runnable.class);
+    InOrder inOrder = inOrder(drawDoneCallback, otherCallback);
+
+    FirstDrawDoneListener.registerForNextDraw(testView, drawDoneCallback);
+    handler.post(otherCallback); // 3rd in queue
+    handler.postAtFrontOfQueue(otherCallback); // 2nd in queue
+    testView.getViewTreeObserver().dispatchOnDraw(); // 1st in queue
+    verify(drawDoneCallback, never()).run();
+    verify(otherCallback, never()).run();
+
+    // Execute all posted tasks
+    shadowOf(Looper.getMainLooper()).idle();
+    inOrder.verify(drawDoneCallback, times(1)).run();
+    inOrder.verify(otherCallback, times(2)).run();
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @Test
+  @Config(sdk = 26)
+  public void onDraw_unregistersItself_inLayoutChangeListener()
+      throws NoSuchFieldException, IllegalAccessException {
+    ArrayList<OnDrawListener> mOnDrawListeners =
+        initViewTreeObserverWithListener(testView.getViewTreeObserver());
+    FirstDrawDoneListener.registerForNextDraw(testView, () -> {});
+    assertThat(mOnDrawListeners.size()).isEqualTo(1);
+
+    // Does not remove OnDrawListener before onDraw, even if OnGlobalLayout is triggered
+    testView.getViewTreeObserver().dispatchOnGlobalLayout();
+    assertThat(mOnDrawListeners.size()).isEqualTo(1);
+
+    // Removes OnDrawListener in the next OnGlobalLayout after onDraw
+    testView.getViewTreeObserver().dispatchOnDraw();
+    testView.getViewTreeObserver().dispatchOnGlobalLayout();
+    assertThat(mOnDrawListeners.size()).isEqualTo(0);
+  }
+
+  /**
+   * Returns ViewTreeObserver.mOnDrawListeners field through reflection. Since reflections are
+   * employed, prefer to be used in tests with fixed API level using @Config(sdk = X).
+   *
+   * @param vto ViewTreeObserver instance to initialize and return the mOnDrawListeners from
+   */
+  private static ArrayList<OnDrawListener> initViewTreeObserverWithListener(ViewTreeObserver vto)
+      throws NoSuchFieldException, IllegalAccessException {
+    // Adding a listener forces ViewTreeObserver.mOnDrawListeners to be initialized and non-null.
+    OnDrawListener placeHolder = () -> {};
+    vto.addOnDrawListener(placeHolder);
+    vto.removeOnDrawListener(placeHolder);
+
+    // Obtain mOnDrawListeners field through reflection
+    Field mOnDrawListeners =
+        android.view.ViewTreeObserver.class.getDeclaredField("mOnDrawListeners");
+    mOnDrawListeners.setAccessible(true);
+    ArrayList<OnDrawListener> listeners = (ArrayList<OnDrawListener>) mOnDrawListeners.get(vto);
+    assertThat(listeners).isNotNull();
+    assertThat(listeners.size()).isEqualTo(0);
+    return listeners;
+  }
+
+  /**
+   * Simulates {@link View}'s dispatchAttachedToWindow() on API 25 using reflection.
+   *
+   * <p>This only simulates the part where dispatchAttachedToWindow() notifies the list of {@link
+   * View.OnAttachStateChangeListener}.
+   *
+   * @param view the view in which we are simulating dispatchAttachedToWindow().
+   * @return list of {@link View.OnAttachStateChangeListener} from the input {@link View}
+   */
+  private static List<View.OnAttachStateChangeListener> dispatchAttachedToWindow(View view)
+      throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
+    assert Build.VERSION.SDK_INT == 25;
+    Class<?> listenerInfo = Class.forName("android.view.View$ListenerInfo");
+    Field mListenerInfo = View.class.getDeclaredField("mListenerInfo");
+    mListenerInfo.setAccessible(true);
+    Object li = mListenerInfo.get(view);
+    assertThat(li).isNotNull();
+    Field mOnAttachStateChangeListeners =
+        listenerInfo.getDeclaredField("mOnAttachStateChangeListeners");
+    mOnAttachStateChangeListeners.setAccessible(true);
+    CopyOnWriteArrayList<View.OnAttachStateChangeListener> listeners =
+        (CopyOnWriteArrayList<View.OnAttachStateChangeListener>)
+            mOnAttachStateChangeListeners.get(li);
+    assertThat(listeners).isNotNull();
+    assertThat(listeners).isNotEmpty();
+    for (View.OnAttachStateChangeListener listener : listeners) {
+      listener.onViewAttachedToWindow(view);
+    }
+    return listeners;
+  }
+}
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/util/ImmutableBundleTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/util/ImmutableBundleTest.java
index f324cdd7ae8..c130215e4ac 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/util/ImmutableBundleTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/util/ImmutableBundleTest.java
@@ -93,48 +93,48 @@ public void getBooleanOptional_valueTypeNotMatch_returnsEmpty() {
   }
 
   @Test
-  public void getFloatOptional_noValueFound_returnsEmpty() {
+  public void getDoubleOptional_noValueFound_returnsEmpty() {
     Bundle testBundle = new Bundle();
     testBundle.putFloat("testKey", 25.0f);
 
     ImmutableBundle testImmutableBundle = new ImmutableBundle(testBundle);
-    assertThat(testImmutableBundle.getFloat("notPresentKey").isAvailable()).isFalse();
+    assertThat(testImmutableBundle.getDouble("notPresentKey").isAvailable()).isFalse();
   }
 
   @Test
-  public void getFloatOptional_valueFound_returnsValue() {
+  public void getDoubleOptional_valueFound_returnsValue() {
     Bundle testBundle = new Bundle();
     testBundle.putFloat("testKey", 25.0f);
 
     ImmutableBundle testImmutableBundle = new ImmutableBundle(testBundle);
-    assertThat(testImmutableBundle.getFloat("testKey").get()).isEqualTo(25.0f);
+    assertThat(testImmutableBundle.getDouble("testKey").get()).isEqualTo(25.0);
   }
 
   @Test
-  public void getFloatOptional_keyIsNull_returnsEmpty() {
+  public void getDoubleOptional_keyIsNull_returnsEmpty() {
     Bundle testBundle = new Bundle();
     testBundle.putFloat("testKey", 25.0f);
 
     ImmutableBundle testImmutableBundle = new ImmutableBundle(testBundle);
-    assertThat(testImmutableBundle.getFloat(null).isAvailable()).isFalse();
+    assertThat(testImmutableBundle.getDouble(null).isAvailable()).isFalse();
   }
 
   @Test
-  public void getFloatOptional_valueTypeNotMatch_returnsEmpty() {
+  public void getDoubleOptional_valueTypeNotMatch_returnsEmpty() {
     Bundle testBundle = new Bundle();
     testBundle.putBoolean("testKey", true);
 
     ImmutableBundle testImmutableBundle = new ImmutableBundle(testBundle);
-    assertThat(testImmutableBundle.getFloat("testKey").isAvailable()).isFalse();
+    assertThat(testImmutableBundle.getDouble("testKey").isAvailable()).isFalse();
   }
 
   @Test
-  public void getFloatOptional_valueIsNull_returnsEmpty() {
+  public void getDoubleOptional_valueIsNull_returnsEmpty() {
     Bundle testBundle = new Bundle();
     testBundle.putString("testKey", null);
 
     ImmutableBundle testImmutableBundle = new ImmutableBundle(testBundle);
-    assertThat(testImmutableBundle.getFloat("testKey").isAvailable()).isFalse();
+    assertThat(testImmutableBundle.getDouble("testKey").isAvailable()).isFalse();
   }
 
   @Test
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/util/TimerTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/util/TimerTest.java
index 7c3f945dc3b..e8031b53577 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/util/TimerTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/util/TimerTest.java
@@ -15,27 +15,75 @@
 package com.google.firebase.perf.util;
 
 import static com.google.common.truth.Truth.assertThat;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 import android.os.Parcel;
-import java.util.concurrent.TimeUnit;
+import android.os.SystemClock;
+import java.time.Duration;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-
-/** Unit tests for {@link Timer}. */
+import org.robolectric.shadows.ShadowSystemClock;
+
+/**
+ * Unit tests for {@link Timer}.
+ *
+ * <p>IMPORTANT: {@link SystemClock} is paused in tests, and can only be advanced through specific
+ * methods such as {@link ShadowSystemClock#advanceBy(Duration)} which are shadowed by Robolectic.
+ */
 @RunWith(RobolectricTestRunner.class)
 public class TimerTest {
 
   @Before
   public void setUp() {}
 
+  @Test
+  public void getDurationMicros_returnsDifferenceBetweenElapsedRealtime() {
+    // Robolectric shadows SystemClock, which is paused and can only change via specific methods.
+    Timer start = new Timer();
+    ShadowSystemClock.advanceBy(Duration.ofMillis(100000));
+    Timer end = new Timer();
+    assertThat(start.getDurationMicros(end)).isEqualTo(MILLISECONDS.toMicros(100000));
+  }
+
+  @Test
+  public void ofElapsedRealtime_createsNewTimerWithArgumentElapsedRealtime() {
+    // Robolectric shadows SystemClock, which is paused and can only change via specific methods.
+    long refElapsedRealtime = SystemClock.elapsedRealtime();
+    Timer ref = new Timer();
+    Timer past = Timer.ofElapsedRealtime(refElapsedRealtime - 100);
+    Timer future = Timer.ofElapsedRealtime(refElapsedRealtime + 100);
+
+    assertThat(past.getDurationMicros(ref)).isEqualTo(MILLISECONDS.toMicros(100));
+    assertThat(ref.getDurationMicros(future)).isEqualTo(MILLISECONDS.toMicros(100));
+  }
+
+  @Test
+  public void ofElapsedRealtime_extrapolatesWallTime() {
+    // Robolectric shadows SystemClock, which is paused and can only change via specific methods.
+    // Advance SystemClock by a large amount to avoid negative time
+    ShadowSystemClock.advanceBy(Duration.ofMillis(10000000));
+    long nowElapsedRealtime = SystemClock.elapsedRealtime();
+    Timer now = new Timer();
+    Timer morePast = Timer.ofElapsedRealtime(nowElapsedRealtime - 2000);
+    Timer past = Timer.ofElapsedRealtime(nowElapsedRealtime - 1000);
+    Timer future = Timer.ofElapsedRealtime(nowElapsedRealtime + 1000);
+    Timer moreFuture = Timer.ofElapsedRealtime(nowElapsedRealtime + 2000);
+
+    // We cannot manipulate System.currentTimeMillis() so multiple comparisons are used to test
+    assertThat(morePast.getMicros()).isLessThan(past.getMicros());
+    assertThat(past.getMicros()).isLessThan(now.getMicros());
+    assertThat(now.getMicros()).isLessThan(future.getMicros());
+    assertThat(future.getMicros()).isLessThan(moreFuture.getMicros());
+  }
+
   @Test
   public void testCreate() throws InterruptedException {
     Timer timer = new Timer();
     Thread.sleep(10);
-    long currentTimeMicros = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis());
+    long currentTimeMicros = MILLISECONDS.toMicros(System.currentTimeMillis());
 
     assertThat(timer.getMicros()).isNotEqualTo(currentTimeMicros);
     assertThat(timer.getMicros()).isLessThan(currentTimeMicros);
@@ -45,7 +93,7 @@ public void testCreate() throws InterruptedException {
   public void testReset() throws InterruptedException {
     Timer timer = new Timer();
     Thread.sleep(10);
-    long currentTimeMicros = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis());
+    long currentTimeMicros = MILLISECONDS.toMicros(System.currentTimeMillis());
 
     assertThat(timer.getMicros()).isNotEqualTo(currentTimeMicros);
     timer.reset();
@@ -55,7 +103,7 @@ public void testReset() throws InterruptedException {
 
   @Test
   public void testGetCurrentTimestampMicros() {
-    Timer timer = new Timer(0);
+    Timer timer = new Timer(0, 0);
     long currentTimeSmallest = timer.getCurrentTimestampMicros();
 
     assertThat(timer.getMicros()).isEqualTo(0);
@@ -76,9 +124,14 @@ public void testParcel() {
 
     Timer timer2 = Timer.CREATOR.createFromParcel(p2);
     Assert.assertEquals(timer1.getMicros(), timer2.getMicros());
-    Assert.assertEquals(timer1.getHighResTime(), timer2.getHighResTime());
+    Assert.assertEquals(timer1.getDurationMicros(timer2), 0);
 
     p1.recycle();
     p2.recycle();
   }
+
+  /** Helper for other tests that returns elapsedRealtimeMicros from a Timer object */
+  public static long getElapsedRealtimeMicros(Timer timer) {
+    return new Timer(0, 0).getDurationMicros(timer);
+  }
 }
diff --git a/firebase-segmentation/firebase-segmentation.gradle b/firebase-segmentation/firebase-segmentation.gradle
index 215e75fa43e..f1429dd9eec 100644
--- a/firebase-segmentation/firebase-segmentation.gradle
+++ b/firebase-segmentation/firebase-segmentation.gradle
@@ -17,7 +17,8 @@ plugins {
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.segmentation"    
+    compileSdkVersion project.compileSdkVersion
 
     defaultConfig {
         minSdkVersion project.minSdkVersion
@@ -38,21 +39,24 @@ android {
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-installations-interop')
-    runtimeOnly project(':firebase-installations')
+    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
 
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    api 'com.google.android.gms:play-services-tasks:18.0.1'
+    api 'com.google.firebase:firebase-annotations:16.2.0'
+    api 'com.google.firebase:firebase-common:21.0.0'
+    api 'com.google.firebase:firebase-components:18.0.0'
+    api 'com.google.firebase:firebase-installations-interop:17.1.0'
 
     compileOnly "com.google.auto.value:auto-value-annotations:1.6.5"
+
+    runtimeOnly project(':firebase-installations')
+
     annotationProcessor "com.google.auto.value:auto-value:1.6.2"
-    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
 
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'junit:junit:4.12'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'org.mockito:mockito-inline:2.25.0'
+    testImplementation 'org.mockito:mockito-core:5.2.0'
+    testImplementation 'org.mockito:mockito-inline:5.2.0'
 }
diff --git a/firebase-segmentation/src/main/AndroidManifest.xml b/firebase-segmentation/src/main/AndroidManifest.xml
index 9005c369f32..bcdb5cd81ee 100644
--- a/firebase-segmentation/src/main/AndroidManifest.xml
+++ b/firebase-segmentation/src/main/AndroidManifest.xml
@@ -13,8 +13,7 @@
 <!-- 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="com.google.firebase.segmentation">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <application>
diff --git a/firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentation.java b/firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentation.java
index b7e70bfef69..c9ba9550b38 100644
--- a/firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentation.java
+++ b/firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentation.java
@@ -30,7 +30,6 @@
 import com.google.firebase.segmentation.remote.SegmentationServiceClient.Code;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
 
 /** Entry point of Firebase Segmentation SDK. */
 public class FirebaseSegmentation {
@@ -43,24 +42,29 @@ public class FirebaseSegmentation {
   private final SegmentationServiceClient backendServiceClient;
   private final Executor executor;
 
-  FirebaseSegmentation(FirebaseApp firebaseApp, FirebaseInstallationsApi firebaseInstallationsApi) {
+  FirebaseSegmentation(
+      FirebaseApp firebaseApp,
+      FirebaseInstallationsApi firebaseInstallationsApi,
+      Executor blockingExecutor) {
     this(
         firebaseApp,
         firebaseInstallationsApi,
         new CustomInstallationIdCache(firebaseApp),
-        new SegmentationServiceClient(firebaseApp.getApplicationContext()));
+        new SegmentationServiceClient(firebaseApp.getApplicationContext()),
+        blockingExecutor);
   }
 
   FirebaseSegmentation(
       FirebaseApp firebaseApp,
       FirebaseInstallationsApi firebaseInstallationsApi,
       CustomInstallationIdCache localCache,
-      SegmentationServiceClient backendServiceClient) {
+      SegmentationServiceClient backendServiceClient,
+      Executor blockingExecutor) {
     this.firebaseApp = firebaseApp;
     this.firebaseInstallationsApi = firebaseInstallationsApi;
     this.localCache = localCache;
     this.backendServiceClient = backendServiceClient;
-    this.executor = Executors.newFixedThreadPool(4);
+    this.executor = blockingExecutor;
   }
 
   /**
diff --git a/firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentationRegistrar.java b/firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentationRegistrar.java
index c69385a9cba..1620d043ae3 100644
--- a/firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentationRegistrar.java
+++ b/firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentationRegistrar.java
@@ -16,29 +16,38 @@
 
 import androidx.annotation.NonNull;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.Executor;
 
 /** @hide */
 public class FirebaseSegmentationRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-segmentation";
 
   @Override
   @NonNull
   public List<Component<?>> getComponents() {
+    Qualified<Executor> blockingExecutor = Qualified.qualified(Blocking.class, Executor.class);
     return Arrays.asList(
         Component.builder(FirebaseSegmentation.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(FirebaseInstallationsApi.class))
+            .add(Dependency.required(blockingExecutor))
             .factory(
                 c ->
                     new FirebaseSegmentation(
-                        c.get(FirebaseApp.class), c.get(FirebaseInstallationsApi.class)))
+                        c.get(FirebaseApp.class),
+                        c.get(FirebaseInstallationsApi.class),
+                        c.get(blockingExecutor)))
             .build(),
-        LibraryVersionComponent.create("fire-segmentation", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-segmentation/src/test/java/com/google/firebase/segmentation/FirebaseSegmentationTest.java b/firebase-segmentation/src/test/java/com/google/firebase/segmentation/FirebaseSegmentationTest.java
index 6a8a37485c2..1e6fb7b7106 100644
--- a/firebase-segmentation/src/test/java/com/google/firebase/segmentation/FirebaseSegmentationTest.java
+++ b/firebase-segmentation/src/test/java/com/google/firebase/segmentation/FirebaseSegmentationTest.java
@@ -134,7 +134,11 @@ public void cleanUp() throws Exception {
   public void testUpdateCustomInstallationId_CacheOk_BackendOk() throws Exception {
     FirebaseSegmentation firebaseSegmentation =
         new FirebaseSegmentation(
-            firebaseApp, firebaseInstallationsApi, actualCache, backendClientReturnsOk);
+            firebaseApp,
+            firebaseInstallationsApi,
+            actualCache,
+            backendClientReturnsOk,
+            taskExecutor);
 
     // No exception, means success.
     TestOnCompleteListener<Void> onCompleteListener = new TestOnCompleteListener<>();
@@ -153,7 +157,11 @@ public void testUpdateCustomInstallationId_CacheOk_BackendError_Retryable()
       throws InterruptedException {
     FirebaseSegmentation firebaseSegmentation =
         new FirebaseSegmentation(
-            firebaseApp, firebaseInstallationsApi, actualCache, backendClientReturnsError);
+            firebaseApp,
+            firebaseInstallationsApi,
+            actualCache,
+            backendClientReturnsError,
+            taskExecutor);
 
     // Expect exception
     try {
@@ -185,7 +193,11 @@ public void testUpdateCustomInstallationId_CacheOk_BackendError_NotRetryable()
         .thenReturn(SegmentationServiceClient.Code.CONFLICT);
     FirebaseSegmentation firebaseSegmentation =
         new FirebaseSegmentation(
-            firebaseApp, firebaseInstallationsApi, actualCache, backendClientReturnsError);
+            firebaseApp,
+            firebaseInstallationsApi,
+            actualCache,
+            backendClientReturnsError,
+            taskExecutor);
 
     // Expect exception
     try {
@@ -210,7 +222,11 @@ public void testUpdateCustomInstallationId_CacheOk_BackendError_NotRetryable()
   public void testUpdateCustomInstallationId_CacheError_BackendOk() throws InterruptedException {
     FirebaseSegmentation firebaseSegmentation =
         new FirebaseSegmentation(
-            firebaseApp, firebaseInstallationsApi, cacheReturnsError, backendClientReturnsOk);
+            firebaseApp,
+            firebaseInstallationsApi,
+            cacheReturnsError,
+            backendClientReturnsOk,
+            taskExecutor);
 
     // Expect exception
     try {
@@ -237,7 +253,11 @@ public void testClearCustomInstallationId_CacheOk_BackendOk() throws Exception {
             CustomInstallationIdCache.CacheStatus.SYNCED));
     FirebaseSegmentation firebaseSegmentation =
         new FirebaseSegmentation(
-            firebaseApp, firebaseInstallationsApi, actualCache, backendClientReturnsOk);
+            firebaseApp,
+            firebaseInstallationsApi,
+            actualCache,
+            backendClientReturnsOk,
+            taskExecutor);
 
     // No exception, means success.
     TestOnCompleteListener<Void> onCompleteListener = new TestOnCompleteListener<>();
@@ -258,7 +278,11 @@ public void testClearCustomInstallationId_CacheOk_BackendError() throws Exceptio
             CustomInstallationIdCache.CacheStatus.SYNCED));
     FirebaseSegmentation firebaseSegmentation =
         new FirebaseSegmentation(
-            firebaseApp, firebaseInstallationsApi, actualCache, backendClientReturnsError);
+            firebaseApp,
+            firebaseInstallationsApi,
+            actualCache,
+            backendClientReturnsError,
+            taskExecutor);
 
     // Expect exception
     try {
@@ -286,7 +310,11 @@ public void testClearCustomInstallationId_CacheOk_BackendError() throws Exceptio
   public void testClearCustomInstallationId_CacheError_BackendOk() throws InterruptedException {
     FirebaseSegmentation firebaseSegmentation =
         new FirebaseSegmentation(
-            firebaseApp, firebaseInstallationsApi, cacheReturnsError, backendClientReturnsOk);
+            firebaseApp,
+            firebaseInstallationsApi,
+            cacheReturnsError,
+            backendClientReturnsOk,
+            taskExecutor);
 
     // Expect exception
     try {
diff --git a/firebase-sessions/CHANGELOG.md b/firebase-sessions/CHANGELOG.md
new file mode 100644
index 00000000000..8c9c855196b
--- /dev/null
+++ b/firebase-sessions/CHANGELOG.md
@@ -0,0 +1,33 @@
+# Unreleased
+
+* [fixed] Handled datastore writes when device has full internal memory more gracefully.
+  (GitHub [#5859](https://github.com/firebase/firebase-android-sdk/issues/5859))
+* [fixed] Safely unbind malfunctioning session lifecycle service to release service connections.
+  (GitHub [#5869](https://github.com/firebase/firebase-android-sdk/issues/5869))
+
+# 1.2.3
+
+* [fixed] Force validation or rotation of FIDs.
+
+# 1.2.1
+
+* [changed] Bump internal dependencies.
+* [fixed] Handle corruption in DataStore Preferences more gracefully.
+
+# 1.2.0
+
+* [feature] Added support for accurate sessions on multi-process apps.
+
+# 1.0.2
+
+* [fixed] Made Sessions more resilient to the FirebaseApp instance being deleted.
+
+# 1.0.1
+
+* [fixed] Fixed NPE when no version name is
+  set ([#5195](https://github.com/firebase/firebase-android-sdk/issues/5195)).
+* [fixed] Populate DataCollectionStatus fields for Crashlytics and Perf.
+
+# 1.0.0
+
+* [feature] Initial Firebase sessions library.
diff --git a/firebase-sessions/README.md b/firebase-sessions/README.md
new file mode 100644
index 00000000000..276c8af1ba7
--- /dev/null
+++ b/firebase-sessions/README.md
@@ -0,0 +1,27 @@
+# Firebase Sessions SDK
+
+The Firebase Sessions SDK is used by Crashlytics and Performance internally to measure sessions.
+
+## Building
+
+All Gradle commands should be run from the root of this repository.
+
+`./gradlew :firebase-sessions:publishToMavenLocal`
+
+## Running Tests
+
+Unit tests:
+
+`./gradlew :firebase-sessions:test`
+
+Integration tests, requiring a running and connected device (emulator or real):
+
+`./gradlew :firebase-sessions:connectedAndroidTest`
+
+## Code Formatting
+
+Format Kotlin code in this SDK in Android Studio using
+the [ktfmt plugin](https://plugins.jetbrains.com/plugin/14912-ktfmt) with code style to
+**Google (internal)**, or by running:
+
+`./gradlew :firebase-sessions:ktfmtFormat`
diff --git a/firebase-sessions/api.txt b/firebase-sessions/api.txt
new file mode 100644
index 00000000000..c328c81853c
--- /dev/null
+++ b/firebase-sessions/api.txt
@@ -0,0 +1,35 @@
+// Signature format: 2.0
+package com.google.firebase.sessions.api {
+
+  public final class FirebaseSessionsDependencies {
+    method public static void addDependency(@NonNull com.google.firebase.sessions.api.SessionSubscriber.Name subscriberName);
+    method public static void register(@NonNull com.google.firebase.sessions.api.SessionSubscriber subscriber);
+    field @NonNull public static final com.google.firebase.sessions.api.FirebaseSessionsDependencies INSTANCE;
+  }
+
+  public interface SessionSubscriber {
+    method @NonNull public com.google.firebase.sessions.api.SessionSubscriber.Name getSessionSubscriberName();
+    method public boolean isDataCollectionEnabled();
+    method public void onSessionChanged(@NonNull com.google.firebase.sessions.api.SessionSubscriber.SessionDetails sessionDetails);
+    property public abstract boolean isDataCollectionEnabled;
+    property @NonNull public abstract com.google.firebase.sessions.api.SessionSubscriber.Name sessionSubscriberName;
+  }
+
+  public enum SessionSubscriber.Name {
+    method @NonNull public static com.google.firebase.sessions.api.SessionSubscriber.Name valueOf(@NonNull String name) throws java.lang.IllegalArgumentException;
+    method @NonNull public static com.google.firebase.sessions.api.SessionSubscriber.Name[] values();
+    enum_constant public static final com.google.firebase.sessions.api.SessionSubscriber.Name CRASHLYTICS;
+    enum_constant @Discouraged(message="This is for testing purposes only.") public static final com.google.firebase.sessions.api.SessionSubscriber.Name MATT_SAYS_HI;
+    enum_constant public static final com.google.firebase.sessions.api.SessionSubscriber.Name PERFORMANCE;
+  }
+
+  public static final class SessionSubscriber.SessionDetails {
+    ctor public SessionSubscriber.SessionDetails(@NonNull String sessionId);
+    method @NonNull public String component1();
+    method @NonNull public com.google.firebase.sessions.api.SessionSubscriber.SessionDetails copy(@NonNull String sessionId);
+    method @NonNull public String getSessionId();
+    property @NonNull public final String sessionId;
+  }
+
+}
+
diff --git a/firebase-sessions/firebase-sessions.gradle.kts b/firebase-sessions/firebase-sessions.gradle.kts
new file mode 100644
index 00000000000..73a85eea507
--- /dev/null
+++ b/firebase-sessions/firebase-sessions.gradle.kts
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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:Suppress("UnstableApiUsage")
+
+plugins {
+  id("firebase-library")
+  id("kotlin-android")
+  id("kotlin-kapt")
+}
+
+firebaseLibrary {
+  libraryGroup("crashlytics")
+
+  testLab.enabled = true
+  publishSources = true
+  publishJavadoc = false
+  publishReleaseNotes = false
+}
+
+android {
+  val compileSdkVersion : Int by rootProject
+  val targetSdkVersion : Int by rootProject
+  val minSdkVersion : Int by rootProject
+
+  namespace = "com.google.firebase.sessions"
+  compileSdk = compileSdkVersion
+  defaultConfig {
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+    multiDexEnabled = true
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+  }
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+  kotlinOptions { jvmTarget = "1.8" }
+  testOptions.unitTests.isIncludeAndroidResources = true
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs::class.java).configureEach {
+  kotlinOptions.jvmTarget = "1.8"
+}
+
+dependencies {
+  api("com.google.firebase:firebase-common:21.0.0")
+  api("com.google.firebase:firebase-common-ktx:21.0.0")
+
+  api("com.google.firebase:firebase-components:18.0.0")
+  api("com.google.firebase:firebase-installations-interop:17.1.1") {
+    exclude(group = "com.google.firebase", module = "firebase-common")
+    exclude(group = "com.google.firebase", module = "firebase-components")
+  }
+  implementation("androidx.datastore:datastore-preferences:1.0.0")
+  implementation("com.google.android.datatransport:transport-api:3.0.0")
+  api("com.google.firebase:firebase-annotations:16.2.0")
+  api("com.google.firebase:firebase-encoders:17.0.0")
+  api("com.google.firebase:firebase-encoders-json:18.0.1")
+  implementation(libs.androidx.annotation)
+  compileOnly(libs.errorprone.annotations)
+
+  runtimeOnly("com.google.firebase:firebase-installations:17.2.0") {
+    exclude(group = "com.google.firebase", module = "firebase-common")
+    exclude(group = "com.google.firebase", module = "firebase-components")
+  }
+  runtimeOnly("com.google.firebase:firebase-datatransport:18.1.8") {
+    exclude(group = "com.google.firebase", module = "firebase-common")
+    exclude(group = "com.google.firebase", module = "firebase-components")
+  }
+
+  kapt(project(":encoders:firebase-encoders-processor"))
+
+  testImplementation(project(":integ-testing")) {
+    exclude(group = "com.google.firebase", module = "firebase-common")
+    exclude(group = "com.google.firebase", module = "firebase-components")
+  }
+  testImplementation(libs.androidx.test.junit)
+  testImplementation(libs.androidx.test.runner)
+  testImplementation(libs.junit)
+  testImplementation(libs.kotlin.coroutines.test)
+  testImplementation(libs.robolectric)
+  testImplementation(libs.truth)
+
+  androidTestImplementation(libs.androidx.test.junit)
+  androidTestImplementation(libs.androidx.test.rules)
+  androidTestImplementation(libs.androidx.test.runner)
+  androidTestImplementation(libs.truth)
+}
diff --git a/firebase-sessions/gradle.properties b/firebase-sessions/gradle.properties
new file mode 100644
index 00000000000..91d32512896
--- /dev/null
+++ b/firebase-sessions/gradle.properties
@@ -0,0 +1,16 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+version=2.0.1
+latestReleasedVersion=2.0.0
diff --git a/firebase-sessions/src/androidTest/AndroidManifest.xml b/firebase-sessions/src/androidTest/AndroidManifest.xml
new file mode 100644
index 00000000000..16c3a897134
--- /dev/null
+++ b/firebase-sessions/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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"
+  android:versionCode="1"
+  android:versionName="1.0.0">
+
+  <application>
+
+  </application>
+
+</manifest>
diff --git a/firebase-sessions/src/androidTest/kotlin/com/google/firebase/sessions/FirebaseSessionsTests.kt b/firebase-sessions/src/androidTest/kotlin/com/google/firebase/sessions/FirebaseSessionsTests.kt
new file mode 100644
index 00000000000..1cf67e0c5e1
--- /dev/null
+++ b/firebase-sessions/src/androidTest/kotlin/com/google/firebase/sessions/FirebaseSessionsTests.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.initialize
+import com.google.firebase.sessions.settings.SessionsSettings
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class FirebaseSessionsTests {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId(PROJECT_ID)
+        .build()
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+
+  @Test
+  fun firebaseSessionsDoesInitialize() {
+    assertThat(FirebaseSessions.instance).isNotNull()
+  }
+
+  @Test
+  fun firebaseSessionsDependenciesDoInitialize() {
+    assertThat(SessionFirelogPublisher.instance).isNotNull()
+    assertThat(SessionGenerator.instance).isNotNull()
+    assertThat(SessionsSettings.instance).isNotNull()
+  }
+
+  companion object {
+    private const val APP_ID = "1:1:android:1a"
+    private const val API_KEY = "API-KEY-API-KEY-API-KEY-API-KEY-API-KEY"
+    private const val PROJECT_ID = "PROJECT-ID"
+  }
+}
diff --git a/firebase-sessions/src/androidTest/kotlin/com/google/firebase/sessions/SessionLifecycleServiceBinderTest.kt b/firebase-sessions/src/androidTest/kotlin/com/google/firebase/sessions/SessionLifecycleServiceBinderTest.kt
new file mode 100644
index 00000000000..49106b742af
--- /dev/null
+++ b/firebase-sessions/src/androidTest/kotlin/com/google/firebase/sessions/SessionLifecycleServiceBinderTest.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ServiceTestRule
+import com.google.common.truth.Truth.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class SessionLifecycleServiceBinderTest {
+  @get:Rule val serviceRule = ServiceTestRule()
+
+  @Test
+  fun bindSessionLifecycleService() {
+    val serviceConnection =
+      object : ServiceConnection {
+        var connected: Boolean = false
+
+        override fun onServiceConnected(className: ComponentName?, serviceBinder: IBinder?) {
+          connected = true
+        }
+
+        override fun onServiceDisconnected(className: ComponentName?) {
+          connected = false
+        }
+      }
+
+    val sessionLifecycleServiceIntent =
+      Intent(ApplicationProvider.getApplicationContext(), SessionLifecycleService::class.java)
+
+    serviceRule.bindService(
+      sessionLifecycleServiceIntent,
+      serviceConnection,
+      Context.BIND_IMPORTANT or Context.BIND_AUTO_CREATE,
+    )
+
+    assertThat(serviceConnection.connected).isTrue()
+  }
+}
diff --git a/firebase-sessions/src/main/AndroidManifest.xml b/firebase-sessions/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..181dcb1eee7
--- /dev/null
+++ b/firebase-sessions/src/main/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2023 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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">
+  <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
+  <!--<uses-sdk android:minSdkVersion="21"/>-->
+
+  <application>
+    <service
+      android:name="com.google.firebase.sessions.SessionLifecycleService"
+      android:enabled="true"
+      android:exported="false" />
+    <service android:name="com.google.firebase.components.ComponentDiscoveryService"
+      android:exported="false">
+      <meta-data
+        android:name="com.google.firebase.components:com.google.firebase.sessions.FirebaseSessionsRegistrar"
+        android:value="com.google.firebase.components.ComponentRegistrar" />
+    </service>
+  </application>
+</manifest>
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/ApplicationInfo.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/ApplicationInfo.kt
new file mode 100644
index 00000000000..93893cf0285
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/ApplicationInfo.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import com.google.firebase.encoders.json.NumberedEnum
+
+/** Enum denoting different development environments. */
+internal enum class LogEnvironment(override val number: Int) : NumberedEnum {
+  /** Unknown environment. */
+  LOG_ENVIRONMENT_UNKNOWN(0),
+
+  /** Autopush environment. */
+  LOG_ENVIRONMENT_AUTOPUSH(1),
+
+  /** Staging environment. */
+  LOG_ENVIRONMENT_STAGING(2),
+
+  /** Production environment. */
+  LOG_ENVIRONMENT_PROD(3),
+}
+
+internal data class AndroidApplicationInfo(
+  /** The package name of the application/bundle name. */
+  val packageName: String,
+
+  /** The display version of the application. */
+  val versionName: String,
+
+  /** The build version of the application. */
+  val appBuildVersion: String,
+
+  /** The manufacturer of the device that runs the application. */
+  val deviceManufacturer: String,
+
+  /** Information about this process */
+  val currentProcessDetails: ProcessDetails,
+
+  /** Information about all processes running for this app */
+  val appProcessDetails: List<ProcessDetails>,
+)
+
+internal data class ApplicationInfo(
+  /** The Firebase Application ID of the application. */
+  val appId: String,
+
+  /** The model of the device that runs the application. */
+  val deviceModel: String,
+
+  /** The SDK version of the sessions library. */
+  val sessionSdkVersion: String,
+
+  /** The display version of the Android operating system. */
+  val osVersion: String,
+
+  /** The logging environment for the events. */
+  val logEnvironment: LogEnvironment,
+
+  /** The android application information for the app. */
+  val androidAppInfo: AndroidApplicationInfo,
+)
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/EventGDTLogger.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/EventGDTLogger.kt
new file mode 100644
index 00000000000..852d4f9b121
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/EventGDTLogger.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.util.Log
+import com.google.android.datatransport.Encoding
+import com.google.android.datatransport.Event
+import com.google.android.datatransport.TransportFactory
+import com.google.firebase.inject.Provider
+
+/**
+ * The [EventGDTLoggerInterface] is for testing purposes so that we can mock EventGDTLogger in other
+ * classes that depend on it.
+ *
+ * @hide
+ */
+internal fun interface EventGDTLoggerInterface {
+  fun log(sessionEvent: SessionEvent)
+}
+
+/**
+ * The [EventGDTLogger] is responsible for encoding and logging events to the Google Data Transport
+ * library.
+ *
+ * @hide
+ */
+internal class EventGDTLogger(private val transportFactoryProvider: Provider<TransportFactory>) :
+  EventGDTLoggerInterface {
+
+  // Logs a [SessionEvent] to FireLog
+  override fun log(sessionEvent: SessionEvent) {
+    transportFactoryProvider
+      .get()
+      .getTransport(
+        AQS_LOG_SOURCE,
+        SessionEvent::class.java,
+        Encoding.of("json"),
+        this::encode,
+      )
+      .send(Event.ofData(sessionEvent))
+  }
+
+  private fun encode(value: SessionEvent): ByteArray {
+    val jsonEvent = SessionEvents.SESSION_EVENT_ENCODER.encode(value)
+    Log.d(TAG, "Session Event: $jsonEvent")
+    return jsonEvent.toByteArray()
+  }
+
+  companion object {
+    private const val TAG = "EventGDTLogger"
+
+    private const val AQS_LOG_SOURCE = "FIREBASE_APPQUALITY_SESSION"
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt
new file mode 100644
index 00000000000..0dec3b98150
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.app.Application
+import android.util.Log
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.app
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies
+import com.google.firebase.sessions.settings.SessionsSettings
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+/** Responsible for initializing AQS */
+internal class FirebaseSessions(
+  private val firebaseApp: FirebaseApp,
+  private val settings: SessionsSettings,
+  backgroundDispatcher: CoroutineContext,
+  lifecycleServiceBinder: SessionLifecycleServiceBinder,
+) {
+
+  init {
+    Log.d(TAG, "Initializing Firebase Sessions SDK.")
+    val appContext = firebaseApp.applicationContext.applicationContext
+    if (appContext is Application) {
+      appContext.registerActivityLifecycleCallbacks(SessionsActivityLifecycleCallbacks)
+
+      CoroutineScope(backgroundDispatcher).launch {
+        val subscribers = FirebaseSessionsDependencies.getRegisteredSubscribers()
+        if (subscribers.values.none { it.isDataCollectionEnabled }) {
+          Log.d(TAG, "No Sessions subscribers. Not listening to lifecycle events.")
+        } else {
+          settings.updateSettings()
+          if (!settings.sessionsEnabled) {
+            Log.d(TAG, "Sessions SDK disabled. Not listening to lifecycle events.")
+          } else {
+            val lifecycleClient = SessionLifecycleClient(backgroundDispatcher)
+            lifecycleClient.bindToService(lifecycleServiceBinder)
+            SessionsActivityLifecycleCallbacks.lifecycleClient = lifecycleClient
+
+            firebaseApp.addLifecycleEventListener { _, _ ->
+              Log.w(
+                TAG,
+                "FirebaseApp instance deleted. Sessions library will stop collecting data.",
+              )
+              SessionsActivityLifecycleCallbacks.lifecycleClient = null
+            }
+          }
+        }
+      }
+    } else {
+      Log.e(
+        TAG,
+        "Failed to register lifecycle callbacks, unexpected context ${appContext.javaClass}.",
+      )
+    }
+  }
+
+  companion object {
+    private const val TAG = "FirebaseSessions"
+
+    val instance: FirebaseSessions
+      get() = Firebase.app[FirebaseSessions::class.java]
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsRegistrar.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsRegistrar.kt
new file mode 100644
index 00000000000..caad2de6ff8
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsRegistrar.kt
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import androidx.annotation.Keep
+import com.google.android.datatransport.TransportFactory
+import com.google.firebase.FirebaseApp
+import com.google.firebase.annotations.concurrent.Background
+import com.google.firebase.annotations.concurrent.Blocking
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.components.Dependency
+import com.google.firebase.components.Qualified.qualified
+import com.google.firebase.components.Qualified.unqualified
+import com.google.firebase.installations.FirebaseInstallationsApi
+import com.google.firebase.platforminfo.LibraryVersionComponent
+import com.google.firebase.sessions.settings.SessionsSettings
+import kotlinx.coroutines.CoroutineDispatcher
+
+/**
+ * [ComponentRegistrar] for setting up [FirebaseSessions] and its internal dependencies.
+ *
+ * @hide
+ */
+@Keep
+internal class FirebaseSessionsRegistrar : ComponentRegistrar {
+  override fun getComponents() =
+    listOf(
+      Component.builder(FirebaseSessions::class.java)
+        .name(LIBRARY_NAME)
+        .add(Dependency.required(firebaseApp))
+        .add(Dependency.required(sessionsSettings))
+        .add(Dependency.required(backgroundDispatcher))
+        .add(Dependency.required(sessionLifecycleServiceBinder))
+        .factory { container ->
+          FirebaseSessions(
+            container[firebaseApp],
+            container[sessionsSettings],
+            container[backgroundDispatcher],
+            container[sessionLifecycleServiceBinder],
+          )
+        }
+        .eagerInDefaultApp()
+        .build(),
+      Component.builder(SessionGenerator::class.java)
+        .name("session-generator")
+        .factory { SessionGenerator(timeProvider = WallClock) }
+        .build(),
+      Component.builder(SessionFirelogPublisher::class.java)
+        .name("session-publisher")
+        .add(Dependency.required(firebaseApp))
+        .add(Dependency.required(firebaseInstallationsApi))
+        .add(Dependency.required(sessionsSettings))
+        .add(Dependency.requiredProvider(transportFactory))
+        .add(Dependency.required(backgroundDispatcher))
+        .factory { container ->
+          SessionFirelogPublisherImpl(
+            container[firebaseApp],
+            container[firebaseInstallationsApi],
+            container[sessionsSettings],
+            EventGDTLogger(container.getProvider(transportFactory)),
+            container[backgroundDispatcher],
+          )
+        }
+        .build(),
+      Component.builder(SessionsSettings::class.java)
+        .name("sessions-settings")
+        .add(Dependency.required(firebaseApp))
+        .add(Dependency.required(blockingDispatcher))
+        .add(Dependency.required(backgroundDispatcher))
+        .add(Dependency.required(firebaseInstallationsApi))
+        .factory { container ->
+          SessionsSettings(
+            container[firebaseApp],
+            container[blockingDispatcher],
+            container[backgroundDispatcher],
+            container[firebaseInstallationsApi],
+          )
+        }
+        .build(),
+      Component.builder(SessionDatastore::class.java)
+        .name("sessions-datastore")
+        .add(Dependency.required(firebaseApp))
+        .add(Dependency.required(backgroundDispatcher))
+        .factory { container ->
+          SessionDatastoreImpl(
+            container[firebaseApp].applicationContext,
+            container[backgroundDispatcher],
+          )
+        }
+        .build(),
+      Component.builder(SessionLifecycleServiceBinder::class.java)
+        .name("sessions-service-binder")
+        .add(Dependency.required(firebaseApp))
+        .factory { container -> SessionLifecycleServiceBinderImpl(container[firebaseApp]) }
+        .build(),
+      LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME),
+    )
+
+  private companion object {
+    private const val LIBRARY_NAME = "fire-sessions"
+
+    private val firebaseApp = unqualified(FirebaseApp::class.java)
+    private val firebaseInstallationsApi = unqualified(FirebaseInstallationsApi::class.java)
+    private val backgroundDispatcher =
+      qualified(Background::class.java, CoroutineDispatcher::class.java)
+    private val blockingDispatcher =
+      qualified(Blocking::class.java, CoroutineDispatcher::class.java)
+    private val transportFactory = unqualified(TransportFactory::class.java)
+    private val sessionsSettings = unqualified(SessionsSettings::class.java)
+    private val sessionLifecycleServiceBinder =
+      unqualified(SessionLifecycleServiceBinder::class.java)
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/InstallationId.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/InstallationId.kt
new file mode 100644
index 00000000000..0df42fda953
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/InstallationId.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.util.Log
+import com.google.firebase.installations.FirebaseInstallationsApi
+import kotlinx.coroutines.tasks.await
+
+/** Provides the Firebase installation id and Firebase authentication token. */
+internal class InstallationId private constructor(val fid: String, val authToken: String) {
+  companion object {
+    private const val TAG = "InstallationId"
+
+    suspend fun create(firebaseInstallations: FirebaseInstallationsApi): InstallationId {
+      // Fetch the auth token first, so the fid will be validated.
+      val authToken: String =
+        try {
+          firebaseInstallations.getToken(false).await().token
+        } catch (ex: Exception) {
+          Log.w(TAG, "Error getting authentication token.", ex)
+          // If there are any failures, return an empty value.
+          ""
+        }
+      val fid: String =
+        try {
+          firebaseInstallations.id.await()
+        } catch (ex: Exception) {
+          Log.w(TAG, "Error getting Firebase installation id .", ex)
+          ""
+        }
+
+      return InstallationId(fid, authToken)
+    }
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/ProcessDetailsProvider.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/ProcessDetailsProvider.kt
new file mode 100644
index 00000000000..72e80469880
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/ProcessDetailsProvider.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.app.ActivityManager
+import android.app.Application
+import android.content.Context
+import android.os.Build
+import android.os.Process
+import com.google.android.gms.common.util.ProcessUtils
+
+/**
+ * Provider of ProcessDetails.
+ *
+ * @hide
+ */
+internal object ProcessDetailsProvider {
+  /** Gets the details for all of this app's running processes. */
+  fun getAppProcessDetails(context: Context): List<ProcessDetails> {
+    val appUid = context.applicationInfo.uid
+    val defaultProcessName = context.applicationInfo.processName
+    val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as? ActivityManager
+    val runningAppProcesses = activityManager?.runningAppProcesses ?: listOf()
+
+    return runningAppProcesses
+      .filterNotNull()
+      .filter {
+        // Only collect process info for this app's processes.
+        it.uid == appUid
+      }
+      .map { runningAppProcessInfo ->
+        ProcessDetails(
+          processName = runningAppProcessInfo.processName,
+          pid = runningAppProcessInfo.pid,
+          importance = runningAppProcessInfo.importance,
+          isDefaultProcess = runningAppProcessInfo.processName == defaultProcessName,
+        )
+      }
+  }
+
+  /**
+   * Gets this app's current process details.
+   *
+   * If the current process details are not found for whatever reason, returns process details with
+   * just the current process name and pid set.
+   */
+  fun getCurrentProcessDetails(context: Context): ProcessDetails {
+    val pid = Process.myPid()
+    return getAppProcessDetails(context).find { it.pid == pid }
+      ?: buildProcessDetails(getProcessName(), pid)
+  }
+
+  /** Builds a ProcessDetails object. */
+  private fun buildProcessDetails(
+    processName: String,
+    pid: Int = 0,
+    importance: Int = 0,
+    isDefaultProcess: Boolean = false
+  ) = ProcessDetails(processName, pid, importance, isDefaultProcess)
+
+  /** Gets the app's current process name. If it could not be found, returns an empty string. */
+  internal fun getProcessName(): String {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      return Process.myProcessName()
+    }
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      Application.getProcessName()?.let {
+        return it
+      }
+    }
+
+    // GMS core has different ways to get the process name on old api levels.
+    ProcessUtils.getMyProcessName()?.let {
+      return it
+    }
+
+    // Default to an empty string if nothing works.
+    return ""
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionDataStoreConfigs.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionDataStoreConfigs.kt
new file mode 100644
index 00000000000..109e980e666
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionDataStoreConfigs.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.util.Base64
+import com.google.firebase.sessions.settings.SessionsSettings
+
+/**
+ * Util object for handling DataStore<Preferences> configs in multi-process apps safely.
+ *
+ * This can be removed when datastore-preferences:1.1.0 becomes stable.
+ */
+internal object SessionDataStoreConfigs {
+  /** Sanitized process name to use in config filenames. */
+  private val PROCESS_NAME =
+    Base64.encodeToString(
+      ProcessDetailsProvider.getProcessName().encodeToByteArray(),
+      Base64.NO_WRAP or Base64.URL_SAFE, // URL safe is also filename safe.
+    )
+
+  /** Config name for [SessionDatastore] */
+  val SESSIONS_CONFIG_NAME = "firebase_session_${PROCESS_NAME}_data"
+
+  /** Config name for [SessionsSettings] */
+  val SETTINGS_CONFIG_NAME = "firebase_session_${PROCESS_NAME}_settings"
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionDatastore.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionDatastore.kt
new file mode 100644
index 00000000000..736761617fd
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionDatastore.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.content.Context
+import android.util.Log
+import androidx.datastore.core.DataStore
+import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.emptyPreferences
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import com.google.firebase.Firebase
+import com.google.firebase.app
+import com.google.firebase.sessions.ProcessDetailsProvider.getProcessName
+import java.io.IOException
+import java.util.concurrent.atomic.AtomicReference
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+/** Datastore for sessions information */
+internal data class FirebaseSessionsData(val sessionId: String?)
+
+/** Handles reading to and writing from the [DataStore]. */
+internal interface SessionDatastore {
+  /** Stores a new session ID value in the [DataStore] */
+  fun updateSessionId(sessionId: String)
+
+  /**
+   * Gets the currently stored session ID from the [DataStore]. This will be null if no session has
+   * been stored previously.
+   */
+  fun getCurrentSessionId(): String?
+
+  companion object {
+    val instance: SessionDatastore
+      get() = Firebase.app[SessionDatastore::class.java]
+  }
+}
+
+internal class SessionDatastoreImpl(
+  private val context: Context,
+  private val backgroundDispatcher: CoroutineContext,
+) : SessionDatastore {
+
+  /** Most recent session from datastore is updated asynchronously whenever it changes */
+  private val currentSessionFromDatastore = AtomicReference<FirebaseSessionsData>()
+
+  private object FirebaseSessionDataKeys {
+    val SESSION_ID = stringPreferencesKey("session_id")
+  }
+
+  private val firebaseSessionDataFlow: Flow<FirebaseSessionsData> =
+    context.dataStore.data
+      .catch { exception ->
+        Log.e(TAG, "Error reading stored session data.", exception)
+        emit(emptyPreferences())
+      }
+      .map { preferences -> mapSessionsData(preferences) }
+
+  init {
+    CoroutineScope(backgroundDispatcher).launch {
+      firebaseSessionDataFlow.collect { currentSessionFromDatastore.set(it) }
+    }
+  }
+
+  override fun updateSessionId(sessionId: String) {
+    CoroutineScope(backgroundDispatcher).launch {
+      try {
+        context.dataStore.edit { preferences ->
+          preferences[FirebaseSessionDataKeys.SESSION_ID] = sessionId
+        }
+      } catch (e: IOException) {
+        Log.w(
+          TAG,
+          "Failed to update session Id: $e",
+        )
+      }
+    }
+  }
+
+  override fun getCurrentSessionId() = currentSessionFromDatastore.get()?.sessionId
+
+  private fun mapSessionsData(preferences: Preferences): FirebaseSessionsData =
+    FirebaseSessionsData(
+      preferences[FirebaseSessionDataKeys.SESSION_ID],
+    )
+
+  private companion object {
+    private const val TAG = "FirebaseSessionsRepo"
+
+    private val Context.dataStore: DataStore<Preferences> by
+      preferencesDataStore(
+        name = SessionDataStoreConfigs.SESSIONS_CONFIG_NAME,
+        corruptionHandler =
+          ReplaceFileCorruptionHandler { ex ->
+            Log.w(TAG, "CorruptionException in sessions DataStore in ${getProcessName()}.", ex)
+            emptyPreferences()
+          },
+      )
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionEvent.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionEvent.kt
new file mode 100644
index 00000000000..c9eff6684f6
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionEvent.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import com.google.firebase.encoders.annotations.Encodable
+import com.google.firebase.encoders.json.NumberedEnum
+
+/**
+ * Contains the relevant information around a Firebase Session Event.
+ *
+ * See go/app-quality-unified-session-definition for more details. Keep in sync with
+ * https://github.com/firebase/firebase-ios-sdk/blob/master/FirebaseSessions/ProtoSupport/Protos/sessions.proto
+ */
+@Encodable
+internal data class SessionEvent(
+  /** The type of event being reported. */
+  val eventType: EventType,
+
+  /** Information about the session triggering the event. */
+  val sessionData: SessionInfo,
+
+  /** Information about the application that is generating the session events. */
+  val applicationInfo: ApplicationInfo,
+)
+
+/** Enum denoting all possible session event types. */
+internal enum class EventType(override val number: Int) : NumberedEnum {
+  EVENT_TYPE_UNKNOWN(0),
+
+  /** This event type is fired as soon as a new session begins. */
+  SESSION_START(1),
+}
+
+/** Contains session-specific information relating to the event being uploaded. */
+internal data class SessionInfo(
+  /** A globally unique identifier for the session. */
+  val sessionId: String,
+
+  /**
+   * Will point to the first Session for the run of the app.
+   *
+   * For the first session, this will be the same as session_id.
+   */
+  val firstSessionId: String,
+
+  /** What order this Session came in this run of the app. For the first Session this will be 0. */
+  val sessionIndex: Int,
+
+  /** Tracks when the event was initiated. */
+  val eventTimestampUs: Long,
+
+  /** Data collection status of the dependent product SDKs. */
+  val dataCollectionStatus: DataCollectionStatus,
+
+  /** Identifies a unique device+app installation: go/firebase-installations */
+  val firebaseInstallationId: String,
+
+  /** Authentication token for the firebaseInstallationId. */
+  val firebaseAuthenticationToken: String,
+)
+
+/** Contains the data collection state for all dependent SDKs and sampling info */
+internal data class DataCollectionStatus(
+  val performance: DataCollectionState = DataCollectionState.COLLECTION_SDK_NOT_INSTALLED,
+  val crashlytics: DataCollectionState = DataCollectionState.COLLECTION_SDK_NOT_INSTALLED,
+  val sessionSamplingRate: Double = 1.0,
+)
+
+/** Container for information about the process */
+internal data class ProcessDetails(
+  val processName: String,
+  val pid: Int,
+  val importance: Int,
+  val isDefaultProcess: Boolean,
+)
+
+/** Enum denoting different data collection states. */
+internal enum class DataCollectionState(override val number: Int) : NumberedEnum {
+  COLLECTION_UNKNOWN(0),
+
+  // This product SDK is not present in this version of the app.
+  COLLECTION_SDK_NOT_INSTALLED(1),
+
+  // The product SDK is present and collecting all product-level events.
+  COLLECTION_ENABLED(2),
+
+  // The product SDK is present but data collection for it has been locally
+  // disabled.
+  COLLECTION_DISABLED(3),
+
+  // The product SDK is present but data collection has been remotely disabled.
+  COLLECTION_DISABLED_REMOTE(4),
+
+  // Indicates that the product SDK is present, but session data is being
+  // collected, but the product-level events are not being uploaded.
+  COLLECTION_SAMPLED(5),
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionEvents.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionEvents.kt
new file mode 100644
index 00000000000..25b3cbeb15d
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionEvents.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.os.Build
+import com.google.firebase.FirebaseApp
+import com.google.firebase.encoders.DataEncoder
+import com.google.firebase.encoders.json.JsonDataEncoderBuilder
+import com.google.firebase.sessions.api.SessionSubscriber
+import com.google.firebase.sessions.settings.SessionsSettings
+
+/** Contains functions for [SessionEvent]s. */
+internal object SessionEvents {
+  /** JSON [DataEncoder] for [SessionEvent]s. */
+  internal val SESSION_EVENT_ENCODER: DataEncoder =
+    JsonDataEncoderBuilder()
+      .configureWith(AutoSessionEventEncoder.CONFIG)
+      .ignoreNullValues(true)
+      .build()
+
+  /** Construct a Session Start event. */
+  fun buildSession(
+    firebaseApp: FirebaseApp,
+    sessionDetails: SessionDetails,
+    sessionsSettings: SessionsSettings,
+    subscribers: Map<SessionSubscriber.Name, SessionSubscriber> = emptyMap(),
+    firebaseInstallationId: String = "",
+    firebaseAuthenticationToken: String = "",
+  ) =
+    SessionEvent(
+      eventType = EventType.SESSION_START,
+      sessionData =
+        SessionInfo(
+          sessionDetails.sessionId,
+          sessionDetails.firstSessionId,
+          sessionDetails.sessionIndex,
+          eventTimestampUs = sessionDetails.sessionStartTimestampUs,
+          DataCollectionStatus(
+            performance = toDataCollectionState(subscribers[SessionSubscriber.Name.PERFORMANCE]),
+            crashlytics = toDataCollectionState(subscribers[SessionSubscriber.Name.CRASHLYTICS]),
+            sessionSamplingRate = sessionsSettings.samplingRate,
+          ),
+          firebaseInstallationId,
+          firebaseAuthenticationToken,
+        ),
+      applicationInfo = getApplicationInfo(firebaseApp),
+    )
+
+  fun getApplicationInfo(firebaseApp: FirebaseApp): ApplicationInfo {
+    val context = firebaseApp.applicationContext
+    val packageName = context.packageName
+    @Suppress("DEPRECATION") // TODO(mrober): Use ApplicationInfoFlags when target sdk set to 33
+    val packageInfo = context.packageManager.getPackageInfo(packageName, 0)
+    val buildVersion =
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        packageInfo.longVersionCode.toString()
+      } else {
+        @Suppress("DEPRECATION") packageInfo.versionCode.toString()
+      }
+
+    return ApplicationInfo(
+      appId = firebaseApp.options.applicationId,
+      deviceModel = Build.MODEL,
+      sessionSdkVersion = BuildConfig.VERSION_NAME,
+      osVersion = Build.VERSION.RELEASE,
+      logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
+      androidAppInfo =
+        AndroidApplicationInfo(
+          packageName = packageName,
+          versionName = packageInfo.versionName ?: buildVersion,
+          appBuildVersion = buildVersion,
+          deviceManufacturer = Build.MANUFACTURER,
+          ProcessDetailsProvider.getCurrentProcessDetails(firebaseApp.applicationContext),
+          ProcessDetailsProvider.getAppProcessDetails(firebaseApp.applicationContext),
+        ),
+    )
+  }
+
+  private fun toDataCollectionState(subscriber: SessionSubscriber?): DataCollectionState =
+    if (subscriber == null) {
+      DataCollectionState.COLLECTION_SDK_NOT_INSTALLED
+    } else if (subscriber.isDataCollectionEnabled) {
+      DataCollectionState.COLLECTION_ENABLED
+    } else {
+      DataCollectionState.COLLECTION_DISABLED
+    }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionFirelogPublisher.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionFirelogPublisher.kt
new file mode 100644
index 00000000000..63961d0dea1
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionFirelogPublisher.kt
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.util.Log
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.app
+import com.google.firebase.installations.FirebaseInstallationsApi
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies
+import com.google.firebase.sessions.settings.SessionsSettings
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+/** Responsible for uploading session events to Firelog. */
+internal fun interface SessionFirelogPublisher {
+
+  /** Asynchronously logs the session represented by the given [SessionDetails] to Firelog. */
+  fun logSession(sessionDetails: SessionDetails)
+
+  companion object {
+    val instance: SessionFirelogPublisher
+      get() = Firebase.app[SessionFirelogPublisher::class.java]
+  }
+}
+
+/**
+ * [SessionFirelogPublisher] is responsible for publishing sessions to firelog
+ *
+ * @hide
+ */
+internal class SessionFirelogPublisherImpl(
+  private val firebaseApp: FirebaseApp,
+  private val firebaseInstallations: FirebaseInstallationsApi,
+  private val sessionSettings: SessionsSettings,
+  private val eventGDTLogger: EventGDTLoggerInterface,
+  private val backgroundDispatcher: CoroutineContext,
+) : SessionFirelogPublisher {
+
+  /**
+   * Logs the session represented by the given [SessionDetails] to Firelog on a background thread.
+   *
+   * This will pull all the necessary information about the device in order to create a full
+   * [SessionEvent], and then upload that through the Firelog interface.
+   */
+  override fun logSession(sessionDetails: SessionDetails) {
+    CoroutineScope(backgroundDispatcher).launch {
+      if (shouldLogSession()) {
+        val installationId = InstallationId.create(firebaseInstallations)
+        attemptLoggingSessionEvent(
+          SessionEvents.buildSession(
+            firebaseApp,
+            sessionDetails,
+            sessionSettings,
+            FirebaseSessionsDependencies.getRegisteredSubscribers(),
+            firebaseInstallationId = installationId.fid,
+            firebaseAuthenticationToken = installationId.authToken,
+          )
+        )
+      }
+    }
+  }
+
+  /** Attempts to write the given [SessionEvent] to firelog. Failures are logged and ignored. */
+  private fun attemptLoggingSessionEvent(sessionEvent: SessionEvent) {
+    try {
+      eventGDTLogger.log(sessionEvent)
+      Log.d(TAG, "Successfully logged Session Start event: ${sessionEvent.sessionData.sessionId}")
+    } catch (ex: RuntimeException) {
+      Log.e(TAG, "Error logging Session Start event to DataTransport: ", ex)
+    }
+  }
+
+  /** Determines if the SDK should log a session to Firelog. */
+  private suspend fun shouldLogSession(): Boolean {
+    Log.d(TAG, "Data Collection is enabled for at least one Subscriber")
+
+    // This will cause remote settings to be fetched if the cache is expired.
+    sessionSettings.updateSettings()
+
+    if (!sessionSettings.sessionsEnabled) {
+      Log.d(TAG, "Sessions SDK disabled. Events will not be sent.")
+      return false
+    }
+
+    if (!shouldCollectEvents()) {
+      Log.d(TAG, "Sessions SDK has dropped this session due to sampling.")
+      return false
+    }
+
+    return true
+  }
+
+  /** Calculate whether we should sample events using [SessionsSettings] data. */
+  private fun shouldCollectEvents(): Boolean {
+    // Sampling rate of 1 means the SDK will send every event.
+    return randomValueForSampling <= sessionSettings.samplingRate
+  }
+
+  internal companion object {
+    private const val TAG = "SessionFirelogPublisher"
+
+    private val randomValueForSampling: Double = Math.random()
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionGenerator.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionGenerator.kt
new file mode 100644
index 00000000000..3b4c3124c98
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionGenerator.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import com.google.errorprone.annotations.CanIgnoreReturnValue
+import com.google.firebase.Firebase
+import com.google.firebase.app
+import java.util.UUID
+
+/**
+ * [SessionDetails] is a data class responsible for storing information about the current Session.
+ */
+internal data class SessionDetails(
+  val sessionId: String,
+  val firstSessionId: String,
+  val sessionIndex: Int,
+  val sessionStartTimestampUs: Long,
+)
+
+/**
+ * The [SessionGenerator] is responsible for generating the Session ID, and keeping the
+ * [SessionDetails] up to date with the latest values.
+ */
+internal class SessionGenerator(
+  private val timeProvider: TimeProvider,
+  private val uuidGenerator: () -> UUID = UUID::randomUUID
+) {
+  private val firstSessionId = generateSessionId()
+  private var sessionIndex = -1
+
+  /** The current generated session, must not be accessed before calling [generateNewSession]. */
+  lateinit var currentSession: SessionDetails
+    private set
+
+  /** Returns if a session has been generated. */
+  val hasGenerateSession: Boolean
+    get() = ::currentSession.isInitialized
+
+  /** Generates a new session. The first session's sessionId will match firstSessionId. */
+  @CanIgnoreReturnValue
+  fun generateNewSession(): SessionDetails {
+    sessionIndex++
+    currentSession =
+      SessionDetails(
+        sessionId = if (sessionIndex == 0) firstSessionId else generateSessionId(),
+        firstSessionId,
+        sessionIndex,
+        sessionStartTimestampUs = timeProvider.currentTimeUs()
+      )
+    return currentSession
+  }
+
+  private fun generateSessionId() = uuidGenerator().toString().replace("-", "").lowercase()
+
+  internal companion object {
+    val instance: SessionGenerator
+      get() = Firebase.app[SessionGenerator::class.java]
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleClient.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleClient.kt
new file mode 100644
index 00000000000..6ecb76fe512
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleClient.kt
@@ -0,0 +1,217 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.content.ComponentName
+import android.content.ServiceConnection
+import android.os.Handler
+import android.os.IBinder
+import android.os.Looper
+import android.os.Message
+import android.os.Messenger
+import android.os.RemoteException
+import android.util.Log
+import com.google.errorprone.annotations.CanIgnoreReturnValue
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies
+import com.google.firebase.sessions.api.SessionSubscriber
+import java.util.concurrent.LinkedBlockingDeque
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+/**
+ * Client for binding to the [SessionLifecycleService]. This client will receive updated sessions
+ * through a callback whenever a new session is generated by the service, or after the initial
+ * binding.
+ *
+ * Note: this client will be connected in every application process that uses Firebase, and is
+ * intended to maintain that connection for the lifetime of the process.
+ */
+internal class SessionLifecycleClient(private val backgroundDispatcher: CoroutineContext) {
+
+  private var service: Messenger? = null
+  private var serviceBound: Boolean = false
+  private val queuedMessages = LinkedBlockingDeque<Message>(MAX_QUEUED_MESSAGES)
+
+  /**
+   * The callback class that will be used to receive updated session events from the
+   * [SessionLifecycleService].
+   */
+  internal class ClientUpdateHandler(private val backgroundDispatcher: CoroutineContext) :
+    Handler(Looper.getMainLooper()) {
+
+    override fun handleMessage(msg: Message) {
+      when (msg.what) {
+        SessionLifecycleService.SESSION_UPDATED ->
+          handleSessionUpdate(
+            msg.data?.getString(SessionLifecycleService.SESSION_UPDATE_EXTRA) ?: ""
+          )
+        else -> {
+          Log.w(TAG, "Received unexpected event from the SessionLifecycleService: $msg")
+          super.handleMessage(msg)
+        }
+      }
+    }
+
+    private fun handleSessionUpdate(sessionId: String) {
+      Log.d(TAG, "Session update received: $sessionId")
+
+      CoroutineScope(backgroundDispatcher).launch {
+        FirebaseSessionsDependencies.getRegisteredSubscribers().values.forEach { subscriber ->
+          // Notify subscribers, regardless of sampling and data collection state.
+          subscriber.onSessionChanged(SessionSubscriber.SessionDetails(sessionId))
+          Log.d(TAG, "Notified ${subscriber.sessionSubscriberName} of new session $sessionId")
+        }
+      }
+    }
+  }
+
+  /** The connection object to the [SessionLifecycleService]. */
+  private val serviceConnection =
+    object : ServiceConnection {
+      override fun onServiceConnected(className: ComponentName?, serviceBinder: IBinder?) {
+        Log.d(TAG, "Connected to SessionLifecycleService. Queue size ${queuedMessages.size}")
+        service = Messenger(serviceBinder)
+        serviceBound = true
+        sendLifecycleEvents(drainQueue())
+      }
+
+      override fun onServiceDisconnected(className: ComponentName?) {
+        Log.d(TAG, "Disconnected from SessionLifecycleService")
+        service = null
+        serviceBound = false
+      }
+    }
+
+  /**
+   * Binds to the [SessionLifecycleService] and passes a callback [Messenger] that will be used to
+   * relay session updates to this client.
+   */
+  fun bindToService(sessionLifecycleServiceBinder: SessionLifecycleServiceBinder) {
+    sessionLifecycleServiceBinder.bindToService(
+      Messenger(ClientUpdateHandler(backgroundDispatcher)),
+      serviceConnection,
+    )
+  }
+
+  /**
+   * Should be called when any activity in this application process goes to the foreground. This
+   * will relay the event to the [SessionLifecycleService] where it can make the determination of
+   * whether or not this foregrounding event should result in a new session being generated.
+   */
+  fun foregrounded() {
+    sendLifecycleEvent(SessionLifecycleService.FOREGROUNDED)
+  }
+
+  /**
+   * Should be called when any activity in this application process goes from the foreground to the
+   * background. This will relay the event to the [SessionLifecycleService] where it will be used to
+   * determine when a new session should be generated.
+   */
+  fun backgrounded() {
+    sendLifecycleEvent(SessionLifecycleService.BACKGROUNDED)
+  }
+
+  /**
+   * Sends a message to the [SessionLifecycleService] with the given event code. This will
+   * potentially also send any messages that have been queued up but not successfully delivered to
+   * this service since the previous send.
+   */
+  private fun sendLifecycleEvent(messageCode: Int) {
+    val allMessages = drainQueue()
+    allMessages.add(Message.obtain(null, messageCode, 0, 0))
+    sendLifecycleEvents(allMessages)
+  }
+
+  /**
+   * Sends lifecycle events to the [SessionLifecycleService]. This will only send the latest
+   * FOREGROUND and BACKGROUND events to the service that are included in the given list. Running
+   * through the full backlog of messages is not useful since the service only cares about the
+   * current state and transitions from background -> foreground.
+   *
+   * Does not send events unless data collection is enabled for at least one subscriber.
+   */
+  @CanIgnoreReturnValue
+  private fun sendLifecycleEvents(messages: List<Message>) =
+    CoroutineScope(backgroundDispatcher).launch {
+      val subscribers = FirebaseSessionsDependencies.getRegisteredSubscribers()
+      if (subscribers.isEmpty()) {
+        Log.d(
+          TAG,
+          "Sessions SDK did not have any dependent SDKs register as dependencies. Events will not be sent.",
+        )
+      } else if (subscribers.values.none { it.isDataCollectionEnabled }) {
+        Log.d(TAG, "Data Collection is disabled for all subscribers. Skipping this Event")
+      } else {
+        mutableListOf(
+            getLatestByCode(messages, SessionLifecycleService.BACKGROUNDED),
+            getLatestByCode(messages, SessionLifecycleService.FOREGROUNDED),
+          )
+          .filterNotNull()
+          .sortedBy { it.getWhen() }
+          .forEach { sendMessageToServer(it) }
+      }
+    }
+
+  /** Sends the given [Message] to the [SessionLifecycleService]. */
+  private fun sendMessageToServer(msg: Message) {
+    if (service != null) {
+      try {
+        Log.d(TAG, "Sending lifecycle ${msg.what} to service")
+        service?.send(msg)
+      } catch (e: RemoteException) {
+        Log.w(TAG, "Unable to deliver message: ${msg.what}", e)
+        queueMessage(msg)
+      }
+    } else {
+      queueMessage(msg)
+    }
+  }
+
+  /**
+   * Queues the given [Message] up for delivery to the [SessionLifecycleService] once the connection
+   * is established.
+   */
+  private fun queueMessage(msg: Message) {
+    if (queuedMessages.offer(msg)) {
+      Log.d(TAG, "Queued message ${msg.what}. Queue size ${queuedMessages.size}")
+    } else {
+      Log.d(TAG, "Failed to enqueue message ${msg.what}. Dropping.")
+    }
+  }
+
+  /** Drains the queue of messages into a new list in a thread-safe manner. */
+  private fun drainQueue(): MutableList<Message> {
+    val messages = mutableListOf<Message>()
+    queuedMessages.drainTo(messages)
+    return messages
+  }
+
+  /** Gets the message in the given list with the given code that has the latest timestamp. */
+  private fun getLatestByCode(messages: List<Message>, msgCode: Int): Message? =
+    messages.filter { it.what == msgCode }.maxByOrNull { it.getWhen() }
+
+  companion object {
+    const val TAG = "SessionLifecycleClient"
+
+    /**
+     * The maximum number of messages that we should queue up for delivery to the
+     * [SessionLifecycleService] in the event that we have lost the connection.
+     */
+    private const val MAX_QUEUED_MESSAGES = 20
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleService.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleService.kt
new file mode 100644
index 00000000000..c226e759c87
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleService.kt
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.app.Service
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.os.DeadObjectException
+import android.os.Handler
+import android.os.HandlerThread
+import android.os.IBinder
+import android.os.Looper
+import android.os.Message
+import android.os.Messenger
+import android.util.Log
+import com.google.firebase.sessions.settings.SessionsSettings
+
+/**
+ * Service for monitoring application lifecycle events and determining when/if a new session should
+ * be generated. When this happens, the service will broadcast the updated session id to all
+ * connected clients.
+ */
+internal class SessionLifecycleService : Service() {
+
+  /** The thread that will be used to process all lifecycle messages from connected clients. */
+  internal val handlerThread: HandlerThread = HandlerThread("FirebaseSessions_HandlerThread")
+
+  /** The handler that will process all lifecycle messages from connected clients . */
+  private var messageHandler: MessageHandler? = null
+
+  /** The single messenger that will be sent to all connected clients of this service . */
+  private var messenger: Messenger? = null
+
+  /**
+   * Handler of incoming activity lifecycle events being received from [SessionLifecycleClient]s.
+   * All incoming communication from connected clients comes through this class and will be used to
+   * determine when new sessions should be created.
+   */
+  internal class MessageHandler(looper: Looper) : Handler(looper) {
+
+    /**
+     * Flag indicating whether or not the app has ever come into the foreground during the lifetime
+     * of the service. If it has not, we can infer that the first foreground event is a cold-start
+     *
+     * Note: this is made volatile because we attempt to send the current session ID to newly bound
+     * clients, and this binding happens
+     */
+    private var hasForegrounded: Boolean = false
+
+    /**
+     * The timestamp of the last activity lifecycle message we've received from a client. Used to
+     * determine when the app has been idle for long enough to require a new session.
+     */
+    private var lastMsgTimeMs: Long = 0
+
+    /** Queue of connected clients. */
+    private val boundClients = ArrayList<Messenger>()
+
+    override fun handleMessage(msg: Message) {
+      if (lastMsgTimeMs > msg.getWhen()) {
+        Log.d(TAG, "Ignoring old message from ${msg.getWhen()} which is older than $lastMsgTimeMs.")
+        return
+      }
+      when (msg.what) {
+        FOREGROUNDED -> handleForegrounding(msg)
+        BACKGROUNDED -> handleBackgrounding(msg)
+        CLIENT_BOUND -> handleClientBound(msg)
+        else -> {
+          Log.w(TAG, "Received unexpected event from the SessionLifecycleClient: $msg")
+          super.handleMessage(msg)
+        }
+      }
+    }
+
+    /**
+     * Handles a foregrounding event by any activity owned by the application as specified by the
+     * given [Message]. This will determine if the foregrounding should result in the creation of a
+     * new session.
+     */
+    private fun handleForegrounding(msg: Message) {
+      Log.d(TAG, "Activity foregrounding at ${msg.getWhen()}.")
+      if (!hasForegrounded) {
+        Log.d(TAG, "Cold start detected.")
+        hasForegrounded = true
+        newSession()
+      } else if (isSessionRestart(msg.getWhen())) {
+        Log.d(TAG, "Session too long in background. Creating new session.")
+        newSession()
+      }
+      lastMsgTimeMs = msg.getWhen()
+    }
+
+    /**
+     * Handles a backgrounding event by any activity owned by the application as specified by the
+     * given [Message]. This will keep track of the backgrounding and be used to determine if future
+     * foregrounding events should result in the creation of a new session.
+     */
+    private fun handleBackgrounding(msg: Message) {
+      Log.d(TAG, "Activity backgrounding at ${msg.getWhen()}")
+      lastMsgTimeMs = msg.getWhen()
+    }
+
+    /**
+     * Handles a newly bound client to this service by adding it to the list of callback clients and
+     * attempting to send it the latest session id immediately.
+     */
+    private fun handleClientBound(msg: Message) {
+      boundClients.add(msg.replyTo)
+      maybeSendSessionToClient(msg.replyTo)
+      Log.d(TAG, "Client ${msg.replyTo} bound at ${msg.getWhen()}. Clients: ${boundClients.size}")
+    }
+
+    /** Generates a new session id and sends it everywhere it's needed */
+    private fun newSession() {
+      SessionGenerator.instance.generateNewSession()
+      Log.d(TAG, "Generated new session ${SessionGenerator.instance.currentSession.sessionId}")
+      broadcastSession()
+      SessionDatastore.instance.updateSessionId(SessionGenerator.instance.currentSession.sessionId)
+    }
+
+    /**
+     * Broadcasts the current session to by uploading to Firelog and all sending a message to all
+     * connected clients.
+     */
+    private fun broadcastSession() {
+      Log.d(TAG, "Broadcasting new session: ${SessionGenerator.instance.currentSession}")
+      SessionFirelogPublisher.instance.logSession(SessionGenerator.instance.currentSession)
+      // Create a defensive copy because DeadObjectExceptions on send will modify boundClients
+      val clientsToSend = ArrayList(boundClients)
+      clientsToSend.forEach { maybeSendSessionToClient(it) }
+    }
+
+    private fun maybeSendSessionToClient(client: Messenger) {
+      if (hasForegrounded) {
+        sendSessionToClient(client, SessionGenerator.instance.currentSession.sessionId)
+      } else {
+        // Send the value from the datastore before the first foregrounding it exists
+        val storedSession = SessionDatastore.instance.getCurrentSessionId()
+        Log.d(TAG, "App has not yet foregrounded. Using previously stored session: $storedSession")
+        storedSession?.let { sendSessionToClient(client, it) }
+      }
+    }
+
+    /** Sends the current session id to the client connected through the given [Messenger]. */
+    private fun sendSessionToClient(client: Messenger, sessionId: String) {
+      try {
+        val msgData = Bundle().also { it.putString(SESSION_UPDATE_EXTRA, sessionId) }
+        client.send(Message.obtain(null, SESSION_UPDATED, 0, 0).also { it.data = msgData })
+      } catch (e: DeadObjectException) {
+        Log.d(TAG, "Removing dead client from list: $client")
+        boundClients.remove(client)
+      } catch (e: Exception) {
+        Log.w(TAG, "Unable to push new session to $client.", e)
+      }
+    }
+
+    /**
+     * Determines if the foregrounding that occurred at the given time should trigger a new session
+     * because the app has been idle for too long.
+     */
+    private fun isSessionRestart(foregroundTimeMs: Long) =
+      (foregroundTimeMs - lastMsgTimeMs) >
+        SessionsSettings.instance.sessionRestartTimeout.inWholeMilliseconds
+  }
+
+  override fun onCreate() {
+    super.onCreate()
+    handlerThread.start()
+    messageHandler = MessageHandler(handlerThread.looper)
+    messenger = Messenger(messageHandler)
+  }
+
+  /** Called when a new [SessionLifecycleClient] binds to this service. */
+  override fun onBind(intent: Intent?): IBinder? =
+    if (intent == null) {
+      Log.d(TAG, "Service bound with null intent. Ignoring.")
+      null
+    } else {
+      Log.d(TAG, "Service bound to new client on process ${intent.action}")
+      val callbackMessenger = getClientCallback(intent)
+      if (callbackMessenger != null) {
+        val clientBoundMsg = Message.obtain(null, CLIENT_BOUND, 0, 0)
+        clientBoundMsg.replyTo = callbackMessenger
+        messageHandler?.sendMessage(clientBoundMsg)
+      }
+      messenger?.binder
+    }
+
+  override fun onDestroy() {
+    super.onDestroy()
+    handlerThread.quit()
+  }
+
+  /**
+   * Extracts the callback [Messenger] from the given [Intent] which will be used to push session
+   * updates back to the [SessionLifecycleClient] that created this [Intent].
+   */
+  private fun getClientCallback(intent: Intent): Messenger? =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      intent.getParcelableExtra(CLIENT_CALLBACK_MESSENGER, Messenger::class.java)
+    } else {
+      @Suppress("DEPRECATION") intent.getParcelableExtra(CLIENT_CALLBACK_MESSENGER)
+    }
+
+  internal companion object {
+    const val TAG = "SessionLifecycleService"
+
+    /**
+     * Key for the [Messenger] callback extra included in the [Intent] used by the
+     * [SessionLifecycleClient] to bind to this service.
+     */
+    const val CLIENT_CALLBACK_MESSENGER = "ClientCallbackMessenger"
+
+    /**
+     * Key for the extra String included in the [SESSION_UPDATED] message, sent to all connected
+     * clients, containing an updated session id.
+     */
+    const val SESSION_UPDATE_EXTRA = "SessionUpdateExtra"
+
+    /** [Message] code indicating that an application activity has gone to the foreground */
+    const val FOREGROUNDED = 1
+    /** [Message] code indicating that an application activity has gone to the background */
+    const val BACKGROUNDED = 2
+    /**
+     * [Message] code indicating that a new session has been started, and containing the new session
+     * id in the [SESSION_UPDATE_EXTRA] extra field.
+     */
+    const val SESSION_UPDATED = 3
+
+    /**
+     * [Message] code indicating that a new client has been bound to the service. The
+     * [Message.replyTo] field will contain the new client callback interface.
+     */
+    private const val CLIENT_BOUND = 4
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleServiceBinder.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleServiceBinder.kt
new file mode 100644
index 00000000000..e2246c78aae
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionLifecycleServiceBinder.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.Messenger
+import android.util.Log
+import com.google.firebase.FirebaseApp
+
+/** Interface for binding with the [SessionLifecycleService]. */
+internal fun interface SessionLifecycleServiceBinder {
+  /**
+   * Binds the given client callback [Messenger] to the [SessionLifecycleService]. The given
+   * callback will be used to relay session updates to this client.
+   */
+  fun bindToService(callback: Messenger, serviceConnection: ServiceConnection)
+}
+
+internal class SessionLifecycleServiceBinderImpl(private val firebaseApp: FirebaseApp) :
+  SessionLifecycleServiceBinder {
+
+  override fun bindToService(callback: Messenger, serviceConnection: ServiceConnection) {
+    val appContext = firebaseApp.applicationContext.applicationContext
+    Intent(appContext, SessionLifecycleService::class.java).also { intent ->
+      Log.d(TAG, "Binding service to application.")
+      // This is necessary for the onBind() to be called by each process
+      intent.action = android.os.Process.myPid().toString()
+      intent.putExtra(SessionLifecycleService.CLIENT_CALLBACK_MESSENGER, callback)
+
+      val isServiceBound =
+        try {
+          appContext.bindService(
+            intent,
+            serviceConnection,
+            Context.BIND_IMPORTANT or Context.BIND_AUTO_CREATE,
+          )
+        } catch (ex: SecurityException) {
+          Log.w(TAG, "Failed to bind session lifecycle service to application.", ex)
+          false
+        }
+      if (!isServiceBound) {
+        unbindServiceSafely(appContext, serviceConnection)
+        Log.i(TAG, "Session lifecycle service binding failed.")
+      }
+    }
+  }
+
+  private fun unbindServiceSafely(appContext: Context, serviceConnection: ServiceConnection) =
+    try {
+      appContext.unbindService(serviceConnection)
+    } catch (ex: IllegalArgumentException) {
+      Log.w(TAG, "Session lifecycle service binding failed.", ex)
+    }
+
+  private companion object {
+    const val TAG = "LifecycleServiceBinder"
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionsActivityLifecycleCallbacks.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionsActivityLifecycleCallbacks.kt
new file mode 100644
index 00000000000..b72c1da5cf3
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionsActivityLifecycleCallbacks.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.app.Activity
+import android.app.Application.ActivityLifecycleCallbacks
+import android.os.Bundle
+import androidx.annotation.VisibleForTesting
+
+/**
+ * Lifecycle callbacks that will inform the [SessionLifecycleClient] whenever an [Activity] in this
+ * application process goes foreground or background.
+ */
+internal object SessionsActivityLifecycleCallbacks : ActivityLifecycleCallbacks {
+  @VisibleForTesting internal var hasPendingForeground: Boolean = false
+
+  var lifecycleClient: SessionLifecycleClient? = null
+    /** Sets the client and calls [SessionLifecycleClient.foregrounded] for pending foreground. */
+    set(lifecycleClient) {
+      field = lifecycleClient
+      lifecycleClient?.let {
+        if (hasPendingForeground) {
+          hasPendingForeground = false
+          it.foregrounded()
+        }
+      }
+    }
+
+  override fun onActivityResumed(activity: Activity) {
+    lifecycleClient?.foregrounded() ?: run { hasPendingForeground = true }
+  }
+
+  override fun onActivityPaused(activity: Activity) {
+    lifecycleClient?.backgrounded()
+  }
+
+  override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) = Unit
+
+  override fun onActivityStarted(activity: Activity) = Unit
+
+  override fun onActivityStopped(activity: Activity) = Unit
+
+  override fun onActivityDestroyed(activity: Activity) = Unit
+
+  override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/TimeProvider.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/TimeProvider.kt
new file mode 100644
index 00000000000..706285de337
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/TimeProvider.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.os.SystemClock
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+
+/** Time provider interface, for testing purposes. */
+internal interface TimeProvider {
+  fun elapsedRealtime(): Duration
+  fun currentTimeUs(): Long
+}
+
+/** "Wall clock" time provider. */
+internal object WallClock : TimeProvider {
+  /**
+   * Gets the [Duration] elapsed in "wall clock" time since device boot.
+   *
+   * This clock is guaranteed to be monotonic, and continues to tick even when the CPU is in power
+   * saving modes, so is the recommend basis for general purpose interval timing.
+   */
+  override fun elapsedRealtime(): Duration = SystemClock.elapsedRealtime().milliseconds
+
+  /**
+   * Gets the current "wall clock" time in microseconds.
+   *
+   * This clock can be set by the user or the phone network, so the time may jump backwards or
+   * forwards unpredictably. This clock should only be used when correspondence with real-world
+   * dates and times is important, such as in a calendar or alarm clock application.
+   */
+  override fun currentTimeUs(): Long = System.currentTimeMillis() * US_PER_MILLIS
+
+  /** Microseconds per millisecond. */
+  private const val US_PER_MILLIS = 1000L
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependencies.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependencies.kt
new file mode 100644
index 00000000000..8d3548c8f4b
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependencies.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.api
+
+import android.util.Log
+import androidx.annotation.VisibleForTesting
+import java.util.Collections.synchronizedMap
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+
+/**
+ * [FirebaseSessionsDependencies] determines when a dependent SDK is installed in the app. The
+ * Sessions SDK uses this to figure out which dependencies to wait for to getting the data
+ * collection state. This is thread safe.
+ *
+ * This is important because the Sessions SDK starts up before dependent SDKs.
+ */
+object FirebaseSessionsDependencies {
+  private const val TAG = "SessionsDependencies"
+
+  private val dependencies = synchronizedMap(mutableMapOf<SessionSubscriber.Name, Dependency>())
+
+  /**
+   * Add a subscriber as a dependency to the Sessions SDK. Every dependency must register itself, or
+   * the Sessions SDK will never generate a session.
+   */
+  @JvmStatic
+  fun addDependency(subscriberName: SessionSubscriber.Name) {
+    if (subscriberName == SessionSubscriber.Name.PERFORMANCE) {
+      throw IllegalArgumentException(
+        """
+          Incompatible versions of Firebase Perf and Firebase Sessions.
+          A safe combination would be:
+            firebase-sessions:1.1.0
+            firebase-crashlytics:18.5.0
+            firebase-perf:20.5.0
+          For more information contact Firebase Support.
+        """
+          .trimIndent()
+      )
+    }
+    if (dependencies.containsKey(subscriberName)) {
+      Log.d(TAG, "Dependency $subscriberName already added.")
+      return
+    }
+
+    // The dependency is locked until the subscriber registers itself.
+    dependencies[subscriberName] = Dependency(Mutex(locked = true))
+    Log.d(TAG, "Dependency to $subscriberName added.")
+  }
+
+  /**
+   * Register and unlock the subscriber. This must be called before [getRegisteredSubscribers] can
+   * return.
+   */
+  @JvmStatic
+  fun register(subscriber: SessionSubscriber) {
+    val subscriberName = subscriber.sessionSubscriberName
+    val dependency = getDependency(subscriberName)
+
+    dependency.subscriber?.run {
+      Log.d(TAG, "Subscriber $subscriberName already registered.")
+      return
+    }
+    dependency.subscriber = subscriber
+    Log.d(TAG, "Subscriber $subscriberName registered.")
+
+    // Unlock to show the subscriber has been registered, it is possible to get it now.
+    dependency.mutex.unlock()
+  }
+
+  /** Gets the subscribers safely, blocks until all the subscribers are registered. */
+  internal suspend fun getRegisteredSubscribers(): Map<SessionSubscriber.Name, SessionSubscriber> {
+    // The call to getSubscriber will never throw because the mutex guarantees it's been registered.
+    return dependencies.mapValues { (subscriberName, dependency) ->
+      dependency.mutex.withLock { getSubscriber(subscriberName) }
+    }
+  }
+
+  /** Gets the subscriber, regardless of being registered. This is exposed for testing. */
+  @VisibleForTesting
+  internal fun getSubscriber(subscriberName: SessionSubscriber.Name): SessionSubscriber {
+    return getDependency(subscriberName).subscriber
+      ?: throw IllegalStateException("Subscriber $subscriberName has not been registered.")
+  }
+
+  /** Resets all the dependencies for testing purposes. */
+  @VisibleForTesting internal fun reset() = dependencies.clear()
+
+  private fun getDependency(subscriberName: SessionSubscriber.Name): Dependency {
+    return dependencies.getOrElse(subscriberName) {
+      throw IllegalStateException(
+        "Cannot get dependency $subscriberName. Dependencies should be added at class load time."
+      )
+    }
+  }
+
+  private data class Dependency(val mutex: Mutex, var subscriber: SessionSubscriber? = null)
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/api/SessionSubscriber.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/api/SessionSubscriber.kt
new file mode 100644
index 00000000000..fdef981091f
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/api/SessionSubscriber.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.api
+
+import androidx.annotation.Discouraged
+
+/** [SessionSubscriber] is an interface that dependent SDKs must implement. */
+interface SessionSubscriber {
+  /** [SessionSubscriber.Name]s are used for identifying subscribers. */
+  enum class Name {
+    CRASHLYTICS,
+    PERFORMANCE,
+    @Discouraged(message = "This is for testing purposes only.") MATT_SAYS_HI,
+  }
+
+  /** [SessionDetails] contains session data passed to subscribers whenever the session changes */
+  data class SessionDetails(val sessionId: String)
+
+  fun onSessionChanged(sessionDetails: SessionDetails)
+
+  val isDataCollectionEnabled: Boolean
+
+  val sessionSubscriberName: Name
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/LocalOverrideSettings.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/LocalOverrideSettings.kt
new file mode 100644
index 00000000000..37e7acc949b
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/LocalOverrideSettings.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.settings
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Bundle
+import kotlin.time.Duration
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+
+internal class LocalOverrideSettings(context: Context) : SettingsProvider {
+  @Suppress("DEPRECATION") // TODO(mrober): Use ApplicationInfoFlags when target sdk set to 33
+  private val metadata =
+    context.packageManager
+      .getApplicationInfo(
+        context.packageName,
+        PackageManager.GET_META_DATA,
+      )
+      .metaData
+      ?: Bundle.EMPTY // Default to an empty bundle, meaning no cached values.
+
+  override val sessionEnabled: Boolean?
+    get() =
+      if (metadata.containsKey(SESSIONS_ENABLED)) {
+        metadata.getBoolean(SESSIONS_ENABLED)
+      } else {
+        null
+      }
+
+  override val sessionRestartTimeout: Duration?
+    get() =
+      if (metadata.containsKey(SESSION_RESTART_TIMEOUT)) {
+        val timeoutInSeconds = metadata.getInt(SESSION_RESTART_TIMEOUT)
+        timeoutInSeconds.toDuration(DurationUnit.SECONDS)
+      } else {
+        null
+      }
+
+  override val samplingRate: Double?
+    get() =
+      if (metadata.containsKey(SAMPLING_RATE)) {
+        metadata.getDouble(SAMPLING_RATE)
+      } else {
+        null
+      }
+
+  private companion object {
+    const val SESSIONS_ENABLED = "firebase_sessions_enabled"
+    const val SESSION_RESTART_TIMEOUT = "firebase_sessions_sessions_restart_timeout"
+    const val SAMPLING_RATE = "firebase_sessions_sampling_rate"
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettings.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettings.kt
new file mode 100644
index 00000000000..0f58bca6fab
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettings.kt
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.settings
+
+import android.os.Build
+import android.util.Log
+import androidx.annotation.VisibleForTesting
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import com.google.firebase.installations.FirebaseInstallationsApi
+import com.google.firebase.sessions.ApplicationInfo
+import com.google.firebase.sessions.InstallationId
+import kotlin.coroutines.CoroutineContext
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import org.json.JSONException
+import org.json.JSONObject
+
+internal class RemoteSettings(
+  private val backgroundDispatcher: CoroutineContext,
+  private val firebaseInstallationsApi: FirebaseInstallationsApi,
+  private val appInfo: ApplicationInfo,
+  private val configsFetcher: CrashlyticsSettingsFetcher,
+  dataStore: DataStore<Preferences>,
+) : SettingsProvider {
+  private val settingsCache = SettingsCache(dataStore)
+  private val fetchInProgress = Mutex()
+
+  override val sessionEnabled: Boolean?
+    get() = settingsCache.sessionsEnabled()
+
+  override val sessionRestartTimeout: Duration?
+    get() = settingsCache.sessionRestartTimeout()?.seconds
+
+  override val samplingRate: Double?
+    get() = settingsCache.sessionSamplingRate()
+
+  /**
+   * Fetch remote settings. This should only be called if data collection is enabled.
+   *
+   * This will exit early if the cache is not expired. Otherwise it will block while fetching, even
+   * if called multiple times. This may fetch the FID, so only call if data collection is enabled.
+   */
+  override suspend fun updateSettings() {
+    // Check if cache is expired. If not, return early.
+    if (!fetchInProgress.isLocked && !settingsCache.hasCacheExpired()) {
+      return
+    }
+
+    fetchInProgress.withLock {
+      // Double check if cache is expired. If not, return.
+      if (!settingsCache.hasCacheExpired()) {
+        Log.d(TAG, "Remote settings cache not expired. Using cached values.")
+        return
+      }
+
+      // Get the installations ID before making a remote config fetch.
+      val installationId = InstallationId.create(firebaseInstallationsApi).fid
+      if (installationId == "") {
+        Log.w(TAG, "Error getting Firebase Installation ID. Skipping this Session Event.")
+        return
+      }
+
+      // All the required fields are available, start making a network request.
+      val options =
+        mapOf(
+          "X-Crashlytics-Installation-ID" to installationId,
+          "X-Crashlytics-Device-Model" to
+            removeForwardSlashesIn(String.format("%s/%s", Build.MANUFACTURER, Build.MODEL)),
+          "X-Crashlytics-OS-Build-Version" to removeForwardSlashesIn(Build.VERSION.INCREMENTAL),
+          "X-Crashlytics-OS-Display-Version" to removeForwardSlashesIn(Build.VERSION.RELEASE),
+          "X-Crashlytics-API-Client-Version" to appInfo.sessionSdkVersion,
+        )
+
+      Log.d(TAG, "Fetching settings from server.")
+      configsFetcher.doConfigFetch(
+        headerOptions = options,
+        onSuccess = {
+          Log.d(TAG, "Fetched settings: $it")
+          var sessionsEnabled: Boolean? = null
+          var sessionSamplingRate: Double? = null
+          var sessionTimeoutSeconds: Int? = null
+          var cacheDuration: Int? = null
+          if (it.has("app_quality")) {
+            val aqsSettings = it["app_quality"] as JSONObject
+            try {
+              if (aqsSettings.has("sessions_enabled")) {
+                sessionsEnabled = aqsSettings["sessions_enabled"] as Boolean?
+              }
+
+              if (aqsSettings.has("sampling_rate")) {
+                sessionSamplingRate = aqsSettings["sampling_rate"] as Double?
+              }
+
+              if (aqsSettings.has("session_timeout_seconds")) {
+                sessionTimeoutSeconds = aqsSettings["session_timeout_seconds"] as Int?
+              }
+
+              if (aqsSettings.has("cache_duration")) {
+                cacheDuration = aqsSettings["cache_duration"] as Int?
+              }
+            } catch (exception: JSONException) {
+              Log.e(TAG, "Error parsing the configs remotely fetched: ", exception)
+            }
+          }
+
+          sessionsEnabled?.let { settingsCache.updateSettingsEnabled(sessionsEnabled) }
+
+          sessionTimeoutSeconds?.let {
+            settingsCache.updateSessionRestartTimeout(sessionTimeoutSeconds)
+          }
+
+          sessionSamplingRate?.let { settingsCache.updateSamplingRate(sessionSamplingRate) }
+
+          cacheDuration?.let { settingsCache.updateSessionCacheDuration(cacheDuration) }
+            ?: let { settingsCache.updateSessionCacheDuration(86400) }
+
+          settingsCache.updateSessionCacheUpdatedTime(System.currentTimeMillis())
+        },
+        onFailure = { msg ->
+          // Network request failed here.
+          Log.e(TAG, "Error failing to fetch the remote configs: $msg")
+        },
+      )
+    }
+  }
+
+  override fun isSettingsStale(): Boolean = settingsCache.hasCacheExpired()
+
+  @VisibleForTesting
+  internal fun clearCachedSettings() {
+    val scope = CoroutineScope(backgroundDispatcher)
+    scope.launch { settingsCache.removeConfigs() }
+  }
+
+  private fun removeForwardSlashesIn(s: String): String {
+    return s.replace(FORWARD_SLASH_STRING.toRegex(), "")
+  }
+
+  private companion object {
+    const val TAG = "SessionConfigFetcher"
+
+    const val FORWARD_SLASH_STRING: String = "/"
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettingsFetcher.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettingsFetcher.kt
new file mode 100644
index 00000000000..a0896c24e7e
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettingsFetcher.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.settings
+
+import android.net.Uri
+import com.google.firebase.sessions.ApplicationInfo
+import java.io.BufferedReader
+import java.io.InputStreamReader
+import java.net.URL
+import javax.net.ssl.HttpsURLConnection
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.withContext
+import org.json.JSONObject
+
+internal fun interface CrashlyticsSettingsFetcher {
+  suspend fun doConfigFetch(
+    headerOptions: Map<String, String>,
+    onSuccess: suspend (JSONObject) -> Unit,
+    onFailure: suspend (msg: String) -> Unit
+  )
+}
+
+internal class RemoteSettingsFetcher(
+  private val appInfo: ApplicationInfo,
+  private val blockingDispatcher: CoroutineContext,
+  private val baseUrl: String = FIREBASE_SESSIONS_BASE_URL_STRING,
+) : CrashlyticsSettingsFetcher {
+  @Suppress("BlockingMethodInNonBlockingContext") // blockingDispatcher is safe for blocking calls.
+  override suspend fun doConfigFetch(
+    headerOptions: Map<String, String>,
+    onSuccess: suspend (JSONObject) -> Unit,
+    onFailure: suspend (String) -> Unit
+  ) =
+    withContext(blockingDispatcher) {
+      try {
+        val connection = settingsUrl().openConnection() as HttpsURLConnection
+        connection.requestMethod = "GET"
+        connection.setRequestProperty("Accept", "application/json")
+        headerOptions.forEach { connection.setRequestProperty(it.key, it.value) }
+
+        val responseCode = connection.responseCode
+        if (responseCode == HttpsURLConnection.HTTP_OK) {
+          val inputStream = connection.inputStream
+          val bufferedReader = BufferedReader(InputStreamReader(inputStream))
+          val response = StringBuilder()
+          var inputLine: String?
+          while (bufferedReader.readLine().also { inputLine = it } != null) {
+            response.append(inputLine)
+          }
+          bufferedReader.close()
+          inputStream.close()
+
+          val responseJson = JSONObject(response.toString())
+          onSuccess(responseJson)
+        } else {
+          onFailure("Bad response code: $responseCode")
+        }
+      } catch (ex: Exception) {
+        onFailure(ex.message ?: ex.toString())
+      }
+    }
+
+  private fun settingsUrl(): URL {
+    val uri =
+      Uri.Builder()
+        .scheme("https")
+        .authority(baseUrl)
+        .appendPath("spi")
+        .appendPath("v2")
+        .appendPath("platforms")
+        .appendPath(FIREBASE_PLATFORM)
+        .appendPath("gmp")
+        .appendPath(appInfo.appId)
+        .appendPath("settings")
+        .appendQueryParameter("build_version", appInfo.androidAppInfo.appBuildVersion)
+        .appendQueryParameter("display_version", appInfo.androidAppInfo.versionName)
+
+    return URL(uri.build().toString())
+  }
+
+  companion object {
+    private const val FIREBASE_SESSIONS_BASE_URL_STRING = "firebase-settings.crashlytics.com"
+    private const val FIREBASE_PLATFORM = "android"
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SessionsSettings.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SessionsSettings.kt
new file mode 100644
index 00000000000..fd2ee5dbddd
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SessionsSettings.kt
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.settings
+
+import android.content.Context
+import android.util.Log
+import androidx.datastore.core.DataStore
+import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.emptyPreferences
+import androidx.datastore.preferences.preferencesDataStore
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.app
+import com.google.firebase.installations.FirebaseInstallationsApi
+import com.google.firebase.sessions.ApplicationInfo
+import com.google.firebase.sessions.ProcessDetailsProvider.getProcessName
+import com.google.firebase.sessions.SessionDataStoreConfigs
+import com.google.firebase.sessions.SessionEvents
+import kotlin.coroutines.CoroutineContext
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.minutes
+
+/** [SessionsSettings] manages all the configs that are relevant to the sessions library. */
+internal class SessionsSettings(
+  private val localOverrideSettings: SettingsProvider,
+  private val remoteSettings: SettingsProvider,
+) {
+  private constructor(
+    context: Context,
+    blockingDispatcher: CoroutineContext,
+    backgroundDispatcher: CoroutineContext,
+    firebaseInstallationsApi: FirebaseInstallationsApi,
+    appInfo: ApplicationInfo,
+  ) : this(
+    localOverrideSettings = LocalOverrideSettings(context),
+    remoteSettings =
+      RemoteSettings(
+        backgroundDispatcher,
+        firebaseInstallationsApi,
+        appInfo,
+        configsFetcher =
+          RemoteSettingsFetcher(
+            appInfo,
+            blockingDispatcher,
+          ),
+        dataStore = context.dataStore,
+      ),
+  )
+
+  constructor(
+    firebaseApp: FirebaseApp,
+    blockingDispatcher: CoroutineContext,
+    backgroundDispatcher: CoroutineContext,
+    firebaseInstallationsApi: FirebaseInstallationsApi,
+  ) : this(
+    firebaseApp.applicationContext,
+    blockingDispatcher,
+    backgroundDispatcher,
+    firebaseInstallationsApi,
+    SessionEvents.getApplicationInfo(firebaseApp),
+  )
+
+  // Order of preference for all the configs below:
+  // 1. Honor local overrides
+  // 2. If no local overrides, use remote config
+  // 3. If no remote config, fall back to SDK defaults.
+
+  /** Setting to qualify if sessions service is enabled. */
+  val sessionsEnabled: Boolean
+    get() {
+      localOverrideSettings.sessionEnabled?.let {
+        return it
+      }
+      remoteSettings.sessionEnabled?.let {
+        return it
+      }
+      // SDK Default
+      return true
+    }
+
+  /** Setting that provides the sessions sampling rate. */
+  val samplingRate: Double
+    get() {
+      localOverrideSettings.samplingRate?.let {
+        if (isValidSamplingRate(it)) {
+          return it
+        }
+      }
+      remoteSettings.samplingRate?.let {
+        if (isValidSamplingRate(it)) {
+          return it
+        }
+      }
+      // SDK Default
+      return 1.0
+    }
+
+  /** Background timeout config value before which a new session is generated. */
+  val sessionRestartTimeout: Duration
+    get() {
+      localOverrideSettings.sessionRestartTimeout?.let {
+        if (isValidSessionRestartTimeout(it)) {
+          return it
+        }
+      }
+      remoteSettings.sessionRestartTimeout?.let {
+        if (isValidSessionRestartTimeout(it)) {
+          return it
+        }
+      }
+      // SDK Default
+      return 30.minutes
+    }
+
+  private fun isValidSamplingRate(samplingRate: Double): Boolean = samplingRate in 0.0..1.0
+
+  private fun isValidSessionRestartTimeout(sessionRestartTimeout: Duration): Boolean {
+    return sessionRestartTimeout.isPositive() && sessionRestartTimeout.isFinite()
+  }
+
+  /** Update the settings for all the settings providers. */
+  suspend fun updateSettings() {
+    localOverrideSettings.updateSettings()
+    remoteSettings.updateSettings()
+  }
+
+  internal companion object {
+    private const val TAG = "SessionsSettings"
+
+    val instance: SessionsSettings
+      get() = Firebase.app[SessionsSettings::class.java]
+
+    private val Context.dataStore: DataStore<Preferences> by
+      preferencesDataStore(
+        name = SessionDataStoreConfigs.SETTINGS_CONFIG_NAME,
+        corruptionHandler =
+          ReplaceFileCorruptionHandler { ex ->
+            Log.w(TAG, "CorruptionException in settings DataStore in ${getProcessName()}.", ex)
+            emptyPreferences()
+          },
+      )
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsCache.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsCache.kt
new file mode 100644
index 00000000000..33b6a4fe7c8
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsCache.kt
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.settings
+
+import android.util.Log
+import androidx.annotation.VisibleForTesting
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.doublePreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.longPreferencesKey
+import java.io.IOException
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+
+internal data class SessionConfigs(
+  val sessionEnabled: Boolean?,
+  val sessionSamplingRate: Double?,
+  val sessionRestartTimeout: Int?,
+  val cacheDuration: Int?,
+  val cacheUpdatedTime: Long?,
+)
+
+internal class SettingsCache(private val dataStore: DataStore<Preferences>) {
+  private lateinit var sessionConfigs: SessionConfigs
+
+  init {
+    // Block until the cache is loaded from disk to ensure cache
+    // values are valid and readable from the main thread on init.
+    runBlocking { updateSessionConfigs(dataStore.data.first().toPreferences()) }
+  }
+
+  /** Update session configs from the given [preferences]. */
+  private fun updateSessionConfigs(preferences: Preferences) {
+    sessionConfigs =
+      SessionConfigs(
+        sessionEnabled = preferences[SESSIONS_ENABLED],
+        sessionSamplingRate = preferences[SAMPLING_RATE],
+        sessionRestartTimeout = preferences[RESTART_TIMEOUT_SECONDS],
+        cacheDuration = preferences[CACHE_DURATION_SECONDS],
+        cacheUpdatedTime = preferences[CACHE_UPDATED_TIME]
+      )
+  }
+
+  internal fun hasCacheExpired(): Boolean {
+    val cacheUpdatedTime = sessionConfigs.cacheUpdatedTime
+    val cacheDuration = sessionConfigs.cacheDuration
+
+    if (cacheUpdatedTime != null && cacheDuration != null) {
+      val timeDifferenceSeconds = (System.currentTimeMillis() - cacheUpdatedTime) / 1000
+      if (timeDifferenceSeconds < cacheDuration) {
+        return false
+      }
+    }
+    return true
+  }
+
+  fun sessionsEnabled(): Boolean? = sessionConfigs.sessionEnabled
+
+  fun sessionSamplingRate(): Double? = sessionConfigs.sessionSamplingRate
+
+  fun sessionRestartTimeout(): Int? = sessionConfigs.sessionRestartTimeout
+
+  suspend fun updateSettingsEnabled(enabled: Boolean?) {
+    updateConfigValue(SESSIONS_ENABLED, enabled)
+  }
+
+  suspend fun updateSamplingRate(rate: Double?) {
+    updateConfigValue(SAMPLING_RATE, rate)
+  }
+
+  suspend fun updateSessionRestartTimeout(timeoutInSeconds: Int?) {
+    updateConfigValue(RESTART_TIMEOUT_SECONDS, timeoutInSeconds)
+  }
+
+  suspend fun updateSessionCacheDuration(cacheDurationInSeconds: Int?) {
+    updateConfigValue(CACHE_DURATION_SECONDS, cacheDurationInSeconds)
+  }
+
+  suspend fun updateSessionCacheUpdatedTime(cacheUpdatedTime: Long?) {
+    updateConfigValue(CACHE_UPDATED_TIME, cacheUpdatedTime)
+  }
+
+  @VisibleForTesting
+  internal suspend fun removeConfigs() {
+    try {
+      dataStore.edit { preferences ->
+        preferences.clear()
+        updateSessionConfigs(preferences)
+      }
+    } catch (e: IOException) {
+      Log.w(
+        TAG,
+        "Failed to remove config values: $e",
+      )
+    }
+  }
+
+  /** Updated the config value, or remove the key if the value is null. */
+  private suspend fun <T> updateConfigValue(key: Preferences.Key<T>, value: T?) {
+    // TODO(mrober): Refactor these to update all the values in one transaction.
+    try {
+      dataStore.edit { preferences ->
+        if (value != null) {
+          preferences[key] = value
+        } else {
+          preferences.remove(key)
+        }
+        updateSessionConfigs(preferences)
+      }
+    } catch (ex: IOException) {
+      Log.w(TAG, "Failed to update cache config value: $ex")
+    }
+  }
+
+  private companion object {
+    const val TAG = "SettingsCache"
+
+    val SESSIONS_ENABLED = booleanPreferencesKey("firebase_sessions_enabled")
+    val SAMPLING_RATE = doublePreferencesKey("firebase_sessions_sampling_rate")
+    val RESTART_TIMEOUT_SECONDS = intPreferencesKey("firebase_sessions_restart_timeout")
+    val CACHE_DURATION_SECONDS = intPreferencesKey("firebase_sessions_cache_duration")
+    val CACHE_UPDATED_TIME = longPreferencesKey("firebase_sessions_cache_updated_time")
+  }
+}
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsProvider.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsProvider.kt
new file mode 100644
index 00000000000..5507c514219
--- /dev/null
+++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsProvider.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.settings
+
+import kotlin.time.Duration
+
+internal interface SettingsProvider {
+  /** Setting to control if session collection is enabled. */
+  val sessionEnabled: Boolean?
+
+  /** Setting to represent when to restart a new session after app backgrounding. */
+  val sessionRestartTimeout: Duration?
+
+  /** Setting denoting the percentage of the sessions data that should be collected. */
+  val samplingRate: Double?
+
+  /** Function to initiate refresh of the settings for the provider. */
+  suspend fun updateSettings() = Unit // Default to no op.
+
+  /** Function representing if the settings are stale. */
+  fun isSettingsStale(): Boolean = false // Default to false.
+}
diff --git a/firebase-sessions/src/test/AndroidManifest.xml b/firebase-sessions/src/test/AndroidManifest.xml
new file mode 100644
index 00000000000..4eccb7649da
--- /dev/null
+++ b/firebase-sessions/src/test/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 Google LLC -->
+<!-- -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
+<!-- you may not use this file except in compliance with the License. -->
+<!-- You may obtain a copy of the License at -->
+<!-- -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- -->
+<!-- Unless required by applicable law or agreed to in writing, software -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
+<!-- WITHOUT 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">
+  <application>
+    <service
+      android:name="com.google.firebase.components.ComponentDiscoveryService"
+      android:exported="false">
+      <meta-data
+        android:name="com.google.firebase.components:com.google.firebase.sessions.FirebaseSessionsRegistrar"
+        android:value="com.google.firebase.components.ComponentRegistrar"
+        tools:node="remove"/>
+      <meta-data
+        android:name="com.google.firebase.components:com.google.firebase.sessions.testing.FirebaseSessionsFakeRegistrar"
+        android:value="com.google.firebase.components.ComponentRegistrar" />
+    </service>
+  </application>
+</manifest>
+
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/ApplicationInfoTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/ApplicationInfoTest.kt
new file mode 100644
index 00000000000..3c6ccf8644d
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/ApplicationInfoTest.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.content.Context
+import android.os.Build
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.initialize
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class ApplicationInfoTest {
+
+  @Test
+  fun applicationInfo_populatesInfoCorrectly() {
+    val firebaseApp = FakeFirebaseApp().firebaseApp
+    val actualCurrentProcessDetails =
+      ProcessDetailsProvider.getCurrentProcessDetails(firebaseApp.applicationContext)
+    val actualAppProcessDetails =
+      ProcessDetailsProvider.getAppProcessDetails(firebaseApp.applicationContext)
+    val applicationInfo = SessionEvents.getApplicationInfo(firebaseApp)
+    assertThat(applicationInfo)
+      .isEqualTo(
+        ApplicationInfo(
+          appId = FakeFirebaseApp.MOCK_APP_ID,
+          deviceModel = Build.MODEL,
+          sessionSdkVersion = BuildConfig.VERSION_NAME,
+          osVersion = Build.VERSION.RELEASE,
+          logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
+          AndroidApplicationInfo(
+            packageName = ApplicationProvider.getApplicationContext<Context>().packageName,
+            versionName = FakeFirebaseApp.MOCK_APP_VERSION,
+            appBuildVersion = FakeFirebaseApp.MOCK_APP_BUILD_VERSION,
+            deviceManufacturer = Build.MANUFACTURER,
+            actualCurrentProcessDetails,
+            actualAppProcessDetails,
+          )
+        )
+      )
+  }
+
+  @Test
+  fun applicationInfo_missiongVersionCode_populatesInfoCorrectly() {
+    // Initialize Firebase with no version code set.
+    val firebaseApp =
+      Firebase.initialize(
+        ApplicationProvider.getApplicationContext(),
+        FirebaseOptions.Builder()
+          .setApplicationId(FakeFirebaseApp.MOCK_APP_ID)
+          .setApiKey(FakeFirebaseApp.MOCK_API_KEY)
+          .setProjectId(FakeFirebaseApp.MOCK_PROJECT_ID)
+          .build()
+      )
+
+    val actualCurrentProcessDetails =
+      ProcessDetailsProvider.getCurrentProcessDetails(firebaseApp.applicationContext)
+    val actualAppProcessDetails =
+      ProcessDetailsProvider.getAppProcessDetails(firebaseApp.applicationContext)
+
+    val applicationInfo = SessionEvents.getApplicationInfo(firebaseApp)
+
+    assertThat(applicationInfo)
+      .isEqualTo(
+        ApplicationInfo(
+          appId = FakeFirebaseApp.MOCK_APP_ID,
+          deviceModel = Build.MODEL,
+          sessionSdkVersion = BuildConfig.VERSION_NAME,
+          osVersion = Build.VERSION.RELEASE,
+          logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
+          AndroidApplicationInfo(
+            packageName = ApplicationProvider.getApplicationContext<Context>().packageName,
+            versionName = "0",
+            appBuildVersion = "0",
+            deviceManufacturer = Build.MANUFACTURER,
+            actualCurrentProcessDetails,
+            actualAppProcessDetails,
+          )
+        )
+      )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/EventGDTLoggerTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/EventGDTLoggerTest.kt
new file mode 100644
index 00000000000..b636d53e3dc
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/EventGDTLoggerTest.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import com.google.android.datatransport.Encoding
+import com.google.android.datatransport.Event
+import com.google.android.datatransport.TransportFactory
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.sessions.settings.SessionsSettings
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import com.google.firebase.sessions.testing.FakeProvider
+import com.google.firebase.sessions.testing.FakeSettingsProvider
+import com.google.firebase.sessions.testing.FakeTransportFactory
+import com.google.firebase.sessions.testing.TestSessionEventData
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(RobolectricTestRunner::class)
+class EventGDTLoggerTest {
+
+  @Test
+  fun event_logsToGoogleDataTransport() = runTest {
+    val fakeFirebaseApp = FakeFirebaseApp()
+    val sessionEvent =
+      SessionEvents.buildSession(
+        fakeFirebaseApp.firebaseApp,
+        TestSessionEventData.TEST_SESSION_DETAILS,
+        SessionsSettings(
+          localOverrideSettings = FakeSettingsProvider(),
+          remoteSettings = FakeSettingsProvider(),
+        ),
+      )
+    val fakeTransportFactory = FakeTransportFactory()
+    val fakeTransportFactoryProvider = FakeProvider(fakeTransportFactory as TransportFactory)
+    val eventGDTLogger = EventGDTLogger(transportFactoryProvider = fakeTransportFactoryProvider)
+
+    eventGDTLogger.log(sessionEvent = sessionEvent)
+
+    assertThat(fakeTransportFactory.name).isEqualTo("FIREBASE_APPQUALITY_SESSION")
+    assertThat(fakeTransportFactory.payloadEncoding).isEqualTo(Encoding.of("json"))
+    assertThat(fakeTransportFactory.fakeTransport!!.sentEvent)
+      .isEqualTo(Event.ofData(TestSessionEventData.TEST_SESSION_EVENT))
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/ProcessDetailsProviderTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/ProcessDetailsProviderTest.kt
new file mode 100644
index 00000000000..b41b33e3361
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/ProcessDetailsProviderTest.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ProcessDetailsProviderTest {
+  private lateinit var firebaseApp: FirebaseApp
+
+  @Before
+  fun before() {
+    firebaseApp = FakeFirebaseApp().firebaseApp
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+
+  @Test
+  fun getCurrentProcessDetails() {
+    val processDetails =
+      ProcessDetailsProvider.getCurrentProcessDetails(firebaseApp.applicationContext)
+    assertThat(processDetails)
+      .isEqualTo(ProcessDetails("com.google.firebase.sessions.test", 0, 100, false))
+  }
+
+  @Test
+  fun getAppProcessDetails() {
+    val processDetails = ProcessDetailsProvider.getAppProcessDetails(firebaseApp.applicationContext)
+    assertThat(processDetails)
+      .isEqualTo(listOf(ProcessDetails("com.google.firebase.sessions.test", 0, 100, false)))
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionEventEncoderTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionEventEncoderTest.kt
new file mode 100644
index 00000000000..6f919cf946b
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionEventEncoderTest.kt
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.os.Build
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.sessions.SessionEvents.SESSION_EVENT_ENCODER
+import com.google.firebase.sessions.api.SessionSubscriber
+import com.google.firebase.sessions.settings.SessionsSettings
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import com.google.firebase.sessions.testing.FakeSessionSubscriber
+import com.google.firebase.sessions.testing.FakeSettingsProvider
+import com.google.firebase.sessions.testing.TestSessionEventData
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(AndroidJUnit4::class)
+class SessionEventEncoderTest {
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+
+  @Test
+  fun sessionEvent_encodesToJson() = runTest {
+    val fakeFirebaseApp = FakeFirebaseApp()
+    val sessionEvent =
+      SessionEvents.buildSession(
+        fakeFirebaseApp.firebaseApp,
+        TestSessionEventData.TEST_SESSION_DETAILS,
+        SessionsSettings(
+          localOverrideSettings = FakeSettingsProvider(),
+          remoteSettings = FakeSettingsProvider(),
+        ),
+        subscribers =
+          mapOf(
+            SessionSubscriber.Name.CRASHLYTICS to FakeSessionSubscriber(),
+            SessionSubscriber.Name.PERFORMANCE to
+              FakeSessionSubscriber(
+                isDataCollectionEnabled = false,
+                sessionSubscriberName = SessionSubscriber.Name.PERFORMANCE,
+              ),
+          ),
+      )
+
+    val json = SESSION_EVENT_ENCODER.encode(sessionEvent)
+
+    assertThat(json)
+      .isEqualTo(
+        """
+          {
+            "eventType":1,
+            "sessionData":{
+              "sessionId":"a1b2c3",
+              "firstSessionId":"a1a1a1",
+              "sessionIndex":3,
+              "eventTimestampUs":12340000,
+              "dataCollectionStatus":{
+                "performance":3,
+                "crashlytics":2,
+                "sessionSamplingRate":1.0
+              },
+              "firebaseInstallationId":"",
+              "firebaseAuthenticationToken":""
+            },
+            "applicationInfo":{
+              "appId":"1:12345:android:app",
+              "deviceModel":"${Build.MODEL}",
+              "sessionSdkVersion":"${BuildConfig.VERSION_NAME}",
+              "osVersion":"${Build.VERSION.RELEASE}",
+              "logEnvironment":3,
+              "androidAppInfo":{
+                "packageName":"com.google.firebase.sessions.test",
+                "versionName":"1.0.0",
+                "appBuildVersion":"0",
+                "deviceManufacturer":"${Build.MANUFACTURER}",
+                "currentProcessDetails":{
+                  "processName":"com.google.firebase.sessions.test",
+                  "pid":0,
+                  "importance":100,
+                  "defaultProcess":false
+                },
+                "appProcessDetails":[
+                  {
+                    "processName":"com.google.firebase.sessions.test",
+                    "pid":0,
+                    "importance":100,
+                    "defaultProcess":false
+                  }
+                ]
+              }
+            }
+          }
+        """
+          .lines()
+          .joinToString("") { it.trim() }
+      )
+  }
+
+  @Test
+  fun sessionEvent_emptyValues_encodesToJson() {
+    val sessionEvent =
+      SessionEvent(
+        eventType = EventType.EVENT_TYPE_UNKNOWN,
+        sessionData =
+          SessionInfo(
+            sessionId = "",
+            firstSessionId = "",
+            sessionIndex = 0,
+            eventTimestampUs = 0,
+            dataCollectionStatus = DataCollectionStatus(),
+            firebaseInstallationId = "",
+            firebaseAuthenticationToken = "",
+          ),
+        applicationInfo =
+          ApplicationInfo(
+            appId = "",
+            deviceModel = "",
+            sessionSdkVersion = "",
+            osVersion = "",
+            logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
+            AndroidApplicationInfo(
+              packageName = "",
+              versionName = "",
+              appBuildVersion = "",
+              deviceManufacturer = "",
+              currentProcessDetails = ProcessDetails("", 0, 0, false),
+              appProcessDetails = listOf(),
+            ),
+          ),
+      )
+
+    val json = SESSION_EVENT_ENCODER.encode(sessionEvent)
+
+    assertThat(json)
+      .isEqualTo(
+        """
+          {
+            "eventType":0,
+            "sessionData":{
+              "sessionId":"",
+              "firstSessionId":"",
+              "sessionIndex":0,
+              "eventTimestampUs":0,
+              "dataCollectionStatus":{
+                "performance":1,
+                "crashlytics":1,
+                "sessionSamplingRate":1.0
+              },
+              "firebaseInstallationId":"",
+              "firebaseAuthenticationToken":""
+            },
+            "applicationInfo":{
+              "appId":"",
+              "deviceModel":"",
+              "sessionSdkVersion":"",
+              "osVersion":"",
+              "logEnvironment":3,
+              "androidAppInfo":{
+                "packageName":"",
+                "versionName":"",
+                "appBuildVersion":"",
+                "deviceManufacturer":"",
+                "currentProcessDetails":{
+                  "processName":"",
+                  "pid":0,
+                  "importance":0,
+                  "defaultProcess":false
+                },
+                "appProcessDetails":[]
+              }
+            }
+          }
+        """
+          .lines()
+          .joinToString("") { it.trim() }
+      )
+  }
+
+  @Test
+  fun eventType_numberedEnum_encodesToJson() {
+    val json =
+      SESSION_EVENT_ENCODER.encode(
+        arrayOf(
+          EventType.SESSION_START,
+          EventType.EVENT_TYPE_UNKNOWN,
+          EventType.SESSION_START,
+          EventType.SESSION_START,
+        )
+      )
+
+    assertThat(json).isEqualTo("[1,0,1,1]")
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionEventTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionEventTest.kt
new file mode 100644
index 00000000000..682371491df
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionEventTest.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.os.Bundle
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.sessions.settings.LocalOverrideSettings
+import com.google.firebase.sessions.settings.SessionsSettings
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import com.google.firebase.sessions.testing.FakeSettingsProvider
+import com.google.firebase.sessions.testing.TestSessionEventData.TEST_DATA_COLLECTION_STATUS
+import com.google.firebase.sessions.testing.TestSessionEventData.TEST_SESSION_DATA
+import com.google.firebase.sessions.testing.TestSessionEventData.TEST_SESSION_DETAILS
+import com.google.firebase.sessions.testing.TestSessionEventData.TEST_SESSION_EVENT
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(RobolectricTestRunner::class)
+class SessionEventTest {
+  @Test
+  fun sessionStart_populatesSessionDetailsCorrectly() = runTest {
+    val fakeFirebaseApp = FakeFirebaseApp()
+    val sessionEvent =
+      SessionEvents.buildSession(
+        fakeFirebaseApp.firebaseApp,
+        TEST_SESSION_DETAILS,
+        SessionsSettings(
+          localOverrideSettings = FakeSettingsProvider(),
+          remoteSettings = FakeSettingsProvider(),
+        ),
+      )
+
+    assertThat(sessionEvent).isEqualTo(TEST_SESSION_EVENT)
+  }
+
+  @Test
+  fun sessionStart_samplingRate() = runTest {
+    val metadata = Bundle()
+    metadata.putDouble("firebase_sessions_sampling_rate", 0.5)
+    val firebaseApp = FakeFirebaseApp(metadata).firebaseApp
+    val context = firebaseApp.applicationContext
+
+    val sessionEvent =
+      SessionEvents.buildSession(
+        firebaseApp,
+        TEST_SESSION_DETAILS,
+        SessionsSettings(
+          localOverrideSettings = LocalOverrideSettings(context),
+          remoteSettings = FakeSettingsProvider(),
+        ),
+      )
+
+    assertThat(sessionEvent)
+      .isEqualTo(
+        TEST_SESSION_EVENT.copy(
+          sessionData =
+            TEST_SESSION_DATA.copy(
+              dataCollectionStatus = TEST_DATA_COLLECTION_STATUS.copy(sessionSamplingRate = 0.5)
+            )
+        )
+      )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionFirelogPublisherTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionFirelogPublisherTest.kt
new file mode 100644
index 00000000000..01d6bba540b
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionFirelogPublisherTest.kt
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.concurrent.TestOnlyExecutors
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies
+import com.google.firebase.sessions.api.SessionSubscriber
+import com.google.firebase.sessions.settings.SessionsSettings
+import com.google.firebase.sessions.testing.FakeEventGDTLogger
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import com.google.firebase.sessions.testing.FakeFirebaseInstallations
+import com.google.firebase.sessions.testing.FakeSessionSubscriber
+import com.google.firebase.sessions.testing.FakeSettingsProvider
+import com.google.firebase.sessions.testing.TestSessionEventData
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(AndroidJUnit4::class)
+class SessionFirelogPublisherTest {
+  @Before
+  fun setUp() {
+    val crashlyticsSubscriber =
+      FakeSessionSubscriber(sessionSubscriberName = SessionSubscriber.Name.CRASHLYTICS)
+    FirebaseSessionsDependencies.addDependency(SessionSubscriber.Name.CRASHLYTICS)
+    FirebaseSessionsDependencies.register(crashlyticsSubscriber)
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+    FirebaseSessionsDependencies.reset()
+  }
+
+  @Test
+  fun logSession_populatesFid() = runTest {
+    val fakeFirebaseApp = FakeFirebaseApp()
+    val fakeEventGDTLogger = FakeEventGDTLogger()
+    val firebaseInstallations = FakeFirebaseInstallations("FaKeFiD", "FakeAuthToken")
+    val sessionsSettings =
+      SessionsSettings(
+        localOverrideSettings = FakeSettingsProvider(),
+        remoteSettings = FakeSettingsProvider(),
+      )
+    val publisher =
+      SessionFirelogPublisherImpl(
+        fakeFirebaseApp.firebaseApp,
+        firebaseInstallations,
+        sessionsSettings,
+        eventGDTLogger = fakeEventGDTLogger,
+        TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext,
+      )
+
+    // Construct an event with no fid set.
+    publisher.logSession(TestSessionEventData.TEST_SESSION_DETAILS)
+
+    runCurrent()
+
+    assertThat(fakeEventGDTLogger.loggedEvent!!.sessionData.firebaseInstallationId)
+      .isEqualTo("FaKeFiD")
+    assertThat(fakeEventGDTLogger.loggedEvent!!.sessionData.firebaseAuthenticationToken)
+      .isEqualTo("FakeAuthToken")
+  }
+
+  @Test
+  fun logSession_nullFid_populatesEmptyFid() = runTest {
+    val fakeFirebaseApp = FakeFirebaseApp()
+    val fakeEventGDTLogger = FakeEventGDTLogger()
+    val firebaseInstallations = FakeFirebaseInstallations(fid = null, "FakeAuthToken")
+    val sessionsSettings =
+      SessionsSettings(
+        localOverrideSettings = FakeSettingsProvider(),
+        remoteSettings = FakeSettingsProvider(),
+      )
+    val publisher =
+      SessionFirelogPublisherImpl(
+        fakeFirebaseApp.firebaseApp,
+        firebaseInstallations,
+        sessionsSettings,
+        eventGDTLogger = fakeEventGDTLogger,
+        TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext,
+      )
+
+    // Construct an event with no fid set.
+    publisher.logSession(TestSessionEventData.TEST_SESSION_DETAILS)
+
+    runCurrent()
+
+    assertThat(fakeEventGDTLogger.loggedEvent!!.sessionData.firebaseInstallationId).isEqualTo("")
+    assertThat(fakeEventGDTLogger.loggedEvent!!.sessionData.firebaseAuthenticationToken)
+      .isEqualTo("FakeAuthToken")
+  }
+
+  @Test
+  fun logSession_nullAuthToken_populatesEmptyAuthToken() = runTest {
+    val fakeFirebaseApp = FakeFirebaseApp()
+    val fakeEventGDTLogger = FakeEventGDTLogger()
+    val firebaseInstallations = FakeFirebaseInstallations("FaKeFiD", authToken = null)
+    val sessionsSettings =
+      SessionsSettings(
+        localOverrideSettings = FakeSettingsProvider(),
+        remoteSettings = FakeSettingsProvider(),
+      )
+    val publisher =
+      SessionFirelogPublisherImpl(
+        fakeFirebaseApp.firebaseApp,
+        firebaseInstallations,
+        sessionsSettings,
+        eventGDTLogger = fakeEventGDTLogger,
+        TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext,
+      )
+
+    // Construct an event with no fid set.
+    publisher.logSession(TestSessionEventData.TEST_SESSION_DETAILS)
+
+    runCurrent()
+
+    assertThat(fakeEventGDTLogger.loggedEvent!!.sessionData.firebaseInstallationId)
+      .isEqualTo("FaKeFiD")
+    assertThat(fakeEventGDTLogger.loggedEvent!!.sessionData.firebaseAuthenticationToken)
+      .isEqualTo("")
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionGeneratorTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionGeneratorTest.kt
new file mode 100644
index 00000000000..7f29fb66ae7
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionGeneratorTest.kt
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.sessions.testing.FakeTimeProvider
+import com.google.firebase.sessions.testing.TestSessionEventData.TEST_SESSION_TIMESTAMP_US
+import java.util.UUID
+import org.junit.Test
+
+class SessionGeneratorTest {
+  private fun isValidSessionId(sessionId: String): Boolean {
+    if (sessionId.length != 32) {
+      return false
+    }
+    if (sessionId.contains("-")) {
+      return false
+    }
+    if (sessionId.lowercase() != sessionId) {
+      return false
+    }
+    return true
+  }
+
+  // This test case isn't important behavior. Nothing should access
+  // currentSession before generateNewSession has been called.
+  @Test(expected = UninitializedPropertyAccessException::class)
+  fun currentSession_beforeGenerate_throwsUninitialized() {
+    val sessionGenerator =
+      SessionGenerator(
+        timeProvider = FakeTimeProvider(),
+      )
+
+    sessionGenerator.currentSession
+  }
+
+  @Test
+  fun hasGenerateSession_beforeGenerate_returnsFalse() {
+    val sessionGenerator =
+      SessionGenerator(
+        timeProvider = FakeTimeProvider(),
+      )
+
+    assertThat(sessionGenerator.hasGenerateSession).isFalse()
+  }
+
+  @Test
+  fun hasGenerateSession_afterGenerate_returnsTrue() {
+    val sessionGenerator =
+      SessionGenerator(
+        timeProvider = FakeTimeProvider(),
+      )
+
+    sessionGenerator.generateNewSession()
+
+    assertThat(sessionGenerator.hasGenerateSession).isTrue()
+  }
+
+  @Test
+  fun generateNewSession_generatesValidSessionIds() {
+    val sessionGenerator =
+      SessionGenerator(
+        timeProvider = FakeTimeProvider(),
+      )
+
+    sessionGenerator.generateNewSession()
+
+    assertThat(isValidSessionId(sessionGenerator.currentSession.sessionId)).isTrue()
+    assertThat(isValidSessionId(sessionGenerator.currentSession.firstSessionId)).isTrue()
+
+    // Validate several random session ids.
+    repeat(16) {
+      assertThat(isValidSessionId(sessionGenerator.generateNewSession().sessionId)).isTrue()
+    }
+  }
+
+  @Test
+  fun generateNewSession_generatesValidSessionDetails() {
+    val sessionGenerator =
+      SessionGenerator(
+        timeProvider = FakeTimeProvider(),
+        uuidGenerator = UUIDs()::next,
+      )
+
+    sessionGenerator.generateNewSession()
+
+    assertThat(isValidSessionId(sessionGenerator.currentSession.sessionId)).isTrue()
+    assertThat(isValidSessionId(sessionGenerator.currentSession.firstSessionId)).isTrue()
+
+    assertThat(sessionGenerator.currentSession)
+      .isEqualTo(
+        SessionDetails(
+          sessionId = SESSION_ID_1,
+          firstSessionId = SESSION_ID_1,
+          sessionIndex = 0,
+          sessionStartTimestampUs = TEST_SESSION_TIMESTAMP_US,
+        )
+      )
+  }
+
+  // Ensures that generating a Session ID multiple times results in the fist
+  // Session ID being set in the firstSessionId field
+  @Test
+  fun generateNewSession_incrementsSessionIndex_keepsFirstSessionId() {
+    val sessionGenerator =
+      SessionGenerator(
+        timeProvider = FakeTimeProvider(),
+        uuidGenerator = UUIDs()::next,
+      )
+
+    val firstSessionDetails = sessionGenerator.generateNewSession()
+
+    assertThat(isValidSessionId(firstSessionDetails.sessionId)).isTrue()
+    assertThat(isValidSessionId(firstSessionDetails.firstSessionId)).isTrue()
+
+    assertThat(firstSessionDetails)
+      .isEqualTo(
+        SessionDetails(
+          sessionId = SESSION_ID_1,
+          firstSessionId = SESSION_ID_1,
+          sessionIndex = 0,
+          sessionStartTimestampUs = TEST_SESSION_TIMESTAMP_US,
+        )
+      )
+
+    val secondSessionDetails = sessionGenerator.generateNewSession()
+
+    assertThat(isValidSessionId(secondSessionDetails.sessionId)).isTrue()
+    assertThat(isValidSessionId(secondSessionDetails.firstSessionId)).isTrue()
+
+    // Ensure the new firstSessionId is equal to the first sessionId, and sessionIndex increased
+    assertThat(secondSessionDetails)
+      .isEqualTo(
+        SessionDetails(
+          sessionId = SESSION_ID_2,
+          firstSessionId = SESSION_ID_1,
+          sessionIndex = 1,
+          sessionStartTimestampUs = TEST_SESSION_TIMESTAMP_US,
+        )
+      )
+
+    // Do a third round just in case
+    val thirdSessionDetails = sessionGenerator.generateNewSession()
+
+    assertThat(isValidSessionId(thirdSessionDetails.sessionId)).isTrue()
+    assertThat(isValidSessionId(thirdSessionDetails.firstSessionId)).isTrue()
+
+    assertThat(thirdSessionDetails)
+      .isEqualTo(
+        SessionDetails(
+          sessionId = SESSION_ID_3,
+          firstSessionId = SESSION_ID_1,
+          sessionIndex = 2,
+          sessionStartTimestampUs = TEST_SESSION_TIMESTAMP_US,
+        )
+      )
+  }
+
+  private class UUIDs(val names: List<String> = listOf(UUID_1, UUID_2, UUID_3)) {
+    var index = -1
+
+    fun next(): UUID {
+      index = (index + 1).coerceAtMost(names.size - 1)
+      return UUID.fromString(names[index])
+    }
+  }
+
+  @Suppress("SpellCheckingInspection") // UUIDs are not words.
+  companion object {
+    const val UUID_1 = "11111111-1111-1111-1111-111111111111"
+    const val SESSION_ID_1 = "11111111111111111111111111111111"
+    const val UUID_2 = "22222222-2222-2222-2222-222222222222"
+    const val SESSION_ID_2 = "22222222222222222222222222222222"
+    const val UUID_3 = "CCCCCCCC-CCCC-CCCC-CCCC-CCCCCCCCCCCC"
+    const val SESSION_ID_3 = "cccccccccccccccccccccccccccccccc"
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionLifecycleClientTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionLifecycleClientTest.kt
new file mode 100644
index 00000000000..b038e68081c
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionLifecycleClientTest.kt
@@ -0,0 +1,280 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.os.Looper
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.filters.MediumTest
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.concurrent.TestOnlyExecutors
+import com.google.firebase.initialize
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies
+import com.google.firebase.sessions.api.SessionSubscriber
+import com.google.firebase.sessions.api.SessionSubscriber.SessionDetails
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import com.google.firebase.sessions.testing.FakeSessionLifecycleServiceBinder
+import com.google.firebase.sessions.testing.FakeSessionSubscriber
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.runTest
+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.shadowOf
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@MediumTest
+@RunWith(RobolectricTestRunner::class)
+internal class SessionLifecycleClientTest {
+  private lateinit var fakeService: FakeSessionLifecycleServiceBinder
+  private lateinit var lifecycleServiceBinder: FakeSessionLifecycleServiceBinder
+
+  @Before
+  fun setUp() {
+    val firebaseApp =
+      Firebase.initialize(
+        ApplicationProvider.getApplicationContext(),
+        FirebaseOptions.Builder()
+          .setApplicationId(FakeFirebaseApp.MOCK_APP_ID)
+          .setApiKey(FakeFirebaseApp.MOCK_API_KEY)
+          .setProjectId(FakeFirebaseApp.MOCK_PROJECT_ID)
+          .build(),
+      )
+    fakeService = firebaseApp[FakeSessionLifecycleServiceBinder::class.java]
+    lifecycleServiceBinder = firebaseApp[FakeSessionLifecycleServiceBinder::class.java]
+  }
+
+  @After
+  fun cleanUp() {
+    fakeService.serviceDisconnected()
+    FirebaseApp.clearInstancesForTest()
+    fakeService.clearForTest()
+    FirebaseSessionsDependencies.reset()
+  }
+
+  @Test
+  fun bindToService_registersCallbacks() =
+    runTest(UnconfinedTestDispatcher()) {
+      val client = SessionLifecycleClient(backgroundDispatcher() + coroutineContext)
+      addSubscriber(true, SessionSubscriber.Name.CRASHLYTICS)
+      client.bindToService(lifecycleServiceBinder)
+
+      waitForMessages()
+      assertThat(fakeService.clientCallbacks).hasSize(1)
+      assertThat(fakeService.connectionCallbacks).hasSize(1)
+    }
+
+  @Test
+  fun onServiceConnected_sendsQueuedMessages() =
+    runTest(UnconfinedTestDispatcher()) {
+      val client = SessionLifecycleClient(backgroundDispatcher() + coroutineContext)
+      addSubscriber(true, SessionSubscriber.Name.CRASHLYTICS)
+      client.bindToService(lifecycleServiceBinder)
+      client.foregrounded()
+      client.backgrounded()
+
+      fakeService.serviceConnected()
+
+      waitForMessages()
+      assertThat(fakeService.receivedMessageCodes)
+        .containsExactly(SessionLifecycleService.FOREGROUNDED, SessionLifecycleService.BACKGROUNDED)
+    }
+
+  @Test
+  fun onServiceConnected_sendsOnlyLatestMessages() =
+    runTest(UnconfinedTestDispatcher()) {
+      val client = SessionLifecycleClient(backgroundDispatcher() + coroutineContext)
+      addSubscriber(true, SessionSubscriber.Name.CRASHLYTICS)
+      client.bindToService(lifecycleServiceBinder)
+      client.foregrounded()
+      client.backgrounded()
+      client.foregrounded()
+      client.backgrounded()
+      client.foregrounded()
+      client.backgrounded()
+
+      fakeService.serviceConnected()
+
+      waitForMessages()
+      assertThat(fakeService.receivedMessageCodes)
+        .containsExactly(SessionLifecycleService.FOREGROUNDED, SessionLifecycleService.BACKGROUNDED)
+    }
+
+  @Test
+  fun onServiceDisconnected_noMoreEventsSent() =
+    runTest(UnconfinedTestDispatcher()) {
+      val client = SessionLifecycleClient(backgroundDispatcher() + coroutineContext)
+      addSubscriber(true, SessionSubscriber.Name.CRASHLYTICS)
+      client.bindToService(lifecycleServiceBinder)
+
+      fakeService.serviceConnected()
+      fakeService.serviceDisconnected()
+      client.foregrounded()
+      client.backgrounded()
+
+      waitForMessages()
+      assertThat(fakeService.receivedMessageCodes).isEmpty()
+    }
+
+  @Test
+  fun serviceReconnection_handlesNewMessages() =
+    runTest(UnconfinedTestDispatcher()) {
+      val client = SessionLifecycleClient(backgroundDispatcher() + coroutineContext)
+      addSubscriber(true, SessionSubscriber.Name.CRASHLYTICS)
+      client.bindToService(lifecycleServiceBinder)
+
+      fakeService.serviceConnected()
+      fakeService.serviceDisconnected()
+      fakeService.serviceConnected()
+      client.foregrounded()
+      client.backgrounded()
+
+      waitForMessages()
+      assertThat(fakeService.receivedMessageCodes)
+        .containsExactly(SessionLifecycleService.FOREGROUNDED, SessionLifecycleService.BACKGROUNDED)
+    }
+
+  @Test
+  fun serviceReconnection_queuesOldMessages() =
+    runTest(UnconfinedTestDispatcher()) {
+      val client = SessionLifecycleClient(backgroundDispatcher() + coroutineContext)
+      addSubscriber(true, SessionSubscriber.Name.CRASHLYTICS)
+      client.bindToService(lifecycleServiceBinder)
+
+      fakeService.serviceConnected()
+      fakeService.serviceDisconnected()
+      client.foregrounded()
+      client.backgrounded()
+      fakeService.serviceConnected()
+
+      waitForMessages()
+      assertThat(fakeService.receivedMessageCodes)
+        .containsExactly(SessionLifecycleService.FOREGROUNDED, SessionLifecycleService.BACKGROUNDED)
+    }
+
+  @Test
+  fun doesNotSendLifecycleEventsWithoutSubscribers() =
+    runTest(UnconfinedTestDispatcher()) {
+      val client = SessionLifecycleClient(backgroundDispatcher() + coroutineContext)
+      client.bindToService(lifecycleServiceBinder)
+
+      fakeService.serviceConnected()
+      client.foregrounded()
+      client.backgrounded()
+
+      waitForMessages()
+      assertThat(fakeService.receivedMessageCodes).isEmpty()
+    }
+
+  @Test
+  fun doesNotSendLifecycleEventsWithoutEnabledSubscribers() =
+    runTest(UnconfinedTestDispatcher()) {
+      val client = SessionLifecycleClient(backgroundDispatcher() + coroutineContext)
+      addSubscriber(collectionEnabled = false, SessionSubscriber.Name.CRASHLYTICS)
+      addSubscriber(collectionEnabled = false, SessionSubscriber.Name.MATT_SAYS_HI)
+      client.bindToService(lifecycleServiceBinder)
+
+      fakeService.serviceConnected()
+      client.foregrounded()
+      client.backgrounded()
+
+      waitForMessages()
+      assertThat(fakeService.receivedMessageCodes).isEmpty()
+    }
+
+  @Test
+  fun sendsLifecycleEventsWhenAtLeastOneEnabledSubscriber() =
+    runTest(UnconfinedTestDispatcher()) {
+      val client = SessionLifecycleClient(backgroundDispatcher() + coroutineContext)
+      addSubscriber(collectionEnabled = true, SessionSubscriber.Name.CRASHLYTICS)
+      addSubscriber(collectionEnabled = false, SessionSubscriber.Name.MATT_SAYS_HI)
+      client.bindToService(lifecycleServiceBinder)
+
+      fakeService.serviceConnected()
+      client.foregrounded()
+      client.backgrounded()
+
+      waitForMessages()
+      assertThat(fakeService.receivedMessageCodes).hasSize(2)
+    }
+
+  @Test
+  fun handleSessionUpdate_noSubscribers() =
+    runTest(UnconfinedTestDispatcher()) {
+      val client = SessionLifecycleClient(backgroundDispatcher() + coroutineContext)
+      client.bindToService(lifecycleServiceBinder)
+
+      fakeService.serviceConnected()
+      fakeService.broadcastSession("123")
+
+      waitForMessages()
+    }
+
+  @Test
+  fun handleSessionUpdate_sendsToSubscribers() =
+    runTest(UnconfinedTestDispatcher()) {
+      val client = SessionLifecycleClient(backgroundDispatcher() + coroutineContext)
+      val crashlyticsSubscriber = addSubscriber(true, SessionSubscriber.Name.CRASHLYTICS)
+      val mattSaysHiSubscriber = addSubscriber(true, SessionSubscriber.Name.MATT_SAYS_HI)
+      client.bindToService(lifecycleServiceBinder)
+
+      fakeService.serviceConnected()
+      fakeService.broadcastSession("123")
+
+      waitForMessages()
+      assertThat(crashlyticsSubscriber.sessionChangedEvents).containsExactly(SessionDetails("123"))
+      assertThat(mattSaysHiSubscriber.sessionChangedEvents).containsExactly(SessionDetails("123"))
+    }
+
+  @Test
+  fun handleSessionUpdate_sendsToAllSubscribersAsLongAsOneIsEnabled() =
+    runTest(UnconfinedTestDispatcher()) {
+      val client = SessionLifecycleClient(backgroundDispatcher() + coroutineContext)
+      val crashlyticsSubscriber = addSubscriber(true, SessionSubscriber.Name.CRASHLYTICS)
+      val mattSaysHiSubscriber = addSubscriber(false, SessionSubscriber.Name.MATT_SAYS_HI)
+      client.bindToService(lifecycleServiceBinder)
+
+      fakeService.serviceConnected()
+      fakeService.broadcastSession("123")
+
+      waitForMessages()
+      assertThat(crashlyticsSubscriber.sessionChangedEvents).containsExactly(SessionDetails("123"))
+      assertThat(mattSaysHiSubscriber.sessionChangedEvents).containsExactly(SessionDetails("123"))
+    }
+
+  private fun addSubscriber(
+    collectionEnabled: Boolean,
+    name: SessionSubscriber.Name,
+  ): FakeSessionSubscriber {
+    val fakeSubscriber = FakeSessionSubscriber(collectionEnabled, sessionSubscriberName = name)
+    FirebaseSessionsDependencies.addDependency(name)
+    FirebaseSessionsDependencies.register(fakeSubscriber)
+    return fakeSubscriber
+  }
+
+  private fun waitForMessages() {
+    shadowOf(Looper.getMainLooper()).idle()
+  }
+
+  private fun backgroundDispatcher() = TestOnlyExecutors.background().asCoroutineDispatcher()
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionLifecycleServiceTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionLifecycleServiceTest.kt
new file mode 100644
index 00000000000..682a9ddfbbb
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionLifecycleServiceTest.kt
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.content.Context
+import android.content.Intent
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import android.os.Messenger
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.filters.MediumTest
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.initialize
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import com.google.firebase.sessions.testing.FakeFirelogPublisher
+import com.google.firebase.sessions.testing.FakeSessionDatastore
+import java.time.Duration
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.android.controller.ServiceController
+import org.robolectric.annotation.LooperMode
+import org.robolectric.annotation.LooperMode.Mode.PAUSED
+import org.robolectric.shadows.ShadowSystemClock
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@MediumTest
+@LooperMode(PAUSED)
+@RunWith(RobolectricTestRunner::class)
+internal class SessionLifecycleServiceTest {
+
+  lateinit var service: ServiceController<SessionLifecycleService>
+  lateinit var firebaseApp: FirebaseApp
+
+  data class CallbackMessage(val code: Int, val sessionId: String?)
+
+  internal inner class TestCallbackHandler(looper: Looper = Looper.getMainLooper()) :
+    Handler(looper) {
+    val callbackMessages = ArrayList<CallbackMessage>()
+
+    override fun handleMessage(msg: Message) {
+      callbackMessages.add(CallbackMessage(msg.what, getSessionId(msg)))
+    }
+  }
+
+  @Before
+  fun setUp() {
+    val context = ApplicationProvider.getApplicationContext<Context>()
+    firebaseApp =
+      Firebase.initialize(
+        ApplicationProvider.getApplicationContext(),
+        FirebaseOptions.Builder()
+          .setApplicationId(FakeFirebaseApp.MOCK_APP_ID)
+          .setApiKey(FakeFirebaseApp.MOCK_API_KEY)
+          .setProjectId(FakeFirebaseApp.MOCK_PROJECT_ID)
+          .build()
+      )
+    service = createService()
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+
+  @Test
+  fun binding_noCallbackOnInitialBindingWhenNoneStored() {
+    val client = TestCallbackHandler()
+
+    bindToService(client)
+
+    waitForAllMessages()
+    assertThat(client.callbackMessages).isEmpty()
+  }
+
+  @Test
+  fun binding_callbackOnInitialBindWhenSessionIdSet() {
+    val client = TestCallbackHandler()
+    firebaseApp.get(FakeSessionDatastore::class.java).updateSessionId("123")
+
+    bindToService(client)
+
+    waitForAllMessages()
+    assertThat(client.callbackMessages).hasSize(1)
+    val msg = client.callbackMessages.first()
+    assertThat(msg.code).isEqualTo(SessionLifecycleService.SESSION_UPDATED)
+    assertThat(msg.sessionId).isNotEmpty()
+    // We should not send stored session IDs to firelog
+    assertThat(getUploadedSessions()).isEmpty()
+  }
+
+  @Test
+  fun foregrounding_startsSessionOnFirstForegrounding() {
+    val client = TestCallbackHandler()
+    val messenger = bindToService(client)
+
+    messenger.send(Message.obtain(null, SessionLifecycleService.FOREGROUNDED, 0, 0))
+
+    waitForAllMessages()
+    assertThat(client.callbackMessages).hasSize(1)
+    assertThat(getUploadedSessions()).hasSize(1)
+    assertThat(client.callbackMessages.first().code)
+      .isEqualTo(SessionLifecycleService.SESSION_UPDATED)
+    assertThat(client.callbackMessages.first().sessionId).isNotEmpty()
+    assertThat(getUploadedSessions().first().sessionId)
+      .isEqualTo(client.callbackMessages.first().sessionId)
+  }
+
+  @Test
+  fun foregrounding_onlyOneSessionOnMultipleForegroundings() {
+    val client = TestCallbackHandler()
+    val messenger = bindToService(client)
+
+    messenger.send(Message.obtain(null, SessionLifecycleService.FOREGROUNDED, 0, 0))
+    messenger.send(Message.obtain(null, SessionLifecycleService.FOREGROUNDED, 0, 0))
+    messenger.send(Message.obtain(null, SessionLifecycleService.FOREGROUNDED, 0, 0))
+
+    waitForAllMessages()
+    assertThat(client.callbackMessages).hasSize(1)
+    assertThat(getUploadedSessions()).hasSize(1)
+  }
+
+  @Test
+  fun foregrounding_newSessionAfterLongDelay() {
+    val client = TestCallbackHandler()
+    val messenger = bindToService(client)
+
+    messenger.send(Message.obtain(null, SessionLifecycleService.FOREGROUNDED, 0, 0))
+    ShadowSystemClock.advanceBy(Duration.ofMinutes(31))
+    messenger.send(Message.obtain(null, SessionLifecycleService.FOREGROUNDED, 0, 0))
+
+    waitForAllMessages()
+    assertThat(client.callbackMessages).hasSize(2)
+    assertThat(getUploadedSessions()).hasSize(2)
+    assertThat(client.callbackMessages.first().sessionId)
+      .isNotEqualTo(client.callbackMessages.last().sessionId)
+    assertThat(getUploadedSessions().first().sessionId)
+      .isEqualTo(client.callbackMessages.first().sessionId)
+    assertThat(getUploadedSessions().last().sessionId)
+      .isEqualTo(client.callbackMessages.last().sessionId)
+  }
+
+  @Test
+  fun sendsSessionsToMultipleClients() {
+    val client1 = TestCallbackHandler()
+    val client2 = TestCallbackHandler()
+    val client3 = TestCallbackHandler()
+    bindToService(client1)
+    val messenger = bindToService(client2)
+    bindToService(client3)
+    waitForAllMessages()
+
+    messenger.send(Message.obtain(null, SessionLifecycleService.FOREGROUNDED, 0, 0))
+
+    waitForAllMessages()
+    assertThat(client1.callbackMessages).hasSize(1)
+    assertThat(client1.callbackMessages).isEqualTo(client2.callbackMessages)
+    assertThat(client1.callbackMessages).isEqualTo(client3.callbackMessages)
+    assertThat(getUploadedSessions()).hasSize(1)
+  }
+
+  @Test
+  fun onlyOneSessionForMultipleClientsForegrounding() {
+    val client1 = TestCallbackHandler()
+    val client2 = TestCallbackHandler()
+    val client3 = TestCallbackHandler()
+    val messenger1 = bindToService(client1)
+    val messenger2 = bindToService(client2)
+    val messenger3 = bindToService(client3)
+    waitForAllMessages()
+
+    messenger1.send(Message.obtain(null, SessionLifecycleService.FOREGROUNDED, 0, 0))
+    messenger1.send(Message.obtain(null, SessionLifecycleService.BACKGROUNDED, 0, 0))
+    messenger2.send(Message.obtain(null, SessionLifecycleService.FOREGROUNDED, 0, 0))
+    messenger2.send(Message.obtain(null, SessionLifecycleService.BACKGROUNDED, 0, 0))
+    messenger3.send(Message.obtain(null, SessionLifecycleService.FOREGROUNDED, 0, 0))
+
+    waitForAllMessages()
+    assertThat(client1.callbackMessages).hasSize(1)
+    assertThat(client1.callbackMessages).isEqualTo(client2.callbackMessages)
+    assertThat(client1.callbackMessages).isEqualTo(client3.callbackMessages)
+    assertThat(getUploadedSessions()).hasSize(1)
+  }
+
+  @Test
+  fun backgrounding_doesNotStartSession() {
+    val client = TestCallbackHandler()
+    val messenger = bindToService(client)
+
+    messenger.send(Message.obtain(null, SessionLifecycleService.BACKGROUNDED, 0, 0))
+
+    waitForAllMessages()
+    assertThat(client.callbackMessages).isEmpty()
+    assertThat(getUploadedSessions()).isEmpty()
+  }
+
+  private fun bindToService(client: TestCallbackHandler): Messenger {
+    return Messenger(service.get()?.onBind(createServiceLaunchIntent(client)))
+  }
+
+  private fun createServiceLaunchIntent(client: TestCallbackHandler) =
+    Intent(
+        ApplicationProvider.getApplicationContext<Context>(),
+        SessionLifecycleService::class.java
+      )
+      .apply { putExtra(SessionLifecycleService.CLIENT_CALLBACK_MESSENGER, Messenger(client)) }
+
+  private fun createService() =
+    Robolectric.buildService(SessionLifecycleService::class.java).create()
+
+  private fun waitForAllMessages() {
+    shadowOf(service.get()?.handlerThread?.getLooper()).idle()
+    shadowOf(Looper.getMainLooper()).idle()
+  }
+
+  private fun getUploadedSessions() =
+    firebaseApp.get(FakeFirelogPublisher::class.java).loggedSessions
+
+  private fun getSessionId(msg: Message) =
+    msg.data?.getString(SessionLifecycleService.SESSION_UPDATE_EXTRA)
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionsActivityLifecycleCallbacksTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionsActivityLifecycleCallbacksTest.kt
new file mode 100644
index 00000000000..189e13fed89
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionsActivityLifecycleCallbacksTest.kt
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions
+
+import android.app.Activity
+import android.os.Looper
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.concurrent.TestOnlyExecutors
+import com.google.firebase.initialize
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies
+import com.google.firebase.sessions.api.SessionSubscriber
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import com.google.firebase.sessions.testing.FakeSessionLifecycleServiceBinder
+import com.google.firebase.sessions.testing.FakeSessionSubscriber
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Shadows
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(AndroidJUnit4::class)
+internal class SessionsActivityLifecycleCallbacksTest {
+  private lateinit var fakeService: FakeSessionLifecycleServiceBinder
+  private lateinit var lifecycleServiceBinder: FakeSessionLifecycleServiceBinder
+  private val fakeActivity = Activity()
+
+  @Before
+  fun setUp() {
+    // Reset the state of the SessionsActivityLifecycleCallbacks object.
+    SessionsActivityLifecycleCallbacks.hasPendingForeground = false
+    SessionsActivityLifecycleCallbacks.lifecycleClient = null
+
+    FirebaseSessionsDependencies.addDependency(SessionSubscriber.Name.MATT_SAYS_HI)
+    FirebaseSessionsDependencies.register(
+      FakeSessionSubscriber(
+        isDataCollectionEnabled = true,
+        sessionSubscriberName = SessionSubscriber.Name.MATT_SAYS_HI,
+      )
+    )
+
+    val firebaseApp =
+      Firebase.initialize(
+        ApplicationProvider.getApplicationContext(),
+        FirebaseOptions.Builder()
+          .setApplicationId(FakeFirebaseApp.MOCK_APP_ID)
+          .setApiKey(FakeFirebaseApp.MOCK_API_KEY)
+          .setProjectId(FakeFirebaseApp.MOCK_PROJECT_ID)
+          .build(),
+      )
+    fakeService = firebaseApp[FakeSessionLifecycleServiceBinder::class.java]
+    lifecycleServiceBinder = firebaseApp[FakeSessionLifecycleServiceBinder::class.java]
+  }
+
+  @After
+  fun cleanUp() {
+    fakeService.serviceDisconnected()
+    FirebaseApp.clearInstancesForTest()
+    fakeService.clearForTest()
+    FirebaseSessionsDependencies.reset()
+  }
+
+  @Test
+  fun hasPendingForeground_thenSetLifecycleClient_callsBackgrounded() =
+    runTest(UnconfinedTestDispatcher()) {
+      val lifecycleClient = SessionLifecycleClient(backgroundDispatcher(coroutineContext))
+
+      // Activity comes to foreground before the lifecycle client was set due to no settings.
+      SessionsActivityLifecycleCallbacks.onActivityResumed(fakeActivity)
+
+      // Settings fetched and set the lifecycle client.
+      lifecycleClient.bindToService(lifecycleServiceBinder)
+      fakeService.serviceConnected()
+      SessionsActivityLifecycleCallbacks.lifecycleClient = lifecycleClient
+
+      // Assert lifecycleClient.foregrounded got called.
+      waitForMessages()
+      assertThat(fakeService.receivedMessageCodes).hasSize(1)
+    }
+
+  @Test
+  fun noPendingForeground_thenSetLifecycleClient_doesNotCallBackgrounded() =
+    runTest(UnconfinedTestDispatcher()) {
+      val lifecycleClient = SessionLifecycleClient(backgroundDispatcher(coroutineContext))
+
+      // Set lifecycle client before any foreground happened.
+      lifecycleClient.bindToService(lifecycleServiceBinder)
+      fakeService.serviceConnected()
+      SessionsActivityLifecycleCallbacks.lifecycleClient = lifecycleClient
+
+      // Assert lifecycleClient.foregrounded did not get called.
+      waitForMessages()
+      assertThat(fakeService.receivedMessageCodes).hasSize(0)
+
+      // Activity comes to foreground.
+      SessionsActivityLifecycleCallbacks.onActivityResumed(fakeActivity)
+
+      // Assert lifecycleClient.foregrounded did get called.
+      waitForMessages()
+      assertThat(fakeService.receivedMessageCodes).hasSize(1)
+    }
+
+  private fun waitForMessages() = Shadows.shadowOf(Looper.getMainLooper()).idle()
+
+  private fun backgroundDispatcher(coroutineContext: CoroutineContext) =
+    TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependenciesTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependenciesTest.kt
new file mode 100644
index 00000000000..f662fe13e90
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependenciesTest.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.api
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.sessions.api.SessionSubscriber.Name.CRASHLYTICS
+import com.google.firebase.sessions.api.SessionSubscriber.Name.MATT_SAYS_HI
+import com.google.firebase.sessions.testing.FakeSessionSubscriber
+import kotlin.time.Duration.Companion.seconds
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.withTimeout
+import org.junit.After
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(AndroidJUnit4::class)
+class FirebaseSessionsDependenciesTest {
+  @After
+  fun cleanUp() {
+    // Reset all dependencies after each test.
+    FirebaseSessionsDependencies.reset()
+  }
+
+  @Test
+  fun register_dependencyAdded_canGet() {
+    val crashlyticsSubscriber = FakeSessionSubscriber(sessionSubscriberName = CRASHLYTICS)
+    FirebaseSessionsDependencies.addDependency(CRASHLYTICS)
+    FirebaseSessionsDependencies.register(crashlyticsSubscriber)
+
+    assertThat(FirebaseSessionsDependencies.getSubscriber(CRASHLYTICS))
+      .isEqualTo(crashlyticsSubscriber)
+  }
+
+  @Test
+  fun register_alreadyRegisteredSameName_ignoresSecondSubscriber() {
+    val firstSubscriber = FakeSessionSubscriber(sessionSubscriberName = CRASHLYTICS)
+    val secondSubscriber = FakeSessionSubscriber(sessionSubscriberName = CRASHLYTICS)
+
+    FirebaseSessionsDependencies.addDependency(CRASHLYTICS)
+
+    // Register the first time, no problem.
+    FirebaseSessionsDependencies.register(firstSubscriber)
+
+    // Attempt to register a second subscriber with the same name.
+    FirebaseSessionsDependencies.register(secondSubscriber)
+
+    assertThat(FirebaseSessionsDependencies.getSubscriber(CRASHLYTICS)).isEqualTo(firstSubscriber)
+  }
+
+  @Test
+  fun getSubscriber_dependencyAdded_notRegistered_throws() {
+    FirebaseSessionsDependencies.addDependency(MATT_SAYS_HI)
+
+    val thrown =
+      assertThrows(IllegalStateException::class.java) {
+        FirebaseSessionsDependencies.getSubscriber(MATT_SAYS_HI)
+      }
+
+    assertThat(thrown).hasMessageThat().contains("Subscriber MATT_SAYS_HI has not been registered")
+  }
+
+  @Test
+  fun getSubscriber_notDepended_throws() {
+    val thrown =
+      assertThrows(IllegalStateException::class.java) {
+        // Crashlytics was never added as a dependency.
+        FirebaseSessionsDependencies.getSubscriber(CRASHLYTICS)
+      }
+
+    assertThat(thrown).hasMessageThat().contains("Cannot get dependency CRASHLYTICS")
+  }
+
+  @Test
+  fun getSubscribers_waitsForRegister() = runTest {
+    val crashlyticsSubscriber = FakeSessionSubscriber(sessionSubscriberName = CRASHLYTICS)
+    FirebaseSessionsDependencies.addDependency(CRASHLYTICS)
+
+    // Wait a few seconds and then register.
+    launch(Dispatchers.Default) {
+      delay(2.seconds)
+      FirebaseSessionsDependencies.register(crashlyticsSubscriber)
+    }
+
+    // Block until the register happens.
+    val subscribers = FirebaseSessionsDependencies.getRegisteredSubscribers()
+
+    assertThat(subscribers).containsExactly(CRASHLYTICS, crashlyticsSubscriber)
+  }
+
+  @Test
+  fun getSubscribers_noDependencies() = runTest {
+    val subscribers = FirebaseSessionsDependencies.getRegisteredSubscribers()
+
+    assertThat(subscribers).isEmpty()
+  }
+
+  @Test(expected = TimeoutCancellationException::class)
+  fun getSubscribers_neverRegister_waitsForever() = runTest {
+    FirebaseSessionsDependencies.addDependency(CRASHLYTICS)
+
+    // The register never happens, wait until the timeout.
+    withTimeout(2.seconds) { FirebaseSessionsDependencies.getRegisteredSubscribers() }
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/settings/LocalOverrideSettingsTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/settings/LocalOverrideSettingsTest.kt
new file mode 100644
index 00000000000..08e84f4aa97
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/settings/LocalOverrideSettingsTest.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.settings
+
+import android.os.Bundle
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class LocalOverrideSettingsTest {
+  @Test
+  fun localOverrides_returnsNullByDefault() {
+    val context = FakeFirebaseApp().firebaseApp.applicationContext
+
+    val localSettings = LocalOverrideSettings(context)
+    assertThat(localSettings.sessionEnabled).isNull()
+    assertThat(localSettings.sessionRestartTimeout).isNull()
+    assertThat(localSettings.samplingRate).isNull()
+  }
+
+  @Test
+  fun localOverrides_overrideValuesAreFetchedCorrectly() {
+    val metadata = Bundle()
+    metadata.putBoolean("firebase_sessions_enabled", false)
+    metadata.putDouble("firebase_sessions_sampling_rate", 0.5)
+    metadata.putInt("firebase_sessions_sessions_restart_timeout", 180)
+    val context = FakeFirebaseApp(metadata).firebaseApp.applicationContext
+
+    val localSettings = LocalOverrideSettings(context)
+    assertThat(localSettings.sessionEnabled).isFalse()
+    assertThat(localSettings.sessionRestartTimeout).isEqualTo(3.minutes)
+    assertThat(localSettings.samplingRate).isEqualTo(0.5)
+  }
+
+  @Test
+  fun localOverridesForSomeFields_overrideValuesAreFetchedCorrectly() {
+    val metadata = Bundle()
+    metadata.putBoolean("firebase_sessions_enabled", false)
+    metadata.putInt("firebase_sessions_sessions_restart_timeout", 180)
+    val context = FakeFirebaseApp(metadata).firebaseApp.applicationContext
+
+    val localSettings = LocalOverrideSettings(context)
+    assertThat(localSettings.sessionEnabled).isFalse()
+    assertThat(localSettings.sessionRestartTimeout).isEqualTo(3.minutes)
+    assertThat(localSettings.samplingRate).isNull()
+  }
+
+  @Test
+  fun localOverrides_invalidOverrideValuesAreFetchedAsSomething() {
+    val metadata = Bundle()
+    metadata.putString("firebase_sessions_enabled", "no")
+    metadata.putDouble("firebase_sessions_sampling_rate", -2.0)
+    metadata.putInt("firebase_sessions_sessions_restart_timeout", -2)
+    val context = FakeFirebaseApp(metadata).firebaseApp.applicationContext
+
+    // These values are not meaningful, but are fetched.
+    val localSettings = LocalOverrideSettings(context)
+    assertThat(localSettings.sessionEnabled).isFalse()
+    assertThat(localSettings.sessionRestartTimeout).isEqualTo((-2).seconds)
+    assertThat(localSettings.samplingRate).isEqualTo(-2.0)
+  }
+
+  @Test
+  fun localOverrides_invalidOverrideValueTypesAreFetchedAsDefault() {
+    val metadata = Bundle()
+    // These are all the wrong type.
+    metadata.putString("firebase_sessions_enabled", "true")
+    metadata.putString("firebase_sessions_sampling_rate", "0.375")
+    metadata.putString("firebase_sessions_sessions_restart_timeout", "9000.1")
+    val context = FakeFirebaseApp(metadata).firebaseApp.applicationContext
+
+    // These are the bundle default values.
+    val localSettings = LocalOverrideSettings(context)
+    assertThat(localSettings.sessionEnabled).isFalse()
+    assertThat(localSettings.sessionRestartTimeout).isEqualTo(Duration.ZERO)
+    assertThat(localSettings.samplingRate).isEqualTo(0.0)
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/settings/RemoteSettingsTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/settings/RemoteSettingsTest.kt
new file mode 100644
index 00000000000..6a3a4a1f8c3
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/settings/RemoteSettingsTest.kt
@@ -0,0 +1,338 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.settings
+
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import androidx.datastore.preferences.preferencesDataStoreFile
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.concurrent.TestOnlyExecutors
+import com.google.firebase.sessions.SessionEvents
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import com.google.firebase.sessions.testing.FakeFirebaseInstallations
+import com.google.firebase.sessions.testing.FakeRemoteConfigFetcher
+import com.google.firebase.sessions.testing.TestSessionEventData.TEST_APPLICATION_INFO
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.withTimeout
+import org.json.JSONObject
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(AndroidJUnit4::class)
+class RemoteSettingsTest {
+
+  @Test
+  fun remoteSettings_successfulFetchCachesValues() =
+    runTest(UnconfinedTestDispatcher()) {
+      val firebaseApp = FakeFirebaseApp().firebaseApp
+      val context = firebaseApp.applicationContext
+      val firebaseInstallations = FakeFirebaseInstallations("FaKeFiD")
+      val fakeFetcher = FakeRemoteConfigFetcher()
+
+      TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext
+
+      val remoteSettings =
+        RemoteSettings(
+          TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext,
+          firebaseInstallations,
+          SessionEvents.getApplicationInfo(firebaseApp),
+          fakeFetcher,
+          dataStore =
+            PreferenceDataStoreFactory.create(
+              scope = this,
+              produceFile = { context.preferencesDataStoreFile(SESSION_TEST_CONFIGS_NAME) },
+            ),
+        )
+
+      runCurrent()
+
+      assertThat(remoteSettings.sessionEnabled).isNull()
+      assertThat(remoteSettings.samplingRate).isNull()
+      assertThat(remoteSettings.sessionRestartTimeout).isNull()
+
+      fakeFetcher.responseJSONObject = JSONObject(VALID_RESPONSE)
+      remoteSettings.updateSettings()
+
+      runCurrent()
+
+      assertThat(remoteSettings.sessionEnabled).isFalse()
+      assertThat(remoteSettings.samplingRate).isEqualTo(0.75)
+      assertThat(remoteSettings.sessionRestartTimeout).isEqualTo(40.minutes)
+
+      remoteSettings.clearCachedSettings()
+    }
+
+  @Test
+  fun remoteSettings_successfulFetchWithLessConfigsCachesOnlyReceivedValues() =
+    runTest(UnconfinedTestDispatcher()) {
+      val firebaseApp = FakeFirebaseApp().firebaseApp
+      val context = firebaseApp.applicationContext
+      val firebaseInstallations = FakeFirebaseInstallations("FaKeFiD")
+      val fakeFetcher = FakeRemoteConfigFetcher()
+
+      val remoteSettings =
+        RemoteSettings(
+          TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext,
+          firebaseInstallations,
+          SessionEvents.getApplicationInfo(firebaseApp),
+          fakeFetcher,
+          dataStore =
+            PreferenceDataStoreFactory.create(
+              scope = this,
+              produceFile = { context.preferencesDataStoreFile(SESSION_TEST_CONFIGS_NAME) },
+            ),
+        )
+
+      runCurrent()
+
+      assertThat(remoteSettings.sessionEnabled).isNull()
+      assertThat(remoteSettings.samplingRate).isNull()
+      assertThat(remoteSettings.sessionRestartTimeout).isNull()
+
+      val fetchedResponse = JSONObject(VALID_RESPONSE)
+      fetchedResponse.getJSONObject("app_quality").remove("sessions_enabled")
+      fakeFetcher.responseJSONObject = fetchedResponse
+      remoteSettings.updateSettings()
+
+      runCurrent()
+
+      assertThat(remoteSettings.sessionEnabled).isNull()
+      assertThat(remoteSettings.samplingRate).isEqualTo(0.75)
+      assertThat(remoteSettings.sessionRestartTimeout).isEqualTo(40.minutes)
+
+      remoteSettings.clearCachedSettings()
+    }
+
+  @Test
+  fun remoteSettings_successfulReFetchUpdatesCache() =
+    runTest(UnconfinedTestDispatcher()) {
+      val firebaseApp = FakeFirebaseApp().firebaseApp
+      val context = firebaseApp.applicationContext
+      val firebaseInstallations = FakeFirebaseInstallations("FaKeFiD")
+      val fakeFetcher = FakeRemoteConfigFetcher()
+
+      val remoteSettings =
+        RemoteSettings(
+          TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext,
+          firebaseInstallations,
+          SessionEvents.getApplicationInfo(firebaseApp),
+          fakeFetcher,
+          dataStore =
+            PreferenceDataStoreFactory.create(
+              scope = this,
+              produceFile = { context.preferencesDataStoreFile(SESSION_TEST_CONFIGS_NAME) },
+            ),
+        )
+
+      val fetchedResponse = JSONObject(VALID_RESPONSE)
+      fetchedResponse.getJSONObject("app_quality").put("cache_duration", 1)
+      fakeFetcher.responseJSONObject = fetchedResponse
+      remoteSettings.updateSettings()
+
+      runCurrent()
+
+      assertThat(remoteSettings.sessionEnabled).isFalse()
+      assertThat(remoteSettings.samplingRate).isEqualTo(0.75)
+      assertThat(remoteSettings.sessionRestartTimeout).isEqualTo(40.minutes)
+
+      fetchedResponse.getJSONObject("app_quality").put("sessions_enabled", true)
+      fetchedResponse.getJSONObject("app_quality").put("sampling_rate", 0.25)
+      fetchedResponse.getJSONObject("app_quality").put("session_timeout_seconds", 1200)
+
+      // TODO(mrober): Fix these so we don't need to sleep. Maybe use FakeTime?
+      // Sleep for a second before updating configs
+      Thread.sleep(2000)
+
+      fakeFetcher.responseJSONObject = fetchedResponse
+      remoteSettings.updateSettings()
+
+      runCurrent()
+
+      assertThat(remoteSettings.sessionEnabled).isTrue()
+      assertThat(remoteSettings.samplingRate).isEqualTo(0.25)
+      assertThat(remoteSettings.sessionRestartTimeout).isEqualTo(20.minutes)
+
+      remoteSettings.clearCachedSettings()
+    }
+
+  @Test
+  fun remoteSettings_successfulFetchWithEmptyConfigRetainsOldConfigs() =
+    runTest(UnconfinedTestDispatcher()) {
+      val firebaseApp = FakeFirebaseApp().firebaseApp
+      val context = firebaseApp.applicationContext
+      val firebaseInstallations = FakeFirebaseInstallations("FaKeFiD")
+      val fakeFetcher = FakeRemoteConfigFetcher()
+
+      val remoteSettings =
+        RemoteSettings(
+          TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext,
+          firebaseInstallations,
+          SessionEvents.getApplicationInfo(firebaseApp),
+          fakeFetcher,
+          dataStore =
+            PreferenceDataStoreFactory.create(
+              scope = this,
+              produceFile = { context.preferencesDataStoreFile(SESSION_TEST_CONFIGS_NAME) },
+            ),
+        )
+
+      val fetchedResponse = JSONObject(VALID_RESPONSE)
+      fetchedResponse.getJSONObject("app_quality").put("cache_duration", 1)
+      fakeFetcher.responseJSONObject = fetchedResponse
+      remoteSettings.updateSettings()
+
+      runCurrent()
+
+      assertThat(remoteSettings.sessionEnabled).isFalse()
+      assertThat(remoteSettings.samplingRate).isEqualTo(0.75)
+      assertThat(remoteSettings.sessionRestartTimeout).isEqualTo(40.minutes)
+
+      fetchedResponse.remove("app_quality")
+
+      // Sleep for a second before updating configs
+      Thread.sleep(2000)
+
+      fakeFetcher.responseJSONObject = fetchedResponse
+      remoteSettings.updateSettings()
+
+      runCurrent()
+
+      assertThat(remoteSettings.sessionEnabled).isFalse()
+      assertThat(remoteSettings.samplingRate).isEqualTo(0.75)
+      assertThat(remoteSettings.sessionRestartTimeout).isEqualTo(40.minutes)
+
+      remoteSettings.clearCachedSettings()
+    }
+
+  @Test
+  fun remoteSettings_fetchWhileFetchInProgress() =
+    runTest(UnconfinedTestDispatcher()) {
+      // This test does:
+      // 1. Do a fetch with a fake fetcher that will block for 3 seconds.
+      // 2. While that is happening, do a second fetch.
+      //    - First fetch is still fetching, so second fetch should fall through to the mutex.
+      //    - Second fetch will be blocked until first completes.
+      //    - First fetch returns, should unblock the second fetch.
+      //    - Second fetch should go into mutex, sees cache is valid in "double check," exist early.
+      // 3. After a fetch completes, do a third fetch.
+      //    - First fetch should have have updated the cache.
+      //    - Third fetch should exit even earlier, never having gone into the mutex.
+
+      val firebaseApp = FakeFirebaseApp().firebaseApp
+      val context = firebaseApp.applicationContext
+      val firebaseInstallations = FakeFirebaseInstallations("FaKeFiD")
+      val fakeFetcherWithDelay =
+        FakeRemoteConfigFetcher(
+          JSONObject(VALID_RESPONSE),
+          networkDelay = 3.seconds,
+        )
+
+      fakeFetcherWithDelay.responseJSONObject
+        .getJSONObject("app_quality")
+        .put("sampling_rate", 0.125)
+
+      val remoteSettingsWithDelay =
+        RemoteSettings(
+          TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext,
+          firebaseInstallations,
+          SessionEvents.getApplicationInfo(firebaseApp),
+          configsFetcher = fakeFetcherWithDelay,
+          dataStore =
+            PreferenceDataStoreFactory.create(
+              scope = this,
+              produceFile = { context.preferencesDataStoreFile(SESSION_TEST_CONFIGS_NAME) },
+            ),
+        )
+
+      // Do the first fetch. This one should fetched the configsFetcher.
+      val firstFetch = launch(Dispatchers.Default) { remoteSettingsWithDelay.updateSettings() }
+
+      // Wait a second, and then do the second fetch while first is still running.
+      // This one should block until the first fetch completes, but then exit early.
+      launch(Dispatchers.Default) {
+        delay(1.seconds)
+        remoteSettingsWithDelay.updateSettings()
+      }
+
+      // Wait until the first fetch is done, then do a third fetch.
+      // This one should not even block, and exit early.
+      firstFetch.join()
+      withTimeout(1.seconds) { remoteSettingsWithDelay.updateSettings() }
+
+      // Assert that the configsFetcher was fetched exactly once.
+      assertThat(fakeFetcherWithDelay.timesCalled).isEqualTo(1)
+      assertThat(remoteSettingsWithDelay.samplingRate).isEqualTo(0.125)
+    }
+
+  @Test
+  fun remoteSettingsFetcher_badFetch_callsOnFailure() = runTest {
+    var failure: String? = null
+
+    RemoteSettingsFetcher(
+        TEST_APPLICATION_INFO,
+        TestOnlyExecutors.blocking().asCoroutineDispatcher() + coroutineContext,
+        baseUrl = "this.url.is.invalid",
+      )
+      .doConfigFetch(
+        headerOptions = emptyMap(),
+        onSuccess = {},
+        onFailure = { failure = it },
+      )
+
+    assertThat(failure).isNotNull()
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+
+  private companion object {
+    const val SESSION_TEST_CONFIGS_NAME = "firebase_session_settings_test"
+
+    const val VALID_RESPONSE =
+      """
+      {
+        "settings_version":3,
+        "cache_duration":86400,
+        "features":{
+        },
+        "app":{
+        },
+        "fabric":{
+        },
+        "app_quality":{
+          "sessions_enabled":false,
+          "sampling_rate":0.75,
+          "session_timeout_seconds":2400
+        }
+      }
+      """
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/settings/SessionsSettingsTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/settings/SessionsSettingsTest.kt
new file mode 100644
index 00000000000..f74eac409e5
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/settings/SessionsSettingsTest.kt
@@ -0,0 +1,261 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.settings
+
+import android.os.Bundle
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import androidx.datastore.preferences.preferencesDataStoreFile
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.concurrent.TestOnlyExecutors
+import com.google.firebase.sessions.SessionDataStoreConfigs
+import com.google.firebase.sessions.SessionEvents
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import com.google.firebase.sessions.testing.FakeFirebaseInstallations
+import com.google.firebase.sessions.testing.FakeRemoteConfigFetcher
+import com.google.firebase.sessions.testing.FakeSettingsProvider
+import kotlin.time.Duration.Companion.minutes
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.json.JSONObject
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(RobolectricTestRunner::class)
+class SessionsSettingsTest {
+
+  @Test
+  fun sessionSettings_fetchDefaults() {
+    val sessionsSettings =
+      SessionsSettings(
+        localOverrideSettings = FakeSettingsProvider(),
+        remoteSettings = FakeSettingsProvider(),
+      )
+
+    assertThat(sessionsSettings.sessionsEnabled).isTrue()
+    assertThat(sessionsSettings.samplingRate).isEqualTo(1.0)
+    assertThat(sessionsSettings.sessionRestartTimeout).isEqualTo(30.minutes)
+  }
+
+  @Test
+  fun sessionSettings_fetchOverridingConfigs() {
+    val metadata = Bundle()
+    metadata.putBoolean("firebase_sessions_enabled", false)
+    metadata.putDouble("firebase_sessions_sampling_rate", 0.5)
+    metadata.putInt("firebase_sessions_sessions_restart_timeout", 180)
+    val firebaseApp = FakeFirebaseApp(metadata).firebaseApp
+    val context = firebaseApp.applicationContext
+
+    val sessionsSettings =
+      SessionsSettings(
+        localOverrideSettings = LocalOverrideSettings(context),
+        remoteSettings = FakeSettingsProvider(),
+      )
+
+    assertThat(sessionsSettings.sessionsEnabled).isFalse()
+    assertThat(sessionsSettings.samplingRate).isEqualTo(0.5)
+    assertThat(sessionsSettings.sessionRestartTimeout).isEqualTo(3.minutes)
+  }
+
+  @Test
+  fun sessionSettings_fetchOverridingConfigsOnlyWhenPresent() = runTest {
+    val metadata = Bundle()
+    metadata.putBoolean("firebase_sessions_enabled", false)
+    metadata.putDouble("firebase_sessions_sampling_rate", 0.5)
+    val firebaseApp = FakeFirebaseApp(metadata).firebaseApp
+    val context = firebaseApp.applicationContext
+
+    val sessionsSettings =
+      SessionsSettings(
+        localOverrideSettings = LocalOverrideSettings(context),
+        remoteSettings = FakeSettingsProvider(),
+      )
+
+    runCurrent()
+
+    assertThat(sessionsSettings.sessionsEnabled).isFalse()
+    assertThat(sessionsSettings.samplingRate).isEqualTo(0.5)
+    assertThat(sessionsSettings.sessionRestartTimeout).isEqualTo(30.minutes)
+  }
+
+  @Test
+  fun sessionSettings_remoteSettingsOverrideDefaultsWhenPresent() =
+    runTest(UnconfinedTestDispatcher()) {
+      val firebaseApp = FakeFirebaseApp().firebaseApp
+      val context = firebaseApp.applicationContext
+      val firebaseInstallations = FakeFirebaseInstallations("FaKeFiD")
+      val fakeFetcher = FakeRemoteConfigFetcher(JSONObject(VALID_RESPONSE))
+
+      val remoteSettings =
+        RemoteSettings(
+          TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext,
+          firebaseInstallations,
+          SessionEvents.getApplicationInfo(firebaseApp),
+          fakeFetcher,
+          dataStore =
+            PreferenceDataStoreFactory.create(
+              scope = this,
+              produceFile = { context.preferencesDataStoreFile(SESSION_TEST_CONFIGS_NAME) },
+            ),
+        )
+
+      val sessionsSettings =
+        SessionsSettings(
+          localOverrideSettings = LocalOverrideSettings(context),
+          remoteSettings = remoteSettings,
+        )
+
+      sessionsSettings.updateSettings()
+
+      runCurrent()
+
+      assertThat(sessionsSettings.sessionsEnabled).isFalse()
+      assertThat(sessionsSettings.samplingRate).isEqualTo(0.75)
+      assertThat(sessionsSettings.sessionRestartTimeout).isEqualTo(40.minutes)
+
+      remoteSettings.clearCachedSettings()
+    }
+
+  @Test
+  fun sessionSettings_manifestOverridesRemoteSettingsAndDefaultsWhenPresent() =
+    runTest(UnconfinedTestDispatcher()) {
+      val metadata = Bundle()
+      metadata.putBoolean("firebase_sessions_enabled", true)
+      metadata.putDouble("firebase_sessions_sampling_rate", 0.5)
+      metadata.putInt("firebase_sessions_sessions_restart_timeout", 180)
+      val firebaseApp = FakeFirebaseApp(metadata).firebaseApp
+      val context = firebaseApp.applicationContext
+      val firebaseInstallations = FakeFirebaseInstallations("FaKeFiD")
+      val fakeFetcher = FakeRemoteConfigFetcher(JSONObject(VALID_RESPONSE))
+
+      val remoteSettings =
+        RemoteSettings(
+          TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext,
+          firebaseInstallations,
+          SessionEvents.getApplicationInfo(firebaseApp),
+          fakeFetcher,
+          dataStore =
+            PreferenceDataStoreFactory.create(
+              scope = this,
+              produceFile = { context.preferencesDataStoreFile(SESSION_TEST_CONFIGS_NAME) },
+            ),
+        )
+
+      val sessionsSettings =
+        SessionsSettings(
+          localOverrideSettings = LocalOverrideSettings(context),
+          remoteSettings = remoteSettings,
+        )
+
+      sessionsSettings.updateSettings()
+
+      runCurrent()
+
+      assertThat(sessionsSettings.sessionsEnabled).isTrue()
+      assertThat(sessionsSettings.samplingRate).isEqualTo(0.5)
+      assertThat(sessionsSettings.sessionRestartTimeout).isEqualTo(3.minutes)
+
+      remoteSettings.clearCachedSettings()
+    }
+
+  @Test
+  fun sessionSettings_invalidManifestConfigsDoNotOverride() =
+    runTest(UnconfinedTestDispatcher()) {
+      val metadata = Bundle()
+      metadata.putBoolean("firebase_sessions_enabled", false)
+      metadata.putDouble("firebase_sessions_sampling_rate", -0.2) // Invalid
+      metadata.putInt("firebase_sessions_sessions_restart_timeout", -2) // Invalid
+      val firebaseApp = FakeFirebaseApp(metadata).firebaseApp
+      val context = firebaseApp.applicationContext
+      val firebaseInstallations = FakeFirebaseInstallations("FaKeFiD")
+      val fakeFetcher = FakeRemoteConfigFetcher()
+      val invalidResponse =
+        VALID_RESPONSE.replace(
+          "\"sampling_rate\":0.75,",
+          "\"sampling_rate\":1.2,", // Invalid
+        )
+      fakeFetcher.responseJSONObject = JSONObject(invalidResponse)
+
+      val remoteSettings =
+        RemoteSettings(
+          TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext,
+          firebaseInstallations,
+          SessionEvents.getApplicationInfo(firebaseApp),
+          fakeFetcher,
+          dataStore =
+            PreferenceDataStoreFactory.create(
+              scope = this,
+              produceFile = { context.preferencesDataStoreFile(SESSION_TEST_CONFIGS_NAME) },
+            ),
+        )
+
+      val sessionsSettings =
+        SessionsSettings(
+          localOverrideSettings = LocalOverrideSettings(context),
+          remoteSettings = remoteSettings,
+        )
+
+      sessionsSettings.updateSettings()
+
+      runCurrent()
+
+      assertThat(sessionsSettings.sessionsEnabled).isFalse() // Manifest
+      assertThat(sessionsSettings.samplingRate).isEqualTo(1.0) // SDK default
+      assertThat(sessionsSettings.sessionRestartTimeout).isEqualTo(40.minutes) // Remote
+
+      remoteSettings.clearCachedSettings()
+    }
+
+  @Test
+  fun sessionSettings_dataStorePreferencesNameIsFilenameSafe() {
+    assertThat(SessionDataStoreConfigs.SESSIONS_CONFIG_NAME).matches("^[a-zA-Z0-9_=]+\$")
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+
+  private companion object {
+    const val SESSION_TEST_CONFIGS_NAME = "firebase_session_settings_test"
+
+    const val VALID_RESPONSE =
+      """
+      {
+        "settings_version":3,
+        "cache_duration":86400,
+        "features":{
+        },
+        "app":{
+        },
+        "fabric":{
+        },
+        "app_quality":{
+          "sessions_enabled":false,
+          "sampling_rate":0.75,
+          "session_timeout_seconds":2400
+        }
+      }
+    """
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/settings/SettingsCacheTest.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/settings/SettingsCacheTest.kt
new file mode 100644
index 00000000000..c4d35c86456
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/settings/SettingsCacheTest.kt
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.settings
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.preferencesDataStore
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.sessions.testing.FakeFirebaseApp
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(RobolectricTestRunner::class)
+class SettingsCacheTest {
+  private val Context.dataStore: DataStore<Preferences> by
+    preferencesDataStore(name = SESSION_TEST_CONFIGS_NAME)
+
+  @Test
+  fun sessionCache_returnsEmptyCache() = runTest {
+    val context = FakeFirebaseApp().firebaseApp.applicationContext
+    val settingsCache = SettingsCache(context.dataStore)
+
+    assertThat(settingsCache.sessionSamplingRate()).isNull()
+    assertThat(settingsCache.sessionsEnabled()).isNull()
+    assertThat(settingsCache.sessionRestartTimeout()).isNull()
+    assertThat(settingsCache.hasCacheExpired()).isTrue()
+  }
+
+  @Test
+  fun settingConfigsReturnsCachedValue() = runTest {
+    val context = FakeFirebaseApp().firebaseApp.applicationContext
+    val settingsCache = SettingsCache(context.dataStore)
+
+    settingsCache.updateSettingsEnabled(false)
+    settingsCache.updateSamplingRate(0.25)
+    settingsCache.updateSessionRestartTimeout(600)
+    settingsCache.updateSessionCacheUpdatedTime(System.currentTimeMillis())
+    settingsCache.updateSessionCacheDuration(1000)
+
+    assertThat(settingsCache.sessionsEnabled()).isFalse()
+    assertThat(settingsCache.sessionSamplingRate()).isEqualTo(0.25)
+    assertThat(settingsCache.sessionsEnabled()).isFalse()
+    assertThat(settingsCache.sessionRestartTimeout()).isEqualTo(600)
+    assertThat(settingsCache.hasCacheExpired()).isFalse()
+
+    settingsCache.removeConfigs()
+  }
+
+  @Test
+  fun settingConfigsReturnsPreviouslyStoredValue() = runTest {
+    val context = FakeFirebaseApp().firebaseApp.applicationContext
+    val settingsCache = SettingsCache(context.dataStore)
+
+    settingsCache.updateSettingsEnabled(false)
+    settingsCache.updateSamplingRate(0.25)
+    settingsCache.updateSessionRestartTimeout(600)
+    settingsCache.updateSessionCacheUpdatedTime(System.currentTimeMillis())
+    settingsCache.updateSessionCacheDuration(1000)
+
+    // Create a new instance to imitate a second app launch.
+    val newSettingsCache = SettingsCache(context.dataStore)
+
+    assertThat(newSettingsCache.sessionsEnabled()).isFalse()
+    assertThat(newSettingsCache.sessionSamplingRate()).isEqualTo(0.25)
+    assertThat(newSettingsCache.sessionsEnabled()).isFalse()
+    assertThat(newSettingsCache.sessionRestartTimeout()).isEqualTo(600)
+    assertThat(newSettingsCache.hasCacheExpired()).isFalse()
+
+    settingsCache.removeConfigs()
+    newSettingsCache.removeConfigs()
+  }
+
+  @Test
+  fun settingConfigsReturnsCacheExpiredWithShortCacheDuration() = runTest {
+    val context = FakeFirebaseApp().firebaseApp.applicationContext
+    val settingsCache = SettingsCache(context.dataStore)
+
+    settingsCache.updateSettingsEnabled(false)
+    settingsCache.updateSamplingRate(0.25)
+    settingsCache.updateSessionRestartTimeout(600)
+    settingsCache.updateSessionCacheUpdatedTime(System.currentTimeMillis())
+    settingsCache.updateSessionCacheDuration(0)
+
+    assertThat(settingsCache.sessionSamplingRate()).isEqualTo(0.25)
+    assertThat(settingsCache.sessionsEnabled()).isFalse()
+    assertThat(settingsCache.sessionRestartTimeout()).isEqualTo(600)
+    assertThat(settingsCache.hasCacheExpired()).isTrue()
+
+    settingsCache.removeConfigs()
+  }
+
+  @Test
+  fun settingConfigsReturnsCachedValueWithPartialConfigs() = runTest {
+    val context = FakeFirebaseApp().firebaseApp.applicationContext
+    val settingsCache = SettingsCache(context.dataStore)
+
+    settingsCache.updateSettingsEnabled(false)
+    settingsCache.updateSamplingRate(0.25)
+    settingsCache.updateSessionCacheUpdatedTime(System.currentTimeMillis())
+    settingsCache.updateSessionCacheDuration(1000)
+
+    assertThat(settingsCache.sessionSamplingRate()).isEqualTo(0.25)
+    assertThat(settingsCache.sessionsEnabled()).isFalse()
+    assertThat(settingsCache.sessionRestartTimeout()).isNull()
+    assertThat(settingsCache.hasCacheExpired()).isFalse()
+
+    settingsCache.removeConfigs()
+  }
+
+  @Test
+  fun settingConfigsAllowsUpdateConfigsAndCachesValues() = runTest {
+    val context = FakeFirebaseApp().firebaseApp.applicationContext
+    val settingsCache = SettingsCache(context.dataStore)
+
+    settingsCache.updateSettingsEnabled(false)
+    settingsCache.updateSamplingRate(0.25)
+    settingsCache.updateSessionRestartTimeout(600)
+    settingsCache.updateSessionCacheUpdatedTime(System.currentTimeMillis())
+    settingsCache.updateSessionCacheDuration(1000)
+
+    assertThat(settingsCache.sessionSamplingRate()).isEqualTo(0.25)
+    assertThat(settingsCache.sessionsEnabled()).isFalse()
+    assertThat(settingsCache.sessionRestartTimeout()).isEqualTo(600)
+    assertThat(settingsCache.hasCacheExpired()).isFalse()
+
+    settingsCache.updateSettingsEnabled(true)
+    settingsCache.updateSamplingRate(0.33)
+    settingsCache.updateSessionRestartTimeout(100)
+    settingsCache.updateSessionCacheUpdatedTime(System.currentTimeMillis())
+    settingsCache.updateSessionCacheDuration(0)
+
+    assertThat(settingsCache.sessionSamplingRate()).isEqualTo(0.33)
+    assertThat(settingsCache.sessionsEnabled()).isTrue()
+    assertThat(settingsCache.sessionRestartTimeout()).isEqualTo(100)
+    assertThat(settingsCache.hasCacheExpired()).isTrue()
+
+    settingsCache.removeConfigs()
+  }
+
+  @Test
+  fun settingConfigsCleansCacheForNullValues() = runTest {
+    val context = FakeFirebaseApp().firebaseApp.applicationContext
+    val settingsCache = SettingsCache(context.dataStore)
+
+    settingsCache.updateSettingsEnabled(false)
+    settingsCache.updateSamplingRate(0.25)
+    settingsCache.updateSessionRestartTimeout(600)
+    settingsCache.updateSessionCacheUpdatedTime(System.currentTimeMillis())
+    settingsCache.updateSessionCacheDuration(1000)
+
+    assertThat(settingsCache.sessionSamplingRate()).isEqualTo(0.25)
+    assertThat(settingsCache.sessionsEnabled()).isFalse()
+    assertThat(settingsCache.sessionRestartTimeout()).isEqualTo(600)
+    assertThat(settingsCache.hasCacheExpired()).isFalse()
+
+    settingsCache.updateSettingsEnabled(null)
+    settingsCache.updateSamplingRate(0.33)
+    settingsCache.updateSessionRestartTimeout(null)
+    settingsCache.updateSessionCacheUpdatedTime(System.currentTimeMillis())
+    settingsCache.updateSessionCacheDuration(1000)
+
+    assertThat(settingsCache.sessionSamplingRate()).isEqualTo(0.33)
+    assertThat(settingsCache.sessionsEnabled()).isNull()
+    assertThat(settingsCache.sessionRestartTimeout()).isNull()
+    assertThat(settingsCache.hasCacheExpired()).isFalse()
+
+    settingsCache.removeConfigs()
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+
+  private companion object {
+    const val SESSION_TEST_CONFIGS_NAME = "firebase_test_session_settings"
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeEventGDTLogger.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeEventGDTLogger.kt
new file mode 100644
index 00000000000..d213f4e8a4c
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeEventGDTLogger.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import com.google.firebase.sessions.EventGDTLogger
+import com.google.firebase.sessions.EventGDTLoggerInterface
+import com.google.firebase.sessions.SessionEvent
+
+/**
+ * The [FakeEventGDTLogger] is for mocking [EventGDTLogger].
+ *
+ * @hide
+ */
+internal class FakeEventGDTLogger : EventGDTLoggerInterface {
+
+  // Lets tests assert the right event was logged.
+  var loggedEvent: SessionEvent? = null
+
+  override fun log(sessionEvent: SessionEvent) {
+    loggedEvent = sessionEvent
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeFirebaseApp.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeFirebaseApp.kt
new file mode 100644
index 00000000000..eea9114b3b8
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeFirebaseApp.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import android.app.ActivityManager
+import android.content.Context
+import android.os.Bundle
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.core.content.pm.PackageInfoBuilder
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.initialize
+import org.robolectric.Shadows
+import org.robolectric.shadow.api.Shadow
+import org.robolectric.shadows.ShadowActivityManager
+
+internal class FakeFirebaseApp(metadata: Bundle? = null) {
+  val firebaseApp: FirebaseApp
+
+  init {
+    val context: Context = ApplicationProvider.getApplicationContext()
+    context.applicationInfo.uid = 313
+
+    val shadowPackageManager = Shadows.shadowOf(context.packageManager)
+    val packageInfo = PackageInfoBuilder.newBuilder().setPackageName(context.packageName).build()
+    packageInfo.versionName = MOCK_APP_VERSION
+
+    metadata?.let { packageInfo.applicationInfo.metaData = it }
+    shadowPackageManager.installPackage(packageInfo)
+
+    val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+    val shadowActivityManager: ShadowActivityManager = Shadow.extract(activityManager)
+    val runningAppProcessInfo = ActivityManager.RunningAppProcessInfo()
+    runningAppProcessInfo.pid = 0
+    runningAppProcessInfo.uid = 313
+    runningAppProcessInfo.processName = context.packageName
+    runningAppProcessInfo.importance = 100
+    shadowActivityManager.setProcesses(listOf(runningAppProcessInfo))
+
+    firebaseApp =
+      Firebase.initialize(
+        context,
+        FirebaseOptions.Builder()
+          .setApplicationId(MOCK_APP_ID)
+          .setApiKey(MOCK_API_KEY)
+          .setProjectId(MOCK_PROJECT_ID)
+          .build()
+      )
+  }
+
+  companion object {
+    internal const val MOCK_PROJECT_ID = "project"
+    internal const val MOCK_APP_ID = "1:12345:android:app"
+    internal const val MOCK_API_KEY = "RANDOM_APIKEY_FOR_TESTING"
+    internal const val MOCK_APP_VERSION = "1.0.0"
+    internal const val MOCK_APP_BUILD_VERSION = "0"
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeFirebaseInstallations.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeFirebaseInstallations.kt
new file mode 100644
index 00000000000..9b46eeaea63
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeFirebaseInstallations.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import com.google.android.gms.tasks.Task
+import com.google.android.gms.tasks.Tasks
+import com.google.firebase.installations.FirebaseInstallationsApi
+import com.google.firebase.installations.InstallationTokenResult
+import com.google.firebase.installations.internal.FidListener
+import com.google.firebase.installations.internal.FidListenerHandle
+
+/**
+ * Fake [FirebaseInstallationsApi] that implements always returns the given [fid] and [authToken].
+ */
+internal class FakeFirebaseInstallations(
+  private val fid: String? = "",
+  private val authToken: String? = "",
+) : FirebaseInstallationsApi {
+  override fun getId(): Task<String> = Tasks.forResult(fid)
+
+  override fun getToken(forceRefresh: Boolean): Task<InstallationTokenResult> =
+    Tasks.forResult(
+      authToken?.let {
+        InstallationTokenResult.builder()
+          .setToken(it)
+          .setTokenCreationTimestamp(0)
+          .setTokenExpirationTimestamp(0)
+          .build()
+      }
+    )
+
+  override fun delete(): Task<Void> = throw NotImplementedError("delete not faked.")
+
+  override fun registerFidListener(listener: FidListener): FidListenerHandle =
+    throw NotImplementedError("registerFidListener not faked.")
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeFirelogPublisher.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeFirelogPublisher.kt
new file mode 100644
index 00000000000..2975447bbaa
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeFirelogPublisher.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import com.google.firebase.sessions.SessionDetails
+import com.google.firebase.sessions.SessionFirelogPublisher
+
+/**
+ * Fake implementation of [SessionFirelogPublisher] that allows for inspecting the session details
+ * that were sent to it.
+ */
+internal class FakeFirelogPublisher : SessionFirelogPublisher {
+
+  /** All the sessions that were uploaded via this fake [SessionFirelogPublisher] */
+  val loggedSessions = ArrayList<SessionDetails>()
+
+  override fun logSession(sessionDetails: SessionDetails) {
+    loggedSessions.add(sessionDetails)
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeProvider.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeProvider.kt
new file mode 100644
index 00000000000..4e834eff8d0
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeProvider.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import com.google.firebase.inject.Provider
+
+class FakeProvider<T>(private val instance: T) : Provider<T> {
+  override fun get(): T {
+    return instance
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeRemoteConfigFetcher.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeRemoteConfigFetcher.kt
new file mode 100644
index 00000000000..9f72a451f45
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeRemoteConfigFetcher.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import com.google.firebase.sessions.settings.CrashlyticsSettingsFetcher
+import kotlin.time.Duration
+import org.json.JSONObject
+
+/**
+ * Fake [CrashlyticsSettingsFetcher] that, when fetched, will produce given [responseJSONObject]
+ * after simulating a [networkDelay], while keeping count of calls to [doConfigFetch].
+ */
+internal class FakeRemoteConfigFetcher(
+  var responseJSONObject: JSONObject = JSONObject(),
+  private val networkDelay: Duration = Duration.ZERO,
+) : CrashlyticsSettingsFetcher {
+  /** The number of times [doConfigFetch] was called on this instance. */
+  var timesCalled: Int = 0
+    private set
+
+  override suspend fun doConfigFetch(
+    headerOptions: Map<String, String>,
+    onSuccess: suspend (JSONObject) -> Unit,
+    onFailure: suspend (String) -> Unit,
+  ) {
+    timesCalled++
+    if (networkDelay.isPositive()) {
+      @Suppress("BlockingMethodInNonBlockingContext") // Using sleep, not delay, for runTest.
+      Thread.sleep(networkDelay.inWholeMilliseconds)
+    }
+    onSuccess(responseJSONObject)
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeSessionDatastore.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeSessionDatastore.kt
new file mode 100644
index 00000000000..f98852032c8
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeSessionDatastore.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import com.google.firebase.sessions.SessionDatastore
+
+/**
+ * Fake implementaiton of the [SessionDatastore] that allows for inspecting and modifying the
+ * currently stored values in unit tests.
+ */
+internal class FakeSessionDatastore : SessionDatastore {
+
+  /** The currently stored value */
+  private var currentSessionId: String? = null
+
+  override fun updateSessionId(sessionId: String) {
+    currentSessionId = sessionId
+  }
+
+  override fun getCurrentSessionId() = currentSessionId
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeSessionLifecycleServiceBinder.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeSessionLifecycleServiceBinder.kt
new file mode 100644
index 00000000000..0d4e58e2014
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeSessionLifecycleServiceBinder.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import android.content.ComponentName
+import android.content.ServiceConnection
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import android.os.Messenger
+import com.google.firebase.sessions.SessionLifecycleService
+import com.google.firebase.sessions.SessionLifecycleServiceBinder
+import java.util.concurrent.LinkedBlockingQueue
+import org.robolectric.Shadows.shadowOf
+
+/**
+ * Fake implementation of the [SessionLifecycleServiceBinder] that allows for inspecting the
+ * callbacks and received messages of the service in unit tests.
+ */
+internal class FakeSessionLifecycleServiceBinder : SessionLifecycleServiceBinder {
+
+  val clientCallbacks = mutableListOf<Messenger>()
+  val connectionCallbacks = mutableListOf<ServiceConnection>()
+  val receivedMessageCodes = LinkedBlockingQueue<Int>()
+  var service = Messenger(FakeServiceHandler())
+
+  internal inner class FakeServiceHandler() : Handler(Looper.getMainLooper()) {
+    override fun handleMessage(msg: Message) {
+      receivedMessageCodes.add(msg.what)
+    }
+  }
+
+  override fun bindToService(callback: Messenger, serviceConnection: ServiceConnection) {
+    clientCallbacks.add(callback)
+    connectionCallbacks.add(serviceConnection)
+  }
+
+  fun serviceConnected() {
+    connectionCallbacks.forEach { it.onServiceConnected(componentName, service.getBinder()) }
+  }
+
+  fun serviceDisconnected() {
+    connectionCallbacks.forEach { it.onServiceDisconnected(componentName) }
+  }
+
+  fun broadcastSession(sessionId: String) {
+    clientCallbacks.forEach { client ->
+      val msgData =
+        Bundle().also { it.putString(SessionLifecycleService.SESSION_UPDATE_EXTRA, sessionId) }
+      client.send(
+        Message.obtain(null, SessionLifecycleService.SESSION_UPDATED, 0, 0).also {
+          it.data = msgData
+        }
+      )
+    }
+  }
+
+  fun waitForAllMessages() {
+    shadowOf(Looper.getMainLooper()).idle()
+  }
+
+  fun clearForTest() {
+    clientCallbacks.clear()
+    connectionCallbacks.clear()
+    receivedMessageCodes.clear()
+    service = Messenger(FakeServiceHandler())
+  }
+
+  companion object {
+    val componentName =
+      ComponentName("com.google.firebase.sessions.testing", "FakeSessionLifecycleServiceBinder")
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeSessionSubscriber.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeSessionSubscriber.kt
new file mode 100644
index 00000000000..e95059b8691
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeSessionSubscriber.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import com.google.firebase.sessions.api.SessionSubscriber
+import com.google.firebase.sessions.api.SessionSubscriber.Name.CRASHLYTICS
+
+/** Fake [SessionSubscriber] that can set [isDataCollectionEnabled] and [sessionSubscriberName]. */
+internal class FakeSessionSubscriber(
+  override val isDataCollectionEnabled: Boolean = true,
+  override val sessionSubscriberName: SessionSubscriber.Name = CRASHLYTICS,
+) : SessionSubscriber {
+
+  val sessionChangedEvents = mutableListOf<SessionSubscriber.SessionDetails>()
+
+  override fun onSessionChanged(sessionDetails: SessionSubscriber.SessionDetails) {
+    sessionChangedEvents.add(sessionDetails)
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeSettingsProvider.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeSettingsProvider.kt
new file mode 100644
index 00000000000..56dbb8f8685
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeSettingsProvider.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import com.google.firebase.sessions.settings.SettingsProvider
+import kotlin.time.Duration
+
+/** Fake [SettingsProvider] that can set the settings fields. */
+internal class FakeSettingsProvider(
+  override val sessionEnabled: Boolean? = null,
+  override val sessionRestartTimeout: Duration? = null,
+  override val samplingRate: Double? = null,
+) : SettingsProvider
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeTimeProvider.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeTimeProvider.kt
new file mode 100644
index 00000000000..35010de415a
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeTimeProvider.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import com.google.firebase.sessions.TimeProvider
+import com.google.firebase.sessions.testing.TestSessionEventData.TEST_SESSION_TIMESTAMP_US
+import kotlin.time.Duration
+import kotlin.time.DurationUnit
+
+/**
+ * Fake [TimeProvider] that allows programmatically elapsing time forward.
+ *
+ * Default [elapsedRealtime] is [Duration.ZERO] until the time is moved using [addInterval].
+ */
+class FakeTimeProvider(private val initialTimeUs: Long = TEST_SESSION_TIMESTAMP_US) : TimeProvider {
+  private var elapsed = Duration.ZERO
+
+  fun addInterval(interval: Duration) {
+    if (interval.isNegative()) {
+      throw IllegalArgumentException("Cannot add a negative duration to elapsed time.")
+    }
+    elapsed += interval
+  }
+
+  override fun elapsedRealtime(): Duration = elapsed
+
+  override fun currentTimeUs(): Long = initialTimeUs + elapsed.toLong(DurationUnit.MICROSECONDS)
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeTransportFactory.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeTransportFactory.kt
new file mode 100644
index 00000000000..da1d273a33f
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeTransportFactory.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import com.google.android.datatransport.*
+import com.google.firebase.sessions.SessionEvent
+
+/** Fake [Transport] that implements [send]. */
+internal class FakeTransport<T>() : Transport<T> {
+
+  var sentEvent: Event<T>? = null
+
+  override fun send(event: Event<T>?) {
+    this.sentEvent = event
+  }
+
+  override fun schedule(p0: Event<T>?, p1: TransportScheduleCallback?) {
+    return
+  }
+}
+
+/** Fake [TransportFactory] that implements [getTransport]. */
+internal class FakeTransportFactory() : TransportFactory {
+
+  var name: String? = null
+  var payloadEncoding: Encoding? = null
+  var fakeTransport: FakeTransport<SessionEvent>? = null
+
+  override fun <T> getTransport(
+    name: String?,
+    payloadType: java.lang.Class<T>?,
+    payloadEncoding: Encoding?,
+    payloadTransformer: Transformer<T, ByteArray?>?
+  ): Transport<T>? {
+    this.name = name
+    this.payloadEncoding = payloadEncoding
+    val fakeTransport = FakeTransport<T>()
+    @Suppress("UNCHECKED_CAST")
+    this.fakeTransport = fakeTransport as FakeTransport<SessionEvent>
+    return fakeTransport
+  }
+
+  @Deprecated("This is deprecated in the API. Don't use or expect on this function.")
+  override fun <T> getTransport(
+    name: String?,
+    payloadType: java.lang.Class<T>?,
+    payloadTransformer: Transformer<T, ByteArray?>?
+  ): Transport<T>? {
+    return null
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FirebaseSessionsFakeRegistrar.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FirebaseSessionsFakeRegistrar.kt
new file mode 100644
index 00000000000..9755a5e12d0
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FirebaseSessionsFakeRegistrar.kt
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import androidx.annotation.Keep
+import com.google.android.datatransport.TransportFactory
+import com.google.firebase.FirebaseApp
+import com.google.firebase.annotations.concurrent.Background
+import com.google.firebase.annotations.concurrent.Blocking
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.components.Dependency
+import com.google.firebase.components.Qualified.qualified
+import com.google.firebase.components.Qualified.unqualified
+import com.google.firebase.installations.FirebaseInstallationsApi
+import com.google.firebase.platforminfo.LibraryVersionComponent
+import com.google.firebase.sessions.BuildConfig
+import com.google.firebase.sessions.FirebaseSessions
+import com.google.firebase.sessions.SessionDatastore
+import com.google.firebase.sessions.SessionFirelogPublisher
+import com.google.firebase.sessions.SessionGenerator
+import com.google.firebase.sessions.SessionLifecycleServiceBinder
+import com.google.firebase.sessions.WallClock
+import com.google.firebase.sessions.settings.SessionsSettings
+import kotlinx.coroutines.CoroutineDispatcher
+
+/**
+ * [ComponentRegistrar] for setting up Fake components for [FirebaseSessions] and its internal
+ * dependencies for unit tests.
+ *
+ * @hide
+ */
+@Keep
+internal class FirebaseSessionsFakeRegistrar : ComponentRegistrar {
+  override fun getComponents() =
+    listOf(
+      Component.builder(SessionGenerator::class.java)
+        .name("session-generator")
+        .factory { SessionGenerator(timeProvider = WallClock) }
+        .build(),
+      Component.builder(FakeFirelogPublisher::class.java)
+        .name("fake-session-publisher")
+        .factory { FakeFirelogPublisher() }
+        .build(),
+      Component.builder(SessionFirelogPublisher::class.java)
+        .name("session-publisher")
+        .add(Dependency.required(fakeFirelogPublisher))
+        .factory { container -> container.get(fakeFirelogPublisher) }
+        .build(),
+      Component.builder(SessionsSettings::class.java)
+        .name("sessions-settings")
+        .add(Dependency.required(firebaseApp))
+        .add(Dependency.required(blockingDispatcher))
+        .add(Dependency.required(backgroundDispatcher))
+        .factory { container ->
+          SessionsSettings(
+            container.get(firebaseApp),
+            container.get(blockingDispatcher),
+            container.get(backgroundDispatcher),
+            fakeFirebaseInstallations,
+          )
+        }
+        .build(),
+      Component.builder(FakeSessionDatastore::class.java)
+        .name("fake-sessions-datastore")
+        .factory { FakeSessionDatastore() }
+        .build(),
+      Component.builder(SessionDatastore::class.java)
+        .name("sessions-datastore")
+        .add(Dependency.required(fakeDatastore))
+        .factory { container -> container.get(fakeDatastore) }
+        .build(),
+      Component.builder(FakeSessionLifecycleServiceBinder::class.java)
+        .name("fake-sessions-service-binder")
+        .factory { FakeSessionLifecycleServiceBinder() }
+        .build(),
+      Component.builder(SessionLifecycleServiceBinder::class.java)
+        .name("sessions-service-binder")
+        .add(Dependency.required(fakeServiceBinder))
+        .factory { container -> container.get(fakeServiceBinder) }
+        .build(),
+      LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME),
+    )
+
+  private companion object {
+    private const val LIBRARY_NAME = "fire-sessions"
+
+    private val firebaseApp = unqualified(FirebaseApp::class.java)
+    private val firebaseInstallationsApi = unqualified(FirebaseInstallationsApi::class.java)
+    private val backgroundDispatcher =
+      qualified(Background::class.java, CoroutineDispatcher::class.java)
+    private val blockingDispatcher =
+      qualified(Blocking::class.java, CoroutineDispatcher::class.java)
+    private val transportFactory = unqualified(TransportFactory::class.java)
+    private val fakeFirelogPublisher = unqualified(FakeFirelogPublisher::class.java)
+    private val fakeDatastore = unqualified(FakeSessionDatastore::class.java)
+    private val fakeServiceBinder = unqualified(FakeSessionLifecycleServiceBinder::class.java)
+    private val sessionGenerator = unqualified(SessionGenerator::class.java)
+    private val sessionsSettings = unqualified(SessionsSettings::class.java)
+
+    private val fakeFirebaseInstallations = FakeFirebaseInstallations("FaKeFiD")
+  }
+}
diff --git a/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/TestSessionEventData.kt b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/TestSessionEventData.kt
new file mode 100644
index 00000000000..7619bc12588
--- /dev/null
+++ b/firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/TestSessionEventData.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.sessions.testing
+
+import android.content.Context
+import android.os.Build
+import androidx.test.core.app.ApplicationProvider
+import com.google.firebase.sessions.AndroidApplicationInfo
+import com.google.firebase.sessions.ApplicationInfo
+import com.google.firebase.sessions.BuildConfig
+import com.google.firebase.sessions.DataCollectionState
+import com.google.firebase.sessions.DataCollectionStatus
+import com.google.firebase.sessions.EventType
+import com.google.firebase.sessions.LogEnvironment
+import com.google.firebase.sessions.ProcessDetails
+import com.google.firebase.sessions.SessionDetails
+import com.google.firebase.sessions.SessionEvent
+import com.google.firebase.sessions.SessionInfo
+
+internal object TestSessionEventData {
+  const val TEST_SESSION_TIMESTAMP_US: Long = 12340000
+
+  val TEST_SESSION_DETAILS =
+    SessionDetails(
+      sessionId = "a1b2c3",
+      firstSessionId = "a1a1a1",
+      sessionIndex = 3,
+      sessionStartTimestampUs = TEST_SESSION_TIMESTAMP_US
+    )
+
+  val TEST_DATA_COLLECTION_STATUS =
+    DataCollectionStatus(
+      performance = DataCollectionState.COLLECTION_SDK_NOT_INSTALLED,
+      crashlytics = DataCollectionState.COLLECTION_SDK_NOT_INSTALLED,
+      sessionSamplingRate = 1.0
+    )
+
+  val TEST_SESSION_DATA =
+    SessionInfo(
+      sessionId = "a1b2c3",
+      firstSessionId = "a1a1a1",
+      sessionIndex = 3,
+      eventTimestampUs = TEST_SESSION_TIMESTAMP_US,
+      dataCollectionStatus = TEST_DATA_COLLECTION_STATUS,
+      firebaseInstallationId = "",
+      firebaseAuthenticationToken = "",
+    )
+
+  val TEST_PROCESS_DETAILS =
+    ProcessDetails(
+      processName = "com.google.firebase.sessions.test",
+      0,
+      100,
+      false,
+    )
+
+  val TEST_APP_PROCESS_DETAILS = listOf(TEST_PROCESS_DETAILS)
+
+  val TEST_APPLICATION_INFO =
+    ApplicationInfo(
+      appId = FakeFirebaseApp.MOCK_APP_ID,
+      deviceModel = Build.MODEL,
+      sessionSdkVersion = BuildConfig.VERSION_NAME,
+      osVersion = Build.VERSION.RELEASE,
+      logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
+      AndroidApplicationInfo(
+        packageName = ApplicationProvider.getApplicationContext<Context>().packageName,
+        versionName = FakeFirebaseApp.MOCK_APP_VERSION,
+        appBuildVersion = FakeFirebaseApp.MOCK_APP_BUILD_VERSION,
+        deviceManufacturer = Build.MANUFACTURER,
+        currentProcessDetails = TEST_PROCESS_DETAILS,
+        appProcessDetails = TEST_APP_PROCESS_DETAILS,
+      ),
+    )
+
+  val TEST_SESSION_EVENT =
+    SessionEvent(
+      eventType = EventType.SESSION_START,
+      sessionData = TEST_SESSION_DATA,
+      applicationInfo = TEST_APPLICATION_INFO,
+    )
+}
diff --git a/firebase-sessions/test-app/.gitignore b/firebase-sessions/test-app/.gitignore
new file mode 100644
index 00000000000..4ed65ee3787
--- /dev/null
+++ b/firebase-sessions/test-app/.gitignore
@@ -0,0 +1 @@
+**/google-services.json
diff --git a/firebase-sessions/test-app/README.md b/firebase-sessions/test-app/README.md
new file mode 100644
index 00000000000..820fed1d7b9
--- /dev/null
+++ b/firebase-sessions/test-app/README.md
@@ -0,0 +1,17 @@
+# Firebase Sessions Test App
+
+## Setup
+
+Download the `google-services.json` file
+from [Firebase Console](https://console.firebase.google.com/) (for whatever Firebase project you
+have or want to integrate the `test-app`) and store it under the current directory.
+
+Note: The [Package name](https://firebase.google.com/docs/android/setup#register-app) for your app
+created on the Firebase Console (for which the `google-services.json` is downloaded) must match
+the [applicationId](https://developer.android.com/studio/build/application-id.html) declared in
+the `test-app/test-app.gradle.kts` for the app to link to Firebase.
+
+## Running
+
+Run the test app directly from Android Studio by selecting and running
+the `firebase-sessions.test-app` run configuration.
diff --git a/firebase-sessions/test-app/multidex-config.pro b/firebase-sessions/test-app/multidex-config.pro
new file mode 100644
index 00000000000..61f1dfa8c4f
--- /dev/null
+++ b/firebase-sessions/test-app/multidex-config.pro
@@ -0,0 +1 @@
+-keep class com.google.firebase.** { *; }
diff --git a/firebase-sessions/test-app/src/androidTest/AndroidManifest.xml b/firebase-sessions/test-app/src/androidTest/AndroidManifest.xml
new file mode 100644
index 00000000000..e417fdf07de
--- /dev/null
+++ b/firebase-sessions/test-app/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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"
+  android:versionCode="1"
+  android:versionName="1.0.0">
+
+  <application>
+
+  </application>
+
+  <uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator" />
+
+</manifest>
diff --git a/firebase-sessions/test-app/src/androidTest/kotlin/com/google/firebase/testing/sessions/FirebaseSessionsIntegrationTest.kt b/firebase-sessions/test-app/src/androidTest/kotlin/com/google/firebase/testing/sessions/FirebaseSessionsIntegrationTest.kt
new file mode 100644
index 00000000000..3e4490e1f41
--- /dev/null
+++ b/firebase-sessions/test-app/src/androidTest/kotlin/com/google/firebase/testing/sessions/FirebaseSessionsIntegrationTest.kt
@@ -0,0 +1,237 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.testing.sessions
+
+import android.content.Context
+import android.content.Intent
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.By
+import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiObject2
+import androidx.test.uiautomator.Until
+import com.google.common.truth.Truth.assertThat
+import java.util.regex.Pattern
+import org.junit.After
+import org.junit.Assert.fail
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class FirebaseSessionsIntegrationTest {
+
+  private lateinit var device: UiDevice
+
+  @Before
+  fun setup() {
+    // Initialize UiDevice instance
+    device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+  }
+
+  @After
+  fun cleanup() {
+    // Make sure all processes are killed
+    Runtime.getRuntime().exec(arrayOf("am", "force-stop", TEST_APP_PACKAGE))
+  }
+
+  @Test
+  fun sameSessionIdBetweenActivitiesOnDifferentProcesses() {
+    launchApp()
+
+    val sessionId1 = getCurrentSessionId()
+    navigateToSecondActivity()
+    Thread.sleep(TIME_TO_PROPAGATE_SESSION)
+    val sessionId2 = getCurrentSessionId()
+
+    assertThat(sessionId1).isEqualTo(sessionId2)
+  }
+
+  @Test
+  fun sameSessionIdAfterQuickForegroundBackground() {
+    launchApp()
+
+    val sessionId1 = getCurrentSessionId()
+    background()
+    foreground()
+    val sessionId2 = getCurrentSessionId()
+
+    assertThat(sessionId1).isEqualTo(sessionId2)
+  }
+
+  @Test
+  fun newSessionIdAfterLongBackground() {
+    launchApp()
+
+    val sessionId1 = getCurrentSessionId()
+    background()
+    // Test app overrides the background time from 30m, to 5s.
+    Thread.sleep(6_000)
+    foreground()
+    device.waitForIdle()
+    Thread.sleep(TIME_TO_PROPAGATE_SESSION)
+    val sessionId2 = getCurrentSessionId()
+
+    assertThat(sessionId1).isNotEqualTo(sessionId2)
+  }
+
+  @Test
+  fun newSessionFollowingCrash() {
+    if (!BuildConfig.SHOULD_CRASH_APP) return
+
+    launchApp()
+    val origSession = getCurrentSessionId()
+    getButton("CRASH!").click()
+    dismissPossibleErrorDialog()
+
+    launchApp()
+
+    Thread.sleep(TIME_TO_PROPAGATE_SESSION)
+    val newSession = getCurrentSessionId()
+    assertThat(newSession).isNotEqualTo(origSession)
+  }
+
+  @Test
+  fun nonFatalMainActivity() {
+    launchApp()
+    val origSession = getCurrentSessionId()
+
+    getButton("NON FATAL").click()
+    device.waitForIdle()
+
+    Thread.sleep(TIME_TO_PROPAGATE_SESSION)
+    val newSession = getCurrentSessionId()
+    assertThat(origSession).isEqualTo(newSession)
+  }
+
+  @Test
+  fun anrMainActivity() {
+    if (!BuildConfig.SHOULD_CRASH_APP) return
+    launchApp()
+    val origSession = getCurrentSessionId()
+
+    getButton("ANR").click()
+    device.waitForIdle()
+    dismissPossibleAnrDialog()
+
+    launchApp()
+
+    Thread.sleep(TIME_TO_PROPAGATE_SESSION)
+    val newSession = getCurrentSessionId()
+    assertThat(origSession).isNotEqualTo(newSession)
+  }
+
+  @Test
+  fun crashSecondaryProcess() {
+    if (!BuildConfig.SHOULD_CRASH_APP) return
+    launchApp()
+    navigateToSecondActivity()
+    val origSession = getCurrentSessionId()
+
+    getButton("CRASH!").click()
+    dismissPossibleErrorDialog()
+
+    launchApp()
+
+    Thread.sleep(TIME_TO_PROPAGATE_SESSION)
+    val newSession = getCurrentSessionId()
+    assertThat(newSession).isNotEqualTo(origSession)
+  }
+
+  private fun launchApp() {
+    // Start from the home screen
+    device.pressHome()
+
+    // Wait for launcher
+    device.wait(Until.hasObject(By.pkg(device.launcherPackageName).depth(0)), LAUNCH_TIMEOUT)
+
+    // Launch the app
+    val context = ApplicationProvider.getApplicationContext<Context>()
+    val intent =
+      context.packageManager.getLaunchIntentForPackage(TEST_APP_PACKAGE)?.apply {
+        // Clear out any previous instances
+        addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+      }
+    context.startActivity(intent)
+
+    // Wait for the app to appear
+    device.wait(Until.hasObject(By.pkg(TEST_APP_PACKAGE).depth(0)), LAUNCH_TIMEOUT)
+    device.waitForIdle()
+  }
+
+  private fun navigateToSecondActivity() {
+    device.wait(Until.hasObject(By.text("NEXT ACTIVITY").depth(0)), TRANSITION_TIMEOUT)
+    val nextActivityButton =
+      device.findObject(By.text("NEXT ACTIVITY").clazz("android.widget.Button"))
+    nextActivityButton?.click()
+    device.wait(Until.hasObject(By.pkg(TEST_APP_PACKAGE).depth(0)), TRANSITION_TIMEOUT)
+  }
+
+  private fun getButton(text: String): UiObject2 {
+    device.wait(Until.hasObject(By.text(text).depth(0)), TRANSITION_TIMEOUT)
+    val button = device.findObject(By.text(text).clazz("android.widget.Button"))
+    if (button == null) {
+      fail("Could not locate button with text $text")
+    }
+    return button
+  }
+
+  private fun dismissPossibleAnrDialog() {
+    device.wait(
+      Until.hasObject(By.clazz("com.android.server.am.AppNotRespondingDialog")),
+      TRANSITION_TIMEOUT
+    )
+    device.findObject(By.text("Close app").clazz("android.widget.Button"))?.click()
+  }
+
+  private fun dismissPossibleErrorDialog() {
+    device.wait(
+      Until.hasObject(By.clazz("com.android.server.am.AppErrorDialog")),
+      TRANSITION_TIMEOUT
+    )
+    device.findObject(By.text("Close app").clazz("android.widget.Button"))?.click()
+  }
+
+  private fun background() {
+    device.pressHome()
+    device.wait(Until.hasObject(By.pkg(device.launcherPackageName).depth(0)), TRANSITION_TIMEOUT)
+  }
+
+  private fun foreground() {
+    device.pressRecentApps()
+    Thread.sleep(1_000L)
+    device.click(device.displayWidth / 2, device.displayHeight / 2)
+    device.wait(Until.hasObject(By.pkg(TEST_APP_PACKAGE).depth(0)), TRANSITION_TIMEOUT)
+    device.waitForIdle()
+  }
+
+  private fun getCurrentSessionId(): String? {
+    device.wait(
+      Until.hasObject(By.res(Pattern.compile(".*session_id_(fragment|second)_text")).depth(0)),
+      TRANSITION_TIMEOUT
+    )
+    return device.findObject(By.res(Pattern.compile(".*session_id_(fragment|second)_text")))?.text
+  }
+
+  companion object {
+    private const val TEST_APP_PACKAGE = "com.google.firebase.testing.sessions"
+    private const val LAUNCH_TIMEOUT = 5_000L
+    private const val TRANSITION_TIMEOUT = 1_000L
+    private const val TIME_TO_PROPAGATE_SESSION = 5_000L
+  }
+}
diff --git a/firebase-sessions/test-app/src/main/AndroidManifest.xml b/firebase-sessions/test-app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..11c21bdf24d
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/AndroidManifest.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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">
+
+  <application
+    android:icon="@mipmap/ic_launcher"
+    android:label="@string/app_name"
+    android:name=".TestApplication"
+    android:supportsRtl="true"
+    android:theme="@style/Theme.Widget_test_app"
+    tools:targetApi="31">
+    <meta-data
+      android:name="firebase_performance_logcat_enabled"
+      android:value="true" />
+    <!-- Override the background timeout for the test app to be 5s instead of 30m -->
+    <meta-data
+      android:name="firebase_sessions_sessions_restart_timeout"
+      android:value="5" />
+    <activity
+      android:exported="true"
+      android:label="@string/app_name"
+      android:name=".MainActivity"
+      android:process=":main"
+      android:theme="@style/Theme.Widget_test_app.NoActionBar">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+
+    <activity
+      android:exported="true"
+      android:label="@string/app_name"
+      android:name=".SecondActivity"
+      android:process=":second"
+      android:theme="@style/Theme.Widget_test_app.NoActionBar" />
+
+    <receiver
+      android:exported="false"
+      android:name="CrashWidgetProvider"
+      android:process=":widgetProcess">
+      <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+      </intent-filter>
+      <meta-data
+        android:name="android.appwidget.provider"
+        android:resource="@xml/homescreen_widget" />
+    </receiver>
+
+    <receiver android:name=".CrashBroadcastReceiver" />
+
+    <service
+      android:enabled="true"
+      android:exported="false"
+      android:name=".ForegroundService"
+      android:process=":foregroundServiceProcess" />
+
+  </application>
+
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+  <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+</manifest>
diff --git a/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/BaseActivity.kt b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/BaseActivity.kt
new file mode 100644
index 00000000000..8c2670696aa
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/BaseActivity.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.testing.sessions
+
+import android.app.ActivityManager
+import android.app.ActivityManager.RunningAppProcessInfo
+import android.app.Application
+import android.os.Build
+import android.os.Bundle
+import android.util.Log
+import androidx.appcompat.app.AppCompatActivity
+import com.google.firebase.FirebaseApp
+
+open class BaseActivity : AppCompatActivity() {
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    FirebaseApp.initializeApp(this)
+    Log.i(TAG, "onCreate - ${getProcessName()} - ${getImportance()}")
+  }
+
+  override fun onPause() {
+    super.onPause()
+    Log.i(TAG, "onPause - ${getProcessName()} - ${getImportance()}")
+  }
+
+  override fun onStop() {
+    super.onStop()
+    Log.i(TAG, "onStop - ${getProcessName()} - ${getImportance()}")
+  }
+
+  override fun onResume() {
+    super.onResume()
+    Log.i(TAG, "onResume - ${getProcessName()} - ${getImportance()}")
+  }
+
+  override fun onStart() {
+    super.onStart()
+    Log.i(TAG, "onStart - ${getProcessName()} - ${getImportance()}")
+  }
+
+  override fun onDestroy() {
+    super.onDestroy()
+    Log.i(TAG, "onDestroy - ${getProcessName()} - ${getImportance()}")
+  }
+
+  private fun getImportance(): Int {
+    val processInfo = RunningAppProcessInfo()
+    ActivityManager.getMyMemoryState(processInfo)
+    return processInfo.importance
+  }
+
+  private fun getProcessName(): String =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) Application.getProcessName() else "unknown"
+
+  companion object {
+    val TAG = "BaseActivity"
+  }
+}
diff --git a/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/CrashBroadcastReceiver.kt b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/CrashBroadcastReceiver.kt
new file mode 100644
index 00000000000..89d2f03f1ce
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/CrashBroadcastReceiver.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.testing.sessions
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import android.widget.Toast
+
+class CrashBroadcastReceiver : BroadcastReceiver() {
+
+  override fun onReceive(context: Context, intent: Intent) {
+    Log.i(TAG, "Received intent: $intent")
+    when (intent.action) {
+      CRASH_ACTION -> crash(context)
+      TOAST_ACTION -> toast(context)
+    }
+  }
+
+  fun crash(context: Context) {
+    Toast.makeText(context, "KABOOM!", Toast.LENGTH_LONG).show()
+    throw RuntimeException("CRASH_BROADCAST")
+  }
+
+  fun toast(context: Context) {
+    Toast.makeText(context, "Cheers!", Toast.LENGTH_LONG).show()
+  }
+
+  companion object {
+    val TAG = "CrashBroadcastReceiver"
+    val CRASH_ACTION = "com.google.firebase.testing.sessions.CrashBroadcastReceiver.CRASH_ACTION"
+    val TOAST_ACTION = "com.google.firebase.testing.sessions.CrashBroadcastReceiver.TOAST_ACTION"
+  }
+}
diff --git a/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/CrashWidgetProvider.kt b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/CrashWidgetProvider.kt
new file mode 100644
index 00000000000..8496c7c064c
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/CrashWidgetProvider.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.testing.sessions
+
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.Context
+import android.content.Intent
+import android.icu.text.SimpleDateFormat
+import android.os.Build
+import android.widget.RemoteViews
+import com.google.firebase.FirebaseApp
+import java.util.Date
+import java.util.Locale
+
+/** Provides homescreen widget for the test app. */
+class CrashWidgetProvider : AppWidgetProvider() {
+
+  override fun onUpdate(
+    context: Context,
+    appWidgetManager: AppWidgetManager,
+    appWidgetIds: IntArray
+  ) {
+    FirebaseApp.initializeApp(context)
+
+    appWidgetIds.forEach { appWidgetId ->
+      // Get the layout for the widget and attach an on-click listener
+      // to the button.
+      val views: RemoteViews =
+        RemoteViews(context.packageName, R.layout.crash_widget).apply {
+          setOnClickPendingIntent(R.id.widgetCrashButton, getPendingCrashIntent(context))
+          setTextViewText(R.id.widgetTimeText, getDateText())
+        }
+
+      // Tell the AppWidgetManager to perform an update on the current
+      // widget.
+      appWidgetManager.updateAppWidget(appWidgetId, views)
+    }
+  }
+
+  override fun onReceive(context: Context, intent: Intent): Unit {
+    super.onReceive(context, intent)
+
+    if (CRASH_BUTTON_CLICK == intent.getAction()) {
+      throw RuntimeException("CRASHED FROM WIDGET")
+    }
+  }
+
+  fun getPendingCrashIntent(context: Context): PendingIntent {
+    val intent = Intent(context, CrashWidgetProvider::class.java)
+    intent.setAction(CRASH_BUTTON_CLICK)
+    return PendingIntent.getBroadcast(
+      context,
+      0,
+      intent,
+      PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+    )
+  }
+
+  companion object {
+    val CRASH_BUTTON_CLICK = "widgetCrashButtonClick"
+
+    fun getDateText(): String =
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+        SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(Date())
+      else "unknown"
+  }
+}
diff --git a/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/FirstFragment.kt b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/FirstFragment.kt
new file mode 100644
index 00000000000..779fff5cf8a
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/FirstFragment.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.testing.sessions
+
+import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.icu.text.SimpleDateFormat
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.firebase.testing.sessions.databinding.FragmentFirstBinding
+import java.util.Date
+import java.util.Locale
+
+/** A simple [Fragment] subclass as the default destination in the navigation. */
+class FirstFragment : Fragment() {
+  val crashlytics = FirebaseCrashlytics.getInstance()
+
+  private var _binding: FragmentFirstBinding? = null
+
+  // This property is only valid between onCreateView and
+  // onDestroyView.
+  private val binding
+    get() = _binding!!
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?
+  ): View? {
+
+    _binding = FragmentFirstBinding.inflate(inflater, container, false)
+    return binding.root
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+
+    binding.buttonCrash.setOnClickListener { throw RuntimeException("CRASHED") }
+    binding.buttonNonFatal.setOnClickListener {
+      crashlytics.recordException(IllegalStateException())
+    }
+    binding.buttonAnr.setOnClickListener {
+      while (true) {
+        Thread.sleep(1_000)
+      }
+    }
+    binding.buttonForegroundProcess.setOnClickListener {
+      if (binding.buttonForegroundProcess.getText().startsWith("Start")) {
+        ForegroundService.startService(getContext()!!, "Starting service at ${getDateText()}")
+        binding.buttonForegroundProcess.setText("Stop foreground service")
+      } else {
+        ForegroundService.stopService(getContext()!!)
+        binding.buttonForegroundProcess.setText("Start foreground service")
+      }
+    }
+    binding.startSplitscreen.setOnClickListener {
+      val intent = Intent(getContext()!!, SecondActivity::class.java)
+      intent.addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_LAUNCH_ADJACENT)
+      startActivity(intent)
+      activity?.finish()
+    }
+    binding.startSplitscreenSame.setOnClickListener {
+      val intent = Intent(getContext()!!, MainActivity::class.java)
+      intent.addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_LAUNCH_ADJACENT)
+      startActivity(intent)
+    }
+    binding.nextActivityButton.setOnClickListener {
+      val intent = Intent(getContext()!!, SecondActivity::class.java)
+      intent.addFlags(FLAG_ACTIVITY_NEW_TASK)
+      startActivity(intent)
+    }
+  }
+
+  override fun onResume() {
+    super.onResume()
+    TestApplication.sessionSubscriber.registerView(binding.sessionIdFragmentText)
+  }
+
+  override fun onPause() {
+    super.onPause()
+    TestApplication.sessionSubscriber.unregisterView(binding.sessionIdFragmentText)
+  }
+
+  override fun onDestroyView() {
+    super.onDestroyView()
+    _binding = null
+  }
+
+  companion object {
+    fun getDateText(): String =
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+        SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(Date())
+      else "unknown"
+  }
+}
diff --git a/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/ForegroundService.kt b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/ForegroundService.kt
new file mode 100644
index 00000000000..697dfb5e566
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/ForegroundService.kt
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.testing.sessions
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.IBinder
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.content.ContextCompat
+import com.google.firebase.FirebaseApp
+
+class ForegroundService : Service() {
+  private val CHANNEL_ID = "CrashForegroundService"
+  val receiver = CrashBroadcastReceiver()
+
+  override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+    Log.i(TAG, "Initializing app From ForegroundSErvice")
+    FirebaseApp.initializeApp(this)
+    createNotificationChannel()
+    val pending =
+      PendingIntent.getActivity(
+        this,
+        0,
+        Intent(this, MainActivity::class.java),
+        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+      )
+
+    val crashIntent = Intent(CrashBroadcastReceiver.CRASH_ACTION)
+    val toastIntent = Intent(CrashBroadcastReceiver.TOAST_ACTION)
+
+    val pendingCrash =
+      PendingIntent.getBroadcast(this, 0, crashIntent, PendingIntent.FLAG_IMMUTABLE)
+    val pendingToast =
+      PendingIntent.getBroadcast(this, 0, toastIntent, PendingIntent.FLAG_IMMUTABLE)
+    val pendingMsg =
+      PendingIntent.getActivity(
+        this,
+        0,
+        Intent(this, SecondActivity::class.java).setAction("MESSAGE"),
+        PendingIntent.FLAG_IMMUTABLE
+      )
+
+    val notification =
+      NotificationCompat.Builder(this, CHANNEL_ID)
+        .setContentTitle("Crash Test Notification Widget")
+        .setContentText(intent?.getStringExtra("inputExtra"))
+        .setContentIntent(pending)
+        .setSmallIcon(R.drawable.ic_launcher_foreground)
+        .setTicker("Crash Notification Widget Ticker")
+        .addAction(R.drawable.ic_launcher_foreground, "CRASH!", pendingCrash)
+        .addAction(R.drawable.ic_launcher_foreground, "TOAST!", pendingToast)
+        .addAction(R.drawable.ic_launcher_foreground, "Send Message", pendingMsg)
+        .build()
+
+    startForeground(1, notification)
+    return START_STICKY
+  }
+
+  override fun onBind(intent: Intent): IBinder? {
+    return null
+  }
+
+  override fun onDestroy() {
+    super.onDestroy()
+    Log.i(TAG, "OnDestroy for ForegroundService")
+  }
+
+  private fun createNotificationChannel() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      val serviceChannel =
+        NotificationChannel(
+          CHANNEL_ID,
+          "Foreground Service Channel",
+          NotificationManager.IMPORTANCE_DEFAULT
+        )
+      val manager = getSystemService(NotificationManager::class.java)
+      manager!!.createNotificationChannel(serviceChannel)
+    }
+  }
+
+  companion object {
+    val TAG = "WidgetForegroundService"
+
+    fun startService(context: Context, message: String) {
+      Log.i(TAG, "Starting foreground serice")
+      ContextCompat.startForegroundService(
+        context,
+        Intent(context, ForegroundService::class.java).putExtra("inputExtra", message)
+      )
+    }
+
+    fun stopService(context: Context) {
+      Log.i(TAG, "Stopping serice")
+      context.stopService(Intent(context, ForegroundService::class.java))
+    }
+  }
+}
diff --git a/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/MainActivity.kt b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/MainActivity.kt
new file mode 100644
index 00000000000..ac41d11d73e
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/MainActivity.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.testing.sessions
+
+import android.os.Bundle
+import com.google.firebase.testing.sessions.databinding.ActivityMainBinding
+
+class MainActivity : BaseActivity() {
+
+  private lateinit var binding: ActivityMainBinding
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    binding = ActivityMainBinding.inflate(layoutInflater)
+    setContentView(binding.root)
+  }
+}
diff --git a/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/SecondActivity.kt b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/SecondActivity.kt
new file mode 100644
index 00000000000..9272510d0f3
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/SecondActivity.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.testing.sessions
+
+import android.app.ActivityManager
+import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.os.Build
+import android.os.Bundle
+import android.widget.Button
+
+/** Second activity from the MainActivity that runs on a different process. */
+class SecondActivity : BaseActivity() {
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_second)
+    findViewById<Button>(R.id.prev_activity_button).setOnClickListener {
+      val intent = Intent(this, MainActivity::class.java)
+      intent.addFlags(FLAG_ACTIVITY_NEW_TASK)
+      startActivity(intent)
+      finish()
+    }
+    findViewById<Button>(R.id.second_crash_button).setOnClickListener {
+      throw IllegalStateException("SecondActivity has crashed")
+    }
+    findViewById<Button>(R.id.kill_background_processes).setOnClickListener {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        getSystemService(ActivityManager::class.java)
+          .killBackgroundProcesses("com.google.firebase.testing.sessions")
+      }
+    }
+  }
+
+  override fun onResume() {
+    super.onResume()
+    TestApplication.sessionSubscriber.registerView(findViewById(R.id.session_id_second_text))
+  }
+
+  override fun onPause() {
+    super.onPause()
+    TestApplication.sessionSubscriber.unregisterView(findViewById(R.id.session_id_second_text))
+  }
+}
diff --git a/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/TestApplication.kt b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/TestApplication.kt
new file mode 100644
index 00000000000..6d528f50e5c
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/TestApplication.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.testing.sessions
+
+import android.annotation.SuppressLint
+import android.content.IntentFilter
+import android.os.Handler
+import android.os.Looper
+import android.widget.TextView
+import androidx.multidex.MultiDexApplication
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies
+import com.google.firebase.sessions.api.SessionSubscriber
+
+class TestApplication : MultiDexApplication() {
+  private val broadcastReceiver = CrashBroadcastReceiver()
+
+  override fun onCreate() {
+    super.onCreate()
+    registerReceiver(broadcastReceiver, IntentFilter(CrashBroadcastReceiver.CRASH_ACTION))
+    registerReceiver(broadcastReceiver, IntentFilter(CrashBroadcastReceiver.TOAST_ACTION))
+  }
+
+  class FakeSessionSubscriber : SessionSubscriber {
+    override val isDataCollectionEnabled = true
+    override val sessionSubscriberName = SessionSubscriber.Name.MATT_SAYS_HI
+    private val viewsToUpdate = mutableListOf<TextView>()
+    private val uiHandler = Handler(Looper.getMainLooper())
+
+    var sessionDetails: SessionSubscriber.SessionDetails? = null
+      private set
+
+    override fun onSessionChanged(sessionDetails: SessionSubscriber.SessionDetails) {
+      this.sessionDetails = sessionDetails
+      viewsToUpdate.forEach { updateView(it, sessionDetails.sessionId) }
+    }
+
+    fun registerView(textView: TextView) {
+      viewsToUpdate.add(textView)
+      updateView(textView, sessionDetails?.sessionId)
+    }
+
+    fun unregisterView(textView: TextView) {
+      viewsToUpdate.remove(textView)
+    }
+
+    private fun updateView(textView: TextView, sessionId: String?) {
+      uiHandler.post { textView.text = sessionId ?: "No Session Id" }
+    }
+  }
+
+  @SuppressLint("DiscouragedApi")
+  companion object {
+    val sessionSubscriber = FakeSessionSubscriber()
+
+    init {
+      FirebaseSessionsDependencies.addDependency(SessionSubscriber.Name.MATT_SAYS_HI)
+      FirebaseSessionsDependencies.register(sessionSubscriber)
+    }
+  }
+}
diff --git a/firebase-sessions/test-app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/firebase-sessions/test-app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 00000000000..44a7ccb32c8
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,46 @@
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:aapt="http://schemas.android.com/aapt"
+  android:height="108dp"
+  android:viewportHeight="108"
+  android:viewportWidth="108"
+  android:width="108dp">
+  <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+        android:endX="85.84757"
+        android:endY="92.4963"
+        android:startX="42.9492"
+        android:startY="49.59793"
+        android:type="linear">
+        <item
+          android:color="#44000000"
+          android:offset="0.0" />
+        <item
+          android:color="#00000000"
+          android:offset="1.0" />
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+    android:fillColor="#FFFFFF"
+    android:fillType="nonZero"
+    android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+    android:strokeColor="#00000000"
+    android:strokeWidth="1" />
+</vector>
diff --git a/firebase-sessions/test-app/src/main/res/drawable/ic_launcher_background.xml b/firebase-sessions/test-app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 00000000000..3f723137ef3
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:height="108dp"
+  android:viewportHeight="108"
+  android:viewportWidth="108"
+  android:width="108dp">
+  <path
+    android:fillColor="#3DDC84"
+    android:pathData="M0,0h108v108h-108z" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M9,0L9,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,0L19,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M29,0L29,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M39,0L39,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M49,0L49,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M59,0L59,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M69,0L69,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M79,0L79,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M89,0L89,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M99,0L99,108"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,9L108,9"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,19L108,19"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,29L108,29"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,39L108,39"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,49L108,49"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,59L108,59"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,69L108,69"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,79L108,79"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,89L108,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M0,99L108,99"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,29L89,29"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,39L89,39"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,49L89,49"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,59L89,59"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,69L89,69"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M19,79L89,79"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M29,19L29,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M39,19L39,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M49,19L49,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M59,19L59,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M69,19L69,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M79,19L79,89"
+    android:strokeColor="#33FFFFFF"
+    android:strokeWidth="0.8" />
+</vector>
diff --git a/firebase-sessions/test-app/src/main/res/drawable/sensor_window.xml b/firebase-sessions/test-app/src/main/res/drawable/sensor_window.xml
new file mode 100644
index 00000000000..8c9dd3f4731
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/drawable/sensor_window.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:height="24dp"
+  android:tint="#BB86FC"
+  android:viewportHeight="24"
+  android:viewportWidth="24"
+  android:width="24dp">
+  <path
+    android:fillColor="#FFFFFF"
+    android:pathData="M18,4v16H6V4H18M18,2H6C4.9,2 4,2.9 4,4v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C20,2.9 19.1,2 18,2L18,2zM7,19h10v-6H7V19zM10,10h4v1h3V5H7v6h3V10z" />
+</vector>
diff --git a/firebase-sessions/test-app/src/main/res/layout/activity_main.xml b/firebase-sessions/test-app/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000000..b8ce9758d24
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  tools:context=".MainActivity">
+
+  <include layout="@layout/content_main" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/firebase-sessions/test-app/src/main/res/layout/activity_second.xml b/firebase-sessions/test-app/src/main/res/layout/activity_second.xml
new file mode 100644
index 00000000000..1292d4f8d4d
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/layout/activity_second.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical"
+  tools:context=".SecondActivity">
+
+  <Button
+    android:id="@+id/prev_activity_button"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/prev_activity_text"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintLeft_toLeftOf="parent" />
+
+  <Button
+    android:id="@+id/second_crash_button"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/crash_button_text"
+    app:layout_constraintTop_toBottomOf="@id/prev_activity_button"
+    app:layout_constraintLeft_toLeftOf="parent" />
+
+  <Button
+    android:id="@+id/kill_background_processes"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/kill_processes_button_text"
+    app:layout_constraintTop_toBottomOf="@id/second_crash_button"
+    app:layout_constraintLeft_toLeftOf="parent" />
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+    <TextView
+      android:id="@+id/session_id_second_label"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/session_id_label"
+      android:labelFor="@id/session_id_second_text"/>
+    <TextView
+      android:id="@+id/session_id_second_text"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/session_id_label"
+      android:text="@string/no_session_text"/>
+  </LinearLayout>
+
+</LinearLayout>
diff --git a/firebase-sessions/test-app/src/main/res/layout/content_main.xml b/firebase-sessions/test-app/src/main/res/layout/content_main.xml
new file mode 100644
index 00000000000..98aa89a61d5
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/layout/content_main.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+  <fragment
+    android:id="@+id/nav_host_fragment_content_main"
+    android:layout_width="0dp"
+    android:layout_height="0dp"
+    android:name="androidx.navigation.fragment.NavHostFragment"
+    app:defaultNavHost="true"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:navGraph="@navigation/nav_graph" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/firebase-sessions/test-app/src/main/res/layout/crash_widget.xml b/firebase-sessions/test-app/src/main/res/layout/crash_widget.xml
new file mode 100644
index 00000000000..fa7b4f6421e
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/layout/crash_widget.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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="wrap_content"
+  android:layout_height="wrap_content"
+  android:orientation="vertical">
+
+  <Button
+    android:id="@+id/widgetCrashButton"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/widget_crash_button_text" />
+
+  <TextView
+    android:id="@+id/widgetTimeText"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text=""
+    android:textColor="#fafafa"
+    android:textSize="32dp" />
+
+</LinearLayout>
diff --git a/firebase-sessions/test-app/src/main/res/layout/crash_widget_preview.xml b/firebase-sessions/test-app/src/main/res/layout/crash_widget_preview.xml
new file mode 100644
index 00000000000..cb6518f2e1e
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/layout/crash_widget_preview.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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="wrap_content"
+  android:layout_height="wrap_content"
+  android:orientation="vertical">
+
+  <Button
+    android:id="@+id/widgetCrashButton"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/widget_crash_button_text" />
+
+</LinearLayout>
diff --git a/firebase-sessions/test-app/src/main/res/layout/fragment_first.xml b/firebase-sessions/test-app/src/main/res/layout/fragment_first.xml
new file mode 100644
index 00000000000..71fe46e5cbd
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/layout/fragment_first.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent">
+  <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    tools:context=".FirstFragment">
+
+    <Button
+        android:id="@+id/button_crash"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/crash_button_text"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent" />
+
+    <Button
+        android:id="@+id/button_non_fatal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/non_fatal_button_text"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/button_crash" />
+
+    <Button
+        android:id="@+id/button_anr"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/button_anr_text"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/button_non_fatal" />
+
+    <Button
+        android:id="@+id/button_foreground_process"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/start_foreground_service_text"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/button_anr" />
+
+    <Button
+        android:id="@+id/start_splitscreen"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/start_splitcreen_text"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/button_foreground_process" />
+
+    <Button
+        android:id="@+id/start_splitscreen_same"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/start_splitcreen_same_text"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/start_splitscreen" />
+
+    <Button
+        android:id="@+id/next_activity_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/next_activity_text"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/start_splitscreen_same" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+        <TextView
+            android:id="@+id/session_id_fragment_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/session_id_label"
+            android:labelFor="@id/session_id_fragment_text"/>
+        <TextView
+            android:id="@+id/session_id_fragment_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hint="@string/session_id_label"
+            android:text="@string/no_session_text"/>
+    </LinearLayout>
+
+  </LinearLayout>
+</ScrollView>
diff --git a/firebase-sessions/test-app/src/main/res/menu/menu_main.xml b/firebase-sessions/test-app/src/main/res/menu/menu_main.xml
new file mode 100644
index 00000000000..5f848d88ed5
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/menu/menu_main.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  tools:context="com.google.firebase.testing.sessions.MainActivity">
+  <item
+    android:id="@+id/action_settings"
+    android:orderInCategory="100"
+    android:title="@string/action_settings"
+    app:showAsAction="never" />
+</menu>
diff --git a/firebase-sessions/test-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/firebase-sessions/test-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000000..1328ee3bdea
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/firebase-sessions/test-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/firebase-sessions/test-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000000..1328ee3bdea
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/firebase-sessions/test-app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/firebase-sessions/test-app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml
new file mode 100644
index 00000000000..acb106f3faa
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+  <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/firebase-sessions/test-app/src/main/res/navigation/nav_graph.xml b/firebase-sessions/test-app/src/main/res/navigation/nav_graph.xml
new file mode 100644
index 00000000000..f00433c5d25
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/navigation/nav_graph.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/nav_graph"
+  app:startDestination="@id/FirstFragment">
+
+  <fragment
+    android:id="@+id/FirstFragment"
+    android:name="com.google.firebase.testing.sessions.FirstFragment"
+    android:label="@string/first_fragment_label"
+    tools:layout="@layout/fragment_first" />
+
+</navigation>
diff --git a/firebase-sessions/test-app/src/main/res/values-night-v21/themes.xml b/firebase-sessions/test-app/src/main/res/values-night-v21/themes.xml
new file mode 100644
index 00000000000..ba22f1e300f
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/values-night-v21/themes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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="Theme.Widget_test_app" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <!-- Primary brand color. -->
+    <item name="colorPrimary">@color/purple_200</item>
+    <item name="colorPrimaryVariant">@color/purple_700</item>
+    <item name="colorOnPrimary">@color/black</item>
+    <!-- Secondary brand color. -->
+    <item name="colorSecondary">@color/teal_200</item>
+    <item name="colorSecondaryVariant">@color/teal_200</item>
+    <item name="colorOnSecondary">@color/black</item>
+    <!-- Status bar color. -->
+    <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+    <!-- Customize your theme here. -->
+  </style>
+</resources>
diff --git a/firebase-sessions/test-app/src/main/res/values-night/themes.xml b/firebase-sessions/test-app/src/main/res/values-night/themes.xml
new file mode 100644
index 00000000000..1d40bec6a3e
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/values-night/themes.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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 xmlns:tools="http://schemas.android.com/tools">
+  <!-- Base application theme. -->
+  <style name="Theme.Widget_test_app" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <!-- Primary brand color. -->
+    <item name="colorPrimary">@color/purple_200</item>
+    <item name="colorPrimaryVariant">@color/purple_700</item>
+    <item name="colorOnPrimary">@color/black</item>
+    <!-- Secondary brand color. -->
+    <item name="colorSecondary">@color/teal_200</item>
+    <item name="colorSecondaryVariant">@color/teal_200</item>
+    <item name="colorOnSecondary">@color/black</item>
+    <!-- Customize your theme here. -->
+  </style>
+</resources>
diff --git a/firebase-sessions/test-app/src/main/res/values/colors.xml b/firebase-sessions/test-app/src/main/res/values/colors.xml
new file mode 100644
index 00000000000..119d0762aa6
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/values/colors.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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="purple_200">#FFBB86FC</color>
+  <color name="purple_500">#FF6200EE</color>
+  <color name="purple_700">#FF3700B3</color>
+  <color name="teal_200">#FF03DAC5</color>
+  <color name="teal_700">#FF018786</color>
+  <color name="black">#FF000000</color>
+  <color name="white">#FFFFFFFF</color>
+</resources>
diff --git a/firebase-sessions/test-app/src/main/res/values/strings.xml b/firebase-sessions/test-app/src/main/res/values/strings.xml
new file mode 100644
index 00000000000..b0bcc278bea
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/values/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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">Firebase Sessions Test App</string>
+  <string name="action_settings">Settings</string>
+  <string name="first_fragment_label">First Fragment</string>
+  <string name="crash_test_widget_description">Test Widget for Crashing</string>
+  <string name="widget_crash_button_text">Crash!</string>
+  <string name="crash_button_text">Crash!</string>
+  <string name="non_fatal_button_text">Non Fatal</string>
+  <string name="button_anr_text">ANR</string>
+  <string name="start_foreground_service_text">Start Foreground Service</string>
+  <string name="start_splitcreen_text">Start splitscreen - Different activity</string>
+  <string name="start_splitcreen_same_text">Start splitscreen - Same activity</string>
+  <string name="next_activity_text">Next activity</string>
+  <string name="prev_activity_text">Previous activity</string>
+  <string name="kill_processes_button_text">Kill Background Processes</string>
+  <string name="no_session_text">No Session Set</string>
+  <string name="session_id_label">Session Id: </string>
+</resources>
diff --git a/firebase-sessions/test-app/src/main/res/values/themes.xml b/firebase-sessions/test-app/src/main/res/values/themes.xml
new file mode 100644
index 00000000000..a92994a22c1
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/values/themes.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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 xmlns:tools="http://schemas.android.com/tools">
+  <!-- Base application theme. -->
+  <style name="Theme.Widget_test_app" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <!-- Primary brand color. -->
+    <item name="colorPrimary">@color/purple_500</item>
+    <item name="colorPrimaryVariant">@color/purple_700</item>
+    <item name="colorOnPrimary">@color/white</item>
+    <!-- Secondary brand color. -->
+    <item name="colorSecondary">@color/teal_200</item>
+    <item name="colorSecondaryVariant">@color/teal_700</item>
+    <item name="colorOnSecondary">@color/black</item>
+    <!-- Customize your theme here. -->
+  </style>
+
+  <style name="Theme.Widget_test_app.NoActionBar">
+    <item name="windowActionBar">false</item>
+    <item name="windowNoTitle">true</item>
+  </style>
+
+  <style name="Theme.Widget_test_app.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+  <style name="Theme.Widget_test_app.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+</resources>
diff --git a/firebase-sessions/test-app/src/main/res/xml/homescreen_widget.xml b/firebase-sessions/test-app/src/main/res/xml/homescreen_widget.xml
new file mode 100644
index 00000000000..913c5969e36
--- /dev/null
+++ b/firebase-sessions/test-app/src/main/res/xml/homescreen_widget.xml
@@ -0,0 +1,30 @@
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+  android:minWidth="80dp"
+  android:minHeight="80dp"
+  android:targetCellWidth="2"
+  android:targetCellHeight="2"
+  android:maxResizeWidth="250dp"
+  android:maxResizeHeight="120dp"
+  android:updatePeriodMillis="10000"
+  android:description="@string/crash_test_widget_description"
+  android:previewLayout="@layout/crash_widget_preview"
+  android:initialLayout="@layout/crash_widget"
+  android:resizeMode="horizontal|vertical"
+  android:widgetCategory="home_screen"
+  android:widgetFeatures="reconfigurable|configuration_optional"></appwidget-provider>
diff --git a/firebase-sessions/test-app/test-app.gradle.kts b/firebase-sessions/test-app/test-app.gradle.kts
new file mode 100644
index 00000000000..c882b4d962e
--- /dev/null
+++ b/firebase-sessions/test-app/test-app.gradle.kts
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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:Suppress("DEPRECATION") // App projects should still use FirebaseTestLabPlugin.
+
+import com.google.firebase.gradle.plugins.ci.device.FirebaseTestLabExtension
+import com.google.firebase.gradle.plugins.ci.device.FirebaseTestLabPlugin
+
+plugins {
+  id("com.android.application")
+  id("org.jetbrains.kotlin.android")
+  id("com.google.gms.google-services")
+  id("com.google.firebase.crashlytics")
+  id("com.google.firebase.firebase-perf")
+  id("copy-google-services")
+}
+
+android {
+  val compileSdkVersion : Int by rootProject
+  val targetSdkVersion: Int by rootProject
+  val minSdkVersion : Int by rootProject
+
+  namespace = "com.google.firebase.testing.sessions"
+  compileSdk = compileSdkVersion
+  buildFeatures.buildConfig = true
+  defaultConfig {
+    applicationId = "com.google.firebase.testing.sessions"
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+    versionCode = 1
+    versionName = "1.0"
+    multiDexEnabled = true
+    multiDexKeepProguard = file("multidex-config.pro")
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+    // We only want to actually crash the app on specific runs.
+    buildConfigField(
+      "boolean",
+      "SHOULD_CRASH_APP",
+      project.hasProperty("triggerCrashes").toString()
+    )
+  }
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+  kotlinOptions { jvmTarget = "1.8" }
+  buildFeatures { viewBinding = true }
+}
+
+dependencies {
+  if (project.hasProperty("useReleasedVersions")) {
+    implementation(platform("com.google.firebase:firebase-bom:latest.release"))
+    implementation("com.google.firebase:firebase-crashlytics")
+    implementation("com.google.firebase:firebase-perf")
+    implementation("com.google.firebase:firebase-sessions")
+  } else {
+    implementation(project(":firebase-crashlytics")) {
+      exclude(group = "com.google.firebase", module = "firebase-sessions")
+    }
+    implementation(project(":firebase-perf")) {
+      exclude(group = "com.google.firebase", module = "firebase-sessions")
+    }
+    implementation(project(":firebase-sessions"))
+  }
+
+  implementation("androidx.appcompat:appcompat:1.6.1")
+  implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+  implementation("androidx.core:core-ktx:1.7.0")
+  implementation("androidx.multidex:multidex:2.0.1")
+  implementation("androidx.navigation:navigation-fragment-ktx:2.4.1")
+  implementation("androidx.navigation:navigation-ui-ktx:2.4.1")
+  implementation("com.google.android.material:material:1.9.0")
+  implementation(libs.androidx.core)
+
+  androidTestImplementation("com.google.firebase:firebase-common:21.0.0")
+  androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
+  androidTestImplementation(libs.androidx.test.junit)
+  androidTestImplementation(libs.androidx.test.runner)
+  androidTestImplementation(libs.truth)
+}
+
+apply<FirebaseTestLabPlugin>()
+
+configure<FirebaseTestLabExtension> {
+  device("model=panther,version=33") // Pixel7
+}
diff --git a/firebase-storage/CHANGELOG.md b/firebase-storage/CHANGELOG.md
index c45a2ac5184..eae4cd94a43 100644
--- a/firebase-storage/CHANGELOG.md
+++ b/firebase-storage/CHANGELOG.md
@@ -1,35 +1,209 @@
+# Unreleased
+
+
+# 21.0.0
+* [changed] Bump internal dependencies
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.3.0
+* [fixed] Fixed an issue where the wrong SDK version was being reported to the backend.
+* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-perf-ktx`
+  to `com.google.firebase:firebase-perf` under the `com.google.firebase.perf` package.
+  For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+* [deprecated] All the APIs from `com.google.firebase:firebase-perf-ktx` have been added to
+  `com.google.firebase:firebase-perf` under the `com.google.firebase.perf` package,
+  and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-perf-ktx` are
+  now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
+  [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.2.1
+* [changed] Migrated `firebase-storage` SDK to use standard Firebase executors.
+  (GitHub [#4830](//github.com/firebase/firebase-android-sdk/pull/4830){: .external})
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.2.0
+* [changed] Internal changes to ensure alignment with other SDK releases.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.1.0
+* [fixed] Fixed an issue that caused an infinite number of retries with no
+  exponential backoff for `uploadChunk()`.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library. The Kotlin extensions library has the following
+additional updates:
+
+* [feature] Firebase now supports Kotlin coroutines.
+  With this release, we added
+  [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}
+  to `firebase-storage-ktx` as a transitive dependency, which exposes the
+  `Task<T>.await()` suspend function to convert a
+  [`Task`](https://developers.google.com/android/guides/tasks) into a Kotlin
+  coroutine.
+* [feature] Added
+  [`StorageTask.taskState`](/docs/reference/kotlin/com/google/firebase/storage/ktx/package-summary#taskState)
+  Kotlin Flows to monitor the progress of an upload or download `Task`.
+
+# 20.0.2
+* [changed] Updated dependency of `play-services-basement` to its latest
+  version (v18.1.0).
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.1
+* [changed] Updated dependencies of `play-services-basement`,
+  `play-services-base`, and `play-services-tasks` to their latest versions
+  (v18.0.0, v18.0.1, and v18.0.1, respectively). For more information, see the
+  [note](#basement18-0-0_base18-0-1_tasks18-0-1) at the top of this release
+  entry.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library. The Kotlin extensions library has no additional
+updates.
+
+# 20.0.0
+* [feature] Added abuse reduction features.
+* [feature] Added the ability to connect to the [firebase_storage] emulator.
+* [changed] Internal changes to support dynamic feature modules.
+* [changed] Internal infrastructure improvements.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library. The Kotlin extensions library has no additional
+updates.
+
 # 19.2.2
-- [fixed] Fixed an issue that caused the SDK to report incorrect values for
-  "getTotalByteCount()" after a download was paused and resumed.
+* [fixed] Fixed an issue that caused the SDK to report incorrect values for
+[`getTotalByteCount()`](docs/reference/android/com/google/firebase/storage/FileDownloadTask.TaskSnapshot#getTotalByteCount())
+after a download was paused and resumed.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library. The Kotlin extensions library has no additional
+updates.
 
 # 19.2.1
-- [fixed] Fixed an issue that caused the SDK to crash if the download location
-  was deleted before the download completed. Instead, the download now fails.
+* [fixed] Fixed an issue that caused the SDK to crash if the download location
+ was deleted before the download completed. Instead, the download now fails.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.2.0
+* [changed] Updated to support improvements in the KTX library (see below).
+
 
-# 19.0.2
-- [fixed] Fixed an encoding issue in `list()/listAll()` that caused us to miss
-  entries for folders that contained special characters.
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library and has the following additional updates:
+
+* [feature] Added API support for destructuring of
+  [`TaskSnapshot`](/docs/reference/kotlin/com/google/firebase/storage/StreamDownloadTask.TaskSnapshot)
+  and
+  [`ListResult`](/docs/reference/kotlin/com/google/firebase/storage/ListResult).
+
+# 19.1.1
+* [changed] Internal changes to ensure functionality alignment with other SDK releases.
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-storage` library. The Kotlin extensions library has no additional
+updates.
+
+# 19.1.0
+* [feature] Added `getCacheControl()`, `getContentDisposition()`,
+  `getContentEncoding()`, `getContentLanguage()`, and `getContentType()` to
+  [`StorageMetadata.Builder`](/docs/reference/android/com/google/firebase/storage/StorageMetadata.Builder)
+  to provide access to the current state of the metadata.
+* [fixed] Fixed an encoding issue in
+  [`StorageReference.list()`](/docs/reference/android/com/google/firebase/storage/StorageReference.html#list(int))
+  that caused the API to miss entries for prefixes that contained special
+  characters.
+
+
+## Kotlin
+* [feature] The beta release of a [firebase_storage_full] Android library
+  with Kotlin extensions is now available. The Kotlin extensions library
+  transitively includes the base `firebase-storage` library. To learn more,
+  visit the
+  [[firebase_storage_full] KTX documentation](/docs/reference/kotlin/com/google/firebase/storage/ktx/package-summary).
 
 # 19.0.1
-- [fixed] `listAll()` now propagates the error messages if the List operation
-  was denied by a Security Rule.
+* [fixed] [`StorageReference.listAll()`](/docs/reference/android/com/google/firebase/storage/StorageReference.html#listAll())
+  now propagates the error messages if the List operation was denied by a
+  Security Rule.
 
 # 19.0.0
-- [changed] Added missing nullability annotations for better Kotlin interop.
-- [internal] Removed ``@PublicApi` annotations as they are no longer enforced
-  and have no semantic meaning.
+* [changed] Versioned to add nullability annotations to improve the Kotlin
+  developer experience. No other changes.
+
+# 18.1.1
+* [changed] Internal changes to ensure functionality alignment with other SDK
+  releases.
 
 # 18.1.0
-- [feature] Added `StorageReference.list()` and `StorageReference.listAll()`,
+* [feature] Added
+  [`StorageReference.list()`](/docs/reference/android/com/google/firebase/storage/StorageReference.html#list(int))
+  and [`StorageReference.listAll()`](/docs/reference/android/com/google/firebase/storage/StorageReference.html#listAll()),
   which allows developers to list the files and folders under the given
   StorageReference.
-- [changed] Added validation to `StorageReference.getDownloadUrl()` and
-  `StorageReference.getMetadata()` to return an error if the reference is the
-  root of the bucket.
+* [changed] Added validation to
+  [`StorageReference.getDownloadUrl()`](/docs/reference/android/com/google/firebase/storage/StorageReference.html#getDownloadUrl())
+  and [`StorageReference.getMetadata()`](/docs/reference/android/com/google/firebase/storage/StorageReference.html#getMetadata())
+  to return an error if the reference is the root of the bucket.
 
 # 17.0.0
-- [internal] Updated the SDK initialization process and removed usages of
-  deprecated methods.
-- [changed] Added `@RestrictTo` annotations to discourage the use of APIs that
-  are not public. This affects internal APIs that were previously obfuscated
-  and are not mentioned in our documentation.
+* [changed] Internal changes that rely on an updated API to obtain
+  authentication credentials. If you use [firebase_auth], update to
+  `firebase-auth` v17.0.0 or later to ensure functionality alignment.
+
+# 16.0.2
+* [fixed] This release includes minor fixes and improvements.
+
+# 16.0.1
+* [feature] Added support for `onSuccessTask()` and `addOnCanceledListener()`
+  to [`StorageTask`](/docs/reference/android/com/google/firebase/storage/StorageTask),
+  [`UploadTask`](/docs/reference/android/com/google/firebase/storage/UploadTask),
+  [`StreamDownloadTask`](/docs/reference/android/com/google/firebase/storage/StreamDownloadTask),
+  and [`FileDownloadTask`](/docs/reference/android/com/google/firebase/storage/FileDownloadTask).
+* [changed] Removed the deprecated `StorageMetadata.getDownloadUrl()` and
+  `UploadTask.TaskSnapshot.getDownloadUrl()` methods. To get a current download
+  URL, use
+  [`StorageReference.getDownloadUr()`](/docs/reference/android/com/google/firebase/storage/StorageReference.html#getDownloadUrl()).
+
diff --git a/firebase-storage/api.txt b/firebase-storage/api.txt
index 82e7d844b92..440cecda0dc 100644
--- a/firebase-storage/api.txt
+++ b/firebase-storage/api.txt
@@ -34,12 +34,14 @@ package com.google.firebase.storage {
     method @NonNull public static com.google.firebase.storage.FirebaseStorage getInstance(@NonNull String);
     method @NonNull public static com.google.firebase.storage.FirebaseStorage getInstance(@NonNull com.google.firebase.FirebaseApp);
     method @NonNull public static com.google.firebase.storage.FirebaseStorage getInstance(@NonNull com.google.firebase.FirebaseApp, @NonNull String);
+    method public long getMaxChunkUploadRetry();
     method public long getMaxDownloadRetryTimeMillis();
     method public long getMaxOperationRetryTimeMillis();
     method public long getMaxUploadRetryTimeMillis();
     method @NonNull public com.google.firebase.storage.StorageReference getReference();
     method @NonNull public com.google.firebase.storage.StorageReference getReference(@NonNull String);
     method @NonNull public com.google.firebase.storage.StorageReference getReferenceFromUrl(@NonNull String);
+    method public void setMaxChunkUploadRetry(long);
     method public void setMaxDownloadRetryTimeMillis(long);
     method public void setMaxOperationRetryTimeMillis(long);
     method public void setMaxUploadRetryTimeMillis(long);
@@ -79,7 +81,28 @@ package com.google.firebase.storage {
     field public static final int ERROR_UNKNOWN = -13000; // 0xffffcd38
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @IntDef({com.google.firebase.storage.StorageException.ERROR_UNKNOWN, com.google.firebase.storage.StorageException.ERROR_OBJECT_NOT_FOUND, com.google.firebase.storage.StorageException.ERROR_BUCKET_NOT_FOUND, com.google.firebase.storage.StorageException.ERROR_PROJECT_NOT_FOUND, com.google.firebase.storage.StorageException.ERROR_QUOTA_EXCEEDED, com.google.firebase.storage.StorageException.ERROR_NOT_AUTHENTICATED, com.google.firebase.storage.StorageException.ERROR_NOT_AUTHORIZED, com.google.firebase.storage.StorageException.ERROR_RETRY_LIMIT_EXCEEDED, com.google.firebase.storage.StorageException.ERROR_INVALID_CHECKSUM, com.google.firebase.storage.StorageException.ERROR_CANCELED}) public static @interface StorageException.ErrorCode {
+  @IntDef({com.google.firebase.storage.StorageException.ERROR_UNKNOWN, com.google.firebase.storage.StorageException.ERROR_OBJECT_NOT_FOUND, com.google.firebase.storage.StorageException.ERROR_BUCKET_NOT_FOUND, com.google.firebase.storage.StorageException.ERROR_PROJECT_NOT_FOUND, com.google.firebase.storage.StorageException.ERROR_QUOTA_EXCEEDED, com.google.firebase.storage.StorageException.ERROR_NOT_AUTHENTICATED, com.google.firebase.storage.StorageException.ERROR_NOT_AUTHORIZED, com.google.firebase.storage.StorageException.ERROR_RETRY_LIMIT_EXCEEDED, com.google.firebase.storage.StorageException.ERROR_INVALID_CHECKSUM, com.google.firebase.storage.StorageException.ERROR_CANCELED}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface StorageException.ErrorCode {
+  }
+
+  public final class StorageKt {
+    method public static operator long component1(@NonNull com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method public static operator long component1(@NonNull com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
+    method public static operator long component1(@NonNull com.google.firebase.storage.FileDownloadTask.TaskSnapshot);
+    method @NonNull public static operator java.util.List<com.google.firebase.storage.StorageReference> component1(@NonNull com.google.firebase.storage.ListResult);
+    method public static operator long component2(@NonNull com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method public static operator long component2(@NonNull com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
+    method public static operator long component2(@NonNull com.google.firebase.storage.FileDownloadTask.TaskSnapshot);
+    method @NonNull public static operator java.util.List<com.google.firebase.storage.StorageReference> component2(@NonNull com.google.firebase.storage.ListResult);
+    method @Nullable public static operator com.google.firebase.storage.StorageMetadata component3(@NonNull com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method @NonNull public static operator java.io.InputStream component3(@NonNull com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
+    method @Nullable public static operator String component3(@NonNull com.google.firebase.storage.ListResult);
+    method @Nullable public static operator android.net.Uri component4(@NonNull com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method @NonNull public static com.google.firebase.storage.FirebaseStorage getStorage(@NonNull com.google.firebase.Firebase);
+    method @NonNull public static <T extends com.google.firebase.storage.StorageTask.SnapshotBase> kotlinx.coroutines.flow.Flow<com.google.firebase.storage.TaskState<T>> getTaskState(@NonNull com.google.firebase.storage.StorageTask<T>);
+    method @NonNull public static com.google.firebase.storage.FirebaseStorage storage(@NonNull com.google.firebase.Firebase, @NonNull String url);
+    method @NonNull public static com.google.firebase.storage.FirebaseStorage storage(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @NonNull public static com.google.firebase.storage.FirebaseStorage storage(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String url);
+    method @NonNull public static com.google.firebase.storage.StorageMetadata storageMetadata(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.storage.StorageMetadata.Builder,kotlin.Unit> init);
   }
 
   public class StorageMetadata {
@@ -229,6 +252,21 @@ package com.google.firebase.storage {
     method public long getTotalByteCount();
   }
 
+  public abstract class TaskState<T> {
+  }
+
+  public static final class TaskState.InProgress<T> extends com.google.firebase.storage.TaskState<T> {
+    ctor public TaskState.InProgress(@Nullable T snapshot);
+    method public T getSnapshot();
+    property public final T snapshot;
+  }
+
+  public static final class TaskState.Paused<T> extends com.google.firebase.storage.TaskState<T> {
+    ctor public TaskState.Paused(@Nullable T snapshot);
+    method public T getSnapshot();
+    property public final T snapshot;
+  }
+
   public class UploadTask extends com.google.firebase.storage.StorageTask<com.google.firebase.storage.UploadTask.TaskSnapshot> {
     method protected void resetState();
     method protected void schedule();
@@ -243,3 +281,43 @@ package com.google.firebase.storage {
 
 }
 
+package com.google.firebase.storage.ktx {
+
+  public final class StorageKt {
+    method @Deprecated public static operator long component1(@NonNull com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method @Deprecated public static operator long component1(@NonNull com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
+    method @Deprecated public static operator long component1(@NonNull com.google.firebase.storage.FileDownloadTask.TaskSnapshot);
+    method @Deprecated @NonNull public static operator java.util.List<com.google.firebase.storage.StorageReference> component1(@NonNull com.google.firebase.storage.ListResult);
+    method @Deprecated public static operator long component2(@NonNull com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method @Deprecated public static operator long component2(@NonNull com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
+    method @Deprecated public static operator long component2(@NonNull com.google.firebase.storage.FileDownloadTask.TaskSnapshot);
+    method @Deprecated @NonNull public static operator java.util.List<com.google.firebase.storage.StorageReference> component2(@NonNull com.google.firebase.storage.ListResult);
+    method @Deprecated @Nullable public static operator com.google.firebase.storage.StorageMetadata component3(@NonNull com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method @Deprecated @NonNull public static operator java.io.InputStream component3(@NonNull com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
+    method @Deprecated @Nullable public static operator String component3(@NonNull com.google.firebase.storage.ListResult);
+    method @Deprecated @Nullable public static operator android.net.Uri component4(@NonNull com.google.firebase.storage.UploadTask.TaskSnapshot);
+    method @Deprecated @NonNull public static com.google.firebase.storage.FirebaseStorage getStorage(@NonNull com.google.firebase.ktx.Firebase);
+    method @Deprecated @NonNull public static <T extends com.google.firebase.storage.StorageTask.SnapshotBase> kotlinx.coroutines.flow.Flow<com.google.firebase.storage.ktx.TaskState<T>> getTaskState(@NonNull com.google.firebase.storage.StorageTask<T>);
+    method @Deprecated @NonNull public static com.google.firebase.storage.FirebaseStorage storage(@NonNull com.google.firebase.ktx.Firebase, @NonNull String url);
+    method @Deprecated @NonNull public static com.google.firebase.storage.FirebaseStorage storage(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @Deprecated @NonNull public static com.google.firebase.storage.FirebaseStorage storage(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String url);
+    method @Deprecated @NonNull public static com.google.firebase.storage.StorageMetadata storageMetadata(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.storage.StorageMetadata.Builder,kotlin.Unit> init);
+  }
+
+  @Deprecated public abstract class TaskState<T> {
+  }
+
+  @Deprecated public static final class TaskState.InProgress<T> extends com.google.firebase.storage.ktx.TaskState<T> {
+    ctor @Deprecated public TaskState.InProgress(@Nullable T snapshot);
+    method @Deprecated public T getSnapshot();
+    property public final T snapshot;
+  }
+
+  @Deprecated public static final class TaskState.Paused<T> extends com.google.firebase.storage.ktx.TaskState<T> {
+    ctor @Deprecated public TaskState.Paused(@Nullable T snapshot);
+    method @Deprecated public T getSnapshot();
+    property public final T snapshot;
+  }
+
+}
+
diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle
index f3c15cfa18d..31ae62d569b 100644
--- a/firebase-storage/firebase-storage.gradle
+++ b/firebase-storage/firebase-storage.gradle
@@ -14,10 +14,13 @@
 
 plugins {
     id 'firebase-library'
+    id("kotlin-android")
     id 'com.google.protobuf'
+    id("copy-google-services")
 }
 
 firebaseLibrary {
+    libraryGroup "storage"
     testLab.enabled = true
     publishJavadoc = true
     publishSources = true
@@ -28,7 +31,8 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.storage"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
@@ -72,41 +76,46 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions { jvmTarget = "1.8" }
 }
 
 dependencies {
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':appcheck:firebase-appcheck-interop')
+    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
+
+    api("com.google.firebase:firebase-annotations:16.2.0")
+    api("com.google.firebase:firebase-appcheck:17.1.0") {
+        exclude group: "com.google.firebase", module: "firebase-common"
+        exclude group: "com.google.firebase", module: "firebase-components"
+        exclude group: "com.google.firebase", module: "firebase-annotations"
+    }
+    api("com.google.firebase:firebase-appcheck-interop:17.1.0")
+    api('com.google.firebase:firebase-auth-interop:18.0.0') {
+         exclude group: "com.google.firebase", module: "firebase-common"
+         exclude group: "com.google.firebase", module: "firebase-components"
+         exclude group: "com.google.firebase", module: "firebase-annotations"
+     }
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
+    api("com.google.firebase:firebase-components:18.0.0")
 
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.google.android.gms:play-services-base:18.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation('com.google.firebase:firebase-auth-interop:18.0.0') {
-        exclude group: "com.google.firebase", module: "firebase-common"
-    }
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
 
-    javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
-    javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation 'androidx.test:rules:1.2.0'
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 
     androidTestImplementation "androidx.annotation:annotation:1.1.0"
     androidTestImplementation 'androidx.test:rules:1.2.0'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
     androidTestImplementation 'junit:junit:4.12'
-
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:rules:1.2.0'
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation project(':appcheck:firebase-appcheck')
 }
-
-// ==========================================================================
-// Copy from here down if you want to use the google-services plugin in your
-// androidTest integration tests.
-// ==========================================================================
-ext.packageName = "com.google.firebase.storage"
-apply from: '../gradle/googleServices.gradle'
diff --git a/firebase-storage/gradle.properties b/firebase-storage/gradle.properties
index 0807252820f..245bf5280b1 100644
--- a/firebase-storage/gradle.properties
+++ b/firebase-storage/gradle.properties
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=20.0.1
-latestReleasedVersion=20.0.0
+version=21.0.1
+latestReleasedVersion=21.0.0
 android.enableUnitTestBinaryResources=true
diff --git a/firebase-storage/ktx/api.txt b/firebase-storage/ktx/api.txt
index 479a44eda40..3d03b63fadb 100644
--- a/firebase-storage/ktx/api.txt
+++ b/firebase-storage/ktx/api.txt
@@ -1,25 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.storage.ktx {
 
-  public final class StorageKt {
-    ctor public StorageKt();
-    method public static operator long component1(@NonNull com.google.firebase.storage.UploadTask.TaskSnapshot);
-    method public static operator long component1(@NonNull com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
-    method public static operator long component1(@NonNull com.google.firebase.storage.FileDownloadTask.TaskSnapshot);
-    method @NonNull public static operator java.util.List<com.google.firebase.storage.StorageReference> component1(@NonNull com.google.firebase.storage.ListResult);
-    method public static operator long component2(@NonNull com.google.firebase.storage.UploadTask.TaskSnapshot);
-    method public static operator long component2(@NonNull com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
-    method public static operator long component2(@NonNull com.google.firebase.storage.FileDownloadTask.TaskSnapshot);
-    method @NonNull public static operator java.util.List<com.google.firebase.storage.StorageReference> component2(@NonNull com.google.firebase.storage.ListResult);
-    method @Nullable public static operator com.google.firebase.storage.StorageMetadata component3(@NonNull com.google.firebase.storage.UploadTask.TaskSnapshot);
-    method @NonNull public static operator java.io.InputStream component3(@NonNull com.google.firebase.storage.StreamDownloadTask.TaskSnapshot);
-    method @Nullable public static operator String component3(@NonNull com.google.firebase.storage.ListResult);
-    method @Nullable public static operator android.net.Uri component4(@NonNull com.google.firebase.storage.UploadTask.TaskSnapshot);
-    method @NonNull public static com.google.firebase.storage.FirebaseStorage getStorage(@NonNull com.google.firebase.ktx.Firebase);
-    method @NonNull public static com.google.firebase.storage.FirebaseStorage storage(@NonNull com.google.firebase.ktx.Firebase, @NonNull String url);
-    method @NonNull public static com.google.firebase.storage.FirebaseStorage storage(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
-    method @NonNull public static com.google.firebase.storage.FirebaseStorage storage(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String url);
-    method @NonNull public static com.google.firebase.storage.StorageMetadata storageMetadata(@NonNull kotlin.jvm.functions.Function1<? super com.google.firebase.storage.StorageMetadata.Builder,kotlin.Unit> init);
+  public final class LoggingKt {
   }
 
 }
diff --git a/firebase-storage/ktx/ktx.gradle b/firebase-storage/ktx/ktx.gradle
index af12896ca9f..e44168d6976 100644
--- a/firebase-storage/ktx/ktx.gradle
+++ b/firebase-storage/ktx/ktx.gradle
@@ -14,19 +14,23 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
+group = "com.google.firebase"
+
 firebaseLibrary {
-    releaseWith project(':firebase-storage')
-    publishJavadoc = true
+    libraryGroup "storage"
+    publishJavadoc = false
+    publishReleaseNotes = false
     publishSources = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.firebase.storage.ktx"    
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
@@ -53,22 +57,19 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api(project(":firebase-storage"))
+    api("com.google.firebase:firebase-common:21.0.0")
+    api("com.google.firebase:firebase-common-ktx:21.0.0")
 
-    implementation project(':firebase-common')
-    implementation project(':firebase-components')
-    implementation project(':firebase-common:ktx')
-    implementation project(':firebase-storage')
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'com.google.android.gms:play-services-tasks:18.0.1'
+    implementation("com.google.firebase:firebase-components:18.0.0")
 
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:3.3.3'
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'junit:junit:4.12'
 }
diff --git a/firebase-storage/ktx/src/main/AndroidManifest.xml b/firebase-storage/ktx/src/main/AndroidManifest.xml
index a0588e1a8c9..3a78c5134c7 100644
--- a/firebase-storage/ktx/src/main/AndroidManifest.xml
+++ b/firebase-storage/ktx/src/main/AndroidManifest.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.storage.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.storage.ktx.FirebaseStorageKtxRegistrar"
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.storage.ktx.FirebaseStorageLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
diff --git a/firebase-storage/ktx/src/main/kotlin/com/google/firebase/storage/ktx/Logging.kt b/firebase-storage/ktx/src/main/kotlin/com/google/firebase/storage/ktx/Logging.kt
new file mode 100644
index 00000000000..32d28146f10
--- /dev/null
+++ b/firebase-storage/ktx/src/main/kotlin/com/google/firebase/storage/ktx/Logging.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.storage.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.platforminfo.LibraryVersionComponent
+import com.google.firebase.storage.BuildConfig
+
+internal const val LIBRARY_NAME: String = "fire-stg-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseStorageLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}
diff --git a/firebase-storage/ktx/src/test/kotlin/com/google/firebase/storage/ktx/StorageTest.kt b/firebase-storage/ktx/src/test/kotlin/com/google/firebase/storage/ktx/StorageTest.kt
index 1f8f9a099d9..5dfa0d7c8d1 100644
--- a/firebase-storage/ktx/src/test/kotlin/com/google/firebase/storage/ktx/StorageTest.kt
+++ b/firebase-storage/ktx/src/test/kotlin/com/google/firebase/storage/ktx/StorageTest.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.storage.ktx
 
@@ -45,137 +47,141 @@ const val API_KEY = "API_KEY"
 const val EXISTING_APP = "existing"
 
 abstract class BaseTestCase {
-    @Before
-    fun setUp() {
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build()
-        )
-
-        Firebase.initialize(
-                ApplicationProvider.getApplicationContext(),
-                FirebaseOptions.Builder()
-                        .setApplicationId(APP_ID)
-                        .setApiKey(API_KEY)
-                        .setProjectId("123")
-                        .build(),
-                EXISTING_APP
-        )
-    }
-
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class StorageTests : BaseTestCase() {
 
-    @Test
-    fun `storage should delegate to FirebaseStorage#getInstance()`() {
-        assertThat(Firebase.storage).isSameInstanceAs(FirebaseStorage.getInstance())
-    }
-
-    @Test
-    fun `FirebaseApp#storage should delegate to FirebaseStorage#getInstance(FirebaseApp)`() {
-        val app = Firebase.app(EXISTING_APP)
-        assertThat(Firebase.storage(app)).isSameInstanceAs(FirebaseStorage.getInstance(app))
-    }
-
-    @Test
-    fun `Firebase#storage should delegate to FirebaseStorage#getInstance(url)`() {
-        val url = "gs://valid.url"
-        assertThat(Firebase.storage(url)).isSameInstanceAs(FirebaseStorage.getInstance(url))
+  @Test
+  fun `storage should delegate to FirebaseStorage#getInstance()`() {
+    assertThat(Firebase.storage).isSameInstanceAs(FirebaseStorage.getInstance())
+  }
+
+  @Test
+  fun `FirebaseApp#storage should delegate to FirebaseStorage#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.storage(app)).isSameInstanceAs(FirebaseStorage.getInstance(app))
+  }
+
+  @Test
+  fun `Firebase#storage should delegate to FirebaseStorage#getInstance(url)`() {
+    val url = "gs://valid.url"
+    assertThat(Firebase.storage(url)).isSameInstanceAs(FirebaseStorage.getInstance(url))
+  }
+
+  @Test
+  fun `Firebase#storage should delegate to FirebaseStorage#getInstance(FirebaseApp, url)`() {
+    val app = Firebase.app(EXISTING_APP)
+    val url = "gs://valid.url"
+    assertThat(Firebase.storage(app, url)).isSameInstanceAs(FirebaseStorage.getInstance(app, url))
+  }
+
+  @Test
+  fun `storageMetadata type-safe builder extension works`() {
+    val storage = Firebase.storage
+    val metadata: StorageMetadata = storageMetadata {
+      contentLanguage = "en_us"
+      contentType = "text/html"
+      contentEncoding = "utf-8"
+      cacheControl = "no-cache"
+      contentDisposition = "attachment"
     }
 
-    @Test
-    fun `Firebase#storage should delegate to FirebaseStorage#getInstance(FirebaseApp, url)`() {
-        val app = Firebase.app(EXISTING_APP)
-        val url = "gs://valid.url"
-        assertThat(Firebase.storage(app, url)).isSameInstanceAs(FirebaseStorage.getInstance(app, url))
-    }
-
-    @Test
-    fun `storageMetadata type-safe builder extension works`() {
-        val storage = Firebase.storage
-        val metadata: StorageMetadata = storageMetadata {
-            contentLanguage = "en_us"
-            contentType = "text/html"
-            contentEncoding = "utf-8"
-            cacheControl = "no-cache"
-            contentDisposition = "attachment"
+    assertThat(metadata.getContentType()).isEqualTo("text/html")
+    assertThat(metadata.getCacheControl()).isEqualTo("no-cache")
+  }
+
+  @Test
+  fun `ListResult destructuring declarations work`() {
+    val mockListResult =
+      KtxTestUtil.listResult(listOf<StorageReference>(), listOf<StorageReference>(), null)
+
+    val (items, prefixes, pageToken) = mockListResult
+    assertThat(items).isSameInstanceAs(mockListResult.items)
+    assertThat(prefixes).isSameInstanceAs(mockListResult.prefixes)
+    assertThat(pageToken).isSameInstanceAs(mockListResult.pageToken)
+  }
+
+  @Test
+  fun `UploadTask#TaskSnapshot destructuring declarations work`() {
+    val mockTaskSnapshot = Mockito.mock(UploadTask.TaskSnapshot::class.java)
+    `when`(mockTaskSnapshot.bytesTransferred).thenReturn(50)
+    `when`(mockTaskSnapshot.totalByteCount).thenReturn(100)
+    `when`(mockTaskSnapshot.metadata)
+      .thenReturn(
+        storageMetadata {
+          contentType = "image/png"
+          contentEncoding = "utf-8"
         }
-
-        assertThat(metadata.getContentType()).isEqualTo("text/html")
-        assertThat(metadata.getCacheControl()).isEqualTo("no-cache")
-    }
-
-    @Test
-    fun `ListResult destructuring declarations work`() {
-        val mockListResult = KtxTestUtil.listResult(listOf<StorageReference>(), listOf<StorageReference>(), null)
-
-        val (items, prefixes, pageToken) = mockListResult
-        assertThat(items).isSameInstanceAs(mockListResult.items)
-        assertThat(prefixes).isSameInstanceAs(mockListResult.prefixes)
-        assertThat(pageToken).isSameInstanceAs(mockListResult.pageToken)
-    }
-
-    @Test
-    fun `UploadTask#TaskSnapshot destructuring declarations work`() {
-        val mockTaskSnapshot = Mockito.mock(UploadTask.TaskSnapshot::class.java)
-        `when`(mockTaskSnapshot.bytesTransferred).thenReturn(50)
-        `when`(mockTaskSnapshot.totalByteCount).thenReturn(100)
-        `when`(mockTaskSnapshot.metadata).thenReturn(storageMetadata {
-            contentType = "image/png"
-            contentEncoding = "utf-8"
-        })
-        `when`(mockTaskSnapshot.uploadSessionUri).thenReturn(Uri.parse("https://test.com"))
-
-        val (bytesTransferred, totalByteCount, metadata, sessionUri) = mockTaskSnapshot
-
-        assertThat(bytesTransferred).isSameInstanceAs(mockTaskSnapshot.bytesTransferred)
-        assertThat(totalByteCount).isSameInstanceAs(mockTaskSnapshot.totalByteCount)
-        assertThat(metadata).isSameInstanceAs(mockTaskSnapshot.metadata)
-        assertThat(sessionUri).isSameInstanceAs(mockTaskSnapshot.uploadSessionUri)
-    }
-
-    @Test
-    fun `StreamDownloadTask#TaskSnapshot destructuring declarations work`() {
-        val mockTaskSnapshot = Mockito.mock(StreamDownloadTask.TaskSnapshot::class.java)
-        `when`(mockTaskSnapshot.bytesTransferred).thenReturn(50)
-        `when`(mockTaskSnapshot.totalByteCount).thenReturn(100)
-        `when`(mockTaskSnapshot.stream).thenReturn(ByteArrayInputStream("test".toByteArray()))
-
-        val (bytesTransferred, totalByteCount, stream) = mockTaskSnapshot
-
-        assertThat(bytesTransferred).isSameInstanceAs(mockTaskSnapshot.bytesTransferred)
-        assertThat(totalByteCount).isSameInstanceAs(mockTaskSnapshot.totalByteCount)
-        assertThat(stream).isSameInstanceAs(mockTaskSnapshot.stream)
-    }
-
-    @Test
-    fun `FileDownloadTask#TaskSnapshot destructuring declarations work`() {
-        val mockTaskSnapshot = Mockito.mock(FileDownloadTask.TaskSnapshot::class.java)
-        `when`(mockTaskSnapshot.bytesTransferred).thenReturn(50)
-        `when`(mockTaskSnapshot.totalByteCount).thenReturn(100)
-
-        val (bytesTransferred, totalByteCount) = mockTaskSnapshot
-
-        assertThat(bytesTransferred).isSameInstanceAs(mockTaskSnapshot.bytesTransferred)
-        assertThat(totalByteCount).isSameInstanceAs(mockTaskSnapshot.totalByteCount)
-    }
+      )
+    `when`(mockTaskSnapshot.uploadSessionUri).thenReturn(Uri.parse("https://test.com"))
+
+    val (bytesTransferred, totalByteCount, metadata, sessionUri) = mockTaskSnapshot
+
+    assertThat(bytesTransferred).isSameInstanceAs(mockTaskSnapshot.bytesTransferred)
+    assertThat(totalByteCount).isSameInstanceAs(mockTaskSnapshot.totalByteCount)
+    assertThat(metadata).isSameInstanceAs(mockTaskSnapshot.metadata)
+    assertThat(sessionUri).isSameInstanceAs(mockTaskSnapshot.uploadSessionUri)
+  }
+
+  @Test
+  fun `StreamDownloadTask#TaskSnapshot destructuring declarations work`() {
+    val mockTaskSnapshot = Mockito.mock(StreamDownloadTask.TaskSnapshot::class.java)
+    `when`(mockTaskSnapshot.bytesTransferred).thenReturn(50)
+    `when`(mockTaskSnapshot.totalByteCount).thenReturn(100)
+    `when`(mockTaskSnapshot.stream).thenReturn(ByteArrayInputStream("test".toByteArray()))
+
+    val (bytesTransferred, totalByteCount, stream) = mockTaskSnapshot
+
+    assertThat(bytesTransferred).isSameInstanceAs(mockTaskSnapshot.bytesTransferred)
+    assertThat(totalByteCount).isSameInstanceAs(mockTaskSnapshot.totalByteCount)
+    assertThat(stream).isSameInstanceAs(mockTaskSnapshot.stream)
+  }
+
+  @Test
+  fun `FileDownloadTask#TaskSnapshot destructuring declarations work`() {
+    val mockTaskSnapshot = Mockito.mock(FileDownloadTask.TaskSnapshot::class.java)
+    `when`(mockTaskSnapshot.bytesTransferred).thenReturn(50)
+    `when`(mockTaskSnapshot.totalByteCount).thenReturn(100)
+
+    val (bytesTransferred, totalByteCount) = mockTaskSnapshot
+
+    assertThat(bytesTransferred).isSameInstanceAs(mockTaskSnapshot.bytesTransferred)
+    assertThat(totalByteCount).isSameInstanceAs(mockTaskSnapshot.totalByteCount)
+  }
 }
 
 @RunWith(RobolectricTestRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun `library version should be registered with runtime`() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
 }
diff --git a/firebase-storage/src/androidTest/AndroidManifest.xml b/firebase-storage/src/androidTest/AndroidManifest.xml
index 55000c56b3c..64239ad9178 100644
--- a/firebase-storage/src/androidTest/AndroidManifest.xml
+++ b/firebase-storage/src/androidTest/AndroidManifest.xml
@@ -12,10 +12,9 @@
 <!-- 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="com.google.firebase.storage">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="23" />-->
+  <!--<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />-->
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/firebase-storage/src/androidTest/java/com/google/firebase/storage/IntegrationTest.java b/firebase-storage/src/androidTest/java/com/google/firebase/storage/IntegrationTest.java
index 34e931ed7de..5deea55cc2a 100644
--- a/firebase-storage/src/androidTest/java/com/google/firebase/storage/IntegrationTest.java
+++ b/firebase-storage/src/androidTest/java/com/google/firebase/storage/IntegrationTest.java
@@ -18,9 +18,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
-import android.os.Environment;
 import androidx.annotation.NonNull;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.rule.GrantPermissionRule;
 import androidx.test.runner.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
@@ -40,23 +38,23 @@
 /** Integration tests for {@link FirebaseStorage}. */
 @RunWith(AndroidJUnit4.class)
 public class IntegrationTest {
+  // The file size in bytes of "1.1mb.dat"
+  private static final int LARGE_FILE_SIZE_BYTES = 10 * 1024;
+  private final String randomPrefix = UUID.randomUUID().toString();
+  private final String unicodePrefix = "prefix/\\%:😊 ";
+
   @Rule
   public GrantPermissionRule grantPermissionRule =
       GrantPermissionRule.grant(WRITE_EXTERNAL_STORAGE);
 
-  // The file size in bytes of "1.1mb.dat"
-  private static final int LARGE_FILE_SIZE_BYTES = 10 * 1024;
-
   private FirebaseStorage storageClient;
 
-  private final String randomPrefix = UUID.randomUUID().toString();
-
-  private final String unicodePrefix = "prefix/\\%:😊 ";
-
   @Before
   public void before() throws ExecutionException, InterruptedException {
     if (storageClient == null) {
-      FirebaseApp app = FirebaseApp.initializeApp(InstrumentationRegistry.getContext());
+      FirebaseApp app =
+          FirebaseApp.initializeApp(
+              androidx.test.platform.app.InstrumentationRegistry.getInstrumentation().getContext());
       storageClient = FirebaseStorage.getInstance(app);
 
       Tasks.await(getReference("metadata.dat").putBytes(new byte[0]));
@@ -66,12 +64,20 @@ public void before() throws ExecutionException, InterruptedException {
     }
   }
 
+  public File createFile(String fileName) {
+    return new File(
+        androidx.test.platform.app.InstrumentationRegistry.getInstrumentation()
+            .getContext()
+            .getFilesDir(),
+        fileName);
+  }
+
   @Test
   public void downloadFile() throws ExecutionException, InterruptedException, IOException {
-    File tempFile = new File(Environment.getExternalStorageDirectory(), "download.dat");
+    String fileName = "download.dat";
+    File tempFile = createFile(fileName);
 
-    FileDownloadTask.TaskSnapshot fileTask =
-        Tasks.await(getReference("download.dat").getFile(tempFile));
+    FileDownloadTask.TaskSnapshot fileTask = Tasks.await(getReference(fileName).getFile(tempFile));
 
     assertThat(tempFile.exists()).isTrue();
     assertThat(tempFile.length()).isEqualTo(LARGE_FILE_SIZE_BYTES);
@@ -80,9 +86,10 @@ public void downloadFile() throws ExecutionException, InterruptedException, IOEx
 
   @Test
   public void downloadUnicodeFile() throws ExecutionException, InterruptedException, IOException {
-    File tempFile = new File(Environment.getExternalStorageDirectory(), "empty.dat");
+    String fileName = "empty.dat";
+    File tempFile = createFile(fileName);
 
-    Tasks.await(getReference(unicodePrefix + "/empty.dat").getFile(tempFile));
+    Tasks.await(getReference(unicodePrefix + "/" + fileName).getFile(tempFile));
 
     assertThat(tempFile.exists()).isTrue();
   }
diff --git a/firebase-storage/src/main/AndroidManifest.xml b/firebase-storage/src/main/AndroidManifest.xml
index 86ee76395cf..a6c1a9945fb 100644
--- a/firebase-storage/src/main/AndroidManifest.xml
+++ b/firebase-storage/src/main/AndroidManifest.xml
@@ -14,16 +14,15 @@
 <!-- limitations under the License. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.google.firebase.storage">
+          xmlns:tools="http://schemas.android.com/tools">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application>
-        <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
+        <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false"> <meta-data android:name="com.google.firebase.components:com.google.firebase.storage.FirebaseStorageKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.storage.StorageRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/FirebaseStorage.java b/firebase-storage/src/main/java/com/google/firebase/storage/FirebaseStorage.java
index c646ddbff1d..852e6bbfa36 100644
--- a/firebase-storage/src/main/java/com/google/firebase/storage/FirebaseStorage.java
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/FirebaseStorage.java
@@ -25,7 +25,7 @@
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.appcheck.AppCheckTokenResult;
 import com.google.firebase.appcheck.interop.AppCheckTokenListener;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.emulators.EmulatedServiceSettings;
 import com.google.firebase.inject.Provider;
@@ -50,9 +50,10 @@ public class FirebaseStorage {
       "The storage Uri cannot contain a path element.";
   @NonNull private final FirebaseApp mApp;
   @Nullable private final Provider<InternalAuthProvider> mAuthProvider;
-  @Nullable private final Provider<InternalAppCheckTokenProvider> mAppCheckProvider;
+  @Nullable private final Provider<InteropAppCheckTokenProvider> mAppCheckProvider;
   @Nullable private final String mBucketName;
   private long sMaxUploadRetry = 10 * DateUtils.MINUTE_IN_MILLIS; //  10 * 60 * 1000
+  private long sMaxChunkUploadRetry = DateUtils.MINUTE_IN_MILLIS; //  60 * 1000
   private long sMaxDownloadRetry = 10 * DateUtils.MINUTE_IN_MILLIS; //  10 * 60 * 1000
   private long sMaxQueryRetry = 2 * DateUtils.MINUTE_IN_MILLIS; //  2 * 60 * 1000
 
@@ -62,7 +63,7 @@ public class FirebaseStorage {
       @Nullable String bucketName,
       @NonNull FirebaseApp app,
       @Nullable Provider<InternalAuthProvider> authProvider,
-      @Nullable Provider<InternalAppCheckTokenProvider> appCheckProvider) {
+      @Nullable Provider<InteropAppCheckTokenProvider> appCheckProvider) {
     mBucketName = bucketName;
     mApp = app;
     mAuthProvider = authProvider;
@@ -226,6 +227,25 @@ public void setMaxUploadRetryTimeMillis(long maxTransferRetryMillis) {
     sMaxUploadRetry = maxTransferRetryMillis;
   }
 
+  /**
+   * Returns the maximum time to retry sending a chunk if a failure occurs
+   *
+   * @return maximum time in milliseconds. Defaults to 1 minute.
+   */
+  public long getMaxChunkUploadRetry() {
+    return sMaxChunkUploadRetry;
+  }
+
+  /**
+   * Sets the maximum time to retry sending a chunk if a failure occurs
+   *
+   * @param maxChunkRetryMillis the maximum time in milliseconds. Defaults to 1 minute (60,000
+   *     milliseconds).
+   */
+  public void setMaxChunkUploadRetry(long maxChunkRetryMillis) {
+    sMaxChunkUploadRetry = maxChunkRetryMillis;
+  }
+
   /**
    * Returns the maximum time to retry operations other than upload and download if a failure
    * occurs.
@@ -343,7 +363,7 @@ InternalAuthProvider getAuthProvider() {
   }
 
   @Nullable
-  InternalAppCheckTokenProvider getAppCheckProvider() {
+  InteropAppCheckTokenProvider getAppCheckProvider() {
     return mAppCheckProvider != null ? mAppCheckProvider.get() : null;
   }
 
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/FirebaseStorageComponent.java b/firebase-storage/src/main/java/com/google/firebase/storage/FirebaseStorageComponent.java
index 136e65bbde9..a45fb62447a 100644
--- a/firebase-storage/src/main/java/com/google/firebase/storage/FirebaseStorageComponent.java
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/FirebaseStorageComponent.java
@@ -18,11 +18,14 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.inject.Provider;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Executor;
 
 class FirebaseStorageComponent {
   /** A map from storage buckets to Firebase Storage instances. */
@@ -30,15 +33,18 @@ class FirebaseStorageComponent {
 
   private final FirebaseApp app;
   @Nullable private final Provider<InternalAuthProvider> authProvider;
-  @Nullable private final Provider<InternalAppCheckTokenProvider> appCheckProvider;
+  @Nullable private final Provider<InteropAppCheckTokenProvider> appCheckProvider;
 
   FirebaseStorageComponent(
       @NonNull FirebaseApp app,
       @Nullable Provider<InternalAuthProvider> authProvider,
-      @Nullable Provider<InternalAppCheckTokenProvider> appCheckProvider) {
+      @Nullable Provider<InteropAppCheckTokenProvider> appCheckProvider,
+      @NonNull @Blocking Executor blockingExecutor,
+      @NonNull @UiThread Executor uiExecutor) {
     this.app = app;
     this.authProvider = authProvider;
     this.appCheckProvider = appCheckProvider;
+    StorageTaskScheduler.initializeExecutors(blockingExecutor, uiExecutor);
   }
 
   /** Provides instances of Firebase Storage for given bucket names. */
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/ListResult.java b/firebase-storage/src/main/java/com/google/firebase/storage/ListResult.java
index c41963b0dfc..77254c82325 100644
--- a/firebase-storage/src/main/java/com/google/firebase/storage/ListResult.java
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/ListResult.java
@@ -22,7 +22,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-/** Contains the prefixes and items returned by a {@link StorageReference#list} call. */
+/** Contains the prefixes and items returned by a {@link StorageReference#list(int)} call. */
 public final class ListResult {
   private static final String ITEMS_KEY = "items";
   private static final String NAME_KEY = "name";
diff --git a/firebase-storage/ktx/src/main/kotlin/com/google/firebase/storage/ktx/Storage.kt b/firebase-storage/src/main/java/com/google/firebase/storage/Storage.kt
similarity index 59%
rename from firebase-storage/ktx/src/main/kotlin/com/google/firebase/storage/ktx/Storage.kt
rename to firebase-storage/src/main/java/com/google/firebase/storage/Storage.kt
index d560b1232ad..caf92a7e2b8 100644
--- a/firebase-storage/ktx/src/main/kotlin/com/google/firebase/storage/ktx/Storage.kt
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/Storage.kt
@@ -1,36 +1,36 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.storage.ktx
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.storage
 
 import androidx.annotation.Keep
+import com.google.android.gms.tasks.OnCompleteListener
+import com.google.firebase.Firebase
 import com.google.firebase.FirebaseApp
 import com.google.firebase.components.Component
 import com.google.firebase.components.ComponentRegistrar
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.platforminfo.LibraryVersionComponent
-import com.google.firebase.storage.FileDownloadTask
-import com.google.firebase.storage.FirebaseStorage
-import com.google.firebase.storage.ListResult
-import com.google.firebase.storage.StorageMetadata
-import com.google.firebase.storage.StorageReference
-import com.google.firebase.storage.StreamDownloadTask
-import com.google.firebase.storage.UploadTask
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.trySendBlocking
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
 
 /** Returns the [FirebaseStorage] instance of the default [FirebaseApp]. */
 val Firebase.storage: FirebaseStorage
-    get() = FirebaseStorage.getInstance()
+  get() = FirebaseStorage.getInstance()
 
 /** Returns the [FirebaseStorage] instance for a custom storage bucket at [url]. */
 fun Firebase.storage(url: String): FirebaseStorage = FirebaseStorage.getInstance(url)
@@ -40,13 +40,13 @@ fun Firebase.storage(app: FirebaseApp): FirebaseStorage = FirebaseStorage.getIns
 
 /** Returns the [FirebaseStorage] instance of a given [FirebaseApp] and storage bucket [url]. */
 fun Firebase.storage(app: FirebaseApp, url: String): FirebaseStorage =
-        FirebaseStorage.getInstance(app, url)
+  FirebaseStorage.getInstance(app, url)
 
 /** Returns a [StorageMetadata] object initialized using the [init] function. */
 fun storageMetadata(init: StorageMetadata.Builder.() -> Unit): StorageMetadata {
-    val builder = StorageMetadata.Builder()
-    builder.init()
-    return builder.build()
+  val builder = StorageMetadata.Builder()
+  builder.init()
+  return builder.build()
 }
 
 /**
@@ -133,11 +133,52 @@ operator fun ListResult.component2(): List<StorageReference> = prefixes
  */
 operator fun ListResult.component3(): String? = pageToken
 
-internal const val LIBRARY_NAME: String = "fire-stg-ktx"
+/**
+ * Starts listening to this task's progress and emits its values via a [Flow].
+ *
+ * - When the returned flow starts being collected, it attaches the following listeners:
+ * [OnProgressListener], [OnPausedListener], [OnCompleteListener].
+ * - When the flow completes the listeners will be removed.
+ */
+val <T : StorageTask<T>.SnapshotBase> StorageTask<T>.taskState: Flow<TaskState<T>>
+  get() = callbackFlow {
+    val progressListener =
+      OnProgressListener<T> { snapshot ->
+        StorageTaskScheduler.getInstance().scheduleCallback {
+          trySendBlocking(TaskState.InProgress(snapshot))
+        }
+      }
+    val pauseListener =
+      OnPausedListener<T> { snapshot ->
+        StorageTaskScheduler.getInstance().scheduleCallback {
+          trySendBlocking(TaskState.Paused(snapshot))
+        }
+      }
+
+    // Only used to close or cancel the Flows, doesn't send any values
+    val completionListener =
+      OnCompleteListener<T> { task ->
+        if (task.isSuccessful) {
+          close()
+        } else {
+          val exception = task.exception
+          cancel("Error getting the TaskState", exception)
+        }
+      }
+
+    addOnProgressListener(progressListener)
+    addOnPausedListener(pauseListener)
+    addOnCompleteListener(completionListener)
+
+    awaitClose {
+      removeOnProgressListener(progressListener)
+      removeOnPausedListener(pauseListener)
+      removeOnCompleteListener(completionListener)
+    }
+  }
 
 /** @suppress */
 @Keep
 class FirebaseStorageKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  override fun getComponents(): List<Component<*>> = listOf()
 }
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/StorageReference.java b/firebase-storage/src/main/java/com/google/firebase/storage/StorageReference.java
index 0f2be9555d9..a48b95e932e 100644
--- a/firebase-storage/src/main/java/com/google/firebase/storage/StorageReference.java
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/StorageReference.java
@@ -360,8 +360,8 @@ public Task<StorageMetadata> getMetadata() {
    * share the file with others, but can be revoked by a developer in the Firebase Console if
    * desired.
    *
-   * @return The {@link Uri} representing the download URL. You can feed this URL into a {@link
-   *     java.net.URL} and download the object via {@link URL#openStream()}.
+   * @return The {@link Uri} representing the download URL. You can feed this URL into a {@link URL}
+   *     and download the object via {@link URL#openStream()}.
    */
   @SuppressWarnings("deprecation,unused")
   @NonNull
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/StorageRegistrar.java b/firebase-storage/src/main/java/com/google/firebase/storage/StorageRegistrar.java
index 57ebbdd5d17..2831b525d82 100644
--- a/firebase-storage/src/main/java/com/google/firebase/storage/StorageRegistrar.java
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/StorageRegistrar.java
@@ -17,33 +17,46 @@
 import androidx.annotation.Keep;
 import androidx.annotation.RestrictTo;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.UiThread;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.Executor;
 
 /** @hide */
 @Keep
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class StorageRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-gcs";
+  Qualified<Executor> blockingExecutor = Qualified.qualified(Blocking.class, Executor.class);
+  Qualified<Executor> uiExecutor = Qualified.qualified(UiThread.class, Executor.class);
+
   @Override
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(FirebaseStorageComponent.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
+            .add(Dependency.required(blockingExecutor))
+            .add(Dependency.required(uiExecutor))
             .add(Dependency.optionalProvider(InternalAuthProvider.class))
-            .add(Dependency.optionalProvider(InternalAppCheckTokenProvider.class))
+            .add(Dependency.optionalProvider(InteropAppCheckTokenProvider.class))
             .factory(
                 c ->
                     new FirebaseStorageComponent(
                         c.get(FirebaseApp.class),
                         c.getProvider(InternalAuthProvider.class),
-                        c.getProvider(InternalAppCheckTokenProvider.class)))
+                        c.getProvider(InteropAppCheckTokenProvider.class),
+                        c.get(blockingExecutor),
+                        c.get(uiExecutor)))
             .build(),
-        LibraryVersionComponent.create("fire-gcs", BuildConfig.VERSION_NAME));
+        LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }
 }
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/StorageTask.java b/firebase-storage/src/main/java/com/google/firebase/storage/StorageTask.java
index 8aed4e1677e..c3d61c93ba4 100644
--- a/firebase-storage/src/main/java/com/google/firebase/storage/StorageTask.java
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/StorageTask.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.storage;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.util.Log;
 import androidx.annotation.NonNull;
@@ -978,6 +979,8 @@ public <ContinuationResultT> Task<ContinuationResultT> onSuccessTask(
     return successTaskImpl(executor, continuation);
   }
 
+  // TODO(b/261014861): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   @NonNull
   private <ContinuationResultT> Task<ContinuationResultT> continueWithTaskImpl(
       @Nullable final Executor executor,
@@ -1020,6 +1023,8 @@ private <ContinuationResultT> Task<ContinuationResultT> continueWithTaskImpl(
     return source.getTask();
   }
 
+  // TODO(b/261014861): Use an explicit executor in continuations.
+  @SuppressLint("TaskMainThread")
   @NonNull
   private <ContinuationResultT> Task<ContinuationResultT> successTaskImpl(
       @Nullable final Executor executor,
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskScheduler.java b/firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskScheduler.java
index 27f0da2f656..c4bd0929dcc 100644
--- a/firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskScheduler.java
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskScheduler.java
@@ -16,13 +16,8 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
-import java.util.concurrent.BlockingQueue;
+import com.google.firebase.concurrent.FirebaseExecutors;
 import java.util.concurrent.Executor;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * A class used to schedule long running operations (upload/download) and operations that are
@@ -35,31 +30,26 @@
 public class StorageTaskScheduler {
   public static StorageTaskScheduler sInstance = new StorageTaskScheduler();
 
-  private static BlockingQueue<Runnable> mCommandQueue = new LinkedBlockingQueue<>();
-  private static final ThreadPoolExecutor COMMAND_POOL_EXECUTOR =
-      new ThreadPoolExecutor(
-          5, 5, 5, TimeUnit.SECONDS, mCommandQueue, new StorageThreadFactory("Command-"));
-
-  private static BlockingQueue<Runnable> mUploadQueue = new LinkedBlockingQueue<>();
-  private static final ThreadPoolExecutor UPLOAD_QUEUE_EXECUTOR =
-      new ThreadPoolExecutor(
-          2, 2, 5, TimeUnit.SECONDS, mUploadQueue, new StorageThreadFactory("Upload-"));
-
-  private static BlockingQueue<Runnable> mDownloadQueue = new LinkedBlockingQueue<>();
-  private static final ThreadPoolExecutor DOWNLOAD_QUEUE_EXECUTOR =
-      new ThreadPoolExecutor(
-          3, 3, 5, TimeUnit.SECONDS, mDownloadQueue, new StorageThreadFactory("Download-"));
-
-  private static BlockingQueue<Runnable> mCallbackQueue = new LinkedBlockingQueue<>();
-  private static final ThreadPoolExecutor CALLBACK_QUEUE_EXECUTOR =
-      new ThreadPoolExecutor(
-          1, 1, 5, TimeUnit.SECONDS, mCallbackQueue, new StorageThreadFactory("Callbacks-"));
-
-  static {
-    COMMAND_POOL_EXECUTOR.allowCoreThreadTimeOut(true);
-    UPLOAD_QUEUE_EXECUTOR.allowCoreThreadTimeOut(true);
-    DOWNLOAD_QUEUE_EXECUTOR.allowCoreThreadTimeOut(true);
-    CALLBACK_QUEUE_EXECUTOR.allowCoreThreadTimeOut(true);
+  private static final int COMMAND_POOL_SIZE = 5;
+  private static final int DOWNLOAD_POOL_SIZE = 3;
+  private static final int UPLOAD_POOL_SIZE = 2;
+
+  private static Executor COMMAND_POOL_EXECUTOR;
+  private static Executor UPLOAD_QUEUE_EXECUTOR;
+  private static Executor DOWNLOAD_QUEUE_EXECUTOR;
+  private static Executor CALLBACK_QUEUE_EXECUTOR;
+  private static Executor MAIN_THREAD_EXECUTOR;
+
+  public static void initializeExecutors(
+      @NonNull Executor firebaseExecutor, @NonNull Executor uiExecutor) {
+    COMMAND_POOL_EXECUTOR =
+        FirebaseExecutors.newLimitedConcurrencyExecutor(firebaseExecutor, COMMAND_POOL_SIZE);
+    DOWNLOAD_QUEUE_EXECUTOR =
+        FirebaseExecutors.newLimitedConcurrencyExecutor(firebaseExecutor, DOWNLOAD_POOL_SIZE);
+    UPLOAD_QUEUE_EXECUTOR =
+        FirebaseExecutors.newLimitedConcurrencyExecutor(firebaseExecutor, UPLOAD_POOL_SIZE);
+    CALLBACK_QUEUE_EXECUTOR = FirebaseExecutors.newSequentialExecutor(firebaseExecutor);
+    MAIN_THREAD_EXECUTOR = uiExecutor;
   }
 
   public static StorageTaskScheduler getInstance() {
@@ -74,6 +64,10 @@ public void scheduleUpload(Runnable task) {
     UPLOAD_QUEUE_EXECUTOR.execute(task);
   }
 
+  public Executor getMainThreadExecutor() {
+    return MAIN_THREAD_EXECUTOR;
+  }
+
   public void scheduleDownload(Runnable task) {
     DOWNLOAD_QUEUE_EXECUTOR.execute(task);
   }
@@ -85,25 +79,4 @@ public void scheduleCallback(Runnable task) {
   public Executor getCommandPoolExecutor() {
     return COMMAND_POOL_EXECUTOR;
   }
-
-  /** The thread factory for Storage threads. */
-  static class StorageThreadFactory implements ThreadFactory {
-    private final AtomicInteger threadNumber = new AtomicInteger(1);
-    private final String mNameSuffix;
-
-    StorageThreadFactory(@NonNull String suffix) {
-      mNameSuffix = suffix;
-    }
-
-    @Override
-    @SuppressWarnings("ThreadPriorityCheck")
-    public Thread newThread(@NonNull Runnable r) {
-      Thread t = new Thread(r, "FirebaseStorage-" + mNameSuffix + threadNumber.getAndIncrement());
-      t.setDaemon(false);
-      t.setPriority(
-          android.os.Process.THREAD_PRIORITY_BACKGROUND
-              + android.os.Process.THREAD_PRIORITY_MORE_FAVORABLE);
-      return t;
-    }
-  }
 }
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/TaskState.kt b/firebase-storage/src/main/java/com/google/firebase/storage/TaskState.kt
new file mode 100644
index 00000000000..44515e7e375
--- /dev/null
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/TaskState.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.storage
+
+/** Used to emit events about the progress of storage tasks. */
+abstract class TaskState<T> private constructor() {
+  /**
+   * Called periodically as data is transferred and can be used to populate an upload/download
+   * indicator.
+   */
+  class InProgress<T>(val snapshot: T) : TaskState<T>()
+
+  /** Called any time the upload/download is paused. */
+  class Paused<T>(val snapshot: T) : TaskState<T>()
+}
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/UploadTask.java b/firebase-storage/src/main/java/com/google/firebase/storage/UploadTask.java
index de53eb86ab8..0f9231dc385 100644
--- a/firebase-storage/src/main/java/com/google/firebase/storage/UploadTask.java
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/UploadTask.java
@@ -14,6 +14,8 @@
 
 package com.google.firebase.storage;
 
+import static com.google.firebase.storage.internal.ExponentialBackoffSender.RND_MAX;
+
 import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
@@ -25,10 +27,14 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.common.api.Status;
 import com.google.android.gms.common.internal.Preconditions;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.android.gms.common.util.Clock;
+import com.google.android.gms.common.util.DefaultClock;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.storage.internal.AdaptiveStreamBuffer;
 import com.google.firebase.storage.internal.ExponentialBackoffSender;
+import com.google.firebase.storage.internal.Sleeper;
+import com.google.firebase.storage.internal.SleeperImpl;
 import com.google.firebase.storage.internal.Util;
 import com.google.firebase.storage.network.NetworkRequest;
 import com.google.firebase.storage.network.ResumableUploadByteRequest;
@@ -40,6 +46,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Random;
 import java.util.concurrent.atomic.AtomicLong;
 import org.json.JSONException;
 
@@ -62,7 +69,7 @@ public class UploadTask extends StorageTask<UploadTask.TaskSnapshot> {
   // Active, current mutable state.
   private final AtomicLong mBytesUploaded = new AtomicLong(0);
   @Nullable private final InternalAuthProvider mAuthProvider;
-  @Nullable private final InternalAppCheckTokenProvider mAppCheckProvider;
+  @Nullable private final InteropAppCheckTokenProvider mAppCheckProvider;
   private int mCurrentChunkSize = PREFERRED_CHUNK_SIZE;
   private ExponentialBackoffSender mSender;
   private boolean mIsStreamOwned;
@@ -72,6 +79,12 @@ public class UploadTask extends StorageTask<UploadTask.TaskSnapshot> {
   private volatile Exception mServerException = null;
   private volatile int mResultCode = 0;
   private volatile String mServerStatus;
+  private volatile long maxSleepTime;
+  private static final Random random = new Random();
+  /*package*/ static Sleeper sleeper = new SleeperImpl();
+  /*package*/ static Clock clock = DefaultClock.getInstance();
+  private int sleepTime = 0;
+  private final int minimumSleepInterval = 1000;
 
   UploadTask(StorageReference targetRef, StorageMetadata metadata, byte[] bytes) {
     Preconditions.checkNotNull(targetRef);
@@ -89,6 +102,7 @@ public class UploadTask extends StorageTask<UploadTask.TaskSnapshot> {
         new AdaptiveStreamBuffer(new ByteArrayInputStream(bytes), PREFERRED_CHUNK_SIZE);
     this.mIsStreamOwned = true;
 
+    this.maxSleepTime = storage.getMaxChunkUploadRetry();
     mSender =
         new ExponentialBackoffSender(
             storage.getApp().getApplicationContext(),
@@ -110,6 +124,7 @@ public class UploadTask extends StorageTask<UploadTask.TaskSnapshot> {
     this.mAppCheckProvider = storage.getAppCheckProvider();
     this.mUri = file;
     InputStream inputStream = null;
+    this.maxSleepTime = storage.getMaxChunkUploadRetry();
     mSender =
         new ExponentialBackoffSender(
             mStorageRef.getApp().getApplicationContext(),
@@ -120,8 +135,9 @@ public class UploadTask extends StorageTask<UploadTask.TaskSnapshot> {
     try {
       ContentResolver resolver =
           mStorageRef.getStorage().getApp().getApplicationContext().getContentResolver();
+      ParcelFileDescriptor fd = null;
       try {
-        ParcelFileDescriptor fd = resolver.openFileDescriptor(mUri, "r");
+        fd = resolver.openFileDescriptor(mUri, "r");
         if (fd != null) {
           size = fd.getStatSize();
           fd.close();
@@ -173,12 +189,13 @@ public class UploadTask extends StorageTask<UploadTask.TaskSnapshot> {
     this.mStreamBuffer = new AdaptiveStreamBuffer(stream, PREFERRED_CHUNK_SIZE);
     this.mIsStreamOwned = false;
     this.mUri = null;
+    this.maxSleepTime = storage.getMaxChunkUploadRetry();
     mSender =
         new ExponentialBackoffSender(
             mStorageRef.getApp().getApplicationContext(),
             mAuthProvider,
             mAppCheckProvider,
-            mStorageRef.getStorage().getMaxUploadRetryTimeMillis());
+            storage.getMaxUploadRetryTimeMillis());
   }
 
   /** @return the target of the upload. */
@@ -321,15 +338,18 @@ private boolean shouldContinue() {
     }
 
     boolean inErrorState = mServerException != null || mResultCode < 200 || mResultCode >= 300;
+    long deadLine = clock.elapsedRealtime() + this.maxSleepTime;
+    long currentTime = clock.elapsedRealtime() + this.sleepTime;
     // we attempt to recover by calling recoverStatus(true)
-    if (inErrorState && !recoverStatus(true)) {
-      // we failed to recover.
-      if (serverStateValid()) {
-        tryChangeState(INTERNAL_STATE_FAILURE, false);
+    if (inErrorState) {
+      if (currentTime > deadLine || !recoverStatus(true)) {
+        if (serverStateValid()) {
+          tryChangeState(INTERNAL_STATE_FAILURE, false);
+        }
+        return false;
       }
-      return false;
+      sleepTime = Math.max(sleepTime * 2, minimumSleepInterval);
     }
-
     return true;
   }
 
@@ -410,6 +430,36 @@ private boolean recoverStatus(boolean withRetry) {
     return true;
   }
 
+  /**
+   * Send with a delay that uses sleepTime to delay sending a request to the server. Will reset
+   * sleepTime upon send success. TODO: Create an exponential backoff helper to consolidate code
+   * here and in ExponentialBackoffSender.java
+   *
+   * @param request to send
+   * @return whether the delay and send were successful
+   */
+  private boolean delaySend(NetworkRequest request) {
+    try {
+      Log.d(TAG, "Waiting " + sleepTime + " milliseconds");
+      sleeper.sleep(sleepTime + random.nextInt(RND_MAX));
+    } catch (InterruptedException e) {
+      Log.w(TAG, "thread interrupted during exponential backoff.");
+
+      Thread.currentThread().interrupt();
+      mServerException = e;
+      return false;
+    }
+    boolean sendRes = send(request);
+    // We reset the sleepTime if the send was successful. For example,
+    // uploadChunk(request) // false, then sleepTime becomes 1000
+    // uploadChunk(request) // false, then sleepTime becomes 2000
+    // uploadChunk(request) // true, then sleepTime becomes 0 again
+    if (sendRes) {
+      sleepTime = 0;
+    }
+    return sendRes;
+  }
+
   private void uploadChunk() {
     try {
       mStreamBuffer.fill(mCurrentChunkSize);
@@ -425,7 +475,7 @@ private void uploadChunk() {
               bytesToUpload,
               mStreamBuffer.isFinished());
 
-      if (!send(uploadRequest)) {
+      if (!delaySend(uploadRequest)) {
         mCurrentChunkSize = PREFERRED_CHUNK_SIZE;
         Log.d(TAG, "Resetting chunk size to " + mCurrentChunkSize);
         return;
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/internal/ExponentialBackoffSender.java b/firebase-storage/src/main/java/com/google/firebase/storage/internal/ExponentialBackoffSender.java
index a1525054ba5..db048ebb189 100644
--- a/firebase-storage/src/main/java/com/google/firebase/storage/internal/ExponentialBackoffSender.java
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/internal/ExponentialBackoffSender.java
@@ -21,7 +21,7 @@
 import com.google.android.gms.common.internal.Preconditions;
 import com.google.android.gms.common.util.Clock;
 import com.google.android.gms.common.util.DefaultClock;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.storage.network.NetworkRequest;
 import java.util.Random;
@@ -42,14 +42,14 @@ public class ExponentialBackoffSender {
   /*package*/ static Clock clock = DefaultClock.getInstance();
   private final Context context;
   @Nullable private final InternalAuthProvider authProvider;
-  @Nullable private final InternalAppCheckTokenProvider appCheckProvider;
+  @Nullable private final InteropAppCheckTokenProvider appCheckProvider;
   private long retryTime;
   private volatile boolean canceled;
 
   public ExponentialBackoffSender(
       Context context,
       @Nullable InternalAuthProvider authProvider,
-      @Nullable InternalAppCheckTokenProvider appCheckProvider,
+      @Nullable InteropAppCheckTokenProvider appCheckProvider,
       long retryTime) {
     this.context = context;
     this.authProvider = authProvider;
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/internal/SmartHandler.java b/firebase-storage/src/main/java/com/google/firebase/storage/internal/SmartHandler.java
index 1b3d4a7864d..ad1c59b976d 100644
--- a/firebase-storage/src/main/java/com/google/firebase/storage/internal/SmartHandler.java
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/internal/SmartHandler.java
@@ -14,8 +14,7 @@
 
 package com.google.firebase.storage.internal;
 
-import android.os.Handler;
-import android.os.Looper;
+import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.gms.common.internal.Preconditions;
@@ -29,7 +28,6 @@
  */
 @SuppressWarnings("JavaDoc")
 public class SmartHandler {
-  private final Handler handler;
   private final Executor executor;
   /**
    * This works around a deadlock in robolectric (see https://github
@@ -43,16 +41,17 @@ public class SmartHandler {
   /*package*/ static boolean testMode = false;
 
   /** Constructs a SmartHandler */
+  // TODO(b/258426744): Migrate to go/firebase-android-executors
+  @SuppressLint("ThreadPoolCreation")
   public SmartHandler(@Nullable Executor executor) {
-    this.executor = executor;
-    if (this.executor == null) {
+    if (executor == null) {
       if (!testMode) {
-        handler = new Handler(Looper.getMainLooper());
+        this.executor = StorageTaskScheduler.getInstance().getMainThreadExecutor();
       } else {
-        handler = null; // we will call back on the thread pool.
+        this.executor = null;
       }
     } else {
-      handler = null;
+      this.executor = executor;
     }
   }
 
@@ -64,15 +63,11 @@ public SmartHandler(@Nullable Executor executor) {
    */
   public void callBack(@NonNull final Runnable runnable) {
     Preconditions.checkNotNull(runnable);
-    if (handler == null) {
-      if (executor != null) {
-        // manually specified executor
-        executor.execute(runnable);
-      } else {
-        StorageTaskScheduler.getInstance().scheduleCallback(runnable);
-      }
+    if (executor != null) {
+      // manually specified executor
+      executor.execute(runnable);
     } else {
-      handler.post(runnable);
+      StorageTaskScheduler.getInstance().scheduleCallback(runnable);
     }
   }
 }
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/internal/Util.java b/firebase-storage/src/main/java/com/google/firebase/storage/internal/Util.java
index e28e774fe3f..8acea20fbe9 100644
--- a/firebase-storage/src/main/java/com/google/firebase/storage/internal/Util.java
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/internal/Util.java
@@ -25,7 +25,7 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.appcheck.AppCheckTokenResult;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.GetTokenResult;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.storage.network.NetworkRequest;
@@ -161,7 +161,7 @@ public static String getCurrentAuthToken(@Nullable InternalAuthProvider authProv
 
   @Nullable
   public static String getCurrentAppCheckToken(
-      @Nullable InternalAppCheckTokenProvider appCheckProvider) {
+      @Nullable InteropAppCheckTokenProvider appCheckProvider) {
     if (appCheckProvider == null) {
       return null;
     }
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/ktx/Storage.kt b/firebase-storage/src/main/java/com/google/firebase/storage/ktx/Storage.kt
new file mode 100644
index 00000000000..fc94cdc8ef3
--- /dev/null
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/ktx/Storage.kt
@@ -0,0 +1,374 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.storage.ktx
+
+import androidx.annotation.Keep
+import com.google.android.gms.tasks.OnCompleteListener
+import com.google.firebase.FirebaseApp
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.storage.FileDownloadTask
+import com.google.firebase.storage.FirebaseStorage
+import com.google.firebase.storage.ListResult
+import com.google.firebase.storage.OnPausedListener
+import com.google.firebase.storage.OnProgressListener
+import com.google.firebase.storage.StorageMetadata
+import com.google.firebase.storage.StorageReference
+import com.google.firebase.storage.StorageTask
+import com.google.firebase.storage.StorageTaskScheduler
+import com.google.firebase.storage.StreamDownloadTask
+import com.google.firebase.storage.UploadTask
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.trySendBlocking
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseStorage] instance of the default [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+val Firebase.storage: FirebaseStorage
+  get() = FirebaseStorage.getInstance()
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseStorage] instance for a custom storage bucket at [url].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.storage(url: String): FirebaseStorage = FirebaseStorage.getInstance(url)
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseStorage] instance of a given [FirebaseApp].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.storage(app: FirebaseApp): FirebaseStorage = FirebaseStorage.getInstance(app)
+
+/**
+ * Accessing this object for Kotlin apps has changed; see the
+ * [migration guide](https://firebase.google.com/docs/android/kotlin-migration).
+ *
+ * Returns the [FirebaseStorage] instance of a given [FirebaseApp] and storage bucket [url].
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+fun Firebase.storage(app: FirebaseApp, url: String): FirebaseStorage =
+  FirebaseStorage.getInstance(app, url)
+
+/**
+ * Returns a [StorageMetadata] object initialized using the [init] function.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+fun storageMetadata(init: StorageMetadata.Builder.() -> Unit): StorageMetadata {
+  val builder = StorageMetadata.Builder()
+  builder.init()
+  return builder.build()
+}
+
+/**
+ * Destructuring declaration for [UploadTask.TaskSnapshot] to provide bytesTransferred.
+ *
+ * @return the bytesTransferred of the [UploadTask.TaskSnapshot]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun UploadTask.TaskSnapshot.component1() = bytesTransferred
+
+/**
+ * Destructuring declaration for [UploadTask.TaskSnapshot] to provide totalByteCount.
+ *
+ * @return the totalByteCount of the [UploadTask.TaskSnapshot]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun UploadTask.TaskSnapshot.component2() = totalByteCount
+
+/**
+ * Destructuring declaration for [UploadTask.TaskSnapshot] to provide its metadata.
+ *
+ * @return the metadata of the [UploadTask.TaskSnapshot]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun UploadTask.TaskSnapshot.component3() = metadata
+
+/**
+ * Destructuring declaration for [UploadTask.TaskSnapshot] to provide its uploadSessionUri.
+ *
+ * @return the uploadSessionUri of the [UploadTask.TaskSnapshot]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun UploadTask.TaskSnapshot.component4() = uploadSessionUri
+
+/**
+ * Destructuring declaration for [StreamDownloadTask.TaskSnapshot] to provide bytesTransferred.
+ *
+ * @return the bytesTransferred of the [StreamDownloadTask.TaskSnapshot]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun StreamDownloadTask.TaskSnapshot.component1() = bytesTransferred
+
+/**
+ * Destructuring declaration for [StreamDownloadTask.TaskSnapshot] to provide totalByteCount.
+ *
+ * @return the totalByteCount of the [StreamDownloadTask.TaskSnapshot]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun StreamDownloadTask.TaskSnapshot.component2() = totalByteCount
+
+/**
+ * Destructuring declaration for [StreamDownloadTask.TaskSnapshot] to provide its stream.
+ *
+ * @return the stream of the [StreamDownloadTask.TaskSnapshot]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun StreamDownloadTask.TaskSnapshot.component3() = stream
+
+/**
+ * Destructuring declaration for [FileDownloadTask.TaskSnapshot] to provide bytesTransferred.
+ *
+ * @return the bytesTransferred of the [FileDownloadTask.TaskSnapshot]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun FileDownloadTask.TaskSnapshot.component1() = bytesTransferred
+
+/**
+ * Destructuring declaration for [FileDownloadTask.TaskSnapshot] to provide totalByteCount.
+ *
+ * @return the totalByteCount of the [FileDownloadTask.TaskSnapshot]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun FileDownloadTask.TaskSnapshot.component2() = totalByteCount
+
+/**
+ * Destructuring declaration for [ListResult] to provide its items.
+ *
+ * @return the items of the [ListResult]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun ListResult.component1(): List<StorageReference> = items
+
+/**
+ * Destructuring declaration for [ListResult] to provide its prefixes.
+ *
+ * @return the prefixes of the [ListResult]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun ListResult.component2(): List<StorageReference> = prefixes
+
+/**
+ * Destructuring declaration for [ListResult] to provide its pageToken.
+ *
+ * @return the pageToken of the [ListResult]
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+operator fun ListResult.component3(): String? = pageToken
+
+/**
+ * Starts listening to this task's progress and emits its values via a [Flow].
+ *
+ * - When the returned flow starts being collected, it attaches the following listeners:
+ * [OnProgressListener], [OnPausedListener], [OnCompleteListener].
+ * - When the flow completes the listeners will be removed.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+val <T : StorageTask<T>.SnapshotBase> StorageTask<T>.taskState: Flow<TaskState<T>>
+  get() = callbackFlow {
+    val progressListener =
+      OnProgressListener<T> { snapshot ->
+        StorageTaskScheduler.getInstance().scheduleCallback {
+          trySendBlocking(TaskState.InProgress(snapshot))
+        }
+      }
+    val pauseListener =
+      OnPausedListener<T> { snapshot ->
+        StorageTaskScheduler.getInstance().scheduleCallback {
+          trySendBlocking(TaskState.Paused(snapshot))
+        }
+      }
+
+    // Only used to close or cancel the Flows, doesn't send any values
+    val completionListener =
+      OnCompleteListener<T> { task ->
+        if (task.isSuccessful) {
+          close()
+        } else {
+          val exception = task.exception
+          cancel("Error getting the TaskState", exception)
+        }
+      }
+
+    addOnProgressListener(progressListener)
+    addOnPausedListener(pauseListener)
+    addOnCompleteListener(completionListener)
+
+    awaitClose {
+      removeOnProgressListener(progressListener)
+      removeOnPausedListener(pauseListener)
+      removeOnCompleteListener(completionListener)
+    }
+  }
+
+/**
+ * @suppress
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+@Keep
+class FirebaseStorageKtxRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> = listOf()
+}
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/ktx/TaskState.kt b/firebase-storage/src/main/java/com/google/firebase/storage/ktx/TaskState.kt
new file mode 100644
index 00000000000..5c409a163e0
--- /dev/null
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/ktx/TaskState.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.storage.ktx
+
+/**
+ * Used to emit events about the progress of storage tasks.
+ * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+ * respective main modules, and the Kotlin extension (KTX) APIs in
+ * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+ * longer release KTX modules. For details, see the
+ * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+ */
+@Deprecated(
+  "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+  ReplaceWith("")
+)
+abstract class TaskState<T> private constructor() {
+  /**
+   * Called periodically as data is transferred and can be used to populate an upload/download
+   * indicator.
+   * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+   * respective main modules, and the Kotlin extension (KTX) APIs in
+   * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+   * longer release KTX modules. For details, see the
+   * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+   */
+  @Deprecated(
+    "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+    ReplaceWith("")
+  )
+  class InProgress<T>(val snapshot: T) : TaskState<T>()
+
+  /**
+   * Called any time the upload/download is paused.
+   * @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
+   * respective main modules, and the Kotlin extension (KTX) APIs in
+   * `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
+   * longer release KTX modules. For details, see the
+   * [FAQ about this initiative.](https://firebase.google.com/docs/android/kotlin-migration)
+   */
+  @Deprecated(
+    "Migrate to use the KTX API from the main module: https://firebase.google.com/docs/android/kotlin-migration.",
+    ReplaceWith("")
+  )
+  class Paused<T>(val snapshot: T) : TaskState<T>()
+}
diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/network/NetworkRequest.java b/firebase-storage/src/main/java/com/google/firebase/storage/network/NetworkRequest.java
index e2c515c9bc9..4ee0ae72ceb 100644
--- a/firebase-storage/src/main/java/com/google/firebase/storage/network/NetworkRequest.java
+++ b/firebase-storage/src/main/java/com/google/firebase/storage/network/NetworkRequest.java
@@ -15,8 +15,6 @@
 package com.google.firebase.storage.network;
 
 import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.text.TextUtils;
@@ -28,6 +26,7 @@
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.emulators.EmulatedServiceSettings;
+import com.google.firebase.storage.BuildConfig;
 import com.google.firebase.storage.StorageException;
 import com.google.firebase.storage.internal.StorageReferenceUri;
 import com.google.firebase.storage.network.connection.HttpURLConnectionFactory;
@@ -50,23 +49,18 @@
 /** Encapsulates a single network request and response */
 @SuppressWarnings("unused")
 public abstract class NetworkRequest {
-  private static final String TAG = "NetworkRequest";
-
-  private static final String X_FIREBASE_GMPID = "x-firebase-gmpid";
-  private static final String X_FIREBASE_APPCHECK = "x-firebase-appcheck";
-
   public static final Uri PROD_BASE_URL = Uri.parse("https://firebasestorage.googleapis.com/v0");
-
   /* Do not change these values without changing corresponding logic on the SDK side*/
   public static final int INITIALIZATION_EXCEPTION = -1;
   public static final int NETWORK_UNAVAILABLE = -2;
-
   /*package*/ static final String GET = "GET";
   /*package*/ static final String DELETE = "DELETE";
   /*package*/ static final String POST = "POST";
   /*package*/ static final String PATCH = "PATCH";
   /*package*/ static final String PUT = "PUT";
-
+  private static final String TAG = "NetworkRequest";
+  private static final String X_FIREBASE_GMPID = "x-firebase-gmpid";
+  private static final String X_FIREBASE_APPCHECK = "x-firebase-appcheck";
   private static final int MAXIMUM_TOKEN_WAIT_TIME_MS = 30000;
   private static final String CONTENT_TYPE = "Content-Type";
   private static final String APPLICATION_JSON = "application/json";
@@ -80,7 +74,6 @@ public abstract class NetworkRequest {
 
   private StorageReferenceUri storageReferenceUri;
 
-  private static String gmsCoreVersion;
   private Context context;
   private Map<String, List<String>> resultHeaders;
   private int resultCode;
@@ -106,7 +99,7 @@ public static Uri getBaseUrl(@Nullable EmulatedServiceSettings emulatorSettings)
       return Uri.parse(
           "http://" + emulatorSettings.getHost() + ":" + emulatorSettings.getPort() + "/v0");
     } else {
-      return Uri.parse("https://firebasestorage.googleapis.com/v0");
+      return PROD_BASE_URL;
     }
   }
 
@@ -321,23 +314,6 @@ private HttpURLConnection createConnection() throws IOException {
     return conn;
   }
 
-  @NonNull
-  private static String getGmsCoreVersion(Context context) {
-    if (gmsCoreVersion == null) {
-      PackageManager packageManager = context.getPackageManager();
-      try {
-        PackageInfo info = packageManager.getPackageInfo("com.google.android.gms", 0);
-        gmsCoreVersion = info.versionName;
-      } catch (PackageManager.NameNotFoundException e) {
-        Log.e(TAG, "Unable to find gmscore in package manager", e);
-      }
-      if (gmsCoreVersion == null) {
-        gmsCoreVersion = "[No Gmscore]";
-      }
-    }
-    return gmsCoreVersion;
-  }
-
   @SuppressWarnings("TryFinallyCanBeTryWithResources")
   private void constructMessage(
       @NonNull HttpURLConnection conn, @Nullable String authToken, @Nullable String appCheckToken)
@@ -355,14 +331,8 @@ private void constructMessage(
     } else {
       Log.w(TAG, "No App Check token for request.");
     }
-
-    StringBuilder userAgent = new StringBuilder("Android/");
-    String gmsCore = getGmsCoreVersion(context);
-    if (!TextUtils.isEmpty(gmsCore)) {
-      userAgent.append(gmsCore);
-    }
-    conn.setRequestProperty("X-Firebase-Storage-Version", userAgent.toString());
-
+    String userAgent = "Android/" + BuildConfig.VERSION_NAME;
+    conn.setRequestProperty("X-Firebase-Storage-Version", userAgent);
     Map<String, String> requestProperties = requestHeaders;
     for (Map.Entry<String, String> entry : requestProperties.entrySet()) {
       conn.setRequestProperty(entry.getKey(), entry.getValue());
diff --git a/firebase-storage/src/test/AndroidManifest.xml b/firebase-storage/src/test/AndroidManifest.xml
index f3f3f3ba706..c1b80874e8d 100644
--- a/firebase-storage/src/test/AndroidManifest.xml
+++ b/firebase-storage/src/test/AndroidManifest.xml
@@ -13,11 +13,10 @@
 <!-- See the License for the specific language governing permissions and -->
 <!-- limitations under the License. -->
 
-<manifest package="com.firebase.storage.example"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--Although the *SdkVersion is captured in gradle build files, this is required for bazel builds-->
-    <!--<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21"/>-->
+    <!--<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33"/>-->
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java b/firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java
index 62f86e2549f..c55a943f5c3 100644
--- a/firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java
+++ b/firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java
@@ -148,9 +148,11 @@ public void initWithDefaultAndCustomUriTest() throws Exception {
     Assert.assertEquals("gs://foo-bar.appspot.com/", customRef.toString());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void badInitTest() throws Exception {
-    FirebaseStorage.getInstance().getReference("gs://fooey.appspot.com/child");
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> FirebaseStorage.getInstance().getReference("gs://fooey.appspot.com/child"));
   }
 
   @Test
@@ -178,15 +180,18 @@ public void initWithApp() throws Exception {
     Assert.assertEquals("child", ref.getName());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void badInitWithApp1() throws Exception {
-    FirebaseStorage.getInstance().getReference("gs://bucket/child");
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> FirebaseStorage.getInstance().getReference("gs://bucket/child"));
   }
 
   @SuppressWarnings("ConstantConditions")
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void badInitWithApp2() throws Exception {
-    FirebaseStorage.getInstance().getReference(null);
+    assertThrows(
+        IllegalArgumentException.class, () -> FirebaseStorage.getInstance().getReference(null));
   }
 
   @Test
diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/StorageTest.kt b/firebase-storage/src/test/java/com/google/firebase/storage/StorageTest.kt
new file mode 100644
index 00000000000..ac312d5aade
--- /dev/null
+++ b/firebase-storage/src/test/java/com/google/firebase/storage/StorageTest.kt
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.storage
+
+import android.net.Uri
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import java.io.ByteArrayInputStream
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class StorageTests : BaseTestCase() {
+
+  @Test
+  fun `storage should delegate to FirebaseStorage#getInstance()`() {
+    assertThat(Firebase.storage).isSameInstanceAs(FirebaseStorage.getInstance())
+  }
+
+  @Test
+  fun `FirebaseApp#storage should delegate to FirebaseStorage#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.storage(app)).isSameInstanceAs(FirebaseStorage.getInstance(app))
+  }
+
+  @Test
+  fun `Firebase#storage should delegate to FirebaseStorage#getInstance(url)`() {
+    val url = "gs://valid.url"
+    assertThat(Firebase.storage(url)).isSameInstanceAs(FirebaseStorage.getInstance(url))
+  }
+
+  @Test
+  fun `Firebase#storage should delegate to FirebaseStorage#getInstance(FirebaseApp, url)`() {
+    val app = Firebase.app(EXISTING_APP)
+    val url = "gs://valid.url"
+    assertThat(Firebase.storage(app, url)).isSameInstanceAs(FirebaseStorage.getInstance(app, url))
+  }
+
+  @Test
+  fun `storageMetadata type-safe builder extension works`() {
+    val storage = Firebase.storage
+    val metadata: StorageMetadata = storageMetadata {
+      contentLanguage = "en_us"
+      contentType = "text/html"
+      contentEncoding = "utf-8"
+      cacheControl = "no-cache"
+      contentDisposition = "attachment"
+    }
+
+    assertThat(metadata.getContentType()).isEqualTo("text/html")
+    assertThat(metadata.getCacheControl()).isEqualTo("no-cache")
+  }
+
+  @Test
+  fun `ListResult destructuring declarations work`() {
+    val mockListResult =
+      KtxTestUtil.listResult(listOf<StorageReference>(), listOf<StorageReference>(), null)
+
+    val (items, prefixes, pageToken) = mockListResult
+    assertThat(items).isSameInstanceAs(mockListResult.items)
+    assertThat(prefixes).isSameInstanceAs(mockListResult.prefixes)
+    assertThat(pageToken).isSameInstanceAs(mockListResult.pageToken)
+  }
+
+  @Test
+  fun `UploadTask#TaskSnapshot destructuring declarations work`() {
+    val mockTaskSnapshot = Mockito.mock(UploadTask.TaskSnapshot::class.java)
+    `when`(mockTaskSnapshot.bytesTransferred).thenReturn(50)
+    `when`(mockTaskSnapshot.totalByteCount).thenReturn(100)
+    `when`(mockTaskSnapshot.metadata)
+      .thenReturn(
+        storageMetadata {
+          contentType = "image/png"
+          contentEncoding = "utf-8"
+        }
+      )
+    `when`(mockTaskSnapshot.uploadSessionUri).thenReturn(Uri.parse("https://test.com"))
+
+    val (bytesTransferred, totalByteCount, metadata, sessionUri) = mockTaskSnapshot
+
+    assertThat(bytesTransferred).isSameInstanceAs(mockTaskSnapshot.bytesTransferred)
+    assertThat(totalByteCount).isSameInstanceAs(mockTaskSnapshot.totalByteCount)
+    assertThat(metadata).isSameInstanceAs(mockTaskSnapshot.metadata)
+    assertThat(sessionUri).isSameInstanceAs(mockTaskSnapshot.uploadSessionUri)
+  }
+
+  @Test
+  fun `StreamDownloadTask#TaskSnapshot destructuring declarations work`() {
+    val mockTaskSnapshot = Mockito.mock(StreamDownloadTask.TaskSnapshot::class.java)
+    `when`(mockTaskSnapshot.bytesTransferred).thenReturn(50)
+    `when`(mockTaskSnapshot.totalByteCount).thenReturn(100)
+    `when`(mockTaskSnapshot.stream).thenReturn(ByteArrayInputStream("test".toByteArray()))
+
+    val (bytesTransferred, totalByteCount, stream) = mockTaskSnapshot
+
+    assertThat(bytesTransferred).isSameInstanceAs(mockTaskSnapshot.bytesTransferred)
+    assertThat(totalByteCount).isSameInstanceAs(mockTaskSnapshot.totalByteCount)
+    assertThat(stream).isSameInstanceAs(mockTaskSnapshot.stream)
+  }
+
+  @Test
+  fun `FileDownloadTask#TaskSnapshot destructuring declarations work`() {
+    val mockTaskSnapshot = Mockito.mock(FileDownloadTask.TaskSnapshot::class.java)
+    `when`(mockTaskSnapshot.bytesTransferred).thenReturn(50)
+    `when`(mockTaskSnapshot.totalByteCount).thenReturn(100)
+
+    val (bytesTransferred, totalByteCount) = mockTaskSnapshot
+
+    assertThat(bytesTransferred).isSameInstanceAs(mockTaskSnapshot.bytesTransferred)
+    assertThat(totalByteCount).isSameInstanceAs(mockTaskSnapshot.totalByteCount)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/TestUtil.java b/firebase-storage/src/test/java/com/google/firebase/storage/TestUtil.java
index 41208b6ab63..1b70a9d26c6 100644
--- a/firebase-storage/src/test/java/com/google/firebase/storage/TestUtil.java
+++ b/firebase-storage/src/test/java/com/google/firebase/storage/TestUtil.java
@@ -109,6 +109,12 @@ private static void verifyTaskStateChanges(@Nullable InputStream inputStream, St
             System.out.println("Warning!!! Line " + line + " is different.");
           }
         } else {
+          if (!originalLine.equals(newLine)) {
+            System.err.println("Original:");
+            System.err.println(baselineContents);
+            System.err.println("New:");
+            System.err.println(contents);
+          }
           if (!originalLine.equals(newLine)) {
             System.err.println("Original:");
             System.err.println(baselineContents);
@@ -144,10 +150,10 @@ static void await(Task<?> task, int timeout, TimeUnit timeUnit) throws Interrupt
   }
 
   /**
-   * Awaits for a Task for 3 seconds, but flushes the Robolectric scheduler to allow newly added
+   * Awaits for a Task for 10 seconds, but flushes the Robolectric scheduler to allow newly added
    * Tasks to be executed.
    */
   static void await(Task<?> task) throws InterruptedException {
-    await(task, 3, TimeUnit.SECONDS);
+    await(task, 10, TimeUnit.SECONDS);
   }
 }
diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/UploadTest.java b/firebase-storage/src/test/java/com/google/firebase/storage/UploadTest.java
index 07f7dd57a95..e97028667ae 100644
--- a/firebase-storage/src/test/java/com/google/firebase/storage/UploadTest.java
+++ b/firebase-storage/src/test/java/com/google/firebase/storage/UploadTest.java
@@ -100,6 +100,36 @@ public void smallTextUpload() throws Exception {
     TestUtil.verifyTaskStateChanges("smallTextUpload", task.getResult().toString());
   }
 
+  /**
+   * This test will replicate uploadChunk() returning 500's and test to make sure the retries are
+   * limited and using exponential backoff. If the maxretry limit is not checked, then the await
+   * task will time out.
+   *
+   * @throws Exception
+   */
+  @Test
+  public void fileUploadWith500() throws Exception {
+
+    System.out.println("Starting test fileUploadWith500.");
+
+    MockConnectionFactory factory = NetworkLayerMock.ensureNetworkMock("fileUploadWith500", true);
+
+    String filename = TEST_ASSET_ROOT + "image.jpg";
+    ClassLoader classLoader = UploadTest.class.getClassLoader();
+    InputStream imageStream = classLoader.getResourceAsStream(filename);
+    Uri sourceFile = Uri.parse("file://" + filename);
+
+    ContentResolver resolver = ApplicationProvider.getApplicationContext().getContentResolver();
+    Shadows.shadowOf(resolver).registerInputStream(sourceFile, imageStream);
+
+    Task<StringBuilder> task = TestUploadHelper.fileUpload(sourceFile, "image.jpg");
+
+    TestUtil.await(task, 3, TimeUnit.MINUTES);
+
+    factory.verifyOldMock();
+    TestUtil.verifyTaskStateChanges("fileUploadWith500", task.getResult().toString());
+  }
+
   @Test
   public void cantUploadToRoot() throws Exception {
     System.out.println("Starting test cantUploadToRoot.");
@@ -111,26 +141,10 @@ public void cantUploadToRoot() throws Exception {
 
     final UploadTask task = storage.putBytes(new byte[] {});
 
-    try {
-      task.getResult();
-      Assert.fail();
-    } catch (IllegalStateException ignore) {
-      // Task is not yet done.
-    }
-
-    Assert.assertNull(task.getException());
-
-    task.addOnFailureListener(
-        (exception) -> {
-          Assert.assertEquals(
-              "Cannot upload to getRoot. You should upload to a storage location such as "
-                  + ".getReference('image.png').putFile...",
-              exception.getCause().getMessage());
-          taskException.set(exception);
-        });
+    task.addOnFailureListener(taskException::set);
 
     // TODO(mrschmidt): Lower the timeout
-    TestUtil.await(task, 300, TimeUnit.SECONDS);
+    TestUtil.await(task, 1, TimeUnit.MINUTES);
 
     try {
       task.getResult();
@@ -147,6 +161,12 @@ public void cantUploadToRoot() throws Exception {
     }
 
     Assert.assertEquals(taskException.get().getCause(), task.getException().getCause());
+    Assert.assertTrue(
+        taskException
+            .get()
+            .getCause()
+            .getMessage()
+            .contains("Cannot upload to getRoot. You should upload to a storage location"));
   }
 
   @Test
@@ -263,7 +283,7 @@ public void cancelledUpload() throws Exception {
     Task<StringBuilder> task = TestUploadHelper.byteUploadCancel();
 
     // TODO(mrschmidt): Lower the timeout
-    TestUtil.await(task, 500, TimeUnit.SECONDS);
+    TestUtil.await(task, 1000, TimeUnit.SECONDS);
 
     factory.verifyOldMock();
     TestUtil.verifyTaskStateChanges("cancelledUpload", task.getResult().toString());
@@ -466,7 +486,7 @@ public void fileUploadRecovery() throws Exception {
 
     Task<StringBuilder> task = TestUploadHelper.fileUpload(sourceFile, "flubbertest.jpg");
 
-    TestUtil.await(task, 5, TimeUnit.SECONDS);
+    TestUtil.await(task, 4, TimeUnit.MINUTES);
 
     factory.verifyOldMock();
     TestUtil.verifyTaskStateChanges("fileUploadRecovery", task.getResult().toString());
@@ -489,7 +509,7 @@ public void fileUploadNoRecovery() throws Exception {
 
     Task<StringBuilder> task = TestUploadHelper.fileUpload(sourceFile, "flubbertest.jpg");
 
-    TestUtil.await(task, 5, TimeUnit.SECONDS);
+    TestUtil.await(task);
 
     factory.verifyOldMock();
     TestUtil.verifyTaskStateChanges("fileUploadNoRecovery", task.getResult().toString());
diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/internal/UtilTest.java b/firebase-storage/src/test/java/com/google/firebase/storage/internal/UtilTest.java
index 8d3866afda2..50d908a587e 100644
--- a/firebase-storage/src/test/java/com/google/firebase/storage/internal/UtilTest.java
+++ b/firebase-storage/src/test/java/com/google/firebase/storage/internal/UtilTest.java
@@ -20,7 +20,7 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseException;
 import com.google.firebase.appcheck.AppCheckTokenResult;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -40,7 +40,7 @@ public class UtilTest {
   // Tasks.await() cannot be invoked on the main thread, so we need a real executor.
   private final ExecutorService executorService = Executors.newSingleThreadExecutor();
 
-  @Mock InternalAppCheckTokenProvider mockAppCheckTokenProvider;
+  @Mock InteropAppCheckTokenProvider mockAppCheckTokenProvider;
   @Mock AppCheckTokenResult mockAppCheckTokenResult;
 
   @Before
diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/ktx/StorageTest.kt b/firebase-storage/src/test/java/com/google/firebase/storage/ktx/StorageTest.kt
new file mode 100644
index 00000000000..0164695e901
--- /dev/null
+++ b/firebase-storage/src/test/java/com/google/firebase/storage/ktx/StorageTest.kt
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.storage.ktx
+
+import android.net.Uri
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.ktx.app
+import com.google.firebase.ktx.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import com.google.firebase.storage.FileDownloadTask
+import com.google.firebase.storage.FirebaseStorage
+import com.google.firebase.storage.KtxTestUtil
+import com.google.firebase.storage.StorageMetadata
+import com.google.firebase.storage.StorageReference
+import com.google.firebase.storage.StreamDownloadTask
+import com.google.firebase.storage.UploadTask
+import java.io.ByteArrayInputStream
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.robolectric.RobolectricTestRunner
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class StorageTests : BaseTestCase() {
+
+  @Test
+  fun `storage should delegate to FirebaseStorage#getInstance()`() {
+    assertThat(Firebase.storage).isSameInstanceAs(FirebaseStorage.getInstance())
+  }
+
+  @Test
+  fun `FirebaseApp#storage should delegate to FirebaseStorage#getInstance(FirebaseApp)`() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.storage(app)).isSameInstanceAs(FirebaseStorage.getInstance(app))
+  }
+
+  @Test
+  fun `Firebase#storage should delegate to FirebaseStorage#getInstance(url)`() {
+    val url = "gs://valid.url"
+    assertThat(Firebase.storage(url)).isSameInstanceAs(FirebaseStorage.getInstance(url))
+  }
+
+  @Test
+  fun `Firebase#storage should delegate to FirebaseStorage#getInstance(FirebaseApp, url)`() {
+    val app = Firebase.app(EXISTING_APP)
+    val url = "gs://valid.url"
+    assertThat(Firebase.storage(app, url)).isSameInstanceAs(FirebaseStorage.getInstance(app, url))
+  }
+
+  @Test
+  fun `storageMetadata type-safe builder extension works`() {
+    val storage = Firebase.storage
+    val metadata: StorageMetadata = storageMetadata {
+      contentLanguage = "en_us"
+      contentType = "text/html"
+      contentEncoding = "utf-8"
+      cacheControl = "no-cache"
+      contentDisposition = "attachment"
+    }
+
+    assertThat(metadata.getContentType()).isEqualTo("text/html")
+    assertThat(metadata.getCacheControl()).isEqualTo("no-cache")
+  }
+
+  @Test
+  fun `ListResult destructuring declarations work`() {
+    val mockListResult =
+      KtxTestUtil.listResult(listOf<StorageReference>(), listOf<StorageReference>(), null)
+
+    val (items, prefixes, pageToken) = mockListResult
+    assertThat(items).isSameInstanceAs(mockListResult.items)
+    assertThat(prefixes).isSameInstanceAs(mockListResult.prefixes)
+    assertThat(pageToken).isSameInstanceAs(mockListResult.pageToken)
+  }
+
+  @Test
+  fun `UploadTask#TaskSnapshot destructuring declarations work`() {
+    val mockTaskSnapshot = Mockito.mock(UploadTask.TaskSnapshot::class.java)
+    `when`(mockTaskSnapshot.bytesTransferred).thenReturn(50)
+    `when`(mockTaskSnapshot.totalByteCount).thenReturn(100)
+    `when`(mockTaskSnapshot.metadata)
+      .thenReturn(
+        storageMetadata {
+          contentType = "image/png"
+          contentEncoding = "utf-8"
+        }
+      )
+    `when`(mockTaskSnapshot.uploadSessionUri).thenReturn(Uri.parse("https://test.com"))
+
+    val (bytesTransferred, totalByteCount, metadata, sessionUri) = mockTaskSnapshot
+
+    assertThat(bytesTransferred).isSameInstanceAs(mockTaskSnapshot.bytesTransferred)
+    assertThat(totalByteCount).isSameInstanceAs(mockTaskSnapshot.totalByteCount)
+    assertThat(metadata).isSameInstanceAs(mockTaskSnapshot.metadata)
+    assertThat(sessionUri).isSameInstanceAs(mockTaskSnapshot.uploadSessionUri)
+  }
+
+  @Test
+  fun `StreamDownloadTask#TaskSnapshot destructuring declarations work`() {
+    val mockTaskSnapshot = Mockito.mock(StreamDownloadTask.TaskSnapshot::class.java)
+    `when`(mockTaskSnapshot.bytesTransferred).thenReturn(50)
+    `when`(mockTaskSnapshot.totalByteCount).thenReturn(100)
+    `when`(mockTaskSnapshot.stream).thenReturn(ByteArrayInputStream("test".toByteArray()))
+
+    val (bytesTransferred, totalByteCount, stream) = mockTaskSnapshot
+
+    assertThat(bytesTransferred).isSameInstanceAs(mockTaskSnapshot.bytesTransferred)
+    assertThat(totalByteCount).isSameInstanceAs(mockTaskSnapshot.totalByteCount)
+    assertThat(stream).isSameInstanceAs(mockTaskSnapshot.stream)
+  }
+
+  @Test
+  fun `FileDownloadTask#TaskSnapshot destructuring declarations work`() {
+    val mockTaskSnapshot = Mockito.mock(FileDownloadTask.TaskSnapshot::class.java)
+    `when`(mockTaskSnapshot.bytesTransferred).thenReturn(50)
+    `when`(mockTaskSnapshot.totalByteCount).thenReturn(100)
+
+    val (bytesTransferred, totalByteCount) = mockTaskSnapshot
+
+    assertThat(bytesTransferred).isSameInstanceAs(mockTaskSnapshot.bytesTransferred)
+    assertThat(totalByteCount).isSameInstanceAs(mockTaskSnapshot.totalByteCount)
+  }
+}
+
+@RunWith(RobolectricTestRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun `library version should be registered with runtime`() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}
diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/network/MockConnectionFactory.java b/firebase-storage/src/test/java/com/google/firebase/storage/network/MockConnectionFactory.java
index 6c1e419e9a6..63320e95b7a 100644
--- a/firebase-storage/src/test/java/com/google/firebase/storage/network/MockConnectionFactory.java
+++ b/firebase-storage/src/test/java/com/google/firebase/storage/network/MockConnectionFactory.java
@@ -20,6 +20,7 @@
 
 import android.util.Base64;
 import androidx.annotation.NonNull;
+import com.google.firebase.storage.BuildConfig;
 import com.google.firebase.storage.network.connection.HttpURLConnectionFactory;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -44,10 +45,10 @@
 
 public class MockConnectionFactory implements HttpURLConnectionFactory {
   private final boolean binaryBody;
-  private HttpURLConnection oldMock;
-  private List<String> verifications = new ArrayList<>();
   private final BufferedReader br;
   private final Semaphore pauseSemaphore = new Semaphore(0);
+  private HttpURLConnection oldMock;
+  private List<String> verifications = new ArrayList<>();
   private int lineCount = 0;
   private int pauseRecord = Integer.MAX_VALUE;
   private int currentRecord = 0;
@@ -69,6 +70,11 @@ public MockConnectionFactory(String testName, boolean binaryBody) {
     }
   }
 
+  private static InputStream getResFile(String fileName) {
+    ClassLoader classLoader = MockConnectionFactory.class.getClassLoader();
+    return classLoader.getResourceAsStream("activitylogs/" + fileName);
+  }
+
   public void setPauseRecord(int pauseRecord) {
     this.pauseRecord = pauseRecord;
   }
@@ -77,11 +83,6 @@ public Semaphore getSemaphore() {
     return pauseSemaphore;
   }
 
-  private static InputStream getResFile(String fileName) {
-    ClassLoader classLoader = MockConnectionFactory.class.getClassLoader();
-    return classLoader.getResourceAsStream("activitylogs/" + fileName);
-  }
-
   @Override
   public synchronized HttpURLConnection createInstance(@NonNull URL url) throws IOException {
     verifyOldMock();
@@ -206,7 +207,11 @@ public synchronized void verifyOldMock() {
             key = value.substring(0, comma);
             value = value.substring(comma + 1);
             requestPropertyKeys.add(key);
-            requestPropertyValues.add(value);
+            if (key.equals("X-Firebase-Storage-Version")) {
+              requestPropertyValues.add("Android/" + BuildConfig.VERSION_NAME);
+            } else {
+              requestPropertyValues.add(value);
+            }
           }
         } else if (key.equalsIgnoreCase("setDoOutput")) {
           verify(oldMock).setDoOutput("true".equals(value));
diff --git a/firebase-storage/src/test/resources/activitylogs/fileUploadWith500_network.txt b/firebase-storage/src/test/resources/activitylogs/fileUploadWith500_network.txt
new file mode 100644
index 00000000000..9b462baf726
--- /dev/null
+++ b/firebase-storage/src/test/resources/activitylogs/fileUploadWith500_network.txt
@@ -0,0 +1,647 @@
+
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Header-Content-Type,image/jpeg
+setRequestProperty:X-Goog-Upload-Command,start
+setRequestProperty:Content-Type,application/json
+setDoOutput:true
+setRequestProperty:Content-Length,59
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:200
+getHeaderFields:
+ null:[HTTP/1.1 200 OK]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:23 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137242316]
+ X-Android-Response-Source:[NETWORK 200]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242023]
+ X-Goog-Upload-Chunk-Granularity:[262144]
+ X-Goog-Upload-Control-URL:[https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable]
+ X-Goog-Upload-Status:[active]
+ X-Goog-Upload-URL:[https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/195,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V97mApXQtgaL-JK4Dg]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/195,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/195]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[success]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Offset,0
+setRequestProperty:X-Goog-Upload-Command,upload
+setDoOutput:true
+setRequestProperty:Content-Length,262144
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:500
+getHeaderFields:
+ null:[HTTP/1.1 500 INTERNAL SERVER ERROR]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:23 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137242929]
+ X-Android-Response-Source:[NETWORK 500]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242334]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9zbFduStgbkjq7wAg]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[failure]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Command,query
+setRequestProperty:Content-Length,0
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:200
+getHeaderFields:
+ null:[HTTP/1.1 200 OK]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:24 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137243529]
+ X-Android-Response-Source:[NETWORK 200]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242953]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9TPO7SRtgaHrYKAAQ]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[success]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Offset,0
+setRequestProperty:X-Goog-Upload-Command,upload
+setDoOutput:true
+setRequestProperty:Content-Length,262144
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:500
+getHeaderFields:
+ null:[HTTP/1.1 500 INTERNAL SERVER ERROR]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:23 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137242929]
+ X-Android-Response-Source:[NETWORK 500]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242334]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9zbFduStgbkjq7wAg]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[failure]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Command,query
+setRequestProperty:Content-Length,0
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:200
+getHeaderFields:
+ null:[HTTP/1.1 200 OK]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:24 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137243529]
+ X-Android-Response-Source:[NETWORK 200]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242953]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9TPO7SRtgaHrYKAAQ]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[success]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Offset,0
+setRequestProperty:X-Goog-Upload-Command,upload
+setDoOutput:true
+setRequestProperty:Content-Length,262144
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:500
+getHeaderFields:
+ null:[HTTP/1.1 500 INTERNAL SERVER ERROR]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:23 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137242929]
+ X-Android-Response-Source:[NETWORK 500]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242334]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9zbFduStgbkjq7wAg]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[failure]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Command,query
+setRequestProperty:Content-Length,0
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:200
+getHeaderFields:
+ null:[HTTP/1.1 200 OK]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:24 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137243529]
+ X-Android-Response-Source:[NETWORK 200]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242953]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9TPO7SRtgaHrYKAAQ]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[success]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Offset,0
+setRequestProperty:X-Goog-Upload-Command,upload
+setDoOutput:true
+setRequestProperty:Content-Length,262144
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:500
+getHeaderFields:
+ null:[HTTP/1.1 500 INTERNAL SERVER ERROR]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:23 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137242929]
+ X-Android-Response-Source:[NETWORK 500]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242334]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9zbFduStgbkjq7wAg]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[failure]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Command,query
+setRequestProperty:Content-Length,0
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:200
+getHeaderFields:
+ null:[HTTP/1.1 200 OK]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:24 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137243529]
+ X-Android-Response-Source:[NETWORK 200]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242953]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9TPO7SRtgaHrYKAAQ]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[success]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Offset,0
+setRequestProperty:X-Goog-Upload-Command,upload
+setDoOutput:true
+setRequestProperty:Content-Length,262144
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:500
+getHeaderFields:
+ null:[HTTP/1.1 500 INTERNAL SERVER ERROR]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:23 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137242929]
+ X-Android-Response-Source:[NETWORK 500]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242334]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9zbFduStgbkjq7wAg]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[failure]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Command,query
+setRequestProperty:Content-Length,0
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:200
+getHeaderFields:
+ null:[HTTP/1.1 200 OK]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:24 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137243529]
+ X-Android-Response-Source:[NETWORK 200]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242953]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9TPO7SRtgaHrYKAAQ]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[success]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Offset,0
+setRequestProperty:X-Goog-Upload-Command,upload
+setDoOutput:true
+setRequestProperty:Content-Length,262144
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:500
+getHeaderFields:
+ null:[HTTP/1.1 500 INTERNAL SERVER ERROR]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:23 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137242929]
+ X-Android-Response-Source:[NETWORK 500]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242334]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9zbFduStgbkjq7wAg]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[failure]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Command,query
+setRequestProperty:Content-Length,0
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:200
+getHeaderFields:
+ null:[HTTP/1.1 200 OK]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:24 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137243529]
+ X-Android-Response-Source:[NETWORK 200]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242953]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9TPO7SRtgaHrYKAAQ]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[success]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Offset,0
+setRequestProperty:X-Goog-Upload-Command,upload
+setDoOutput:true
+setRequestProperty:Content-Length,262144
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:500
+getHeaderFields:
+ null:[HTTP/1.1 500 INTERNAL SERVER ERROR]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:23 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137242929]
+ X-Android-Response-Source:[NETWORK 500]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242334]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9zbFduStgbkjq7wAg]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[failure]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Command,query
+setRequestProperty:Content-Length,0
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:200
+getHeaderFields:
+ null:[HTTP/1.1 200 OK]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:24 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137243529]
+ X-Android-Response-Source:[NETWORK 200]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242953]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9TPO7SRtgaHrYKAAQ]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/880]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[success]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
+<new>
+Url:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+setRequestMethod:POST
+setRequestProperty:X-Firebase-Storage-Version,Android/[No Gmscore]
+setRequestProperty:x-firebase-gmpid,fooey
+setRequestProperty:x-firebase-appcheck,eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ==
+setRequestProperty:X-Goog-Upload-Protocol,resumable
+setRequestProperty:X-Goog-Upload-Offset,0
+setRequestProperty:X-Goog-Upload-Command,upload
+setDoOutput:true
+setRequestProperty:Content-Length,262144
+setUseCaches:false
+setDoInput:true
+getOutputStream:
+getResponseCode:500
+getHeaderFields:
+ null:[HTTP/1.1 500 INTERNAL SERVER ERROR]
+ Alt-Svc:[quic=":443"; ma=2592000; v="36,35,34,33,32"]
+ Content-Length:[0]
+ Content-Type:[text/html; charset=UTF-8]
+ Date:[Mon, 10 Oct 2016 22:07:23 GMT]
+ Server:[UploadServer]
+ X-Android-Received-Millis:[1476137242929]
+ X-Android-Response-Source:[NETWORK 500]
+ X-Android-Selected-Protocol:[http/1.1]
+ X-Android-Sent-Millis:[1476137242334]
+ X-Goog-Upload-Status:[active]
+ X-Google-Backends:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-DOS-Service-Trace:[main:apps-upload-embargo]
+ X-Google-GFE-Backend-Request-Info:[eid=GxH8V9zbFduStgbkjq7wAg]
+ X-Google-GFE-Request-Trace:[acsfoc19:443,/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927,acsfoc19:443]
+ X-Google-GFE-Response-Code-Details-Trace:[response_code_set_by_backend]
+ X-Google-GFE-Service-Trace:[apps-upload-embargo]
+ X-Google-Netmon-Label:[/bns/ph/borg/ph/bns/apps-upload/apps-upload.uploader/927]
+ X-Google-Service:[apps-upload-embargo]
+ X-Google-Shellfish-Status:[CIgCQEY]
+ X-GUploader-Customer:[firebase-storage]
+ X-GUploader-Request-Result:[failure]
+ X-GUploader-UploadID:[AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg]
+getInputStream:
+disconnect:
diff --git a/firebase-storage/src/test/resources/activitylogs/fileUploadWith500_task.txt b/firebase-storage/src/test/resources/activitylogs/fileUploadWith500_task.txt
new file mode 100644
index 00000000000..063ec876dcc
--- /dev/null
+++ b/firebase-storage/src/test/resources/activitylogs/fileUploadWith500_task.txt
@@ -0,0 +1,68 @@
+
+onProgress:
+  exceptionMessage:<none>
+  targetStorageString:gs://fooey.appspot.com/image.jpg
+  bytesUploaded:0
+  currentState:2
+  uploadUri:<none>
+  total bytes:1076408
+onProgress:
+  exceptionMessage:<none>
+  targetStorageString:gs://fooey.appspot.com/image.jpg
+  bytesUploaded:0
+  currentState:4
+  uploadUri:<none>
+  total bytes:1076408
+onProgress:
+  exceptionMessage:<none>
+  targetStorageString:gs://fooey.appspot.com/image.jpg
+  bytesUploaded:0
+  currentState:4
+  uploadUri:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+  total bytes:1076408
+onProgress:
+  exceptionMessage:<none>
+  targetStorageString:gs://fooey.appspot.com/image.jpg
+  bytesUploaded:0
+  currentState:4
+  uploadUri:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+  total bytes:1076408
+onProgress:
+  exceptionMessage:<none>
+  targetStorageString:gs://fooey.appspot.com/image.jpg
+  bytesUploaded:0
+  currentState:4
+  uploadUri:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+  total bytes:1076408
+onProgress:
+  exceptionMessage:<none>
+  targetStorageString:gs://fooey.appspot.com/image.jpg
+  bytesUploaded:0
+  currentState:4
+  uploadUri:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+  total bytes:1076408
+onProgress:
+  exceptionMessage:<none>
+  targetStorageString:gs://fooey.appspot.com/image.jpg
+  bytesUploaded:0
+  currentState:4
+  uploadUri:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+  total bytes:1076408
+onProgress:
+  exceptionMessage:<none>
+  targetStorageString:gs://fooey.appspot.com/image.jpg
+  bytesUploaded:0
+  currentState:4
+  uploadUri:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+  total bytes:1076408
+onProgress:
+  exceptionMessage:<none>
+  targetStorageString:gs://fooey.appspot.com/image.jpg
+  bytesUploaded:0
+  currentState:4
+  uploadUri:https://firebasestorage.googleapis.com/v0/b/fooey.appspot.com/o?name=image.jpg&uploadType=resumable&upload_id=AEnB2Uq98TD5-fHipJMqNua3J76QCFnDacqBbwpZJjpAVHWATgGP4sXS4zu2wBu-h4KKn2-jGDchzM59eFRVlqIN-PF5mtmNdg&upload_protocol=resumable
+  total bytes:1076408
+onFailure:
+com.google.firebase.storage.StorageException: The operation retry limit has been exceeded.
+onComplete:Success=
+false
\ No newline at end of file
diff --git a/firebase-storage/src/testUtil/java/com/google/firebase/storage/ControllableSchedulerHelper.java b/firebase-storage/src/testUtil/java/com/google/firebase/storage/ControllableSchedulerHelper.java
index 092c8c00dc9..133de300dcd 100644
--- a/firebase-storage/src/testUtil/java/com/google/firebase/storage/ControllableSchedulerHelper.java
+++ b/firebase-storage/src/testUtil/java/com/google/firebase/storage/ControllableSchedulerHelper.java
@@ -15,7 +15,6 @@
 package com.google.firebase.storage;
 
 import android.annotation.SuppressLint;
-import com.google.android.gms.common.internal.Preconditions;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -60,13 +59,21 @@ public synchronized void resume() {
   }
 
   /** Verify that all callbacks run on the same thread. */
-  public void verifyCallbackThread() {
+  public synchronized void verifyCallbackThread() {
     if (callbackThread == null) {
       callbackThread = Thread.currentThread().getId();
     }
-    Preconditions.checkState(
-        callbackThread == Thread.currentThread().getId(),
-        "Callback fired on unexpected callback thread.");
+
+    if (callbackThread != Thread.currentThread().getId()) {
+      /*
+       * TODO(b/279463318): This should be removed in the future.
+       * Previously, since we used to guarantee max one live thread at any given time,
+       * this threw an error if the executor ran the callback on a new thread.
+       * Since we no longer guarantee this, there's a chance that the executor may spawn a new thread if no tasks are pending.
+       * The error remains for future debugging needs.
+       */
+      System.err.println("WARNING: Callback fired on unexpected callback thread.");
+    }
   }
 
   @Override
diff --git a/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestDownloadHelper.java b/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestDownloadHelper.java
index 6fa0faf126a..10607e01af5 100644
--- a/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestDownloadHelper.java
+++ b/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestDownloadHelper.java
@@ -266,15 +266,15 @@ private static void verifyTaskCount(StorageReference reference, int expectedTask
     List<FileDownloadTask> globalDownloadTasks = reference.getActiveDownloadTasks();
     Preconditions.checkState(
         globalDownloadTasks.size() == expectedTasks,
-        "Expected active download task to contain %s item(s), but contained %s item(s)",
+        "Expected active download task to contain %d item(s), but contained %d item(s)",
         globalDownloadTasks.size(),
         expectedTasks);
     List<FileDownloadTask> downloadTasksAtParent =
         StorageTaskManager.getInstance().getDownloadTasksUnder(reference.getParent());
     Preconditions.checkState(
         downloadTasksAtParent.size() == expectedTasks,
-        "Expected active download task at location %s to contain %s item(s), "
-            + "but contained %s item(s)",
+        "Expected active download task at location %s to contain %d item(s), "
+            + "but contained %d item(s)",
         reference.getParent(),
         downloadTasksAtParent.size(),
         expectedTasks);
diff --git a/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestUploadHelper.java b/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestUploadHelper.java
index dc01718cca8..7138391cd54 100644
--- a/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestUploadHelper.java
+++ b/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestUploadHelper.java
@@ -557,7 +557,7 @@ public static Task<StringBuilder> adaptiveChunking() {
     final ByteArrayInputStream inputStream = new ByteArrayInputStream(data);
 
     // This test will upload 2 MB of data:
-    //  - it will read and upload one chunk of 256KB (258KB read, 258KB uploaded)
+    //  - it will read and upload one chunk of 256KB (256KB read, 256KB uploaded)
     //  - it will read and upload one chunk of 512KB (768KB read, 768KB uploaded)
     //  - it will read and fail the upload one chunk of 1MB (1.75MB read, 768KB uploaded)
     //  - it will upload 256KB from its local cache (1.75MB read, 1MB uploaded)
@@ -686,7 +686,8 @@ private static void verifyTaskCount(StorageReference reference, int expectedTask
     List<UploadTask> globalUploadTasks = reference.getActiveUploadTasks();
     Preconditions.checkState(
         globalUploadTasks.size() == expectedTasks,
-        "Expected active upload task to contain %s item(s), but contained %s item(s)",
+        "Expected active upload task to contain %d item(s), but contained %d item(s)",
+        expectedTasks,
         globalUploadTasks.size());
     List<UploadTask> uploadTasksAtParent =
         StorageTaskManager.getInstance().getUploadTasksUnder(reference.getParent());
@@ -695,6 +696,7 @@ private static void verifyTaskCount(StorageReference reference, int expectedTask
         "Expected active upload task at location %s to contain %s item(s), "
             + "but contained %s item(s)",
         reference.getParent(),
+        expectedTasks,
         uploadTasksAtParent.size());
   }
 
diff --git a/firebase-storage/src/testUtil/java/com/google/firebase/storage/network/MockInputStreamHelper.java b/firebase-storage/src/testUtil/java/com/google/firebase/storage/network/MockInputStreamHelper.java
index e03c90575f8..c9f1ba566a1 100644
--- a/firebase-storage/src/testUtil/java/com/google/firebase/storage/network/MockInputStreamHelper.java
+++ b/firebase-storage/src/testUtil/java/com/google/firebase/storage/network/MockInputStreamHelper.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.storage.network;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,6 +38,7 @@ public MockInputStreamHelper(final byte[] responseData) {
     this.injectExceptions = new TreeSet<>();
   }
 
+  @CanIgnoreReturnValue
   public MockInputStreamHelper injectExceptionAt(int bytePos) {
     if (opened) {
       throw new IllegalStateException("Can't add exception points after reading from stream.");
diff --git a/firebase-storage/test-app/test-app.gradle b/firebase-storage/test-app/test-app.gradle
index 90b679ea702..8b7d046c990 100644
--- a/firebase-storage/test-app/test-app.gradle
+++ b/firebase-storage/test-app/test-app.gradle
@@ -14,6 +14,7 @@
 
 
 apply plugin: "com.android.application"
+apply plugin: 'copy-google-services'
 
 android {
   compileSdkVersion project.targetSdkVersion
@@ -47,25 +48,15 @@ dependencies {
     exclude group: 'com.google.firebase', module: 'firebase-common'
     exclude group: 'com.google.firebase', module: 'firebase-components'
   }
-
+  implementation 'androidx.appcompat:appcompat:1.0.2'
+  implementation 'com.google.android.gms:play-services-base:18.0.1'
+  implementation 'com.google.android.gms:play-services-basement:18.1.0'
+  implementation 'com.google.android.material:material:1.0.0'
+  implementation 'com.google.firebase:firebase-auth:20+'
   // We intentionally use an open ended version to pick up any SNAPSHOT
   // versions published to the root project' s build/ directory.
   implementation 'com.google.firebase:firebase-common:19+'
-  implementation 'com.google.firebase:firebase-auth:20+'
-  implementation 'com.google.android.gms:play-services-basement:18.0.0'
-  implementation 'com.google.android.gms:play-services-base:18.0.1'
 
-  implementation 'com.google.android.material:material:1.0.0'
-  implementation 'androidx.appcompat:appcompat:1.0.2'
-
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
   androidTestImplementation 'androidx.test:rules:1.2.0'
+  androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
-
-
-// ==========================================================================
-// Copy from here down if you want to use the google-services plugin in your
-// androidTest integration tests.
-// ==========================================================================
-ext.packageName = "com.example.storage"
-apply from: '../../gradle/googleServices.gradle'
diff --git a/gradle.properties b/gradle.properties
index cde160bba8d..c1aa7f84562 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,12 +11,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-org.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=8g
+org.gradle.jvmargs=-Xmx8g
 
 org.gradle.parallel=true
 org.gradle.caching=true
 
-firebase.checks.errorproneProjects=:tools:errorprone
 firebase.checks.lintProjects=:tools:lint
 
 systemProp.illegal-access=warn
+
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/errorProne.gradle b/gradle/errorProne.gradle
index 8fefb591e73..f7f1874f512 100644
--- a/gradle/errorProne.gradle
+++ b/gradle/errorProne.gradle
@@ -14,7 +14,7 @@
 
 def isErrorProneRequested = getGradle().getStartParameter().getTaskNames().contains("withErrorProne")
 
-def errorproneVersion = '2.4.0'
+def errorproneVersion = '2.26.0'
 def errorproneJavacVersion = '9+181-r4173-1'
 
 if (isErrorProneRequested) {
diff --git a/gradle/googleServices.gradle b/gradle/googleServices.gradle
deleted file mode 100644
index 7b65e39c662..00000000000
--- a/gradle/googleServices.gradle
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Copy 'google-services' JSON file specified in the FIREBASE_GOOGLE_SERVICES_PATH environment
-// variable (default: "${project.rootDir}/google-services.json").
-// Note that this fails silently.
-task copyRootGoogleServices(type: Copy) {
-    String sourceGoogleServicesFilePath = System.env.FIREBASE_GOOGLE_SERVICES_PATH ?: "${rootDir}/google-services.json"
-
-    // Copies the 'google-services.json' from (source) into (destination)
-    from sourceGoogleServicesFilePath
-    into projectDir
-
-    // Renames the source file to 'google-services.json' (handy if the source json file name is different)
-    rename {
-        'google-services.json'
-    }
-
-    String targetPackageLine = "\"package_name\": \"${packageName}\""
-    boolean targetPackageFound = false
-
-    File sourceGoogleServicesFile = new File(sourceGoogleServicesFilePath)
-    if (sourceGoogleServicesFile.exists()) {
-        targetPackageFound = sourceGoogleServicesFile.getText('UTF-8').contains(targetPackageLine)
-    }
-
-    println(sprintf("Task:copyRootGoogleServices -> sourceGoogleServicesFile {path: '%s', exists: %b}" +
-            ", dest {path: '%s'}, targetPackage {name: '%s', foundInSource: %b}",
-            sourceGoogleServicesFile.getPath(), sourceGoogleServicesFile.exists(),
-            projectDir, packageName, targetPackageFound))
-
-    // Do not modify 'google-services.json' if the target 'package_name' already exists
-    if (!targetPackageFound) {
-        // Modifies 'google-services.json' such that all declared 'package_name' entries are
-        // replaced with the target 'package_name'. This tricks google-services plugin into thinking
-        // that the target 'package_name' is a Firebase App and allows connection to the Firebase
-        // project. Note that all events generated from that app will then go to whatever the first
-        // client entry in the 'google-services.json' file.
-        // Note: Filtering allows us to change the contents of the file that are copied from source
-        // before they reach their new destination.
-        filter { String line ->
-            return line.replaceAll(/"package_name":\s+".*"/) {
-                targetPackageLine
-            }
-        }
-    }
-}
-
-// Before the google-services plugin tries to process the JSON file, attempt
-// to copy it from the root project.
-afterEvaluate {
-    if (tasks.findByName("processReleaseGoogleServices")) {
-        processReleaseGoogleServices.dependsOn 'copyRootGoogleServices'
-    }
-    if (tasks.findByName("processDebugGoogleServices")) {
-        processDebugGoogleServices.dependsOn 'copyRootGoogleServices'
-    }
-    if (tasks.findByName("processAggressiveGoogleServices")) {
-        processAggressiveGoogleServices.dependsOn 'copyRootGoogleServices'
-    }
-}
-
-// Detect testing if the command contains any task with both the module name
-// (firebase-firestore) and the testing keyword.
-//
-// Note: this only works if the command is run explicitly, not if it's just
-// somewhere in the task graph (for instance if you ran
-// ./gradlew test at the root project).
-def isTesting = getGradle().getStartParameter().getTaskNames().any({ String taskName ->
-    def hasProjectTestTask = taskName.contains("$name") &&  ['AndroidTest', 'connectedCheck', 'deviceCheck'].any({ taskName.contains(it)})
-
-    // this is needed for storage test app to build
-    def hasStorageAppAssembleTask = taskName == ":firebase-storage:test-app:assembleRelease"
-    return hasProjectTestTask || hasStorageAppAssembleTask || taskName.contains('connectedCheck') || taskName.contains('deviceCheck') || taskName.contains('AndroidTest')
-})
-
-if (isTesting) {
-    println '[test] applying google-services plugin'
-    apply plugin: 'com.google.gms.google-services'
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000000..5cec6ee0094
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,67 @@
+[versions]
+# javalite, protoc and protobufjavautil versions should be in sync while updating and
+# it needs to match the protobuf version which grpc has transitive dependency on.
+android-lint = "31.3.2"
+autovalue = "1.10.1"
+coroutines = "1.6.4"
+dagger = "2.43.2"
+grpc = "1.57.2"
+javalite = "3.21.11"
+kotlin = "1.8.22"
+protoc = "3.21.11"
+truth = "1.4.2"
+robolectric = "4.12"
+protobufjavautil = "3.21.11"
+kotest = "5.5.5"
+quickcheck = "0.6"
+androidx-test-core="1.5.0"
+androidx-test-junit="1.1.5"
+androidx-test-truth = "1.5.0"
+
+[libraries]
+android-lint = { module = "com.android.tools.lint:lint", version.ref = "android-lint" }
+android-lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "android-lint" }
+android-lint-checks = { module = "com.android.tools.lint:lint-checks", version.ref = "android-lint" }
+android-lint-tests = { module = "com.android.tools.lint:lint-tests", version.ref = "android-lint" }
+android-lint-testutils = { module = "com.android.tools:testutils", version.ref = "android-lint" }
+androidx-annotation = { module = "androidx.annotation:annotation", version = "1.5.0" }
+androidx-core = { module = "androidx.core:core", version = "1.2.0" }
+androidx-futures = { module = "androidx.concurrent:concurrent-futures", version = "1.1.0" }
+autovalue = { module = "com.google.auto.value:auto-value", version.ref = "autovalue" }
+autovalue-annotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "autovalue" }
+dagger-dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
+dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
+errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version = "2.26.0" }
+findbugs-jsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
+javax-inject = { module = "javax.inject:javax.inject", version = "1" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+kotlin-coroutines-tasks = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "coroutines" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.5.0" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version = "3.12.13" }
+org-json = { module = "org.json:json", version = "20210307" }
+playservices-base = { module = "com.google.android.gms:play-services-base", version = "18.1.0" }
+playservices-basement = { module = "com.google.android.gms:play-services-basement", version = "18.3.0" }
+playservices-tasks = { module = "com.google.android.gms:play-services-tasks", version = "18.1.0" }
+
+# Test libs
+androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test-core" }
+androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
+androidx-test-truth = { module = "androidx.test.ext:truth", version.ref = "androidx-test-truth" }
+androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test-core" }
+androidx-test-runner = { module = "androidx.test:runner", version = "1.5.2" }
+junit = { module = "junit:junit", version = "4.13.2" }
+kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+mockito-core = { module = "org.mockito:mockito-core", version = "5.2.0" }
+mockito-dexmaker = { module = "com.linkedin.dexmaker:dexmaker-mockito", version = "2.28.3" }
+robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+truth = { module = "com.google.truth:truth", version.ref = "truth" }
+protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protobufjavautil" }
+kotest-runner = { module = "io.kotest:kotest-runner-junit4-jvm", version.ref = "kotest" }
+kotest-assertions = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest" }
+kotest-property = { module = "io.kotest:kotest-property-jvm", version.ref = "kotest" }
+quickcheck = { module = "net.java:quickcheck", version.ref = "quickcheck" }
+
+[bundles]
+kotest = ["kotest-runner", "kotest-assertions", "kotest-property"]
+playservices = ["playservices-base", "playservices-basement", "playservices-tasks"]
diff --git a/gradle/projectSettings.gradle b/gradle/projectSettings.gradle
index defb51e9fd9..69228b202d8 100644
--- a/gradle/projectSettings.gradle
+++ b/gradle/projectSettings.gradle
@@ -29,7 +29,9 @@ ext {
 
   /** Recursively renames build scripts to ${project.name}.gradle. */
   renameBuildScripts = {ProjectDescriptor project ->
-    project.buildFileName = project.parent ? "${project.name}.gradle" : 'build.gradle'
+    def ktsFile = "${project.name}.gradle.kts"
+    def projectFile = new File(project.projectDir, ktsFile).exists() ? ktsFile : "${project.name}.gradle"
+    project.buildFileName = project.parent ? projectFile : 'build.gradle'
 
     project.children.each {
       renameBuildScripts(it)
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf016b..943f0cbfa75 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5028f28f8e4..744c64d1277 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index b0d6d0ab5de..65dcd68d65c 100755
--- a/gradlew
+++ b/gradlew
@@ -1,13 +1,13 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 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
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      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,
@@ -17,78 +17,113 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle 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 Gradle
+#
+#       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/HEAD/subprojects/plugins/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
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+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
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # 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"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+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
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # 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"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || 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
@@ -105,84 +140,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+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=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=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-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" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    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
-        i=$((i+1))
+        # 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
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# 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.
+#
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
+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/gradlew.bat b/gradlew.bat
index 15e1ee37a70..6689b85beec 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -5,7 +5,7 @@
 @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      http://www.apache.org/licenses/LICENSE-2.0
+@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,
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,10 +25,14 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+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"
 
@@ -37,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,38 +65,26 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/health-metrics/README.md b/health-metrics/README.md
index bd8cb53a40c..b390ec2e938 100644
--- a/health-metrics/README.md
+++ b/health-metrics/README.md
@@ -12,4 +12,14 @@ Refer to [README.md](apk-size/README.md) in the subdirectory `apk-size` for more
 
 ## App startup time
 
-**TODO(yifany)**: Add more details once the measurement tools and infrastructure is ready.
+Firebase runs during different
+[app lifecycle](https://d.android.com/guide/components/activities/process-lifecycle)
+phases, and contributes to the overall
+[app startup time](https://d.android.com/topic/performance/vitals/launch-time)
+in many ways.
+
+We are currently using
+[benchmarking](https://d.android.com/topic/performance/benchmarking/benchmarking-overview)
+and [tracing](https://d.android.com/topic/performance/tracing) to measure its
+latency impact. Refer to [README.md](benchmark/README.md) in the subdirectory
+`benchmark` for more details.
diff --git a/health-metrics/apk-size/apk-size.gradle b/health-metrics/apk-size/apk-size.gradle
index 45717e07ae4..5c0cd6967ac 100644
--- a/health-metrics/apk-size/apk-size.gradle
+++ b/health-metrics/apk-size/apk-size.gradle
@@ -16,11 +16,11 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0-beta02'
+        classpath 'com.android.tools.build:gradle:4.2.0'
     }
 }
 
diff --git a/health-metrics/apk-size/app/configure.gradle b/health-metrics/apk-size/app/configure.gradle
index 5b09a6671e7..1efea2b8180 100644
--- a/health-metrics/apk-size/app/configure.gradle
+++ b/health-metrics/apk-size/app/configure.gradle
@@ -18,7 +18,7 @@ repositories {
         url '../../../build/m2repository/'
     }
     google()
-    jcenter()
+    mavenCentral()
 }
 
 if (project.hasProperty('sdks')) {
diff --git a/health-metrics/apk-size/app/default.gradle b/health-metrics/apk-size/app/default.gradle
index dafd18c6d7a..83932707d3a 100644
--- a/health-metrics/apk-size/app/default.gradle
+++ b/health-metrics/apk-size/app/default.gradle
@@ -25,13 +25,13 @@ android {
         abortOnError false
         checkReleaseBuilds false
     }
-    compileSdkVersion project.targetSdkVersion
+    compileSdk 33
 
     defaultConfig {
         applicationId 'com.google.apksize'
         minSdkVersion project.targetSdkVersion
         multiDexEnabled true
-        targetSdkVersion project.targetSdkVersion
+        targetSdkVersion 33
         versionCode 1
         versionName '1.0'
     }
diff --git a/health-metrics/apk-size/app/src/main/AndroidManifest.xml b/health-metrics/apk-size/app/src/main/AndroidManifest.xml
index 6c4dd85b647..bd272dc4425 100644
--- a/health-metrics/apk-size/app/src/main/AndroidManifest.xml
+++ b/health-metrics/apk-size/app/src/main/AndroidManifest.xml
@@ -7,8 +7,9 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
-            <intent-filter>
+      <activity 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/health-metrics/apk-size/gradle.properties b/health-metrics/apk-size/gradle.properties
index 963a114b25a..d0435c9120d 100644
--- a/health-metrics/apk-size/gradle.properties
+++ b/health-metrics/apk-size/gradle.properties
@@ -15,4 +15,4 @@
 android.useAndroidX=true
 android.enableJetifier=true
 
-org.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=8g
+org.gradle.jvmargs=-Xmx8g
diff --git a/health-metrics/apk-size/gradle/wrapper/gradle-wrapper.jar b/health-metrics/apk-size/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf016b..e708b1c023e 100644
Binary files a/health-metrics/apk-size/gradle/wrapper/gradle-wrapper.jar and b/health-metrics/apk-size/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/health-metrics/apk-size/gradle/wrapper/gradle-wrapper.properties b/health-metrics/apk-size/gradle/wrapper/gradle-wrapper.properties
index bb8b2fc26b2..4d9ca164914 100644
--- a/health-metrics/apk-size/gradle/wrapper/gradle-wrapper.properties
+++ b/health-metrics/apk-size/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/health-metrics/apk-size/gradlew b/health-metrics/apk-size/gradlew
index 83f2acfdc31..4f906e0c811 100755
--- a/health-metrics/apk-size/gradlew
+++ b/health-metrics/apk-size/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/health-metrics/apk-size/gradlew.bat b/health-metrics/apk-size/gradlew.bat
index 24467a141f7..ac1b06f9382 100644
--- a/health-metrics/apk-size/gradlew.bat
+++ b/health-metrics/apk-size/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 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"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/health-metrics/benchmark/README.md b/health-metrics/benchmark/README.md
new file mode 100644
index 00000000000..3cd25e9617b
--- /dev/null
+++ b/health-metrics/benchmark/README.md
@@ -0,0 +1,190 @@
+# Benchmark
+
+This directory contains the benchmark test apps used for measuring latency for
+initializing Firebase Android SDKs during app startup.
+
+## Test app configurations
+
+[config.yaml](config.yaml) contains a list of configuration blocks for
+building a macrobenchmark test app for each of the Firebase Android SDKs.
+If not all of them are required, comment out irrelevant ones for faster build
+and test time.
+
+## Run macrobenchmark tests
+
+### Prerequisite
+
+1. `fireci` CLI tool
+
+   Refer to its [readme](../../ci/fireci/README.md) for how to install it.
+
+1. `google-services.json`
+
+   Download it from the Firebase project
+   [`fireescape-integ-tests`](https://firebase.corp.google.com/u/0/project/fireescape-integ-tests)
+   to the directory `./template/app`.
+
+1. Authentication to Google Cloud
+
+   Authentication is required by Google Cloud SDK and Google Cloud Storage
+   client library used in the benchmark tests.
+
+   One simple way is to configure it is to set an environment variable
+   `GOOGLE_APPLICATION_CREDENTIALS` to a service account key file. However,
+   please refer to the official Google Cloud
+   [doc](https://cloud.google.com/docs/authentication) for full guidance on
+   authentication.
+
+### Run tests locally
+
+1. [Connect an Android device to the computer](https://d.android.com/studio/run/device)
+
+1. Run below command in the repository root directory `firebase-android-sdk`:
+
+   ```shell
+   fireci macrobenchmark run --local
+   ```
+
+   **Note**: specify `--repeat <number>` to run the test multiple times. Run
+   `fireci macrobenchmark run --help` to see more details.
+
+Alternatively, developers can also create test apps with `fireci`, and run the
+test from either CLI or Android Studio:
+
+1. Run below command to build all test apps:
+
+   ```shell
+   fireci macrobenchmark run --build-only
+   ```
+
+1. Locate the temporary test apps directory from the log, for example:
+
+   - on linux: `/tmp/benchmark-test-*/`
+   - on macos: `/var/folders/**/benchmark-test-*/`
+
+1. Start the benchmark tests from CLI or Android Studio:
+
+   - CLI
+
+     Run below command in the above test app project directory
+
+     ```
+     ./gradlew :macrobenchmark:connectedCheck
+     ```
+
+   - Android Studio
+
+     1. Import the project (e.g. `**/benchmark-test-*/firestore`) into Android Studio
+     1. Start the benchmark test by clicking gutter icons in the file `BenchmarkTest.kt`
+
+1. Inspect the benchmark test results:
+
+   - CLI
+
+     Result files are created in `<test-app-dir>/macrobenchmark/build/outputs/`:
+
+     - `*-benchmarkData.json` contains metric aggregates
+     - `*.perfetto-trace` are the raw trace files
+
+     Additionally, upload `.perfetto-trace` files to
+     [Perfetto Trace Viewer](https://ui.perfetto.dev/) to visualize all traces.
+
+   - Android Studio
+
+     Test results are displayed directly in the "Run" tool window, including
+
+     - macrobenchmark built-in metrics
+     - duration of custom traces
+     - links to trace files that can be visualized within the IDE
+
+     Alternatively, same set of result files are produced at the same output
+     location as invoking tests from CLI, which can be used for inspection.
+
+### Run tests on Firebase Test Lab
+
+Run below command to build and run all tests on FTL:
+
+```shell
+fireci macrobenchmark run --remote
+```
+
+**Note**: `--repeat <number>` is also supported to submit the test to FTL for
+`<number>` times. All tests on FTL will run in parallel.
+
+Alternatively, developers can still build test apps locally, and manually
+[run tests on FTL with `gcloud` CLI](https://firebase.google.com/docs/test-lab/android/command-line#running_your_instrumentation_tests).
+
+Aggregated benchmark results are displayed in the log. The log also
+contains links to FTL result pages and result files on Google Cloud Storage.
+
+## Analyze macrobenchmark results
+
+Besides results from `*-benchmarkData.json` as descriped above, `fireci`
+supports more in depth analysis, such as:
+
+- calculating percentiles and visualizing distributions for one test run
+- comparing two sets of results (with stats and graphs) from two different runs
+
+To see more details, run
+
+```shell
+fireci macrobenchmark analyze --help
+```
+
+### Example usage
+
+1. Analyzing local test results
+
+   ```shell
+   fireci macrobenchmark analyze --local-reports-dir <path-to-dir>
+   ```
+
+   `<path-to-dir>` is the directory containing the `*-benchmarkData.json` from
+   the local test runs.
+
+   **Note**: If the test is started:
+
+   - with `fireci macrobenchmark run --local`, `fireci` copies all benchmark
+     json files into a dir, which can be supplied here.
+   - manually (CLI or Android Studio), `<path-to-dir>` shall be the directory
+     that contains `*-benchmarkData.json` in the gradle build directory.
+
+1. Analyzing remote test results
+
+   ```shell
+   fireci macrobenchmark analyze --ftl-results-dir <dir1> --ftl-results-dir <dir2> ...
+   ```
+
+   `<dir1>`, `<dir2>` are Firebase Test Lab results directory names, such as
+   `2022-11-04_11:18:34.039437_OqZn`.
+
+1. Comparing two sets of result from two different FTL runs
+
+   ```shell
+   fireci macrobenchmark analyze \
+     --diff-mode \
+     --ctl-ftl-results-dir <dir1-from-run1> \
+     --ctl-ftl-results-dir <dir2-from-run1> \
+     ...
+     --exp-ftl-results-dir <dir1-from-run2> \
+     --exp-ftl-results-dir <dir2-from-run2> \
+     ...
+   ```
+
+   `ctl` and `exp` are short for "control group" and "experimental group".
+
+1. Comparing a local test run against a FTL run
+
+   ```shell
+   fireci macrobenchmark analyze \
+     --diff-mode \
+     --ctl-ftl-results-dir <dir1-from-ftl-run> \
+     --ctl-ftl-results-dir <dir2-from-ftl-run> \
+     ...
+     --exp-local-reports-dir <dir-from-local-run>
+   ```
+
+## Toolchains
+
+- Gradle 7.5.1
+- Android Gradle Plugin 7.2.2
diff --git a/health-metrics/benchmark/config.yaml b/health-metrics/benchmark/config.yaml
new file mode 100644
index 00000000000..5ffac2d261d
--- /dev/null
+++ b/health-metrics/benchmark/config.yaml
@@ -0,0 +1,64 @@
+# Configurations for tracing test apps construction.
+#
+# Note:
+#   - One SDK may contain multiple test apps
+#   - Common plugins and traces are applied to all test apps during runtime
+#   - Test apps can also define their additional gradle plugins and custom traces, e.g.
+#
+#     test-apps:
+#       - sdk: firebase-crashlytics
+#         name: crashlytics-1
+#         plugins: [com.google.firebase.<crashlytics-custom-plugin>]
+#         traces: [crashlytics-custom-trace]
+#
+#       - sdk: firebase-crashlytics
+#         name: crashlytics-2
+#         ......
+#
+
+common-plugins: [com.google.gms.google-services]
+
+common-traces: [Firebase, ComponentDiscovery, Runtime]
+
+test-apps:
+  - sdk: N.A.
+    name: all-included
+    dependencies:
+      - com.google.firebase:firebase-abt
+      - com.google.firebase:firebase-appcheck
+      - com.google.firebase:firebase-appdistribution
+      - com.google.firebase:firebase-crashlytics
+      - com.google.firebase:firebase-database
+      - com.google.firebase:firebase-dynamic-links
+      - com.google.firebase:firebase-firestore
+      - com.google.firebase:firebase-functions
+      - com.google.firebase:firebase-inappmessaging
+      - com.google.firebase:firebase-inappmessaging-display
+      - com.google.firebase:firebase-messaging
+      - com.google.firebase:firebase-ml-modeldownloader
+      - com.google.firebase:firebase-perf
+      - com.google.firebase:firebase-sessions
+      - com.google.firebase:firebase-storage
+    plugins:
+      - com.google.firebase.crashlytics
+      - com.google.firebase.firebase-perf
+    traces:
+      - fire-abt
+      - fire-app-check
+      - fire-appdistribution
+      - fire-cls
+      - fire-dl
+      - fire-fcm
+      - fire-fiam
+      - fire-fiamd
+      - fire-fn
+      - fire-fst
+      - fire-gcs
+      - fire-installations
+      - firebase-ml-modeldownloader
+      - fire-perf
+      - fire-perf-early
+      - fire-rc
+      - fire-rtdb
+      - fire-transport
+      - fire-sessions
diff --git a/health-metrics/macrobenchmark/template/app/build.gradle.mustache b/health-metrics/benchmark/template/app/build.gradle.mustache
similarity index 76%
rename from health-metrics/macrobenchmark/template/app/build.gradle.mustache
rename to health-metrics/benchmark/template/app/build.gradle.mustache
index 73537a6300b..98ca5f3cf15 100644
--- a/health-metrics/macrobenchmark/template/app/build.gradle.mustache
+++ b/health-metrics/benchmark/template/app/build.gradle.mustache
@@ -14,28 +14,28 @@
 
 plugins {
     id 'com.android.application'
-    id 'kotlin-android'
+    id 'org.jetbrains.kotlin.android'
     {{#plugins}}
     id '{{.}}'
     {{/plugins}}
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.3'
+    compileSdkVersion 32
 
     defaultConfig {
-        applicationId 'com.google.firebase.macrobenchmark'
+        applicationId 'com.google.firebase.benchmark'
         minSdkVersion 29
-        targetSdkVersion 30
+        targetSdkVersion 32
         versionCode 1
-        versionName "1.0"
+        versionName '1.0'
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
-        release {
+        benchmark {
+            debuggable false
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -64,12 +64,13 @@ dependencies {
     implementation '{{key}}:{{version}}'
     {{/dependencies}}
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.5.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.tracing:tracing-ktx:1.1.0'
+
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation "androidx.test.ext:junit:1.1.5"
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
diff --git a/health-metrics/macrobenchmark/template/app/proguard-rules.pro b/health-metrics/benchmark/template/app/proguard-rules.pro
similarity index 100%
rename from health-metrics/macrobenchmark/template/app/proguard-rules.pro
rename to health-metrics/benchmark/template/app/proguard-rules.pro
diff --git a/health-metrics/benchmark/template/app/src/main/AndroidManifest.xml b/health-metrics/benchmark/template/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..400075eb9c4
--- /dev/null
+++ b/health-metrics/benchmark/template/app/src/main/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.google.firebase.benchmark">
+
+    <application
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Benchmark"
+        tools:targetApi="31">
+        <profileable android:shell="true" />
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/health-metrics/benchmark/template/app/src/main/java/com/google/firebase/Utilities.kt b/health-metrics/benchmark/template/app/src/main/java/com/google/firebase/Utilities.kt
new file mode 100644
index 00000000000..917c28ec412
--- /dev/null
+++ b/health-metrics/benchmark/template/app/src/main/java/com/google/firebase/Utilities.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase
+
+import com.google.firebase.FirebaseApp
+
+internal fun initializeAllComponentsForBenchmark(app: FirebaseApp) {
+  app.initializeAllComponents()
+}
diff --git a/health-metrics/benchmark/template/app/src/main/java/com/google/firebase/benchmark/MainActivity.kt b/health-metrics/benchmark/template/app/src/main/java/com/google/firebase/benchmark/MainActivity.kt
new file mode 100644
index 00000000000..fdc9d70619b
--- /dev/null
+++ b/health-metrics/benchmark/template/app/src/main/java/com/google/firebase/benchmark/MainActivity.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.benchmark
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.google.firebase.FirebaseApp
+import com.google.firebase.initializeAllComponentsForBenchmark
+
+class MainActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        val app = FirebaseApp.getInstance()
+        initializeAllComponentsForBenchmark(app)
+    }
+}
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/health-metrics/benchmark/template/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 99%
rename from health-metrics/macrobenchmark/template/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to health-metrics/benchmark/template/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
index 2b068d11462..7706ab9e6d4 100644
--- a/health-metrics/macrobenchmark/template/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/health-metrics/benchmark/template/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -27,4 +27,4 @@
         android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
         android:strokeWidth="1"
         android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/drawable/ic_launcher_background.xml b/health-metrics/benchmark/template/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from health-metrics/macrobenchmark/template/app/src/main/res/drawable/ic_launcher_background.xml
rename to health-metrics/benchmark/template/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/layout/activity_main.xml b/health-metrics/benchmark/template/app/src/main/res/layout/activity_main.xml
similarity index 79%
rename from health-metrics/macrobenchmark/template/app/src/main/res/layout/activity_main.xml
rename to health-metrics/benchmark/template/app/src/main/res/layout/activity_main.xml
index 4fc244418b5..c75d0576c09 100644
--- a/health-metrics/macrobenchmark/template/app/src/main/res/layout/activity_main.xml
+++ b/health-metrics/benchmark/template/app/src/main/res/layout/activity_main.xml
@@ -11,8 +11,8 @@
         android:layout_height="wrap_content"
         android:text="Hello World!"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/health-metrics/benchmark/template/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 93%
rename from health-metrics/macrobenchmark/template/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to health-metrics/benchmark/template/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cfe52e..6b78462d615 100644
--- a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/health-metrics/benchmark/template/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/health-metrics/benchmark/template/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 93%
rename from health-metrics/macrobenchmark/template/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to health-metrics/benchmark/template/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cfe52e..6b78462d615 100644
--- a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/health-metrics/benchmark/template/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/health-metrics/benchmark/template/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/health-metrics/benchmark/template/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 00000000000..c209e78ecd3
Binary files /dev/null and b/health-metrics/benchmark/template/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/health-metrics/benchmark/template/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/health-metrics/benchmark/template/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 00000000000..b2dfe3d1ba5
Binary files /dev/null and b/health-metrics/benchmark/template/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/health-metrics/benchmark/template/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/health-metrics/benchmark/template/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 00000000000..4f0f1d64e58
Binary files /dev/null and b/health-metrics/benchmark/template/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/health-metrics/benchmark/template/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/health-metrics/benchmark/template/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 00000000000..62b611da081
Binary files /dev/null and b/health-metrics/benchmark/template/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/health-metrics/benchmark/template/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/health-metrics/benchmark/template/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 00000000000..948a3070fe3
Binary files /dev/null and b/health-metrics/benchmark/template/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/health-metrics/benchmark/template/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/health-metrics/benchmark/template/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000000..1b9a6956b3a
Binary files /dev/null and b/health-metrics/benchmark/template/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/health-metrics/benchmark/template/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/health-metrics/benchmark/template/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 00000000000..28d4b77f9f0
Binary files /dev/null and b/health-metrics/benchmark/template/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/health-metrics/benchmark/template/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/health-metrics/benchmark/template/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000000..9287f508362
Binary files /dev/null and b/health-metrics/benchmark/template/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/health-metrics/benchmark/template/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/health-metrics/benchmark/template/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 00000000000..aa7d6427e6f
Binary files /dev/null and b/health-metrics/benchmark/template/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/health-metrics/benchmark/template/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/health-metrics/benchmark/template/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000000..9126ae37cbc
Binary files /dev/null and b/health-metrics/benchmark/template/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/values-night/themes.xml b/health-metrics/benchmark/template/app/src/main/res/values-night/themes.xml
similarity index 86%
rename from health-metrics/macrobenchmark/template/app/src/main/res/values-night/themes.xml
rename to health-metrics/benchmark/template/app/src/main/res/values-night/themes.xml
index 88f1c721163..78ada11fae6 100644
--- a/health-metrics/macrobenchmark/template/app/src/main/res/values-night/themes.xml
+++ b/health-metrics/benchmark/template/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Macrobenchmark" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Benchmark" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -13,4 +13,4 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/values/colors.xml b/health-metrics/benchmark/template/app/src/main/res/values/colors.xml
similarity index 96%
rename from health-metrics/macrobenchmark/template/app/src/main/res/values/colors.xml
rename to health-metrics/benchmark/template/app/src/main/res/values/colors.xml
index f8c6127d327..ca1931bca99 100644
--- a/health-metrics/macrobenchmark/template/app/src/main/res/values/colors.xml
+++ b/health-metrics/benchmark/template/app/src/main/res/values/colors.xml
@@ -7,4 +7,4 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/health-metrics/benchmark/template/app/src/main/res/values/strings.xml b/health-metrics/benchmark/template/app/src/main/res/values/strings.xml
new file mode 100644
index 00000000000..2acaa64f542
--- /dev/null
+++ b/health-metrics/benchmark/template/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">benchmark</string>
+</resources>
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/values/themes.xml b/health-metrics/benchmark/template/app/src/main/res/values/themes.xml
similarity index 86%
rename from health-metrics/macrobenchmark/template/app/src/main/res/values/themes.xml
rename to health-metrics/benchmark/template/app/src/main/res/values/themes.xml
index 2bbfc467c2c..11866afe933 100644
--- a/health-metrics/macrobenchmark/template/app/src/main/res/values/themes.xml
+++ b/health-metrics/benchmark/template/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Macrobenchmark" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Benchmark" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -13,4 +13,4 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/health-metrics/benchmark/template/app/src/main/res/xml/backup_rules.xml b/health-metrics/benchmark/template/app/src/main/res/xml/backup_rules.xml
new file mode 100644
index 00000000000..148c18b6593
--- /dev/null
+++ b/health-metrics/benchmark/template/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>
diff --git a/health-metrics/benchmark/template/app/src/main/res/xml/data_extraction_rules.xml b/health-metrics/benchmark/template/app/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 00000000000..0c4f95cab91
--- /dev/null
+++ b/health-metrics/benchmark/template/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
diff --git a/health-metrics/benchmark/template/build.gradle b/health-metrics/benchmark/template/build.gradle
new file mode 100644
index 00000000000..071bb3b84f6
--- /dev/null
+++ b/health-metrics/benchmark/template/build.gradle
@@ -0,0 +1,28 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+    id 'com.android.application' version '7.2.2' apply false
+    id 'com.android.library' version '7.2.2' apply false
+    id 'com.android.test' version '7.2.2' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
+
+    id 'com.google.gms.google-services' version '4.3.13' apply false
+    id 'com.google.firebase.crashlytics' version '2.9.1' apply false
+    id 'com.google.firebase.firebase-perf' version '1.4.1' apply false
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/health-metrics/macrobenchmark/template/gradle.properties b/health-metrics/benchmark/template/gradle.properties
similarity index 96%
rename from health-metrics/macrobenchmark/template/gradle.properties
rename to health-metrics/benchmark/template/gradle.properties
index a7d19a63475..a90756bf7d4 100644
--- a/health-metrics/macrobenchmark/template/gradle.properties
+++ b/health-metrics/benchmark/template/gradle.properties
@@ -20,7 +20,7 @@
 # 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=-Xmx512m -Xms256m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx1024m -Xms512m -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
diff --git a/health-metrics/macrobenchmark/template/benchmark/build.gradle b/health-metrics/benchmark/template/macrobenchmark/build.gradle
similarity index 52%
rename from health-metrics/macrobenchmark/template/benchmark/build.gradle
rename to health-metrics/benchmark/template/macrobenchmark/build.gradle
index aacb27f8539..36154f49bca 100644
--- a/health-metrics/macrobenchmark/template/benchmark/build.gradle
+++ b/health-metrics/benchmark/template/macrobenchmark/build.gradle
@@ -13,48 +13,50 @@
 // limitations under the License.
 
 plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
+    id 'com.android.test'
+    id 'org.jetbrains.kotlin.android'
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.3'
+    compileSdkVersion 32
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
     defaultConfig {
-        minSdkVersion 29
-        targetSdkVersion 30
-        versionCode 1
-        versionName '1.0'
+        minSdk 29
+        targetSdk 32
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        benchmark {
+            debuggable = true
+            signingConfig = debug.signingConfig
+            matchingFallbacks = ["release"]
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
+    targetProjectPath = ":app"
+    experimentalProperties["android.experimental.self-instrumenting"] = true
 }
 
 dependencies {
-    androidTestImplementation 'androidx.benchmark:benchmark-macro-junit4:1.1.0-alpha02'
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.5.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.3.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation 'androidx.benchmark:benchmark-macro-junit4:1.1.0'
+    implementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation "androidx.test.ext:junit:1.1.5"
+    implementation 'androidx.test.uiautomator:uiautomator:2.2.0'
+}
+
+androidComponents {
+    beforeVariants(selector().all()) {
+        enabled = buildType == "benchmark"
+    }
 }
diff --git a/health-metrics/macrobenchmark/template/benchmark/proguard-rules.pro b/health-metrics/benchmark/template/macrobenchmark/proguard-rules.pro
similarity index 100%
rename from health-metrics/macrobenchmark/template/benchmark/proguard-rules.pro
rename to health-metrics/benchmark/template/macrobenchmark/proguard-rules.pro
diff --git a/health-metrics/benchmark/template/macrobenchmark/src/main/AndroidManifest.xml b/health-metrics/benchmark/template/macrobenchmark/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..5b21eea1a7f
--- /dev/null
+++ b/health-metrics/benchmark/template/macrobenchmark/src/main/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.firebase.macrobenchmark">
+
+    <queries>
+        <package android:name="com.google.firebase.benchmark" />
+    </queries>
+</manifest>
diff --git a/health-metrics/benchmark/template/macrobenchmark/src/main/java/com/google/firebase/macrobenchmark/BenchmarkTest.kt.mustache b/health-metrics/benchmark/template/macrobenchmark/src/main/java/com/google/firebase/macrobenchmark/BenchmarkTest.kt.mustache
new file mode 100644
index 00000000000..82dd0ecbf3b
--- /dev/null
+++ b/health-metrics/benchmark/template/macrobenchmark/src/main/java/com/google/firebase/macrobenchmark/BenchmarkTest.kt.mustache
@@ -0,0 +1,48 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.macrobenchmark
+
+import androidx.benchmark.macro.ExperimentalMetricApi
+import androidx.benchmark.macro.StartupMode
+import androidx.benchmark.macro.StartupTimingMetric
+import androidx.benchmark.macro.TraceSectionMetric
+import androidx.benchmark.macro.junit4.MacrobenchmarkRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class StartupBenchmark {
+  @get:Rule
+  val benchmarkRule = MacrobenchmarkRule()
+
+  @OptIn(ExperimentalMetricApi::class)
+  @Test
+  fun startup() = benchmarkRule.measureRepeated(
+    packageName = "com.google.firebase.benchmark",
+    metrics = listOf(
+      StartupTimingMetric(),
+      {{#traces}}
+      TraceSectionMetric("{{.}}"),
+      {{/traces}}
+    ),
+    iterations = 100,
+    startupMode = StartupMode.COLD
+  ) {
+    pressHome()
+    startActivityAndWait()
+  }
+}
diff --git a/health-metrics/macrobenchmark/template/settings.gradle b/health-metrics/benchmark/template/settings.gradle.mustache
similarity index 60%
rename from health-metrics/macrobenchmark/template/settings.gradle
rename to health-metrics/benchmark/template/settings.gradle.mustache
index 3c1a05b94ef..2428ba1c912 100644
--- a/health-metrics/macrobenchmark/template/settings.gradle
+++ b/health-metrics/benchmark/template/settings.gradle.mustache
@@ -12,6 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-rootProject.name = 'macrobenchmark'
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+
+        maven {
+            url '{{m2repository}}'
+        }
+    }
+}
+
+rootProject.name = 'benchmark'
 include ':app'
-include ':benchmark'
+include ':macrobenchmark'
diff --git a/health-metrics/macrobenchmark/config.yaml b/health-metrics/macrobenchmark/config.yaml
deleted file mode 100644
index 791885dd9ef..00000000000
--- a/health-metrics/macrobenchmark/config.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-baseline:
-  name: baseline
-
-firebase-config:
-  name: config
-  dependencies:
-    - com.google.firebase:firebase-config-ktx
-
-firebase-common:
-  name: common
-  dependencies:
-    - com.google.firebase:firebase-common
-
-firebase-crashlytics:
-  name: crash
-  dependencies:
-    - com.google.firebase:firebase-crashlytics-ktx
-  plugins:
-    - com.google.firebase.crashlytics
-
-firebase-database:
-  name: database
-  dependencies:
-    - com.google.firebase:firebase-database-ktx
-
-firebase-dynamic-links:
-  name: dynamiclinks
-  dependencies:
-    - com.google.firebase:firebase-dynamic-links-ktx
-
-firebase-firestore:
-  name: firestore
-  dependencies:
-    - com.google.firebase:firebase-firestore-ktx
-
-firebase-functions:
-  name: functions
-  dependencies:
-    - com.google.firebase:firebase-functions-ktx
-
-firebase-inappmessaging-display:
-  name: inappmessaging
-  dependencies:
-    - com.google.firebase:firebase-analytics-ktx@18.0.3
-    - com.google.firebase:firebase-inappmessaging-ktx
-    - com.google.firebase:firebase-inappmessaging-display-ktx
-
-firebase-messaging:
-  name: messaging
-  dependencies:
-    - com.google.firebase:firebase-messaging-ktx
-
-firebase-perf:
-  name: perf
-  dependencies:
-    - com.google.firebase:firebase-perf-ktx
-  plugins:
-    - com.google.firebase.firebase-perf
-
-firebase-storage:
-  name: storage
-  dependencies:
-    - com.google.firebase:firebase-storage-ktx
-
-
-
-# TODO(yifany): google3 sdks, customizing FTL devices
-# auth
-# analytics
-# combined
-#   - crashlytics + analytics
-#   - crashlytics + fireperf
-#   - auth + firestore
-#   - ...
diff --git a/health-metrics/macrobenchmark/template/app/src/main/AndroidManifest.xml b/health-metrics/macrobenchmark/template/app/src/main/AndroidManifest.xml
deleted file mode 100644
index 4920e1c389e..00000000000
--- a/health-metrics/macrobenchmark/template/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2021 Google LLC -->
-<!-- -->
-<!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
-<!-- you may not use this file except in compliance with the License. -->
-<!-- You may obtain a copy of the License at -->
-<!-- -->
-<!--      http://www.apache.org/licenses/LICENSE-2.0 -->
-<!-- -->
-<!-- Unless required by applicable law or agreed to in writing, software -->
-<!-- distributed under the License is distributed on an "AS IS" BASIS, -->
-<!-- WITHOUT 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="com.google.firebase.benchmark">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.Macrobenchmark">
-        <activity android:name=".MainActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.google.firebase.benchmark.STARTUP_ACTIVITY" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <profileable android:shell="true" />
-    </application>
-
-</manifest>
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-hdpi/ic_launcher.png b/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index a571e60098c..00000000000
Binary files a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 61da551c559..00000000000
Binary files a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-mdpi/ic_launcher.png b/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c41dd285319..00000000000
Binary files a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index db5080a7527..00000000000
Binary files a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 6dba46dab19..00000000000
Binary files a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index da31a871c8d..00000000000
Binary files a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 15ac681720f..00000000000
Binary files a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index b216f2d313c..00000000000
Binary files a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index f25a4197447..00000000000
Binary files a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index e96783ccce8..00000000000
Binary files a/health-metrics/macrobenchmark/template/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/health-metrics/macrobenchmark/template/app/src/main/res/values/strings.xml b/health-metrics/macrobenchmark/template/app/src/main/res/values/strings.xml
deleted file mode 100644
index 84d56e22541..00000000000
--- a/health-metrics/macrobenchmark/template/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">macrobenchmark</string>
-</resources>
\ No newline at end of file
diff --git a/health-metrics/macrobenchmark/template/benchmark/src/androidTest/java/com/google/firebase/benchmark/BenchmarkTest.kt.mustache b/health-metrics/macrobenchmark/template/benchmark/src/androidTest/java/com/google/firebase/benchmark/BenchmarkTest.kt.mustache
deleted file mode 100644
index 5b35820fe9b..00000000000
--- a/health-metrics/macrobenchmark/template/benchmark/src/androidTest/java/com/google/firebase/benchmark/BenchmarkTest.kt.mustache
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.benchmark
-
-import android.content.Intent
-import androidx.benchmark.macro.StartupMode
-import androidx.benchmark.macro.StartupTimingMetric
-import androidx.benchmark.macro.junit4.MacrobenchmarkRule
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.Parameterized
-
-
-@RunWith(Parameterized::class)
-class BenchmarkTest(private val startupMode: StartupMode) {
-    @get:Rule
-    val benchmarkRule = MacrobenchmarkRule()
-
-    @Test
-    fun startup() = benchmarkRule.measureRepeated(
-        packageName = "com.google.firebase.macrobenchmark",
-        metrics = listOf(StartupTimingMetric()),
-        iterations = 20,
-        startupMode = startupMode
-    ) {
-        pressHome()
-        val intent = Intent()
-        intent.setPackage("com.google.firebase.macrobenchmark")
-        intent.setAction("com.google.firebase.benchmark.STARTUP_ACTIVITY")
-        startActivityAndWait(intent)
-    }
-
-    companion object {
-        @Parameterized.Parameters(name = "mode={0}")
-        @JvmStatic
-        fun parameters(): List<Array<Any>> {
-            return listOf(StartupMode.COLD, StartupMode.WARM, StartupMode.HOT)
-                .map { arrayOf(it) }
-        }
-    }
-}
diff --git a/health-metrics/macrobenchmark/template/build.gradle b/health-metrics/macrobenchmark/template/build.gradle
deleted file mode 100644
index ba1e309c38a..00000000000
--- a/health-metrics/macrobenchmark/template/build.gradle
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-buildscript {
-    ext.kotlin_version = "1.5.0"
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:4.2.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-        classpath 'com.google.gms:google-services:4.3.5'
-
-        // Add the Crashlytics Gradle plugin (be sure to add version
-        // 2.0.0 or later if you built your app with Android Studio 4.1).
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
-
-        // Add the dependency for the Performance Monitoring plugin
-        classpath 'com.google.firebase:perf-plugin:1.3.5'  // Performance Monitoring plugin
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-
-        maven {
-            url rootProject.file('../../../../build/m2repository')
-        }
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/integ-testing/integ-testing.gradle.kts b/integ-testing/integ-testing.gradle.kts
new file mode 100644
index 00000000000..f45509fb7ef
--- /dev/null
+++ b/integ-testing/integ-testing.gradle.kts
@@ -0,0 +1,49 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+  id("com.android.library")
+  kotlin("android")
+}
+
+android {
+  val targetSdkVersion: Int by rootProject
+  val minSdkVersion: Int by rootProject
+
+  compileSdk = targetSdkVersion
+  namespace = "com.google.firebase.testing.integ"
+
+  defaultConfig {
+    minSdk = minSdkVersion
+    targetSdk = targetSdkVersion
+  }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+
+  kotlinOptions {
+    jvmTarget = "1.8"
+  }
+}
+
+dependencies {
+  implementation("com.google.firebase:firebase-common-ktx:21.0.0")
+  implementation("com.google.firebase:firebase-common:21.0.0")
+  implementation("com.google.firebase:firebase-components:18.0.0")
+  implementation(libs.androidx.test.runner)
+  implementation(libs.junit)
+  implementation(libs.kotlin.coroutines.test)
+}
diff --git a/integ-testing/src/main/AndroidManifest.xml b/integ-testing/src/main/AndroidManifest.xml
index 1f3a31eae93..caec1222802 100644
--- a/integ-testing/src/main/AndroidManifest.xml
+++ b/integ-testing/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
 <!-- limitations under the License. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  package="com.google.firebase.testing.integ">
+  xmlns:tools="http://schemas.android.com/tools">
   <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="14"/>-->
+  <!--<uses-sdk android:minSdkVersion="21"/>-->
 </manifest>
diff --git a/integ-testing/src/main/java/com/google/firebase/concurrent/TestOnlyExecutors.java b/integ-testing/src/main/java/com/google/firebase/concurrent/TestOnlyExecutors.java
new file mode 100644
index 00000000000..84ee68afe60
--- /dev/null
+++ b/integ-testing/src/main/java/com/google/firebase/concurrent/TestOnlyExecutors.java
@@ -0,0 +1,39 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.firebase.concurrent;
+
+import androidx.annotation.RestrictTo;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+
+@RestrictTo(RestrictTo.Scope.TESTS)
+public class TestOnlyExecutors {
+    public static Executor ui() {
+        return UiExecutor.INSTANCE;
+    }
+
+    public static ScheduledExecutorService background() {
+        return ExecutorsRegistrar.BG_EXECUTOR.get();
+    }
+
+    public static ScheduledExecutorService blocking() {
+        return ExecutorsRegistrar.BLOCKING_EXECUTOR.get();
+    }
+
+    public static ScheduledExecutorService lite() {
+        return ExecutorsRegistrar.LITE_EXECUTOR.get();
+    }
+}
diff --git a/integ-testing/src/main/java/com/google/firebase/testing/integ/StrictModeRule.java b/integ-testing/src/main/java/com/google/firebase/testing/integ/StrictModeRule.java
index 9720ed9bf8f..abe3703f4de 100644
--- a/integ-testing/src/main/java/com/google/firebase/testing/integ/StrictModeRule.java
+++ b/integ-testing/src/main/java/com/google/firebase/testing/integ/StrictModeRule.java
@@ -14,6 +14,7 @@
 
 package com.google.firebase.testing.integ;
 
+import android.annotation.SuppressLint;
 import android.os.Build;
 import android.os.StrictMode;
 import android.os.StrictMode.ThreadPolicy;
@@ -64,6 +65,7 @@ public class StrictModeRule implements TestRule {
   private static final Executor penaltyListenerExecutor = Runnable::run;
 
   /** Runs {@code runnable} on Main thread. */
+  @SuppressLint("RestrictedApi")
   public <E extends Throwable> void runOnMainThread(MaybeThrowingRunnable<E> runnable) throws E {
     try {
       new UiThreadStatement(
@@ -83,6 +85,7 @@ public void evaluate() throws E {
   }
 
   /** Runs {@code callable} on Main thread and returns it result. */
+  @SuppressLint("RestrictedApi")
   public <T, E extends Throwable> T runOnMainThread(MaybeThrowingCallable<T, E> callable) throws E {
     try {
       AtomicReference<T> result = new AtomicReference<>();
diff --git a/integ-testing/src/main/kotlin/com/google/firebase/testing/integ/TestScopeExtensions.kt b/integ-testing/src/main/kotlin/com/google/firebase/testing/integ/TestScopeExtensions.kt
new file mode 100644
index 00000000000..451707ce401
--- /dev/null
+++ b/integ-testing/src/main/kotlin/com/google/firebase/testing/integ/TestScopeExtensions.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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:OptIn(ExperimentalCoroutinesApi::class)
+
+package com.google.firebase.testing.integ
+
+import androidx.annotation.RestrictTo
+import com.google.firebase.concurrent.TestOnlyExecutors
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.test.TestScope
+
+/**
+ * Container for type-safe access to the [CoroutineContext] of [TestOnlyExecutors].
+ *
+ * @property ui the instance provided by [TestOnlyExecutors.ui]
+ * @property blocking the instance provided by [TestOnlyExecutors.blocking]
+ * @property background the instance provided by [TestOnlyExecutors.background]
+ * @property lite the instance provided by [TestOnlyExecutors.lite]
+ * @see TestScope.firebaseExecutors
+ */
+data class FirebaseTestExecutorsContainer(
+  val ui: CoroutineContext,
+  val blocking: CoroutineContext,
+  val background: CoroutineContext,
+  val lite: CoroutineContext
+)
+
+/**
+ * Provides a [CoroutineContext] of a given [TestOnlyExecutors] merged with this [TestScope].
+ *
+ * Your standard [TestOnlyExecutors] does not support special mechanisms that other [TestScope] may
+ * provide (such as fast forwarding). To fix this, you must wrap the [CoroutineContext] of a given
+ * [TestOnlyExecutors] with the inherited one in a [TestScope]. This property facilitates that
+ * automatically.
+ *
+ * Now, you can utilize [TestOnlyExecutors] AND special methods provided to [TestScope].
+ *
+ * Example usage:
+ * ```
+ * @Test
+ * fun doesStuff() = runTest {
+ *   val scope = CoroutineScope(firebaseExecutors.background)
+ *   scope.launch {
+ *    // ... does stuff
+ *   }
+ *
+ *   runCurrent()
+ * }
+ * ```
+ */
+@get:RestrictTo(RestrictTo.Scope.TESTS)
+@get:Suppress("RestrictedApi")
+val TestScope.firebaseExecutors: FirebaseTestExecutorsContainer
+  get() =
+    FirebaseTestExecutorsContainer(
+      TestOnlyExecutors.ui().asCoroutineDispatcher() + coroutineContext,
+      TestOnlyExecutors.blocking().asCoroutineDispatcher() + coroutineContext,
+      TestOnlyExecutors.background().asCoroutineDispatcher() + coroutineContext,
+      TestOnlyExecutors.lite().asCoroutineDispatcher() + coroutineContext
+    )
diff --git a/kotlindoc/package-lists/androidx/package-list b/kotlindoc/package-lists/androidx/package-list
new file mode 100644
index 00000000000..79784a35c51
--- /dev/null
+++ b/kotlindoc/package-lists/androidx/package-list
@@ -0,0 +1,429 @@
+android.support.v4.media
+android.support.v4.media.session
+androidx.activity
+androidx.activity.contextaware
+androidx.activity.result
+androidx.activity.result.contract
+androidx.ads.identifier
+androidx.ads.identifier.provider
+androidx.annotation
+androidx.appcompat.app
+androidx.appcompat.content.res
+androidx.appcompat.graphics.drawable
+androidx.appcompat.view
+androidx.appcompat.widget
+androidx.appsearch.annotation
+androidx.appsearch.app
+androidx.appsearch.builtintypes
+androidx.appsearch.exceptions
+androidx.appsearch.localstorage
+androidx.appsearch.observer
+androidx.appsearch.platformstorage
+androidx.arch.core.executor.testing
+androidx.arch.core.util
+androidx.asynclayoutinflater.appcompat
+androidx.asynclayoutinflater.view
+androidx.autofill
+androidx.autofill.inline
+androidx.autofill.inline.common
+androidx.autofill.inline.v1
+androidx.benchmark
+androidx.benchmark.junit4
+androidx.benchmark.macro
+androidx.benchmark.macro.junit4
+androidx.benchmark.perfetto
+androidx.biometric
+androidx.biometric.auth
+androidx.browser.browseractions
+androidx.browser.customtabs
+androidx.browser.trusted
+androidx.browser.trusted.sharing
+androidx.browser.trusted.splashscreens
+androidx.camera.camera2
+androidx.camera.camera2.interop
+androidx.camera.core
+androidx.camera.extensions
+androidx.camera.lifecycle
+androidx.camera.mlkit.vision
+androidx.camera.previewview
+androidx.camera.video
+androidx.camera.view
+androidx.camera.view.transform
+androidx.camera.view.video
+androidx.camera.viewfinder
+androidx.car.app
+androidx.car.app.activity
+androidx.car.app.activity.renderer.surface
+androidx.car.app.annotations
+androidx.car.app.connection
+androidx.car.app.constraints
+androidx.car.app.hardware
+androidx.car.app.hardware.climate
+androidx.car.app.hardware.common
+androidx.car.app.hardware.info
+androidx.car.app.managers
+androidx.car.app.media
+androidx.car.app.messaging
+androidx.car.app.messaging.model
+androidx.car.app.model
+androidx.car.app.model.signin
+androidx.car.app.navigation
+androidx.car.app.navigation.model
+androidx.car.app.notification
+androidx.car.app.serialization
+androidx.car.app.suggestion
+androidx.car.app.suggestion.model
+androidx.car.app.testing
+androidx.car.app.testing.navigation
+androidx.car.app.validation
+androidx.car.app.versioning
+androidx.cardview.widget
+androidx.collection
+androidx.concurrent.futures
+androidx.constraintlayout.core
+androidx.constraintlayout.core.dsl
+androidx.constraintlayout.core.motion
+androidx.constraintlayout.core.motion.key
+androidx.constraintlayout.core.motion.parse
+androidx.constraintlayout.core.motion.utils
+androidx.constraintlayout.core.parser
+androidx.constraintlayout.core.state
+androidx.constraintlayout.core.state.helpers
+androidx.constraintlayout.core.utils
+androidx.constraintlayout.core.widgets
+androidx.constraintlayout.core.widgets.analyzer
+androidx.constraintlayout.helper.widget
+androidx.constraintlayout.motion.utils
+androidx.constraintlayout.motion.widget
+androidx.constraintlayout.utils.widget
+androidx.constraintlayout.widget
+androidx.contentpager.content
+androidx.coordinatorlayout.widget
+androidx.core.accessibilityservice
+androidx.core.animation
+androidx.core.app
+androidx.core.content
+androidx.core.content.pm
+androidx.core.content.res
+androidx.core.database
+androidx.core.database.sqlite
+androidx.core.graphics
+androidx.core.graphics.drawable
+androidx.core.hardware.display
+androidx.core.hardware.fingerprint
+androidx.core.location
+androidx.core.math
+androidx.core.net
+androidx.core.os
+androidx.core.performance
+androidx.core.provider
+androidx.core.role
+androidx.core.splashscreen
+androidx.core.telephony
+androidx.core.telephony.mbms
+androidx.core.text
+androidx.core.text.util
+androidx.core.transition
+androidx.core.util
+androidx.core.uwb
+androidx.core.uwb.exceptions
+androidx.core.uwb.rxjava3
+androidx.core.view
+androidx.core.view.accessibility
+androidx.core.view.animation
+androidx.core.view.inputmethod
+androidx.core.widget
+androidx.credentials
+androidx.credentials.exceptions
+androidx.credentials.exceptions.domerrors
+androidx.credentials.exceptions.publickeycredential
+androidx.cursoradapter.widget
+androidx.customview.poolingcontainer
+androidx.customview.view
+androidx.customview.widget
+androidx.datastore
+androidx.datastore.core
+androidx.datastore.core.handlers
+androidx.datastore.core.okio
+androidx.datastore.migrations
+androidx.datastore.preferences
+androidx.datastore.preferences.core
+androidx.datastore.preferences.rxjava2
+androidx.datastore.preferences.rxjava3
+androidx.datastore.rxjava2
+androidx.datastore.rxjava3
+androidx.documentfile.provider
+androidx.draganddrop
+androidx.drawerlayout.widget
+androidx.dynamicanimation.animation
+androidx.emoji.bundled
+androidx.emoji.text
+androidx.emoji.widget
+androidx.emoji2.bundled
+androidx.emoji2.emojipicker
+androidx.emoji2.text
+androidx.emoji2.viewsintegration
+androidx.emoji2.widget
+androidx.enterprise.feedback
+androidx.exifinterface.media
+androidx.fragment.app
+androidx.fragment.app.strictmode
+androidx.fragment.app.testing
+androidx.graphics.lowlatency
+androidx.graphics.opengl
+androidx.graphics.opengl.egl
+androidx.graphics.surface
+androidx.gridlayout.widget
+androidx.hardware
+androidx.health.connect.client
+androidx.health.connect.client.aggregate
+androidx.health.connect.client.changes
+androidx.health.connect.client.permission
+androidx.health.connect.client.records
+androidx.health.connect.client.records.metadata
+androidx.health.connect.client.request
+androidx.health.connect.client.response
+androidx.health.connect.client.time
+androidx.health.connect.client.units
+androidx.health.platform.client.request
+androidx.health.services.client
+androidx.health.services.client.data
+androidx.heifwriter
+androidx.hilt.navigation
+androidx.hilt.navigation.fragment
+androidx.hilt.work
+androidx.input.motionprediction
+androidx.interpolator.view.animation
+androidx.javascriptengine
+androidx.leanback.app
+androidx.leanback.database
+androidx.leanback.graphics
+androidx.leanback.media
+androidx.leanback.paging
+androidx.leanback.preference
+androidx.leanback.system
+androidx.leanback.tab
+androidx.leanback.widget
+androidx.leanback.widget.picker
+androidx.lifecycle
+androidx.lifecycle.testing
+androidx.lifecycle.viewmodel
+androidx.loader.app
+androidx.loader.content
+androidx.localbroadcastmanager.content
+androidx.media
+androidx.media.app
+androidx.media.session
+androidx.media.utils
+androidx.media2.common
+androidx.media2.player
+androidx.media2.session
+androidx.media2.widget
+androidx.media3.cast
+androidx.media3.common
+androidx.media3.database
+androidx.media3.datasource
+androidx.media3.decoder
+androidx.media3.effect
+androidx.media3.exoplayer
+androidx.media3.extractor
+androidx.media3.session
+androidx.media3.test
+androidx.media3.transformer
+androidx.media3.ui
+androidx.mediarouter.app
+androidx.mediarouter.media
+androidx.mediarouter.testing
+androidx.metrics.performance
+androidx.navigation
+androidx.navigation.dynamicfeatures
+androidx.navigation.dynamicfeatures.fragment
+androidx.navigation.dynamicfeatures.fragment.ui
+androidx.navigation.fragment
+androidx.navigation.testing
+androidx.navigation.ui
+androidx.opengl
+androidx.paging
+androidx.paging.rxjava2
+androidx.paging.rxjava3
+androidx.paging.testing
+androidx.palette.graphics
+androidx.percentlayout.widget
+androidx.preference
+androidx.print
+androidx.privacysandbox.ads.adservices.adid
+androidx.privacysandbox.ads.adservices.adselection
+androidx.privacysandbox.ads.adservices.appsetid
+androidx.privacysandbox.ads.adservices.common
+androidx.privacysandbox.ads.adservices.customaudience
+androidx.privacysandbox.ads.adservices.java.adid
+androidx.privacysandbox.ads.adservices.java.adselection
+androidx.privacysandbox.ads.adservices.java.appsetid
+androidx.privacysandbox.ads.adservices.java.customaudience
+androidx.privacysandbox.ads.adservices.java.measurement
+androidx.privacysandbox.ads.adservices.java.topics
+androidx.privacysandbox.ads.adservices.measurement
+androidx.privacysandbox.ads.adservices.topics
+androidx.privacysandbox.sdkruntime.client
+androidx.privacysandbox.sdkruntime.core
+androidx.privacysandbox.tools
+androidx.privacysandbox.tools.apigenerator
+androidx.privacysandbox.tools.apigenerator.parser
+androidx.privacysandbox.tools.apipackager
+androidx.privacysandbox.tools.core
+androidx.privacysandbox.tools.core.generator
+androidx.privacysandbox.tools.core.model
+androidx.privacysandbox.tools.core.proto
+androidx.privacysandbox.tools.core.validator
+androidx.profileinstaller
+androidx.recommendation.app
+androidx.recyclerview.selection
+androidx.recyclerview.widget
+androidx.remotecallback
+androidx.resourceinspection.annotation
+androidx.resourceinspection.processor
+androidx.room
+androidx.room.migration
+androidx.room.rxjava3
+androidx.room.testing
+androidx.savedstate
+androidx.security.app.authenticator
+androidx.security.crypto
+androidx.security.identity
+androidx.slice
+androidx.slice.builders
+androidx.slice.core
+androidx.slice.widget
+androidx.slidingpanelayout.widget
+androidx.sqlite.db
+androidx.sqlite.db.framework
+androidx.startup
+androidx.swiperefreshlayout.widget
+androidx.test
+androidx.test.annotation
+androidx.test.core.app
+androidx.test.core.content.pm
+androidx.test.core.graphics
+androidx.test.core.os
+androidx.test.core.view
+androidx.test.espresso
+androidx.test.espresso.accessibility
+androidx.test.espresso.action
+androidx.test.espresso.assertion
+androidx.test.espresso.base
+androidx.test.espresso.contrib
+androidx.test.espresso.device.filter
+androidx.test.espresso.device.sizeclass
+androidx.test.espresso.idling
+androidx.test.espresso.idling.concurrent
+androidx.test.espresso.idling.net
+androidx.test.espresso.intent
+androidx.test.espresso.intent.matcher
+androidx.test.espresso.intent.rule
+androidx.test.espresso.matcher
+androidx.test.espresso.remote
+androidx.test.espresso.screenshot
+androidx.test.espresso.util
+androidx.test.espresso.web.action
+androidx.test.espresso.web.assertion
+androidx.test.espresso.web.matcher
+androidx.test.espresso.web.model
+androidx.test.espresso.web.sugar
+androidx.test.espresso.web.webdriver
+androidx.test.ext.junit.rules
+androidx.test.ext.junit.runners
+androidx.test.ext.truth.app
+androidx.test.ext.truth.content
+androidx.test.ext.truth.location
+androidx.test.ext.truth.os
+androidx.test.ext.truth.util
+androidx.test.ext.truth.view
+androidx.test.filters
+androidx.test.orchestrator.callback
+androidx.test.orchestrator.junit
+androidx.test.orchestrator.listeners
+androidx.test.orchestrator.listeners.result
+androidx.test.platform
+androidx.test.platform.app
+androidx.test.platform.device
+androidx.test.platform.graphics
+androidx.test.platform.io
+androidx.test.platform.tracing
+androidx.test.platform.ui
+androidx.test.rule
+androidx.test.rule.logging
+androidx.test.rule.provider
+androidx.test.runner
+androidx.test.runner.intent
+androidx.test.runner.intercepting
+androidx.test.runner.lifecycle
+androidx.test.runner.permission
+androidx.test.runner.screenshot
+androidx.test.runner.suites
+androidx.test.services.storage
+androidx.test.services.storage.file
+androidx.test.uiautomator
+androidx.textclassifier
+androidx.tracing
+androidx.tracing.perfetto
+androidx.transition
+androidx.tv.foundation
+androidx.tv.foundation.lazy.grid
+androidx.tv.foundation.lazy.list
+androidx.tv.material3
+androidx.tvprovider.media.tv
+androidx.vectordrawable.graphics.drawable
+androidx.versionedparcelable
+androidx.viewpager.widget
+androidx.viewpager2.adapter
+androidx.viewpager2.widget
+androidx.wear.activity
+androidx.wear.ambient
+androidx.wear.input
+androidx.wear.input.testing
+androidx.wear.ongoing
+androidx.wear.phone.interactions
+androidx.wear.phone.interactions.authentication
+androidx.wear.phone.interactions.notifications
+androidx.wear.protolayout
+androidx.wear.protolayout.expression
+androidx.wear.protolayout.expression.proto
+androidx.wear.provider
+androidx.wear.remote.interactions
+androidx.wear.tiles
+androidx.wear.tiles.client
+androidx.wear.tiles.connection
+androidx.wear.tiles.manager
+androidx.wear.tiles.material
+androidx.wear.tiles.material.layouts
+androidx.wear.tiles.renderer
+androidx.wear.tiles.testing
+androidx.wear.tiles.timeline
+androidx.wear.utils
+androidx.wear.watchface
+androidx.wear.watchface.client
+androidx.wear.watchface.complications
+androidx.wear.watchface.complications.data
+androidx.wear.watchface.complications.datasource
+androidx.wear.watchface.complications.rendering
+androidx.wear.watchface.data
+androidx.wear.watchface.editor
+androidx.wear.watchface.style
+androidx.wear.widget
+androidx.wear.widget.drawer
+androidx.webkit
+androidx.window
+androidx.window.core
+androidx.window.core.layout
+androidx.window.embedding
+androidx.window.java.layout
+androidx.window.layout
+androidx.window.rxjava2.layout
+androidx.window.rxjava3.layout
+androidx.window.testing.layout
+androidx.work
+androidx.work.multiprocess
+androidx.work.rxjava3
+androidx.work.testing
+org.chromium.support_lib_boundary.util
+
diff --git a/kotlindoc/package-lists/firebase/package-list b/kotlindoc/package-lists/firebase/package-list
deleted file mode 100644
index e63bb28131b..00000000000
--- a/kotlindoc/package-lists/firebase/package-list
+++ /dev/null
@@ -1,77 +0,0 @@
-com.crashlytics.sdk.android.answers
-com.crashlytics.sdk.android.beta
-com.crashlytics.sdk.android.crashlytics
-com.crashlytics.sdk.android.crashlytics-core
-com.google.android.gms.ads
-com.google.android.gms.ads.appopen
-com.google.android.gms.ads.doubleclick
-com.google.android.gms.ads.formats
-com.google.android.gms.ads.identifier
-com.google.android.gms.ads.initialization
-com.google.android.gms.ads.instream
-com.google.android.gms.ads.mediation
-com.google.android.gms.ads.mediation.admob
-com.google.android.gms.ads.mediation.customevent
-com.google.android.gms.ads.mediation.rtb
-com.google.android.gms.ads.reward
-com.google.android.gms.ads.reward.mediation
-com.google.android.gms.ads.rewarded
-com.google.android.gms.ads.search
-com.google.android.gms.appindexing
-com.google.android.gms.appinvite
-com.google.android.gms.measurement
-com.google.firebase
-com.google.firebase.analytics
-com.google.firebase.appindexing
-com.google.firebase.appindexing.builders
-com.google.firebase.appinvite
-com.google.firebase.auth
-com.google.firebase.auth.internal
-com.google.firebase.database
-com.google.firebase.database.ktx
-com.google.firebase.dynamiclinks
-com.google.firebase.dynamiclinks.ktx
-com.google.firebase.firestore
-com.google.firebase.firestore.ktx
-com.google.firebase.functions
-com.google.firebase.functions.ktx
-com.google.firebase.iid
-com.google.firebase.inappmessaging
-com.google.firebase.inappmessaging.display
-com.google.firebase.inappmessaging.display.ktx
-com.google.firebase.inappmessaging.ktx
-com.google.firebase.inappmessaging.model
-com.google.firebase.installations
-com.google.firebase.ktx
-com.google.firebase.messaging
-com.google.firebase.ml.common
-com.google.firebase.ml.common.modeldownload
-com.google.firebase.ml.custom
-com.google.firebase.ml.custom.model
-com.google.firebase.ml.naturallanguage
-com.google.firebase.ml.naturallanguage.languageid
-com.google.firebase.ml.naturallanguage.smartreply
-com.google.firebase.ml.naturallanguage.translate
-com.google.firebase.ml.text
-com.google.firebase.ml.vision
-com.google.firebase.ml.vision.automl
-com.google.firebase.ml.vision.barcode
-com.google.firebase.ml.vision.cloud
-com.google.firebase.ml.vision.cloud.label
-com.google.firebase.ml.vision.cloud.landmark
-com.google.firebase.ml.vision.cloud.text
-com.google.firebase.ml.vision.common
-com.google.firebase.ml.vision.document
-com.google.firebase.ml.vision.face
-com.google.firebase.ml.vision.label
-com.google.firebase.ml.vision.objects
-com.google.firebase.ml.vision.text
-com.google.firebase.perf
-com.google.firebase.perf.metrics
-com.google.firebase.provider
-com.google.firebase.remoteconfig
-com.google.firebase.remoteconfig.ktx
-com.google.firebase.storage
-com.google.firebase.storage.ktx
-io.fabric.sdk.android.fabric
-io.fabric.sdk.android.fabric.services.concurrency
diff --git a/kotlindoc/package-lists/kotlin/package-list b/kotlindoc/package-lists/kotlin/package-list
new file mode 100644
index 00000000000..2f683a6cfe6
--- /dev/null
+++ b/kotlindoc/package-lists/kotlin/package-list
@@ -0,0 +1,317 @@
+$dokka.format:kotlin-website-html
+$dokka.linkExtension:html
+$dokka.location:kotlin$and(java.math.BigInteger, java.math.BigInteger)kotlin/java.math.-big-integer/and.html
+$dokka.location:kotlin$dec(java.math.BigDecimal)kotlin/java.math.-big-decimal/dec.html
+$dokka.location:kotlin$dec(java.math.BigInteger)kotlin/java.math.-big-integer/dec.html
+$dokka.location:kotlin$div(java.math.BigDecimal, java.math.BigDecimal)kotlin/java.math.-big-decimal/div.html
+$dokka.location:kotlin$div(java.math.BigInteger, java.math.BigInteger)kotlin/java.math.-big-integer/div.html
+$dokka.location:kotlin$inc(java.math.BigDecimal)kotlin/java.math.-big-decimal/inc.html
+$dokka.location:kotlin$inc(java.math.BigInteger)kotlin/java.math.-big-integer/inc.html
+$dokka.location:kotlin$inv(java.math.BigInteger)kotlin/java.math.-big-integer/inv.html
+$dokka.location:kotlin$minus(java.math.BigDecimal, java.math.BigDecimal)kotlin/java.math.-big-decimal/minus.html
+$dokka.location:kotlin$minus(java.math.BigInteger, java.math.BigInteger)kotlin/java.math.-big-integer/minus.html
+$dokka.location:kotlin$or(java.math.BigInteger, java.math.BigInteger)kotlin/java.math.-big-integer/or.html
+$dokka.location:kotlin$plus(java.math.BigDecimal, java.math.BigDecimal)kotlin/java.math.-big-decimal/plus.html
+$dokka.location:kotlin$plus(java.math.BigInteger, java.math.BigInteger)kotlin/java.math.-big-integer/plus.html
+$dokka.location:kotlin$rem(java.math.BigDecimal, java.math.BigDecimal)kotlin/java.math.-big-decimal/rem.html
+$dokka.location:kotlin$rem(java.math.BigInteger, java.math.BigInteger)kotlin/java.math.-big-integer/rem.html
+$dokka.location:kotlin$shl(java.math.BigInteger, kotlin.Int)kotlin/java.math.-big-integer/shl.html
+$dokka.location:kotlin$shr(java.math.BigInteger, kotlin.Int)kotlin/java.math.-big-integer/shr.html
+$dokka.location:kotlin$times(java.math.BigDecimal, java.math.BigDecimal)kotlin/java.math.-big-decimal/times.html
+$dokka.location:kotlin$times(java.math.BigInteger, java.math.BigInteger)kotlin/java.math.-big-integer/times.html
+$dokka.location:kotlin$toBigDecimal(java.math.BigInteger)kotlin/java.math.-big-integer/to-big-decimal.html
+$dokka.location:kotlin$toBigDecimal(java.math.BigInteger, kotlin.Int, java.math.MathContext)kotlin/java.math.-big-integer/to-big-decimal.html
+$dokka.location:kotlin$unaryMinus(java.math.BigDecimal)kotlin/java.math.-big-decimal/unary-minus.html
+$dokka.location:kotlin$unaryMinus(java.math.BigInteger)kotlin/java.math.-big-integer/unary-minus.html
+$dokka.location:kotlin$xor(java.math.BigInteger, java.math.BigInteger)kotlin/java.math.-big-integer/xor.html
+$dokka.location:kotlin.ArithmeticExceptionkotlin/-arithmetic-exception/index.html
+$dokka.location:kotlin.AssertionErrorkotlin/-assertion-error/index.html
+$dokka.location:kotlin.ClassCastExceptionkotlin/-class-cast-exception/index.html
+$dokka.location:kotlin.Comparatorkotlin/-comparator/index.html
+$dokka.location:kotlin.ConcurrentModificationExceptionkotlin/-concurrent-modification-exception/index.html
+$dokka.location:kotlin.Errorkotlin/-error/index.html
+$dokka.location:kotlin.Exceptionkotlin/-exception/index.html
+$dokka.location:kotlin.IllegalArgumentExceptionkotlin/-illegal-argument-exception/index.html
+$dokka.location:kotlin.IllegalStateExceptionkotlin/-illegal-state-exception/index.html
+$dokka.location:kotlin.IndexOutOfBoundsExceptionkotlin/-index-out-of-bounds-exception/index.html
+$dokka.location:kotlin.NoSuchElementExceptionkotlin/-no-such-element-exception/index.html
+$dokka.location:kotlin.NullPointerExceptionkotlin/-null-pointer-exception/index.html
+$dokka.location:kotlin.NumberFormatExceptionkotlin/-number-format-exception/index.html
+$dokka.location:kotlin.RuntimeExceptionkotlin/-runtime-exception/index.html
+$dokka.location:kotlin.Throwskotlin/-throws/index.html
+$dokka.location:kotlin.UnsupportedOperationExceptionkotlin/-unsupported-operation-exception/index.html
+$dokka.location:kotlin.collections$getOrPut(java.util.concurrent.ConcurrentMap((kotlin.collections.getOrPut.K, kotlin.collections.getOrPut.V)), kotlin.collections.getOrPut.K, kotlin.Function0((kotlin.collections.getOrPut.V)))kotlin.collections/java.util.concurrent.-concurrent-map/get-or-put.html
+$dokka.location:kotlin.collections$iterator(java.util.Enumeration((kotlin.collections.iterator.T)))kotlin.collections/java.util.-enumeration/iterator.html
+$dokka.location:kotlin.collections$toList(java.util.Enumeration((kotlin.collections.toList.T)))kotlin.collections/java.util.-enumeration/to-list.html
+$dokka.location:kotlin.collections.ArrayListkotlin.collections/-array-list/index.html
+$dokka.location:kotlin.collections.HashMapkotlin.collections/-hash-map/index.html
+$dokka.location:kotlin.collections.HashSetkotlin.collections/-hash-set/index.html
+$dokka.location:kotlin.collections.LinkedHashMapkotlin.collections/-linked-hash-map/index.html
+$dokka.location:kotlin.collections.LinkedHashSetkotlin.collections/-linked-hash-set/index.html
+$dokka.location:kotlin.concurrent$getOrSet(java.lang.ThreadLocal((kotlin.concurrent.getOrSet.T)), kotlin.Function0((kotlin.concurrent.getOrSet.T)))kotlin.concurrent/java.lang.-thread-local/get-or-set.html
+$dokka.location:kotlin.concurrent$read(java.util.concurrent.locks.ReentrantReadWriteLock, kotlin.Function0((kotlin.concurrent.read.T)))kotlin.concurrent/java.util.concurrent.locks.-reentrant-read-write-lock/read.html
+$dokka.location:kotlin.concurrent$schedule(java.util.Timer, java.util.Date, kotlin.Function1((java.util.TimerTask, kotlin.Unit)))kotlin.concurrent/java.util.-timer/schedule.html
+$dokka.location:kotlin.concurrent$schedule(java.util.Timer, java.util.Date, kotlin.Long, kotlin.Function1((java.util.TimerTask, kotlin.Unit)))kotlin.concurrent/java.util.-timer/schedule.html
+$dokka.location:kotlin.concurrent$schedule(java.util.Timer, kotlin.Long, kotlin.Function1((java.util.TimerTask, kotlin.Unit)))kotlin.concurrent/java.util.-timer/schedule.html
+$dokka.location:kotlin.concurrent$schedule(java.util.Timer, kotlin.Long, kotlin.Long, kotlin.Function1((java.util.TimerTask, kotlin.Unit)))kotlin.concurrent/java.util.-timer/schedule.html
+$dokka.location:kotlin.concurrent$scheduleAtFixedRate(java.util.Timer, java.util.Date, kotlin.Long, kotlin.Function1((java.util.TimerTask, kotlin.Unit)))kotlin.concurrent/java.util.-timer/schedule-at-fixed-rate.html
+$dokka.location:kotlin.concurrent$scheduleAtFixedRate(java.util.Timer, kotlin.Long, kotlin.Long, kotlin.Function1((java.util.TimerTask, kotlin.Unit)))kotlin.concurrent/java.util.-timer/schedule-at-fixed-rate.html
+$dokka.location:kotlin.concurrent$withLock(java.util.concurrent.locks.Lock, kotlin.Function0((kotlin.concurrent.withLock.T)))kotlin.concurrent/java.util.concurrent.locks.-lock/with-lock.html
+$dokka.location:kotlin.concurrent$write(java.util.concurrent.locks.ReentrantReadWriteLock, kotlin.Function0((kotlin.concurrent.write.T)))kotlin.concurrent/java.util.concurrent.locks.-reentrant-read-write-lock/write.html
+$dokka.location:kotlin.coroutines.cancellation.CancellationExceptionkotlin.coroutines.cancellation/-cancellation-exception/index.html
+$dokka.location:kotlin.io$appendBytes(java.io.File, kotlin.ByteArray)kotlin.io/java.io.-file/append-bytes.html
+$dokka.location:kotlin.io$appendText(java.io.File, kotlin.String, java.nio.charset.Charset)kotlin.io/java.io.-file/append-text.html
+$dokka.location:kotlin.io$buffered(java.io.InputStream, kotlin.Int)kotlin.io/java.io.-input-stream/buffered.html
+$dokka.location:kotlin.io$buffered(java.io.OutputStream, kotlin.Int)kotlin.io/java.io.-output-stream/buffered.html
+$dokka.location:kotlin.io$buffered(java.io.Reader, kotlin.Int)kotlin.io/java.io.-reader/buffered.html
+$dokka.location:kotlin.io$buffered(java.io.Writer, kotlin.Int)kotlin.io/java.io.-writer/buffered.html
+$dokka.location:kotlin.io$bufferedReader(java.io.File, java.nio.charset.Charset, kotlin.Int)kotlin.io/java.io.-file/buffered-reader.html
+$dokka.location:kotlin.io$bufferedReader(java.io.InputStream, java.nio.charset.Charset)kotlin.io/java.io.-input-stream/buffered-reader.html
+$dokka.location:kotlin.io$bufferedWriter(java.io.File, java.nio.charset.Charset, kotlin.Int)kotlin.io/java.io.-file/buffered-writer.html
+$dokka.location:kotlin.io$bufferedWriter(java.io.OutputStream, java.nio.charset.Charset)kotlin.io/java.io.-output-stream/buffered-writer.html
+$dokka.location:kotlin.io$copyRecursively(java.io.File, java.io.File, kotlin.Boolean, kotlin.Function2((java.io.File, java.io.IOException, kotlin.io.OnErrorAction)))kotlin.io/java.io.-file/copy-recursively.html
+$dokka.location:kotlin.io$copyTo(java.io.File, java.io.File, kotlin.Boolean, kotlin.Int)kotlin.io/java.io.-file/copy-to.html
+$dokka.location:kotlin.io$copyTo(java.io.InputStream, java.io.OutputStream, kotlin.Int)kotlin.io/java.io.-input-stream/copy-to.html
+$dokka.location:kotlin.io$copyTo(java.io.Reader, java.io.Writer, kotlin.Int)kotlin.io/java.io.-reader/copy-to.html
+$dokka.location:kotlin.io$deleteRecursively(java.io.File)kotlin.io/java.io.-file/delete-recursively.html
+$dokka.location:kotlin.io$endsWith(java.io.File, java.io.File)kotlin.io/java.io.-file/ends-with.html
+$dokka.location:kotlin.io$endsWith(java.io.File, kotlin.String)kotlin.io/java.io.-file/ends-with.html
+$dokka.location:kotlin.io$extension#java.io.Filekotlin.io/java.io.-file/extension.html
+$dokka.location:kotlin.io$forEachBlock(java.io.File, kotlin.Function2((kotlin.ByteArray, kotlin.Int, kotlin.Unit)))kotlin.io/java.io.-file/for-each-block.html
+$dokka.location:kotlin.io$forEachBlock(java.io.File, kotlin.Int, kotlin.Function2((kotlin.ByteArray, kotlin.Int, kotlin.Unit)))kotlin.io/java.io.-file/for-each-block.html
+$dokka.location:kotlin.io$forEachLine(java.io.File, java.nio.charset.Charset, kotlin.Function1((kotlin.String, kotlin.Unit)))kotlin.io/java.io.-file/for-each-line.html
+$dokka.location:kotlin.io$forEachLine(java.io.Reader, kotlin.Function1((kotlin.String, kotlin.Unit)))kotlin.io/java.io.-reader/for-each-line.html
+$dokka.location:kotlin.io$inputStream(java.io.File)kotlin.io/java.io.-file/input-stream.html
+$dokka.location:kotlin.io$invariantSeparatorsPath#java.io.Filekotlin.io/java.io.-file/invariant-separators-path.html
+$dokka.location:kotlin.io$isRooted#java.io.Filekotlin.io/java.io.-file/is-rooted.html
+$dokka.location:kotlin.io$iterator(java.io.BufferedInputStream)kotlin.io/java.io.-buffered-input-stream/iterator.html
+$dokka.location:kotlin.io$lineSequence(java.io.BufferedReader)kotlin.io/java.io.-buffered-reader/line-sequence.html
+$dokka.location:kotlin.io$nameWithoutExtension#java.io.Filekotlin.io/java.io.-file/name-without-extension.html
+$dokka.location:kotlin.io$normalize(java.io.File)kotlin.io/java.io.-file/normalize.html
+$dokka.location:kotlin.io$outputStream(java.io.File)kotlin.io/java.io.-file/output-stream.html
+$dokka.location:kotlin.io$printWriter(java.io.File, java.nio.charset.Charset)kotlin.io/java.io.-file/print-writer.html
+$dokka.location:kotlin.io$readBytes(java.io.File)kotlin.io/java.io.-file/read-bytes.html
+$dokka.location:kotlin.io$readBytes(java.io.InputStream)kotlin.io/java.io.-input-stream/read-bytes.html
+$dokka.location:kotlin.io$readBytes(java.io.InputStream, kotlin.Int)kotlin.io/java.io.-input-stream/read-bytes.html
+$dokka.location:kotlin.io$readBytes(java.net.URL)kotlin.io/java.net.-u-r-l/read-bytes.html
+$dokka.location:kotlin.io$readLines(java.io.File, java.nio.charset.Charset)kotlin.io/java.io.-file/read-lines.html
+$dokka.location:kotlin.io$readLines(java.io.Reader)kotlin.io/java.io.-reader/read-lines.html
+$dokka.location:kotlin.io$readText(java.io.File, java.nio.charset.Charset)kotlin.io/java.io.-file/read-text.html
+$dokka.location:kotlin.io$readText(java.io.Reader)kotlin.io/java.io.-reader/read-text.html
+$dokka.location:kotlin.io$readText(java.net.URL, java.nio.charset.Charset)kotlin.io/java.net.-u-r-l/read-text.html
+$dokka.location:kotlin.io$reader(java.io.File, java.nio.charset.Charset)kotlin.io/java.io.-file/reader.html
+$dokka.location:kotlin.io$reader(java.io.InputStream, java.nio.charset.Charset)kotlin.io/java.io.-input-stream/reader.html
+$dokka.location:kotlin.io$relativeTo(java.io.File, java.io.File)kotlin.io/java.io.-file/relative-to.html
+$dokka.location:kotlin.io$relativeToOrNull(java.io.File, java.io.File)kotlin.io/java.io.-file/relative-to-or-null.html
+$dokka.location:kotlin.io$relativeToOrSelf(java.io.File, java.io.File)kotlin.io/java.io.-file/relative-to-or-self.html
+$dokka.location:kotlin.io$resolve(java.io.File, java.io.File)kotlin.io/java.io.-file/resolve.html
+$dokka.location:kotlin.io$resolve(java.io.File, kotlin.String)kotlin.io/java.io.-file/resolve.html
+$dokka.location:kotlin.io$resolveSibling(java.io.File, java.io.File)kotlin.io/java.io.-file/resolve-sibling.html
+$dokka.location:kotlin.io$resolveSibling(java.io.File, kotlin.String)kotlin.io/java.io.-file/resolve-sibling.html
+$dokka.location:kotlin.io$startsWith(java.io.File, java.io.File)kotlin.io/java.io.-file/starts-with.html
+$dokka.location:kotlin.io$startsWith(java.io.File, kotlin.String)kotlin.io/java.io.-file/starts-with.html
+$dokka.location:kotlin.io$toRelativeString(java.io.File, java.io.File)kotlin.io/java.io.-file/to-relative-string.html
+$dokka.location:kotlin.io$useLines(java.io.File, java.nio.charset.Charset, kotlin.Function1((kotlin.sequences.Sequence((kotlin.String)), kotlin.io.useLines.T)))kotlin.io/java.io.-file/use-lines.html
+$dokka.location:kotlin.io$useLines(java.io.Reader, kotlin.Function1((kotlin.sequences.Sequence((kotlin.String)), kotlin.io.useLines.T)))kotlin.io/java.io.-reader/use-lines.html
+$dokka.location:kotlin.io$walk(java.io.File, kotlin.io.FileWalkDirection)kotlin.io/java.io.-file/walk.html
+$dokka.location:kotlin.io$walkBottomUp(java.io.File)kotlin.io/java.io.-file/walk-bottom-up.html
+$dokka.location:kotlin.io$walkTopDown(java.io.File)kotlin.io/java.io.-file/walk-top-down.html
+$dokka.location:kotlin.io$writeBytes(java.io.File, kotlin.ByteArray)kotlin.io/java.io.-file/write-bytes.html
+$dokka.location:kotlin.io$writeText(java.io.File, kotlin.String, java.nio.charset.Charset)kotlin.io/java.io.-file/write-text.html
+$dokka.location:kotlin.io$writer(java.io.File, java.nio.charset.Charset)kotlin.io/java.io.-file/writer.html
+$dokka.location:kotlin.io$writer(java.io.OutputStream, java.nio.charset.Charset)kotlin.io/java.io.-output-stream/writer.html
+$dokka.location:kotlin.io.path$absolute(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/absolute.html
+$dokka.location:kotlin.io.path$absolutePathString(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/absolute-path-string.html
+$dokka.location:kotlin.io.path$appendBytes(java.nio.file.Path, kotlin.ByteArray)kotlin.io.path/java.nio.file.-path/append-bytes.html
+$dokka.location:kotlin.io.path$appendLines(java.nio.file.Path, kotlin.collections.Iterable((kotlin.CharSequence)), java.nio.charset.Charset)kotlin.io.path/java.nio.file.-path/append-lines.html
+$dokka.location:kotlin.io.path$appendLines(java.nio.file.Path, kotlin.sequences.Sequence((kotlin.CharSequence)), java.nio.charset.Charset)kotlin.io.path/java.nio.file.-path/append-lines.html
+$dokka.location:kotlin.io.path$appendText(java.nio.file.Path, kotlin.CharSequence, java.nio.charset.Charset)kotlin.io.path/java.nio.file.-path/append-text.html
+$dokka.location:kotlin.io.path$bufferedReader(java.nio.file.Path, java.nio.charset.Charset, kotlin.Int, kotlin.Array((java.nio.file.OpenOption)))kotlin.io.path/java.nio.file.-path/buffered-reader.html
+$dokka.location:kotlin.io.path$bufferedWriter(java.nio.file.Path, java.nio.charset.Charset, kotlin.Int, kotlin.Array((java.nio.file.OpenOption)))kotlin.io.path/java.nio.file.-path/buffered-writer.html
+$dokka.location:kotlin.io.path$copyTo(java.nio.file.Path, java.nio.file.Path, kotlin.Array((java.nio.file.CopyOption)))kotlin.io.path/java.nio.file.-path/copy-to.html
+$dokka.location:kotlin.io.path$copyTo(java.nio.file.Path, java.nio.file.Path, kotlin.Boolean)kotlin.io.path/java.nio.file.-path/copy-to.html
+$dokka.location:kotlin.io.path$createDirectories(java.nio.file.Path, kotlin.Array((java.nio.file.attribute.FileAttribute((kotlin.Any)))))kotlin.io.path/java.nio.file.-path/create-directories.html
+$dokka.location:kotlin.io.path$createDirectory(java.nio.file.Path, kotlin.Array((java.nio.file.attribute.FileAttribute((kotlin.Any)))))kotlin.io.path/java.nio.file.-path/create-directory.html
+$dokka.location:kotlin.io.path$createFile(java.nio.file.Path, kotlin.Array((java.nio.file.attribute.FileAttribute((kotlin.Any)))))kotlin.io.path/java.nio.file.-path/create-file.html
+$dokka.location:kotlin.io.path$createLinkPointingTo(java.nio.file.Path, java.nio.file.Path)kotlin.io.path/java.nio.file.-path/create-link-pointing-to.html
+$dokka.location:kotlin.io.path$createSymbolicLinkPointingTo(java.nio.file.Path, java.nio.file.Path, kotlin.Array((java.nio.file.attribute.FileAttribute((kotlin.Any)))))kotlin.io.path/java.nio.file.-path/create-symbolic-link-pointing-to.html
+$dokka.location:kotlin.io.path$deleteExisting(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/delete-existing.html
+$dokka.location:kotlin.io.path$deleteIfExists(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/delete-if-exists.html
+$dokka.location:kotlin.io.path$div(java.nio.file.Path, java.nio.file.Path)kotlin.io.path/java.nio.file.-path/div.html
+$dokka.location:kotlin.io.path$div(java.nio.file.Path, kotlin.String)kotlin.io.path/java.nio.file.-path/div.html
+$dokka.location:kotlin.io.path$exists(java.nio.file.Path, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/exists.html
+$dokka.location:kotlin.io.path$extension#java.nio.file.Pathkotlin.io.path/java.nio.file.-path/extension.html
+$dokka.location:kotlin.io.path$fileAttributesView(java.nio.file.Path, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/file-attributes-view.html
+$dokka.location:kotlin.io.path$fileAttributesViewOrNull(java.nio.file.Path, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/file-attributes-view-or-null.html
+$dokka.location:kotlin.io.path$fileSize(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/file-size.html
+$dokka.location:kotlin.io.path$fileStore(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/file-store.html
+$dokka.location:kotlin.io.path$forEachDirectoryEntry(java.nio.file.Path, kotlin.String, kotlin.Function1((java.nio.file.Path, kotlin.Unit)))kotlin.io.path/java.nio.file.-path/for-each-directory-entry.html
+$dokka.location:kotlin.io.path$forEachLine(java.nio.file.Path, java.nio.charset.Charset, kotlin.Function1((kotlin.String, kotlin.Unit)))kotlin.io.path/java.nio.file.-path/for-each-line.html
+$dokka.location:kotlin.io.path$getAttribute(java.nio.file.Path, kotlin.String, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/get-attribute.html
+$dokka.location:kotlin.io.path$getLastModifiedTime(java.nio.file.Path, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/get-last-modified-time.html
+$dokka.location:kotlin.io.path$getOwner(java.nio.file.Path, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/get-owner.html
+$dokka.location:kotlin.io.path$getPosixFilePermissions(java.nio.file.Path, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/get-posix-file-permissions.html
+$dokka.location:kotlin.io.path$inputStream(java.nio.file.Path, kotlin.Array((java.nio.file.OpenOption)))kotlin.io.path/java.nio.file.-path/input-stream.html
+$dokka.location:kotlin.io.path$invariantSeparatorsPath#java.nio.file.Pathkotlin.io.path/java.nio.file.-path/invariant-separators-path.html
+$dokka.location:kotlin.io.path$invariantSeparatorsPathString#java.nio.file.Pathkotlin.io.path/java.nio.file.-path/invariant-separators-path-string.html
+$dokka.location:kotlin.io.path$isDirectory(java.nio.file.Path, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/is-directory.html
+$dokka.location:kotlin.io.path$isExecutable(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/is-executable.html
+$dokka.location:kotlin.io.path$isHidden(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/is-hidden.html
+$dokka.location:kotlin.io.path$isReadable(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/is-readable.html
+$dokka.location:kotlin.io.path$isRegularFile(java.nio.file.Path, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/is-regular-file.html
+$dokka.location:kotlin.io.path$isSameFileAs(java.nio.file.Path, java.nio.file.Path)kotlin.io.path/java.nio.file.-path/is-same-file-as.html
+$dokka.location:kotlin.io.path$isSymbolicLink(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/is-symbolic-link.html
+$dokka.location:kotlin.io.path$isWritable(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/is-writable.html
+$dokka.location:kotlin.io.path$listDirectoryEntries(java.nio.file.Path, kotlin.String)kotlin.io.path/java.nio.file.-path/list-directory-entries.html
+$dokka.location:kotlin.io.path$moveTo(java.nio.file.Path, java.nio.file.Path, kotlin.Array((java.nio.file.CopyOption)))kotlin.io.path/java.nio.file.-path/move-to.html
+$dokka.location:kotlin.io.path$moveTo(java.nio.file.Path, java.nio.file.Path, kotlin.Boolean)kotlin.io.path/java.nio.file.-path/move-to.html
+$dokka.location:kotlin.io.path$name#java.nio.file.Pathkotlin.io.path/java.nio.file.-path/name.html
+$dokka.location:kotlin.io.path$nameWithoutExtension#java.nio.file.Pathkotlin.io.path/java.nio.file.-path/name-without-extension.html
+$dokka.location:kotlin.io.path$notExists(java.nio.file.Path, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/not-exists.html
+$dokka.location:kotlin.io.path$outputStream(java.nio.file.Path, kotlin.Array((java.nio.file.OpenOption)))kotlin.io.path/java.nio.file.-path/output-stream.html
+$dokka.location:kotlin.io.path$pathString#java.nio.file.Pathkotlin.io.path/java.nio.file.-path/path-string.html
+$dokka.location:kotlin.io.path$readAttributes(java.nio.file.Path, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/read-attributes.html
+$dokka.location:kotlin.io.path$readAttributes(java.nio.file.Path, kotlin.String, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/read-attributes.html
+$dokka.location:kotlin.io.path$readBytes(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/read-bytes.html
+$dokka.location:kotlin.io.path$readLines(java.nio.file.Path, java.nio.charset.Charset)kotlin.io.path/java.nio.file.-path/read-lines.html
+$dokka.location:kotlin.io.path$readSymbolicLink(java.nio.file.Path)kotlin.io.path/java.nio.file.-path/read-symbolic-link.html
+$dokka.location:kotlin.io.path$readText(java.nio.file.Path, java.nio.charset.Charset)kotlin.io.path/java.nio.file.-path/read-text.html
+$dokka.location:kotlin.io.path$reader(java.nio.file.Path, java.nio.charset.Charset, kotlin.Array((java.nio.file.OpenOption)))kotlin.io.path/java.nio.file.-path/reader.html
+$dokka.location:kotlin.io.path$relativeTo(java.nio.file.Path, java.nio.file.Path)kotlin.io.path/java.nio.file.-path/relative-to.html
+$dokka.location:kotlin.io.path$relativeToOrNull(java.nio.file.Path, java.nio.file.Path)kotlin.io.path/java.nio.file.-path/relative-to-or-null.html
+$dokka.location:kotlin.io.path$relativeToOrSelf(java.nio.file.Path, java.nio.file.Path)kotlin.io.path/java.nio.file.-path/relative-to-or-self.html
+$dokka.location:kotlin.io.path$setAttribute(java.nio.file.Path, kotlin.String, kotlin.Any?, kotlin.Array((java.nio.file.LinkOption)))kotlin.io.path/java.nio.file.-path/set-attribute.html
+$dokka.location:kotlin.io.path$setLastModifiedTime(java.nio.file.Path, java.nio.file.attribute.FileTime)kotlin.io.path/java.nio.file.-path/set-last-modified-time.html
+$dokka.location:kotlin.io.path$setOwner(java.nio.file.Path, java.nio.file.attribute.UserPrincipal)kotlin.io.path/java.nio.file.-path/set-owner.html
+$dokka.location:kotlin.io.path$setPosixFilePermissions(java.nio.file.Path, kotlin.collections.Set((java.nio.file.attribute.PosixFilePermission)))kotlin.io.path/java.nio.file.-path/set-posix-file-permissions.html
+$dokka.location:kotlin.io.path$toPath(java.net.URI)kotlin.io.path/java.net.-u-r-i/to-path.html
+$dokka.location:kotlin.io.path$useDirectoryEntries(java.nio.file.Path, kotlin.String, kotlin.Function1((kotlin.sequences.Sequence((java.nio.file.Path)), kotlin.io.path.useDirectoryEntries.T)))kotlin.io.path/java.nio.file.-path/use-directory-entries.html
+$dokka.location:kotlin.io.path$useLines(java.nio.file.Path, java.nio.charset.Charset, kotlin.Function1((kotlin.sequences.Sequence((kotlin.String)), kotlin.io.path.useLines.T)))kotlin.io.path/java.nio.file.-path/use-lines.html
+$dokka.location:kotlin.io.path$writeBytes(java.nio.file.Path, kotlin.ByteArray, kotlin.Array((java.nio.file.OpenOption)))kotlin.io.path/java.nio.file.-path/write-bytes.html
+$dokka.location:kotlin.io.path$writeLines(java.nio.file.Path, kotlin.collections.Iterable((kotlin.CharSequence)), java.nio.charset.Charset, kotlin.Array((java.nio.file.OpenOption)))kotlin.io.path/java.nio.file.-path/write-lines.html
+$dokka.location:kotlin.io.path$writeLines(java.nio.file.Path, kotlin.sequences.Sequence((kotlin.CharSequence)), java.nio.charset.Charset, kotlin.Array((java.nio.file.OpenOption)))kotlin.io.path/java.nio.file.-path/write-lines.html
+$dokka.location:kotlin.io.path$writeText(java.nio.file.Path, kotlin.CharSequence, java.nio.charset.Charset, kotlin.Array((java.nio.file.OpenOption)))kotlin.io.path/java.nio.file.-path/write-text.html
+$dokka.location:kotlin.io.path$writer(java.nio.file.Path, java.nio.charset.Charset, kotlin.Array((java.nio.file.OpenOption)))kotlin.io.path/java.nio.file.-path/writer.html
+$dokka.location:kotlin.jvm$kotlin#java.lang.Class((kotlin.jvm.kotlin.T))kotlin.jvm/java.lang.-class/kotlin.html
+$dokka.location:kotlin.jvm.optionals$asSequence(java.util.Optional((kotlin.jvm.optionals.asSequence.T)))kotlin.jvm.optionals/java.util.-optional/as-sequence.html
+$dokka.location:kotlin.jvm.optionals$getOrNull(java.util.Optional((kotlin.jvm.optionals.getOrNull.T)))kotlin.jvm.optionals/java.util.-optional/get-or-null.html
+$dokka.location:kotlin.jvm.optionals$toCollection(java.util.Optional((kotlin.jvm.optionals.toCollection.T)), kotlin.jvm.optionals.toCollection.C)kotlin.jvm.optionals/java.util.-optional/to-collection.html
+$dokka.location:kotlin.jvm.optionals$toList(java.util.Optional((kotlin.jvm.optionals.toList.T)))kotlin.jvm.optionals/java.util.-optional/to-list.html
+$dokka.location:kotlin.jvm.optionals$toSet(java.util.Optional((kotlin.jvm.optionals.toSet.T)))kotlin.jvm.optionals/java.util.-optional/to-set.html
+$dokka.location:kotlin.random$asKotlinRandom(java.util.Random)kotlin.random/java.util.-random/as-kotlin-random.html
+$dokka.location:kotlin.reflect.KAnnotatedElementkotlin.reflect/-k-annotated-element/index.html
+$dokka.location:kotlin.reflect.KDeclarationContainerkotlin.reflect/-k-declaration-container/index.html
+$dokka.location:kotlin.reflect.KFunctionkotlin.reflect/-k-function/index.html
+$dokka.location:kotlin.reflect.KMutablePropertykotlin.reflect/-k-mutable-property/index.html
+$dokka.location:kotlin.reflect.KPropertykotlin.reflect/-k-property/index.html
+$dokka.location:kotlin.reflect.jvm$kotlinFunction#java.lang.reflect.Constructor((kotlin.reflect.jvm.kotlinFunction.T))kotlin.reflect.jvm/java.lang.reflect.-constructor/kotlin-function.html
+$dokka.location:kotlin.reflect.jvm$kotlinFunction#java.lang.reflect.Methodkotlin.reflect.jvm/java.lang.reflect.-method/kotlin-function.html
+$dokka.location:kotlin.reflect.jvm$kotlinProperty#java.lang.reflect.Fieldkotlin.reflect.jvm/java.lang.reflect.-field/kotlin-property.html
+$dokka.location:kotlin.sequences$asSequence(java.util.Enumeration((kotlin.sequences.asSequence.T)))kotlin.sequences/java.util.-enumeration/as-sequence.html
+$dokka.location:kotlin.streams$asSequence(java.util.stream.DoubleStream)kotlin.streams/java.util.stream.-double-stream/as-sequence.html
+$dokka.location:kotlin.streams$asSequence(java.util.stream.IntStream)kotlin.streams/java.util.stream.-int-stream/as-sequence.html
+$dokka.location:kotlin.streams$asSequence(java.util.stream.LongStream)kotlin.streams/java.util.stream.-long-stream/as-sequence.html
+$dokka.location:kotlin.streams$asSequence(java.util.stream.Stream((kotlin.streams.asSequence.T)))kotlin.streams/java.util.stream.-stream/as-sequence.html
+$dokka.location:kotlin.streams$asStream(kotlin.sequences.Sequence((kotlin.streams.asStream.T)))kotlin.streams/kotlin.sequences.-sequence/as-stream.html
+$dokka.location:kotlin.streams$toList(java.util.stream.DoubleStream)kotlin.streams/java.util.stream.-double-stream/to-list.html
+$dokka.location:kotlin.streams$toList(java.util.stream.IntStream)kotlin.streams/java.util.stream.-int-stream/to-list.html
+$dokka.location:kotlin.streams$toList(java.util.stream.LongStream)kotlin.streams/java.util.stream.-long-stream/to-list.html
+$dokka.location:kotlin.streams$toList(java.util.stream.Stream((kotlin.streams.toList.T)))kotlin.streams/java.util.stream.-stream/to-list.html
+$dokka.location:kotlin.text$appendLine(java.lang.StringBuilder, java.lang.StringBuffer?)kotlin.text/java.lang.-string-builder/append-line.html
+$dokka.location:kotlin.text$appendLine(java.lang.StringBuilder, java.lang.StringBuilder?)kotlin.text/java.lang.-string-builder/append-line.html
+$dokka.location:kotlin.text$appendLine(java.lang.StringBuilder, kotlin.Byte)kotlin.text/java.lang.-string-builder/append-line.html
+$dokka.location:kotlin.text$appendLine(java.lang.StringBuilder, kotlin.Double)kotlin.text/java.lang.-string-builder/append-line.html
+$dokka.location:kotlin.text$appendLine(java.lang.StringBuilder, kotlin.Float)kotlin.text/java.lang.-string-builder/append-line.html
+$dokka.location:kotlin.text$appendLine(java.lang.StringBuilder, kotlin.Int)kotlin.text/java.lang.-string-builder/append-line.html
+$dokka.location:kotlin.text$appendLine(java.lang.StringBuilder, kotlin.Long)kotlin.text/java.lang.-string-builder/append-line.html
+$dokka.location:kotlin.text$appendLine(java.lang.StringBuilder, kotlin.Short)kotlin.text/java.lang.-string-builder/append-line.html
+$dokka.location:kotlin.text$appendRange(java.lang.StringBuilder, kotlin.CharArray, kotlin.Int, kotlin.Int)kotlin.text/java.lang.-string-builder/append-range.html
+$dokka.location:kotlin.text$appendRange(java.lang.StringBuilder, kotlin.CharSequence, kotlin.Int, kotlin.Int)kotlin.text/java.lang.-string-builder/append-range.html
+$dokka.location:kotlin.text$appendln(java.lang.Appendable)kotlin.text/java.lang.-appendable/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.Appendable, kotlin.Char)kotlin.text/java.lang.-appendable/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.Appendable, kotlin.CharSequence?)kotlin.text/java.lang.-appendable/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, java.lang.StringBuffer?)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, java.lang.StringBuilder?)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, kotlin.Any?)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, kotlin.Boolean)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, kotlin.Byte)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, kotlin.Char)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, kotlin.CharArray)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, kotlin.CharSequence?)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, kotlin.Double)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, kotlin.Float)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, kotlin.Int)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, kotlin.Long)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, kotlin.Short)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$appendln(java.lang.StringBuilder, kotlin.String?)kotlin.text/java.lang.-string-builder/appendln.html
+$dokka.location:kotlin.text$clear(java.lang.StringBuilder)kotlin.text/java.lang.-string-builder/clear.html
+$dokka.location:kotlin.text$deleteAt(java.lang.StringBuilder, kotlin.Int)kotlin.text/java.lang.-string-builder/delete-at.html
+$dokka.location:kotlin.text$deleteRange(java.lang.StringBuilder, kotlin.Int, kotlin.Int)kotlin.text/java.lang.-string-builder/delete-range.html
+$dokka.location:kotlin.text$insertRange(java.lang.StringBuilder, kotlin.Int, kotlin.CharArray, kotlin.Int, kotlin.Int)kotlin.text/java.lang.-string-builder/insert-range.html
+$dokka.location:kotlin.text$insertRange(java.lang.StringBuilder, kotlin.Int, kotlin.CharSequence, kotlin.Int, kotlin.Int)kotlin.text/java.lang.-string-builder/insert-range.html
+$dokka.location:kotlin.text$set(java.lang.StringBuilder, kotlin.Int, kotlin.Char)kotlin.text/java.lang.-string-builder/set.html
+$dokka.location:kotlin.text$setRange(java.lang.StringBuilder, kotlin.Int, kotlin.Int, kotlin.String)kotlin.text/java.lang.-string-builder/set-range.html
+$dokka.location:kotlin.text$toCharArray(java.lang.StringBuilder, kotlin.CharArray, kotlin.Int, kotlin.Int, kotlin.Int)kotlin.text/java.lang.-string-builder/to-char-array.html
+$dokka.location:kotlin.text$toRegex(java.util.regex.Pattern)kotlin.text/java.util.regex.-pattern/to-regex.html
+$dokka.location:kotlin.text.Appendablekotlin.text/-appendable/index.html
+$dokka.location:kotlin.text.CharacterCodingExceptionkotlin.text/-character-coding-exception/index.html
+$dokka.location:kotlin.text.StringBuilderkotlin.text/-string-builder/index.html
+$dokka.location:kotlin.time$toDurationUnit(java.util.concurrent.TimeUnit)kotlin.time/java.util.concurrent.-time-unit/to-duration-unit.html
+$dokka.location:kotlin.time$toKotlinDuration(java.time.Duration)kotlin.time/java.time.-duration/to-kotlin-duration.html
+kotlin
+kotlin.annotation
+kotlin.browser
+kotlin.collections
+kotlin.comparisons
+kotlin.concurrent
+kotlin.contracts
+kotlin.coroutines
+kotlin.coroutines.cancellation
+kotlin.coroutines.intrinsics
+kotlin.dom
+kotlin.experimental
+kotlin.io
+kotlin.io.path
+kotlin.js
+kotlin.jvm
+kotlin.jvm.optionals
+kotlin.math
+kotlin.native
+kotlin.native.concurrent
+kotlin.native.ref
+kotlin.properties
+kotlin.random
+kotlin.ranges
+kotlin.reflect
+kotlin.reflect.full
+kotlin.reflect.jvm
+kotlin.sequences
+kotlin.streams
+kotlin.system
+kotlin.text
+kotlin.time
+kotlinx.browser
+kotlinx.cinterop
+kotlinx.cinterop.internal
+kotlinx.dom
+kotlinx.wasm.jsinterop
+org.khronos.webgl
+org.w3c.css.masking
+org.w3c.dom
+org.w3c.dom.clipboard
+org.w3c.dom.css
+org.w3c.dom.encryptedmedia
+org.w3c.dom.events
+org.w3c.dom.mediacapture
+org.w3c.dom.mediasource
+org.w3c.dom.parsing
+org.w3c.dom.pointerevents
+org.w3c.dom.svg
+org.w3c.dom.url
+org.w3c.fetch
+org.w3c.files
+org.w3c.notifications
+org.w3c.performance
+org.w3c.workers
+org.w3c.xhr
diff --git a/protolite-well-known-types/CHANGELOG.md b/protolite-well-known-types/CHANGELOG.md
new file mode 100644
index 00000000000..f514bbb890e
--- /dev/null
+++ b/protolite-well-known-types/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Unreleased
+
+
diff --git a/protolite-well-known-types/README.md b/protolite-well-known-types/README.md
index 6782ed2dfdb..30926d080d8 100644
--- a/protolite-well-known-types/README.md
+++ b/protolite-well-known-types/README.md
@@ -73,7 +73,7 @@ android {
 }
 
 dependencies {
-    implementation project(':protolite-well-known-types')
+    implementation 'com.google.firebase:protolite-well-known-types:18.0.0'
     implementation "io.grpc:grpc-stub:$grpcVersion"
 
     // optionally override grpc's protobuf-lite runtime
diff --git a/protolite-well-known-types/gradle.properties b/protolite-well-known-types/gradle.properties
index 9b7be4891d1..a60ca35eca9 100644
--- a/protolite-well-known-types/gradle.properties
+++ b/protolite-well-known-types/gradle.properties
@@ -1,2 +1,5 @@
-version=18.0.1
+# IMPORTANT (b/285892320) Keep version and latestReleasedVersion in sync 
+# unless you are releasing a new version of the library to prevent issues 
+# with transitive dependencies.
+version=18.0.0
 latestReleasedVersion=18.0.0
diff --git a/protolite-well-known-types/protolite-well-known-types.gradle b/protolite-well-known-types/protolite-well-known-types.gradle
index 1e6a0a429f2..59e62610451 100644
--- a/protolite-well-known-types/protolite-well-known-types.gradle
+++ b/protolite-well-known-types/protolite-well-known-types.gradle
@@ -19,6 +19,7 @@ plugins {
 
 firebaseLibrary {
     publishJavadoc = false
+    publishReleaseNotes = false
 }
 
 protobuf {
@@ -28,7 +29,7 @@ protobuf {
     generateProtoTasks {
         all().each { task ->
 
-	    task.addIncludeDir(files('fix-javalite/proto'))
+            task.addIncludeDir(files('fix-javalite/proto'))
 
             task.builtins {
                 java {
@@ -39,7 +40,8 @@ protobuf {
     }
 }
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "firebase.com.protolitewrapper"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         targetSdkVersion project.targetSdkVersion
         minSdkVersion project.minSdkVersion
@@ -60,9 +62,9 @@ android {
 
 
 dependencies {
-    implementation "com.google.protobuf:protobuf-javalite:$javaliteVersion"
-
     protobuf("com.google.api.grpc:proto-google-common-protos:1.18.0"){
         exclude group: "com.google.protobuf", module: "protobuf-java"
     }
+
+    implementation "com.google.protobuf:protobuf-javalite:$javaliteVersion"
 }
diff --git a/protolite-well-known-types/src/main/AndroidManifest.xml b/protolite-well-known-types/src/main/AndroidManifest.xml
index 5808444ec83..94cbbcfc396 100644
--- a/protolite-well-known-types/src/main/AndroidManifest.xml
+++ b/protolite-well-known-types/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="firebase.com.protolitewrapper"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/sdkProperties.gradle b/sdkProperties.gradle
index 417372ecc34..a6a7586a842 100644
--- a/sdkProperties.gradle
+++ b/sdkProperties.gradle
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 ext {
-    targetSdkVersion = 29
-    minSdkVersion = 14
-}
\ No newline at end of file
+    targetSdkVersion = 33
+    compileSdkVersion = 34
+    minSdkVersion = 21
+}
diff --git a/settings.gradle b/settings.gradle
index 0b87cb1f5a2..b52d04ceb36 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,5 +23,3 @@ discoverSubprojects(file('subprojects.cfg')).each {
 }
 
 renameBuildScripts(rootProject)
-
-apply from: new File(settingsDir, 'gradle/buildCache.gradle')
diff --git a/smoke-tests/build.gradle b/smoke-tests/build.gradle
index 5a9a8601ff7..776164819e6 100644
--- a/smoke-tests/build.gradle
+++ b/smoke-tests/build.gradle
@@ -23,8 +23,8 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:3.4.3"
-    classpath "com.google.gms:google-services:4.3.10"
+    classpath "com.android.tools.build:gradle:8.3.2"
+    classpath "com.google.gms:google-services:4.3.14"
     classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
   }
 }
@@ -32,10 +32,10 @@ buildscript {
 apply plugin: "com.android.application"
 
 android {
-  compileSdkVersion 29
-
+  compileSdkVersion 34
+  namespace = "com.google.firebase.testing"
   defaultConfig {
-    minSdkVersion 19
+    minSdkVersion 23
     multiDexEnabled true
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     versionName "1.0.0"
@@ -64,30 +64,33 @@ android {
 apply from: "configure.gradle"
 
 dependencies {
+  implementation "androidx.test:core:1.5.0"
+  // Common utilities (application side)
+  implementation "androidx.test:rules:1.4.0"
+  implementation "androidx.test:runner:1.4.0"
   // Firebase
   implementation "com.google.firebase:firebase-analytics"
   implementation "com.google.firebase:firebase-annotations"
-  implementation "com.google.firebase:firebase-appindexing"
+  implementation "com.google.firebase:firebase-appdistribution:16.0.0-beta03"
+  implementation "com.google.firebase:firebase-appdistribution-api:16.0.0-beta03"
   implementation "com.google.firebase:firebase-auth"
   implementation "com.google.firebase:firebase-common"
   implementation "com.google.firebase:firebase-config"
-  implementation "com.google.firebase:firebase-crashlytics"
+  implementation "com.google.firebase:firebase-crashlytics:18.6.4"
   implementation "com.google.firebase:firebase-database"
   implementation "com.google.firebase:firebase-dynamic-links"
   implementation "com.google.firebase:firebase-firestore"
   implementation "com.google.firebase:firebase-functions"
+  // TODO(yifany): remove after the issue is fixed
+  // https://github.com/firebase/firebase-android-sdk/issues/4206
+  implementation "com.google.firebase:firebase-iid:21.1.0"
   implementation "com.google.firebase:firebase-inappmessaging"
   implementation "com.google.firebase:firebase-messaging"
-  implementation "com.google.firebase:firebase-ml-modeldownloader"
+  implementation "com.google.firebase:firebase-ml-modeldownloader:24.2.3"
   implementation "com.google.firebase:firebase-perf"
   implementation "com.google.firebase:firebase-storage"
-
-  // Common utilities (application side)
-  implementation "androidx.test:rules:1.4.0"
-  implementation "androidx.test:runner:1.4.0"
   implementation "com.google.truth:truth:1.0.1"
   implementation "junit:junit:4.13.2"
-  implementation "androidx.test:core:1.4.0"
 
   // Common utilities (instrumentation side)
   androidTestImplementation "androidx.test:runner:1.4.0"
diff --git a/smoke-tests/configure.gradle b/smoke-tests/configure.gradle
index 5450195caf9..65e5aac2690 100644
--- a/smoke-tests/configure.gradle
+++ b/smoke-tests/configure.gradle
@@ -19,7 +19,7 @@ def configurePlatform() {
     bom = project.getProperty("firebase-bom")
   }
 
-  def platform = project.dependencies.platform(bom)
+  def platform = project.dependencies.enforcedPlatform(bom)
   project.dependencies.add("implementation", platform)
 }
 
diff --git a/smoke-tests/gradle.properties b/smoke-tests/gradle.properties
index 92c2f7409e7..372e31337a0 100644
--- a/smoke-tests/gradle.properties
+++ b/smoke-tests/gradle.properties
@@ -15,4 +15,4 @@
 android.enableR8=true
 android.useAndroidX=true
 
-org.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=8g
+org.gradle.jvmargs=-Xmx8g
diff --git a/smoke-tests/settings.gradle b/smoke-tests/settings.gradle
index 9db1d6a346a..a3cc1b04d31 100644
--- a/smoke-tests/settings.gradle
+++ b/smoke-tests/settings.gradle
@@ -11,5 +11,3 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
-enableFeaturePreview("IMPROVED_POM_SUPPORT")
diff --git a/smoke-tests/src/androidTest/backend/functions/functions/package-lock.json b/smoke-tests/src/androidTest/backend/functions/functions/package-lock.json
index 6fb1e64c8b0..453a83077fc 100644
--- a/smoke-tests/src/androidTest/backend/functions/functions/package-lock.json
+++ b/smoke-tests/src/androidTest/backend/functions/functions/package-lock.json
@@ -1,34 +1,3713 @@
 {
   "name": "functions",
+  "lockfileVersion": 2,
   "requires": true,
-  "lockfileVersion": 1,
+  "packages": {
+    "": {
+      "name": "functions",
+      "dependencies": {
+        "firebase-admin": "^11.8.0",
+        "firebase-functions": "^4.4.0"
+      },
+      "devDependencies": {
+        "eslint": "7.19.0",
+        "eslint-config-google": "0.14.0",
+        "firebase-functions-test": "0.2.3"
+      },
+      "engines": {
+        "node": "19"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.21.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
+      "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==",
+      "optional": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz",
+      "integrity": "sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "lodash": "^4.17.20",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/@fastify/busboy": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-1.2.1.tgz",
+      "integrity": "sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==",
+      "dependencies": {
+        "text-decoding": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@firebase/app-types": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.0.tgz",
+      "integrity": "sha512-AeweANOIo0Mb8GiYm3xhTEBVCmPwTYAu9Hcd2qSkLuga/6+j9b1Jskl5bpiSQWy9eJ/j5pavxj6eYogmnuzm+Q=="
+    },
+    "node_modules/@firebase/auth-interop-types": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.2.1.tgz",
+      "integrity": "sha512-VOaGzKp65MY6P5FI84TfYKBXEPi6LmOCSMMzys6o2BN2LOsqy7pCuZCup7NYnfbk5OkkQKzvIfHOzTm0UDpkyg=="
+    },
+    "node_modules/@firebase/component": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.4.tgz",
+      "integrity": "sha512-rLMyrXuO9jcAUCaQXCMjCMUsWrba5fzHlNK24xz5j2W6A/SRmK8mZJ/hn7V0fViLbxC0lPMtrK1eYzk6Fg03jA==",
+      "dependencies": {
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@firebase/database": {
+      "version": "0.14.4",
+      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.14.4.tgz",
+      "integrity": "sha512-+Ea/IKGwh42jwdjCyzTmeZeLM3oy1h0mFPsTy6OqCWzcu/KFqRAr5Tt1HRCOBlNOdbh84JPZC47WLU18n2VbxQ==",
+      "dependencies": {
+        "@firebase/auth-interop-types": "0.2.1",
+        "@firebase/component": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "faye-websocket": "0.11.4",
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@firebase/database-compat": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.3.4.tgz",
+      "integrity": "sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==",
+      "dependencies": {
+        "@firebase/component": "0.6.4",
+        "@firebase/database": "0.14.4",
+        "@firebase/database-types": "0.10.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@firebase/database-types": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.10.4.tgz",
+      "integrity": "sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==",
+      "dependencies": {
+        "@firebase/app-types": "0.9.0",
+        "@firebase/util": "1.9.3"
+      }
+    },
+    "node_modules/@firebase/logger": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.0.tgz",
+      "integrity": "sha512-eRKSeykumZ5+cJPdxxJRgAC3G5NknY2GwEbKfymdnXtnT0Ucm4pspfR6GT4MUQEDuJwRVbVcSx85kgJulMoFFA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@google-cloud/firestore": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-6.5.0.tgz",
+      "integrity": "sha512-U0QwG6pEQxO5c0v0eUylswozmuvlvz7iXSW+I18jzqR2hAFrUq2Weu1wm3NaH8wGD4ZL7W9Be4cMHG5CYU8LuQ==",
+      "optional": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "functional-red-black-tree": "^1.0.1",
+        "google-gax": "^3.5.7",
+        "protobufjs": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@google-cloud/paginator": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.7.tgz",
+      "integrity": "sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ==",
+      "optional": true,
+      "dependencies": {
+        "arrify": "^2.0.0",
+        "extend": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@google-cloud/projectify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-3.0.0.tgz",
+      "integrity": "sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA==",
+      "optional": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@google-cloud/promisify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-3.0.1.tgz",
+      "integrity": "sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA==",
+      "optional": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@google-cloud/storage": {
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-6.10.1.tgz",
+      "integrity": "sha512-EtLlT0YbXtrbUxaNbEfTyTytrjELtl4i42flf8COg+Hu5+apdNjsFO9XEY39wshxAuVjLf4fCSm7GTSW+BD3gQ==",
+      "optional": true,
+      "dependencies": {
+        "@google-cloud/paginator": "^3.0.7",
+        "@google-cloud/projectify": "^3.0.0",
+        "@google-cloud/promisify": "^3.0.0",
+        "abort-controller": "^3.0.0",
+        "async-retry": "^1.3.3",
+        "compressible": "^2.0.12",
+        "duplexify": "^4.0.0",
+        "ent": "^2.2.0",
+        "extend": "^3.0.2",
+        "gaxios": "^5.0.0",
+        "google-auth-library": "^8.0.1",
+        "mime": "^3.0.0",
+        "mime-types": "^2.0.8",
+        "p-limit": "^3.0.1",
+        "retry-request": "^5.0.0",
+        "teeny-request": "^8.0.0",
+        "uuid": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@google-cloud/storage/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "optional": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@grpc/grpc-js": {
+      "version": "1.8.14",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.14.tgz",
+      "integrity": "sha512-w84maJ6CKl5aApCMzFll0hxtFNT6or9WwMslobKaqWUEf1K+zhlL43bSQhFreyYWIWR+Z0xnVFC1KtLm4ZpM/A==",
+      "optional": true,
+      "dependencies": {
+        "@grpc/proto-loader": "^0.7.0",
+        "@types/node": ">=12.12.47"
+      },
+      "engines": {
+        "node": "^8.13.0 || >=10.10.0"
+      }
+    },
+    "node_modules/@grpc/proto-loader": {
+      "version": "0.7.7",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.7.tgz",
+      "integrity": "sha512-1TIeXOi8TuSCQprPItwoMymZXxWT0CPxUhkrkeCUH+D8U7QDwQ6b7SUz2MaLuWM2llT+J/TVFLmQI5KtML3BhQ==",
+      "optional": true,
+      "dependencies": {
+        "@types/long": "^4.0.1",
+        "lodash.camelcase": "^4.3.0",
+        "long": "^4.0.0",
+        "protobufjs": "^7.0.0",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@jsdoc/salty": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.5.tgz",
+      "integrity": "sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==",
+      "optional": true,
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "engines": {
+        "node": ">=v12.0.0"
+      }
+    },
+    "node_modules/@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
+    },
+    "node_modules/@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+    },
+    "node_modules/@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+    },
+    "node_modules/@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
+    },
+    "node_modules/@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.1",
+        "@protobufjs/inquire": "^1.1.0"
+      }
+    },
+    "node_modules/@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
+    },
+    "node_modules/@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
+    },
+    "node_modules/@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
+    },
+    "node_modules/@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
+    },
+    "node_modules/@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "optional": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@types/body-parser": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
+      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.35",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
+      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/cors": {
+      "version": "2.8.12",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
+      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
+    },
+    "node_modules/@types/express": {
+      "version": "4.17.3",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz",
+      "integrity": "sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==",
+      "dependencies": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "node_modules/@types/express-serve-static-core": {
+      "version": "4.17.34",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.34.tgz",
+      "integrity": "sha512-fvr49XlCGoUj2Pp730AItckfjat4WNb0lb3kfrLWffd+RLeoGAMsq7UOy04PAPtoL01uKwcp6u8nhzpgpDYr3w==",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==",
+      "optional": true,
+      "dependencies": {
+        "@types/minimatch": "^5.1.2",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/jsonwebtoken": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
+      "integrity": "sha512-drE6uz7QBKq1fYqqoFKTDRdFCPHd5TCub75BM+D+cMx7NU9hUz7SESLfC2fSCXVFMO5Yj8sOWHuGqPgjc+fz0Q==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/linkify-it": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
+      "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
+      "optional": true
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.14.185",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.185.tgz",
+      "integrity": "sha512-evMDG1bC4rgQg4ku9tKpuMh5iBNEwNa3tf9zRHdP1qlv+1WUg44xat4IxCE14gIpZRGUUWAx2VhItCZc25NfMA==",
+      "dev": true
+    },
+    "node_modules/@types/long": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
+      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==",
+      "optional": true
+    },
+    "node_modules/@types/markdown-it": {
+      "version": "12.2.3",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
+      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "optional": true,
+      "dependencies": {
+        "@types/linkify-it": "*",
+        "@types/mdurl": "*"
+      }
+    },
+    "node_modules/@types/mdurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
+      "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
+      "optional": true
+    },
+    "node_modules/@types/mime": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
+      "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
+    },
+    "node_modules/@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+      "optional": true
+    },
+    "node_modules/@types/node": {
+      "version": "18.7.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz",
+      "integrity": "sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="
+    },
+    "node_modules/@types/qs": {
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
+      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
+    },
+    "node_modules/@types/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==",
+      "optional": true,
+      "dependencies": {
+        "@types/glob": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
+      "dependencies": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/send/node_modules/@types/mime": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
+      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+    },
+    "node_modules/@types/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
+      "dependencies": {
+        "@types/mime": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "optional": true,
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "devOptional": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "devOptional": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "optional": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "devOptional": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+    },
+    "node_modules/arrify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/async-retry": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz",
+      "integrity": "sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==",
+      "optional": true,
+      "dependencies": {
+        "retry": "0.13.1"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "devOptional": true
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true
+    },
+    "node_modules/bignumber.js": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "optional": true
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "devOptional": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
+    },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/catharsis": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
+      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
+      "optional": true,
+      "dependencies": {
+        "lodash": "^4.17.15"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "devOptional": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "optional": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "devOptional": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "devOptional": true
+    },
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "optional": true,
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "devOptional": true
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+    },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "devOptional": true
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/duplexify": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
+      "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
+      "optional": true,
+      "dependencies": {
+        "end-of-stream": "^1.4.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "devOptional": true
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "optional": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==",
+      "optional": true
+    },
+    "node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "optional": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "optional": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "optional": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "optional": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "optional": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "optional": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "optional": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.19.0.tgz",
+      "integrity": "sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@eslint/eslintrc": "^0.3.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.2.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^6.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash": "^4.17.20",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.4",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-google": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz",
+      "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=5.16.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "devOptional": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.2",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.6.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "optional": true
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "devOptional": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "devOptional": true
+    },
+    "node_modules/fast-text-encoding": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz",
+      "integrity": "sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==",
+      "optional": true
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/firebase-admin": {
+      "version": "11.8.0",
+      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-11.8.0.tgz",
+      "integrity": "sha512-RxO0wWDnuqVikXExhVjnhVaaXpziKCad4D1rOX5c1WJdk1jAu9hfE4rbrFKZQZgF1okZS04kgCBIFJro7xn8NQ==",
+      "dependencies": {
+        "@fastify/busboy": "^1.2.1",
+        "@firebase/database-compat": "^0.3.4",
+        "@firebase/database-types": "^0.10.4",
+        "@types/node": ">=12.12.47",
+        "jsonwebtoken": "^9.0.0",
+        "jwks-rsa": "^3.0.1",
+        "node-forge": "^1.3.1",
+        "uuid": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "optionalDependencies": {
+        "@google-cloud/firestore": "^6.5.0",
+        "@google-cloud/storage": "^6.9.5"
+      }
+    },
+    "node_modules/firebase-functions": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-4.4.0.tgz",
+      "integrity": "sha512-Vdkr9/y/UKQez//cPm2Iu/9CeayqQ2tQF6o3KXozDDBokK9AOlAalVHImCpKo6nWptT/ncZ8djJFk5cR8l+E+A==",
+      "dependencies": {
+        "@types/cors": "^2.8.5",
+        "@types/express": "4.17.3",
+        "cors": "^2.8.5",
+        "express": "^4.17.1",
+        "node-fetch": "^2.6.7",
+        "protobufjs": "^7.2.2"
+      },
+      "bin": {
+        "firebase-functions": "lib/bin/firebase-functions.js"
+      },
+      "engines": {
+        "node": ">=14.10.0"
+      },
+      "peerDependencies": {
+        "firebase-admin": "^10.0.0 || ^11.0.0"
+      }
+    },
+    "node_modules/firebase-functions-test": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/firebase-functions-test/-/firebase-functions-test-0.2.3.tgz",
+      "integrity": "sha512-zYX0QTm53wCazuej7O0xqbHl90r/v1PTXt/hwa0jo1YF8nDM+iBKnLDlkIoW66MDd0R6aGg4BvKzTTdJpvigUA==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "^4.14.104",
+        "lodash": "^4.17.5"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "firebase-admin": ">=6.0.0",
+        "firebase-functions": ">=2.0.0"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "devOptional": true
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "devOptional": true
+    },
+    "node_modules/gaxios": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.1.0.tgz",
+      "integrity": "sha512-aezGIjb+/VfsJtIcHGcBSerNEDdfdHeMros+RbYbGpmonKWQCOVOes0LVZhn1lDtIgq55qq0HaxymIoae3Fl/A==",
+      "optional": true,
+      "dependencies": {
+        "extend": "^3.0.2",
+        "https-proxy-agent": "^5.0.0",
+        "is-stream": "^2.0.0",
+        "node-fetch": "^2.6.7"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/gcp-metadata": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.2.0.tgz",
+      "integrity": "sha512-aFhhvvNycky2QyhG+dcfEdHBF0FRbYcf39s6WNHUDysKSrbJ5vuFbjydxBcmewtXeV248GP8dWT3ByPNxsyHCw==",
+      "optional": true,
+      "dependencies": {
+        "gaxios": "^5.0.0",
+        "json-bigint": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "optional": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "devOptional": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/globals": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/google-auth-library": {
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.8.0.tgz",
+      "integrity": "sha512-0iJn7IDqObDG5Tu9Tn2WemmJ31ksEa96IyK0J0OZCpTh6CrC6FrattwKX87h3qKVuprCJpdOGKc1Xi8V0kMh8Q==",
+      "optional": true,
+      "dependencies": {
+        "arrify": "^2.0.0",
+        "base64-js": "^1.3.0",
+        "ecdsa-sig-formatter": "^1.0.11",
+        "fast-text-encoding": "^1.0.0",
+        "gaxios": "^5.0.0",
+        "gcp-metadata": "^5.2.0",
+        "gtoken": "^6.1.0",
+        "jws": "^4.0.0",
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/google-gax": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-3.6.1.tgz",
+      "integrity": "sha512-g/lcUjGcB6DSw2HxgEmCDOrI/CByOwqRvsuUvNalHUK2iPPPlmAIpbMbl62u0YufGMr8zgE3JL7th6dCb1Ry+w==",
+      "optional": true,
+      "dependencies": {
+        "@grpc/grpc-js": "~1.8.0",
+        "@grpc/proto-loader": "^0.7.0",
+        "@types/long": "^4.0.0",
+        "@types/rimraf": "^3.0.2",
+        "abort-controller": "^3.0.0",
+        "duplexify": "^4.0.0",
+        "fast-text-encoding": "^1.0.3",
+        "google-auth-library": "^8.0.2",
+        "is-stream-ended": "^0.1.4",
+        "node-fetch": "^2.6.1",
+        "object-hash": "^3.0.0",
+        "proto3-json-serializer": "^1.0.0",
+        "protobufjs": "7.2.4",
+        "protobufjs-cli": "1.1.1",
+        "retry-request": "^5.0.0"
+      },
+      "bin": {
+        "compileProtos": "build/tools/compileProtos.js",
+        "minifyProtoJson": "build/tools/minify.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/google-p12-pem": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-4.0.1.tgz",
+      "integrity": "sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==",
+      "optional": true,
+      "dependencies": {
+        "node-forge": "^1.3.1"
+      },
+      "bin": {
+        "gp12-pem": "build/src/bin/gp12-pem.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "optional": true
+    },
+    "node_modules/gtoken": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-6.1.2.tgz",
+      "integrity": "sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==",
+      "optional": true,
+      "dependencies": {
+        "gaxios": "^5.0.1",
+        "google-p12-pem": "^4.0.0",
+        "jws": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-parser-js": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "optional": true,
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "optional": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "devOptional": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-stream-ended": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz",
+      "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==",
+      "optional": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/jose": {
+      "version": "4.15.5",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.5.tgz",
+      "integrity": "sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==",
+      "funding": {
+        "url": "https://github.com/sponsors/panva"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/js2xmlparser": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
+      "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
+      "optional": true,
+      "dependencies": {
+        "xmlcreate": "^2.0.4"
+      }
+    },
+    "node_modules/jsdoc": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.2.tgz",
+      "integrity": "sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==",
+      "optional": true,
+      "dependencies": {
+        "@babel/parser": "^7.20.15",
+        "@jsdoc/salty": "^0.2.1",
+        "@types/markdown-it": "^12.2.3",
+        "bluebird": "^3.7.2",
+        "catharsis": "^0.9.0",
+        "escape-string-regexp": "^2.0.0",
+        "js2xmlparser": "^4.0.2",
+        "klaw": "^3.0.0",
+        "markdown-it": "^12.3.2",
+        "markdown-it-anchor": "^8.4.1",
+        "marked": "^4.0.10",
+        "mkdirp": "^1.0.4",
+        "requizzle": "^0.2.3",
+        "strip-json-comments": "^3.1.0",
+        "underscore": "~1.13.2"
+      },
+      "bin": {
+        "jsdoc": "jsdoc.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/json-bigint": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "optional": true,
+      "dependencies": {
+        "bignumber.js": "^9.0.0"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/jsonwebtoken": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
+      "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
+      "dependencies": {
+        "jws": "^3.2.2",
+        "lodash": "^4.17.21",
+        "ms": "^2.1.1",
+        "semver": "^7.3.8"
+      },
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/jsonwebtoken/node_modules/jwa": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jsonwebtoken/node_modules/jws": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "dependencies": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jwa": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
+      "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+      "optional": true,
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jwks-rsa": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.0.1.tgz",
+      "integrity": "sha512-UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw==",
+      "dependencies": {
+        "@types/express": "^4.17.14",
+        "@types/jsonwebtoken": "^9.0.0",
+        "debug": "^4.3.4",
+        "jose": "^4.10.4",
+        "limiter": "^1.1.5",
+        "lru-memoizer": "^2.1.4"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/jwks-rsa/node_modules/@types/express": {
+      "version": "4.17.17",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
+      "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
+      "dependencies": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.33",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "node_modules/jws": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
+      "optional": true,
+      "dependencies": {
+        "jwa": "^2.0.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/klaw": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
+      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
+      "optional": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/limiter": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz",
+      "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="
+    },
+    "node_modules/linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "optional": true,
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
+      "optional": true
+    },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true
+    },
+    "node_modules/long": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
+      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==",
+      "optional": true
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/lru-memoizer": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.2.0.tgz",
+      "integrity": "sha512-QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw==",
+      "dependencies": {
+        "lodash.clonedeep": "^4.5.0",
+        "lru-cache": "~4.0.0"
+      }
+    },
+    "node_modules/lru-memoizer/node_modules/lru-cache": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz",
+      "integrity": "sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==",
+      "dependencies": {
+        "pseudomap": "^1.0.1",
+        "yallist": "^2.0.0"
+      }
+    },
+    "node_modules/lru-memoizer/node_modules/yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
+    },
+    "node_modules/markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "optional": true,
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/markdown-it-anchor": {
+      "version": "8.6.7",
+      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz",
+      "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==",
+      "optional": true,
+      "peerDependencies": {
+        "@types/markdown-it": "*",
+        "markdown-it": "*"
+      }
+    },
+    "node_modules/markdown-it/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "optional": true
+    },
+    "node_modules/marked": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
+      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+      "optional": true,
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
+      "optional": true
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
+      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
+      "optional": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "devOptional": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "optional": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "optional": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-hash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "optional": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "devOptional": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "optional": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/proto3-json-serializer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz",
+      "integrity": "sha512-AwAuY4g9nxx0u52DnSMkqqgyLHaW/XaPLtaAo3y/ZCfeaQB/g4YDH4kb8Wc/mWzWvu0YjOznVnfn373MVZZrgw==",
+      "optional": true,
+      "dependencies": {
+        "protobufjs": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/protobufjs": {
+      "version": "7.2.4",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz",
+      "integrity": "sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/protobufjs-cli": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz",
+      "integrity": "sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==",
+      "optional": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "escodegen": "^1.13.0",
+        "espree": "^9.0.0",
+        "estraverse": "^5.1.0",
+        "glob": "^8.0.0",
+        "jsdoc": "^4.0.0",
+        "minimist": "^1.2.0",
+        "semver": "^7.1.2",
+        "tmp": "^0.2.1",
+        "uglify-js": "^3.7.7"
+      },
+      "bin": {
+        "pbjs": "bin/pbjs",
+        "pbts": "bin/pbts"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "protobufjs": "^7.0.0"
+      }
+    },
+    "node_modules/protobufjs-cli/node_modules/acorn": {
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "optional": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/protobufjs-cli/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "optional": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/protobufjs-cli/node_modules/eslint-visitor-keys": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "optional": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/protobufjs-cli/node_modules/espree": {
+      "version": "9.5.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
+      "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
+      "optional": true,
+      "dependencies": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/protobufjs-cli/node_modules/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "optional": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/protobufjs-cli/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "optional": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/protobufjs/node_modules/long": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "optional": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/requizzle": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz",
+      "integrity": "sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==",
+      "optional": true,
+      "dependencies": {
+        "lodash": "^4.17.21"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "optional": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/retry-request": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-5.0.2.tgz",
+      "integrity": "sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==",
+      "optional": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "extend": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "devOptional": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/semver": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
+      "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/send/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/stream-events": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz",
+      "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==",
+      "optional": true,
+      "dependencies": {
+        "stubs": "^3.0.0"
+      }
+    },
+    "node_modules/stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "optional": true
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "optional": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "devOptional": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "devOptional": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stubs": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+      "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==",
+      "optional": true
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "devOptional": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/teeny-request": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-8.0.3.tgz",
+      "integrity": "sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww==",
+      "optional": true,
+      "dependencies": {
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "stream-events": "^1.0.5",
+        "uuid": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/text-decoding": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/text-decoding/-/text-decoding-1.0.0.tgz",
+      "integrity": "sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA=="
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "optional": true,
+      "dependencies": {
+        "rimraf": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.17.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/tslib": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "optional": true
+    },
+    "node_modules/uglify-js": {
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+      "optional": true,
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/underscore": {
+      "version": "1.13.6",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
+      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+      "optional": true
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "optional": true
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/websocket-driver": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "optional": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "devOptional": true
+    },
+    "node_modules/xmlcreate": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
+      "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
+      "optional": true
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "optional": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "optional": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "optional": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "optional": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  },
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.12.13"
+        "@babel/highlight": "^7.18.6"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
       "dev": true
     },
     "@babel/highlight": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-      "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-validator-identifier": "^7.18.6",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
         "chalk": {
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -39,9 +3718,51 @@
             "escape-string-regexp": "^1.0.5",
             "supports-color": "^5.3.0"
           }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
+    "@babel/parser": {
+      "version": "7.21.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
+      "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==",
+      "optional": true
+    },
     "@eslint/eslintrc": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz",
@@ -60,92 +3781,100 @@
         "strip-json-comments": "^3.1.1"
       }
     },
+    "@fastify/busboy": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-1.2.1.tgz",
+      "integrity": "sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==",
+      "requires": {
+        "text-decoding": "^1.0.0"
+      }
+    },
     "@firebase/app-types": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.1.tgz",
-      "integrity": "sha512-L/ZnJRAq7F++utfuoTKX4CLBG5YR7tFO3PLzG1/oXXKEezJ0kRL3CMRoueBEmTCzVb/6SIs2Qlaw++uDgi5Xyg=="
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.0.tgz",
+      "integrity": "sha512-AeweANOIo0Mb8GiYm3xhTEBVCmPwTYAu9Hcd2qSkLuga/6+j9b1Jskl5bpiSQWy9eJ/j5pavxj6eYogmnuzm+Q=="
     },
     "@firebase/auth-interop-types": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.5.tgz",
-      "integrity": "sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw=="
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.2.1.tgz",
+      "integrity": "sha512-VOaGzKp65MY6P5FI84TfYKBXEPi6LmOCSMMzys6o2BN2LOsqy7pCuZCup7NYnfbk5OkkQKzvIfHOzTm0UDpkyg=="
     },
     "@firebase/component": {
-      "version": "0.1.21",
-      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.1.21.tgz",
-      "integrity": "sha512-kd5sVmCLB95EK81Pj+yDTea8pzN2qo/1yr0ua9yVi6UgMzm6zAeih73iVUkaat96MAHy26yosMufkvd3zC4IKg==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.4.tgz",
+      "integrity": "sha512-rLMyrXuO9jcAUCaQXCMjCMUsWrba5fzHlNK24xz5j2W6A/SRmK8mZJ/hn7V0fViLbxC0lPMtrK1eYzk6Fg03jA==",
       "requires": {
-        "@firebase/util": "0.3.4",
-        "tslib": "^1.11.1"
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
       }
     },
     "@firebase/database": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.8.3.tgz",
-      "integrity": "sha512-i29rr3kcPltIkA8La9M1lgsSxx9bfu5lCQ0T+tbJptZ3UpqpcL1NzCcZa24cJjiLgq3HQNPyLvUvCtcPSFDlRg==",
+      "version": "0.14.4",
+      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.14.4.tgz",
+      "integrity": "sha512-+Ea/IKGwh42jwdjCyzTmeZeLM3oy1h0mFPsTy6OqCWzcu/KFqRAr5Tt1HRCOBlNOdbh84JPZC47WLU18n2VbxQ==",
+      "requires": {
+        "@firebase/auth-interop-types": "0.2.1",
+        "@firebase/component": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "faye-websocket": "0.11.4",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/database-compat": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.3.4.tgz",
+      "integrity": "sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==",
       "requires": {
-        "@firebase/auth-interop-types": "0.1.5",
-        "@firebase/component": "0.1.21",
-        "@firebase/database-types": "0.6.1",
-        "@firebase/logger": "0.2.6",
-        "@firebase/util": "0.3.4",
-        "faye-websocket": "0.11.3",
-        "tslib": "^1.11.1"
+        "@firebase/component": "0.6.4",
+        "@firebase/database": "0.14.4",
+        "@firebase/database-types": "0.10.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
       }
     },
     "@firebase/database-types": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.6.1.tgz",
-      "integrity": "sha512-JtL3FUbWG+bM59iYuphfx9WOu2Mzf0OZNaqWiQ7lJR8wBe7bS9rIm9jlBFtksB7xcya1lZSQPA/GAy2jIlMIkA==",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.10.4.tgz",
+      "integrity": "sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==",
       "requires": {
-        "@firebase/app-types": "0.6.1"
+        "@firebase/app-types": "0.9.0",
+        "@firebase/util": "1.9.3"
       }
     },
     "@firebase/logger": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.2.6.tgz",
-      "integrity": "sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw=="
-    },
-    "@firebase/util": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.3.4.tgz",
-      "integrity": "sha512-VwjJUE2Vgr2UMfH63ZtIX9Hd7x+6gayi6RUXaTqEYxSbf/JmehLmAEYSuxS/NckfzAXWeGnKclvnXVibDgpjQQ==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.0.tgz",
+      "integrity": "sha512-eRKSeykumZ5+cJPdxxJRgAC3G5NknY2GwEbKfymdnXtnT0Ucm4pspfR6GT4MUQEDuJwRVbVcSx85kgJulMoFFA==",
       "requires": {
-        "tslib": "^1.11.1"
+        "tslib": "^2.1.0"
       }
     },
-    "@google-cloud/common": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.5.0.tgz",
-      "integrity": "sha512-10d7ZAvKhq47L271AqvHEd8KzJqGU45TY+rwM2Z3JHuB070FeTi7oJJd7elfrnKaEvaktw3hH2wKnRWxk/3oWQ==",
-      "optional": true,
+    "@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
       "requires": {
-        "@google-cloud/projectify": "^2.0.0",
-        "@google-cloud/promisify": "^2.0.0",
-        "arrify": "^2.0.1",
-        "duplexify": "^4.1.1",
-        "ent": "^2.2.0",
-        "extend": "^3.0.2",
-        "google-auth-library": "^6.1.1",
-        "retry-request": "^4.1.1",
-        "teeny-request": "^7.0.0"
+        "tslib": "^2.1.0"
       }
     },
     "@google-cloud/firestore": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.9.3.tgz",
-      "integrity": "sha512-0BFmq04q+pgUq7stxwA4nZj40nURgxhdU4E4UJT73YON/BsJioJiZZAzQCQeueOJRCzqyx5IraoTSAadQME3wQ==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-6.5.0.tgz",
+      "integrity": "sha512-U0QwG6pEQxO5c0v0eUylswozmuvlvz7iXSW+I18jzqR2hAFrUq2Weu1wm3NaH8wGD4ZL7W9Be4cMHG5CYU8LuQ==",
       "optional": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "functional-red-black-tree": "^1.0.1",
-        "google-gax": "^2.9.2"
+        "google-gax": "^3.5.7",
+        "protobufjs": "^7.0.0"
       }
     },
     "@google-cloud/paginator": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz",
-      "integrity": "sha512-N4Uk4BT1YuskfRhKXBs0n9Lg2YTROZc6IMpkO/8DIHODtm5s3xY8K5vVBo23v/2XulY3azwITQlYWgT4GdLsUw==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.7.tgz",
+      "integrity": "sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ==",
       "optional": true,
       "requires": {
         "arrify": "^2.0.0",
@@ -153,104 +3882,106 @@
       }
     },
     "@google-cloud/projectify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.0.1.tgz",
-      "integrity": "sha512-ZDG38U/Yy6Zr21LaR3BTiiLtpJl6RkPS/JwoRT453G+6Q1DhlV0waNf8Lfu+YVYGIIxgKnLayJRfYlFJfiI8iQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-3.0.0.tgz",
+      "integrity": "sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA==",
       "optional": true
     },
     "@google-cloud/promisify": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz",
-      "integrity": "sha512-d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-3.0.1.tgz",
+      "integrity": "sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA==",
       "optional": true
     },
     "@google-cloud/storage": {
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.7.4.tgz",
-      "integrity": "sha512-fynB3kDT+lhx71laML+LtUs/w9Ezcf+SVAsaP0fhAyPQzOc0kp43uYTymYCvF9GffYR7jcy6yqYifeMSU9VEVA==",
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-6.10.1.tgz",
+      "integrity": "sha512-EtLlT0YbXtrbUxaNbEfTyTytrjELtl4i42flf8COg+Hu5+apdNjsFO9XEY39wshxAuVjLf4fCSm7GTSW+BD3gQ==",
       "optional": true,
       "requires": {
-        "@google-cloud/common": "^3.5.0",
-        "@google-cloud/paginator": "^3.0.0",
-        "@google-cloud/promisify": "^2.0.0",
-        "arrify": "^2.0.0",
-        "async-retry": "^1.3.1",
+        "@google-cloud/paginator": "^3.0.7",
+        "@google-cloud/projectify": "^3.0.0",
+        "@google-cloud/promisify": "^3.0.0",
+        "abort-controller": "^3.0.0",
+        "async-retry": "^1.3.3",
         "compressible": "^2.0.12",
-        "date-and-time": "^0.14.2",
         "duplexify": "^4.0.0",
+        "ent": "^2.2.0",
         "extend": "^3.0.2",
-        "gaxios": "^4.0.0",
-        "gcs-resumable-upload": "^3.1.0",
-        "get-stream": "^6.0.0",
-        "hash-stream-validation": "^0.2.2",
-        "mime": "^2.2.0",
+        "gaxios": "^5.0.0",
+        "google-auth-library": "^8.0.1",
+        "mime": "^3.0.0",
         "mime-types": "^2.0.8",
-        "onetime": "^5.1.0",
         "p-limit": "^3.0.1",
-        "pumpify": "^2.0.0",
-        "snakeize": "^0.1.0",
-        "stream-events": "^1.0.1",
-        "xdg-basedir": "^4.0.0"
+        "retry-request": "^5.0.0",
+        "teeny-request": "^8.0.0",
+        "uuid": "^8.0.0"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "optional": true
+        }
       }
     },
     "@grpc/grpc-js": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.6.tgz",
-      "integrity": "sha512-wfYwFy7CvVEmBKzeDX1kQQYrv5NBpe8Z+VwXipFvqof3lCXKch7k+4T3grKtptaH5GQ5KP9iKwPr9hMDSynIUw==",
+      "version": "1.8.14",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.14.tgz",
+      "integrity": "sha512-w84maJ6CKl5aApCMzFll0hxtFNT6or9WwMslobKaqWUEf1K+zhlL43bSQhFreyYWIWR+Z0xnVFC1KtLm4ZpM/A==",
       "optional": true,
       "requires": {
-        "@types/node": ">=12.12.47",
-        "google-auth-library": "^6.1.1",
-        "semver": "^6.2.0"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "14.14.25",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.25.tgz",
-          "integrity": "sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ==",
-          "optional": true
-        }
+        "@grpc/proto-loader": "^0.7.0",
+        "@types/node": ">=12.12.47"
       }
     },
     "@grpc/proto-loader": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.6.tgz",
-      "integrity": "sha512-DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ==",
+      "version": "0.7.7",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.7.tgz",
+      "integrity": "sha512-1TIeXOi8TuSCQprPItwoMymZXxWT0CPxUhkrkeCUH+D8U7QDwQ6b7SUz2MaLuWM2llT+J/TVFLmQI5KtML3BhQ==",
       "optional": true,
       "requires": {
+        "@types/long": "^4.0.1",
         "lodash.camelcase": "^4.3.0",
-        "protobufjs": "^6.8.6"
+        "long": "^4.0.0",
+        "protobufjs": "^7.0.0",
+        "yargs": "^17.7.2"
+      }
+    },
+    "@jsdoc/salty": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.5.tgz",
+      "integrity": "sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==",
+      "optional": true,
+      "requires": {
+        "lodash": "^4.17.21"
       }
     },
     "@protobufjs/aspromise": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-      "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=",
-      "optional": true
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
     },
     "@protobufjs/base64": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
-      "optional": true
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
     },
     "@protobufjs/codegen": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
-      "optional": true
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
     },
     "@protobufjs/eventemitter": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-      "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=",
-      "optional": true
+      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
     },
     "@protobufjs/fetch": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
-      "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
-      "optional": true,
+      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
       "requires": {
         "@protobufjs/aspromise": "^1.1.1",
         "@protobufjs/inquire": "^1.1.0"
@@ -259,56 +3990,56 @@
     "@protobufjs/float": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
-      "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=",
-      "optional": true
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
     },
     "@protobufjs/inquire": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
-      "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=",
-      "optional": true
+      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
     },
     "@protobufjs/path": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
-      "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=",
-      "optional": true
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
     },
     "@protobufjs/pool": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
-      "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=",
-      "optional": true
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
     },
     "@protobufjs/utf8": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-      "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=",
-      "optional": true
+      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
     },
     "@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
       "optional": true
     },
     "@types/body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==",
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
+      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
       "requires": {
         "@types/connect": "*",
         "@types/node": "*"
       }
     },
     "@types/connect": {
-      "version": "3.4.34",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz",
-      "integrity": "sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==",
+      "version": "3.4.35",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
+      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
       "requires": {
         "@types/node": "*"
       }
     },
+    "@types/cors": {
+      "version": "2.8.12",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
+      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
+    },
     "@types/express": {
       "version": "4.17.3",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz",
@@ -320,54 +4051,127 @@
       }
     },
     "@types/express-serve-static-core": {
-      "version": "4.17.18",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz",
-      "integrity": "sha512-m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==",
+      "version": "4.17.34",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.34.tgz",
+      "integrity": "sha512-fvr49XlCGoUj2Pp730AItckfjat4WNb0lb3kfrLWffd+RLeoGAMsq7UOy04PAPtoL01uKwcp6u8nhzpgpDYr3w==",
       "requires": {
         "@types/node": "*",
         "@types/qs": "*",
-        "@types/range-parser": "*"
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "@types/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==",
+      "optional": true,
+      "requires": {
+        "@types/minimatch": "^5.1.2",
+        "@types/node": "*"
+      }
+    },
+    "@types/jsonwebtoken": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
+      "integrity": "sha512-drE6uz7QBKq1fYqqoFKTDRdFCPHd5TCub75BM+D+cMx7NU9hUz7SESLfC2fSCXVFMO5Yj8sOWHuGqPgjc+fz0Q==",
+      "requires": {
+        "@types/node": "*"
       }
     },
+    "@types/linkify-it": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
+      "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
+      "optional": true
+    },
     "@types/lodash": {
-      "version": "4.14.168",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz",
-      "integrity": "sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==",
+      "version": "4.14.185",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.185.tgz",
+      "integrity": "sha512-evMDG1bC4rgQg4ku9tKpuMh5iBNEwNa3tf9zRHdP1qlv+1WUg44xat4IxCE14gIpZRGUUWAx2VhItCZc25NfMA==",
       "dev": true
     },
     "@types/long": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
-      "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
+      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==",
+      "optional": true
+    },
+    "@types/markdown-it": {
+      "version": "12.2.3",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
+      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "optional": true,
+      "requires": {
+        "@types/linkify-it": "*",
+        "@types/mdurl": "*"
+      }
+    },
+    "@types/mdurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
+      "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
       "optional": true
     },
     "@types/mime": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
+      "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
+    },
+    "@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+      "optional": true
     },
     "@types/node": {
-      "version": "10.17.51",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.51.tgz",
-      "integrity": "sha512-KANw+MkL626tq90l++hGelbl67irOJzGhUJk6a1Bt8QHOeh9tztJx+L0AqttraWKinmZn7Qi5lJZJzx45Gq0dg=="
+      "version": "18.7.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz",
+      "integrity": "sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="
     },
     "@types/qs": {
-      "version": "6.9.5",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz",
-      "integrity": "sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
     },
     "@types/range-parser": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
-      "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
+      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
     },
-    "@types/serve-static": {
-      "version": "1.13.9",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz",
-      "integrity": "sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==",
+    "@types/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==",
+      "optional": true,
+      "requires": {
+        "@types/glob": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
       "requires": {
         "@types/mime": "^1",
         "@types/node": "*"
+      },
+      "dependencies": {
+        "@types/mime": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
+          "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+        }
+      }
+    },
+    "@types/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
+      "requires": {
+        "@types/mime": "*",
+        "@types/node": "*"
       }
     },
     "abort-controller": {
@@ -380,25 +4184,26 @@
       }
     },
     "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       }
     },
     "acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
       "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true
+      "devOptional": true
     },
     "acorn-jsx": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "dev": true
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "devOptional": true,
+      "requires": {}
     },
     "agent-base": {
       "version": "6.0.2",
@@ -422,24 +4227,24 @@
       }
     },
     "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true
     },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "devOptional": true
     },
     "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "devOptional": true,
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       }
     },
     "argparse": {
@@ -454,7 +4259,7 @@
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "arrify": {
       "version": "2.0.1",
@@ -469,19 +4274,19 @@
       "dev": true
     },
     "async-retry": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz",
-      "integrity": "sha512-aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz",
+      "integrity": "sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==",
       "optional": true,
       "requires": {
-        "retry": "0.12.0"
+        "retry": "0.13.1"
       }
     },
     "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "devOptional": true
     },
     "base64-js": {
       "version": "1.5.1",
@@ -490,26 +4295,34 @@
       "optional": true
     },
     "bignumber.js": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz",
-      "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
+      "optional": true
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "optional": true
     },
     "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
       "requires": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "dependencies": {
         "debug": {
@@ -523,7 +4336,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
@@ -531,7 +4344,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -540,12 +4353,24 @@
     "buffer-equal-constant-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
     },
     "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+    },
+    "call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      }
     },
     "callsites": {
       "version": "3.1.0",
@@ -553,71 +4378,50 @@
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true
     },
+    "catharsis": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
+      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
+      "optional": true,
+      "requires": {
+        "lodash": "^4.17.15"
+      }
+    },
     "chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "devOptional": true,
       "requires": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
+      }
+    },
+    "cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "optional": true,
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       }
     },
     "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "devOptional": true,
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
       }
     },
     "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "devOptional": true
     },
     "compressible": {
       "version": "2.0.18",
@@ -631,52 +4435,31 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "optional": true,
-      "requires": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      }
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "devOptional": true
     },
     "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "requires": {
-        "safe-buffer": "5.1.2"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        }
+        "safe-buffer": "5.2.1"
       }
     },
     "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
     },
     "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="
     },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "cors": {
       "version": "2.8.5",
@@ -698,49 +4481,39 @@
         "which": "^2.0.1"
       }
     },
-    "crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "optional": true
-    },
-    "date-and-time": {
-      "version": "0.14.2",
-      "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-0.14.2.tgz",
-      "integrity": "sha512-EFTCh9zRSEpGPmJaexg7HTuzZHh6cnJj1ui7IGCFNXzd2QdpsNh05Db5TF3xzJm30YN+A8/6xHSuRcQqoc3kFA==",
-      "optional": true
-    },
     "debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "requires": {
         "ms": "2.1.2"
       }
     },
     "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "devOptional": true
+    },
+    "define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      }
     },
     "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
     },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-    },
-    "dicer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz",
-      "integrity": "sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==",
-      "requires": {
-        "streamsearch": "0.1.2"
-      }
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
     "doctrine": {
       "version": "3.0.0",
@@ -751,19 +4524,10 @@
         "esutils": "^2.0.2"
       }
     },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "optional": true,
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
     "duplexify": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz",
-      "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
+      "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
       "optional": true,
       "requires": {
         "end-of-stream": "^1.4.1",
@@ -783,18 +4547,18 @@
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "devOptional": true
     },
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "end-of-stream": {
       "version": "1.4.4",
@@ -817,19 +4581,104 @@
     "ent": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+      "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==",
+      "optional": true
+    },
+    "entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "optional": true
+    },
+    "es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "requires": {
+        "get-intrinsic": "^1.2.4"
+      }
+    },
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "optional": true
     },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "optional": true
+    },
+    "escodegen": {
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "optional": true,
+      "requires": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+          "optional": true
+        },
+        "levn": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+          "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+          "optional": true,
+          "requires": {
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2"
+          }
+        },
+        "optionator": {
+          "version": "0.8.3",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+          "optional": true,
+          "requires": {
+            "deep-is": "~0.1.3",
+            "fast-levenshtein": "~2.0.6",
+            "levn": "~0.3.0",
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2",
+            "word-wrap": "~1.2.3"
+          }
+        },
+        "prelude-ls": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+          "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+          "optional": true
+        },
+        "type-check": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+          "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+          "optional": true,
+          "requires": {
+            "prelude-ls": "~1.1.2"
+          }
+        }
+      }
     },
     "eslint": {
       "version": "7.19.0",
@@ -874,24 +4723,14 @@
         "table": "^6.0.4",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
       }
     },
     "eslint-config-google": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz",
       "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-scope": {
       "version": "5.1.1",
@@ -901,6 +4740,14 @@
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+          "dev": true
+        }
       }
     },
     "eslint-utils": {
@@ -921,9 +4768,9 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
-      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true
     },
     "espree": {
@@ -949,7 +4796,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
+      "devOptional": true
     },
     "esquery": {
       "version": "1.4.0",
@@ -958,14 +4805,6 @@
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
-        }
       }
     },
     "esrecurse": {
@@ -975,32 +4814,24 @@
       "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
-        }
       }
     },
     "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "devOptional": true
     },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
+      "devOptional": true
     },
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "event-target-shim": {
       "version": "5.0.1",
@@ -1009,37 +4840,38 @@
       "optional": true
     },
     "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "requires": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.2",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -1056,12 +4888,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
@@ -1074,7 +4901,8 @@
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "devOptional": true
     },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
@@ -1085,43 +4913,43 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "devOptional": true
     },
     "fast-text-encoding": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz",
-      "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz",
+      "integrity": "sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==",
       "optional": true
     },
     "faye-websocket": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
-      "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "requires": {
         "websocket-driver": ">=0.5.1"
       }
     },
     "file-entry-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz",
-      "integrity": "sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
       "requires": {
         "flat-cache": "^3.0.4"
       }
     },
     "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "dependencies": {
@@ -1136,34 +4964,38 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
     "firebase-admin": {
-      "version": "9.4.2",
-      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.4.2.tgz",
-      "integrity": "sha512-mRnBJbW6BAz6DJkZ0GOUTkmnmCrwVzMreMc6O+RXWukFydOzi5Xr6TKSiPKxoOQw41r9IluP2AZ3Qzvlx2SR+g==",
+      "version": "11.8.0",
+      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-11.8.0.tgz",
+      "integrity": "sha512-RxO0wWDnuqVikXExhVjnhVaaXpziKCad4D1rOX5c1WJdk1jAu9hfE4rbrFKZQZgF1okZS04kgCBIFJro7xn8NQ==",
       "requires": {
-        "@firebase/database": "^0.8.1",
-        "@firebase/database-types": "^0.6.1",
-        "@google-cloud/firestore": "^4.5.0",
-        "@google-cloud/storage": "^5.3.0",
-        "@types/node": "^10.10.0",
-        "dicer": "^0.3.0",
-        "jsonwebtoken": "^8.5.1",
-        "node-forge": "^0.10.0"
+        "@fastify/busboy": "^1.2.1",
+        "@firebase/database-compat": "^0.3.4",
+        "@firebase/database-types": "^0.10.4",
+        "@google-cloud/firestore": "^6.5.0",
+        "@google-cloud/storage": "^6.9.5",
+        "@types/node": ">=12.12.47",
+        "jsonwebtoken": "^9.0.0",
+        "jwks-rsa": "^3.0.1",
+        "node-forge": "^1.3.1",
+        "uuid": "^9.0.0"
       }
     },
     "firebase-functions": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.13.1.tgz",
-      "integrity": "sha512-tmYHN9OWWIij/8xO72AD2sKHm9T8pdLPYXy5RWk9VidP8+LDOUZ68vq1g1WKeSkRR7WyVYQ3scU2QoMDfe9T8g==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-4.4.0.tgz",
+      "integrity": "sha512-Vdkr9/y/UKQez//cPm2Iu/9CeayqQ2tQF6o3KXozDDBokK9AOlAalVHImCpKo6nWptT/ncZ8djJFk5cR8l+E+A==",
       "requires": {
+        "@types/cors": "^2.8.5",
         "@types/express": "4.17.3",
         "cors": "^2.8.5",
         "express": "^4.17.1",
-        "lodash": "^4.17.14"
+        "node-fetch": "^2.6.7",
+        "protobufjs": "^7.2.2"
       }
     },
     "firebase-functions-test": {
@@ -1187,94 +5019,96 @@
       }
     },
     "flatted": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
     "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
     },
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "devOptional": true
+    },
+    "function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "devOptional": true
     },
     "gaxios": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.1.0.tgz",
-      "integrity": "sha512-vb0to8xzGnA2qcgywAjtshOKKVDf2eQhJoiL6fHhgW5tVN7wNk7egnYIO9zotfn3lQ3De1VPdf7V5/BWfCtCmg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.1.0.tgz",
+      "integrity": "sha512-aezGIjb+/VfsJtIcHGcBSerNEDdfdHeMros+RbYbGpmonKWQCOVOes0LVZhn1lDtIgq55qq0HaxymIoae3Fl/A==",
       "optional": true,
       "requires": {
-        "abort-controller": "^3.0.0",
         "extend": "^3.0.2",
         "https-proxy-agent": "^5.0.0",
         "is-stream": "^2.0.0",
-        "node-fetch": "^2.3.0"
+        "node-fetch": "^2.6.7"
       }
     },
     "gcp-metadata": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz",
-      "integrity": "sha512-tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.2.0.tgz",
+      "integrity": "sha512-aFhhvvNycky2QyhG+dcfEdHBF0FRbYcf39s6WNHUDysKSrbJ5vuFbjydxBcmewtXeV248GP8dWT3ByPNxsyHCw==",
       "optional": true,
       "requires": {
-        "gaxios": "^4.0.0",
+        "gaxios": "^5.0.0",
         "json-bigint": "^1.0.0"
       }
     },
-    "gcs-resumable-upload": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-3.1.2.tgz",
-      "integrity": "sha512-VKWP3Xju1JmNX3N4ossnGp3DfIRZjOsMj8sDGPBGnvn8YSruCOVGQBvELfStfIFPybScv/e5sEdWx/qzfnS3+w==",
-      "optional": true,
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "optional": true
+    },
+    "get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "requires": {
-        "abort-controller": "^3.0.0",
-        "configstore": "^5.0.0",
-        "extend": "^3.0.2",
-        "gaxios": "^4.0.0",
-        "google-auth-library": "^6.0.0",
-        "pumpify": "^2.0.0",
-        "stream-events": "^1.0.4"
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       }
     },
-    "get-stream": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
-      "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==",
-      "optional": true
-    },
     "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dev": true,
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "devOptional": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.1",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
       }
     },
     "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "requires": {
         "is-glob": "^4.0.1"
@@ -1290,118 +5124,143 @@
       }
     },
     "google-auth-library": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.6.tgz",
-      "integrity": "sha512-Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ==",
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.8.0.tgz",
+      "integrity": "sha512-0iJn7IDqObDG5Tu9Tn2WemmJ31ksEa96IyK0J0OZCpTh6CrC6FrattwKX87h3qKVuprCJpdOGKc1Xi8V0kMh8Q==",
       "optional": true,
       "requires": {
         "arrify": "^2.0.0",
         "base64-js": "^1.3.0",
         "ecdsa-sig-formatter": "^1.0.11",
         "fast-text-encoding": "^1.0.0",
-        "gaxios": "^4.0.0",
-        "gcp-metadata": "^4.2.0",
-        "gtoken": "^5.0.4",
+        "gaxios": "^5.0.0",
+        "gcp-metadata": "^5.2.0",
+        "gtoken": "^6.1.0",
         "jws": "^4.0.0",
         "lru-cache": "^6.0.0"
       }
     },
     "google-gax": {
-      "version": "2.10.2",
-      "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-2.10.2.tgz",
-      "integrity": "sha512-adECud3d5jsk24SvPkKQG3Kw1szpy4We0OqKfsdBHKWlSWhdY4hVQEOG7iBBp469Zm327fzz7NZz8BMLOYZJHg==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-3.6.1.tgz",
+      "integrity": "sha512-g/lcUjGcB6DSw2HxgEmCDOrI/CByOwqRvsuUvNalHUK2iPPPlmAIpbMbl62u0YufGMr8zgE3JL7th6dCb1Ry+w==",
       "optional": true,
       "requires": {
-        "@grpc/grpc-js": "~1.2.0",
-        "@grpc/proto-loader": "^0.5.1",
+        "@grpc/grpc-js": "~1.8.0",
+        "@grpc/proto-loader": "^0.7.0",
         "@types/long": "^4.0.0",
+        "@types/rimraf": "^3.0.2",
         "abort-controller": "^3.0.0",
         "duplexify": "^4.0.0",
         "fast-text-encoding": "^1.0.3",
-        "google-auth-library": "^6.1.3",
+        "google-auth-library": "^8.0.2",
         "is-stream-ended": "^0.1.4",
         "node-fetch": "^2.6.1",
-        "protobufjs": "^6.10.2",
-        "retry-request": "^4.0.0"
+        "object-hash": "^3.0.0",
+        "proto3-json-serializer": "^1.0.0",
+        "protobufjs": "7.2.4",
+        "protobufjs-cli": "1.1.1",
+        "retry-request": "^5.0.0"
       }
     },
     "google-p12-pem": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz",
-      "integrity": "sha512-wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-4.0.1.tgz",
+      "integrity": "sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==",
       "optional": true,
       "requires": {
-        "node-forge": "^0.10.0"
+        "node-forge": "^1.3.1"
+      }
+    },
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "requires": {
+        "get-intrinsic": "^1.1.3"
       }
     },
     "graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "optional": true
     },
     "gtoken": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.2.1.tgz",
-      "integrity": "sha512-OY0BfPKe3QnMsY9MzTHTSKn+Vl2l1CcLe6BwDEQj00mbbkl5nyQ/7EUREstg4fQNZ8iYE7br4JJ7TdKeDOPWmw==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-6.1.2.tgz",
+      "integrity": "sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==",
       "optional": true,
       "requires": {
-        "gaxios": "^4.0.0",
-        "google-p12-pem": "^3.0.3",
+        "gaxios": "^5.0.1",
+        "google-p12-pem": "^4.0.0",
         "jws": "^4.0.0"
       }
     },
     "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "devOptional": true
     },
-    "hash-stream-validation": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz",
-      "integrity": "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ==",
-      "optional": true
+    "has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "requires": {
+        "es-define-property": "^1.0.0"
+      }
+    },
+    "has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+    },
+    "hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "requires": {
+        "function-bind": "^1.1.2"
+      }
     },
     "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        }
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       }
     },
     "http-parser-js": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
-      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
     },
     "http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "optional": true,
       "requires": {
-        "@tootallnate/once": "1",
+        "@tootallnate/once": "2",
         "agent-base": "6",
         "debug": "4"
       }
     },
     "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "optional": true,
       "requires": {
         "agent-base": "6",
@@ -1435,13 +5294,14 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true
     },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "devOptional": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -1460,34 +5320,28 @@
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true
     },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
+      "devOptional": true
     },
     "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
       "requires": {
         "is-extglob": "^2.1.1"
       }
     },
-    "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "optional": true
-    },
     "is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "optional": true
     },
     "is-stream-ended": {
@@ -1496,18 +5350,17 @@
       "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==",
       "optional": true
     },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "optional": true
-    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
+    "jose": {
+      "version": "4.15.5",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.5.tgz",
+      "integrity": "sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg=="
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -1524,6 +5377,38 @@
         "esprima": "^4.0.0"
       }
     },
+    "js2xmlparser": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
+      "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
+      "optional": true,
+      "requires": {
+        "xmlcreate": "^2.0.4"
+      }
+    },
+    "jsdoc": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.2.tgz",
+      "integrity": "sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==",
+      "optional": true,
+      "requires": {
+        "@babel/parser": "^7.20.15",
+        "@jsdoc/salty": "^0.2.1",
+        "@types/markdown-it": "^12.2.3",
+        "bluebird": "^3.7.2",
+        "catharsis": "^0.9.0",
+        "escape-string-regexp": "^2.0.0",
+        "js2xmlparser": "^4.0.2",
+        "klaw": "^3.0.0",
+        "markdown-it": "^12.3.2",
+        "markdown-it-anchor": "^8.4.1",
+        "marked": "^4.0.10",
+        "mkdirp": "^1.0.4",
+        "requizzle": "^0.2.3",
+        "strip-json-comments": "^3.1.0",
+        "underscore": "~1.13.2"
+      }
+    },
     "json-bigint": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
@@ -1542,24 +5427,18 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
     "jsonwebtoken": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
-      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
+      "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
       "requires": {
         "jws": "^3.2.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isinteger": "^4.0.4",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.once": "^4.0.0",
+        "lodash": "^4.17.21",
         "ms": "^2.1.1",
-        "semver": "^5.6.0"
+        "semver": "^7.3.8"
       },
       "dependencies": {
         "jwa": {
@@ -1580,11 +5459,6 @@
             "jwa": "^1.4.1",
             "safe-buffer": "^5.0.1"
           }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         }
       }
     },
@@ -1599,6 +5473,32 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "jwks-rsa": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.0.1.tgz",
+      "integrity": "sha512-UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw==",
+      "requires": {
+        "@types/express": "^4.17.14",
+        "@types/jsonwebtoken": "^9.0.0",
+        "debug": "^4.3.4",
+        "jose": "^4.10.4",
+        "limiter": "^1.1.5",
+        "lru-memoizer": "^2.1.4"
+      },
+      "dependencies": {
+        "@types/express": {
+          "version": "4.17.17",
+          "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
+          "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
+          "requires": {
+            "@types/body-parser": "*",
+            "@types/express-serve-static-core": "^4.17.33",
+            "@types/qs": "*",
+            "@types/serve-static": "*"
+          }
+        }
+      }
+    },
     "jws": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
@@ -1609,6 +5509,15 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "klaw": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
+      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
+      "optional": true,
+      "requires": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
     "levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -1619,51 +5528,41 @@
         "type-check": "~0.4.0"
       }
     },
+    "limiter": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz",
+      "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="
+    },
+    "linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "optional": true,
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
     "lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash.camelcase": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
+      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
       "optional": true
     },
-    "lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
-    },
-    "lodash.isboolean": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
-    },
-    "lodash.isinteger": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
-    },
-    "lodash.isnumber": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
     },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+    "lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true
     },
     "long": {
       "version": "4.0.0",
@@ -1679,64 +5578,126 @@
         "yallist": "^4.0.0"
       }
     },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+    "lru-memoizer": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.2.0.tgz",
+      "integrity": "sha512-QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw==",
+      "requires": {
+        "lodash.clonedeep": "^4.5.0",
+        "lru-cache": "~4.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz",
+          "integrity": "sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==",
+          "requires": {
+            "pseudomap": "^1.0.1",
+            "yallist": "^2.0.0"
+          }
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
+        }
+      }
+    },
+    "markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
       "optional": true,
       "requires": {
-        "semver": "^6.0.0"
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "optional": true
+        }
       }
     },
+    "markdown-it-anchor": {
+      "version": "8.6.7",
+      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz",
+      "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==",
+      "optional": true,
+      "requires": {}
+    },
+    "marked": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
+      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+      "optional": true
+    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
+      "optional": true
+    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
     },
     "mime": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz",
-      "integrity": "sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
+      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
       "optional": true
     },
     "mime-db": {
-      "version": "1.45.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz",
-      "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
     },
     "mime-types": {
-      "version": "2.1.28",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz",
-      "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "requires": {
-        "mime-db": "1.45.0"
+        "mime-db": "1.52.0"
       }
     },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "optional": true
-    },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "devOptional": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
     },
+    "minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "optional": true
+    },
+    "mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "optional": true
+    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -1745,34 +5706,47 @@
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
     "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
     },
     "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
-      "optional": true
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
     },
     "node-forge": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
     },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+    },
+    "object-hash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "optional": true
+    },
+    "object-inspect": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
     },
     "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "requires": {
         "ee-first": "1.1.1"
       }
@@ -1780,20 +5754,12 @@
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "devOptional": true,
       "requires": {
         "wrappy": "1"
       }
     },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "optional": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
     "optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -1834,8 +5800,8 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "devOptional": true
     },
     "path-key": {
       "version": "3.1.1",
@@ -1846,7 +5812,7 @@
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "prelude-ls": {
       "version": "1.2.1",
@@ -1860,11 +5826,19 @@
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
-    "protobufjs": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.2.tgz",
-      "integrity": "sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ==",
+    "proto3-json-serializer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz",
+      "integrity": "sha512-AwAuY4g9nxx0u52DnSMkqqgyLHaW/XaPLtaAo3y/ZCfeaQB/g4YDH4kb8Wc/mWzWvu0YjOznVnfn373MVZZrgw==",
       "optional": true,
+      "requires": {
+        "protobufjs": "^7.0.0"
+      }
+    },
+    "protobufjs": {
+      "version": "7.2.4",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz",
+      "integrity": "sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==",
       "requires": {
         "@protobufjs/aspromise": "^1.1.2",
         "@protobufjs/base64": "^1.1.2",
@@ -1876,49 +5850,105 @@
         "@protobufjs/path": "^1.1.2",
         "@protobufjs/pool": "^1.1.0",
         "@protobufjs/utf8": "^1.1.0",
-        "@types/long": "^4.0.1",
-        "@types/node": "^13.7.0",
-        "long": "^4.0.0"
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
       },
       "dependencies": {
-        "@types/node": {
-          "version": "13.13.41",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.41.tgz",
-          "integrity": "sha512-qLT9IvHiXJfdrje9VmsLzun7cQ65obsBTmtU3EOnCSLFOoSHx1hpiRHoBnpdbyFqnzqdUUIv81JcEJQCB8un9g==",
-          "optional": true
+        "long": {
+          "version": "5.2.3",
+          "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+          "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
         }
       }
     },
-    "proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
-      "requires": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.1"
-      }
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+    "protobufjs-cli": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz",
+      "integrity": "sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==",
       "optional": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+        "chalk": "^4.0.0",
+        "escodegen": "^1.13.0",
+        "espree": "^9.0.0",
+        "estraverse": "^5.1.0",
+        "glob": "^8.0.0",
+        "jsdoc": "^4.0.0",
+        "minimist": "^1.2.0",
+        "semver": "^7.1.2",
+        "tmp": "^0.2.1",
+        "uglify-js": "^3.7.7"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.8.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+          "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+          "optional": true
+        },
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "optional": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+          "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+          "optional": true
+        },
+        "espree": {
+          "version": "9.5.2",
+          "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
+          "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
+          "optional": true,
+          "requires": {
+            "acorn": "^8.8.0",
+            "acorn-jsx": "^5.3.2",
+            "eslint-visitor-keys": "^3.4.1"
+          }
+        },
+        "glob": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+          "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
+          }
+        },
+        "minimatch": {
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+          "optional": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
       }
     },
-    "pumpify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz",
-      "integrity": "sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==",
-      "optional": true,
+    "proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "requires": {
-        "duplexify": "^4.1.1",
-        "inherits": "^2.0.3",
-        "pump": "^3.0.0"
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
       }
     },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
+    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -1926,9 +5956,12 @@
       "dev": true
     },
     "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "range-parser": {
       "version": "1.2.1",
@@ -1936,20 +5969,20 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
     },
     "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "optional": true,
       "requires": {
         "inherits": "^2.0.3",
@@ -1958,17 +5991,32 @@
       }
     },
     "regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "optional": true
+    },
     "require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
+    "requizzle": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz",
+      "integrity": "sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==",
+      "optional": true,
+      "requires": {
+        "lodash": "^4.17.21"
+      }
+    },
     "resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -1976,25 +6024,26 @@
       "dev": true
     },
     "retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "optional": true
     },
     "retry-request": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.1.3.tgz",
-      "integrity": "sha512-QnRZUpuPNgX0+D1xVxul6DbJ9slvo4Rm6iV/dn63e048MvGbUZiKySVt6Tenp04JqmchxjiLltGerOJys7kJYQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-5.0.2.tgz",
+      "integrity": "sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==",
       "optional": true,
       "requires": {
-        "debug": "^4.1.1"
+        "debug": "^4.1.1",
+        "extend": "^3.0.2"
       }
     },
     "rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "glob": "^7.1.3"
       }
@@ -2010,29 +6059,31 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "optional": true
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
+      "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
     },
     "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
         "debug": {
@@ -2046,7 +6097,7 @@
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
             }
           }
         },
@@ -2056,27 +6107,40 @@
           "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
         }
       }
     },
     "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
+      }
+    },
+    "set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "requires": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
       }
     },
     "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
     "shebang-command": {
       "version": "2.0.0",
@@ -2093,11 +6157,16 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
-    "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
-      "optional": true
+    "side-channel": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "requires": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      }
     },
     "slice-ansi": {
       "version": "4.0.0",
@@ -2108,50 +6177,24 @@
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
         "is-fullwidth-code-point": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        }
       }
     },
-    "snakeize": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz",
-      "integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0=",
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "optional": true
     },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
     "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
     "stream-events": {
       "version": "1.0.5",
@@ -2168,22 +6211,6 @@
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "optional": true
     },
-    "streamsearch": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
-      "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
-    },
-    "string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
     "string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -2193,52 +6220,64 @@
         "safe-buffer": "~5.2.0"
       }
     },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "devOptional": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
     "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "devOptional": true,
       "requires": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       }
     },
     "strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
+      "devOptional": true
     },
     "stubs": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
-      "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=",
+      "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==",
       "optional": true
     },
     "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "devOptional": true,
       "requires": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       }
     },
     "table": {
-      "version": "6.0.7",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.0.7.tgz",
-      "integrity": "sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
       "dev": true,
       "requires": {
-        "ajv": "^7.0.2",
-        "lodash": "^4.17.20",
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0"
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
       },
       "dependencies": {
         "ajv": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.0.4.tgz",
-          "integrity": "sha512-xzzzaqgEQfmuhbhAoqjJ8T/1okb6gAzXn/eQRNpAN1AEUoHJTNF9xCDRTtf/s3SKldtZfa+RJeTs+BQq+eZ/sw==",
+          "version": "8.11.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -2256,33 +6295,52 @@
       }
     },
     "teeny-request": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.0.1.tgz",
-      "integrity": "sha512-sasJmQ37klOlplL4Ia/786M5YlOcoLGQyq2TE4WHSRupbAuDaQW0PfVxV4MtdBtRJ4ngzS+1qim8zP6Zp35qCw==",
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-8.0.3.tgz",
+      "integrity": "sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww==",
       "optional": true,
       "requires": {
-        "http-proxy-agent": "^4.0.0",
+        "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
         "node-fetch": "^2.6.1",
         "stream-events": "^1.0.5",
-        "uuid": "^8.0.0"
+        "uuid": "^9.0.0"
       }
     },
+    "text-decoding": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/text-decoding/-/text-decoding-1.0.0.tgz",
+      "integrity": "sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA=="
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
+    "tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "optional": true,
+      "requires": {
+        "rimraf": "^3.0.0"
+      }
+    },
     "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
+    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
     },
     "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
     },
     "type-check": {
       "version": "0.4.0",
@@ -2308,28 +6366,28 @@
         "mime-types": "~2.1.24"
       }
     },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "optional": true,
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
+    "uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "optional": true
     },
-    "unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "optional": true,
-      "requires": {
-        "crypto-random-string": "^2.0.0"
-      }
+    "uglify-js": {
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+      "optional": true
+    },
+    "underscore": {
+      "version": "1.13.6",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
+      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+      "optional": true
     },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
     },
     "uri-js": {
       "version": "4.4.1",
@@ -2343,30 +6401,34 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "optional": true
     },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
     "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "optional": true
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
     },
     "v8-compile-cache": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz",
-      "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
       "dev": true
     },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
+    },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
     },
     "websocket-driver": {
       "version": "0.7.4",
@@ -2383,6 +6445,15 @@
       "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
     },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -2393,32 +6464,38 @@
       }
     },
     "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
+      "devOptional": true
+    },
+    "wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "optional": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
     },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "devOptional": true
     },
-    "write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "optional": true,
-      "requires": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
+    "xmlcreate": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
+      "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
+      "optional": true
     },
-    "xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
+    "y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "optional": true
     },
     "yallist": {
@@ -2426,6 +6503,27 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
+    "yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "optional": true,
+      "requires": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      }
+    },
+    "yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "optional": true
+    },
     "yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/smoke-tests/src/androidTest/backend/functions/functions/package.json b/smoke-tests/src/androidTest/backend/functions/functions/package.json
index 9afedb669e0..8a580d20854 100644
--- a/smoke-tests/src/androidTest/backend/functions/functions/package.json
+++ b/smoke-tests/src/androidTest/backend/functions/functions/package.json
@@ -10,12 +10,12 @@
     "logs": "firebase functions:log"
   },
   "engines": {
-    "node": "12"
+    "node": "19"
   },
   "main": "index.js",
   "dependencies": {
-    "firebase-admin": "9.4.2",
-    "firebase-functions": "3.13.1"
+    "firebase-admin": "^11.8.0",
+    "firebase-functions": "^4.4.0"
   },
   "devDependencies": {
     "eslint": "7.19.0",
diff --git a/smoke-tests/src/main/AndroidManifest.xml b/smoke-tests/src/main/AndroidManifest.xml
index 50801ac0f56..21edc14dc6e 100644
--- a/smoke-tests/src/main/AndroidManifest.xml
+++ b/smoke-tests/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.google.firebase.testing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/smoke-tests/src/main/java/com/google/firebase/testing/BuildOnlyTest.java b/smoke-tests/src/main/java/com/google/firebase/testing/BuildOnlyTest.java
index affcc90bc95..af44f6607ca 100644
--- a/smoke-tests/src/main/java/com/google/firebase/testing/BuildOnlyTest.java
+++ b/smoke-tests/src/main/java/com/google/firebase/testing/BuildOnlyTest.java
@@ -16,11 +16,11 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.firebase.appindexing.FirebaseAppIndex;
 import com.google.firebase.inappmessaging.FirebaseInAppMessaging;
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.ml.modeldownloader.FirebaseModelDownloader;
 import com.google.firebase.perf.FirebasePerformance;
+import com.google.firebase.appdistribution.FirebaseAppDistribution;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -31,11 +31,6 @@
 @RunWith(JUnit4.class)
 public final class BuildOnlyTest {
 
-  @Test
-  public void appindexing_IsNotNull() {
-    assertThat(FirebaseAppIndex.getInstance(getApplicationContext())).isNotNull();
-  }
-
   @Test
   public void inappmessaging_IsNotNull() {
     assertThat(FirebaseInAppMessaging.getInstance()).isNotNull();
@@ -55,4 +50,9 @@ public void modelDownloader_IsNotNull() {
   public void performance_IsNotNull() {
     assertThat(FirebasePerformance.getInstance()).isNotNull();
   }
+
+  @Test
+  public void appDistribution_IsNotNull(){
+    assertThat(FirebaseAppDistribution.getInstance()).isNotNull();
+  }
 }
diff --git a/subprojects.cfg b/subprojects.cfg
index f3d61498230..1753303e5c3 100644
--- a/subprojects.cfg
+++ b/subprojects.cfg
@@ -2,15 +2,15 @@ appcheck
 appcheck:firebase-appcheck-debug-testing
 appcheck:firebase-appcheck-debug
 appcheck:firebase-appcheck-interop
-appcheck:firebase-appcheck-safetynet
+appcheck:firebase-appcheck-playintegrity
 appcheck:firebase-appcheck
-appcheck:firebase-appcheck:test-app
+appcheck:firebase-appcheck:ktx
 
 firebase-abt
 firebase-annotations
 firebase-appdistribution
-firebase-appdistribution:ktx
-firebase-appdistribution:test-app
+firebase-appdistribution-api
+firebase-appdistribution-api:ktx
 firebase-common
 firebase-common:data-collection-tests
 firebase-common:ktx
@@ -19,6 +19,8 @@ firebase-components:firebase-dynamic-module-support
 firebase-config
 firebase-config:ktx
 firebase-config:bandwagoner
+firebase-config:test-app
+firebase-config-interop
 firebase-crashlytics
 firebase-crashlytics:ktx
 firebase-crashlytics-ndk
@@ -50,9 +52,10 @@ firebase-perf:ktx
 firebase-perf:dev-app
 firebase-perf:e2e-app
 firebase-segmentation
+firebase-sessions
+firebase-sessions:test-app
 firebase-storage
 firebase-storage:ktx
-firebase-storage:test-app
 protolite-well-known-types
 
 encoders
@@ -67,10 +70,18 @@ encoders:protoc-gen-firebase-encoders:tests
 
 integ-testing
 
-tools:errorprone
 tools:lint
 
 transport
 transport:transport-api
 transport:transport-backend-cct
 transport:transport-runtime
+transport:transport-runtime-testing
+
+# Test Apps
+# disabled since they require google-services.json to build which is not always available in CI.
+# If needed for development, uncomment but don't submit
+
+#firebase-storage:test-app
+#appcheck:firebase-appcheck:test-app
+#firebase-appdistribution:test-app
diff --git a/tools/errorprone/errorprone.gradle b/tools/errorprone/errorprone.gradle
deleted file mode 100644
index f8be3518dbf..00000000000
--- a/tools/errorprone/errorprone.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-apply plugin: 'java-library'
-
-
-dependencies {
-    implementation 'com.google.errorprone:error_prone_check_api:2.3.2'
-    implementation 'com.google.auto.service:auto-service:1.0-rc4'
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc4'
-
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'com.google.errorprone:error_prone_test_helpers:2.3.3'
-    testImplementation 'com.google.errorprone:javac:9+181-r4173-1'
-}
diff --git a/tools/errorprone/src/main/java/com/google/firebase/errorprone/ComponentsAppGetCheck.java b/tools/errorprone/src/main/java/com/google/firebase/errorprone/ComponentsAppGetCheck.java
deleted file mode 100644
index b42c5dbfa48..00000000000
--- a/tools/errorprone/src/main/java/com/google/firebase/errorprone/ComponentsAppGetCheck.java
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.errorprone;
-
-import static com.google.errorprone.matchers.Matchers.allOf;
-import static com.google.errorprone.matchers.Matchers.anyOf;
-import static com.google.errorprone.matchers.Matchers.enclosingClass;
-import static com.google.errorprone.matchers.Matchers.enclosingMethod;
-import static com.google.errorprone.matchers.Matchers.hasAnnotation;
-import static com.google.errorprone.matchers.Matchers.instanceMethod;
-import static com.google.errorprone.matchers.Matchers.isStatic;
-import static com.google.errorprone.matchers.Matchers.methodHasVisibility;
-import static com.google.errorprone.matchers.Matchers.methodInvocation;
-import static com.google.errorprone.matchers.Matchers.methodIsNamed;
-import static com.google.errorprone.matchers.Matchers.methodReturns;
-import static com.google.errorprone.util.ASTHelpers.getType;
-import static com.google.errorprone.util.ASTHelpers.isSubtype;
-
-import com.google.auto.service.AutoService;
-import com.google.errorprone.BugPattern;
-import com.google.errorprone.VisitorState;
-import com.google.errorprone.bugpatterns.BugChecker;
-import com.google.errorprone.matchers.AbstractTypeMatcher;
-import com.google.errorprone.matchers.Description;
-import com.google.errorprone.matchers.Matcher;
-import com.google.errorprone.matchers.MethodVisibility;
-import com.google.errorprone.suppliers.Supplier;
-import com.google.errorprone.util.ASTHelpers;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.Tree;
-import com.sun.tools.javac.code.Type;
-
-/**
- * Errorprone custom check that discourages use of FirebaseApp#get(Class) as it is only intended for
- * use in Sdk#getInstance() methods.
- */
-@BugPattern(
-    name = "FirebaseUseExplicitDependencies",
-    summary =
-        "Use of FirebaseApp#get(Class) is discouraged, and is only acceptable"
-            + " in SDK#getInstance(...) methods. Instead declare dependencies explicitly in"
-            + " your ComponentRegistrar and inject.",
-    severity = BugPattern.SeverityLevel.ERROR)
-@AutoService(BugChecker.class)
-public class ComponentsAppGetCheck extends BugChecker
-    implements BugChecker.MethodInvocationTreeMatcher {
-  private static final String FIREBASE_APP = "com.google.firebase.FirebaseApp";
-  private static final String GET_COMPONENT_METHOD = "<T>get(java.lang.Class<T>)";
-
-  private static final Matcher<ExpressionTree> CALL_TO_GET =
-      methodInvocation(
-          instanceMethod().onExactClass(FIREBASE_APP).withSignature(GET_COMPONENT_METHOD));
-
-  /**
-   * This matches methods of the forms:
-   *
-   * <pre>{@code
-   * class Foo {
-   *     public static Foo getInstance(/* any number of parameters * /);
-   * }
-   *
-   * class Foo extends/implements Bar {
-   *     public static Bar getInstance(/* any number of parameters * /);
-   * }
-   * }</pre>
-   */
-  private static final Matcher<ExpressionTree> WITHIN_GET_INSTANCE =
-      enclosingMethod(
-          allOf(
-              isStatic(),
-              methodIsNamed("getInstance"),
-              methodReturns(
-                  isSupertypeOf(
-                      state -> ASTHelpers.getType(state.findEnclosing(ClassTree.class))))));
-
-  /**
-   * This matches methods of the forms:
-   *
-   * <pre>{@code
-   * class Foo {
-   *     private static Foo getInstanceImpl(/* any number of parameters * /);
-   * }
-   *
-   * class Foo extends/implements Bar {
-   *     private static Bar getInstanceImpl(/* any number of parameters * /);
-   * }
-   * }</pre>
-   */
-  private static final Matcher<ExpressionTree> WITHIN_GET_INSTANCE_IMPL =
-      enclosingMethod(
-          allOf(
-              isStatic(),
-              methodHasVisibility(MethodVisibility.Visibility.PRIVATE),
-              methodIsNamed("getInstanceImpl"),
-              methodReturns(
-                  isSupertypeOf(
-                      state -> ASTHelpers.getType(state.findEnclosing(ClassTree.class))))));
-
-  private static final Matcher<ExpressionTree> WITHIN_JUNIT_TEST =
-      enclosingClass(hasAnnotation("org.junit.runner.RunWith"));
-
-  private static final Matcher<ExpressionTree> ALLOWED_USAGES =
-      anyOf(WITHIN_GET_INSTANCE, WITHIN_GET_INSTANCE_IMPL, WITHIN_JUNIT_TEST);
-
-  @Override
-  public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
-    if (ALLOWED_USAGES.matches(tree, state) || !CALL_TO_GET.matches(tree, state)) {
-      return Description.NO_MATCH;
-    }
-    return describeMatch(tree);
-  }
-
-  private static <T extends Tree> Matcher<T> isSupertypeOf(Supplier<Type> type) {
-    return new IsSupertypeOf<T>(type);
-  }
-
-  private static class IsSupertypeOf<T extends Tree> extends AbstractTypeMatcher<T> {
-
-    public IsSupertypeOf(Supplier<Type> typeToCompareSupplier) {
-      super(typeToCompareSupplier);
-    }
-
-    public IsSupertypeOf(String typeString) {
-      super(typeString);
-    }
-
-    @Override
-    public boolean matches(T tree, VisitorState state) {
-      return isSubtype(typeToCompareSupplier.get(state), getType(tree), state);
-    }
-  }
-}
diff --git a/tools/errorprone/src/test/java/com/google/firebase/errorprone/ComponentsAppGetCheckTest.java b/tools/errorprone/src/test/java/com/google/firebase/errorprone/ComponentsAppGetCheckTest.java
deleted file mode 100644
index e50b758f1e3..00000000000
--- a/tools/errorprone/src/test/java/com/google/firebase/errorprone/ComponentsAppGetCheckTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.errorprone;
-
-import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class ComponentsAppGetCheckTest {
-
-  private CompilationTestHelper compilationHelper;
-
-  @Before
-  public void setup() {
-    compilationHelper = CompilationTestHelper.newInstance(ComponentsAppGetCheck.class, getClass());
-  }
-
-  @Test
-  public void testPositiveCases() {
-    compilationHelper.addSourceFile("FirebaseUseExplicitDependenciesPositiveCases.java").doTest();
-  }
-
-  @Test
-  public void testNegativeCases() {
-    compilationHelper.addSourceFile("FirebaseUseExplicitDependenciesNegativeCases.java").doTest();
-  }
-}
diff --git a/tools/errorprone/src/test/resources/com/google/firebase/errorprone/FirebaseUseExplicitDependenciesNegativeCases.java b/tools/errorprone/src/test/resources/com/google/firebase/errorprone/FirebaseUseExplicitDependenciesNegativeCases.java
deleted file mode 100644
index 009b61ab43d..00000000000
--- a/tools/errorprone/src/test/resources/com/google/firebase/errorprone/FirebaseUseExplicitDependenciesNegativeCases.java
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.errorprone;
-
-import com.google.firebase.FirebaseApp;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-public class FirebaseUseExplicitDependenciesNegativeCases {
-
-  /** Valid use with one app parameter. */
-  public static FirebaseUseExplicitDependenciesNegativeCases getInstance(FirebaseApp app) {
-    app.get(String.class);
-    return null;
-  }
-
-  /** Valid use with multiple parameters. */
-  public static FirebaseUseExplicitDependenciesNegativeCases getInstance(
-      FirebaseApp app, String foo) {
-    app.get(String.class);
-    return null;
-  }
-
-  /** Valid use with no parameters. */
-  public static FirebaseUseExplicitDependenciesNegativeCases getInstance() {
-    new FirebaseApp().get(String.class);
-    return null;
-  }
-
-  /** Valid private use with multiple parameters. */
-  private static FirebaseUseExplicitDependenciesNegativeCases getInstance(
-      FirebaseApp app, Integer i) {
-    app.get(String.class);
-    return null;
-  }
-
-  /** Use allowed in tests. */
-  @RunWith(JUnit4.class)
-  private static class MyTest {
-    public void test() {
-      new FirebaseApp().get(String.class);
-    }
-  }
-
-  public static class SuperType {}
-
-  public static class SubType extends SuperType {
-    public static SuperType getInstance(FirebaseApp app) {
-      app.get(String.class);
-      return null;
-    }
-  }
-
-  public interface Iface {}
-
-  public static class IfaceImpl implements Iface {
-    public static Iface getInstance(FirebaseApp app) {
-      app.get(String.class);
-      return null;
-    }
-  }
-}
diff --git a/tools/errorprone/src/test/resources/com/google/firebase/errorprone/FirebaseUseExplicitDependenciesPositiveCases.java b/tools/errorprone/src/test/resources/com/google/firebase/errorprone/FirebaseUseExplicitDependenciesPositiveCases.java
deleted file mode 100644
index 800136f82d3..00000000000
--- a/tools/errorprone/src/test/resources/com/google/firebase/errorprone/FirebaseUseExplicitDependenciesPositiveCases.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 com.google.firebase.errorprone;
-
-import com.google.firebase.FirebaseApp;
-
-public class FirebaseUseExplicitDependenciesPositiveCases {
-  private FirebaseApp app = new FirebaseApp();
-
-  public void useOfAppGetInInstanceMethod(FirebaseApp app) {
-    // BUG: Diagnostic contains: FirebaseApp#get(Class) is discouraged
-    app.get(String.class);
-  }
-
-  public void useOfAppGetInStaticMethod() {
-    // BUG: Diagnostic contains: FirebaseApp#get(Class) is discouraged
-    app.get(String.class);
-  }
-
-  /** method returns void so it is not allowed. */
-  public static void getInstance(FirebaseApp app, String foo) {
-    // BUG: Diagnostic contains: FirebaseApp#get(Class) is discouraged
-    app.get(String.class);
-  }
-
-  /** method returns int so it is not allowed. */
-  public static int getInstance(String foo) {
-    // BUG: Diagnostic contains: FirebaseApp#get(Class) is discouraged
-    new FirebaseApp().get(String.class);
-    return 0;
-  }
-
-  /** method returns String so it is not allowed. */
-  public static String getInstance(FirebaseApp app) {
-    // BUG: Diagnostic contains: FirebaseApp#get(Class) is discouraged
-    app.get(String.class);
-    return "";
-  }
-}
diff --git a/tools/lint/lint.gradle b/tools/lint/lint.gradle
deleted file mode 100644
index fb9548d5434..00000000000
--- a/tools/lint/lint.gradle
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-plugins {
-  id 'org.jetbrains.kotlin.jvm'
-}
-
-def lintVersion = '26.4.1'
-
-dependencies {
-  compileOnly "com.android.tools.lint:lint-api:$lintVersion"
-  compileOnly "com.android.tools.lint:lint-checks:$lintVersion"
-
-  testImplementation "junit:junit:4.12"
-  testImplementation ("com.android.tools.lint:lint:$lintVersion") {
-    exclude group: "com.google.protobuf", module: "protobuf-java"
-  }
-  testImplementation ("com.android.tools.lint:lint-tests:$lintVersion") {
-    exclude group: "com.google.protobuf", module: "protobuf-java"
-  }
-  testImplementation "com.android.tools:testutils:$lintVersion"
-}
-
-jar {
-  manifest {
-    attributes('Lint-Registry-v2': 'com.google.firebase.lint.checks.CheckRegistry')
-  }
-}
diff --git a/integ-testing/integ-testing.gradle b/tools/lint/lint.gradle.kts
similarity index 56%
rename from integ-testing/integ-testing.gradle
rename to tools/lint/lint.gradle.kts
index db10ae7d882..0d5cd2d8fc7 100644
--- a/integ-testing/integ-testing.gradle
+++ b/tools/lint/lint.gradle.kts
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,23 +13,22 @@
 // limitations under the License.
 
 plugins {
-    id 'com.android.library'
+  id("org.jetbrains.kotlin.jvm")
 }
 
-android {
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-        minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
-    }
+dependencies {
+  compileOnly(libs.android.lint.api)
+  compileOnly(libs.android.lint.checks)
+  compileOnly(libs.kotlin.stdlib)
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+  testImplementation(libs.android.lint)
+  testImplementation(libs.android.lint.tests)
+  testImplementation(libs.android.lint.testutils)
+  testImplementation(libs.junit)
 }
 
-dependencies {
-    implementation 'junit:junit:4.13'
-    implementation 'androidx.test:runner:1.3.0'
+tasks.jar {
+  manifest {
+    attributes("Lint-Registry-v2" to "com.google.firebase.lint.checks.CheckRegistry")
+  }
 }
diff --git a/tools/lint/src/main/kotlin/Annotations.kt b/tools/lint/src/main/kotlin/Annotations.kt
index e69509e4486..c47673ecb20 100644
--- a/tools/lint/src/main/kotlin/Annotations.kt
+++ b/tools/lint/src/main/kotlin/Annotations.kt
@@ -1,16 +1,18 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
 
@@ -27,60 +29,68 @@ import org.jetbrains.uast.getParentOfType
 internal const val ANNOTATION = "com.google.firebase.annotations.DeferredApi"
 
 fun hasDeferredApiAnnotation(context: JavaContext, methodCall: UElement): Boolean {
-    lambdaMethod(methodCall)?.let {
-        return hasDeferredApiAnnotation(context, it)
-    }
+  lambdaMethod(methodCall)?.let {
+    return hasDeferredApiAnnotation(context, it)
+  }
 
-    val method = methodCall.getParentOfType<UElement>(
-            UMethod::class.java, true,
-            UAnonymousClass::class.java, ULambdaExpression::class.java
+  val method =
+    methodCall.getParentOfType<UElement>(
+      UMethod::class.java,
+      true,
+      UAnonymousClass::class.java,
+      ULambdaExpression::class.java
     ) as? PsiMethod
-    return hasDeferredApiAnnotation(context, method)
+  return hasDeferredApiAnnotation(context, method)
 }
 
 fun hasDeferredApiAnnotation(context: JavaContext, calledMethod: PsiMethod?): Boolean {
-    var method = calledMethod ?: return false
+  var method = calledMethod ?: return false
 
-    while (true) {
-        for (annotation in method.modifierList.annotations) {
-            annotation.qualifiedName?.let {
-                if (it == ANNOTATION) {
-                    return@hasDeferredApiAnnotation true
-                }
-            }
+  while (true) {
+    for (annotation in method.modifierList.annotations) {
+      annotation.qualifiedName?.let {
+        if (it == ANNOTATION) {
+          return@hasDeferredApiAnnotation true
         }
-        method = context.evaluator.getSuperMethod(method) ?: break
+      }
     }
+    method = context.evaluator.getSuperMethod(method) ?: break
+  }
 
-    var cls = method.containingClass ?: return false
+  var cls = method.containingClass ?: return false
 
-    while (true) {
-        val modifierList = cls.modifierList
-        if (modifierList != null) {
-            for (annotation in modifierList.annotations) {
-                annotation.qualifiedName?.let {
-                    if (it == ANNOTATION) {
-                        return@hasDeferredApiAnnotation true
-                    }
-                }
-            }
+  while (true) {
+    val modifierList = cls.modifierList
+    if (modifierList != null) {
+      for (annotation in modifierList.annotations) {
+        annotation.qualifiedName?.let {
+          if (it == ANNOTATION) {
+            return@hasDeferredApiAnnotation true
+          }
         }
-        cls = cls.superClass ?: break
+      }
     }
-    return false
+    cls = cls.superClass ?: break
+  }
+  return false
 }
 
 fun lambdaMethod(element: UElement): PsiMethod? {
-    val lambda = element.getParentOfType<ULambdaExpression>(
-            ULambdaExpression::class.java, true, UMethod::class.java, UAnonymousClass::class.java)
-            ?: return null
+  val lambda =
+    element.getParentOfType<ULambdaExpression>(
+      ULambdaExpression::class.java,
+      true,
+      UMethod::class.java,
+      UAnonymousClass::class.java
+    )
+      ?: return null
 
-    val type = lambda.functionalInterfaceType
-    if (type is PsiClassType) {
-        val resolved = type.resolve()
-        if (resolved != null) {
-            return resolved.allMethods.firstOrNull { it.hasModifier(JvmModifier.ABSTRACT) }
-        }
+  val type = lambda.functionalInterfaceType
+  if (type is PsiClassType) {
+    val resolved = type.resolve()
+    if (resolved != null) {
+      return resolved.allMethods.firstOrNull { it.hasModifier(JvmModifier.ABSTRACT) }
     }
-    return null
+  }
+  return null
 }
diff --git a/tools/lint/src/main/kotlin/CheckRegistry.kt b/tools/lint/src/main/kotlin/CheckRegistry.kt
index ebd68916a9f..579a1953089 100644
--- a/tools/lint/src/main/kotlin/CheckRegistry.kt
+++ b/tools/lint/src/main/kotlin/CheckRegistry.kt
@@ -1,38 +1,53 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
 
 import com.android.tools.lint.client.api.IssueRegistry
+import com.android.tools.lint.client.api.Vendor
 import com.android.tools.lint.detector.api.CURRENT_API
 import com.android.tools.lint.detector.api.Issue
 
 class CheckRegistry : IssueRegistry() {
-    override val issues: List<Issue>
-        get() = listOf(
-                ManifestElementHasNoExportedAttributeDetector.EXPORTED_MISSING_ISSUE,
-                KotlinInteropDetector.KOTLIN_PROPERTY,
-                KotlinInteropDetector.LAMBDA_LAST,
-                KotlinInteropDetector.NO_HARD_KOTLIN_KEYWORDS,
-                KotlinInteropDetector.PLATFORM_NULLNESS,
-                NonAndroidxNullabilityDetector.NON_ANDROIDX_NULLABILITY,
-                DeferredApiDetector.INVALID_DEFERRED_API_USE,
-                ProviderAssignmentDetector.INVALID_PROVIDER_ASSIGNMENT
-        )
+  override val issues: List<Issue>
+    get() =
+      listOf(
+        ManifestElementHasNoExportedAttributeDetector.EXPORTED_MISSING_ISSUE,
+        KotlinInteropDetector.KOTLIN_PROPERTY,
+        KotlinInteropDetector.LAMBDA_LAST,
+        KotlinInteropDetector.NO_HARD_KOTLIN_KEYWORDS,
+        KotlinInteropDetector.PLATFORM_NULLNESS,
+        NonAndroidxNullabilityDetector.NON_ANDROIDX_NULLABILITY,
+        DeferredApiDetector.INVALID_DEFERRED_API_USE,
+        ProviderAssignmentDetector.INVALID_PROVIDER_ASSIGNMENT,
+        ThreadPoolDetector.THREAD_POOL_CREATION,
+        TasksMainThreadDetector.TASK_MAIN_THREAD,
+        FirebaseAppGetDetector.ISSUE,
+      )
 
-    override val api: Int
-        get() = CURRENT_API
-    override val minApi: Int
-        get() = 2
+  override val api: Int
+    get() = CURRENT_API
+  override val minApi: Int
+    get() = 2
+
+  override val vendor: Vendor
+    get() =
+      Vendor(
+        "firebase",
+        identifier = "firebase",
+        feedbackUrl = "https://github.com/firebase/firebase-android-sdk/issues"
+      )
 }
diff --git a/tools/lint/src/main/kotlin/DeferredApiDetector.kt b/tools/lint/src/main/kotlin/DeferredApiDetector.kt
index dc4c56efcc5..36a9b61baa6 100644
--- a/tools/lint/src/main/kotlin/DeferredApiDetector.kt
+++ b/tools/lint/src/main/kotlin/DeferredApiDetector.kt
@@ -1,19 +1,24 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
 
+import com.android.tools.lint.detector.api.AnnotationInfo
+import com.android.tools.lint.detector.api.AnnotationOrigin
+import com.android.tools.lint.detector.api.AnnotationUsageInfo
 import com.android.tools.lint.detector.api.AnnotationUsageType
 import com.android.tools.lint.detector.api.Category
 import com.android.tools.lint.detector.api.Detector
@@ -24,67 +29,63 @@ import com.android.tools.lint.detector.api.Scope
 import com.android.tools.lint.detector.api.Severity
 import com.android.tools.lint.detector.api.SourceCodeScanner
 import com.intellij.psi.PsiMethod
-import org.jetbrains.uast.UAnnotation
 import org.jetbrains.uast.UCallExpression
 import org.jetbrains.uast.UElement
 
+@Suppress("DetectorIsMissingAnnotations")
 class DeferredApiDetector : Detector(), SourceCodeScanner {
-    override fun applicableAnnotations(): List<String> = listOf(ANNOTATION)
+  override fun applicableAnnotations(): List<String> = listOf(ANNOTATION)
 
-    override fun visitAnnotationUsage(
-        context: JavaContext,
-        usage: UElement,
-        type: AnnotationUsageType,
-        annotation: UAnnotation,
-        qualifiedName: String,
-        method: PsiMethod?,
-        annotations: List<UAnnotation>,
-        allMemberAnnotations: List<UAnnotation>,
-        allClassAnnotations: List<UAnnotation>,
-        allPackageAnnotations: List<UAnnotation>
+  override fun visitAnnotationUsage(
+    context: JavaContext,
+    element: UElement,
+    annotationInfo: AnnotationInfo,
+    usageInfo: AnnotationUsageInfo
+  ) {
+    if (
+      usageInfo.type == AnnotationUsageType.METHOD_CALL &&
+        annotationInfo.origin == AnnotationOrigin.METHOD
     ) {
-        if (method != null && type == AnnotationUsageType.METHOD_CALL) {
-            check(context, usage as UCallExpression, method)
-        }
+      check(context, usageInfo.usage as UCallExpression, annotationInfo.annotated as PsiMethod)
     }
+  }
 
-    private fun check(context: JavaContext, usage: UCallExpression, method: PsiMethod) {
-        val usageHasAnnotation = hasDeferredApiAnnotation(context, usage)
-        val methodHasAnnotation = hasDeferredApiAnnotation(context, method)
+  private fun check(context: JavaContext, usage: UCallExpression, method: PsiMethod) {
+    val usageHasAnnotation = hasDeferredApiAnnotation(context, usage)
+    val methodHasAnnotation = hasDeferredApiAnnotation(context, method)
 
-        if ((!usageHasAnnotation && methodHasAnnotation) || (usageHasAnnotation && !methodHasAnnotation))
-            context.report(
-                    INVALID_DEFERRED_API_USE,
-                    usage,
-                    context.getCallLocation(
-                            usage,
-                            includeReceiver = false,
-                            includeArguments = true),
-                    "${method.name} is only safe to call in the context of a Deferred<T> dependency.")
-    }
-
-    companion object {
-        private val IMPLEMENTATION = Implementation(
-                DeferredApiDetector::class.java,
-                Scope.JAVA_FILE_SCOPE
-        )
+    if (
+      (!usageHasAnnotation && methodHasAnnotation) || (usageHasAnnotation && !methodHasAnnotation)
+    )
+      context.report(
+        INVALID_DEFERRED_API_USE,
+        usage,
+        context.getCallLocation(usage, includeReceiver = false, includeArguments = true),
+        "${method.name} is only safe to call in the context of a Deferred`<T>` dependency"
+      )
+  }
 
-        /** Calling methods on the wrong thread  */
-        @JvmField
-        val INVALID_DEFERRED_API_USE = Issue.create(
-                id = "InvalidDeferredApiUse",
-                briefDescription = "Invalid use of @DeferredApi",
+  companion object {
+    private val IMPLEMENTATION =
+      Implementation(DeferredApiDetector::class.java, Scope.JAVA_FILE_SCOPE)
 
-                explanation = """
-                    Ensures that a method which expects to be called in the context of
-                Deferred#whenAvailable(), is actually called this way. This is important for
-                supporting dynamically loaded modules, where certain dependencies become available
+    /** Calling methods on the wrong thread */
+    @JvmField
+    val INVALID_DEFERRED_API_USE =
+      Issue.create(
+        id = "InvalidDeferredApiUse",
+        briefDescription = "Invalid use of @DeferredApi",
+        explanation =
+          """
+                Ensures that a method which expects to be called in the context of \
+                `Deferred#whenAvailable()`, is actually called this way. This is important for \
+                supporting dynamically loaded modules, where certain dependencies become available \
                 during app's runtime and not available upon app launch.
                 """,
-                category = Category.CORRECTNESS,
-                priority = 6,
-                severity = Severity.ERROR,
-                implementation = IMPLEMENTATION
-        )
-    }
+        category = Category.CORRECTNESS,
+        priority = 6,
+        severity = Severity.ERROR,
+        implementation = IMPLEMENTATION
+      )
+  }
 }
diff --git a/tools/lint/src/main/kotlin/FirebaseAppGetDetector.kt b/tools/lint/src/main/kotlin/FirebaseAppGetDetector.kt
new file mode 100644
index 00000000000..84e4c54560b
--- /dev/null
+++ b/tools/lint/src/main/kotlin/FirebaseAppGetDetector.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
+
+import com.android.tools.lint.detector.api.Category
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.Severity
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiMethod
+import com.intellij.psi.util.InheritanceUtil
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.UMethod
+import org.jetbrains.uast.getParentOfType
+
+@Suppress("DetectorIsMissingAnnotations")
+class FirebaseAppGetDetector : Detector(), SourceCodeScanner {
+  override fun getApplicableMethodNames(): List<String> = listOf("get")
+
+  override fun visitMethodCall(context: JavaContext, call: UCallExpression, method: PsiMethod) {
+    if (!isFirebaseAppGet(method)) {
+      return
+    }
+
+    if (withinGetInstance(call)) {
+      return
+    }
+    call.getParentOfType<UMethod>() ?: return
+    context.report(
+      ISSUE,
+      call,
+      context.getCallLocation(call, includeReceiver = false, includeArguments = true),
+      "Use of FirebaseApp#get(Class) is discouraged, and is only acceptable" +
+        " in SDK#getInstance(...) methods. Instead declare dependencies explicitly in" +
+        " your ComponentRegistrar and inject."
+    )
+  }
+
+  private fun withinGetInstance(call: UCallExpression): Boolean {
+    val withinMethod = call.getParentOfType<UMethod>() ?: return false
+    if (withinMethod.name != "getInstance" && !withinMethod.isStatic) return false
+
+    var containingClass: PsiClass = withinMethod.containingClass ?: return false
+    if (containingClass.name == "Companion") {
+      containingClass = containingClass.containingClass ?: return false
+    }
+    return InheritanceUtil.isInheritor(
+      withinMethod.returnType,
+      containingClass.qualifiedName ?: return false
+    )
+  }
+
+  private fun isFirebaseAppGet(method: PsiMethod): Boolean {
+    val cls = (method.parent as? PsiClass) ?: return false
+    return cls.qualifiedName == "com.google.firebase.FirebaseApp" &&
+      method.parameterList.parametersCount == 1
+  }
+
+  companion object {
+    private val IMPLEMENTATION =
+      Implementation(FirebaseAppGetDetector::class.java, Scope.JAVA_FILE_SCOPE)
+    val ISSUE =
+      Issue.create(
+        "FirebaseUseExplicitDependencies",
+        briefDescription =
+          "Use of FirebaseApp#get(Class) is discouraged, and is only acceptable" +
+            " in SDK#getInstance(...) methods. Instead declare dependencies explicitly in" +
+            " your ComponentRegistrar and inject.",
+        explanation =
+          "Use of FirebaseApp#get(Class) is discouraged, and is only acceptable" +
+            " in SDK#getInstance(...) methods. Instead declare dependencies explicitly in" +
+            " your ComponentRegistrar and inject.",
+        category = Category.CORRECTNESS,
+        priority = 6,
+        severity = Severity.ERROR,
+        implementation = IMPLEMENTATION
+      )
+  }
+}
diff --git a/tools/lint/src/main/kotlin/KotlinInteropDetector.kt b/tools/lint/src/main/kotlin/KotlinInteropDetector.kt
index 29ec2cac730..7cd465e2597 100644
--- a/tools/lint/src/main/kotlin/KotlinInteropDetector.kt
+++ b/tools/lint/src/main/kotlin/KotlinInteropDetector.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
 
@@ -52,676 +54,696 @@ import org.jetbrains.uast.getContainingUClass
 import org.jetbrains.uast.getContainingUMethod
 import org.jetbrains.uast.getParentOfType
 
+@Suppress("DetectorIsMissingAnnotations")
 class KotlinInteropDetector : Detector(), SourceCodeScanner {
-    companion object Issues {
-        private val IMPLEMENTATION = Implementation(
-                KotlinInteropDetector::class.java,
-                Scope.JAVA_FILE_SCOPE
-        )
-
-        const val IGNORE_DEPRECATED = false
-
-        @JvmField
-        val NO_HARD_KOTLIN_KEYWORDS = Issue.create(
-                id = "FirebaseNoHardKeywords",
-                briefDescription = "No Hard Kotlin Keywords",
-
-                explanation = """
-            Do not use Kotlin’s hard keywords as the name of methods or fields.
-            These require the use of backticks to escape when calling from Kotlin.
+  companion object Issues {
+    private val IMPLEMENTATION =
+      Implementation(KotlinInteropDetector::class.java, Scope.JAVA_FILE_SCOPE)
+
+    const val IGNORE_DEPRECATED = false
+
+    @JvmField
+    val NO_HARD_KOTLIN_KEYWORDS =
+      Issue.create(
+        id = "FirebaseNoHardKeywords",
+        briefDescription = "No Hard Kotlin Keywords",
+        explanation =
+          """
+            Do not use Kotlin’s hard keywords as the name of methods or fields. \
+            These require the use of backticks to escape when calling from Kotlin. \
             Soft keywords, modifier keywords, and special identifiers are allowed.
 
             For example, Mockito’s `when` function requires backticks when used from Kotlin:
 
-                val callable = Mockito.mock(Callable::class.java)
+                val callable = Mockito.mock(Callable::class.java) \
                 Mockito.\`when\`(callable.call()).thenReturn(/* … */)
             """,
-                category = Category.INTEROPERABILITY_KOTLIN,
-                priority = 1,
-                severity = Severity.ERROR,
-                implementation = IMPLEMENTATION
-        )
-
-        @JvmField
-        val LAMBDA_LAST = Issue.create(
-                id = "FirebaseLambdaLast",
-                briefDescription = "Lambda Parameters Last",
-
-                explanation = """
-            To improve calling this code from Kotlin,
+        category = Category.INTEROPERABILITY_KOTLIN,
+        priority = 1,
+        severity = Severity.ERROR,
+        implementation = IMPLEMENTATION
+      )
+
+    @JvmField
+    val LAMBDA_LAST =
+      Issue.create(
+        id = "FirebaseLambdaLast",
+        briefDescription = "Lambda Parameters Last",
+        explanation =
+          """
+            To improve calling this code from Kotlin, \
             parameter types eligible for SAM conversion should be last.
             """,
-                category = Category.INTEROPERABILITY_KOTLIN,
-                priority = 1,
-                severity = Severity.ERROR,
-                implementation = IMPLEMENTATION
-        )
-
-        @JvmField
-        val PLATFORM_NULLNESS = Issue.create(
-                id = "FirebaseUnknownNullness",
-                briefDescription = "Unknown nullness",
-
-                explanation = """
-            To improve referencing this code from Kotlin, consider adding
+        category = Category.INTEROPERABILITY_KOTLIN,
+        priority = 1,
+        severity = Severity.ERROR,
+        implementation = IMPLEMENTATION
+      )
+
+    @JvmField
+    val PLATFORM_NULLNESS =
+      Issue.create(
+        id = "FirebaseUnknownNullness",
+        briefDescription = "Unknown nullness",
+        explanation =
+          """
+            To improve referencing this code from Kotlin, consider adding \
             explicit nullness information here with either `@NonNull` or `@Nullable`.
             """,
-                category = Category.INTEROPERABILITY_KOTLIN,
-                priority = 1,
-                severity = Severity.ERROR,
-                implementation = IMPLEMENTATION
-        )
-
-        @JvmField
-        val KOTLIN_PROPERTY = Issue.create(
-                id = "FirebaseKotlinPropertyAccess",
-                briefDescription = "Kotlin Property Access",
-
-                explanation = """
+        category = Category.INTEROPERABILITY_KOTLIN,
+        priority = 1,
+        severity = Severity.ERROR,
+        implementation = IMPLEMENTATION
+      )
+
+    @JvmField
+    val KOTLIN_PROPERTY =
+      Issue.create(
+        id = "FirebaseKotlinPropertyAccess",
+        briefDescription = "Kotlin Property Access",
+        explanation =
+          """
             For a method to be represented as a property in Kotlin, strict “bean”-style prefixing must be used.
 
             Accessor methods require a ‘get’ prefix or for boolean-returning methods an ‘is’ prefix can be used.
             """,
-                category = Category.INTEROPERABILITY_KOTLIN,
-                priority = 1,
-                severity = Severity.ERROR,
-                implementation = IMPLEMENTATION
-        )
-
-        private fun isKotlinHardKeyword(keyword: String): Boolean {
-            // From https://github.com/JetBrains/kotlin/blob/master/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
-            when (keyword) {
-                "as",
-                "break",
-                "class",
-                "continue",
-                "do",
-                "else",
-                "false",
-                "for",
-                "fun",
-                "if",
-                "in",
-                "interface",
-                "is",
-                "null",
-                "object",
-                "package",
-                "return",
-                "super",
-                "this",
-                "throw",
-                "true",
-                "try",
-                "typealias",
-                "typeof",
-                "val",
-                "var",
-                "when",
-                "while"
-                -> return true
-            }
-
-            return false
-        }
+        category = Category.INTEROPERABILITY_KOTLIN,
+        priority = 1,
+        severity = Severity.ERROR,
+        implementation = IMPLEMENTATION
+      )
+
+    private fun isKotlinHardKeyword(keyword: String): Boolean {
+      // From
+      // https://github.com/JetBrains/kotlin/blob/master/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
+      when (keyword) {
+        "as",
+        "break",
+        "class",
+        "continue",
+        "do",
+        "else",
+        "false",
+        "for",
+        "fun",
+        "if",
+        "in",
+        "interface",
+        "is",
+        "null",
+        "object",
+        "package",
+        "return",
+        "super",
+        "this",
+        "throw",
+        "true",
+        "try",
+        "typealias",
+        "typeof",
+        "val",
+        "var",
+        "when",
+        "while" -> return true
+      }
+
+      return false
     }
-
-    override fun getApplicableUastTypes(): List<Class<out UElement>>? {
-        return listOf(UMethod::class.java, UField::class.java)
+  }
+
+  override fun getApplicableUastTypes(): List<Class<out UElement>>? {
+    return listOf(UMethod::class.java, UField::class.java)
+  }
+
+  override fun createUastHandler(context: JavaContext): UElementHandler? {
+    // using deprecated psi field here instead of sourcePsi because the IDE
+    // still uses older version of UAST
+    if (isKotlin(context.uastFile?.sourcePsi)) {
+      // These checks apply only to Java code
+      return null
     }
+    return JavaVisitor(context)
+  }
 
-    override fun createUastHandler(context: JavaContext): UElementHandler? {
-        // using deprecated psi field here instead of sourcePsi because the IDE
-        // still uses older version of UAST
-        if (isKotlin(context.uastFile?.sourcePsi)) {
-            // These checks apply only to Java code
-            return null
-        }
-        return JavaVisitor(context)
-    }
+  class JavaVisitor(private val context: JavaContext) : UElementHandler() {
+    private val checkForKeywords = true
+    private val checkNullness = true
+    private val checkLambdaLast = true
+    private val checkPropertyAccess = true
 
-    class JavaVisitor(private val context: JavaContext) : UElementHandler() {
-        private val checkForKeywords = true
-        private val checkNullness = true
-        private val checkLambdaLast = true
-        private val checkPropertyAccess = true
-
-        override fun visitMethod(node: UMethod) {
-            if (isPublicApi(node)) {
-                val methodName = node.name
-
-                if (checkForKeywords) {
-                    ensureNonKeyword(methodName, node, "method")
-                }
-
-                if (checkPropertyAccess && isLikelySetter(methodName, node)) {
-                    ensureValidProperty(node, methodName)
-                }
-
-                if (checkLambdaLast) {
-                    ensureLambdaLastParameter(node)
-                }
-
-                if (checkNullness) {
-                    val type = node.returnType
-                    if (type != null) { // not a constructor
-                        ensureNullnessKnown(node, type)
-                    }
-                    for (parameter in node.uastParameters) {
-                        ensureNullnessKnown(parameter, parameter.type)
-                    }
-                }
-            }
+    override fun visitMethod(node: UMethod) {
+      if (isPublicApi(node)) {
+        val methodName = node.name
+
+        if (checkForKeywords) {
+          ensureNonKeyword(methodName, node, "method")
         }
 
-        override fun visitField(node: UField) {
-            if (isPublicApi(node)) {
-                if (checkForKeywords) {
-                    ensureNonKeyword(node.name, node, "field")
-                }
-                if (checkNullness) {
-                    ensureNullnessKnown(node, node.type)
-                }
-            }
+        if (checkPropertyAccess && isLikelySetter(methodName, node)) {
+          ensureValidProperty(node, methodName)
         }
 
-        private fun isLikelySetter(
-            methodName: String,
-            node: UMethod
-        ): Boolean {
-            return methodName.startsWith("set") && methodName.length > 3 &&
-                    Character.isUpperCase(methodName[3]) &&
-                    node.uastParameters.size == 1 &&
-                    context.evaluator.isPublic(node) &&
-                    !context.evaluator.isStatic(node)
+        if (checkLambdaLast) {
+          ensureLambdaLastParameter(node)
         }
 
-        private fun isPublicApi(node: UDeclaration): Boolean {
-            if (!isJavaPublic(node)) {
-                return false
-            }
-            if (node is PsiJavaDocumentedElement) {
-                node.docComment?.findTagByName("hide")?.let {
-                    return false
-                }
-            }
+        if (checkNullness) {
+          val type = node.returnType
+          if (type != null) { // not a constructor
+            ensureNullnessKnown(node, type)
+          }
+          for (parameter in node.uastParameters) {
+            ensureNullnessKnown(parameter, parameter.type)
+          }
+        }
+      }
+    }
 
-            if (node is PsiMember) {
-                var curNode = node.containingClass
-                while (curNode != null) {
-                    curNode.docComment?.findTagByName("hide")?.let {
-                        return false
-                    }
-                    curNode = curNode.containingClass
-                }
-            }
+    override fun visitField(node: UField) {
+      if (isPublicApi(node)) {
+        if (checkForKeywords) {
+          ensureNonKeyword(node.name, node, "field")
+        }
+        if (checkNullness) {
+          ensureNullnessKnown(node, node.type)
+        }
+      }
+    }
 
-            val psiPackage: PsiPackage = context.evaluator.getPackage(node as PsiElement)!!
-            psiPackage.getFiles(GlobalSearchScope.projectScope(psiPackage.project)).find {
-                it.name == "package-info.java"
-            }?.let {
-                if (it.viewProvider.contents.toString().matches(Regex(".*/\\*\\*.*@hide.*\\*/.*\n\\s*package.*", RegexOption.DOT_MATCHES_ALL))) {
-                    return false
-                }
-            }
+    private fun isLikelySetter(methodName: String, node: UMethod): Boolean {
+      return methodName.startsWith("set") &&
+        methodName.length > 3 &&
+        Character.isUpperCase(methodName[3]) &&
+        node.uastParameters.size == 1 &&
+        context.evaluator.isPublic(node) &&
+        !context.evaluator.isStatic(node)
+    }
 
-            return true
+    private fun isPublicApi(node: UDeclaration): Boolean {
+      if (!isJavaPublic(node)) {
+        return false
+      }
+      if (node is PsiJavaDocumentedElement) {
+        node.docComment?.findTagByName("hide")?.let {
+          return false
         }
+      }
 
-        private fun isJavaPublic(node: UDeclaration): Boolean {
-            val evaluator = context.evaluator
-            if (evaluator.isPublic(node) || evaluator.isProtected(node)) {
-                val cls = node.getParentOfType<UClass>(UClass::class.java) ?: return true
-                return evaluator.isPublic(cls) && cls !is UAnonymousClass
-            }
-
+      if (node is PsiMember) {
+        var curNode = node.containingClass
+        while (curNode != null) {
+          curNode.docComment?.findTagByName("hide")?.let {
             return false
+          }
+          curNode = curNode.containingClass
+        }
+      }
+
+      val psiPackage: PsiPackage = context.evaluator.getPackage(node as PsiElement)!!
+      psiPackage
+        .getFiles(GlobalSearchScope.projectScope(psiPackage.project))
+        .find { it.name == "package-info.java" }
+        ?.let {
+          if (
+            it.viewProvider.contents
+              .toString()
+              .matches(
+                Regex(".*/\\*\\*.*@hide.*\\*/.*\n\\s*package.*", RegexOption.DOT_MATCHES_ALL)
+              )
+          ) {
+            return false
+          }
         }
 
-        private fun ensureValidProperty(setter: UMethod, methodName: String) {
-            val cls = setter.getContainingUClass() ?: return
-            val propertySuffix = methodName.substring(3)
-            val propertyName = propertySuffix.decapitalize()
-            val getterName1 = "get$propertySuffix"
-            val getterName2 = "is$propertySuffix"
-            val badGetterName = "has$propertySuffix"
-            var getter: PsiMethod? = null
-            var badGetter: UMethod? = null
-            cls.methods.forEach {
-                if (it.parameters.isEmpty()) {
-                    val name = it.name
-                    if (name == getterName1 || name == getterName2) {
-                        getter = it
-                    } else if ((name == badGetterName || name == propertyName ||
-                                    name.endsWith(propertySuffix)) &&
-                            context.evaluator.isPublic(it) &&
-                            !it.isConstructor &&
-                            it.returnType == setter.uastParameters.firstOrNull()?.type
-                    ) {
-                        badGetter = it
-                    }
-                }
-            }
+      return true
+    }
 
-            if (getter == null) {
-                // Look for inherited methods
-                cls.superClass?.let { superClass ->
-                    for (inherited in superClass.findMethodsByName(getterName1, true)) {
-                        if (inherited.parameterList.parametersCount == 0) {
-                            getter = inherited
-                            break
-                        }
-                    }
-                    if (getter == null) {
-                        for (inherited in superClass.findMethodsByName(getterName2, true)) {
-                            if (inherited.parameterList.parametersCount == 0) {
-                                getter = inherited
-                                break
-                            }
-                        }
-                    }
-                }
-            }
+    private fun isJavaPublic(node: UDeclaration): Boolean {
+      val evaluator = context.evaluator
+      if (evaluator.isPublic(node) || evaluator.isProtected(node)) {
+        val cls = node.getParentOfType<UClass>(UClass::class.java) ?: return true
+        return evaluator.isPublic(cls) && cls !is UAnonymousClass
+      }
 
-            if (getter != null && getter !is PsiCompiledElement) {
-                @Suppress("NAME_SHADOWING") // compiler gets confused about getter nullness
-                val getter: PsiMethod = getter!!
-
-                // enforce public and not static
-                if (!context.evaluator.isPublic(getter)) {
-                    val message = "This getter should be public such that `$propertyName` can " +
-                            "be accessed as a property from Kotlin; see https://android.github.io/kotlin-guides/interop.html#property-prefixes"
-                    val location = context.getNameLocation(getter)
-                    context.report(KOTLIN_PROPERTY, getter, location, message)
-                    return
-                }
-
-                if (context.evaluator.isStatic(getter)) {
-                    var staticElement: PsiElement? = null
-                    val modifierList = getter.modifierList
-                    // Try to find the static modifier itself
-                    if (modifierList.hasExplicitModifier(PsiModifier.STATIC)) {
-                        var child: PsiElement? = modifierList.firstChild
-                        while (child != null) {
-                            if (child is PsiKeyword && PsiKeyword.STATIC == child.text) {
-                                staticElement = child
-                                break
-                            }
-                            child = child.nextSibling
-                        }
-                    }
-                    val location = if (staticElement != null) {
-                        context.getLocation(staticElement)
-                    } else {
-                        context.getNameLocation(getter)
-                    }
-                    val message =
-                            "This getter should not be static such that `$propertyName` can " +
-                                    "be accessed as a property from Kotlin; see https://android.github.io/kotlin-guides/interop.html#property-prefixes"
-                    context.report(
-                            KOTLIN_PROPERTY,
-                            location.source as? PsiElement ?: setter, location, message
-                    )
-                    return
-                }
-
-                val setterParameterType = setter.uastParameters.first().type
-                if (setterParameterType != getter.returnType &&
-                        !hasSetter(cls, getter.returnType, setter.name) &&
-                        !isTypeVariableReference(setterParameterType)
-                ) {
-                    val message =
-                            "The getter return type (`${getter.returnType?.presentableText}`) and setter parameter type (`${setterParameterType.presentableText}`) getter and setter methods for property `$propertyName` should have exactly the same type to allow " +
-                                    "be accessed as a property from Kotlin; see https://android.github.io/kotlin-guides/interop.html#property-prefixes"
-                    val location = getPropertyLocation(getter, setter)
-                    context.report(
-                            KOTLIN_PROPERTY,
-                            location.source as? PsiElement ?: setter, location, message
-                    )
-                    return
-                }
-
-                // Make sure that if the getter is inherited, it has the same return type
-                for (superMethod in getter.findSuperMethods()) {
-                    if (superMethod.containingClass?.isInterface != true) {
-                        val superReturnType = superMethod.returnType ?: return
-                        val getterType = getter.returnType
-                        if (superReturnType != getterType) {
-                            val message =
-                                    "The getter return type (`${getterType?.presentableText}`)" +
-                                            " is not the same as the setter return type " +
-                                            "(`${superReturnType.presentableText}`); they should have " +
-                                            "exactly the same type to allow " +
-                                            "`${propertySuffix.decapitalize()}` " +
-                                            "be accessed as a property from Kotlin; see " +
-                                            "https://android.github.io/kotlin-guides/interop.html#property-prefixes"
-                            val location = getPropertyLocation(getter, setter)
-                            context.report(
-                                    KOTLIN_PROPERTY,
-                                    location.source as? PsiElement ?: setter, location, message
-                            )
-                            return
-                        }
-                    }
-                }
-            } else if (badGetter != null &&
-                    // Don't complain about overrides; we can't rename those
-                    !badGetter!!.findSuperMethods().any() &&
-                    // Don't complain if the matched bad getter method already has its own
-                    // match
-                    run {
-                        val matchingName =
-                                "set${badGetter!!.name.removePrefix("is").removePrefix("get").removePrefix("has")}"
-
-                        methodName == matchingName || cls.methods.none { it.name == matchingName }
-                    }
-            ) {
-                val name1 = badGetter!!.name
-                if (name1.startsWith("is") && methodName.startsWith("setIs") &&
-                        name1[2].isUpperCase()
-                ) {
-                    val newProperty = name1[2].toLowerCase() + name1.substring(3)
-                    val message =
-                            "This method should be called `set${newProperty.capitalize()}` such " +
-                                    "that (along with the `$name1` getter) Kotlin code can access it " +
-                                    "as a property (`$newProperty`); see " +
-                                    "https://android.github.io/kotlin-guides/interop.html#property-prefixes"
-                    val location = context.getNameLocation(setter)
-                    context.report(KOTLIN_PROPERTY, setter, location, message)
-                    return
-                }
-
-                val location = context.getNameLocation(badGetter!!)
-                val message =
-                        "This method should be called `get$propertySuffix` such that `$propertyName` can " +
-                                "be accessed as a property from Kotlin; see https://android.github.io/kotlin-guides/interop.html#property-prefixes"
-                context.report(KOTLIN_PROPERTY, badGetter, location, message)
+      return false
+    }
+
+    private fun ensureValidProperty(setter: UMethod, methodName: String) {
+      val cls = setter.getContainingUClass() ?: return
+      val propertySuffix = methodName.substring(3)
+      val propertyName = propertySuffix.decapitalize()
+      val getterName1 = "get$propertySuffix"
+      val getterName2 = "is$propertySuffix"
+      val badGetterName = "has$propertySuffix"
+      var getter: PsiMethod? = null
+      var badGetter: UMethod? = null
+      cls.methods.forEach {
+        if (it.parameters.isEmpty()) {
+          val name = it.name
+          if (name == getterName1 || name == getterName2) {
+            getter = it
+          } else if (
+            (name == badGetterName || name == propertyName || name.endsWith(propertySuffix)) &&
+              context.evaluator.isPublic(it) &&
+              !it.isConstructor &&
+              it.returnType == setter.uastParameters.firstOrNull()?.type
+          ) {
+            badGetter = it
+          }
+        }
+      }
+
+      if (getter == null) {
+        // Look for inherited methods
+        cls.javaPsi.superClass?.let { superClass ->
+          for (inherited in superClass.findMethodsByName(getterName1, true)) {
+            if (inherited.parameterList.parametersCount == 0) {
+              getter = inherited
+              break
+            }
+          }
+          if (getter == null) {
+            for (inherited in superClass.findMethodsByName(getterName2, true)) {
+              if (inherited.parameterList.parametersCount == 0) {
+                getter = inherited
+                break
+              }
             }
+          }
+        }
+      }
+
+      if (getter != null && getter !is PsiCompiledElement) {
+        @Suppress("NAME_SHADOWING") // compiler gets confused about getter nullness
+        val getter: PsiMethod = getter!!
+
+        // enforce public and not static
+        if (!context.evaluator.isPublic(getter)) {
+          val message =
+            "This getter should be public such that `$propertyName` can " +
+              "be accessed as a property from Kotlin; see https://android.github.io/kotlin-guides/interop.html#property-prefixes"
+          val location = context.getNameLocation(getter)
+          context.report(KOTLIN_PROPERTY, getter, location, message)
+          return
         }
 
-        private fun isTypeVariableReference(type: PsiType): Boolean {
-            if (type is PsiClassType) {
-                val cls = type.resolve() ?: return false
-                return cls is PsiTypeParameter
+        if (context.evaluator.isStatic(getter)) {
+          var staticElement: PsiElement? = null
+          val modifierList = getter.modifierList
+          // Try to find the static modifier itself
+          if (modifierList.hasExplicitModifier(PsiModifier.STATIC)) {
+            var child: PsiElement? = modifierList.firstChild
+            while (child != null) {
+              if (child is PsiKeyword && PsiKeyword.STATIC == child.text) {
+                staticElement = child
+                break
+              }
+              child = child.nextSibling
+            }
+          }
+          val location =
+            if (staticElement != null) {
+              context.getLocation(staticElement)
             } else {
-                return false
+              context.getNameLocation(getter)
             }
+          val message =
+            "This getter should not be static such that `$propertyName` can " +
+              "be accessed as a property from Kotlin; see https://android.github.io/kotlin-guides/interop.html#property-prefixes"
+          context.report(
+            KOTLIN_PROPERTY,
+            location.source as? PsiElement ?: setter,
+            location,
+            message
+          )
+          return
         }
 
-        /** Returns true if the given class has a (possibly inherited) setter of the given type */
-        private fun hasSetter(cls: UClass, type: PsiType?, setterName: String): Boolean {
-            for (method in cls.findMethodsByName(setterName, true)) {
-                val parameterList = method.parameterList
-                val parameters = parameterList.parameters
-                if (parameters.size == 1 && parameters[0].type == type) {
-                    return true
-                }
-            }
-
-            return false
+        val setterParameterType = setter.uastParameters.first().type
+        if (
+          setterParameterType != getter.returnType &&
+            !hasSetter(cls, getter.returnType, setter.name) &&
+            !isTypeVariableReference(setterParameterType)
+        ) {
+          val message =
+            "The getter return type (`${getter.returnType?.presentableText}`) and setter parameter type (`${setterParameterType.presentableText}`) getter and setter methods for property `$propertyName` should have exactly the same type to allow " +
+              "be accessed as a property from Kotlin; see https://android.github.io/kotlin-guides/interop.html#property-prefixes"
+          val location = getPropertyLocation(getter, setter)
+          context.report(
+            KOTLIN_PROPERTY,
+            location.source as? PsiElement ?: setter,
+            location,
+            message
+          )
+          return
         }
 
-        private fun getPropertyLocation(
-            location1: PsiMethod,
-            location2: PsiMethod
-        ): Location {
-            val primary: PsiMethod
-            val secondary: PsiMethod
-
-            if (location1 is PsiCompiledElement) {
-                primary = location2
-                secondary = location1
-            } else {
-                primary = location1
-                secondary = location2
+        // Make sure that if the getter is inherited, it has the same return type
+        for (superMethod in getter.findSuperMethods()) {
+          if (superMethod.containingClass?.isInterface != true) {
+            val superReturnType = superMethod.returnType ?: return
+            val getterType = getter.returnType
+            if (superReturnType != getterType) {
+              val message =
+                "The getter return type (`${getterType?.presentableText}`)" +
+                  " is not the same as the setter return type " +
+                  "(`${superReturnType.presentableText}`); they should have " +
+                  "exactly the same type to allow " +
+                  "`${propertySuffix.decapitalize()}` " +
+                  "be accessed as a property from Kotlin; see " +
+                  "https://android.github.io/kotlin-guides/interop.html#property-prefixes"
+              val location = getPropertyLocation(getter, setter)
+              context.report(
+                KOTLIN_PROPERTY,
+                location.source as? PsiElement ?: setter,
+                location,
+                message
+              )
+              return
             }
-
-            return context.getNameLocation(primary).withSecondary(
-                    context.getNameLocation(secondary),
-                    "${if (secondary.name.startsWith("set")) "Setter" else "Getter"} here"
-            )
+          }
+        }
+      } else if (
+        badGetter != null &&
+          // Don't complain about overrides; we can't rename those
+          !badGetter!!.findSuperMethods().any() &&
+          // Don't complain if the matched bad getter method already has its own
+          // match
+          run {
+            val matchingName =
+              "set${badGetter!!.name.removePrefix("is").removePrefix("get").removePrefix("has")}"
+
+            methodName == matchingName || cls.methods.none { it.name == matchingName }
+          }
+      ) {
+        val name1 = badGetter!!.name
+        if (name1.startsWith("is") && methodName.startsWith("setIs") && name1[2].isUpperCase()) {
+          val newProperty = name1[2].lowercaseChar() + name1.substring(3)
+          val message =
+            "This method should be called `set${newProperty.capitalize()}` such " +
+              "that (along with the `$name1` getter) Kotlin code can access it " +
+              "as a property (`$newProperty`); see " +
+              "https://android.github.io/kotlin-guides/interop.html#property-prefixes"
+          val location = context.getNameLocation(setter)
+          context.report(KOTLIN_PROPERTY, setter, location, message)
+          return
         }
 
-        private fun ensureNullnessKnown(
-            node: UDeclaration,
-            type: PsiType
-        ) {
-            if (type is PsiPrimitiveType) {
-                return
-            }
-            if (node is UField &&
-                    node.modifierList?.hasModifierProperty(PsiModifier.FINAL) == true) {
-                return
-            }
-            for (annotation in node.annotations) {
-                val name = annotation.qualifiedName ?: continue
-
-                if (isNullableAnnotation(name)) {
-                    if (isToStringMethod(node)) {
-                        val location = context.getLocation(annotation)
-                        val message = "Unexpected `@Nullable`: `toString` should never return null"
-                        context.report(PLATFORM_NULLNESS, node as UElement, location, message)
-                    }
-                    return
-                }
-
-                if (isNonNullAnnotation(name)) {
-                    if (isEqualsParameter(node)) {
-                        val location = context.getLocation(annotation)
-                        val message =
-                                "Unexpected @NonNull: The `equals` contract allows the parameter to be null"
-                        context.report(PLATFORM_NULLNESS, node as UElement, location, message)
-                    }
-                    return
-                }
-            }
+        val location = context.getNameLocation(badGetter!!)
+        val message =
+          "This method should be called `get$propertySuffix` such that `$propertyName` can " +
+            "be accessed as a property from Kotlin; see https://android.github.io/kotlin-guides/interop.html#property-prefixes"
+        context.report(KOTLIN_PROPERTY, badGetter, location, message)
+      }
+    }
 
-            // Known nullability: don't complain
-            if (isEqualsParameter(node) || isToStringMethod(node) || isVarargParameter(node)) {
-                return
-            }
+    private fun isTypeVariableReference(type: PsiType): Boolean {
+      if (type is PsiClassType) {
+        val cls = type.resolve() ?: return false
+        return cls is PsiTypeParameter
+      } else {
+        return false
+      }
+    }
 
-            // Annotation members cannot be null
-            if (node is UMethod) {
-                node.getContainingUClass()?.let {
-                    if (it.isAnnotationType) {
-                        return
-                    }
-                }
-            }
+    private fun String.capitalize() = replaceFirstChar { it.uppercase() }
 
-            // Skip deprecated members?
-            if (IGNORE_DEPRECATED) {
-                val deprecatedNode =
-                        if (node is UParameter) {
-                            node.uastParent
-                        } else {
-                            node
-                        }
-                if ((deprecatedNode?.sourcePsi as? PsiDocCommentOwner)?.isDeprecated == true) {
-                    return
-                }
-                var curr = deprecatedNode
-                while (curr != null) {
-                    curr = curr.getContainingUClass() ?: break
-                    if ((curr.sourcePsi as? PsiDocCommentOwner)?.isDeprecated == true) {
-                        return
-                    }
-                }
-            }
+    private fun String.decapitalize() = replaceFirstChar { it.lowercase() }
 
-            val location: Location =
-                    when (node) {
-                        is UVariable -> // UParameter, UField
-                            context.getLocation(node.typeReference ?: return)
-                        is UMethod -> context.getLocation(node.returnTypeElement ?: return)
-                        else -> return
-                    }
-            val replaceLocation = if (node is UParameter) {
-                location
-            } else if (node is UMethod && node.modifierList != null) {
-                // Place the insertion point at the modifiers such that we don't
-                // insert the annotation for example after the "public" keyword.
-                // We also don't want to place it on the method range itself since
-                // that would place it before the method comments.
-                context.getLocation(node.modifierList)
-            } else if (node is UField && node.modifierList != null) {
-                // Ditto for fields
-                context.getLocation(node.modifierList!!)
-            } else {
-                return
-            }
-            val message = "Unknown nullability; explicitly declare as `@Nullable` or `@NonNull`" +
-                    " to improve Kotlin interoperability; see " +
-                    "https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-            val fix = LintFix.create().alternatives(
-                    LintFix.create()
-                            .replace()
-                            .name("Annotate @NonNull")
-                            .range(replaceLocation)
-                            .beginning()
-                            .shortenNames()
-                            .reformat(true)
-                            .with("$nonNullAnnotation ")
-                            .build(),
-                    LintFix.create()
-                            .replace()
-                            .name("Annotate @Nullable")
-                            .range(replaceLocation)
-                            .beginning()
-                            .shortenNames()
-                            .reformat(true)
-                            .with("$nullableAnnotation ")
-                            .build()
-            )
-            context.report(PLATFORM_NULLNESS, node as UElement, location, message, fix)
+    /** Returns true if the given class has a (possibly inherited) setter of the given type */
+    private fun hasSetter(cls: UClass, type: PsiType?, setterName: String): Boolean {
+      for (method in cls.findMethodsByName(setterName, true)) {
+        val parameterList = method.parameterList
+        val parameters = parameterList.parameters
+        if (parameters.size == 1 && parameters[0].type == type) {
+          return true
         }
+      }
 
-        private fun isEqualsParameter(node: UDeclaration): Boolean {
-            if (node is UParameter) {
-                val method = node.getContainingUMethod() ?: return false
-                if (method.name == "equals" && method.uastParameters.size == 1) {
-                    return true
-                }
-            }
+      return false
+    }
 
-            return false
-        }
+    private fun getPropertyLocation(location1: PsiMethod, location2: PsiMethod): Location {
+      val primary: PsiMethod
+      val secondary: PsiMethod
+
+      if (location1 is PsiCompiledElement) {
+        primary = location2
+        secondary = location1
+      } else {
+        primary = location1
+        secondary = location2
+      }
+
+      return context
+        .getNameLocation(primary)
+        .withSecondary(
+          context.getNameLocation(secondary),
+          "${if (secondary.name.startsWith("set")) "Setter" else "Getter"} here"
+        )
+    }
 
-        private fun isVarargParameter(node: UDeclaration): Boolean {
-            return node is UParameter && node.isVarArgs
+    private fun ensureNullnessKnown(node: UDeclaration, type: PsiType) {
+      if (type is PsiPrimitiveType) {
+        return
+      }
+      if (node is UField && node.modifierList?.hasModifierProperty(PsiModifier.FINAL) == true) {
+        return
+      }
+      for (annotation in node.uAnnotations) {
+        val name = annotation.qualifiedName ?: continue
+
+        if (isNullableAnnotation(name)) {
+          if (isToStringMethod(node)) {
+            val location = context.getLocation(annotation)
+            val message = "Unexpected `@Nullable`: `toString` should never return null"
+            context.report(PLATFORM_NULLNESS, node as UElement, location, message)
+          }
+          return
         }
 
-        private fun isToStringMethod(node: UDeclaration): Boolean {
-            if (node is UMethod) {
-                val method = node
-                if (method.name == "toString" && method.uastParameters.isEmpty()) {
-                    return true
-                }
-            }
+        if (isNonNullAnnotation(name)) {
+          if (isEqualsParameter(node)) {
+            val location = context.getLocation(annotation)
+            val message =
+              "Unexpected @NonNull: The `equals` contract allows the parameter to be null"
+            context.report(PLATFORM_NULLNESS, node as UElement, location, message)
+          }
+          return
+        }
+      }
+
+      // Known nullability: don't complain
+      if (isEqualsParameter(node) || isToStringMethod(node) || isVarargParameter(node)) {
+        return
+      }
+
+      // Annotation members cannot be null
+      if (node is UMethod) {
+        node.getContainingUClass()?.let {
+          if (it.isAnnotationType) {
+            return
+          }
+        }
+      }
+
+      // Skip deprecated members?
+      if (IGNORE_DEPRECATED) {
+        val deprecatedNode =
+          if (node is UParameter) {
+            node.uastParent
+          } else {
+            node
+          }
+        if ((deprecatedNode?.sourcePsi as? PsiDocCommentOwner)?.isDeprecated == true) {
+          return
+        }
+        var curr = deprecatedNode
+        while (curr != null) {
+          curr = curr.getContainingUClass() ?: break
+          if ((curr.sourcePsi as? PsiDocCommentOwner)?.isDeprecated == true) {
+            return
+          }
+        }
+      }
+
+      val location: Location =
+        when (node) {
+          is UVariable -> // UParameter, UField
+          context.getLocation(node.typeReference ?: return)
+          is UMethod -> context.getLocation(node.returnTypeElement ?: return)
+          else -> return
+        }
+      val replaceLocation =
+        if (node is UParameter) {
+          location
+        } else if (node is UMethod) {
+          // Place the insertion point at the modifiers such that we don't
+          // insert the annotation for example after the "public" keyword.
+          // We also don't want to place it on the method range itself since
+          // that would place it before the method comments.
+          context.getLocation(node.modifierList)
+        } else if (node is UField && node.modifierList != null) {
+          // Ditto for fields
+          context.getLocation(node.modifierList!!)
+        } else {
+          return
+        }
+      val message =
+        "Unknown nullability; explicitly declare as `@Nullable` or `@NonNull`" +
+          " to improve Kotlin interoperability; see " +
+          "https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+      val fix =
+        LintFix.create()
+          .alternatives(
+            LintFix.create()
+              .replace()
+              .name("Annotate @NonNull")
+              .range(replaceLocation)
+              .beginning()
+              .shortenNames()
+              .reformat(true)
+              .with("$nonNullAnnotation ")
+              .build(),
+            LintFix.create()
+              .replace()
+              .name("Annotate @Nullable")
+              .range(replaceLocation)
+              .beginning()
+              .shortenNames()
+              .reformat(true)
+              .with("$nullableAnnotation ")
+              .build()
+          )
+      context.report(PLATFORM_NULLNESS, node as UElement, location, message, fix)
+    }
 
-            return false
+    private fun isEqualsParameter(node: UDeclaration): Boolean {
+      if (node is UParameter) {
+        val method = node.getContainingUMethod() ?: return false
+        if (method.name == "equals" && method.uastParameters.size == 1) {
+          return true
         }
+      }
 
-        private var nonNullAnnotation: String = "@androidx.annotation.NonNull"
-        private var nullableAnnotation: String? = "@androidx.annotation.Nullable"
+      return false
+    }
 
-        private fun isNullableAnnotation(qualifiedName: String): Boolean {
-            return qualifiedName.endsWith("Nullable")
-        }
+    private fun isVarargParameter(node: UDeclaration): Boolean {
+      return node is UParameter && node.isVarArgs
+    }
 
-        private fun isNonNullAnnotation(qualifiedName: String): Boolean {
-            return qualifiedName.endsWith("NonNull") ||
-                    qualifiedName.endsWith("NotNull") ||
-                    qualifiedName.endsWith("Nonnull")
+    private fun isToStringMethod(node: UDeclaration): Boolean {
+      if (node is UMethod) {
+        val method = node
+        if (method.name == "toString" && method.uastParameters.isEmpty()) {
+          return true
         }
+      }
 
-        private fun ensureNonKeyword(name: String, node: UDeclaration, typeLabel: String) {
-            if (isKotlinHardKeyword(name)) {
-                // See if this method is overriding some other method; in that case
-                // we don't have a choice here.
-                if (node is UMethod && context.evaluator.isOverride(node)) {
-                    return
-                }
-                val message =
-                        "Avoid $typeLabel names that are Kotlin hard keywords (\"$name\"); see " +
-                                "https://android.github.io/kotlin-guides/interop.html#no-hard-keywords"
-                context.report(
-                        NO_HARD_KOTLIN_KEYWORDS,
-                        node as UElement,
-                        context.getNameLocation(node as UElement),
-                        message
-                )
-            }
+      return false
+    }
+
+    private var nonNullAnnotation: String = "@androidx.annotation.NonNull"
+    private var nullableAnnotation: String? = "@androidx.annotation.Nullable"
+
+    private fun isNullableAnnotation(qualifiedName: String): Boolean {
+      return qualifiedName.endsWith("Nullable")
+    }
+
+    private fun isNonNullAnnotation(qualifiedName: String): Boolean {
+      return qualifiedName.endsWith("NonNull") ||
+        qualifiedName.endsWith("NotNull") ||
+        qualifiedName.endsWith("Nonnull")
+    }
+
+    private fun ensureNonKeyword(name: String, node: UDeclaration, typeLabel: String) {
+      if (isKotlinHardKeyword(name)) {
+        // See if this method is overriding some other method; in that case
+        // we don't have a choice here.
+        if (node is UMethod && context.evaluator.isOverride(node)) {
+          return
         }
+        val message =
+          "Avoid $typeLabel names that are Kotlin hard keywords (\"$name\"); see " +
+            "https://android.github.io/kotlin-guides/interop.html#no-hard-keywords"
+        context.report(
+          NO_HARD_KOTLIN_KEYWORDS,
+          node as UElement,
+          context.getNameLocation(node as UElement),
+          message
+        )
+      }
+    }
 
-        private fun ensureLambdaLastParameter(method: UMethod) {
-            val parameters = method.uastParameters
-            if (parameters.size > 1) {
-                // Make sure that SAM-compatible parameters are last
-                val lastIndex = parameters.size - 1
-                if (!isFunctionalInterface(parameters[lastIndex].type)) {
-                    for (i in lastIndex - 1 downTo 0) {
-                        val parameter = parameters[i]
-                        if (isFunctionalInterface(parameter.type)) {
-                            val message =
-                                    "Functional interface parameters (such as parameter ${i + 1}, \"${parameter.name}\", in ${
+    private fun ensureLambdaLastParameter(method: UMethod) {
+      val parameters = method.uastParameters
+      if (parameters.size > 1) {
+        // Make sure that SAM-compatible parameters are last
+        val lastIndex = parameters.size - 1
+        if (!isFunctionalInterface(parameters[lastIndex].type)) {
+          for (i in lastIndex - 1 downTo 0) {
+            val parameter = parameters[i]
+            if (isFunctionalInterface(parameter.type)) {
+              val message =
+                "Functional interface parameters (such as parameter ${i + 1}, \"${parameter.name}\", in ${
                                     method.containingClass?.qualifiedName}.${method.name
                                     }) should be last to improve Kotlin interoperability; see " +
-                                            "https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
-                            context.report(
-                                    LAMBDA_LAST,
-                                    method,
-                                    context.getLocation(parameters[lastIndex] as UElement),
-                                    message
-                            )
-                            break
-                        }
-                    }
-                }
+                  "https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
+              context.report(
+                LAMBDA_LAST,
+                method,
+                context.getLocation(parameters[lastIndex] as UElement),
+                message
+              )
+              break
             }
+          }
         }
+      }
+    }
 
-        private fun isFunctionalInterface(type: PsiType): Boolean {
-            if (type !is PsiClassType) {
-                return false
-            }
+    private fun isFunctionalInterface(type: PsiType): Boolean {
+      if (type !is PsiClassType) {
+        return false
+      }
 
-            val cls = type.resolve() ?: return false
-            if (!cls.isInterface) {
-                return false
-            }
+      val cls = type.resolve() ?: return false
+      if (!cls.isInterface) {
+        return false
+      }
 
-            var abstractCount = 0
-            for (method in cls.methods) {
-                if (method.modifierList.hasModifierProperty(PsiModifier.ABSTRACT)) {
-                    abstractCount++
-                }
+      var abstractCount = 0
+      for (method in cls.methods) {
+        if (method.modifierList.hasModifierProperty(PsiModifier.ABSTRACT)) {
+          abstractCount++
+        }
+      }
+
+      if (abstractCount != 1) {
+        // Try a little harder; we don't want to count methods that are overrides
+        if (abstractCount > 1) {
+          abstractCount = 0
+          for (method in cls.methods) {
+            if (
+              method.modifierList.hasModifierProperty(PsiModifier.ABSTRACT) &&
+                !context.evaluator.isOverride(method, true)
+            ) {
+              abstractCount++
             }
+          }
+        }
 
-            if (abstractCount != 1) {
-                // Try a little harder; we don't want to count methods that are overrides
-                if (abstractCount > 1) {
-                    abstractCount = 0
-                    for (method in cls.methods) {
-                        if (method.modifierList.hasModifierProperty(PsiModifier.ABSTRACT) &&
-                                !context.evaluator.isOverride(method, true)
-                        ) {
-                            abstractCount++
-                        }
-                    }
-                }
-
-                if (abstractCount != 1) {
-                    return false
-                }
-            }
+        if (abstractCount != 1) {
+          return false
+        }
+      }
 
-            if (cls.superClass?.isInterface == true) {
-                return false
-            }
+      if (cls.superClass?.isInterface == true) {
+        return false
+      }
 
-            return true
-        }
+      return true
     }
+  }
 }
diff --git a/tools/lint/src/main/kotlin/ManifestElementHasNoExportedAttributeDetector.kt b/tools/lint/src/main/kotlin/ManifestElementHasNoExportedAttributeDetector.kt
index ac0a43e2b73..96ed21c20bf 100644
--- a/tools/lint/src/main/kotlin/ManifestElementHasNoExportedAttributeDetector.kt
+++ b/tools/lint/src/main/kotlin/ManifestElementHasNoExportedAttributeDetector.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
 
@@ -25,39 +27,48 @@ import com.android.tools.lint.detector.api.XmlContext
 import com.android.tools.lint.detector.api.XmlScanner
 import org.w3c.dom.Element
 
+@Suppress("DetectorIsMissingAnnotations")
 class ManifestElementHasNoExportedAttributeDetector : Detector(), XmlScanner {
 
-    enum class Component(val xmlName: String) {
-        ACTIVITY("activity"),
-        ACTIVITY_ALIAS("activity-alias"),
-        PROVIDER("provider"),
-        RECEIVER("receiver"),
-        SERVICE("service"),
-    }
+  enum class Component(val xmlName: String) {
+    ACTIVITY("activity"),
+    ACTIVITY_ALIAS("activity-alias"),
+    PROVIDER("provider"),
+    RECEIVER("receiver"),
+    SERVICE("service"),
+  }
 
-    companion object {
-        internal val EXPORTED_MISSING_ISSUE: Issue = Issue.create(
-                "ManifestElementHasNoExportedAttribute",
-                "`android:exported` attribute missing on element",
-                "Leaving this attribute out may unintentionally lead to an exported component, please " +
-                        "specify the value explicitly.",
-                Category.SECURITY,
-                1,
-                Severity.ERROR,
-                Implementation(ManifestElementHasNoExportedAttributeDetector::class.java, Scope.MANIFEST_SCOPE))
-    }
+  companion object {
+    internal val EXPORTED_MISSING_ISSUE: Issue =
+      Issue.create(
+        "ManifestElementHasNoExportedAttribute",
+        "`android:exported` attribute missing on element",
+        "Leaving this attribute out may unintentionally lead to an exported component, please " +
+          "specify the value explicitly.",
+        Category.SECURITY,
+        1,
+        Severity.ERROR,
+        Implementation(
+          ManifestElementHasNoExportedAttributeDetector::class.java,
+          Scope.MANIFEST_SCOPE
+        )
+      )
+  }
 
-    override fun getApplicableElements(): Collection<String>? = Component.values().map { it.xmlName }
+  override fun getApplicableElements(): Collection<String>? = Component.values().map { it.xmlName }
 
-    override fun visitElement(context: XmlContext, element: Element) {
-        val value = element.getAttributeNS(SdkConstants.ANDROID_URI, "exported")
-        value.takeIf { it.isEmpty() }?.let {
-            context.report(
-                    EXPORTED_MISSING_ISSUE,
-                    element,
-                    context.getLocation(element),
-                    "Set `android:exported` attribute explicitly. As the implicit default value " +
-                            "is insecure.")
-        }
-    }
+  override fun visitElement(context: XmlContext, element: Element) {
+    val value = element.getAttributeNS(SdkConstants.ANDROID_URI, "exported")
+    value
+      .takeIf { it.isEmpty() }
+      ?.let {
+        context.report(
+          EXPORTED_MISSING_ISSUE,
+          element,
+          context.getLocation(element),
+          "Set `android:exported` attribute explicitly. As the implicit default value " +
+            "is insecure."
+        )
+      }
+  }
 }
diff --git a/tools/lint/src/main/kotlin/NonAndroidxNullabilityDetector.kt b/tools/lint/src/main/kotlin/NonAndroidxNullabilityDetector.kt
index 7b52fd016fd..48ff04ef5b0 100644
--- a/tools/lint/src/main/kotlin/NonAndroidxNullabilityDetector.kt
+++ b/tools/lint/src/main/kotlin/NonAndroidxNullabilityDetector.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
 
@@ -35,96 +37,102 @@ import org.jetbrains.uast.UMethod
 private val NULLABLE_ANNOTATIONS = listOf("Nullable", "CheckForNull")
 private val NOT_NULL_ANNOTATIONS = listOf("NonNull", "NotNull", "Nonnull")
 
-private val ANDROIDX_ANNOTATIONS = listOf(
-        "androidx.annotation.Nullable",
-        "androidx.annotation.NonNull",
-        "android.support.annotation.Nullable",
-        "android.support.annotation.NonNull")
+private val ANDROIDX_ANNOTATIONS =
+  listOf(
+    "androidx.annotation.Nullable",
+    "androidx.annotation.NonNull",
+    "android.support.annotation.Nullable",
+    "android.support.annotation.NonNull"
+  )
 
+@Suppress("DetectorIsMissingAnnotations")
 class NonAndroidxNullabilityDetector : Detector(), SourceCodeScanner {
-    companion object Issues {
-        private val IMPLEMENTATION = Implementation(
-                NonAndroidxNullabilityDetector::class.java,
-                Scope.JAVA_FILE_SCOPE
-        )
-
-        @JvmField
-        val NON_ANDROIDX_NULLABILITY = Issue.create(
-                id = "FirebaseNonAndroidxNullability",
-                briefDescription = "Use androidx nullability annotations.",
-
-                explanation = "Use androidx nullability annotations instead.",
-                category = Category.COMPLIANCE,
-                priority = 1,
-                severity = Severity.ERROR,
-                enabledByDefault = false,
-                implementation = IMPLEMENTATION
-        )
+  companion object Issues {
+    private val IMPLEMENTATION =
+      Implementation(NonAndroidxNullabilityDetector::class.java, Scope.JAVA_FILE_SCOPE)
+
+    @JvmField
+    val NON_ANDROIDX_NULLABILITY =
+      Issue.create(
+        id = "FirebaseNonAndroidxNullability",
+        briefDescription = "Use androidx nullability annotations",
+        explanation = "Use androidx nullability annotations instead.",
+        category = Category.COMPLIANCE,
+        priority = 1,
+        severity = Severity.ERROR,
+        enabledByDefault = false,
+        implementation = IMPLEMENTATION
+      )
+  }
+
+  override fun getApplicableUastTypes(): List<Class<out UElement>>? {
+    return listOf(UClass::class.java, UMethod::class.java, UField::class.java)
+  }
+
+  override fun createUastHandler(context: JavaContext): UElementHandler? {
+    // using deprecated psi field here instead of sourcePsi because the IDE
+    // still uses older version of UAST
+    if (isKotlin(context.uastFile?.sourcePsi)) {
+      // These checks apply only to Java code
+      return null
     }
+    return Visitor(context)
+  }
 
-    override fun getApplicableUastTypes(): List<Class<out UElement>>? {
-        return listOf(UClass::class.java, UMethod::class.java, UField::class.java)
+  class Visitor(private val context: JavaContext) : UElementHandler() {
+    override fun visitClass(node: UClass) {
+      doVisit(node)
     }
 
-    override fun createUastHandler(context: JavaContext): UElementHandler? {
-        // using deprecated psi field here instead of sourcePsi because the IDE
-        // still uses older version of UAST
-        if (isKotlin(context.uastFile?.sourcePsi)) {
-            // These checks apply only to Java code
-            return null
-        }
-        return Visitor(context)
+    override fun visitMethod(node: UMethod) {
+      doVisit(node)
+      for (parameter in node.uastParameters) {
+        doVisit(parameter)
+      }
     }
 
-    class Visitor(private val context: JavaContext) : UElementHandler() {
-        override fun visitClass(node: UClass) {
-            doVisit(node)
-        }
-
-        override fun visitMethod(node: UMethod) {
-            doVisit(node)
-            for (parameter in node.uastParameters) {
-                doVisit(parameter)
-            }
-        }
-
-        override fun visitField(node: UField) {
-            doVisit(node)
-        }
-
-        private fun doVisit(node: UDeclaration) {
-            for (annotation in node.annotations) {
-                ensureAndroidNullability(context, annotation)
-            }
-        }
-
-        private fun ensureAndroidNullability(context: JavaContext, annotation: UAnnotation) {
-            val name = annotation.qualifiedName ?: return
-
-            val simpleName = name.split('.').last()
-
-            if (!isNullabilityAnnotation(simpleName) || name in ANDROIDX_ANNOTATIONS) {
-                return
-            }
-
-            val replacement = if (simpleName in NOT_NULL_ANNOTATIONS) "NonNull" else "Nullable"
-            val replacementAnnotation = "@androidx.annotation.$replacement"
-
-            val fix = LintFix.create()
-                    .replace()
-                    .name("Replace with $replacementAnnotation")
-                    .range(context.getLocation(annotation))
-                    .all()
-                    .shortenNames()
-                    .reformat(true)
-                    .with(replacementAnnotation)
-                    .build()
-
-            context.report(NON_ANDROIDX_NULLABILITY, context.getLocation(annotation),
-                    "Use androidx nullability annotations.", fix)
-        }
-
-        private fun isNullabilityAnnotation(name: String): Boolean =
-                name in NULLABLE_ANNOTATIONS || name in NOT_NULL_ANNOTATIONS
+    override fun visitField(node: UField) {
+      doVisit(node)
     }
+
+    private fun doVisit(node: UDeclaration) {
+      for (annotation in node.uAnnotations) {
+        ensureAndroidNullability(context, annotation)
+      }
+    }
+
+    private fun ensureAndroidNullability(context: JavaContext, annotation: UAnnotation) {
+      val name = annotation.qualifiedName ?: return
+
+      val simpleName = name.split('.').last()
+
+      if (!isNullabilityAnnotation(simpleName) || name in ANDROIDX_ANNOTATIONS) {
+        return
+      }
+
+      val replacement = if (simpleName in NOT_NULL_ANNOTATIONS) "NonNull" else "Nullable"
+      val replacementAnnotation = "@androidx.annotation.$replacement"
+
+      val fix =
+        LintFix.create()
+          .replace()
+          .name("Replace with $replacementAnnotation")
+          .range(context.getLocation(annotation))
+          .all()
+          .shortenNames()
+          .reformat(true)
+          .with(replacementAnnotation)
+          .build()
+
+      context.report(
+        NON_ANDROIDX_NULLABILITY,
+        context.getLocation(annotation),
+        "Use androidx nullability annotations",
+        fix
+      )
+    }
+
+    private fun isNullabilityAnnotation(name: String): Boolean =
+      name in NULLABLE_ANNOTATIONS || name in NOT_NULL_ANNOTATIONS
+  }
 }
diff --git a/tools/lint/src/main/kotlin/ProviderAssignmentDetector.kt b/tools/lint/src/main/kotlin/ProviderAssignmentDetector.kt
index c3ad7426475..76748b6a54d 100644
--- a/tools/lint/src/main/kotlin/ProviderAssignmentDetector.kt
+++ b/tools/lint/src/main/kotlin/ProviderAssignmentDetector.kt
@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
 
@@ -25,78 +27,79 @@ import com.android.tools.lint.detector.api.SourceCodeScanner
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiField
 import com.intellij.psi.PsiMethod
+import org.jetbrains.uast.UBinaryExpression
 import org.jetbrains.uast.UCallExpression
 import org.jetbrains.uast.UReferenceExpression
 import org.jetbrains.uast.getParentOfType
-import org.jetbrains.uast.java.JavaUAssignmentExpression
 
 private const val PROVIDER = "com.google.firebase.inject.Provider"
 
+@Suppress("DetectorIsMissingAnnotations")
 class ProviderAssignmentDetector : Detector(), SourceCodeScanner {
-    override fun getApplicableMethodNames() = listOf("get")
+  override fun getApplicableMethodNames() = listOf("get")
 
-    override fun visitMethodCall(context: JavaContext, node: UCallExpression, method: PsiMethod) {
-        if (!isProviderGet(method)) {
-            return
-        }
-        val assignmentExpression = node
-                .getParentOfType<JavaUAssignmentExpression>(
-                    JavaUAssignmentExpression::class.java, true)
-        val assignmentTarget = assignmentExpression?.leftOperand as? UReferenceExpression ?: return
-
-        // This would only be true if assigning the result of get(),
-        // in cases like foo = p.get().someMethod() there would be an intermediate parent
-        // and we don't want to trigger in such cases.
-        if (assignmentExpression != node.uastParent?.uastParent) {
-            return
-        }
+  override fun visitMethodCall(context: JavaContext, node: UCallExpression, method: PsiMethod) {
+    if (!isProviderGet(method)) {
+      return
+    }
+    val binaryOperation = node.getParentOfType(UBinaryExpression::class.java) ?: return
+    if (binaryOperation.operatorIdentifier?.name != "=") return
 
-        if (hasDeferredApiAnnotation(context, assignmentExpression)) {
-            return
-        }
+    val assignmentTarget = binaryOperation.leftOperand as? UReferenceExpression ?: return
 
-        assignmentTarget.resolve()?.let {
-            if (it is PsiField) {
-                context.report(
-                        INVALID_PROVIDER_ASSIGNMENT,
-                        context.getCallLocation(node, includeReceiver = false, includeArguments = true),
-                        "Provider.get() assignment to a field detected.")
-            }
-        }
+    // This would only be true if assigning the result of get(),
+    // in cases like foo = p.get().someMethod() there would be an intermediate parent
+    // and we don't want to trigger in such cases.
+    if (binaryOperation != node.uastParent?.uastParent) {
+      return
     }
 
-    private fun isProviderGet(method: PsiMethod): Boolean {
-        if (!method.parameterList.isEmpty) {
-            return false
-        }
-        (method.parent as? PsiClass)?.let {
-            return it.qualifiedName == PROVIDER
-        }
-        return false
+    if (hasDeferredApiAnnotation(context, binaryOperation)) {
+      return
     }
 
-    companion object {
-        private val IMPLEMENTATION = Implementation(
-                ProviderAssignmentDetector::class.java,
-                Scope.JAVA_FILE_SCOPE
+    assignmentTarget.resolve()?.let {
+      if (it is PsiField) {
+        context.report(
+          INVALID_PROVIDER_ASSIGNMENT,
+          context.getCallLocation(node, includeReceiver = false, includeArguments = true),
+          "`Provider.get()` assignment to a field detected"
         )
+      }
+    }
+  }
+
+  private fun isProviderGet(method: PsiMethod): Boolean {
+    if (!method.parameterList.isEmpty) {
+      return false
+    }
+    (method.parent as? PsiClass)?.let {
+      return it.qualifiedName == PROVIDER
+    }
+    return false
+  }
 
-        /** Calling methods on the wrong thread  */
-        @JvmField
-        val INVALID_PROVIDER_ASSIGNMENT = Issue.create(
-                id = "ProviderAssignment",
-                briefDescription = "Invalid use of Provider<T>",
+  companion object {
+    private val IMPLEMENTATION =
+      Implementation(ProviderAssignmentDetector::class.java, Scope.JAVA_FILE_SCOPE)
 
-                explanation = """
-                    Ensures that results of Provider.get() are not stored in class fields. Doing
-                    so may lead to bugs in the context of dynamic feature loading. Namely, optional
-                    provider dependencies can become available during the execution of the app, so
+    /** Calling methods on the wrong thread */
+    @JvmField
+    val INVALID_PROVIDER_ASSIGNMENT =
+      Issue.create(
+        id = "ProviderAssignment",
+        briefDescription = "Invalid use of Provider<T>",
+        explanation =
+          """
+                    Ensures that results of `Provider.get()` are not stored in class fields. Doing \
+                    so may lead to bugs in the context of dynamic feature loading. Namely, optional \
+                    provider dependencies can become available during the execution of the app, so \
                     dependents must be ready to handle this situation.
                 """,
-                category = Category.CORRECTNESS,
-                priority = 6,
-                severity = Severity.ERROR,
-                implementation = IMPLEMENTATION
-        )
-    }
+        category = Category.CORRECTNESS,
+        priority = 6,
+        severity = Severity.ERROR,
+        implementation = IMPLEMENTATION
+      )
+  }
 }
diff --git a/tools/lint/src/main/kotlin/TasksMainThreadDetector.kt b/tools/lint/src/main/kotlin/TasksMainThreadDetector.kt
new file mode 100644
index 00000000000..16e7474b5bd
--- /dev/null
+++ b/tools/lint/src/main/kotlin/TasksMainThreadDetector.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
+
+import com.android.tools.lint.detector.api.Category
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.Severity
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiMethod
+import com.intellij.psi.PsiParameter
+import com.intellij.psi.util.InheritanceUtil
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.UClass
+import org.jetbrains.uast.UMethod
+import org.jetbrains.uast.getParentOfType
+
+internal val GENERICS_PATTERN = Regex("<.*>")
+
+@Suppress("DetectorIsMissingAnnotations")
+class TasksMainThreadDetector : Detector(), SourceCodeScanner {
+
+  override fun getApplicableMethodNames(): List<String> =
+    listOf(
+      "addOnSuccessListener",
+      "addOnFailureListener",
+      "addOnCompleteListener",
+      "addOnCanceledListener",
+      "continueWith",
+      "continueWithTask",
+      "onSuccessTask"
+    )
+
+  override fun visitMethodCall(context: JavaContext, node: UCallExpression, method: PsiMethod) {
+    if (!isTaskMethod(method)) {
+      return
+    }
+
+    // It's ok to call from a subclass of Task as it needs to implement overloads that don't take an
+    // executor.
+    val callingClass = node.getParentOfType<UClass>()
+    if (
+      callingClass != null &&
+        InheritanceUtil.isInheritor(callingClass.javaPsi, "com.google.android.gms.tasks.Task")
+    ) {
+      val callingMethod = node.getParentOfType<UMethod>()?.javaPsi
+      if (method.isSameMethodAs(callingMethod)) {
+        return
+      }
+    }
+
+    val firstArgument: PsiParameter = method.parameterList.parameters.firstOrNull() ?: return
+    if (!firstArgument.type.equalsToText("java.util.concurrent.Executor")) {
+      context.report(
+        TASK_MAIN_THREAD,
+        context.getCallLocation(node, includeReceiver = false, includeArguments = false),
+        "Use an Executor explicitly to avoid running on the main thread."
+      )
+    }
+  }
+
+  private fun PsiMethod.isSameMethodAs(other: PsiMethod?): Boolean =
+    other != null &&
+      name == other.name &&
+      parameterList.parameters.map { it.type.toString().replace(GENERICS_PATTERN, "") } ==
+        other.parameterList.parameters.map { it.type.toString().replace(GENERICS_PATTERN, "") }
+
+  private fun isTaskMethod(method: PsiMethod): Boolean {
+    (method.parent as? PsiClass)?.let {
+      return it.qualifiedName == "com.google.android.gms.tasks.Task"
+    }
+    return false
+  }
+
+  companion object {
+    private val IMPLEMENTATION =
+      Implementation(TasksMainThreadDetector::class.java, Scope.JAVA_FILE_SCOPE)
+
+    /** Calling methods on the wrong thread */
+    @JvmField
+    val TASK_MAIN_THREAD =
+      Issue.create(
+        id = "TaskMainThread",
+        briefDescription = "Use an explicit Executor for Task continuations",
+        explanation =
+          """
+                    Not providing an executor results in continuations being executed on the main \
+                    thread, which in most cases is not intended. Please pass in an executor \
+                    explicitly.
+                """,
+        category = Category.PERFORMANCE,
+        priority = 6,
+        severity = Severity.ERROR,
+        implementation = IMPLEMENTATION
+      )
+  }
+}
diff --git a/tools/lint/src/main/kotlin/ThreadPoolDetector.kt b/tools/lint/src/main/kotlin/ThreadPoolDetector.kt
new file mode 100644
index 00000000000..0e009f36c44
--- /dev/null
+++ b/tools/lint/src/main/kotlin/ThreadPoolDetector.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
+
+import com.android.tools.lint.detector.api.Category
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.Severity
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiMethod
+import org.jetbrains.uast.UCallExpression
+
+@Suppress("DetectorIsMissingAnnotations")
+class ThreadPoolDetector : Detector(), SourceCodeScanner {
+  override fun getApplicableMethodNames(): List<String> =
+    listOf(
+      "newCachedThreadPool",
+      "newFixedThreadPool",
+      "newScheduledThreadPool",
+      "newSingleThreadExecutor",
+      "newSingleThreadScheduledExecutor",
+      "newWorkStealingPool",
+      "factory"
+    )
+
+  override fun getApplicableConstructorTypes(): List<String> =
+    listOf(
+      "java.lang.Thread",
+      "java.util.concurrent.ForkJoinPool",
+      "java.util.concurrent.ThreadPoolExecutor",
+      "java.util.concurrent.ScheduledThreadPoolExecutor",
+      "android.os.Handler"
+    )
+
+  override fun visitMethodCall(context: JavaContext, node: UCallExpression, method: PsiMethod) {
+    if (!isExecutorMethod(method) && !isPoolableFactory(method)) {
+      return
+    }
+
+    context.report(
+      THREAD_POOL_CREATION,
+      context.getCallLocation(node, includeReceiver = false, includeArguments = true),
+      "Creating thread pools is not allowed"
+    )
+  }
+
+  override fun visitConstructor(
+    context: JavaContext,
+    node: UCallExpression,
+    constructor: PsiMethod
+  ) {
+    val cls = (constructor.parent as? PsiClass) ?: return
+    if (cls.qualifiedName == "android.os.Handler") {
+      if (node.valueArgumentCount == 0) return
+      if (node.valueArguments[0].toString().endsWith("getMainLooper()")) {
+        context.report(
+          THREAD_POOL_CREATION,
+          context.getCallLocation(node, includeReceiver = false, includeArguments = true),
+          "Creating Ui thread loopers is not allowed, use a `@UiThread Executor` instead"
+        )
+      }
+    } else {
+      context.report(
+        THREAD_POOL_CREATION,
+        context.getCallLocation(node, includeReceiver = false, includeArguments = true),
+        "Creating threads or thread pools is not allowed"
+      )
+    }
+  }
+
+  private fun isExecutorMethod(method: PsiMethod): Boolean {
+    (method.parent as? PsiClass)?.let {
+      return it.qualifiedName == "java.util.concurrent.Executors"
+    }
+    return false
+  }
+
+  private fun isPoolableFactory(method: PsiMethod): Boolean {
+    if (method.name != "factory") return false
+    (method.parent as? PsiClass)?.let {
+      return it.name == "PoolableExecutors"
+    }
+    return false
+  }
+
+  companion object {
+    private val IMPLEMENTATION =
+      Implementation(ThreadPoolDetector::class.java, Scope.JAVA_FILE_SCOPE)
+
+    /** Calling methods on the wrong thread */
+    @JvmField
+    val THREAD_POOL_CREATION =
+      Issue.create(
+        id = "ThreadPoolCreation",
+        briefDescription = "Creating thread pools is not allowed",
+        explanation =
+          """
+                    Please use one of the executors provided by firebase-common.
+
+                    See: https://github.com/firebase/firebase-android-sdk/blob/master/docs/executors.md
+                """,
+        category = Category.CORRECTNESS,
+        priority = 6,
+        severity = Severity.ERROR,
+        implementation = IMPLEMENTATION
+      )
+  }
+}
diff --git a/tools/lint/src/test/kotlin/AndroidxNullabilityTests.kt b/tools/lint/src/test/kotlin/AndroidxNullabilityTests.kt
index f101e6c6875..acf69b9aeb5 100644
--- a/tools/lint/src/test/kotlin/AndroidxNullabilityTests.kt
+++ b/tools/lint/src/test/kotlin/AndroidxNullabilityTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
 
@@ -22,109 +24,123 @@ private const val EXPECTED_ERROR = "Use androidx nullability annotations"
 private const val NO_WARNINGS = "No warnings."
 
 private fun annotationSource(pkg: String, name: String): String {
-    return """
+  return """
         package $pkg;
 
         public @interface $name {}
-    """.trimIndent()
+    """
+    .trimIndent()
 }
 
 private fun javaxAnnotation(name: String): String {
-    return annotationSource("javax.annotation", name)
+  return annotationSource("javax.annotation", name)
 }
 
 private fun androidxAnnotation(name: String): String {
-    return annotationSource("androidx.annotation", name)
+  return annotationSource("androidx.annotation", name)
 }
 
-private val JAVAX_NULLABLE_CLASS = """
+private val JAVAX_NULLABLE_CLASS =
+  """
     import javax.annotation.Nullable;
     @Nullable
     class Foo {}
-""".trimIndent()
+"""
+    .trimIndent()
 
-private val ANDROIDX_NULLABLE_CLASS = """
+private val ANDROIDX_NULLABLE_CLASS =
+  """
     import androidx.annotation.Nullable;
     @Nullable
     class Foo {}
-""".trimIndent()
+"""
+    .trimIndent()
 
-private val JAVAX_NULLABLE_METHOD = """
+private val JAVAX_NULLABLE_METHOD =
+  """
     import javax.annotation.Nullable;
 
     class Foo {
       @Nullable String hello() { return null; }
     }
-""".trimIndent()
+"""
+    .trimIndent()
 
-private val ANDROIDX_NULLABLE_METHOD = """
+private val ANDROIDX_NULLABLE_METHOD =
+  """
     import androidx.annotation.Nullable;
 
     class Foo {
       @Nullable String hello() { return null; }
     }
-""".trimIndent()
+"""
+    .trimIndent()
 
-private val JAVAX_NON_NULL_METHOD_PARAMETER = """
+private val JAVAX_NON_NULL_METHOD_PARAMETER =
+  """
     import javax.annotation.Nonnull;
 
     class Foo {
       String hello(@Nonnull String bar) { return null; }
     }
-""".trimIndent()
+"""
+    .trimIndent()
 
-private val ANDROIDX_NON_NULL_METHOD_PARAMETER = """
+private val ANDROIDX_NON_NULL_METHOD_PARAMETER =
+  """
     import androidx.annotation.NonNull;
 
     class Foo {
       String hello(@NonNull String bar) { return null; }
     }
-""".trimIndent()
+"""
+    .trimIndent()
 
 class AndroidxNullabilityTests : LintDetectorTest() {
-    override fun getDetector(): Detector = NonAndroidxNullabilityDetector()
-
-    override fun getIssues(): MutableList<Issue> =
-            mutableListOf(NonAndroidxNullabilityDetector.NON_ANDROIDX_NULLABILITY)
-
-    fun testJavaxAnnotatedNullableClass() {
-        lint().files(java(JAVAX_NULLABLE_CLASS), java(javaxAnnotation("Nullable")))
-                .run()
-                .checkContains(EXPECTED_ERROR)
-    }
-
-    fun testAndroidxAnnotatedNullableClass() {
-        lint().files(
-                java(ANDROIDX_NULLABLE_CLASS), java(androidxAnnotation("Nullable")))
-                .run()
-                .checkContains(NO_WARNINGS)
-    }
-
-    fun testJavaxAnnotatedNullableMethod() {
-        lint().files(
-                java(JAVAX_NULLABLE_METHOD), java(javaxAnnotation("Nullable")))
-                .run()
-                .checkContains(EXPECTED_ERROR)
-    }
-
-    fun testAndroidxAnnotatedNullableMethod() {
-        lint().files(
-                java(ANDROIDX_NULLABLE_METHOD), java(androidxAnnotation("Nullable")))
-                .run()
-                .checkContains(NO_WARNINGS)
-    }
-
-    fun testJavaxAnnotatedNonNullMethodParameter() {
-        lint().files(
-                java(JAVAX_NON_NULL_METHOD_PARAMETER), java(javaxAnnotation("Nonnull")))
-                .run()
-                .checkContains(EXPECTED_ERROR)
-    }
-
-    fun testAndroidxAnnotatedNonNullMethodParameter() {
-        lint().files(
-                java(ANDROIDX_NON_NULL_METHOD_PARAMETER), java(androidxAnnotation("NonNull")))
-                .run()
-                .checkContains(NO_WARNINGS)
-    }
+  override fun getDetector(): Detector = NonAndroidxNullabilityDetector()
+
+  override fun getIssues(): MutableList<Issue> =
+    mutableListOf(NonAndroidxNullabilityDetector.NON_ANDROIDX_NULLABILITY)
+
+  fun testJavaxAnnotatedNullableClass() {
+    lint()
+      .files(java(JAVAX_NULLABLE_CLASS), java(javaxAnnotation("Nullable")))
+      .run()
+      .checkContains(EXPECTED_ERROR)
+  }
+
+  fun testAndroidxAnnotatedNullableClass() {
+    lint()
+      .files(java(ANDROIDX_NULLABLE_CLASS), java(androidxAnnotation("Nullable")))
+      .run()
+      .checkContains(NO_WARNINGS)
+  }
+
+  fun testJavaxAnnotatedNullableMethod() {
+    lint()
+      .files(java(JAVAX_NULLABLE_METHOD), java(javaxAnnotation("Nullable")))
+      .run()
+      .checkContains(EXPECTED_ERROR)
+  }
+
+  fun testAndroidxAnnotatedNullableMethod() {
+    lint()
+      .files(java(ANDROIDX_NULLABLE_METHOD), java(androidxAnnotation("Nullable")))
+      .run()
+      .checkContains(NO_WARNINGS)
+  }
+
+  fun testJavaxAnnotatedNonNullMethodParameter() {
+    lint()
+      .files(java(JAVAX_NON_NULL_METHOD_PARAMETER), java(javaxAnnotation("Nonnull")))
+      .run()
+      .checkContains(EXPECTED_ERROR)
+  }
+
+  fun testAndroidxAnnotatedNonNullMethodParameter() {
+    lint()
+      .files(java(ANDROIDX_NON_NULL_METHOD_PARAMETER), java(androidxAnnotation("NonNull")))
+      .run()
+      .checkContains(NO_WARNINGS)
+  }
 }
diff --git a/tools/lint/src/test/kotlin/DeferredApiDetectorTests.kt b/tools/lint/src/test/kotlin/DeferredApiDetectorTests.kt
index bc206a1a4eb..a4d9dcdfa8c 100644
--- a/tools/lint/src/test/kotlin/DeferredApiDetectorTests.kt
+++ b/tools/lint/src/test/kotlin/DeferredApiDetectorTests.kt
@@ -1,32 +1,35 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
 
 import com.android.tools.lint.checks.infrastructure.LintDetectorTest
 
 fun annotationSource(): String {
-    return """
+  return """
         package com.google.firebase.annotations;
 
         @Inherited
         public @interface DeferredApi {}
-    """.trimIndent()
+    """
+    .trimIndent()
 }
 
 fun deferredSource(): String {
-    return """
+  return """
         package com.google.firebase.inject;
         import com.google.firebase.annotations.DeferredApi;
 
@@ -38,52 +41,63 @@ fun deferredSource(): String {
 
         void whenAvailable(@NonNull DeferredHandler<T> handler);
       }
-    """.trimIndent()
+    """
+    .trimIndent()
 }
 
 fun providerSource(): String {
-    return """
+  return """
         package com.google.firebase.inject;
 
         public interface Provider<T> {
           T get();
         }
-    """.trimIndent()
+    """
+    .trimIndent()
 }
 
-fun annotatedInterface() = """
+fun annotatedInterface() =
+  """
             import com.google.firebase.annotations.DeferredApi;
             
             interface MyApi {
               @DeferredApi void myMethod();
             }
-        """.trimIndent()
+        """
+    .trimIndent()
 
 class DeferredApiDetectorTests : LintDetectorTest() {
-    override fun getDetector() = DeferredApiDetector()
+  override fun getDetector() = DeferredApiDetector()
 
-    override fun getIssues() = mutableListOf(DeferredApiDetector.INVALID_DEFERRED_API_USE)
+  override fun getIssues() = mutableListOf(DeferredApiDetector.INVALID_DEFERRED_API_USE)
 
-    fun test_directUseOfDeferredApiMethodInConstructor_shouldFail() {
-        lint().files(
-                java(annotationSource()),
-                java(annotatedInterface()),
-                java("""
+  fun test_directUseOfDeferredApiMethodInConstructor_shouldFail() {
+    lint()
+      .files(
+        java(annotationSource()),
+        java(annotatedInterface()),
+        java(
+          """
                      class UseOfMyApi {
                        UseOfMyApi(MyApi api) {
                          api.myMethod();
                        }
                      }
-                     """.trimIndent()))
-                .run()
-                .checkContains("myMethod is only safe to call")
-    }
-
-    fun test_directUseOfDeferredApiMethodInMethodThroughField_shouldFail() {
-        lint().files(
-                java(annotationSource()),
-                java(annotatedInterface()),
-                java("""
+                     """
+            .trimIndent()
+        )
+      )
+      .run()
+      .checkContains("myMethod is only safe to call")
+  }
+
+  fun test_directUseOfDeferredApiMethodInMethodThroughField_shouldFail() {
+    lint()
+      .files(
+        java(annotationSource()),
+        java(annotatedInterface()),
+        java(
+          """
                      class UseOfMyApi {
                        private final MyApi api;
                        UseOfMyApi(MyApi api) {
@@ -94,18 +108,23 @@ class DeferredApiDetectorTests : LintDetectorTest() {
                          api.myMethod();
                        }
                      }
-                     """.trimIndent()))
-                .run()
-                .checkContains("myMethod is only safe to call")
-    }
-
-    fun test_whenAvailableUseOfDeferredApiMethodThroughFieldInLambda_shouldSucceed() {
-        lint().files(
-                java(annotationSource()),
-                java(deferredSource()),
-                java(providerSource()),
-                java(annotatedInterface()),
-                java("""
+                     """
+            .trimIndent()
+        )
+      )
+      .run()
+      .checkContains("myMethod is only safe to call")
+  }
+
+  fun test_whenAvailableUseOfDeferredApiMethodThroughFieldInLambda_shouldSucceed() {
+    lint()
+      .files(
+        java(annotationSource()),
+        java(deferredSource()),
+        java(providerSource()),
+        java(annotatedInterface()),
+        java(
+          """
                      import com.google.firebase.inject.Deferred;
                      class UseOfMyApi {
                        private final Deferred<MyApi> api;
@@ -117,18 +136,23 @@ class DeferredApiDetectorTests : LintDetectorTest() {
                              apiProvider.get().myMethod());
                        }
                      }
-                     """.trimIndent()))
-                .run()
-                .expectClean()
-    }
-
-    fun test_whenAvailableUseOfDeferredApiMethodThroughFieldInAnonymousClass_shouldSucceed() {
-        lint().files(
-                java(annotationSource()),
-                java(deferredSource()),
-                java(providerSource()),
-                java(annotatedInterface()),
-                java("""
+                     """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
+
+  fun test_whenAvailableUseOfDeferredApiMethodThroughFieldInAnonymousClass_shouldSucceed() {
+    lint()
+      .files(
+        java(annotationSource()),
+        java(deferredSource()),
+        java(providerSource()),
+        java(annotatedInterface()),
+        java(
+          """
                      import com.google.firebase.inject.Deferred;
                      import com.google.firebase.inject.Provider;
                      class UseOfMyApi {
@@ -144,18 +168,23 @@ class DeferredApiDetectorTests : LintDetectorTest() {
                          });
                        }
                      }
-                     """.trimIndent()))
-                .run()
-                .expectClean()
-    }
-
-    fun test_whenAvailableUseOfDeferredApiMethodInConstructorInLambda_shouldSucceed() {
-        lint().files(
-                java(annotationSource()),
-                java(deferredSource()),
-                java(providerSource()),
-                java(annotatedInterface()),
-                java("""
+                     """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
+
+  fun test_whenAvailableUseOfDeferredApiMethodInConstructorInLambda_shouldSucceed() {
+    lint()
+      .files(
+        java(annotationSource()),
+        java(deferredSource()),
+        java(providerSource()),
+        java(annotatedInterface()),
+        java(
+          """
                      import com.google.firebase.inject.Deferred;
                      class UseOfMyApi {
                        UseOfMyApi(Deferred<MyApi> api) {
@@ -163,18 +192,23 @@ class DeferredApiDetectorTests : LintDetectorTest() {
                              apiProvider.get().myMethod());
                        }
                      }
-                     """.trimIndent()))
-                .run()
-                .expectClean()
-    }
-
-    fun test_whenAvailableUseOfDeferredApiMethodThatCallsToAnotherDeferredApi_shouldSucceed() {
-        lint().files(
-                java(annotationSource()),
-                java(deferredSource()),
-                java(providerSource()),
-                java(annotatedInterface()),
-                java("""
+                     """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
+
+  fun test_whenAvailableUseOfDeferredApiMethodThatCallsToAnotherDeferredApi_shouldSucceed() {
+    lint()
+      .files(
+        java(annotationSource()),
+        java(deferredSource()),
+        java(providerSource()),
+        java(annotatedInterface()),
+        java(
+          """
                      import com.google.firebase.annotations.DeferredApi;
                      import com.google.firebase.inject.Deferred;
                      class UseOfMyApi {
@@ -189,18 +223,23 @@ class DeferredApiDetectorTests : LintDetectorTest() {
                          api.myMethod();
                        }
                      }
-                     """.trimIndent()))
-                .run()
-                .expectClean()
-    }
-
-    fun test_whenAvailableUseOfRegularMethodThatCallsToAnotherDeferredApi_shouldFail() {
-        lint().files(
-                java(annotationSource()),
-                java(deferredSource()),
-                java(providerSource()),
-                java(annotatedInterface()),
-                java("""
+                     """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
+
+  fun test_whenAvailableUseOfRegularMethodThatCallsToAnotherDeferredApi_shouldFail() {
+    lint()
+      .files(
+        java(annotationSource()),
+        java(deferredSource()),
+        java(providerSource()),
+        java(annotatedInterface()),
+        java(
+          """
                      import com.google.firebase.annotations.DeferredApi;
                      import com.google.firebase.inject.Deferred;
                      class UseOfMyApi {
@@ -214,8 +253,11 @@ class DeferredApiDetectorTests : LintDetectorTest() {
                          api.myMethod();
                        }
                      }
-                     """.trimIndent()))
-                .run()
-                .checkContains("myMethod is only safe to call")
-    }
+                     """
+            .trimIndent()
+        )
+      )
+      .run()
+      .checkContains("myMethod is only safe to call")
+  }
 }
diff --git a/tools/lint/src/test/kotlin/FirebaseAppGetDetectorTests.kt b/tools/lint/src/test/kotlin/FirebaseAppGetDetectorTests.kt
new file mode 100644
index 00000000000..535c9c2befa
--- /dev/null
+++ b/tools/lint/src/test/kotlin/FirebaseAppGetDetectorTests.kt
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
+
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Issue
+
+private val FIREBASE_APP =
+  """
+    package com.google.firebase;
+    
+    public class FirebaseApp {
+      public <T> T get(Class<T> t) {
+        return null;
+      }
+      
+      public static FirebaseApp getInstance() {
+        return null;
+      }
+    }
+"""
+    .trimIndent()
+
+class FirebaseAppGetDetectorTests : LintDetectorTest() {
+  override fun getDetector(): Detector = FirebaseAppGetDetector()
+
+  override fun getIssues(): MutableList<Issue> = mutableListOf(FirebaseAppGetDetector.ISSUE)
+
+  fun test_app_get_from_getInstance_shouldNotFail() {
+    lint()
+      .files(
+        java(FIREBASE_APP),
+        java(
+          """
+            import com.google.firebase.FirebaseApp;
+            
+            public class Foo {
+              public static Foo getInstance(FirebaseApp app) {
+                return app.get(Foo.class);
+              } 
+            }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
+
+  fun test_app_get_from_getInstance_returningSubclass_shouldNotFail() {
+    lint()
+      .files(
+        java(FIREBASE_APP),
+        java(
+          """
+            import com.google.firebase.FirebaseApp;
+            
+            public class Foo {
+              public static FooImpl getInstance(FirebaseApp app) {
+                return app.get(FooImpl.class);
+              } 
+            }
+            class FooImpl extends Foo {}
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
+
+  fun test_app_get_from_getInstance_withWrongReturnType_shouldFail() {
+    lint()
+      .files(
+        java(FIREBASE_APP),
+        java(
+          """
+            import com.google.firebase.FirebaseApp;
+            
+            public class Foo {
+              public static String getInstance(FirebaseApp app) {
+                app.get(Foo.class);
+                return "";
+              } 
+            }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .checkContains("Use of FirebaseApp#get(Class) is discouraged")
+  }
+
+  fun test_app_get_from_getInstance_shouldNotFail_kotlin() {
+    lint()
+      .files(
+        java(FIREBASE_APP),
+        kotlin(
+          """
+            import com.google.firebase.FirebaseApp
+            
+            class Foo {
+              companion object {
+                @JvmStatic
+                val instance = FirebaseApp.getInstance().get(Foo::class.java)
+
+                @JvmStatic
+                fun getInstance(app: FirebaseApp) = app.get(Foo::class.java)
+              }
+            }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
+
+  fun test_app_get_from_getInstance_returningSubclass_shouldNotFail_kotlin() {
+    lint()
+      .files(
+        java(FIREBASE_APP),
+        kotlin(
+          """
+            import com.google.firebase.FirebaseApp
+            
+            class Foo {
+              companion object {
+                @JvmStatic
+                val instance = FirebaseApp.getInstance().get(FooImpl::class.java)
+
+                @JvmStatic
+                fun getInstance(app: FirebaseApp) = app.get(FooImpl::class.java)
+              }
+            }
+            class FooImpl : Foo()
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
+
+  fun test_app_get_from_getInstance_withWrongReturnType_shouldFail_kotlin() {
+    lint()
+      .files(
+        java(FIREBASE_APP),
+        kotlin(
+          """
+            import com.google.firebase.FirebaseApp;
+            
+            class Foo {
+              companion object {
+
+                @JvmStatic
+                fun getInstance(app: FirebaseApp) = "".also { app.get(Foo::class.java) }
+              }
+            }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .checkContains("Use of FirebaseApp#get(Class) is discouraged")
+  }
+}
diff --git a/tools/lint/src/test/kotlin/ManifestTests.kt b/tools/lint/src/test/kotlin/ManifestTests.kt
index c790de20101..ba976c394e7 100644
--- a/tools/lint/src/test/kotlin/ManifestTests.kt
+++ b/tools/lint/src/test/kotlin/ManifestTests.kt
@@ -1,16 +1,18 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
 
@@ -23,12 +25,14 @@ import com.google.firebase.lint.checks.ManifestElementHasNoExportedAttributeDete
 import java.lang.AssertionError
 
 internal fun manifestWith(cmp: Component, exported: Boolean? = null): String {
-    val exportedStr = when (exported) {
-        true, false -> "android:exported=\"$exported\""
-        null -> ""
+  val exportedStr =
+    when (exported) {
+      true,
+      false -> "android:exported=\"$exported\""
+      null -> ""
     }
 
-    return """
+  return """
             <manifest
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 package="com.example.lib">
@@ -36,46 +40,44 @@ internal fun manifestWith(cmp: Component, exported: Boolean? = null): String {
                 <${cmp.xmlName} android:name="foo" $exportedStr/>
             </application>
             </manifest>
-            """.trimIndent()
+            """
+    .trimIndent()
 }
 
 fun TestLintResult.checkContains(expected: String) {
-    this.check(TestResultChecker { output ->
-        if (!output.contains(expected)) {
-            throw AssertionError("Expected:<[$expected]>, but was:<[$output]>")
-        }
-    })
+  this.check(
+    TestResultChecker { output ->
+      if (!output.contains(expected)) {
+        throw AssertionError("Expected:<[$expected]>, but was:<[$output]>")
+      }
+    }
+  )
 }
 
 class Test : LintDetectorTest() {
-    fun testComponents_withNoExportedAttr_shouldFail() {
-        Component.values().forEach {
-            lint().files(
-                    manifest(manifestWith(it)))
-                    .run()
-                    .checkContains("Error: Set android:exported attribute explicitly")
-        }
+  fun testComponents_withNoExportedAttr_shouldFail() {
+    Component.values().forEach {
+      lint()
+        .files(manifest(manifestWith(it)))
+        .run()
+        .checkContains("Error: Set android:exported attribute explicitly")
     }
+  }
 
-    fun testComponents_withExportedAttrTrue_shouldSucceed() {
-        Component.values().forEach {
-            lint().files(
-                    manifest(manifestWith(it, true)))
-                    .run()
-                    .expectClean()
-        }
+  fun testComponents_withExportedAttrTrue_shouldSucceed() {
+    Component.values().forEach {
+      lint().files(manifest(manifestWith(it, true))).run().expectClean()
     }
+  }
 
-    fun testComponents_withExportedAttrFalse_shouldSucceed() {
-        Component.values().forEach {
-            lint().files(
-                    manifest(manifestWith(it, false)))
-                    .run()
-                    .expectClean()
-        }
+  fun testComponents_withExportedAttrFalse_shouldSucceed() {
+    Component.values().forEach {
+      lint().files(manifest(manifestWith(it, false))).run().expectClean()
     }
+  }
 
-    override fun getDetector(): Detector = ManifestElementHasNoExportedAttributeDetector()
+  override fun getDetector(): Detector = ManifestElementHasNoExportedAttributeDetector()
 
-    override fun getIssues(): MutableList<Issue> = mutableListOf(ManifestElementHasNoExportedAttributeDetector.EXPORTED_MISSING_ISSUE)
+  override fun getIssues(): MutableList<Issue> =
+    mutableListOf(ManifestElementHasNoExportedAttributeDetector.EXPORTED_MISSING_ISSUE)
 }
diff --git a/tools/lint/src/test/kotlin/ProviderAssignmentDetectorTests.kt b/tools/lint/src/test/kotlin/ProviderAssignmentDetectorTests.kt
index 9c5aac13ade..b876302666a 100644
--- a/tools/lint/src/test/kotlin/ProviderAssignmentDetectorTests.kt
+++ b/tools/lint/src/test/kotlin/ProviderAssignmentDetectorTests.kt
@@ -1,29 +1,34 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT 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 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
 
 import com.android.tools.lint.checks.infrastructure.LintDetectorTest
 
 class ProviderAssignmentDetectorTests : LintDetectorTest() {
-    override fun getDetector() = ProviderAssignmentDetector()
+  override fun getDetector() = ProviderAssignmentDetector()
 
-    override fun getIssues() = mutableListOf(
-            ProviderAssignmentDetector.INVALID_PROVIDER_ASSIGNMENT)
+  override fun getIssues() = mutableListOf(ProviderAssignmentDetector.INVALID_PROVIDER_ASSIGNMENT)
 
-    fun test_assignmentToClassField_shouldFail() {
-        lint().files(java(providerSource()), java("""
+  fun test_assignmentToClassField_shouldFail() {
+    lint()
+      .files(
+        java(providerSource()),
+        java(
+          """
             import com.google.firebase.inject.Provider;
             
             class Foo {
@@ -32,13 +37,20 @@ class ProviderAssignmentDetectorTests : LintDetectorTest() {
                 this.value = p.get();
               }
             }
-        """.trimIndent()))
-                .run()
-                .checkContains("Provider.get() assignment")
-    }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .checkContains("Provider.get() assignment")
+  }
 
-    fun test_assignmentAndUseOfProvider_shouldSucceed() {
-        lint().files(java(providerSource()), java("""
+  fun test_assignmentAndUseOfProvider_shouldSucceed() {
+    lint()
+      .files(
+        java(providerSource()),
+        java(
+          """
             import com.google.firebase.inject.Provider;
             
             class Foo {
@@ -50,13 +62,20 @@ class ProviderAssignmentDetectorTests : LintDetectorTest() {
                 String value = p.get();
               }
             }
-        """.trimIndent()))
-                .run()
-                .expectClean()
-    }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
 
-    fun test_assignmentFromAStoredProvider_shouldFail() {
-        lint().files(java(providerSource()), java("""
+  fun test_assignmentFromAStoredProvider_shouldFail() {
+    lint()
+      .files(
+        java(providerSource()),
+        java(
+          """
             import com.google.firebase.inject.Provider;
             
             class Foo {
@@ -69,13 +88,20 @@ class ProviderAssignmentDetectorTests : LintDetectorTest() {
                 value = p.get();
               }
             }
-        """.trimIndent()))
-                .run()
-                .checkContains("Provider.get() assignment")
-    }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .checkContains("Provider.get() assignment")
+  }
 
-    fun test_assignmentToLocalVariable_shouldSucceed() {
-        lint().files(java(providerSource()), java("""
+  fun test_assignmentToLocalVariable_shouldSucceed() {
+    lint()
+      .files(
+        java(providerSource()),
+        java(
+          """
             import com.google.firebase.inject.Provider;
             
             class Foo {
@@ -83,13 +109,20 @@ class ProviderAssignmentDetectorTests : LintDetectorTest() {
                 String value = p.get();
               }
             }
-        """.trimIndent()))
-                .run()
-                .expectClean()
-    }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
 
-    fun test_assignmentOfAPropertyOrMethodOfTheProvidedObject_shouldSucceed() {
-        lint().files(java(providerSource()), java("""
+  fun test_assignmentOfAPropertyOrMethodOfTheProvidedObject_shouldSucceed() {
+    lint()
+      .files(
+        java(providerSource()),
+        java(
+          """
             import com.google.firebase.inject.Provider;
 
             class Foo {
@@ -100,17 +133,22 @@ class ProviderAssignmentDetectorTests : LintDetectorTest() {
                 s = p.get().toString();
               }
             }
-        """.trimIndent()))
-                .run()
-                .expectClean()
-    }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
 
-    fun test_assignmentFromWithinADeferredApiMethod_shouldSucceed() {
-        lint().files(
-                java(providerSource()),
-                java(annotationSource()),
-                java(deferredSource()),
-                java("""
+  fun test_assignmentFromWithinADeferredApiMethod_shouldSucceed() {
+    lint()
+      .files(
+        java(providerSource()),
+        java(annotationSource()),
+        java(deferredSource()),
+        java(
+          """
                     import com.google.firebase.inject.Deferred;
                     class Foo {
                         private String s;
@@ -120,8 +158,11 @@ class ProviderAssignmentDetectorTests : LintDetectorTest() {
                           });
                         }
                     }
-                """.trimIndent()))
-                .run()
-                .expectClean()
-    }
+                """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
 }
diff --git a/tools/lint/src/test/kotlin/TasksMainThreadDetectorTests.kt b/tools/lint/src/test/kotlin/TasksMainThreadDetectorTests.kt
new file mode 100644
index 00000000000..8bdb8fcd1ba
--- /dev/null
+++ b/tools/lint/src/test/kotlin/TasksMainThreadDetectorTests.kt
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 com.google.firebase.lint.checks
+
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Issue
+
+fun taskSource(): String {
+  return """
+        package com.google.android.gms.tasks;
+        
+        import java.util.concurrent.Executor;
+
+        public interface Task<TResult> {
+          Task<TResult> continueWith(Executor executor, String dummy);
+          Task<TResult> continueWith(String dummy);
+        }
+    """
+    .trimIndent()
+}
+
+class TasksMainThreadDetectorTests : LintDetectorTest() {
+  override fun getDetector(): Detector = TasksMainThreadDetector()
+
+  override fun getIssues(): MutableList<Issue> =
+    mutableListOf(TasksMainThreadDetector.TASK_MAIN_THREAD)
+
+  fun test_continueWith_withoutExecutor_shouldFail() {
+    lint()
+      .files(
+        java(taskSource()),
+        java(
+          """
+            import com.google.android.gms.tasks.Task;
+            class Hello {
+              public static Task<String> useTask(Task<String> task) {
+                return task.continueWith("hello");
+              }
+            }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .checkContains("Use an Executor explicitly to avoid running on the main thread")
+  }
+
+  fun test_continueWith_withExecutor_shouldSucceed() {
+    lint()
+      .files(
+        java(taskSource()),
+        java(
+          """
+            import com.google.android.gms.tasks.Task;
+            import java.util.concurrent.Executor;
+            class Hello {
+              public static Task<String> useTask(Executor executor, Task<String> task) {
+                return task.continueWith(executor, "hello");
+              }
+            }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
+
+  fun test_continueWith_withoutExecutor_whileImplementingOverload_shouldSucceed() {
+    lint()
+      .files(
+        java(taskSource()),
+        java(
+          """
+            import com.google.android.gms.tasks.Task;
+            import java.util.concurrent.Executor;
+            class Hello<TResult> implements Task<TResult> {
+              private final Task<TResult> delegate;
+              
+              Hello(Task<TResult> delegate) { this.delegate = delegate;}
+
+              @Override
+              public Task<TResult> continueWith(Executor executor, String dummy) {
+                return delegate.continueWith(executor, dummy);
+              }
+              public Task<TResult> continueWith(String dummy) {
+                return delegate.continueWith(dummy);
+              }
+            }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .expectClean()
+  }
+
+  fun test_continueWith_withoutExecutor_fromWrongOverload_shouldFail() {
+    lint()
+      .files(
+        java(taskSource()),
+        java(
+          """
+            import com.google.android.gms.tasks.Task;
+            import java.util.concurrent.Executor;
+            class Hello<TResult> implements Task<TResult> {
+              private final Task<TResult> delegate;
+              
+              Hello(Task<TResult> delegate) { this.delegate = delegate;}
+
+              @Override
+              public Task<TResult> continueWith(Executor executor, String dummy) {
+                return delegate.continueWith(dummy);
+              }
+              public Task<TResult> continueWith(String dummy) {
+                return delegate.continueWith(dummy);
+              }
+            }
+        """
+            .trimIndent()
+        )
+      )
+      .run()
+      .checkContains("Use an Executor explicitly to avoid running on the main thread")
+  }
+}
diff --git a/transport/transport-api/CHANGELOG.md b/transport/transport-api/CHANGELOG.md
new file mode 100644
index 00000000000..6fb2fc61402
--- /dev/null
+++ b/transport/transport-api/CHANGELOG.md
@@ -0,0 +1,8 @@
+# Unreleased
+
+
+# 3.2.0
+* [feature] Added new APIs to support passing extra context when logging an event.
+
+# 3.1.0
+* [feature] Added new APIs to support passing a product id when logging an event.
diff --git a/transport/transport-api/gradle.properties b/transport/transport-api/gradle.properties
index b2fccaa1fa5..35913a4611f 100644
--- a/transport/transport-api/gradle.properties
+++ b/transport/transport-api/gradle.properties
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=3.0.1
-latestReleasedVersion=3.0.0
+version=4.0.0
+latestReleasedVersion=3.2.0
diff --git a/transport/transport-api/src/main/AndroidManifest.xml b/transport/transport-api/src/main/AndroidManifest.xml
index a78162ff8b6..68345ceb8a9 100644
--- a/transport/transport-api/src/main/AndroidManifest.xml
+++ b/transport/transport-api/src/main/AndroidManifest.xml
@@ -13,8 +13,7 @@
 <!-- limitations under the License. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-
-    package="com.google.android.datatransport">
+          package="com.google.android.datatransport">
   <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="14"/>-->
+  <!--<uses-sdk android:minSdkVersion="21"/>-->
 </manifest>
diff --git a/transport/transport-api/src/main/java/com/google/android/datatransport/Event.java b/transport/transport-api/src/main/java/com/google/android/datatransport/Event.java
index a53f74dad05..7a4db3257fb 100644
--- a/transport/transport-api/src/main/java/com/google/android/datatransport/Event.java
+++ b/transport/transport-api/src/main/java/com/google/android/datatransport/Event.java
@@ -26,27 +26,111 @@ public abstract class Event<T> {
 
   public abstract Priority getPriority();
 
+  @Nullable
+  public abstract ProductData getProductData();
+
+  @Nullable
+  public abstract EventContext getEventContext();
+
+  public static <T> Event<T> ofData(
+      int code, T payload, @Nullable ProductData productData, @Nullable EventContext eventContext) {
+    return new AutoValue_Event<>(code, payload, Priority.DEFAULT, productData, eventContext);
+  }
+
+  public static <T> Event<T> ofData(int code, T payload, @Nullable ProductData productData) {
+    return new AutoValue_Event<>(code, payload, Priority.DEFAULT, productData, null);
+  }
+
+  public static <T> Event<T> ofData(int code, T payload, @Nullable EventContext eventContext) {
+    return new AutoValue_Event<>(code, payload, Priority.DEFAULT, null, eventContext);
+  }
+
   public static <T> Event<T> ofData(int code, T payload) {
-    return new AutoValue_Event<>(code, payload, Priority.DEFAULT);
+    return new AutoValue_Event<>(code, payload, Priority.DEFAULT, null, null);
+  }
+
+  public static <T> Event<T> ofData(
+      T payload, @Nullable ProductData productData, @Nullable EventContext eventContext) {
+    return new AutoValue_Event<>(null, payload, Priority.DEFAULT, productData, eventContext);
+  }
+
+  public static <T> Event<T> ofData(T payload, @Nullable ProductData productData) {
+    return new AutoValue_Event<>(null, payload, Priority.DEFAULT, productData, null);
+  }
+
+  public static <T> Event<T> ofData(T payload, @Nullable EventContext eventContext) {
+    return new AutoValue_Event<>(null, payload, Priority.DEFAULT, null, eventContext);
   }
 
   public static <T> Event<T> ofData(T payload) {
-    return new AutoValue_Event<>(null, payload, Priority.DEFAULT);
+    return new AutoValue_Event<>(null, payload, Priority.DEFAULT, null, null);
+  }
+
+  public static <T> Event<T> ofTelemetry(
+      int code, T value, @Nullable ProductData productData, @Nullable EventContext eventContext) {
+    return new AutoValue_Event<>(code, value, Priority.VERY_LOW, productData, eventContext);
+  }
+
+  public static <T> Event<T> ofTelemetry(int code, T value, @Nullable ProductData productData) {
+    return new AutoValue_Event<>(code, value, Priority.VERY_LOW, productData, null);
+  }
+
+  public static <T> Event<T> ofTelemetry(int code, T value, @Nullable EventContext eventContext) {
+    return new AutoValue_Event<>(code, value, Priority.VERY_LOW, null, eventContext);
   }
 
   public static <T> Event<T> ofTelemetry(int code, T value) {
-    return new AutoValue_Event<>(code, value, Priority.VERY_LOW);
+    return new AutoValue_Event<>(code, value, Priority.VERY_LOW, null, null);
+  }
+
+  public static <T> Event<T> ofTelemetry(
+      T value, @Nullable ProductData productData, @Nullable EventContext eventContext) {
+    return new AutoValue_Event<>(null, value, Priority.VERY_LOW, productData, eventContext);
+  }
+
+  public static <T> Event<T> ofTelemetry(T value, @Nullable ProductData productData) {
+    return new AutoValue_Event<>(null, value, Priority.VERY_LOW, productData, null);
+  }
+
+  public static <T> Event<T> ofTelemetry(T value, @Nullable EventContext eventContext) {
+    return new AutoValue_Event<>(null, value, Priority.VERY_LOW, null, eventContext);
   }
 
   public static <T> Event<T> ofTelemetry(T value) {
-    return new AutoValue_Event<>(null, value, Priority.VERY_LOW);
+    return new AutoValue_Event<>(null, value, Priority.VERY_LOW, null, null);
+  }
+
+  public static <T> Event<T> ofUrgent(
+      int code, T value, @Nullable ProductData productData, @Nullable EventContext eventContext) {
+    return new AutoValue_Event<>(code, value, Priority.HIGHEST, productData, eventContext);
+  }
+
+  public static <T> Event<T> ofUrgent(int code, T value, @Nullable ProductData productData) {
+    return new AutoValue_Event<>(code, value, Priority.HIGHEST, productData, null);
+  }
+
+  public static <T> Event<T> ofUrgent(int code, T value, @Nullable EventContext eventContext) {
+    return new AutoValue_Event<>(code, value, Priority.HIGHEST, null, eventContext);
   }
 
   public static <T> Event<T> ofUrgent(int code, T value) {
-    return new AutoValue_Event<>(code, value, Priority.HIGHEST);
+    return new AutoValue_Event<>(code, value, Priority.HIGHEST, null, null);
+  }
+
+  public static <T> Event<T> ofUrgent(
+      T value, @Nullable ProductData productData, @Nullable EventContext eventContext) {
+    return new AutoValue_Event<>(null, value, Priority.HIGHEST, productData, eventContext);
+  }
+
+  public static <T> Event<T> ofUrgent(T value, @Nullable ProductData productData) {
+    return new AutoValue_Event<>(null, value, Priority.HIGHEST, productData, null);
+  }
+
+  public static <T> Event<T> ofUrgent(T value, @Nullable EventContext eventContext) {
+    return new AutoValue_Event<>(null, value, Priority.HIGHEST, null, eventContext);
   }
 
   public static <T> Event<T> ofUrgent(T value) {
-    return new AutoValue_Event<>(null, value, Priority.HIGHEST);
+    return new AutoValue_Event<>(null, value, Priority.HIGHEST, null, null);
   }
 }
diff --git a/transport/transport-api/src/main/java/com/google/android/datatransport/EventContext.java b/transport/transport-api/src/main/java/com/google/android/datatransport/EventContext.java
new file mode 100644
index 00000000000..a330894eb7e
--- /dev/null
+++ b/transport/transport-api/src/main/java/com/google/android/datatransport/EventContext.java
@@ -0,0 +1,52 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.android.datatransport;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.auto.value.AutoValue;
+
+@AutoValue
+public abstract class EventContext {
+  @Nullable
+  public abstract String getPseudonymousId();
+
+  @Nullable
+  @SuppressWarnings("mutable")
+  public abstract byte[] getExperimentIdsClear();
+
+  @Nullable
+  @SuppressWarnings("mutable")
+  public abstract byte[] getExperimentIdsEncrypted();
+
+  public static Builder builder() {
+    return new AutoValue_EventContext.Builder();
+  }
+
+  @AutoValue.Builder
+  public abstract static class Builder {
+    @NonNull
+    public abstract Builder setPseudonymousId(String value);
+
+    @NonNull
+    public abstract Builder setExperimentIdsClear(byte[] value);
+
+    @NonNull
+    public abstract Builder setExperimentIdsEncrypted(byte[] value);
+
+    @NonNull
+    public abstract EventContext build();
+  }
+}
diff --git a/tools/errorprone/src/test/java/com/google/firebase/FirebaseApp.java b/transport/transport-api/src/main/java/com/google/android/datatransport/ProductData.java
similarity index 60%
rename from tools/errorprone/src/test/java/com/google/firebase/FirebaseApp.java
rename to transport/transport-api/src/main/java/com/google/android/datatransport/ProductData.java
index c1b2beafa88..9d16162ffbf 100644
--- a/tools/errorprone/src/test/java/com/google/firebase/FirebaseApp.java
+++ b/transport/transport-api/src/main/java/com/google/android/datatransport/ProductData.java
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,11 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase;
+package com.google.android.datatransport;
 
-/** Fake FirebaseApp for testing purposes. */
-public class FirebaseApp {
-  public <T> T get(Class<T> anInterface) {
-    return null;
+import androidx.annotation.Nullable;
+import com.google.auto.value.AutoValue;
+
+@AutoValue
+public abstract class ProductData {
+  @Nullable
+  public abstract Integer getProductId();
+
+  public static ProductData withProductId(@Nullable Integer productId) {
+    return new AutoValue_ProductData(productId);
   }
 }
diff --git a/transport/transport-api/transport-api.gradle b/transport/transport-api/transport-api.gradle
index bdb5379d4be..713756de1e6 100644
--- a/transport/transport-api/transport-api.gradle
+++ b/transport/transport-api/transport-api.gradle
@@ -18,12 +18,14 @@ plugins {
 
 firebaseLibrary{
     publishJavadoc = false
+    publishReleaseNotes = false
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.android.datatransport"    
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'proguard.txt'
@@ -36,9 +38,12 @@ android {
 }
 
 dependencies {
-    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.6'
     implementation 'androidx.annotation:annotation:1.1.0'
+
+    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.6'
+
     annotationProcessor "com.google.auto.value:auto-value:1.6.5"
-    testImplementation 'junit:junit:4.13-beta-3'
+
     testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'junit:junit:4.13-beta-3'
 }
diff --git a/transport/transport-backend-cct/CHANGELOG.md b/transport/transport-backend-cct/CHANGELOG.md
new file mode 100644
index 00000000000..0488ebf1219
--- /dev/null
+++ b/transport/transport-backend-cct/CHANGELOG.md
@@ -0,0 +1,8 @@
+# Unreleased
+
+
+# 3.3.0
+* [feature] Added support for additional event context.
+
+# 3.2.0
+* [feature] Added support for product id.
diff --git a/transport/transport-backend-cct/gradle.properties b/transport/transport-backend-cct/gradle.properties
index 083884cf017..51fd145476a 100644
--- a/transport/transport-backend-cct/gradle.properties
+++ b/transport/transport-backend-cct/gradle.properties
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=3.1.3
-latestReleasedVersion=3.1.2
+version=4.0.0
+latestReleasedVersion=3.3.0
diff --git a/transport/transport-backend-cct/src/main/AndroidManifest.xml b/transport/transport-backend-cct/src/main/AndroidManifest.xml
index 90b8f0856d7..883c9821926 100644
--- a/transport/transport-backend-cct/src/main/AndroidManifest.xml
+++ b/transport/transport-backend-cct/src/main/AndroidManifest.xml
@@ -13,9 +13,9 @@
 <!-- limitations under the License. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.datatransport.backend.cct">
+          package="com.google.android.datatransport.backend.cct">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java
index bdd063898c4..0d129d86787 100644
--- a/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java
+++ b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java
@@ -29,6 +29,10 @@
 import com.google.android.datatransport.cct.internal.AndroidClientInfo;
 import com.google.android.datatransport.cct.internal.BatchedLogRequest;
 import com.google.android.datatransport.cct.internal.ClientInfo;
+import com.google.android.datatransport.cct.internal.ComplianceData;
+import com.google.android.datatransport.cct.internal.ExperimentIds;
+import com.google.android.datatransport.cct.internal.ExternalPRequestContext;
+import com.google.android.datatransport.cct.internal.ExternalPrivacyContext;
 import com.google.android.datatransport.cct.internal.LogEvent;
 import com.google.android.datatransport.cct.internal.LogRequest;
 import com.google.android.datatransport.cct.internal.LogResponse;
@@ -59,9 +63,11 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TimeZone;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
@@ -71,13 +77,14 @@ final class CctTransportBackend implements TransportBackend {
   private static final String LOG_TAG = "CctTransportBackend";
 
   private static final int CONNECTION_TIME_OUT = 30000;
-  private static final int READ_TIME_OUT = 40000;
+  private static final int READ_TIME_OUT = 130000;
   private static final int INVALID_VERSION_CODE = -1;
   private static final String ACCEPT_ENCODING_HEADER_KEY = "Accept-Encoding";
   private static final String CONTENT_ENCODING_HEADER_KEY = "Content-Encoding";
   private static final String GZIP_CONTENT_ENCODING = "gzip";
   private static final String CONTENT_TYPE_HEADER_KEY = "Content-Type";
   static final String API_KEY_HEADER_KEY = "X-Goog-Api-Key";
+  private static final String COOKIE_HEADER_KEY = "Cookie";
   private static final String JSON_CONTENT_TYPE = "application/json";
 
   @VisibleForTesting static final String KEY_NETWORK_TYPE = "net-type";
@@ -133,6 +140,14 @@ private static TelephonyManager getTelephonyManager(Context context) {
     return (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
   }
 
+  private static String getMccMncOrEmpty(Context context) {
+    String value = getTelephonyManager(context).getSimOperator();
+    if (value != null) {
+      return value;
+    }
+    return "";
+  }
+
   private static int getPackageVersionCode(Context context) {
     try {
       int packageVersionCode =
@@ -165,7 +180,7 @@ public EventInternal decorate(EventInternal eventInternal) {
         .addMetadata(KEY_MOBILE_SUBTYPE, getNetSubtypeValue(networkInfo))
         .addMetadata(KEY_COUNTRY, Locale.getDefault().getCountry())
         .addMetadata(KEY_LOCALE, Locale.getDefault().getLanguage())
-        .addMetadata(KEY_MCC_MNC, getTelephonyManager(applicationContext).getSimOperator())
+        .addMetadata(KEY_MCC_MNC, getMccMncOrEmpty(applicationContext))
         .addMetadata(
             KEY_APPLICATION_BUILD, Integer.toString(getPackageVersionCode(applicationContext)))
         .build();
@@ -272,6 +287,32 @@ private BatchedLogRequest getRequestBody(BackendRequest backendRequest) {
         if (eventInternal.getCode() != null) {
           event.setEventCode(eventInternal.getCode());
         }
+        if (eventInternal.getProductId() != null) {
+          event.setComplianceData(
+              ComplianceData.builder()
+                  .setPrivacyContext(
+                      ExternalPrivacyContext.builder()
+                          .setPrequest(
+                              ExternalPRequestContext.builder()
+                                  .setOriginAssociatedProductId(eventInternal.getProductId())
+                                  .build())
+                          .build())
+                  .setProductIdOrigin(ComplianceData.ProductIdOrigin.EVENT_OVERRIDE)
+                  .build());
+        }
+
+        if (eventInternal.getExperimentIdsClear() != null
+            || eventInternal.getExperimentIdsEncrypted() != null) {
+          ExperimentIds.Builder builder = ExperimentIds.builder();
+          if (eventInternal.getExperimentIdsClear() != null) {
+            builder.setClearBlob(eventInternal.getExperimentIdsClear());
+          }
+          if (eventInternal.getExperimentIdsEncrypted() != null) {
+            builder.setEncryptedBlob(eventInternal.getExperimentIdsEncrypted());
+          }
+          event.setExperimentIds(builder.build());
+        }
+
         logEvents.add(event.build());
       }
       requestBuilder.setLogEvents(logEvents);
@@ -282,8 +323,7 @@ private BatchedLogRequest getRequestBody(BackendRequest backendRequest) {
   }
 
   private HttpResponse doSend(HttpRequest request) throws IOException {
-
-    Logging.d(LOG_TAG, "Making request to: %s", request.url);
+    Logging.i(LOG_TAG, "Making request to: %s", request.url);
     HttpURLConnection connection = (HttpURLConnection) request.url.openConnection();
     connection.setConnectTimeout(CONNECTION_TIME_OUT);
     connection.setReadTimeout(readTimeout);
@@ -296,6 +336,11 @@ private HttpResponse doSend(HttpRequest request) throws IOException {
     connection.setRequestProperty(CONTENT_TYPE_HEADER_KEY, JSON_CONTENT_TYPE);
     connection.setRequestProperty(ACCEPT_ENCODING_HEADER_KEY, GZIP_CONTENT_ENCODING);
 
+    if (request.pseudonymousId != null) {
+      connection.setRequestProperty(
+          COOKIE_HEADER_KEY, String.format("NID=%s", request.pseudonymousId));
+    }
+
     if (request.apiKey != null) {
       connection.setRequestProperty(API_KEY_HEADER_KEY, request.apiKey);
     }
@@ -315,9 +360,9 @@ private HttpResponse doSend(HttpRequest request) throws IOException {
     }
 
     int responseCode = connection.getResponseCode();
-    Logging.i(LOG_TAG, "Status Code: " + responseCode);
-    Logging.i(LOG_TAG, "Content-Type: " + connection.getHeaderField("Content-Type"));
-    Logging.i(LOG_TAG, "Content-Encoding: " + connection.getHeaderField("Content-Encoding"));
+    Logging.i(LOG_TAG, "Status Code: %d", responseCode);
+    Logging.d(LOG_TAG, "Content-Type: %s", connection.getHeaderField("Content-Type"));
+    Logging.d(LOG_TAG, "Content-Encoding: %s", connection.getHeaderField("Content-Encoding"));
 
     if (responseCode == 302 || responseCode == 301 || responseCode == 307) {
       String redirect = connection.getHeaderField("Location");
@@ -345,6 +390,24 @@ private static InputStream maybeUnGzip(InputStream input, String contentEncoding
     return input;
   }
 
+  private @Nullable String findPseudonymousId(BackendRequest request) {
+    Iterator<EventInternal> events = request.getEvents().iterator();
+
+    if (!events.hasNext()) return null;
+
+    String pseudonymousId = events.next().getPseudonymousId();
+
+    for (EventInternal event : request.getEvents()) {
+      String currentId = event.getPseudonymousId();
+      if (!Objects.equals(pseudonymousId, currentId)) {
+        Logging.w(LOG_TAG, "Invalid pseudonymous id event found: %s", currentId);
+        return null;
+      }
+    }
+
+    return pseudonymousId;
+  }
+
   @Override
   public BackendResponse send(BackendRequest request) {
     BatchedLogRequest requestBody = getRequestBody(request);
@@ -367,11 +430,13 @@ public BackendResponse send(BackendRequest request) {
       }
     }
 
+    String pseudonymousId = findPseudonymousId(request);
+
     try {
       HttpResponse response =
           retry(
               5,
-              new HttpRequest(actualEndPoint, requestBody, apiKey),
+              new HttpRequest(actualEndPoint, requestBody, apiKey, pseudonymousId),
               this::doSend,
               (req, resp) -> {
                 if (resp.redirectUrl != null) {
@@ -420,16 +485,22 @@ static final class HttpResponse {
   static final class HttpRequest {
     final URL url;
     final BatchedLogRequest requestBody;
+    @Nullable final String pseudonymousId;
     @Nullable final String apiKey;
 
-    HttpRequest(URL url, BatchedLogRequest requestBody, @Nullable String apiKey) {
+    HttpRequest(
+        URL url,
+        BatchedLogRequest requestBody,
+        @Nullable String apiKey,
+        @Nullable String pseudonymousId) {
       this.url = url;
       this.requestBody = requestBody;
       this.apiKey = apiKey;
+      this.pseudonymousId = pseudonymousId;
     }
 
     HttpRequest withUrl(URL newUrl) {
-      return new HttpRequest(newUrl, requestBody, apiKey);
+      return new HttpRequest(newUrl, requestBody, apiKey, pseudonymousId);
     }
   }
 }
diff --git a/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/ComplianceData.java b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/ComplianceData.java
new file mode 100644
index 00000000000..35bbd40265a
--- /dev/null
+++ b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/ComplianceData.java
@@ -0,0 +1,73 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.android.datatransport.cct.internal;
+
+import android.util.SparseArray;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.auto.value.AutoValue;
+
+@AutoValue
+public abstract class ComplianceData {
+  public enum ProductIdOrigin {
+    NOT_SET(0),
+    EVENT_OVERRIDE(5);
+
+    private static final SparseArray<ProductIdOrigin> valueMap = new SparseArray<>();
+
+    private final int value;
+
+    static {
+      valueMap.put(0, NOT_SET);
+      valueMap.put(5, EVENT_OVERRIDE);
+    }
+
+    ProductIdOrigin(int value) {
+      this.value = value;
+    }
+
+    public int getValue() {
+      return value;
+    }
+
+    @Nullable
+    public static ProductIdOrigin forNumber(int value) {
+      return valueMap.get(value);
+    }
+  }
+
+  @Nullable
+  public abstract ExternalPrivacyContext getPrivacyContext();
+
+  @Nullable
+  public abstract ProductIdOrigin getProductIdOrigin();
+
+  @NonNull
+  public static Builder builder() {
+    return new AutoValue_ComplianceData.Builder();
+  }
+
+  @AutoValue.Builder
+  public abstract static class Builder {
+    @NonNull
+    public abstract Builder setPrivacyContext(@Nullable ExternalPrivacyContext value);
+
+    @NonNull
+    public abstract Builder setProductIdOrigin(@Nullable ProductIdOrigin value);
+
+    @NonNull
+    public abstract ComplianceData build();
+  }
+}
diff --git a/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/ExperimentIds.java b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/ExperimentIds.java
new file mode 100644
index 00000000000..24b0b346686
--- /dev/null
+++ b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/ExperimentIds.java
@@ -0,0 +1,47 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.android.datatransport.cct.internal;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.auto.value.AutoValue;
+
+@AutoValue
+public abstract class ExperimentIds {
+  @SuppressWarnings("mutable")
+  @Nullable
+  public abstract byte[] getClearBlob();
+
+  @SuppressWarnings("mutable")
+  @Nullable
+  public abstract byte[] getEncryptedBlob();
+
+  @NonNull
+  public static ExperimentIds.Builder builder() {
+    return new AutoValue_ExperimentIds.Builder();
+  }
+
+  @AutoValue.Builder
+  public abstract static class Builder {
+    @NonNull
+    public abstract ExperimentIds.Builder setClearBlob(@Nullable byte[] value);
+
+    @NonNull
+    public abstract ExperimentIds.Builder setEncryptedBlob(@Nullable byte[] value);
+
+    @NonNull
+    public abstract ExperimentIds build();
+  }
+}
diff --git a/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/ExternalPRequestContext.java b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/ExternalPRequestContext.java
new file mode 100644
index 00000000000..6eb1a9d7311
--- /dev/null
+++ b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/ExternalPRequestContext.java
@@ -0,0 +1,39 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.android.datatransport.cct.internal;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.auto.value.AutoValue;
+
+@AutoValue
+public abstract class ExternalPRequestContext {
+  @Nullable
+  public abstract Integer getOriginAssociatedProductId();
+
+  @NonNull
+  public static Builder builder() {
+    return new AutoValue_ExternalPRequestContext.Builder();
+  }
+
+  @AutoValue.Builder
+  public abstract static class Builder {
+    @NonNull
+    public abstract Builder setOriginAssociatedProductId(@Nullable Integer value);
+
+    @NonNull
+    public abstract ExternalPRequestContext build();
+  }
+}
diff --git a/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/ExternalPrivacyContext.java b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/ExternalPrivacyContext.java
new file mode 100644
index 00000000000..453bec64656
--- /dev/null
+++ b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/ExternalPrivacyContext.java
@@ -0,0 +1,39 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.android.datatransport.cct.internal;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.auto.value.AutoValue;
+
+@AutoValue
+public abstract class ExternalPrivacyContext {
+  @Nullable
+  public abstract ExternalPRequestContext getPrequest();
+
+  @NonNull
+  public static Builder builder() {
+    return new AutoValue_ExternalPrivacyContext.Builder();
+  }
+
+  @AutoValue.Builder
+  public abstract static class Builder {
+    @NonNull
+    public abstract Builder setPrequest(@Nullable ExternalPRequestContext value);
+
+    @NonNull
+    public abstract ExternalPrivacyContext build();
+  }
+}
diff --git a/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/LogEvent.java b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/LogEvent.java
index 59e59d44188..dde5533c393 100644
--- a/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/LogEvent.java
+++ b/transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/LogEvent.java
@@ -26,6 +26,9 @@ public abstract class LogEvent {
   @Nullable
   public abstract Integer getEventCode();
 
+  @Nullable
+  public abstract ComplianceData getComplianceData();
+
   public abstract long getEventUptimeMs();
 
   @SuppressWarnings("mutable")
@@ -41,6 +44,9 @@ public abstract class LogEvent {
   @Nullable
   public abstract NetworkConnectionInfo getNetworkConnectionInfo();
 
+  @Nullable
+  public abstract ExperimentIds getExperimentIds();
+
   @NonNull
   public static Builder protoBuilder(@NonNull byte[] sourceExtension) {
     return builder().setSourceExtension(sourceExtension);
@@ -63,6 +69,9 @@ public abstract static class Builder {
     @NonNull
     public abstract Builder setEventCode(@Nullable Integer value);
 
+    @NonNull
+    public abstract Builder setComplianceData(@Nullable ComplianceData value);
+
     @NonNull
     public abstract Builder setEventUptimeMs(long value);
 
@@ -78,6 +87,9 @@ public abstract static class Builder {
     @NonNull
     public abstract Builder setNetworkConnectionInfo(@Nullable NetworkConnectionInfo value);
 
+    @NonNull
+    public abstract Builder setExperimentIds(@Nullable ExperimentIds value);
+
     @NonNull
     public abstract LogEvent build();
   }
diff --git a/transport/transport-backend-cct/src/test/java/com/google/android/datatransport/cct/CctTransportBackendTest.java b/transport/transport-backend-cct/src/test/java/com/google/android/datatransport/cct/CctTransportBackendTest.java
index 4d3456bfcc3..0cdad86ccbc 100644
--- a/transport/transport-backend-cct/src/test/java/com/google/android/datatransport/cct/CctTransportBackendTest.java
+++ b/transport/transport-backend-cct/src/test/java/com/google/android/datatransport/cct/CctTransportBackendTest.java
@@ -49,6 +49,7 @@
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Locale;
 import java.util.zip.GZIPOutputStream;
 import org.junit.Rule;
@@ -70,6 +71,8 @@ public class CctTransportBackendTest {
   private static final String JSON_PAYLOAD = "{\"hello\": false}";
   private static final String JSON_PAYLOAD_ESCAPED = "{\\\"hello\\\": false}";
   private static final int CODE = 5;
+
+  private static final int PRODUCT_ID = 98765;
   private static final String TEST_NAME = "hello";
   private static final Encoding PROTOBUF_ENCODING = Encoding.of("proto");
   private static final Encoding JSON_ENCODING = Encoding.of("json");
@@ -83,6 +86,16 @@ public class CctTransportBackendTest {
   private CctTransportBackend BACKEND =
       new CctTransportBackend(ApplicationProvider.getApplicationContext(), wallClock, uptimeClock);
 
+  private static final String PSEUDONYMOUS_ID = "pseudonymous Id";
+  private ByteString EXPERIMENT_IDS_CLEAR =
+      ByteString.copyFrom("experiment ids clear".getBytes(Charset.defaultCharset()));
+
+  private String EXPERIMENT_IDS_CLEAR_BYTE64 = "ZXhwZXJpbWVudCBpZHMgY2xlYXI=";
+  private ByteString EXPERIMENT_IDS_ENCRYPTED =
+      ByteString.copyFrom("experiment ids encrypted".getBytes(Charset.defaultCharset()));
+
+  private String EXPERIMENT_IDS_ENCRYPTED_BYTE64 = "ZXhwZXJpbWVudCBpZHMgZW5jcnlwdGVk";
+
   @Rule public WireMockRule wireMockRule = new WireMockRule(8999);
 
   private BackendRequest getCCTBackendRequest() {
@@ -110,6 +123,10 @@ private BackendRequest getCCTBackendRequest(String transportName, CCTDestination
                             new EncodedPayload(
                                 JSON_ENCODING, JSON_PAYLOAD.getBytes(Charset.defaultCharset())))
                         .setCode(CODE)
+                        .setProductId(PRODUCT_ID)
+                        .setPseudonymousId(PSEUDONYMOUS_ID)
+                        .setExperimentIdsClear(EXPERIMENT_IDS_CLEAR.toByteArray())
+                        .setExperimentIdsEncrypted(EXPERIMENT_IDS_ENCRYPTED.toByteArray())
                         .build())))
         .setExtras(destination.getExtras())
         .build();
@@ -185,11 +202,29 @@ public void testCCTSuccessLoggingRequest() {
                             activeNetworkInfo.getSubtype()))))
             .withRequestBody(notMatching("$[?(@.logRequest[0].logEvent[0].eventCode)]"))
             .withRequestBody(matchingJsonPath("$[?(@.logRequest[0].logEvent[1].eventCode == 5)]"))
+            .withRequestBody(
+                matchingJsonPath("$[?(@.logRequest[0].logEvent[0].complianceData)]", absent()))
+            .withRequestBody(
+                matchingJsonPath(
+                    String.format(
+                        "$[?(@.logRequest[0].logEvent[1].complianceData.privacyContext.prequest.originAssociatedProductId == %s)]",
+                        PRODUCT_ID)))
+            .withRequestBody(
+                matchingJsonPath(
+                    String.format(
+                        "$[?(@.logRequest[0].logEvent[1].experimentIds.clearBlob == \"%s\")]",
+                        EXPERIMENT_IDS_CLEAR_BYTE64)))
+            .withRequestBody(
+                matchingJsonPath(
+                    String.format(
+                        "$[?(@.logRequest[0].logEvent[1].experimentIds.encryptedBlob == \"%s\")]",
+                        EXPERIMENT_IDS_ENCRYPTED_BYTE64)))
             .withRequestBody(
                 matchingJsonPath(
                     String.format(
                         "$[?(@.logRequest[0].logEvent[1].sourceExtensionJsonProto3 == \"%s\")]",
-                        JSON_PAYLOAD_ESCAPED))));
+                        JSON_PAYLOAD_ESCAPED)))
+            .withoutHeader("Cookie"));
 
     assertEquals(BackendResponse.ok(3), response);
   }
@@ -710,6 +745,73 @@ public void send_withEventsOfUnsupportedEncoding_shouldBeSkipped() throws IOExce
     assertEquals(BackendResponse.ok(3), response);
   }
 
+  @Test
+  public void schedule_shouldAddCookieOnPseudonymousIds() {
+    String pseudonymousId = "testing_world";
+    BackendRequest request =
+        BackendRequest.builder()
+            .setEvents(
+                Collections.singletonList(
+                    BACKEND.decorate(
+                        EventInternal.builder()
+                            .setEventMillis(INITIAL_WALL_TIME)
+                            .setUptimeMillis(INITIAL_UPTIME)
+                            .setTransportName("4")
+                            .setEncodedPayload(
+                                new EncodedPayload(PROTOBUF_ENCODING, PAYLOAD.toByteArray()))
+                            .setPseudonymousId(pseudonymousId)
+                            .build())))
+            .setExtras(new CCTDestination(TEST_ENDPOINT, null).getExtras())
+            .build();
+
+    stubFor(post(urlEqualTo("/api")).willReturn(aResponse().withStatus(200)));
+    wallClock.tick();
+    uptimeClock.tick();
+
+    BACKEND.send(request);
+    verify(
+        postRequestedFor(urlEqualTo("/api"))
+            .withHeader("Cookie", equalTo(String.format("NID=%s", pseudonymousId))));
+  }
+
+  @Test
+  public void schedule_shouldDropCookieOnMixedPseudonymousIds() {
+    String pseudonymousId = "testing_world";
+    String otherPseudonymousId = "world_testing";
+    BackendRequest request =
+        BackendRequest.builder()
+            .setEvents(
+                Arrays.asList(
+                    BACKEND.decorate(
+                        EventInternal.builder()
+                            .setEventMillis(INITIAL_WALL_TIME)
+                            .setUptimeMillis(INITIAL_UPTIME)
+                            .setTransportName("4")
+                            .setPseudonymousId(pseudonymousId)
+                            .setEncodedPayload(
+                                new EncodedPayload(PROTOBUF_ENCODING, PAYLOAD.toByteArray()))
+                            .build()),
+                    BACKEND.decorate(
+                        EventInternal.builder()
+                            .setEventMillis(INITIAL_WALL_TIME)
+                            .setUptimeMillis(INITIAL_UPTIME)
+                            .setTransportName("4")
+                            .setPseudonymousId(otherPseudonymousId)
+                            .setEncodedPayload(
+                                new EncodedPayload(PROTOBUF_ENCODING, PAYLOAD.toByteArray()))
+                            .setCode(CODE)
+                            .build())))
+            .setExtras(new CCTDestination(TEST_ENDPOINT, null).getExtras())
+            .build();
+
+    stubFor(post(urlEqualTo("/api")).willReturn(aResponse().withStatus(200)));
+    wallClock.tick();
+    uptimeClock.tick();
+
+    BACKEND.send(request);
+    verify(postRequestedFor(urlEqualTo("/api")).withoutHeader("Cookie"));
+  }
+
   // When there is no active network, the ConnectivityManager returns null when
   // getActiveNetworkInfo() is called.
   @Implements(ConnectivityManager.class)
diff --git a/transport/transport-backend-cct/src/test/java/com/google/android/datatransport/cct/internal/LogRequestTest.java b/transport/transport-backend-cct/src/test/java/com/google/android/datatransport/cct/internal/LogRequestTest.java
index a5c0b30e6fb..ad33e9fba8b 100644
--- a/transport/transport-backend-cct/src/test/java/com/google/android/datatransport/cct/internal/LogRequestTest.java
+++ b/transport/transport-backend-cct/src/test/java/com/google/android/datatransport/cct/internal/LogRequestTest.java
@@ -23,6 +23,7 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.util.JsonFormat;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Assert;
@@ -33,7 +34,7 @@
 @RunWith(RobolectricTestRunner.class)
 public class LogRequestTest {
 
-  private static byte[] EMPTY_BYTE_ARRAY = new byte[] {};
+  private static final byte[] EMPTY_BYTE_ARRAY = new byte[] {};
 
   @Test
   public void testBuildNetworkConnectionInfo_empty() {
@@ -192,6 +193,11 @@ public void testLogRequest_jsontToProto() throws InvalidProtocolBufferException
             .setEventTimeMs(100L)
             .setEventUptimeMs(4000L)
             .setTimezoneOffsetSeconds(123)
+            .setExperimentIds(
+                ExperimentIds.builder()
+                    .setClearBlob("blob".getBytes(StandardCharsets.UTF_8))
+                    .setEncryptedBlob("encrypted blob".getBytes(StandardCharsets.UTF_8))
+                    .build())
             .setNetworkConnectionInfo(
                 NetworkConnectionInfo.builder()
                     .setMobileSubtype(NetworkConnectionInfo.MobileSubtype.EDGE)
@@ -246,6 +252,11 @@ public void testLogRequest_jsontToProto() throws InvalidProtocolBufferException
                             .setEventUptimeMs(4000L)
                             .setEventTimeMs(100L)
                             .setTimezoneOffsetSeconds(123L)
+                            .setExperimentIds(
+                                com.google.android.datatransport.cct.proto.ExperimentIds
+                                    .newBuilder()
+                                    .setClearBlob(ByteString.copyFromUtf8("blob"))
+                                    .setEncryptedBlob(ByteString.copyFromUtf8("encrypted blob")))
                             .setNetworkConnectionInfo(
                                 com.google.android.datatransport.cct.proto.NetworkConnectionInfo
                                     .newBuilder()
diff --git a/transport/transport-backend-cct/src/test/proto/google/cct/google_cct.proto b/transport/transport-backend-cct/src/test/proto/google/cct/google_cct.proto
index 18f9a72f833..d7cfad97955 100644
--- a/transport/transport-backend-cct/src/test/proto/google/cct/google_cct.proto
+++ b/transport/transport-backend-cct/src/test/proto/google/cct/google_cct.proto
@@ -26,6 +26,8 @@ message LogEvent {
 
     int64 event_uptime_ms = 17;
 
+    ExperimentIds experiment_ids = 16;
+
     oneof ext {
         bytes source_extension = 6;
 
@@ -255,6 +257,12 @@ message QosTiersOverride {
     int64 qos_tier_fingerprint = 2;
 }
 
+message ExperimentIds {
+    bytes clear_blob = 1;
+
+    bytes encrypted_blob = 2;
+}
+
 message LogResponse {
     // Client should wait for next_request_wait_millis before sending the next
     // log request.
diff --git a/transport/transport-backend-cct/transport-backend-cct.gradle b/transport/transport-backend-cct/transport-backend-cct.gradle
index c5973dde1a5..525baf515c7 100644
--- a/transport/transport-backend-cct/transport-backend-cct.gradle
+++ b/transport/transport-backend-cct/transport-backend-cct.gradle
@@ -18,7 +18,9 @@ plugins {
 }
 
 firebaseLibrary{
+    libraryGroup("transport")
     publishJavadoc = false
+    publishReleaseNotes = false
 }
 
 protobuf {
@@ -37,7 +39,8 @@ protobuf {
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.android.datatransport.backend.cct"    
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
@@ -52,27 +55,25 @@ android {
 }
 
 dependencies {
-    implementation project(':transport:transport-api')
-    implementation project(':transport:transport-runtime')
-    implementation project(':encoders:firebase-encoders')
-    implementation project(':encoders:firebase-encoders-json')
+    api project(':transport:transport-api')
+    api project(':transport:transport-runtime')
+    api 'com.google.firebase:firebase-encoders:17.0.0'
+    api 'com.google.firebase:firebase-encoders-json:18.0.0'
+
     implementation 'androidx.annotation:annotation:1.1.0'
 
     compileOnly "com.google.auto.value:auto-value-annotations:1.6.6"
 
-    annotationProcessor "com.google.auto.value:auto-value:1.6.5"
     annotationProcessor project(':encoders:firebase-encoders-processor')
+    annotationProcessor "com.google.auto.value:auto-value:1.6.5"
 
-    testImplementation 'com.google.protobuf:protobuf-java-util:3.11.0'
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'junit:junit:4.12'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation 'com.github.tomakehurst:wiremock:3.0.1'
+    testImplementation "com.google.protobuf:protobuf-java-util:$protobufJavaUtilVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0'
-    testImplementation 'com.github.tomakehurst:wiremock:2.26.3'
-    //Android compatible version of Apache httpclient.
-    testImplementation 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.13-beta-2'
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation "org.robolectric:robolectric:4.12"
 
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
diff --git a/transport/transport-runtime-testing/CHANGELOG.md b/transport/transport-runtime-testing/CHANGELOG.md
new file mode 100644
index 00000000000..f514bbb890e
--- /dev/null
+++ b/transport/transport-runtime-testing/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Unreleased
+
+
diff --git a/appcheck/firebase-appcheck-safetynet/src/main/AndroidManifest.xml b/transport/transport-runtime-testing/src/main/AndroidManifest.xml
similarity index 81%
rename from appcheck/firebase-appcheck-safetynet/src/main/AndroidManifest.xml
rename to transport/transport-runtime-testing/src/main/AndroidManifest.xml
index 3edfa6845be..65f72c30b9c 100644
--- a/appcheck/firebase-appcheck-safetynet/src/main/AndroidManifest.xml
+++ b/transport/transport-runtime-testing/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2020 Google LLC -->
+<!-- Copyright 2022 Google LLC -->
 <!-- -->
 <!-- Licensed under the Apache License, Version 2.0 (the "License"); -->
 <!-- you may not use this file except in compliance with the License. -->
@@ -14,7 +13,7 @@
 <!-- limitations under the License. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.appcheck.safetynet">
+          package="com.google.android.datatransport.runtime.testing">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="16"/>-->
-</manifest>
\ No newline at end of file
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
+</manifest>
diff --git a/transport/transport-runtime-testing/src/main/java/com/google/android/datatransport/runtime/TransportRuntimeTesting.java b/transport/transport-runtime-testing/src/main/java/com/google/android/datatransport/runtime/TransportRuntimeTesting.java
new file mode 100644
index 00000000000..8bd8034ad53
--- /dev/null
+++ b/transport/transport-runtime-testing/src/main/java/com/google/android/datatransport/runtime/TransportRuntimeTesting.java
@@ -0,0 +1,34 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.android.datatransport.runtime;
+
+import com.google.android.datatransport.Priority;
+import com.google.android.datatransport.runtime.backends.BackendResponse;
+import com.google.android.datatransport.runtime.scheduling.jobscheduling.UploadTestSupport;
+
+/** Test support for {@link TransportRuntime}. */
+public final class TransportRuntimeTesting {
+  private TransportRuntimeTesting() {}
+
+  /** Synchronously force upload all scheduled events for a given destination and priority. */
+  public static BackendResponse forceUpload(Destination destination, Priority priority) {
+    return UploadTestSupport.forceUpload(
+        TransportContext.builder()
+            .setBackendName(destination.getName())
+            .setExtras(destination.getExtras())
+            .setPriority(priority)
+            .build());
+  }
+}
diff --git a/transport/transport-runtime-testing/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/UploadTestSupport.java b/transport/transport-runtime-testing/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/UploadTestSupport.java
new file mode 100644
index 00000000000..f587b3b8f88
--- /dev/null
+++ b/transport/transport-runtime-testing/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/UploadTestSupport.java
@@ -0,0 +1,31 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.android.datatransport.runtime.scheduling.jobscheduling;
+
+import com.google.android.datatransport.runtime.TransportContext;
+import com.google.android.datatransport.runtime.TransportRuntime;
+import com.google.android.datatransport.runtime.backends.BackendResponse;
+
+/**
+ * Support class that avoids making {@link Uploader#logAndUpdateState(TransportContext, int) }
+ * method public in the SDK code.
+ */
+public class UploadTestSupport {
+  private UploadTestSupport() {}
+
+  public static BackendResponse forceUpload(TransportContext context) {
+    return TransportRuntime.getInstance().getUploader().logAndUpdateState(context, 1);
+  }
+}
diff --git a/transport/transport-runtime-testing/transport-runtime-testing.gradle b/transport/transport-runtime-testing/transport-runtime-testing.gradle
new file mode 100644
index 00000000000..4dfced4aa5e
--- /dev/null
+++ b/transport/transport-runtime-testing/transport-runtime-testing.gradle
@@ -0,0 +1,48 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+plugins {
+    // not a firebase-library, since we don't intend to release this artifact.
+    id 'com.android.library'
+}
+
+android {
+    namespace "com.google.android.datatransport.runtime.testing"    
+    compileSdkVersion project.compileSdkVersion
+    defaultConfig {
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    testOptions.unitTests {
+        includeAndroidResources = true
+    }
+}
+
+dependencies {
+    implementation 'androidx.annotation:annotation:1.3.0'
+    implementation 'com.google.android.datatransport:transport-api:3.0.0'
+    implementation 'com.google.android.datatransport:transport-backend-cct:3.1.8'
+    implementation 'com.google.android.datatransport:transport-runtime:3.1.8'
+
+    androidTestImplementation 'androidx.test:rules:1.4.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
+    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'junit:junit:4.13.2'
+}
diff --git a/transport/transport-runtime/CHANGELOG.md b/transport/transport-runtime/CHANGELOG.md
new file mode 100644
index 00000000000..4a7385d299e
--- /dev/null
+++ b/transport/transport-runtime/CHANGELOG.md
@@ -0,0 +1,9 @@
+# Unreleased
+
+
+# 3.3.0
+* [feature] Added support for additional event context.
+
+# 3.2.0
+* [unchanged] Updated internal Dagger dependency.
+* [feature] Added support for product id.
diff --git a/transport/transport-runtime/gradle.properties b/transport/transport-runtime/gradle.properties
index 77ffa37e143..6ec9d6c82b7 100644
--- a/transport/transport-runtime/gradle.properties
+++ b/transport/transport-runtime/gradle.properties
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=3.1.3
-latestReleasedVersion=3.1.2
+version=4.0.0
+latestReleasedVersion=3.3.0
 android.enableUnitTestBinaryResources=true
diff --git a/transport/transport-runtime/src/androidTest/AndroidManifest.xml b/transport/transport-runtime/src/androidTest/AndroidManifest.xml
index 9333c0c776b..f31e038f8d0 100644
--- a/transport/transport-runtime/src/androidTest/AndroidManifest.xml
+++ b/transport/transport-runtime/src/androidTest/AndroidManifest.xml
@@ -1,7 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.datatransport.runtime.androidTest">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application>
         <service
diff --git a/transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/UploaderIntegrationTest.java b/transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/UploaderIntegrationTest.java
index 544f5020042..e4326868548 100644
--- a/transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/UploaderIntegrationTest.java
+++ b/transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/UploaderIntegrationTest.java
@@ -29,6 +29,7 @@
 import androidx.test.runner.AndroidJUnit4;
 import com.google.android.datatransport.Encoding;
 import com.google.android.datatransport.Event;
+import com.google.android.datatransport.EventContext;
 import com.google.android.datatransport.Priority;
 import com.google.android.datatransport.Transport;
 import com.google.android.datatransport.TransportFactory;
@@ -93,6 +94,19 @@ private String generateBackendName() {
     return UUID.randomUUID().toString().replace("-", "");
   }
 
+  private EventInternal makeEventWithPseudonymousId(String id) {
+    return EventInternal.builder()
+        .setTransportName(testTransport)
+        .setEventMillis(1)
+        .setUptimeMillis(2)
+        .setEncodedPayload(
+            new EncodedPayload(Encoding.of("proto"), "Hello".getBytes(Charset.defaultCharset())))
+        .addMetadata("key1", "value1")
+        .addMetadata("key2", "value2")
+        .setPseudonymousId(id)
+        .build();
+  }
+
   @Test
   public void uploader_transientError_shouldReschedule() {
     TransportRuntime runtime = TransportRuntime.getInstance();
@@ -277,7 +291,7 @@ public void uploader_withPendingClientMetricsAndSuccessfulUpload_shouldResetCoun
                 new EncodedPayload(
                     PROTOBUF_ENCODING, "TelemetryData".getBytes(Charset.defaultCharset())))
             .build();
-    EventInternal metricsEvent = component.getUploader().createMetricsEvent(mockBackend);
+    EventInternal metricsEvent = component.getUploader().createMetricsEvent(mockBackend, null);
     transport.send(Event.ofTelemetry("TelemetryData"));
     verify(mockBackend, times(1))
         .send(
@@ -320,7 +334,7 @@ public void uploader_withPendingClientMetricsAndInvalidPayload_shouldNotResetCou
                 new EncodedPayload(
                     PROTOBUF_ENCODING, "TelemetryData".getBytes(Charset.defaultCharset())))
             .build();
-    EventInternal metricsEvent = component.getUploader().createMetricsEvent(mockBackend);
+    EventInternal metricsEvent = component.getUploader().createMetricsEvent(mockBackend, null);
     transport.send(Event.ofTelemetry("TelemetryData"));
     verify(mockBackend, times(1))
         .send(
@@ -363,7 +377,7 @@ public void uploader_withPendingClientMetricsAndFatalError_shouldNotResetCounter
                 new EncodedPayload(
                     PROTOBUF_ENCODING, "TelemetryData".getBytes(Charset.defaultCharset())))
             .build();
-    EventInternal metricsEvent = component.getUploader().createMetricsEvent(mockBackend);
+    EventInternal metricsEvent = component.getUploader().createMetricsEvent(mockBackend, null);
     transport.send(Event.ofTelemetry("TelemetryData"));
     verify(mockBackend, times(1))
         .send(
@@ -415,4 +429,73 @@ public void uploader_withPendingClientMetricsAndFatalError_shouldNotResetCounter
 
     assertThat(store.loadClientMetrics().getLogSourceMetricsList()).hasSize(1);
   }
+
+  @Test
+  public void uploader_shouldBatchSamePseudonymousIds() {
+    TransportRuntime runtime = TransportRuntime.getInstance();
+    SQLiteEventStore store = component.getEventStore();
+
+    String mockBackendName = generateBackendName();
+
+    String targetId = "myId";
+    String alternativeId = "otherId";
+
+    EventInternal oldestEvent = makeEventWithPseudonymousId(targetId);
+    EventInternal siblingEvent = makeEventWithPseudonymousId(targetId);
+    EventInternal otherEvent = makeEventWithPseudonymousId(alternativeId);
+
+    EventContext event = EventContext.builder().setPseudonymousId(alternativeId).build();
+
+    when(mockRegistry.get(mockBackendName)).thenReturn(mockBackend);
+
+    Transport<String> transport =
+        runtime
+            .newFactory(new TestDestination(mockBackendName, null))
+            .getTransport(testTransport, String.class, Encoding.of("proto"), String::getBytes);
+
+    TransportContext TRANSPORT_CONTEXT =
+        TransportContext.builder().setBackendName(mockBackendName).build();
+
+    store.persist(TRANSPORT_CONTEXT, oldestEvent);
+    store.persist(TRANSPORT_CONTEXT, otherEvent);
+    store.persist(TRANSPORT_CONTEXT, siblingEvent);
+
+    transport.send(Event.ofData("", event));
+    verify(mockBackend, times(1))
+        .send(eq(BackendRequest.create(Arrays.asList(oldestEvent, siblingEvent))));
+  }
+
+  @Test
+  public void upload_shouldBatchOldestEventType() {
+    TransportRuntime runtime = TransportRuntime.getInstance();
+    SQLiteEventStore store = component.getEventStore();
+
+    String mockBackendName = generateBackendName();
+
+    String randomId = "myId";
+
+    EventInternal targetEvent = makeEventWithPseudonymousId(null);
+    EventInternal otherEvent = makeEventWithPseudonymousId(randomId);
+    EventInternal siblingEvent = makeEventWithPseudonymousId(randomId);
+
+    EventContext event = EventContext.builder().setPseudonymousId(randomId).build();
+
+    when(mockRegistry.get(mockBackendName)).thenReturn(mockBackend);
+
+    Transport<String> transport =
+        runtime
+            .newFactory(new TestDestination(mockBackendName, null))
+            .getTransport(testTransport, String.class, Encoding.of("proto"), String::getBytes);
+
+    TransportContext TRANSPORT_CONTEXT =
+        TransportContext.builder().setBackendName(mockBackendName).build();
+
+    store.persist(TRANSPORT_CONTEXT, targetEvent);
+    store.persist(TRANSPORT_CONTEXT, otherEvent);
+    store.persist(TRANSPORT_CONTEXT, siblingEvent);
+
+    transport.send(Event.ofData("", event));
+    verify(mockBackend, times(1))
+        .send(eq(BackendRequest.create(Collections.singletonList(targetEvent))));
+  }
 }
diff --git a/transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStoreTest.java b/transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStoreTest.java
index e15d0afbc9c..3756a72aa78 100644
--- a/transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStoreTest.java
+++ b/transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStoreTest.java
@@ -33,13 +33,13 @@
 import com.google.android.datatransport.runtime.time.TestClock;
 import com.google.android.datatransport.runtime.time.UptimeClock;
 import com.google.common.truth.Correspondence;
-import dagger.Lazy;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+import javax.inject.Provider;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -115,12 +115,12 @@ public class SQLiteEventStoreTest {
   private static final String LOG_SOURCE_3 = "source3";
 
   private final TestClock clock = new TestClock(1);
-  private final Lazy<String> packageName =
+  private final Provider<String> packageName =
       () -> ApplicationProvider.getApplicationContext().getPackageName();
   private final SQLiteEventStore store = newStoreWithConfig(clock, CONFIG, packageName);
 
   private static SQLiteEventStore newStoreWithConfig(
-      Clock clock, EventStoreConfig config, Lazy<String> packageName) {
+      Clock clock, EventStoreConfig config, Provider<String> packageName) {
     return new SQLiteEventStore(
         clock,
         new UptimeClock(),
@@ -208,8 +208,8 @@ public void persist_withEventsOfDifferentPriority_shouldEndBeStoredUnderDifferen
     PersistedEvent newEvent1 = store.persist(ctx1, event1);
     PersistedEvent newEvent2 = store.persist(ctx2, event2);
 
-    assertThat(store.loadBatch(ctx1)).containsExactly(newEvent1);
-    assertThat(store.loadBatch(ctx2)).containsExactly(newEvent2);
+    assertThat(store.loadBatch(ctx1)).containsExactly(newEvent1, newEvent2).inOrder();
+    assertThat(store.loadBatch(ctx2)).containsExactly(newEvent2, newEvent1).inOrder();
   }
 
   @Test
@@ -473,6 +473,27 @@ public void loadBatch_shouldLoadNoMoreThanBatchSizeItems() {
     assertThat(store.loadBatch(TRANSPORT_CONTEXT)).hasSize(1);
   }
 
+  @Test
+  public void loadBatch_shouldLoadNoMoreThanBatchSizeItemsWithDifferentPriority() {
+    TransportContext ctx1 = TRANSPORT_CONTEXT;
+    TransportContext ctx2 = TRANSPORT_CONTEXT.withPriority(Priority.VERY_LOW);
+
+    for (int i = 0; i < CONFIG.getLoadBatchSize() - 1; i++) {
+      store.persist(ctx1, EVENT);
+    }
+
+    for (int i = 0; i < 3; i++) {
+      store.persist(ctx2, EVENT);
+    }
+
+    Iterable<PersistedEvent> persistedEvents = store.loadBatch(ctx1);
+    assertThat(store.loadBatch(ctx1)).hasSize(CONFIG.getLoadBatchSize());
+
+    store.recordSuccess(persistedEvents);
+
+    assertThat(store.loadBatch(ctx2)).hasSize(2);
+  }
+
   @Test
   public void cleanUp_whenEventIsNotOld_shouldNotDeleteIt() {
     PersistedEvent persistedEvent = store.persist(TRANSPORT_CONTEXT, EVENT);
diff --git a/transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/scheduling/persistence/SpyEventStoreModule.java b/transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/scheduling/persistence/SpyEventStoreModule.java
index cf4866f81d1..9dc91efb8c2 100644
--- a/transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/scheduling/persistence/SpyEventStoreModule.java
+++ b/transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/scheduling/persistence/SpyEventStoreModule.java
@@ -22,10 +22,10 @@
 import com.google.android.datatransport.runtime.time.Monotonic;
 import com.google.android.datatransport.runtime.time.WallTime;
 import dagger.Binds;
-import dagger.Lazy;
 import dagger.Module;
 import dagger.Provides;
 import javax.inject.Named;
+import javax.inject.Provider;
 import javax.inject.Singleton;
 
 @Module
@@ -42,7 +42,7 @@ static SQLiteEventStore sqliteEventStore(
       @Monotonic Clock clock,
       EventStoreConfig config,
       SchemaManager schemaManager,
-      @Named("PACKAGE_NAME") Lazy<String> packageName) {
+      @Named("PACKAGE_NAME") Provider<String> packageName) {
     return spy(new SQLiteEventStore(wallClock, clock, config, schemaManager, packageName));
   }
 
diff --git a/transport/transport-runtime/src/main/AndroidManifest.xml b/transport/transport-runtime/src/main/AndroidManifest.xml
index aab66d46397..72ee39997af 100644
--- a/transport/transport-runtime/src/main/AndroidManifest.xml
+++ b/transport/transport-runtime/src/main/AndroidManifest.xml
@@ -13,10 +13,10 @@
 <!-- limitations under the License. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.datatransport.runtime">
+          package="com.google.android.datatransport.runtime">
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 
     <application>
         <service
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/EventInternal.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/EventInternal.java
index 2dfa7921c48..9c462770d73 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/EventInternal.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/EventInternal.java
@@ -40,6 +40,20 @@ public byte[] getPayload() {
 
   protected abstract Map<String, String> getAutoMetadata();
 
+  @Nullable
+  public abstract Integer getProductId();
+
+  @Nullable
+  public abstract String getPseudonymousId();
+
+  @Nullable
+  @SuppressWarnings("mutable")
+  public abstract byte[] getExperimentIdsClear();
+
+  @Nullable
+  @SuppressWarnings("mutable")
+  public abstract byte[] getExperimentIdsEncrypted();
+
   public final Map<String, String> getMetadata() {
     return Collections.unmodifiableMap(getAutoMetadata());
   }
@@ -68,6 +82,10 @@ public Builder toBuilder() {
     return new AutoValue_EventInternal.Builder()
         .setTransportName(getTransportName())
         .setCode(getCode())
+        .setProductId(getProductId())
+        .setPseudonymousId(getPseudonymousId())
+        .setExperimentIdsClear(getExperimentIdsClear())
+        .setExperimentIdsEncrypted(getExperimentIdsEncrypted())
         .setEncodedPayload(getEncodedPayload())
         .setEventMillis(getEventMillis())
         .setUptimeMillis(getUptimeMillis())
@@ -92,6 +110,14 @@ public abstract static class Builder {
 
     protected abstract Builder setAutoMetadata(Map<String, String> metadata);
 
+    public abstract Builder setProductId(Integer value);
+
+    public abstract Builder setPseudonymousId(String value);
+
+    public abstract Builder setExperimentIdsClear(byte[] value);
+
+    public abstract Builder setExperimentIdsEncrypted(byte[] value);
+
     protected abstract Map<String, String> getAutoMetadata();
 
     public final Builder addMetadata(String key, String value) {
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/ExecutionModule.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/ExecutionModule.java
index 64eeae96a48..17643e1ee35 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/ExecutionModule.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/ExecutionModule.java
@@ -14,6 +14,7 @@
 
 package com.google.android.datatransport.runtime;
 
+import android.annotation.SuppressLint;
 import dagger.Module;
 import dagger.Provides;
 import java.util.concurrent.Executor;
@@ -24,6 +25,7 @@
 abstract class ExecutionModule {
   @Singleton
   @Provides
+  @SuppressLint("ThreadPoolCreation")
   static Executor executor() {
     return new SafeLoggingExecutor(Executors.newSingleThreadExecutor());
   }
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/ForcedSender.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/ForcedSender.java
new file mode 100644
index 00000000000..9bc141fed41
--- /dev/null
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/ForcedSender.java
@@ -0,0 +1,43 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 com.google.android.datatransport.runtime;
+
+import android.annotation.SuppressLint;
+import androidx.annotation.Discouraged;
+import androidx.annotation.WorkerThread;
+import com.google.android.datatransport.Priority;
+import com.google.android.datatransport.Transport;
+import com.google.android.datatransport.runtime.logging.Logging;
+
+@Discouraged(
+    message =
+        "TransportRuntime is not a realtime delivery system, don't use unless you absolutely must.")
+public final class ForcedSender {
+  private static final String LOG_TAG = "ForcedSender";
+
+  @SuppressLint("DiscouragedApi")
+  @WorkerThread
+  public static void sendBlocking(Transport<?> transport, Priority priority) {
+    if (transport instanceof TransportImpl) {
+      TransportContext context =
+          ((TransportImpl<?>) transport).getTransportContext().withPriority(priority);
+      TransportRuntime.getInstance().getUploader().logAndUpdateState(context, 1);
+    } else {
+      Logging.w(LOG_TAG, "Expected instance of `TransportImpl`, got `%s`.", transport);
+    }
+  }
+
+  private ForcedSender() {}
+}
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportContext.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportContext.java
index 4c78e3022c2..dda095660a6 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportContext.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportContext.java
@@ -29,6 +29,7 @@ public abstract class TransportContext {
   public abstract String getBackendName();
 
   @Nullable
+  @SuppressWarnings("mutable")
   public abstract byte[] getExtras();
 
   /**
@@ -72,7 +73,7 @@ public static Builder builder() {
    *
    * @hide
    */
-  @RestrictTo(RestrictTo.Scope.LIBRARY)
+  @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
   public TransportContext withPriority(Priority priority) {
     return builder()
         .setBackendName(getBackendName())
@@ -89,7 +90,7 @@ public abstract static class Builder {
     public abstract Builder setExtras(@Nullable byte[] extras);
 
     /** @hide */
-    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     public abstract Builder setPriority(Priority priority);
 
     public abstract TransportContext build();
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportImpl.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportImpl.java
index 621363126ce..96d0fb83ca8 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportImpl.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportImpl.java
@@ -57,4 +57,8 @@ public void schedule(Event<T> event, TransportScheduleCallback callback) {
             .build(),
         callback);
   }
+
+  TransportContext getTransportContext() {
+    return transportContext;
+  }
 }
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportRuntime.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportRuntime.java
index 76d811dee2b..c5678cb0d59 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportRuntime.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportRuntime.java
@@ -18,6 +18,7 @@
 import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.datatransport.Encoding;
+import com.google.android.datatransport.EventContext;
 import com.google.android.datatransport.TransportFactory;
 import com.google.android.datatransport.TransportScheduleCallback;
 import com.google.android.datatransport.runtime.scheduling.Scheduler;
@@ -141,7 +142,7 @@ private static Set<Encoding> getSupportedEncodings(Destination destination) {
     return Collections.singleton(Encoding.of("proto"));
   }
 
-  @RestrictTo(RestrictTo.Scope.LIBRARY)
+  @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
   public Uploader getUploader() {
     return uploader;
   }
@@ -155,12 +156,30 @@ public void send(SendRequest request, TransportScheduleCallback callback) {
   }
 
   private EventInternal convert(SendRequest request) {
-    return EventInternal.builder()
-        .setEventMillis(eventClock.getTime())
-        .setUptimeMillis(uptimeClock.getTime())
-        .setTransportName(request.getTransportName())
-        .setEncodedPayload(new EncodedPayload(request.getEncoding(), request.getPayload()))
-        .setCode(request.getEvent().getCode())
-        .build();
+    EventInternal.Builder builder =
+        EventInternal.builder()
+            .setEventMillis(eventClock.getTime())
+            .setUptimeMillis(uptimeClock.getTime())
+            .setTransportName(request.getTransportName())
+            .setEncodedPayload(new EncodedPayload(request.getEncoding(), request.getPayload()))
+            .setCode(request.getEvent().getCode());
+    if (request.getEvent().getProductData() != null
+        && request.getEvent().getProductData().getProductId() != null) {
+      builder.setProductId(request.getEvent().getProductData().getProductId());
+    }
+    if (request.getEvent().getEventContext() != null) {
+      EventContext eventContext = request.getEvent().getEventContext();
+      if (eventContext.getPseudonymousId() != null) {
+        builder.setPseudonymousId(eventContext.getPseudonymousId());
+      }
+      if (eventContext.getExperimentIdsClear() != null) {
+        builder.setExperimentIdsClear(eventContext.getExperimentIdsClear());
+      }
+      if (eventContext.getExperimentIdsEncrypted() != null) {
+        builder.setExperimentIdsEncrypted(eventContext.getExperimentIdsEncrypted());
+      }
+    }
+
+    return builder.build();
   }
 }
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/backends/BackendRequest.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/backends/BackendRequest.java
index ca5b9953aa1..288cd329544 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/backends/BackendRequest.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/backends/BackendRequest.java
@@ -25,6 +25,7 @@ public abstract class BackendRequest {
   public abstract Iterable<EventInternal> getEvents();
 
   @Nullable
+  @SuppressWarnings("mutable")
   public abstract byte[] getExtras();
 
   /** Creates a new instance of the request. */
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/logging/Logging.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/logging/Logging.java
index f46853f8f64..6af851fa375 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/logging/Logging.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/logging/Logging.java
@@ -14,40 +14,76 @@
 
 package com.google.android.datatransport.runtime.logging;
 
+import android.os.Build;
 import android.util.Log;
 
 public final class Logging {
+  private static final String LOG_PREFIX = "TRuntime.";
+  private static final int MAX_LOG_TAG_SIZE_IN_SDK_N = 23;
+
   private Logging() {}
 
   private static String getTag(String tag) {
-    return "TransportRuntime." + tag;
+    if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return concatTag(LOG_PREFIX, tag);
+
+    return LOG_PREFIX + tag;
+  }
+
+  private static String concatTag(String prefix, String tag) {
+    String concatText = prefix + tag;
+
+    if (concatText.length() > MAX_LOG_TAG_SIZE_IN_SDK_N)
+      concatText = concatText.substring(0, MAX_LOG_TAG_SIZE_IN_SDK_N);
+
+    return concatText;
   }
 
   public static void d(String tag, String message) {
-    Log.d(getTag(tag), message);
+    tag = getTag(tag);
+    if (Log.isLoggable(tag, Log.DEBUG)) {
+      Log.d(tag, message);
+    }
   }
 
   public static void d(String tag, String message, Object arg1) {
-    Log.d(getTag(tag), String.format(message, arg1));
+    tag = getTag(tag);
+    if (Log.isLoggable(tag, Log.DEBUG)) {
+      Log.d(tag, String.format(message, arg1));
+    }
   }
 
   public static void d(String tag, String message, Object arg1, Object arg2) {
-    Log.d(getTag(tag), String.format(message, arg1, arg2));
+    tag = getTag(tag);
+    if (Log.isLoggable(tag, Log.DEBUG)) {
+      Log.d(tag, String.format(message, arg1, arg2));
+    }
   }
 
   public static void d(String tag, String message, Object... args) {
-    Log.d(getTag(tag), String.format(message, args));
+    tag = getTag(tag);
+    if (Log.isLoggable(tag, Log.DEBUG)) {
+      Log.d(tag, String.format(message, args));
+    }
   }
 
-  public static void i(String tag, String message) {
-    Log.i(getTag(tag), message);
+  public static void i(String tag, String message, Object arg1) {
+    tag = getTag(tag);
+    if (Log.isLoggable(tag, Log.INFO)) {
+      Log.i(tag, String.format(message, arg1));
+    }
   }
 
   public static void e(String tag, String message, Throwable e) {
-    Log.e(getTag(tag), message, e);
+    tag = getTag(tag);
+    if (Log.isLoggable(tag, Log.ERROR)) {
+      Log.e(tag, message, e);
+    }
   }
 
   public static void w(String tag, String message, Object arg1) {
-    Log.w(getTag(tag), String.format(message, arg1));
+    tag = getTag(tag);
+    if (Log.isLoggable(tag, Log.WARN)) {
+      Log.w(tag, String.format(message, arg1));
+    }
   }
 }
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerScheduler.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerScheduler.java
index 95ef2914d16..1c7f4d21431 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerScheduler.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerScheduler.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.util.Base64;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.datatransport.runtime.TransportContext;
@@ -74,7 +75,12 @@ public AlarmManagerScheduler(
 
   @VisibleForTesting
   boolean isJobServiceOn(Intent intent) {
-    return (PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_NO_CREATE) != null);
+    int flags =
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+            ? PendingIntent.FLAG_NO_CREATE | PendingIntent.FLAG_IMMUTABLE
+            : PendingIntent.FLAG_NO_CREATE;
+
+    return (PendingIntent.getBroadcast(context, 0, intent, flags) != null);
   }
 
   @Override
@@ -109,9 +115,11 @@ public void schedule(TransportContext transportContext, int attemptNumber, boole
     }
 
     long backendTime = eventStore.getNextCallTime(transportContext);
+    boolean hasPendingEvents = force && eventStore.hasPendingEventsFor(transportContext);
 
     long scheduleDelay =
-        config.getScheduleDelay(transportContext.getPriority(), backendTime, attemptNumber);
+        config.getScheduleDelay(
+            transportContext.getPriority(), backendTime, attemptNumber, hasPendingEvents);
 
     Logging.d(
         LOG_TAG,
@@ -121,7 +129,12 @@ public void schedule(TransportContext transportContext, int attemptNumber, boole
         backendTime,
         attemptNumber);
 
-    PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, intent, 0);
+    PendingIntent pendingIntent =
+        PendingIntent.getBroadcast(
+            context,
+            0,
+            intent,
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_IMMUTABLE : 0);
     this.alarmManager.set(
         AlarmManager.ELAPSED_REALTIME, clock.getTime() + scheduleDelay, pendingIntent);
   }
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoScheduler.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoScheduler.java
index 8f1573ca7e1..14fc99f043a 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoScheduler.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoScheduler.java
@@ -115,6 +115,7 @@ public void schedule(TransportContext transportContext, int attemptNumber, boole
     }
 
     long nextCallTime = eventStore.getNextCallTime(transportContext);
+    boolean hasPendingEvents = force && eventStore.hasPendingEventsFor(transportContext);
 
     // Schedule the build.
     JobInfo.Builder builder =
@@ -122,7 +123,8 @@ public void schedule(TransportContext transportContext, int attemptNumber, boole
             new JobInfo.Builder(jobId, serviceComponent),
             transportContext.getPriority(),
             nextCallTime,
-            attemptNumber);
+            attemptNumber,
+            hasPendingEvents);
 
     PersistableBundle bundle = new PersistableBundle();
     bundle.putInt(ATTEMPT_NUMBER, attemptNumber);
@@ -138,7 +140,8 @@ public void schedule(TransportContext transportContext, int attemptNumber, boole
         "Scheduling upload for context %s with jobId=%d in %dms(Backend next call timestamp %d). Attempt %d",
         transportContext,
         jobId,
-        config.getScheduleDelay(transportContext.getPriority(), nextCallTime, attemptNumber),
+        config.getScheduleDelay(
+            transportContext.getPriority(), nextCallTime, attemptNumber, hasPendingEvents),
         nextCallTime,
         attemptNumber);
 
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/SchedulerConfig.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/SchedulerConfig.java
index 09e701eebf5..f07f3cd8443 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/SchedulerConfig.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/SchedulerConfig.java
@@ -86,7 +86,7 @@ public static SchedulerConfig getDefault(Clock clock) {
             ConfigValue.builder()
                 .setDelta(TWENTY_FOUR_HOURS)
                 .setMaxAllowedDelay(TWENTY_FOUR_HOURS)
-                .setFlags(immutableSetOf(Flag.NETWORK_UNMETERED, Flag.DEVICE_IDLE))
+                .setFlags(immutableSetOf(Flag.DEVICE_IDLE))
                 .build())
         .setClock(clock)
         .build();
@@ -133,14 +133,21 @@ public SchedulerConfig build() {
     }
   }
 
-  public long getScheduleDelay(Priority priority, long minTimestamp, int attemptNumber) {
+  public long getScheduleDelay(
+      Priority priority, long minTimestamp, int attemptNumber, boolean skipDelta) {
     long timeDiff = minTimestamp - getClock().getTime();
     ConfigValue config = getValues().get(priority);
 
-    long delay = Math.max(adjustedExponentialBackoff(attemptNumber, config.getDelta()), timeDiff);
+    long delta = (skipDelta) ? 1 : config.getDelta();
+
+    long delay = Math.max(adjustedExponentialBackoff(attemptNumber, delta), timeDiff);
     return Math.min(delay, config.getMaxAllowedDelay());
   }
 
+  public long getScheduleDelay(Priority priority, long minTimestamp, int attemptNumber) {
+    return getScheduleDelay(priority, minTimestamp, attemptNumber, false);
+  }
+
   private long adjustedExponentialBackoff(int attemptNumber, long delta) {
     int attemptCoefficient = attemptNumber - 1;
     long deltaOr2 = delta > 1 ? delta : 2;
@@ -153,13 +160,23 @@ private long adjustedExponentialBackoff(int attemptNumber, long delta) {
 
   @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   public JobInfo.Builder configureJob(
-      JobInfo.Builder builder, Priority priority, long minimumTimestamp, int attemptNumber) {
-    long latency = getScheduleDelay(priority, minimumTimestamp, attemptNumber);
+      JobInfo.Builder builder,
+      Priority priority,
+      long minimumTimestamp,
+      int attemptNumber,
+      boolean skipDelta) {
+    long latency = getScheduleDelay(priority, minimumTimestamp, attemptNumber, skipDelta);
     builder.setMinimumLatency(latency); // wait at least
     populateFlags(builder, getValues().get(priority).getFlags());
     return builder;
   }
 
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+  public JobInfo.Builder configureJob(
+      JobInfo.Builder builder, Priority priority, long minimumTimestamp, int attemptNumber) {
+    return configureJob(builder, priority, minimumTimestamp, attemptNumber, false);
+  }
+
   @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   private void populateFlags(JobInfo.Builder builder, Set<SchedulerConfig.Flag> flags) {
     if (flags.contains(SchedulerConfig.Flag.NETWORK_UNMETERED)) {
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/Uploader.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/Uploader.java
index 49a41c51270..e754c2330c3 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/Uploader.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/Uploader.java
@@ -17,6 +17,8 @@
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.datatransport.Encoding;
 import com.google.android.datatransport.runtime.EncodedPayload;
@@ -37,10 +39,12 @@
 import com.google.android.datatransport.runtime.time.Clock;
 import com.google.android.datatransport.runtime.time.Monotonic;
 import com.google.android.datatransport.runtime.time.WallTime;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.Executor;
 import javax.inject.Inject;
 
@@ -111,20 +115,24 @@ public void upload(TransportContext transportContext, int attemptNumber, Runnabl
         });
   }
 
-  void logAndUpdateState(TransportContext transportContext, int attemptNumber) {
+  @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+  @CanIgnoreReturnValue
+  public BackendResponse logAndUpdateState(TransportContext transportContext, int attemptNumber) {
     TransportBackend backend = backendRegistry.get(transportContext.getBackendName());
     long maxNextRequestWaitMillis = 0;
 
+    BackendResponse response = BackendResponse.ok(maxNextRequestWaitMillis);
     while (guard.runCriticalSection(() -> eventStore.hasPendingEventsFor(transportContext))) {
       Iterable<PersistedEvent> persistedEvents =
           guard.runCriticalSection(() -> eventStore.loadBatch(transportContext));
 
+      List<PersistedEvent> sentEvents = new ArrayList<>();
+
       // Do not make a call to the backend if the list is empty.
       if (!persistedEvents.iterator().hasNext()) {
-        return;
+        return response;
       }
 
-      BackendResponse response;
       if (backend == null) {
         Logging.d(
             LOG_TAG, "Unknown backend for %s, deleting event batch for it...", transportContext);
@@ -132,12 +140,21 @@ void logAndUpdateState(TransportContext transportContext, int attemptNumber) {
       } else {
         List<EventInternal> eventInternals = new ArrayList<>();
 
+        PersistedEvent oldestEvent = persistedEvents.iterator().next();
+        String targetPseudonymousId = oldestEvent.getEvent().getPseudonymousId();
+
         for (PersistedEvent persistedEvent : persistedEvents) {
-          eventInternals.add(persistedEvent.getEvent());
+          EventInternal event = persistedEvent.getEvent();
+          String pseudonymousId = event.getPseudonymousId();
+
+          if (Objects.equals(targetPseudonymousId, pseudonymousId)) {
+            eventInternals.add(event);
+            sentEvents.add(persistedEvent);
+          }
         }
 
         if (transportContext.shouldUploadClientHealthMetrics()) {
-          eventInternals.add(createMetricsEvent(backend));
+          eventInternals.add(createMetricsEvent(backend, targetPseudonymousId));
         }
 
         response =
@@ -151,17 +168,17 @@ void logAndUpdateState(TransportContext transportContext, int attemptNumber) {
         long finalMaxNextRequestWaitMillis1 = maxNextRequestWaitMillis;
         guard.runCriticalSection(
             () -> {
-              eventStore.recordFailure(persistedEvents);
+              eventStore.recordFailure(sentEvents);
               eventStore.recordNextCallTime(
                   transportContext, clock.getTime() + finalMaxNextRequestWaitMillis1);
               return null;
             });
         workScheduler.schedule(transportContext, attemptNumber + 1, true);
-        return;
+        return response;
       } else {
         guard.runCriticalSection(
             () -> {
-              eventStore.recordSuccess(persistedEvents);
+              eventStore.recordSuccess(sentEvents);
               return null;
             });
         if (response.getStatus() == BackendResponse.Status.OK) {
@@ -174,10 +191,11 @@ void logAndUpdateState(TransportContext transportContext, int attemptNumber) {
                   return null;
                 });
           }
+          break;
         } else if (response.getStatus() == BackendResponse.Status.INVALID_PAYLOAD) {
           Map<String, Integer> countMap = new HashMap<>();
-          for (PersistedEvent persistedEvent : persistedEvents) {
-            String logSource = persistedEvent.getEvent().getTransportName();
+          for (PersistedEvent sentEvent : sentEvents) {
+            String logSource = sentEvent.getEvent().getTransportName();
             if (!countMap.containsKey(logSource)) {
               countMap.put(logSource, 1);
             } else {
@@ -202,10 +220,16 @@ void logAndUpdateState(TransportContext transportContext, int attemptNumber) {
               transportContext, clock.getTime() + finalMaxNextRequestWaitMillis);
           return null;
         });
+
+    if (eventStore.hasPendingEventsFor(transportContext)) {
+      workScheduler.schedule(transportContext, attemptNumber, true);
+    }
+    return response;
   }
 
   @VisibleForTesting
-  public EventInternal createMetricsEvent(TransportBackend backend) {
+  public EventInternal createMetricsEvent(
+      TransportBackend backend, @Nullable String pseudonymousId) {
     ClientMetrics clientMetrics =
         guard.runCriticalSection(clientHealthMetricsStore::loadClientMetrics);
     return backend.decorate(
@@ -213,6 +237,7 @@ public EventInternal createMetricsEvent(TransportBackend backend) {
             .setEventMillis(clock.getTime())
             .setUptimeMillis(uptimeClock.getTime())
             .setTransportName(CLIENT_HEALTH_METRICS_LOG_SOURCE)
+            .setPseudonymousId(pseudonymousId)
             .setEncodedPayload(
                 new EncodedPayload(Encoding.of("proto"), clientMetrics.toByteArray()))
             .build());
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/EventStore.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/EventStore.java
index cb6939cd819..bd984c60f66 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/EventStore.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/EventStore.java
@@ -47,7 +47,10 @@ public interface EventStore extends Closeable {
   /** Returns true if the store contains any pending events for a give backend. */
   boolean hasPendingEventsFor(TransportContext transportContext);
 
-  /** Load all pending events for a given backend. */
+  /**
+   * Load all pending events for a given backend. Events with different priority may be added to a
+   * batch.
+   */
   Iterable<PersistedEvent> loadBatch(TransportContext transportContext);
 
   /** Load all {@link TransportContext}s that have pending events. */
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/EventStoreModule.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/EventStoreModule.java
index dfdf98376d3..31d157f24eb 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/EventStoreModule.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/EventStoreModule.java
@@ -20,6 +20,7 @@
 import dagger.Module;
 import dagger.Provides;
 import javax.inject.Named;
+import javax.inject.Singleton;
 
 @Module
 public abstract class EventStoreModule {
@@ -51,6 +52,7 @@ static String dbName() {
   }
 
   @Provides
+  @Singleton
   @Named("PACKAGE_NAME")
   static String packageName(Context context) {
     return context.getPackageName();
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore.java
index 6ff1591bd3a..2f3d89ebda5 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore.java
@@ -25,6 +25,7 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
 import com.google.android.datatransport.Encoding;
+import com.google.android.datatransport.Priority;
 import com.google.android.datatransport.runtime.EncodedPayload;
 import com.google.android.datatransport.runtime.EventInternal;
 import com.google.android.datatransport.runtime.TransportContext;
@@ -41,7 +42,6 @@
 import com.google.android.datatransport.runtime.time.Monotonic;
 import com.google.android.datatransport.runtime.time.WallTime;
 import com.google.android.datatransport.runtime.util.PriorityMapping;
-import dagger.Lazy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -53,6 +53,7 @@
 import java.util.Set;
 import javax.inject.Inject;
 import javax.inject.Named;
+import javax.inject.Provider;
 import javax.inject.Singleton;
 
 /** {@link EventStore} implementation backed by a SQLite database. */
@@ -72,7 +73,7 @@ public class SQLiteEventStore
   private final Clock wallClock;
   private final Clock monotonicClock;
   private final EventStoreConfig config;
-  private final Lazy<String> packageName;
+  private final Provider<String> packageName;
 
   @Inject
   SQLiteEventStore(
@@ -80,7 +81,7 @@ public class SQLiteEventStore
       @Monotonic Clock clock,
       EventStoreConfig config,
       SchemaManager schemaManager,
-      @Named("PACKAGE_NAME") Lazy<String> packageName) {
+      @Named("PACKAGE_NAME") Provider<String> packageName) {
 
     this.schemaManager = schemaManager;
     this.wallClock = wallClock;
@@ -134,6 +135,10 @@ public PersistedEvent persist(TransportContext transportContext, EventInternal e
               values.put("num_attempts", 0);
               values.put("inline", inline);
               values.put("payload", inline ? payloadBytes : new byte[0]);
+              values.put("product_id", event.getProductId());
+              values.put("pseudonymous_id", event.getPseudonymousId());
+              values.put("experiment_ids_clear_blob", event.getExperimentIdsClear());
+              values.put("experiment_ids_encrypted_blob", event.getExperimentIdsEncrypted());
               long newEventId = db.insert("events", null, values);
               if (!inline) {
                 int numChunks = (int) Math.ceil((double) payloadBytes.length / maxBlobSizePerRow);
@@ -338,7 +343,19 @@ public void recordNextCallTime(TransportContext transportContext, long timestamp
   public Iterable<PersistedEvent> loadBatch(TransportContext transportContext) {
     return inTransaction(
         db -> {
-          List<PersistedEvent> events = loadEvents(db, transportContext);
+          List<PersistedEvent> events = loadEvents(db, transportContext, config.getLoadBatchSize());
+          for (Priority p : Priority.values()) {
+            if (p == transportContext.getPriority()) {
+              continue;
+            }
+            int space = config.getLoadBatchSize() - events.size();
+            if (space <= 0) {
+              break;
+            }
+            List<PersistedEvent> additional =
+                loadEvents(db, transportContext.withPriority(p), space);
+            events.addAll(additional);
+          }
           return join(events, loadMetadata(db, events));
         });
   }
@@ -415,7 +432,8 @@ private static byte[] maybeBase64Decode(@Nullable String value) {
   }
 
   /** Loads all events for a backend. */
-  private List<PersistedEvent> loadEvents(SQLiteDatabase db, TransportContext transportContext) {
+  private List<PersistedEvent> loadEvents(
+      SQLiteDatabase db, TransportContext transportContext, int limit) {
     List<PersistedEvent> events = new ArrayList<>();
     Long contextId = getTransportContextId(db, transportContext);
     if (contextId == null) {
@@ -434,13 +452,17 @@ private List<PersistedEvent> loadEvents(SQLiteDatabase db, TransportContext tran
               "payload",
               "code",
               "inline",
+              "product_id",
+              "pseudonymous_id",
+              "experiment_ids_clear_blob",
+              "experiment_ids_encrypted_blob",
             },
             "context_id = ?",
             new String[] {contextId.toString()},
             null,
             null,
             null,
-            String.valueOf(config.getLoadBatchSize())),
+            String.valueOf(limit)),
         cursor -> {
           while (cursor.moveToNext()) {
             long id = cursor.getLong(0);
@@ -460,6 +482,18 @@ private List<PersistedEvent> loadEvents(SQLiteDatabase db, TransportContext tran
             if (!cursor.isNull(6)) {
               event.setCode(cursor.getInt(6));
             }
+            if (!cursor.isNull(8)) {
+              event.setProductId(cursor.getInt(8));
+            }
+            if (!cursor.isNull(9)) {
+              event.setPseudonymousId(cursor.getString(9));
+            }
+            if (!cursor.isNull(10)) {
+              event.setExperimentIdsClear(cursor.getBlob(10));
+            }
+            if (!cursor.isNull(11)) {
+              event.setExperimentIdsEncrypted(cursor.getBlob(11));
+            }
             events.add(PersistedEvent.create(id, transportContext, event.build()));
           }
           return null;
@@ -666,13 +700,15 @@ public ClientMetrics loadClientMetrics() {
                                 .build());
                   }
                   populateLogSourcesMetrics(clientMetricsBuilder, metricsMap);
-                  clientMetricsBuilder.setWindow(getTimeWindow());
-                  clientMetricsBuilder.setGlobalMetrics(getGlobalMetrics());
-                  clientMetricsBuilder.setAppNamespace(packageName.get());
-                  return clientMetricsBuilder.build();
+                  return clientMetricsBuilder
+                      .setWindow(getTimeWindow())
+                      .setGlobalMetrics(getGlobalMetrics())
+                      .setAppNamespace(packageName.get())
+                      .build();
                 }));
   }
 
+  @SuppressWarnings("CheckReturnValue")
   private void populateLogSourcesMetrics(
       ClientMetrics.Builder clientMetricsBuilder, Map<String, List<LogEventDropped>> metricsMap) {
     for (Map.Entry<String, List<LogEventDropped>> entry : metricsMap.entrySet()) {
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManager.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManager.java
index 2076d2824e4..90c965d661b 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManager.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManager.java
@@ -101,7 +101,7 @@ final class SchemaManager extends SQLiteOpenHelper {
   private static final String DROP_GLOBAL_LOG_EVENT_STATE_SQL =
       "DROP TABLE IF EXISTS global_log_event_state";
 
-  static int SCHEMA_VERSION = 5;
+  static int SCHEMA_VERSION = 7;
 
   private static final SchemaManager.Migration MIGRATE_TO_V1 =
       (db) -> {
@@ -138,8 +138,25 @@ final class SchemaManager extends SQLiteOpenHelper {
         db.execSQL(CREATE_INITIAL_GLOBAL_LOG_EVENT_STATE_VALUE_SQL);
       };
 
+  private static final SchemaManager.Migration MIGRATE_TO_V6 =
+      db -> db.execSQL("ALTER TABLE events ADD COLUMN product_id INTEGER");
+
+  private static final SchemaManager.Migration MIGRATE_TO_V7 =
+      db -> {
+        db.execSQL("ALTER TABLE events ADD COLUMN pseudonymous_id TEXT");
+        db.execSQL("ALTER TABLE events ADD COLUMN experiment_ids_clear_blob BLOB");
+        db.execSQL("ALTER TABLE events ADD COLUMN experiment_ids_encrypted_blob BLOB");
+      };
+
   private static final List<Migration> INCREMENTAL_MIGRATIONS =
-      Arrays.asList(MIGRATE_TO_V1, MIGRATE_TO_V2, MIGRATE_TO_V3, MIGRATE_TO_V4, MIGRATION_TO_V5);
+      Arrays.asList(
+          MIGRATE_TO_V1,
+          MIGRATE_TO_V2,
+          MIGRATE_TO_V3,
+          MIGRATE_TO_V4,
+          MIGRATION_TO_V5,
+          MIGRATE_TO_V6,
+          MIGRATE_TO_V7);
 
   @Inject
   SchemaManager(
diff --git a/transport/transport-runtime/src/test/AndroidManifest.xml b/transport/transport-runtime/src/test/AndroidManifest.xml
index 4d8d7fdaf2e..40c11dbbc53 100644
--- a/transport/transport-runtime/src/test/AndroidManifest.xml
+++ b/transport/transport-runtime/src/test/AndroidManifest.xml
@@ -12,10 +12,9 @@
 <!-- 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="com.google.android.datatransport.runtime.tests">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="21"/>-->
 
     <application>
         <service
diff --git a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/TransportRuntimeTest.java b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/TransportRuntimeTest.java
index 9ed05c4553c..f8d18602559 100644
--- a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/TransportRuntimeTest.java
+++ b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/TransportRuntimeTest.java
@@ -28,6 +28,8 @@
 import androidx.annotation.Nullable;
 import com.google.android.datatransport.Encoding;
 import com.google.android.datatransport.Event;
+import com.google.android.datatransport.EventContext;
+import com.google.android.datatransport.ProductData;
 import com.google.android.datatransport.Transformer;
 import com.google.android.datatransport.Transport;
 import com.google.android.datatransport.TransportFactory;
@@ -55,6 +57,7 @@
 public class TransportRuntimeTest {
   private static final String TEST_KEY = "test";
   private static final String TEST_VALUE = "test-value";
+  private static int TEST_PRODUCT_ID = 98765;
   private static final Encoding PROTOBUF_ENCODING = Encoding.of("proto");
   private static final long EVENT_MILLIS = 3;
   private static final long UPTIME_MILLIS = 1;
@@ -72,6 +75,10 @@ public <T> T runCriticalSection(CriticalSection<T> criticalSection) {
           return criticalSection.execute();
         }
       };
+  private static final String PSEUDONYMOUS_ID = "pseudonymous id";
+  private byte[] EXPERIMENT_IDS_CLEAR = "experiment ids clear".getBytes(Charset.defaultCharset());
+  private byte[] EXPERIMENT_IDS_ENCRYPTED =
+      "experiment ids encrypted".getBytes(Charset.defaultCharset());
 
   private static class StatefulTransportScheduleCallback implements TransportScheduleCallback {
     public boolean called = false;
@@ -96,7 +103,15 @@ public void testTransportInternalSend() {
     TransportFactory factory =
         new TransportFactoryImpl(
             Collections.singleton(PROTOBUF_ENCODING), transportContext, transportInternalMock);
-    Event<String> event = Event.ofTelemetry("TelemetryData");
+    Event<String> event =
+        Event.ofTelemetry(
+            "TelemetryData",
+            ProductData.withProductId(TEST_PRODUCT_ID),
+            EventContext.builder()
+                .setPseudonymousId(PSEUDONYMOUS_ID)
+                .setExperimentIdsClear(EXPERIMENT_IDS_CLEAR)
+                .setExperimentIdsEncrypted(EXPERIMENT_IDS_ENCRYPTED)
+                .build());
     Transformer<String, byte[]> transformer = String::getBytes;
     Transport<String> transport = factory.getTransport(testTransport, String.class, transformer);
 
@@ -137,7 +152,16 @@ public void testTransportRuntimeBackendDiscovery() {
     TransportFactory factory = runtime.newFactory(mockBackendName);
     Transport<String> transport =
         factory.getTransport(testTransport, String.class, String::getBytes);
-    Event<String> stringEvent = Event.ofTelemetry(12, "TelemetryData");
+    Event<String> stringEvent =
+        Event.ofTelemetry(
+            12,
+            "TelemetryData",
+            ProductData.withProductId(TEST_PRODUCT_ID),
+            EventContext.builder()
+                .setPseudonymousId(PSEUDONYMOUS_ID)
+                .setExperimentIdsClear(EXPERIMENT_IDS_CLEAR)
+                .setExperimentIdsEncrypted(EXPERIMENT_IDS_ENCRYPTED)
+                .build());
     EventInternal expectedEvent =
         EventInternal.builder()
             .setEventMillis(EVENT_MILLIS)
@@ -147,6 +171,10 @@ public void testTransportRuntimeBackendDiscovery() {
                 new EncodedPayload(
                     PROTOBUF_ENCODING, "TelemetryData".getBytes(Charset.defaultCharset())))
             .setCode(12)
+            .setProductId(TEST_PRODUCT_ID)
+            .setPseudonymousId(PSEUDONYMOUS_ID)
+            .setExperimentIdsClear(EXPERIMENT_IDS_CLEAR)
+            .setExperimentIdsEncrypted(EXPERIMENT_IDS_ENCRYPTED)
             .build();
 
     StatefulTransportScheduleCallback callback = new StatefulTransportScheduleCallback();
@@ -183,7 +211,16 @@ public void testTransportRuntimeTaskFailure() {
     TransportFactory factory = runtime.newFactory(mockBackendName);
     Transport<String> transport =
         factory.getTransport(testTransport, String.class, String::getBytes);
-    Event<String> stringEvent = Event.ofTelemetry(12, "TelemetryData");
+    Event<String> stringEvent =
+        Event.ofTelemetry(
+            12,
+            "TelemetryData",
+            ProductData.withProductId(TEST_PRODUCT_ID),
+            EventContext.builder()
+                .setPseudonymousId(PSEUDONYMOUS_ID)
+                .setExperimentIdsClear(EXPERIMENT_IDS_CLEAR)
+                .setExperimentIdsEncrypted(EXPERIMENT_IDS_ENCRYPTED)
+                .build());
 
     StatefulTransportScheduleCallback callback = new StatefulTransportScheduleCallback();
     transport.schedule(stringEvent, callback);
@@ -218,7 +255,16 @@ public void testTransportRuntimeTaskUsingDefaultScheduler() {
     TransportFactory factory = runtime.newFactory(mockBackendName);
     Transport<String> transport =
         factory.getTransport(testTransport, String.class, String::getBytes);
-    Event<String> stringEvent = Event.ofTelemetry(12, "TelemetryData");
+    Event<String> stringEvent =
+        Event.ofTelemetry(
+            12,
+            "TelemetryData",
+            ProductData.withProductId(TEST_PRODUCT_ID),
+            EventContext.builder()
+                .setPseudonymousId(PSEUDONYMOUS_ID)
+                .setExperimentIdsClear(EXPERIMENT_IDS_CLEAR)
+                .setExperimentIdsEncrypted(EXPERIMENT_IDS_ENCRYPTED)
+                .build());
     EventInternal expectedEvent =
         EventInternal.builder()
             .setEventMillis(EVENT_MILLIS)
@@ -228,6 +274,10 @@ public void testTransportRuntimeTaskUsingDefaultScheduler() {
                 new EncodedPayload(
                     PROTOBUF_ENCODING, "TelemetryData".getBytes(Charset.defaultCharset())))
             .setCode(12)
+            .setProductId(TEST_PRODUCT_ID)
+            .setPseudonymousId(PSEUDONYMOUS_ID)
+            .setExperimentIdsClear(EXPERIMENT_IDS_CLEAR)
+            .setExperimentIdsEncrypted(EXPERIMENT_IDS_ENCRYPTED)
             .build();
 
     StatefulTransportScheduleCallback callback = new StatefulTransportScheduleCallback();
@@ -261,7 +311,8 @@ public void testTransportRuntimeTaskFailsUsingDefaultScheduler() {
     TransportFactory factory = runtime.newFactory(mockBackendName);
     Transport<String> transport =
         factory.getTransport(testTransport, String.class, String::getBytes);
-    Event<String> stringEvent = Event.ofTelemetry(12, "TelemetryData");
+    Event<String> stringEvent =
+        Event.ofTelemetry(12, "TelemetryData", ProductData.withProductId(TEST_PRODUCT_ID));
 
     StatefulTransportScheduleCallback callback = new StatefulTransportScheduleCallback();
     transport.schedule(stringEvent, callback);
diff --git a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerSchedulerTest.java b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerSchedulerTest.java
index 0bc67856876..ac6293f9de3 100644
--- a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerSchedulerTest.java
+++ b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/AlarmManagerSchedulerTest.java
@@ -31,7 +31,10 @@
 import android.net.Uri;
 import android.util.Base64;
 import androidx.test.core.app.ApplicationProvider;
+import com.google.android.datatransport.Encoding;
 import com.google.android.datatransport.Priority;
+import com.google.android.datatransport.runtime.EncodedPayload;
+import com.google.android.datatransport.runtime.EventInternal;
 import com.google.android.datatransport.runtime.TransportContext;
 import com.google.android.datatransport.runtime.scheduling.persistence.EventStore;
 import com.google.android.datatransport.runtime.scheduling.persistence.InMemoryEventStore;
@@ -158,7 +161,7 @@ public void schedule_twoJobs() {
   }
 
   @Test
-  public void schedule_whenExtrasEvailable_transmitsExtras() {
+  public void schedule_whenExtrasAvailable_transmitsExtras() {
     TransportContext transportContext =
         TransportContext.builder()
             .setBackendName("backend1")
@@ -171,7 +174,7 @@ public void schedule_whenExtrasEvailable_transmitsExtras() {
   }
 
   @Test
-  public void schedule_smallWaitTImeFirstAttempt_multiplePriorities() {
+  public void schedule_smallWaitTimeFirstAttempt_multiplePriorities() {
     Intent intent1 = getIntent(TRANSPORT_CONTEXT);
     Intent intent2 = getIntent(UNMETERED_TRANSPORT_CONTEXT);
     store.recordNextCallTime(TRANSPORT_CONTEXT, 5);
@@ -193,4 +196,24 @@ public void schedule_smallWaitTImeFirstAttempt_multiplePriorities() {
             eq(INITIAL_TIMESTAMP + TWENTY_FOUR_HOURS),
             any()); // 2^0*DELTA
   }
+
+  @Test
+  public void schedule_shouldExcludeThePriorityDelta_whenForcedAndPending() {
+    TransportContext context = TransportContext.builder().setBackendName("backend1").build();
+    EventInternal event =
+        EventInternal.builder()
+            .setEventMillis(1)
+            .setUptimeMillis(1)
+            .setTransportName("")
+            .setEncodedPayload(
+                new EncodedPayload(
+                    Encoding.of("proto"), "World".getBytes(Charset.defaultCharset())))
+            .build();
+
+    store.persist(context, event);
+    scheduler.schedule(TRANSPORT_CONTEXT, 1, true);
+
+    verify(alarmManager, times(1))
+        .set(eq(AlarmManager.ELAPSED_REALTIME), eq(INITIAL_TIMESTAMP + 1), any());
+  }
 }
diff --git a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoSchedulerTest.java b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoSchedulerTest.java
index eb2a862e0b5..197daa2747c 100644
--- a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoSchedulerTest.java
+++ b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoSchedulerTest.java
@@ -23,7 +23,10 @@
 import android.os.PersistableBundle;
 import android.util.Base64;
 import androidx.test.core.app.ApplicationProvider;
+import com.google.android.datatransport.Encoding;
 import com.google.android.datatransport.Priority;
+import com.google.android.datatransport.runtime.EncodedPayload;
+import com.google.android.datatransport.runtime.EventInternal;
 import com.google.android.datatransport.runtime.TransportContext;
 import com.google.android.datatransport.runtime.scheduling.persistence.EventStore;
 import com.google.android.datatransport.runtime.scheduling.persistence.InMemoryEventStore;
@@ -164,7 +167,7 @@ public void schedule_twoJobs() {
   }
 
   @Test
-  public void schedule_whenExtrasEvailable_transmitsExtras() {
+  public void schedule_whenExtrasAvailable_transmitsExtras() {
     String extras = "e1";
     TransportContext transportContext =
         TransportContext.builder()
@@ -214,7 +217,7 @@ public void schedule_withMultipleContexts_whenExtrasAvailable_schedulesForBothCo
   }
 
   @Test
-  public void schedule_smallWaitTImeFirstAttempt_multiplePriorities() {
+  public void schedule_smallWaitTimeFirstAttempt_multiplePriorities() {
     store.recordNextCallTime(TRANSPORT_CONTEXT, 5);
     scheduler.schedule(TRANSPORT_CONTEXT, 1);
     scheduler.schedule(UNMETERED_TRANSPORT_CONTEXT, 1);
@@ -245,4 +248,26 @@ public void schedule_smallWaitTImeFirstAttempt_multiplePriorities() {
         .isEqualTo(PriorityMapping.toInt(Priority.VERY_LOW));
     assertThat(bundle2.get(JobInfoScheduler.ATTEMPT_NUMBER)).isEqualTo(1);
   }
+
+  @Test
+  public void schedule_shouldExcludeThePriorityDelta_whenForcedAndPending() {
+    TransportContext context = TransportContext.builder().setBackendName("backend1").build();
+    EventInternal event =
+        EventInternal.builder()
+            .setEventMillis(1)
+            .setUptimeMillis(1)
+            .setTransportName("")
+            .setEncodedPayload(
+                new EncodedPayload(
+                    Encoding.of("proto"), "World".getBytes(Charset.defaultCharset())))
+            .build();
+
+    store.persist(context, event);
+    scheduler.schedule(TRANSPORT_CONTEXT, 1, true);
+
+    assertThat(jobScheduler.getAllPendingJobs()).hasSize(1);
+    JobInfo jobInfo = jobScheduler.getAllPendingJobs().get(0);
+
+    assertThat(jobInfo.getMinLatencyMillis()).isEqualTo(1);
+  }
 }
diff --git a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/UploaderTest.java b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/UploaderTest.java
index 7d4467f1c87..f3b0e999842 100644
--- a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/UploaderTest.java
+++ b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/UploaderTest.java
@@ -41,6 +41,10 @@
 import com.google.android.datatransport.runtime.synchronization.SynchronizationGuard;
 import java.nio.charset.Charset;
 import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -90,7 +94,7 @@ public <T> T runCriticalSection(CriticalSection<T> criticalSection) {
           .build();
   private static final int MANY_EVENT_COUNT = 1000;
 
-  private final EventStore store = spy(new InMemoryEventStore());
+  private final InMemoryEventStore store = spy(new InMemoryEventStore());
   private final EventStore mockStore = mock(EventStore.class);
   private BackendRegistry mockRegistry = mock(BackendRegistry.class);
   private TransportBackend mockBackend = mock(TransportBackend.class);
@@ -111,10 +115,27 @@ public <T> T runCriticalSection(CriticalSection<T> criticalSection) {
               () -> 2,
               mockClientHealthMetricsStore));
 
+  private EventInternal makeEventWithPseudonymousId(String id) {
+    return EventInternal.builder()
+        .setTransportName("43")
+        .setEventMillis(1)
+        .setUptimeMillis(2)
+        .setEncodedPayload(
+            new EncodedPayload(Encoding.of("proto"), "Hello".getBytes(Charset.defaultCharset())))
+        .addMetadata("key1", "value1")
+        .addMetadata("key2", "value2")
+        .setPseudonymousId(id)
+        .build();
+  }
+
   @Before
   public void setUp() {
     when(mockRegistry.get(BACKEND_NAME)).thenReturn(mockBackend);
-    store.persist(TRANSPORT_CONTEXT, EVENT);
+  }
+
+  @After
+  public void cleanUp() {
+    store.reset();
   }
 
   @Test
@@ -137,6 +158,7 @@ public void upload_yesNetwork() {
 
   @Test
   public void logAndUpdateStatus_okResponse() {
+    store.persist(TRANSPORT_CONTEXT, EVENT);
     when(mockBackend.send(any())).thenReturn(BackendResponse.ok(1000));
     uploader.logAndUpdateState(TRANSPORT_CONTEXT, 1);
     verify(store, times(1)).recordSuccess(any());
@@ -145,6 +167,7 @@ public void logAndUpdateStatus_okResponse() {
 
   @Test
   public void logAndUpdateStatus_nontransientResponse() {
+    store.persist(TRANSPORT_CONTEXT, EVENT);
     when(mockBackend.send(any())).thenReturn(BackendResponse.fatalError());
     uploader.logAndUpdateState(TRANSPORT_CONTEXT, 1);
     verify(store, times(1)).recordSuccess(any());
@@ -152,6 +175,7 @@ public void logAndUpdateStatus_nontransientResponse() {
 
   @Test
   public void logAndUpdateStatus_transientReponse() {
+    store.persist(TRANSPORT_CONTEXT, EVENT);
     when(mockBackend.send(any())).thenReturn(BackendResponse.transientError());
     uploader.logAndUpdateState(TRANSPORT_CONTEXT, 1);
     verify(store, times(1)).recordFailure(any());
@@ -161,6 +185,7 @@ public void logAndUpdateStatus_transientReponse() {
   @Test
   public void
       upload_singleEvent_withInvalidPayloadResponse_shouldRecordLogEventDroppedDueToInvalidPayload() {
+    store.persist(TRANSPORT_CONTEXT, EVENT);
     when(mockBackend.send(any())).thenReturn(BackendResponse.invalidPayload());
     uploader.upload(TRANSPORT_CONTEXT, 1, mockRunnable);
     verify(mockClientHealthMetricsStore, times(1))
@@ -171,6 +196,7 @@ public void logAndUpdateStatus_transientReponse() {
   public void
       upload_multipleEvents_withInvalidPayloadResponse_shouldRecordLogEventDroppedDueToInvalidPayload() {
     store.persist(TRANSPORT_CONTEXT, EVENT);
+    store.persist(TRANSPORT_CONTEXT, EVENT);
     store.persist(TRANSPORT_CONTEXT, ANOTHER_EVENT);
     when(mockBackend.send(any())).thenReturn(BackendResponse.invalidPayload());
     uploader.upload(TRANSPORT_CONTEXT, 1, mockRunnable);
@@ -220,4 +246,101 @@ public void upload_toFlgServer_shouldIncludeClientHealthMetrics() {
                   return false;
                 })));
   }
+
+  @Test
+  public void upload_shouldBatchSamePseudonymousIds() {
+    String targetId = "myId";
+    String alternativeId = "otherId";
+
+    EventInternal oldestEvent = makeEventWithPseudonymousId(targetId);
+    EventInternal siblingEvent = makeEventWithPseudonymousId(targetId);
+    EventInternal otherEvent = makeEventWithPseudonymousId(alternativeId);
+
+    when(mockBackend.send(any())).thenReturn(BackendResponse.ok(1000));
+
+    store.persist(TRANSPORT_CONTEXT, oldestEvent);
+    store.persist(TRANSPORT_CONTEXT, EVENT);
+    store.persist(TRANSPORT_CONTEXT, siblingEvent);
+    store.persist(TRANSPORT_CONTEXT, otherEvent);
+
+    List<EventInternal> targetEvents = Arrays.asList(oldestEvent, siblingEvent);
+
+    uploader.logAndUpdateState(TRANSPORT_CONTEXT, 1);
+    verify(mockBackend, times(1))
+        .send(
+            argThat(
+                (backendRequest -> {
+                  List<EventInternal> events =
+                      StreamSupport.stream(backendRequest.getEvents().spliterator(), false)
+                          .collect(Collectors.toList());
+
+                  return events.equals(targetEvents);
+                })));
+  }
+
+  @Test
+  public void upload_shouldLeaveOtherPseudonymousIds() {
+    String targetId = "myId";
+    String alternativeId = "otherId";
+
+    EventInternal oldestEvent = makeEventWithPseudonymousId(targetId);
+    EventInternal otherEvent = makeEventWithPseudonymousId(alternativeId);
+
+    when(mockBackend.send(any())).thenReturn(BackendResponse.ok(1000));
+
+    store.persist(TRANSPORT_CONTEXT, oldestEvent);
+    store.persist(TRANSPORT_CONTEXT, EVENT);
+    store.persist(TRANSPORT_CONTEXT, otherEvent);
+
+    uploader.logAndUpdateState(TRANSPORT_CONTEXT, 1);
+    assertThat(store.hasPendingEventsFor(TRANSPORT_CONTEXT)).isTrue();
+  }
+
+  @Test
+  public void upload_shouldBatchOldestEventType() {
+    String targetId = "myId";
+
+    EventInternal oldestEvent = makeEventWithPseudonymousId(targetId);
+    EventInternal siblingEvent = makeEventWithPseudonymousId(targetId);
+
+    when(mockBackend.send(any())).thenReturn(BackendResponse.ok(1000));
+
+    store.persist(TRANSPORT_CONTEXT, EVENT);
+    store.persist(TRANSPORT_CONTEXT, oldestEvent);
+    store.persist(TRANSPORT_CONTEXT, ANOTHER_EVENT);
+    store.persist(TRANSPORT_CONTEXT, siblingEvent);
+
+    List<EventInternal> targetEvents = Arrays.asList(EVENT, ANOTHER_EVENT);
+
+    uploader.logAndUpdateState(TRANSPORT_CONTEXT, 1);
+    verify(mockBackend, times(1))
+        .send(
+            argThat(
+                (backendRequest -> {
+                  List<EventInternal> events =
+                      StreamSupport.stream(backendRequest.getEvents().spliterator(), false)
+                          .collect(Collectors.toList());
+
+                  return events.equals(targetEvents);
+                })));
+  }
+
+  @Test
+  public void upload_shouldRescheduleIfThereAreAdditionalEventsPending() {
+    String targetId = "myId";
+    String alternativeId = "otherId";
+
+    EventInternal oldestEvent = makeEventWithPseudonymousId(targetId);
+    EventInternal otherEvent = makeEventWithPseudonymousId(alternativeId);
+
+    when(mockBackend.send(any())).thenReturn(BackendResponse.ok(1000));
+
+    store.persist(TRANSPORT_CONTEXT, oldestEvent);
+    store.persist(TRANSPORT_CONTEXT, EVENT);
+    store.persist(TRANSPORT_CONTEXT, otherEvent);
+
+    uploader.logAndUpdateState(TRANSPORT_CONTEXT, 1);
+    assertThat(store.hasPendingEventsFor(TRANSPORT_CONTEXT)).isTrue();
+    verify(mockScheduler, times(1)).schedule(TRANSPORT_CONTEXT, 1, true);
+  }
 }
diff --git a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/InMemoryEventStore.java b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/InMemoryEventStore.java
index d99c525adcc..82073212abe 100644
--- a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/InMemoryEventStore.java
+++ b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/InMemoryEventStore.java
@@ -114,6 +114,12 @@ public synchronized Iterable<TransportContext> loadActiveContexts() {
     return results;
   }
 
+  public void reset() {
+    store.clear();
+    backendCallTime.clear();
+    idCounter.set(0);
+  }
+
   @Override
   public int cleanUp() {
     return 0;
diff --git a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManagerMigrationTest.java b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManagerMigrationTest.java
index 6fc5cddf1a7..9d23ad75985 100644
--- a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManagerMigrationTest.java
+++ b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManagerMigrationTest.java
@@ -16,6 +16,7 @@
 import static com.google.android.datatransport.runtime.scheduling.persistence.SchemaManager.DB_NAME;
 import static com.google.android.datatransport.runtime.scheduling.persistence.SchemaManager.SCHEMA_VERSION;
 
+import android.database.sqlite.SQLiteDatabase;
 import androidx.test.core.app.ApplicationProvider;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,7 +31,7 @@ public class SchemaManagerMigrationTest {
   private final int highVersion;
   private final int lowVersion;
 
-  private static Map<Integer, StateSimulations.StateSimulator> simulatorMap = new HashMap<>();
+  private static final Map<Integer, StateSimulations.StateSimulator> simulatorMap = new HashMap<>();
 
   static {
     simulatorMap.put(1, new StateSimulations.V1());
@@ -38,6 +39,8 @@ public class SchemaManagerMigrationTest {
     simulatorMap.put(3, new StateSimulations.V3());
     simulatorMap.put(4, new StateSimulations.V4());
     simulatorMap.put(5, new StateSimulations.V5());
+    simulatorMap.put(6, new StateSimulations.V6());
+    simulatorMap.put(7, new StateSimulations.V7());
   }
 
   @ParameterizedRobolectricTestRunner.Parameters(name = "lowVersion = {0}, highVersion = {1}")
@@ -60,42 +63,49 @@ public SchemaManagerMigrationTest(int lowVersion, int highVersion) {
   public void upgrade_migratesSuccessfully() {
     SchemaManager schemaManager =
         new SchemaManager(ApplicationProvider.getApplicationContext(), DB_NAME, lowVersion);
-    schemaManager.onUpgrade(schemaManager.getWritableDatabase(), lowVersion, highVersion);
-    simulatorMap.get(highVersion).simulate(schemaManager);
+    try (SQLiteDatabase db = schemaManager.getWritableDatabase()) {
+      schemaManager.onUpgrade(db, lowVersion, highVersion);
+
+      simulatorMap.get(highVersion).simulate(schemaManager);
+    }
   }
 
   @Test
   public void downgrade_migratesSuccessfully() {
     SchemaManager schemaManager =
         new SchemaManager(ApplicationProvider.getApplicationContext(), DB_NAME, highVersion);
-    schemaManager.onDowngrade(schemaManager.getWritableDatabase(), highVersion, lowVersion);
-    simulatorMap.get(lowVersion).simulate(schemaManager);
+    try (SQLiteDatabase db = schemaManager.getWritableDatabase()) {
+      schemaManager.onDowngrade(db, highVersion, lowVersion);
+      simulatorMap.get(lowVersion).simulate(schemaManager);
+    }
   }
 
   @Test
   public void downgrade_upgrade_migratesSuccessfully() {
     SchemaManager schemaManager =
         new SchemaManager(ApplicationProvider.getApplicationContext(), DB_NAME, highVersion);
+    try (SQLiteDatabase db = schemaManager.getWritableDatabase()) {
+      schemaManager.onDowngrade(db, highVersion, lowVersion);
+      simulatorMap.get(lowVersion).simulate(schemaManager);
 
-    schemaManager.onDowngrade(schemaManager.getWritableDatabase(), highVersion, lowVersion);
-    simulatorMap.get(lowVersion).simulate(schemaManager);
-
-    schemaManager.onUpgrade(schemaManager.getWritableDatabase(), lowVersion, highVersion);
-    simulatorMap.get(highVersion).simulate(schemaManager);
+      schemaManager.onUpgrade(db, lowVersion, highVersion);
+      simulatorMap.get(highVersion).simulate(schemaManager);
+    }
   }
 
   @Test
   public void upgrade_downgrade_upgrade_migratesSuccessfully() {
     SchemaManager schemaManager =
         new SchemaManager(ApplicationProvider.getApplicationContext(), DB_NAME, lowVersion);
+    try (SQLiteDatabase db = schemaManager.getWritableDatabase()) {
+      schemaManager.onUpgrade(db, lowVersion, highVersion);
+      simulatorMap.get(highVersion).simulate(schemaManager);
 
-    schemaManager.onUpgrade(schemaManager.getWritableDatabase(), lowVersion, highVersion);
-    simulatorMap.get(highVersion).simulate(schemaManager);
-
-    schemaManager.onDowngrade(schemaManager.getWritableDatabase(), highVersion, lowVersion);
-    simulatorMap.get(lowVersion).simulate(schemaManager);
+      schemaManager.onDowngrade(db, highVersion, lowVersion);
+      simulatorMap.get(lowVersion).simulate(schemaManager);
 
-    schemaManager.onUpgrade(schemaManager.getWritableDatabase(), lowVersion, highVersion);
-    simulatorMap.get(highVersion).simulate(schemaManager);
+      schemaManager.onUpgrade(db, lowVersion, highVersion);
+      simulatorMap.get(highVersion).simulate(schemaManager);
+    }
   }
 }
diff --git a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManagerTest.java b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManagerTest.java
index d04d9122bbc..0eb403be0f6 100644
--- a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManagerTest.java
+++ b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/SchemaManagerTest.java
@@ -28,9 +28,9 @@
 import com.google.android.datatransport.runtime.time.TestClock;
 import com.google.android.datatransport.runtime.time.UptimeClock;
 import com.google.android.datatransport.runtime.util.PriorityMapping;
-import dagger.Lazy;
 import java.nio.charset.Charset;
 import java.util.Map;
+import javax.inject.Provider;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -71,7 +71,7 @@ public class SchemaManagerTest {
       EventStoreConfig.DEFAULT.toBuilder().setLoadBatchSize(5).setEventCleanUpAge(HOUR).build();
 
   private final TestClock clock = new TestClock(1);
-  private final Lazy<String> packageName =
+  private final Provider<String> packageName =
       () -> ApplicationProvider.getApplicationContext().getPackageName();
 
   @Test
@@ -123,9 +123,9 @@ public void upgradingV1ToLatest_nonEmptyDB_isLossless() {
   }
 
   @Test
-  public void upgradingV3ToV4_nonEmptyDB_isLossless() {
-    int oldVersion = 3;
-    int newVersion = 4;
+  public void upgradingV4ToV7_nonEmptyDB_isLossless() {
+    int oldVersion = 4;
+    int newVersion = 7;
     SchemaManager schemaManager =
         new SchemaManager(ApplicationProvider.getApplicationContext(), DB_NAME, oldVersion);
     SQLiteEventStore store =
@@ -134,7 +134,7 @@ public void upgradingV3ToV4_nonEmptyDB_isLossless() {
     // We cannot simulate older operations with a newer client
     PersistedEvent event1 = simulatedPersistOnV1Database(schemaManager, CONTEXT1, EVENT1);
 
-    // Upgrade to V4
+    // Upgrade to V7
     schemaManager.onUpgrade(schemaManager.getWritableDatabase(), oldVersion, newVersion);
     assertThat(store.loadBatch(CONTEXT1)).containsExactly(event1);
 
diff --git a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/StateSimulations.java b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/StateSimulations.java
index 83d527f7ff1..43575d0d259 100644
--- a/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/StateSimulations.java
+++ b/transport/transport-runtime/src/test/java/com/google/android/datatransport/runtime/scheduling/persistence/StateSimulations.java
@@ -180,10 +180,11 @@ public void simulate(SchemaManager schemaManager) {
       assertThat(newEventId).isNotEqualTo(-1);
 
       ContentValues payloads = new ContentValues();
-      values.put("sequence_num", newEventId);
-      values.put("event_id", "42");
-      values.put("bytes", "event".getBytes());
-      long payloadId = db.insert("event_payloads", null, payloads);
+      payloads.put("sequence_num", 1);
+      payloads.put("event_id", newEventId);
+      payloads.put("bytes", "event".getBytes());
+      long payloadId = db.insertOrThrow("event_payloads", null, payloads);
+      assertThat(payloadId).isNotEqualTo(-1);
 
       ContentValues metadata = new ContentValues();
       metadata.put("event_id", newEventId);
@@ -227,10 +228,11 @@ public void simulate(SchemaManager schemaManager) {
       assertThat(newEventId).isNotEqualTo(-1);
 
       ContentValues payloads = new ContentValues();
-      values.put("sequence_num", newEventId);
-      values.put("event_id", "42");
-      values.put("bytes", "event".getBytes());
+      payloads.put("sequence_num", 1);
+      payloads.put("event_id", newEventId);
+      payloads.put("bytes", "event".getBytes());
       long payloadId = db.insert("event_payloads", null, payloads);
+      assertThat(payloadId).isNotEqualTo(-1);
 
       ContentValues metadata = new ContentValues();
       metadata.put("event_id", newEventId);
@@ -252,4 +254,127 @@ public void simulate(SchemaManager schemaManager) {
       assertThat(stateId).isNotEqualTo(-1);
     }
   }
+
+  static class V6 implements StateSimulator {
+    @Override
+    public void simulate(SchemaManager schemaManager) {
+      SQLiteDatabase db = schemaManager.getWritableDatabase();
+      Random rd = new Random();
+      byte[] arr = new byte[7];
+      rd.nextBytes(arr);
+
+      ContentValues record = new ContentValues();
+      record.put("backend_name", "b1");
+      record.put("priority", PriorityMapping.toInt(Priority.DEFAULT));
+      record.put("next_request_ms", 0);
+      record.put("extras", arr);
+      long contextId = db.insert("transport_contexts", null, record);
+      assertThat(contextId).isNotEqualTo(-1);
+
+      ContentValues values = new ContentValues();
+      values.put("context_id", contextId);
+      values.put("transport_name", "42");
+      values.put("timestamp_ms", 1);
+      values.put("uptime_ms", 2);
+      values.put(
+          "payload",
+          new EncodedPayload(PROTOBUF_ENCODING, "Hello".getBytes(Charset.defaultCharset()))
+              .getBytes());
+      values.put("code", 1);
+      values.put("num_attempts", 0);
+      values.put("payload_encoding", "encoding");
+      values.put("inline", true);
+      values.put("product_id", 42);
+      long newEventId = db.insert("events", null, values);
+      assertThat(newEventId).isNotEqualTo(-1);
+
+      ContentValues payloads = new ContentValues();
+      payloads.put("sequence_num", 1);
+      payloads.put("event_id", newEventId);
+      payloads.put("bytes", "event".getBytes());
+      long payloadId = db.insertOrThrow("event_payloads", null, payloads);
+      assertThat(payloadId).isNotEqualTo(-1);
+
+      ContentValues metadata = new ContentValues();
+      metadata.put("event_id", newEventId);
+      metadata.put("name", "key1");
+      metadata.put("value", "value1");
+      long metadataId = db.insert("event_metadata", null, metadata);
+      assertThat(metadataId).isNotEqualTo(-1);
+
+      ContentValues metrics = new ContentValues();
+      metrics.put("log_source", "source2");
+      metrics.put("reason", LogEventDropped.Reason.CACHE_FULL.getNumber());
+      metrics.put("events_dropped_count", 20);
+      long recordId = db.insert("log_event_dropped", null, metrics);
+      assertThat(recordId).isNotEqualTo(-1);
+
+      ContentValues globalState = new ContentValues();
+      globalState.put("last_metrics_upload_ms", 1411);
+      long stateId = db.insert("global_log_event_state", null, globalState);
+      assertThat(stateId).isNotEqualTo(-1);
+    }
+  }
+
+  static class V7 implements StateSimulator {
+    @Override
+    public void simulate(SchemaManager schemaManager) {
+      SQLiteDatabase db = schemaManager.getWritableDatabase();
+      Random rd = new Random();
+      byte[] arr = new byte[7];
+      rd.nextBytes(arr);
+
+      ContentValues record = new ContentValues();
+      record.put("backend_name", "b1");
+      record.put("priority", PriorityMapping.toInt(Priority.DEFAULT));
+      record.put("next_request_ms", 0);
+      record.put("extras", arr);
+      long contextId = db.insert("transport_contexts", null, record);
+      assertThat(contextId).isNotEqualTo(-1);
+
+      ContentValues values = new ContentValues();
+      values.put("context_id", contextId);
+      values.put("transport_name", "42");
+      values.put("timestamp_ms", 1);
+      values.put("uptime_ms", 2);
+      values.put(
+          "payload",
+          new EncodedPayload(PROTOBUF_ENCODING, "Hello".getBytes(Charset.defaultCharset()))
+              .getBytes());
+      values.put("code", 1);
+      values.put("num_attempts", 0);
+      values.put("payload_encoding", "encoding");
+      values.put("inline", true);
+      values.put("product_id", 42);
+      values.put("pseudonymous_id", "pseudonymous id");
+      long newEventId = db.insert("events", null, values);
+      assertThat(newEventId).isNotEqualTo(-1);
+
+      ContentValues payloads = new ContentValues();
+      payloads.put("sequence_num", 1);
+      payloads.put("event_id", newEventId);
+      payloads.put("bytes", "event".getBytes());
+      long payloadId = db.insertOrThrow("event_payloads", null, payloads);
+      assertThat(payloadId).isNotEqualTo(-1);
+
+      ContentValues metadata = new ContentValues();
+      metadata.put("event_id", newEventId);
+      metadata.put("name", "key1");
+      metadata.put("value", "value1");
+      long metadataId = db.insert("event_metadata", null, metadata);
+      assertThat(metadataId).isNotEqualTo(-1);
+
+      ContentValues metrics = new ContentValues();
+      metrics.put("log_source", "source3");
+      metrics.put("reason", LogEventDropped.Reason.CACHE_FULL.getNumber());
+      metrics.put("events_dropped_count", 20);
+      long recordId = db.insert("log_event_dropped", null, metrics);
+      assertThat(recordId).isNotEqualTo(-1);
+
+      ContentValues globalState = new ContentValues();
+      globalState.put("last_metrics_upload_ms", 1511);
+      long stateId = db.insert("global_log_event_state", null, globalState);
+      assertThat(stateId).isNotEqualTo(-1);
+    }
+  }
 }
diff --git a/transport/transport-runtime/transport-runtime.gradle b/transport/transport-runtime/transport-runtime.gradle
index 617895a7058..b186eb5fda0 100644
--- a/transport/transport-runtime/transport-runtime.gradle
+++ b/transport/transport-runtime/transport-runtime.gradle
@@ -50,25 +50,21 @@ protobuf {
 }
 
 firebaseLibrary {
+    libraryGroup("transport")
     publishJavadoc = false
+    publishReleaseNotes = false
     testLab {
         enabled = true
 
-        device 'model=walleye,version=28' // Pixel2
-        device 'model=walleye,version=27' // Pixel2
-        device 'model=victara,version=19' // Moto X
-        device 'model=Nexus4,version=22'
-        device 'model=Nexus7,version=21'
-        device 'model=Nexus4,version=19'
-        device 'model=starqlteue,version=26' // Galaxy S9
-        device 'model=m0,version=18' // Galaxy S3
-        device 'model=hero2lte,version=23' // Galaxy S7
-        device 'model=htc_m8,version=19' // HTC One (M8)
+        device 'model=panther,version=33' // Pixel7
+        device 'model=redfin,version=30' // Pixel5
+        device 'model=x1q,version=29'
     }
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
+    namespace "com.google.android.datatransport.runtime"
+    compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
@@ -93,43 +89,48 @@ android {
     testOptions.unitTests {
         includeAndroidResources = true
     }
+    buildFeatures {
+        aidl true
+    }
 }
 
 thirdPartyLicenses {
-    add 'Dagger', "file://${rootDir}/third_party/licenses/apache-2.0.txt"
+    add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"
 }
 
 dependencies {
-    implementation project(':transport:transport-api')
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'javax.inject:javax.inject:1'
-    implementation project(":encoders:firebase-encoders")
-    implementation project(":encoders:firebase-encoders-proto")
-    annotationProcessor project(":encoders:firebase-encoders-processor")
-
-    vendor ('com.google.dagger:dagger:2.27') {
+    vendor (libs.dagger.dagger) {
         exclude group: "javax.inject", module: "javax.inject"
     }
 
+    api project(':transport:transport-api')
+    api 'com.google.firebase:firebase-encoders:17.0.0'
+    api "com.google.firebase:firebase-encoders-proto:16.0.0"
+
+    implementation 'androidx.annotation:annotation:1.3.0'
+    implementation 'javax.inject:javax.inject:1'
+
     compileOnly "com.google.auto.value:auto-value-annotations:1.6.6"
+    compileOnly "com.google.errorprone:error_prone_annotations:2.9.0"
 
+    annotationProcessor project(":encoders:firebase-encoders-processor")
     annotationProcessor "com.google.auto.value:auto-value:1.6.5"
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.27'
+    annotationProcessor libs.dagger.compiler
 
-    testImplementation 'junit:junit:4.13-beta-2'
+    androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.27'
+
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'androidx.test.ext:junit:1.1.1'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation 'junit:junit:4.13-beta-2'
     testImplementation 'org.mockito:mockito-core:2.25.0'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
 
-    androidTestImplementation 'junit:junit:4.13-beta-3'
-    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
+    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'junit:junit:4.13-beta-3'
     androidTestImplementation 'org.mockito:mockito-android:2.25.0'
-
-    androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.27'
-}
\ No newline at end of file
+    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
+}